Browse Source

Merge remote-tracking branch 'upstream/gva_gormv2_dev' into gva_gormv2_dev

songzhibin97 4 years ago
parent
commit
a716cbe3c7
100 changed files with 954 additions and 1436 deletions
  1. 1 0
      README.md
  2. 1 1
      dockerfile_server
  3. 2 2
      server/api/v1/exa_breakpoint_continue.go
  4. 1 1
      server/api/v1/exa_simple_uploader.go
  5. 19 0
      server/api/v1/sys_api.go
  6. 0 1
      server/api/v1/sys_casbin.go
  7. 2 2
      server/api/v1/sys_menu.go
  8. 1 1
      server/config/excel.go
  9. 1 1
      server/config/gorm.go
  10. 1 1
      server/config/redis.go
  11. 1 1
      server/core/server.go
  12. 1 1
      server/core/server_other.go
  13. 1 1
      server/core/server_win.go
  14. 201 477
      server/docs/docs.go
  15. 199 476
      server/docs/swagger.json
  16. 115 448
      server/docs/swagger.yaml
  17. 1 1
      server/global/global.go
  18. 6 10
      server/go.mod
  19. 1 1
      server/initialize/redis.go
  20. 4 4
      server/model/request/sys_dictionary.go
  21. 4 4
      server/model/request/sys_dictionary_detail.go
  22. 1 1
      server/model/sys_authority.go
  23. 1 1
      server/model/sys_casbin.go
  24. 0 0
      server/resource/page/css/index.d8b172cd.css
  25. 0 0
      server/resource/page/css/index.f05c41c6.css
  26. 1 0
      server/resource/page/css/parser-example.69e16e51.css
  27. BIN
      server/resource/page/img/logo.e1bc3747.png
  28. 0 0
      server/resource/page/index.html
  29. 0 0
      server/resource/page/js/chunk-vendors.788511b0.js
  30. 0 0
      server/resource/page/js/chunk-vendors.9ae0d8fb.js
  31. 0 0
      server/resource/page/js/index.94d8e405.js
  32. 0 0
      server/resource/page/js/index.b3720c41.js
  33. 0 0
      server/resource/page/js/parser-example.c1051310.js
  34. 0 0
      server/resource/page/js/preview.7fecf17e.js
  35. 0 0
      server/resource/page/js/preview.d8d06dfd.js
  36. 1 0
      server/resource/page/js/tinymce-example.5a756246.js
  37. BIN
      server/resource/page/libs/monaco-editor/vs/base/browser/ui/codicons/codicon/codicon.ttf
  38. 5 0
      server/resource/page/libs/monaco-editor/vs/base/worker/workerMain.js
  39. 6 0
      server/resource/page/libs/monaco-editor/vs/basic-languages/abap/abap.js
  40. 6 0
      server/resource/page/libs/monaco-editor/vs/basic-languages/apex/apex.js
  41. 7 0
      server/resource/page/libs/monaco-editor/vs/basic-languages/azcli/azcli.js
  42. 7 0
      server/resource/page/libs/monaco-editor/vs/basic-languages/bat/bat.js
  43. 6 0
      server/resource/page/libs/monaco-editor/vs/basic-languages/cameligo/cameligo.js
  44. 6 0
      server/resource/page/libs/monaco-editor/vs/basic-languages/clojure/clojure.js
  45. 6 0
      server/resource/page/libs/monaco-editor/vs/basic-languages/coffee/coffee.js
  46. 6 0
      server/resource/page/libs/monaco-editor/vs/basic-languages/cpp/cpp.js
  47. 6 0
      server/resource/page/libs/monaco-editor/vs/basic-languages/csharp/csharp.js
  48. 7 0
      server/resource/page/libs/monaco-editor/vs/basic-languages/csp/csp.js
  49. 6 0
      server/resource/page/libs/monaco-editor/vs/basic-languages/css/css.js
  50. 6 0
      server/resource/page/libs/monaco-editor/vs/basic-languages/dart/dart.js
  51. 7 0
      server/resource/page/libs/monaco-editor/vs/basic-languages/dockerfile/dockerfile.js
  52. 6 0
      server/resource/page/libs/monaco-editor/vs/basic-languages/ecl/ecl.js
  53. 6 0
      server/resource/page/libs/monaco-editor/vs/basic-languages/fsharp/fsharp.js
  54. 6 0
      server/resource/page/libs/monaco-editor/vs/basic-languages/go/go.js
  55. 6 0
      server/resource/page/libs/monaco-editor/vs/basic-languages/graphql/graphql.js
  56. 6 0
      server/resource/page/libs/monaco-editor/vs/basic-languages/handlebars/handlebars.js
  57. 6 0
      server/resource/page/libs/monaco-editor/vs/basic-languages/hcl/hcl.js
  58. 6 0
      server/resource/page/libs/monaco-editor/vs/basic-languages/html/html.js
  59. 7 0
      server/resource/page/libs/monaco-editor/vs/basic-languages/ini/ini.js
  60. 6 0
      server/resource/page/libs/monaco-editor/vs/basic-languages/java/java.js
  61. 6 0
      server/resource/page/libs/monaco-editor/vs/basic-languages/javascript/javascript.js
  62. 6 0
      server/resource/page/libs/monaco-editor/vs/basic-languages/julia/julia.js
  63. 6 0
      server/resource/page/libs/monaco-editor/vs/basic-languages/kotlin/kotlin.js
  64. 6 0
      server/resource/page/libs/monaco-editor/vs/basic-languages/less/less.js
  65. 6 0
      server/resource/page/libs/monaco-editor/vs/basic-languages/lexon/lexon.js
  66. 6 0
      server/resource/page/libs/monaco-editor/vs/basic-languages/lua/lua.js
  67. 6 0
      server/resource/page/libs/monaco-editor/vs/basic-languages/m3/m3.js
  68. 6 0
      server/resource/page/libs/monaco-editor/vs/basic-languages/markdown/markdown.js
  69. 6 0
      server/resource/page/libs/monaco-editor/vs/basic-languages/mips/mips.js
  70. 6 0
      server/resource/page/libs/monaco-editor/vs/basic-languages/msdax/msdax.js
  71. 6 0
      server/resource/page/libs/monaco-editor/vs/basic-languages/mysql/mysql.js
  72. 6 0
      server/resource/page/libs/monaco-editor/vs/basic-languages/objective-c/objective-c.js
  73. 6 0
      server/resource/page/libs/monaco-editor/vs/basic-languages/pascal/pascal.js
  74. 6 0
      server/resource/page/libs/monaco-editor/vs/basic-languages/pascaligo/pascaligo.js
  75. 6 0
      server/resource/page/libs/monaco-editor/vs/basic-languages/perl/perl.js
  76. 6 0
      server/resource/page/libs/monaco-editor/vs/basic-languages/pgsql/pgsql.js
  77. 6 0
      server/resource/page/libs/monaco-editor/vs/basic-languages/php/php.js
  78. 6 0
      server/resource/page/libs/monaco-editor/vs/basic-languages/postiats/postiats.js
  79. 6 0
      server/resource/page/libs/monaco-editor/vs/basic-languages/powerquery/powerquery.js
  80. 6 0
      server/resource/page/libs/monaco-editor/vs/basic-languages/powershell/powershell.js
  81. 6 0
      server/resource/page/libs/monaco-editor/vs/basic-languages/pug/pug.js
  82. 6 0
      server/resource/page/libs/monaco-editor/vs/basic-languages/python/python.js
  83. 6 0
      server/resource/page/libs/monaco-editor/vs/basic-languages/r/r.js
  84. 6 0
      server/resource/page/libs/monaco-editor/vs/basic-languages/razor/razor.js
  85. 6 0
      server/resource/page/libs/monaco-editor/vs/basic-languages/redis/redis.js
  86. 6 0
      server/resource/page/libs/monaco-editor/vs/basic-languages/redshift/redshift.js
  87. 6 0
      server/resource/page/libs/monaco-editor/vs/basic-languages/restructuredtext/restructuredtext.js
  88. 6 0
      server/resource/page/libs/monaco-editor/vs/basic-languages/ruby/ruby.js
  89. 6 0
      server/resource/page/libs/monaco-editor/vs/basic-languages/rust/rust.js
  90. 7 0
      server/resource/page/libs/monaco-editor/vs/basic-languages/sb/sb.js
  91. 6 0
      server/resource/page/libs/monaco-editor/vs/basic-languages/scala/scala.js
  92. 7 0
      server/resource/page/libs/monaco-editor/vs/basic-languages/scheme/scheme.js
  93. 6 0
      server/resource/page/libs/monaco-editor/vs/basic-languages/scss/scss.js
  94. 6 0
      server/resource/page/libs/monaco-editor/vs/basic-languages/shell/shell.js
  95. 6 0
      server/resource/page/libs/monaco-editor/vs/basic-languages/solidity/solidity.js
  96. 6 0
      server/resource/page/libs/monaco-editor/vs/basic-languages/sophia/sophia.js
  97. 6 0
      server/resource/page/libs/monaco-editor/vs/basic-languages/sql/sql.js
  98. 6 0
      server/resource/page/libs/monaco-editor/vs/basic-languages/st/st.js
  99. 9 0
      server/resource/page/libs/monaco-editor/vs/basic-languages/swift/swift.js
  100. 6 0
      server/resource/page/libs/monaco-editor/vs/basic-languages/systemverilog/systemverilog.js

+ 1 - 0
README.md

@@ -141,6 +141,7 @@ Gin-vue-admin 的成长离不开大家的支持,如果你愿意为 gin-vue-adm
 
 > <font color=red>**使用docker-compose进行部署本项目需注意的问题**</font>
 
+- dockerfile_server使用了多阶段构建,这是docker 17.05后引入的,因此安装的docker版本需要高于17.05
 - mysql数据库请使用装在服务器磁盘的本地数据库.
 	- 避免使用docker容器内的mysql,可能会出现写入的问题, io比宿主机低  docker的持久化机制问题
 - [init.sql](.docker-compose/docker-entrypoint-initdb.d/init.sql)是给docker-compose进行<font color=red>体验本项目</font>的, 禁止[init.sql](.docker-compose/docker-entrypoint-initdb.d/init.sql)使用进行项目数据的初始化, 数据库初始化[请使用此方法](https://www.gin-vue-admin.com/docs/help#step1%EF%BC%9A%E6%95%B0%E6%8D%AE%E5%BA%93%E5%88%9D%E5%A7%8B%E5%8C%96)

+ 1 - 1
dockerfile_server

@@ -12,7 +12,7 @@ RUN sh ./server-handle.sh
 RUN rm -f server-handle.sh
 RUN cat ./config.yaml
 
-RUN go env && go build -o server .
+RUN go env && go mod tidy && go build -o server .
 
 FROM alpine:latest
 LABEL MAINTAINER="SliverHorn@sliver_horn@qq.com"

+ 2 - 2
server/api/v1/exa_breakpoint_continue.go

@@ -82,7 +82,7 @@ func FindFile(c *gin.Context) {
 		global.GVA_LOG.Error("查找失败!", zap.Any("err", err))
 		response.FailWithMessage("查找失败", c)
 	} else {
-		response.OkWithDetailed(response.FileResponse{File: file},"查找成功", c)
+		response.OkWithDetailed(response.FileResponse{File: file}, "查找成功", c)
 	}
 }
 
@@ -122,7 +122,7 @@ func RemoveChunk(c *gin.Context) {
 	err = service.DeleteFileChunk(fileMd5, fileName, filePath)
 	if err != nil {
 		global.GVA_LOG.Error("缓存切片删除失败!", zap.Any("err", err))
-		response.FailWithDetailed(response.FilePathResponse{FilePath: filePath},"缓存切片删除失败", c)
+		response.FailWithDetailed(response.FilePathResponse{FilePath: filePath}, "缓存切片删除失败", c)
 	} else {
 		response.OkWithDetailed(response.FilePathResponse{FilePath: filePath}, "缓存切片删除成功", c)
 	}

+ 1 - 1
server/api/v1/exa_simple_uploader.go

@@ -69,7 +69,7 @@ func CheckFileMd5(c *gin.Context) {
 		response.OkWithDetailed(gin.H{
 			"chunks": chunks,
 			"isDone": isDone,
-		},"查询成功", c)
+		}, "查询成功", c)
 	}
 }
 

+ 19 - 0
server/api/v1/sys_api.go

@@ -147,3 +147,22 @@ func GetAllApis(c *gin.Context) {
 		response.OkWithDetailed(response.SysAPIListResponse{Apis: apis}, "获取成功", c)
 	}
 }
+
+// @Tags SysApi
+// @Summary 删除选中Api
+// @Security ApiKeyAuth
+// @accept application/json
+// @Produce application/json
+// @Param data body request.IdsReq true "ID"
+// @Success 200 {string} string "{"success":true,"data":{},"msg":"删除成功"}"
+// @Router /api/deleteApisByIds [delete]
+func DeleteApisByIds(c *gin.Context) {
+	var ids request.IdsReq
+	_ = c.ShouldBindJSON(&ids)
+	if err := service.DeleteApisByIds(ids); err != nil {
+		global.GVA_LOG.Error("删除失败!", zap.Any("err", err))
+		response.FailWithMessage("删除失败", c)
+	} else {
+		response.OkWithMessage("删除成功", c)
+	}
+}

+ 0 - 1
server/api/v1/sys_casbin.go

@@ -51,4 +51,3 @@ func GetPolicyPathByAuthorityId(c *gin.Context) {
 	paths := service.GetPolicyPathByAuthorityId(casbin.AuthorityId)
 	response.OkWithDetailed(response.PolicyPathResponse{Paths: paths}, "获取成功", c)
 }
-

+ 2 - 2
server/api/v1/sys_menu.go

@@ -214,6 +214,6 @@ func GetMenuList(c *gin.Context) {
 			Total:    total,
 			Page:     pageInfo.Page,
 			PageSize: pageInfo.PageSize,
-		},"获取成功", c)
+		}, "获取成功", c)
 	}
-}
+}

+ 1 - 1
server/config/excel.go

@@ -2,4 +2,4 @@ package config
 
 type Excel struct {
 	Dir string `mapstructure:"dir" json:"dir" yaml:"dir"`
-}
+}

+ 1 - 1
server/config/gorm.go

@@ -14,4 +14,4 @@ type Mysql struct {
 
 func (m *Mysql) Dsn() string {
 	return m.Username + ":" + m.Password + "@tcp(" + m.Path + ")/" + m.Dbname + "?" + m.Config
-}
+}

+ 1 - 1
server/config/redis.go

@@ -4,4 +4,4 @@ type Redis struct {
 	DB       int    `mapstructure:"db" json:"db" yaml:"db"`
 	Addr     string `mapstructure:"addr" json:"addr" yaml:"addr"`
 	Password string `mapstructure:"password" json:"password" yaml:"password"`
-}
+}

+ 1 - 1
server/core/server.go

@@ -29,7 +29,7 @@ func RunWindowsServer() {
 
 	fmt.Printf(`
 	欢迎使用 Gin-Vue-Admin
-	当前版本:V2.4.0
+	当前版本:V2.4.1
     加群方式:微信号:shouzi_1994 QQ群:622360840
 	默认自动化文档地址:http://127.0.0.1%s/swagger/index.html
 	默认前端文件运行地址:http://127.0.0.1:8080

+ 1 - 1
server/core/server_other.go

@@ -14,4 +14,4 @@ func initServer(address string, router *gin.Engine) server {
 	s.WriteTimeout = 10 * time.Second
 	s.MaxHeaderBytes = 1 << 20
 	return s
-}
+}

+ 1 - 1
server/core/server_win.go

@@ -16,4 +16,4 @@ func initServer(address string, router *gin.Engine) server {
 		WriteTimeout:   10 * time.Second,
 		MaxHeaderBytes: 1 << 20,
 	}
-}
+}

File diff suppressed because it is too large
+ 201 - 477
server/docs/docs.go


File diff suppressed because it is too large
+ 199 - 476
server/docs/swagger.json


+ 115 - 448
server/docs/swagger.yaml

@@ -13,6 +13,35 @@ definitions:
       endpoint:
         type: string
     type: object
+  config.Autocode:
+    properties:
+      root:
+        type: string
+      server:
+        type: string
+      serverApi:
+        type: string
+      serverInitialize:
+        type: string
+      serverModel:
+        type: string
+      serverRequest:
+        type: string
+      serverRouter:
+        type: string
+      serverService:
+        type: string
+      web:
+        type: string
+      webApi:
+        type: string
+      webFlow:
+        type: string
+      webForm:
+        type: string
+      webTable:
+        type: string
+    type: object
   config.Captcha:
     properties:
       imgHeight:
@@ -115,6 +144,10 @@ definitions:
       aliyunOSS:
         $ref: '#/definitions/config.AliyunOSS'
         type: object
+      autoCode:
+        $ref: '#/definitions/config.Autocode'
+        description: auto
+        type: object
       captcha:
         $ref: '#/definitions/config.Captcha'
         type: object
@@ -499,165 +532,6 @@ definitions:
         $ref: '#/definitions/config.Server'
         type: object
     type: object
-  model.WorkflowEdge:
-    properties:
-      clazz:
-        type: string
-      conditionExpression:
-        type: string
-      createdAt:
-        type: string
-      description:
-        type: string
-      endPoint:
-        $ref: '#/definitions/model.WorkflowEndPoint'
-        description: 终点信息
-        type: object
-      hideIcon:
-        type: boolean
-      id:
-        type: string
-      label:
-        type: string
-      reverse:
-        type: boolean
-      seq:
-        type: string
-      shape:
-        type: string
-      source:
-        type: string
-      sourceAnchor:
-        type: integer
-      startPoint:
-        $ref: '#/definitions/model.WorkflowStartPoint'
-        description: 起点信息
-        type: object
-      target:
-        type: string
-      targetAnchor:
-        type: integer
-      updatedAt:
-        type: string
-    type: object
-  model.WorkflowEndPoint:
-    properties:
-      createdAt:
-        type: string
-      id:
-        type: integer
-      index:
-        type: integer
-      updatedAt:
-        type: string
-      workflowEdgeID:
-        type: string
-      x:
-        type: number
-      "y":
-        type: number
-    type: object
-  model.WorkflowNode:
-    properties:
-      assignType:
-        type: string
-      assignValue:
-        type: string
-      clazz:
-        type: string
-      content:
-        type: string
-      createdAt:
-        type: string
-      cycle:
-        type: string
-      description:
-        type: string
-      dueDate:
-        type: string
-      duration:
-        type: string
-      hideIcon:
-        type: boolean
-      id:
-        type: string
-      label:
-        type: string
-      shape:
-        type: string
-      stateValue:
-        type: string
-      subject:
-        type: string
-      success:
-        type: boolean
-      to:
-        type: string
-      type:
-        type: string
-      updatedAt:
-        type: string
-      view:
-        type: string
-      waitState:
-        type: string
-      workflowProcessID:
-        type: string
-      x:
-        type: number
-      "y":
-        type: number
-    type: object
-  model.WorkflowProcess:
-    properties:
-      category:
-        type: string
-      clazz:
-        type: string
-      createdAt:
-        type: string
-      description:
-        type: string
-      edges:
-        description: 流程链接数据
-        items:
-          $ref: '#/definitions/model.WorkflowEdge'
-        type: array
-      hideIcon:
-        type: boolean
-      id:
-        type: string
-      label:
-        type: string
-      name:
-        type: string
-      nodes:
-        description: 流程节点数据
-        items:
-          $ref: '#/definitions/model.WorkflowNode'
-        type: array
-      updatedAt:
-        type: string
-      view:
-        type: string
-    type: object
-  model.WorkflowStartPoint:
-    properties:
-      createdAt:
-        type: string
-      id:
-        type: integer
-      index:
-        type: integer
-      updatedAt:
-        type: string
-      workflowEdgeID:
-        type: string
-      x:
-        type: number
-      "y":
-        type: number
-    type: object
   request.AddMenuAuthorityInfo:
     properties:
       authorityId:
@@ -861,43 +735,6 @@ definitions:
       user_id:
         type: integer
     type: object
-  request.WorkflowProcessSearch:
-    properties:
-      category:
-        type: string
-      clazz:
-        type: string
-      createdAt:
-        type: string
-      description:
-        type: string
-      edges:
-        description: 流程链接数据
-        items:
-          $ref: '#/definitions/model.WorkflowEdge'
-        type: array
-      hideIcon:
-        type: boolean
-      id:
-        type: string
-      label:
-        type: string
-      name:
-        type: string
-      nodes:
-        description: 流程节点数据
-        items:
-          $ref: '#/definitions/model.WorkflowNode'
-        type: array
-      page:
-        type: integer
-      pageSize:
-        type: integer
-      updatedAt:
-        type: string
-      view:
-        type: string
-    type: object
   response.SysAuthorityCopyResponse:
     properties:
       authority:
@@ -924,6 +761,7 @@ paths:
         required: true
         schema:
           $ref: '#/definitions/model.SysApi'
+          type: object
       produces:
       - application/json
       responses:
@@ -947,6 +785,7 @@ paths:
         required: true
         schema:
           $ref: '#/definitions/model.SysApi'
+          type: object
       produces:
       - application/json
       responses:
@@ -959,6 +798,30 @@ paths:
       summary: 删除api
       tags:
       - SysApi
+  /api/deleteApisByIds:
+    delete:
+      consumes:
+      - application/json
+      parameters:
+      - description: ID
+        in: body
+        name: data
+        required: true
+        schema:
+          $ref: '#/definitions/request.IdsReq'
+          type: object
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: '{"success":true,"data":{},"msg":"删除成功"}'
+          schema:
+            type: string
+      security:
+      - ApiKeyAuth: []
+      summary: 删除选中Api
+      tags:
+      - SysApi
   /api/getAllApis:
     post:
       consumes:
@@ -986,6 +849,7 @@ paths:
         required: true
         schema:
           $ref: '#/definitions/request.GetById'
+          type: object
       produces:
       - application/json
       responses:
@@ -1009,6 +873,7 @@ paths:
         required: true
         schema:
           $ref: '#/definitions/request.SearchApiParams'
+          type: object
       produces:
       - application/json
       responses:
@@ -1032,6 +897,7 @@ paths:
         required: true
         schema:
           $ref: '#/definitions/model.SysApi'
+          type: object
       produces:
       - application/json
       responses:
@@ -1055,6 +921,7 @@ paths:
         required: true
         schema:
           $ref: '#/definitions/response.SysAuthorityCopyResponse'
+          type: object
       produces:
       - application/json
       responses:
@@ -1078,6 +945,7 @@ paths:
         required: true
         schema:
           $ref: '#/definitions/model.SysAuthority'
+          type: object
       produces:
       - application/json
       responses:
@@ -1101,6 +969,7 @@ paths:
         required: true
         schema:
           $ref: '#/definitions/model.SysAuthority'
+          type: object
       produces:
       - application/json
       responses:
@@ -1124,6 +993,7 @@ paths:
         required: true
         schema:
           $ref: '#/definitions/request.PageInfo'
+          type: object
       produces:
       - application/json
       responses:
@@ -1147,6 +1017,7 @@ paths:
         required: true
         schema:
           $ref: '#/definitions/model.SysAuthority'
+          type: object
       produces:
       - application/json
       responses:
@@ -1170,6 +1041,7 @@ paths:
         required: true
         schema:
           $ref: '#/definitions/model.SysAuthority'
+          type: object
       produces:
       - application/json
       responses:
@@ -1193,6 +1065,7 @@ paths:
         required: true
         schema:
           $ref: '#/definitions/model.AutoCodeStruct'
+          type: object
       produces:
       - application/json
       responses:
@@ -1264,6 +1137,7 @@ paths:
         required: true
         schema:
           $ref: '#/definitions/model.AutoCodeStruct'
+          type: object
       produces:
       - application/json
       responses:
@@ -1301,6 +1175,7 @@ paths:
         required: true
         schema:
           $ref: '#/definitions/request.Login'
+          type: object
       produces:
       - application/json
       responses:
@@ -1322,6 +1197,7 @@ paths:
         required: true
         schema:
           $ref: '#/definitions/request.CasbinInReceive'
+          type: object
       produces:
       - application/json
       responses:
@@ -1345,6 +1221,7 @@ paths:
         required: true
         schema:
           $ref: '#/definitions/request.CasbinInReceive'
+          type: object
       produces:
       - application/json
       responses:
@@ -1368,6 +1245,7 @@ paths:
         required: true
         schema:
           $ref: '#/definitions/model.ExaCustomer'
+          type: object
       produces:
       - application/json
       responses:
@@ -1390,6 +1268,7 @@ paths:
         required: true
         schema:
           $ref: '#/definitions/model.ExaCustomer'
+          type: object
       produces:
       - application/json
       responses:
@@ -1412,6 +1291,7 @@ paths:
         required: true
         schema:
           $ref: '#/definitions/model.ExaCustomer'
+          type: object
       produces:
       - application/json
       responses:
@@ -1434,6 +1314,7 @@ paths:
         required: true
         schema:
           $ref: '#/definitions/model.ExaCustomer'
+          type: object
       produces:
       - application/json
       responses:
@@ -1457,6 +1338,7 @@ paths:
         required: true
         schema:
           $ref: '#/definitions/request.PageInfo'
+          type: object
       produces:
       - application/json
       responses:
@@ -1496,8 +1378,7 @@ paths:
       produces:
       - application/json
       responses:
-        "200":
-          description: ""
+        "200": {}
       security:
       - ApiKeyAuth: []
       summary: 下载模板
@@ -1514,11 +1395,11 @@ paths:
         required: true
         schema:
           $ref: '#/definitions/model.ExcelInfo'
+          type: object
       produces:
       - application/octet-stream
       responses:
-        "200":
-          description: ""
+        "200": {}
       security:
       - ApiKeyAuth: []
       summary: 导出Excel
@@ -1591,6 +1472,7 @@ paths:
         required: true
         schema:
           $ref: '#/definitions/model.ExaFileUploadAndDownload'
+          type: object
       produces:
       - application/json
       responses:
@@ -1636,6 +1518,7 @@ paths:
         required: true
         schema:
           $ref: '#/definitions/request.PageInfo'
+          type: object
       produces:
       - application/json
       responses:
@@ -1713,6 +1596,7 @@ paths:
         required: true
         schema:
           $ref: '#/definitions/request.InitDB'
+          type: object
       produces:
       - application/json
       responses:
@@ -1750,6 +1634,7 @@ paths:
         required: true
         schema:
           $ref: '#/definitions/request.GetAuthorityId'
+          type: object
       produces:
       - application/json
       responses:
@@ -1773,6 +1658,7 @@ paths:
         required: true
         schema:
           $ref: '#/definitions/model.SysBaseMenu'
+          type: object
       produces:
       - application/json
       responses:
@@ -1796,6 +1682,7 @@ paths:
         required: true
         schema:
           $ref: '#/definitions/request.AddMenuAuthorityInfo'
+          type: object
       produces:
       - application/json
       responses:
@@ -1819,6 +1706,7 @@ paths:
         required: true
         schema:
           $ref: '#/definitions/request.GetById'
+          type: object
       produces:
       - application/json
       responses:
@@ -1842,6 +1730,7 @@ paths:
         required: true
         schema:
           $ref: '#/definitions/request.GetById'
+          type: object
       produces:
       - application/json
       responses:
@@ -1863,6 +1752,7 @@ paths:
         required: true
         schema:
           $ref: '#/definitions/request.Empty'
+          type: object
       produces:
       - application/json
       responses:
@@ -1884,6 +1774,7 @@ paths:
         required: true
         schema:
           $ref: '#/definitions/request.Empty'
+          type: object
       produces:
       - application/json
       responses:
@@ -1907,6 +1798,7 @@ paths:
         required: true
         schema:
           $ref: '#/definitions/request.PageInfo'
+          type: object
       produces:
       - application/json
       responses:
@@ -1930,6 +1822,7 @@ paths:
         required: true
         schema:
           $ref: '#/definitions/model.SysBaseMenu'
+          type: object
       produces:
       - application/json
       responses:
@@ -2015,6 +1908,7 @@ paths:
         required: true
         schema:
           $ref: '#/definitions/model.SysDictionary'
+          type: object
       produces:
       - application/json
       responses:
@@ -2038,6 +1932,7 @@ paths:
         required: true
         schema:
           $ref: '#/definitions/model.SysDictionary'
+          type: object
       produces:
       - application/json
       responses:
@@ -2061,6 +1956,7 @@ paths:
         required: true
         schema:
           $ref: '#/definitions/model.SysDictionary'
+          type: object
       produces:
       - application/json
       responses:
@@ -2084,6 +1980,7 @@ paths:
         required: true
         schema:
           $ref: '#/definitions/request.SysDictionarySearch'
+          type: object
       produces:
       - application/json
       responses:
@@ -2107,6 +2004,7 @@ paths:
         required: true
         schema:
           $ref: '#/definitions/model.SysDictionary'
+          type: object
       produces:
       - application/json
       responses:
@@ -2130,6 +2028,7 @@ paths:
         required: true
         schema:
           $ref: '#/definitions/model.SysDictionaryDetail'
+          type: object
       produces:
       - application/json
       responses:
@@ -2153,6 +2052,7 @@ paths:
         required: true
         schema:
           $ref: '#/definitions/model.SysDictionaryDetail'
+          type: object
       produces:
       - application/json
       responses:
@@ -2176,6 +2076,7 @@ paths:
         required: true
         schema:
           $ref: '#/definitions/model.SysDictionaryDetail'
+          type: object
       produces:
       - application/json
       responses:
@@ -2199,6 +2100,7 @@ paths:
         required: true
         schema:
           $ref: '#/definitions/request.SysDictionaryDetailSearch'
+          type: object
       produces:
       - application/json
       responses:
@@ -2222,6 +2124,7 @@ paths:
         required: true
         schema:
           $ref: '#/definitions/model.SysDictionaryDetail'
+          type: object
       produces:
       - application/json
       responses:
@@ -2245,6 +2148,7 @@ paths:
         required: true
         schema:
           $ref: '#/definitions/model.SysOperationRecord'
+          type: object
       produces:
       - application/json
       responses:
@@ -2268,6 +2172,7 @@ paths:
         required: true
         schema:
           $ref: '#/definitions/model.SysOperationRecord'
+          type: object
       produces:
       - application/json
       responses:
@@ -2291,6 +2196,7 @@ paths:
         required: true
         schema:
           $ref: '#/definitions/request.IdsReq'
+          type: object
       produces:
       - application/json
       responses:
@@ -2314,6 +2220,7 @@ paths:
         required: true
         schema:
           $ref: '#/definitions/model.SysOperationRecord'
+          type: object
       produces:
       - application/json
       responses:
@@ -2337,6 +2244,7 @@ paths:
         required: true
         schema:
           $ref: '#/definitions/request.SysOperationRecordSearch'
+          type: object
       produces:
       - application/json
       responses:
@@ -2400,6 +2308,7 @@ paths:
         required: true
         schema:
           $ref: '#/definitions/model.System'
+          type: object
       produces:
       - application/json
       responses:
@@ -2421,6 +2330,7 @@ paths:
         required: true
         schema:
           $ref: '#/definitions/request.ChangePasswordStruct'
+          type: object
       produces:
       - application/json
       responses:
@@ -2444,6 +2354,7 @@ paths:
         required: true
         schema:
           $ref: '#/definitions/request.GetById'
+          type: object
       produces:
       - application/json
       responses:
@@ -2467,6 +2378,7 @@ paths:
         required: true
         schema:
           $ref: '#/definitions/request.PageInfo'
+          type: object
       produces:
       - application/json
       responses:
@@ -2488,6 +2400,7 @@ paths:
         required: true
         schema:
           $ref: '#/definitions/model.SysUser'
+          type: object
       produces:
       - application/json
       responses:
@@ -2509,6 +2422,7 @@ paths:
         required: true
         schema:
           $ref: '#/definitions/request.SetUserAuth'
+          type: object
       produces:
       - application/json
       responses:
@@ -2532,6 +2446,7 @@ paths:
         required: true
         schema:
           $ref: '#/definitions/model.SysUser'
+          type: object
       produces:
       - application/json
       responses:
@@ -2544,254 +2459,6 @@ paths:
       summary: 设置用户信息
       tags:
       - SysUser
-  /workflowProcess/completeWorkflowMove:
-    post:
-      consumes:
-      - application/json
-      produces:
-      - application/json
-      responses:
-        "200":
-          description: '{"success":true,"data":{},"msg":"获取成功"}'
-          schema:
-            type: string
-      security:
-      - ApiKeyAuth: []
-      summary: 提交工作流
-      tags:
-      - WorkflowProcess
-  /workflowProcess/createWorkflowProcess:
-    post:
-      consumes:
-      - application/json
-      parameters:
-      - description: 创建WorkflowProcess
-        in: body
-        name: data
-        required: true
-        schema:
-          $ref: '#/definitions/model.WorkflowProcess'
-      produces:
-      - application/json
-      responses:
-        "200":
-          description: '{"success":true,"data":{},"msg":"获取成功"}'
-          schema:
-            type: string
-      security:
-      - ApiKeyAuth: []
-      summary: 创建WorkflowProcess
-      tags:
-      - WorkflowProcess
-  /workflowProcess/deleteWorkflowProcess:
-    delete:
-      consumes:
-      - application/json
-      parameters:
-      - description: 删除WorkflowProcess
-        in: body
-        name: data
-        required: true
-        schema:
-          $ref: '#/definitions/model.WorkflowProcess'
-      produces:
-      - application/json
-      responses:
-        "200":
-          description: '{"success":true,"data":{},"msg":"删除成功"}'
-          schema:
-            type: string
-      security:
-      - ApiKeyAuth: []
-      summary: 删除WorkflowProcess
-      tags:
-      - WorkflowProcess
-  /workflowProcess/deleteWorkflowProcessByIds:
-    delete:
-      consumes:
-      - application/json
-      parameters:
-      - description: 批量删除WorkflowProcess
-        in: body
-        name: data
-        required: true
-        schema:
-          $ref: '#/definitions/request.IdsReq'
-      produces:
-      - application/json
-      responses:
-        "200":
-          description: '{"success":true,"data":{},"msg":"删除成功"}'
-          schema:
-            type: string
-      security:
-      - ApiKeyAuth: []
-      summary: 批量删除WorkflowProcess
-      tags:
-      - WorkflowProcess
-  /workflowProcess/findWorkflowProcess:
-    get:
-      consumes:
-      - application/json
-      parameters:
-      - description: 用id查询WorkflowProcess
-        in: body
-        name: data
-        required: true
-        schema:
-          $ref: '#/definitions/model.WorkflowProcess'
-      produces:
-      - application/json
-      responses:
-        "200":
-          description: '{"success":true,"data":{},"msg":"查询成功"}'
-          schema:
-            type: string
-      security:
-      - ApiKeyAuth: []
-      summary: 用id查询WorkflowProcess
-      tags:
-      - WorkflowProcess
-  /workflowProcess/findWorkflowStep:
-    get:
-      consumes:
-      - application/json
-      parameters:
-      - description: 用id查询WorkflowProcess
-        in: body
-        name: data
-        required: true
-        schema:
-          $ref: '#/definitions/model.WorkflowProcess'
-      produces:
-      - application/json
-      responses:
-        "200":
-          description: '{"success":true,"data":{},"msg":"查询成功"}'
-          schema:
-            type: string
-      security:
-      - ApiKeyAuth: []
-      summary: 用id查询工作流步骤
-      tags:
-      - WorkflowProcess
-  /workflowProcess/getMyNeed:
-    get:
-      consumes:
-      - application/json
-      produces:
-      - application/json
-      responses:
-        "200":
-          description: '{"success":true,"data":{},"msg":"获取成功"}'
-          schema:
-            type: string
-      security:
-      - ApiKeyAuth: []
-      summary: 我的待办
-      tags:
-      - WorkflowProcess
-  /workflowProcess/getMyStated:
-    get:
-      consumes:
-      - application/json
-      produces:
-      - application/json
-      responses:
-        "200":
-          description: '{"success":true,"data":{},"msg":"获取成功"}'
-          schema:
-            type: string
-      security:
-      - ApiKeyAuth: []
-      summary: 我发起的工作流
-      tags:
-      - WorkflowProcess
-  /workflowProcess/getWorkflowMoveByID:
-    get:
-      consumes:
-      - application/json
-      parameters:
-      - description: 根据id获取当前节点详情和过往
-        in: body
-        name: data
-        required: true
-        schema:
-          $ref: '#/definitions/request.GetById'
-      produces:
-      - application/json
-      responses:
-        "200":
-          description: '{"success":true,"data":{},"msg":"获取成功"}'
-          schema:
-            type: string
-      security:
-      - ApiKeyAuth: []
-      summary: 根据id获取当前节点详情和历史
-      tags:
-      - WorkflowProcess
-  /workflowProcess/getWorkflowProcessList:
-    get:
-      consumes:
-      - application/json
-      parameters:
-      - description: 分页获取WorkflowProcess列表
-        in: body
-        name: data
-        required: true
-        schema:
-          $ref: '#/definitions/request.WorkflowProcessSearch'
-      produces:
-      - application/json
-      responses:
-        "200":
-          description: '{"success":true,"data":{},"msg":"获取成功"}'
-          schema:
-            type: string
-      security:
-      - ApiKeyAuth: []
-      summary: 分页获取WorkflowProcess列表
-      tags:
-      - WorkflowProcess
-  /workflowProcess/startWorkflow:
-    post:
-      consumes:
-      - application/json
-      produces:
-      - application/json
-      responses:
-        "200":
-          description: '{"success":true,"data":{},"msg":"获取成功"}'
-          schema:
-            type: string
-      security:
-      - ApiKeyAuth: []
-      summary: 开启工作流
-      tags:
-      - WorkflowProcess
-  /workflowProcess/updateWorkflowProcess:
-    put:
-      consumes:
-      - application/json
-      parameters:
-      - description: 更新WorkflowProcess
-        in: body
-        name: data
-        required: true
-        schema:
-          $ref: '#/definitions/model.WorkflowProcess'
-      produces:
-      - application/json
-      responses:
-        "200":
-          description: '{"success":true,"data":{},"msg":"更新成功"}'
-          schema:
-            type: string
-      security:
-      - ApiKeyAuth: []
-      summary: 更新WorkflowProcess
-      tags:
-      - WorkflowProcess
 securityDefinitions:
   ApiKeyAuth:
     in: header

+ 1 - 1
server/global/global.go

@@ -15,5 +15,5 @@ var (
 	GVA_CONFIG config.Server
 	GVA_VP     *viper.Viper
 	//GVA_LOG    *oplogging.Logger
-	GVA_LOG    *zap.Logger
+	GVA_LOG *zap.Logger
 )

+ 6 - 10
server/go.mod

@@ -8,9 +8,8 @@ require (
 	github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751
 	github.com/aliyun/aliyun-oss-go-sdk v2.1.6+incompatible
 	github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f // indirect
-	github.com/casbin/casbin v1.9.1
-	github.com/casbin/casbin/v2 v2.11.0
-	github.com/casbin/gorm-adapter/v3 v3.0.2
+	github.com/casbin/casbin/v2 v2.25.6
+	github.com/casbin/gorm-adapter/v3 v3.2.6
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible
 	github.com/fastly/go-utils v0.0.0-20180712184237-d95a45783239 // indirect
 	github.com/fsnotify/fsnotify v1.4.9
@@ -30,7 +29,6 @@ require (
 	github.com/lestrrat-go/file-rotatelogs v2.3.0+incompatible
 	github.com/lestrrat-go/strftime v1.0.3 // indirect
 	github.com/mailru/easyjson v0.7.1 // indirect
-	github.com/mitchellh/go-homedir v1.1.0
 	github.com/mitchellh/mapstructure v1.2.2 // indirect
 	github.com/mojocn/base64Captcha v1.3.1
 	github.com/onsi/ginkgo v1.7.0 // indirect
@@ -42,8 +40,8 @@ require (
 	github.com/shirou/gopsutil v3.21.1+incompatible
 	github.com/spf13/afero v1.2.2 // indirect
 	github.com/spf13/cast v1.3.1 // indirect
-	github.com/spf13/cobra v1.1.1
 	github.com/spf13/jwalterweatherman v1.1.0 // indirect
+	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/spf13/viper v1.7.0
 	github.com/swaggo/gin-swagger v1.2.0
 	github.com/swaggo/swag v1.6.7
@@ -51,13 +49,11 @@ require (
 	github.com/tencentyun/cos-go-sdk-v5 v0.7.19
 	github.com/unrolled/secure v1.0.7
 	go.uber.org/zap v1.10.0
-	golang.org/x/net v0.0.0-20201224014010-6772e930b67b // indirect
+	golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2 // indirect
 	golang.org/x/tools v0.0.0-20200324003944-a576cf524670 // indirect
 	google.golang.org/protobuf v1.24.0 // indirect
 	gopkg.in/ini.v1 v1.55.0 // indirect
 	gopkg.in/yaml.v2 v2.3.0 // indirect
-	gorm.io/driver/mysql v0.3.0
-	gorm.io/gorm v1.20.9
+	gorm.io/driver/mysql v1.0.1
+	gorm.io/gorm v1.20.7
 )
-
-replace github.com/casbin/gorm-adapter/v3 => github.com/casbin/gorm-adapter/v3 v3.0.2

+ 1 - 1
server/initialize/redis.go

@@ -17,7 +17,7 @@ func Redis() {
 	if err != nil {
 		global.GVA_LOG.Error("redis connect ping failed, err:", zap.Any("err", err))
 	} else {
-		global.GVA_LOG.Info("redis connect ping response:", zap.String("pong",pong))
+		global.GVA_LOG.Info("redis connect ping response:", zap.String("pong", pong))
 		global.GVA_REDIS = client
 	}
 }

+ 4 - 4
server/model/request/sys_dictionary.go

@@ -2,7 +2,7 @@ package request
 
 import "gin-vue-admin/model"
 
-type SysDictionarySearch struct{
-    model.SysDictionary
-    PageInfo
-}
+type SysDictionarySearch struct {
+	model.SysDictionary
+	PageInfo
+}

+ 4 - 4
server/model/request/sys_dictionary_detail.go

@@ -2,7 +2,7 @@ package request
 
 import "gin-vue-admin/model"
 
-type SysDictionaryDetailSearch struct{
-    model.SysDictionaryDetail
-    PageInfo
-}
+type SysDictionaryDetailSearch struct {
+	model.SysDictionaryDetail
+	PageInfo
+}

+ 1 - 1
server/model/sys_authority.go

@@ -14,5 +14,5 @@ type SysAuthority struct {
 	DataAuthorityId []SysAuthority `json:"dataAuthorityId" gorm:"many2many:sys_data_authority_id"`
 	Children        []SysAuthority `json:"children" gorm:"-"`
 	SysBaseMenus    []SysBaseMenu  `json:"menus" gorm:"many2many:sys_authority_menus;"`
-	DefaultRouter   string  		`json:"defaultRouter" gorm:"comment:默认菜单;default:dashboard"`
+	DefaultRouter   string         `json:"defaultRouter" gorm:"comment:默认菜单;default:dashboard"`
 }

+ 1 - 1
server/model/sys_casbin.go

@@ -1,7 +1,7 @@
 package model
 
 type CasbinModel struct {
-	Ptype       string `json:"ptype" gorm:"column:p_type"`
+	Ptype       string `json:"ptype" gorm:"column:ptype"`
 	AuthorityId string `json:"rolename" gorm:"column:v0"`
 	Path        string `json:"path" gorm:"column:v1"`
 	Method      string `json:"method" gorm:"column:v2"`

File diff suppressed because it is too large
+ 0 - 0
server/resource/page/css/index.d8b172cd.css


File diff suppressed because it is too large
+ 0 - 0
server/resource/page/css/index.f05c41c6.css


+ 1 - 0
server/resource/page/css/parser-example.69e16e51.css

@@ -0,0 +1 @@
+.test-form[data-v-77b1aafa]{margin:15px auto;width:800px;padding:15px}

BIN
server/resource/page/img/logo.e1bc3747.png


File diff suppressed because it is too large
+ 0 - 0
server/resource/page/index.html


File diff suppressed because it is too large
+ 0 - 0
server/resource/page/js/chunk-vendors.788511b0.js


File diff suppressed because it is too large
+ 0 - 0
server/resource/page/js/chunk-vendors.9ae0d8fb.js


File diff suppressed because it is too large
+ 0 - 0
server/resource/page/js/index.94d8e405.js


File diff suppressed because it is too large
+ 0 - 0
server/resource/page/js/index.b3720c41.js


File diff suppressed because it is too large
+ 0 - 0
server/resource/page/js/parser-example.c1051310.js


File diff suppressed because it is too large
+ 0 - 0
server/resource/page/js/preview.7fecf17e.js


File diff suppressed because it is too large
+ 0 - 0
server/resource/page/js/preview.d8d06dfd.js


+ 1 - 0
server/resource/page/js/tinymce-example.5a756246.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["tinymce-example"],{a5aa:function(e,t,n){"use strict";n.r(t);var a=function(){var e=this,t=e.$createElement,n=e._self._c||t;return n("div",[n("Tinymce",{attrs:{height:300,placeholder:"在这里输入文字"},model:{value:e.defaultValue,callback:function(t){e.defaultValue=t},expression:"defaultValue"}})],1)},c=[],u=n("31c6"),l={components:{Tinymce:u["a"]},props:{},data:function(){return{defaultValue:"<p>配置文档参阅:http://tinymce.ax-z.cn</p>"}},computed:{},watch:{},created:function(){},mounted:function(){},methods:{}},o=l,i=n("5d22"),d=Object(i["a"])(o,a,c,!1,null,null,null);t["default"]=d.exports}}]);

BIN
server/resource/page/libs/monaco-editor/vs/base/browser/ui/codicons/codicon/codicon.ttf


File diff suppressed because it is too large
+ 5 - 0
server/resource/page/libs/monaco-editor/vs/base/worker/workerMain.js


File diff suppressed because it is too large
+ 6 - 0
server/resource/page/libs/monaco-editor/vs/basic-languages/abap/abap.js


File diff suppressed because it is too large
+ 6 - 0
server/resource/page/libs/monaco-editor/vs/basic-languages/apex/apex.js


+ 7 - 0
server/resource/page/libs/monaco-editor/vs/basic-languages/azcli/azcli.js

@@ -0,0 +1,7 @@
+/*!-----------------------------------------------------------------------------
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * monaco-languages version: 2.3.0(57af10ae0184db4e0f7f9a92ff972629c39ccb53)
+ * Released under the MIT license
+ * https://github.com/Microsoft/monaco-languages/blob/master/LICENSE.md
+ *-----------------------------------------------------------------------------*/
+define("vs/basic-languages/azcli/azcli",["require","exports"],(function(e,t){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.language=t.conf=void 0,t.conf={comments:{lineComment:"#"}},t.language={defaultToken:"keyword",ignoreCase:!0,tokenPostfix:".azcli",str:/[^#\s]/,tokenizer:{root:[{include:"@comment"},[/\s-+@str*\s*/,{cases:{"@eos":{token:"key.identifier",next:"@popall"},"@default":{token:"key.identifier",next:"@type"}}}],[/^-+@str*\s*/,{cases:{"@eos":{token:"key.identifier",next:"@popall"},"@default":{token:"key.identifier",next:"@type"}}}]],type:[{include:"@comment"},[/-+@str*\s*/,{cases:{"@eos":{token:"key.identifier",next:"@popall"},"@default":"key.identifier"}}],[/@str+\s*/,{cases:{"@eos":{token:"string",next:"@popall"},"@default":"string"}}]],comment:[[/#.*$/,{cases:{"@eos":{token:"comment",next:"@popall"}}}]]}}}));

+ 7 - 0
server/resource/page/libs/monaco-editor/vs/basic-languages/bat/bat.js

@@ -0,0 +1,7 @@
+/*!-----------------------------------------------------------------------------
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * monaco-languages version: 2.3.0(57af10ae0184db4e0f7f9a92ff972629c39ccb53)
+ * Released under the MIT license
+ * https://github.com/Microsoft/monaco-languages/blob/master/LICENSE.md
+ *-----------------------------------------------------------------------------*/
+define("vs/basic-languages/bat/bat",["require","exports"],(function(e,s){"use strict";Object.defineProperty(s,"__esModule",{value:!0}),s.language=s.conf=void 0,s.conf={comments:{lineComment:"REM"},brackets:[["{","}"],["[","]"],["(",")"]],autoClosingPairs:[{open:"{",close:"}"},{open:"[",close:"]"},{open:"(",close:")"},{open:'"',close:'"'}],surroundingPairs:[{open:"[",close:"]"},{open:"(",close:")"},{open:'"',close:'"'}],folding:{markers:{start:new RegExp("^\\s*(::\\s*|REM\\s+)#region"),end:new RegExp("^\\s*(::\\s*|REM\\s+)#endregion")}}},s.language={defaultToken:"",ignoreCase:!0,tokenPostfix:".bat",brackets:[{token:"delimiter.bracket",open:"{",close:"}"},{token:"delimiter.parenthesis",open:"(",close:")"},{token:"delimiter.square",open:"[",close:"]"}],keywords:/call|defined|echo|errorlevel|exist|for|goto|if|pause|set|shift|start|title|not|pushd|popd/,symbols:/[=><!~?&|+\-*\/\^;\.,]+/,escapes:/\\(?:[abfnrtv\\"']|x[0-9A-Fa-f]{1,4}|u[0-9A-Fa-f]{4}|U[0-9A-Fa-f]{8})/,tokenizer:{root:[[/^(\s*)(rem(?:\s.*|))$/,["","comment"]],[/(\@?)(@keywords)(?!\w)/,[{token:"keyword"},{token:"keyword.$2"}]],[/[ \t\r\n]+/,""],[/setlocal(?!\w)/,"keyword.tag-setlocal"],[/endlocal(?!\w)/,"keyword.tag-setlocal"],[/[a-zA-Z_]\w*/,""],[/:\w*/,"metatag"],[/%[^%]+%/,"variable"],[/%%[\w]+(?!\w)/,"variable"],[/[{}()\[\]]/,"@brackets"],[/@symbols/,"delimiter"],[/\d*\.\d+([eE][\-+]?\d+)?/,"number.float"],[/0[xX][0-9a-fA-F_]*[0-9a-fA-F]/,"number.hex"],[/\d+/,"number"],[/[;,.]/,"delimiter"],[/"/,"string",'@string."'],[/'/,"string","@string.'"]],string:[[/[^\\"'%]+/,{cases:{"@eos":{token:"string",next:"@popall"},"@default":"string"}}],[/@escapes/,"string.escape"],[/\\./,"string.escape.invalid"],[/%[\w ]+%/,"variable"],[/%%[\w]+(?!\w)/,"variable"],[/["']/,{cases:{"$#==$S2":{token:"string",next:"@pop"},"@default":"string"}}],[/$/,"string","@popall"]]}}}));

File diff suppressed because it is too large
+ 6 - 0
server/resource/page/libs/monaco-editor/vs/basic-languages/cameligo/cameligo.js


File diff suppressed because it is too large
+ 6 - 0
server/resource/page/libs/monaco-editor/vs/basic-languages/clojure/clojure.js


File diff suppressed because it is too large
+ 6 - 0
server/resource/page/libs/monaco-editor/vs/basic-languages/coffee/coffee.js


File diff suppressed because it is too large
+ 6 - 0
server/resource/page/libs/monaco-editor/vs/basic-languages/cpp/cpp.js


File diff suppressed because it is too large
+ 6 - 0
server/resource/page/libs/monaco-editor/vs/basic-languages/csharp/csharp.js


+ 7 - 0
server/resource/page/libs/monaco-editor/vs/basic-languages/csp/csp.js

@@ -0,0 +1,7 @@
+/*!-----------------------------------------------------------------------------
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * monaco-languages version: 2.3.0(57af10ae0184db4e0f7f9a92ff972629c39ccb53)
+ * Released under the MIT license
+ * https://github.com/Microsoft/monaco-languages/blob/master/LICENSE.md
+ *-----------------------------------------------------------------------------*/
+define("vs/basic-languages/csp/csp",["require","exports"],(function(t,e){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.language=e.conf=void 0,e.conf={brackets:[],autoClosingPairs:[],surroundingPairs:[]},e.language={keywords:[],typeKeywords:[],tokenPostfix:".csp",operators:[],symbols:/[=><!~?:&|+\-*\/\^%]+/,escapes:/\\(?:[abfnrtv\\"']|x[0-9A-Fa-f]{1,4}|u[0-9A-Fa-f]{4}|U[0-9A-Fa-f]{8})/,tokenizer:{root:[[/child-src/,"string.quote"],[/connect-src/,"string.quote"],[/default-src/,"string.quote"],[/font-src/,"string.quote"],[/frame-src/,"string.quote"],[/img-src/,"string.quote"],[/manifest-src/,"string.quote"],[/media-src/,"string.quote"],[/object-src/,"string.quote"],[/script-src/,"string.quote"],[/style-src/,"string.quote"],[/worker-src/,"string.quote"],[/base-uri/,"string.quote"],[/plugin-types/,"string.quote"],[/sandbox/,"string.quote"],[/disown-opener/,"string.quote"],[/form-action/,"string.quote"],[/frame-ancestors/,"string.quote"],[/report-uri/,"string.quote"],[/report-to/,"string.quote"],[/upgrade-insecure-requests/,"string.quote"],[/block-all-mixed-content/,"string.quote"],[/require-sri-for/,"string.quote"],[/reflected-xss/,"string.quote"],[/referrer/,"string.quote"],[/policy-uri/,"string.quote"],[/'self'/,"string.quote"],[/'unsafe-inline'/,"string.quote"],[/'unsafe-eval'/,"string.quote"],[/'strict-dynamic'/,"string.quote"],[/'unsafe-hashed-attributes'/,"string.quote"]]}}}));

File diff suppressed because it is too large
+ 6 - 0
server/resource/page/libs/monaco-editor/vs/basic-languages/css/css.js


File diff suppressed because it is too large
+ 6 - 0
server/resource/page/libs/monaco-editor/vs/basic-languages/dart/dart.js


+ 7 - 0
server/resource/page/libs/monaco-editor/vs/basic-languages/dockerfile/dockerfile.js

@@ -0,0 +1,7 @@
+/*!-----------------------------------------------------------------------------
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * monaco-languages version: 2.3.0(57af10ae0184db4e0f7f9a92ff972629c39ccb53)
+ * Released under the MIT license
+ * https://github.com/Microsoft/monaco-languages/blob/master/LICENSE.md
+ *-----------------------------------------------------------------------------*/
+define("vs/basic-languages/dockerfile/dockerfile",["require","exports"],(function(e,o){"use strict";Object.defineProperty(o,"__esModule",{value:!0}),o.language=o.conf=void 0,o.conf={brackets:[["{","}"],["[","]"],["(",")"]],autoClosingPairs:[{open:"{",close:"}"},{open:"[",close:"]"},{open:"(",close:")"},{open:'"',close:'"'},{open:"'",close:"'"}],surroundingPairs:[{open:"{",close:"}"},{open:"[",close:"]"},{open:"(",close:")"},{open:'"',close:'"'},{open:"'",close:"'"}]},o.language={defaultToken:"",tokenPostfix:".dockerfile",variable:/\${?[\w]+}?/,tokenizer:{root:[{include:"@whitespace"},{include:"@comment"},[/(ONBUILD)(\s+)/,["keyword",""]],[/(ENV)(\s+)([\w]+)/,["keyword","",{token:"variable",next:"@arguments"}]],[/(FROM|MAINTAINER|RUN|EXPOSE|ENV|ADD|ARG|VOLUME|LABEL|USER|WORKDIR|COPY|CMD|STOPSIGNAL|SHELL|HEALTHCHECK|ENTRYPOINT)/,{token:"keyword",next:"@arguments"}]],arguments:[{include:"@whitespace"},{include:"@strings"},[/(@variable)/,{cases:{"@eos":{token:"variable",next:"@popall"},"@default":"variable"}}],[/\\/,{cases:{"@eos":"","@default":""}}],[/./,{cases:{"@eos":{token:"",next:"@popall"},"@default":""}}]],whitespace:[[/\s+/,{cases:{"@eos":{token:"",next:"@popall"},"@default":""}}]],comment:[[/(^#.*$)/,"comment","@popall"]],strings:[[/\\'$/,"","@popall"],[/\\'/,""],[/'$/,"string","@popall"],[/'/,"string","@stringBody"],[/"$/,"string","@popall"],[/"/,"string","@dblStringBody"]],stringBody:[[/[^\\\$']/,{cases:{"@eos":{token:"string",next:"@popall"},"@default":"string"}}],[/\\./,"string.escape"],[/'$/,"string","@popall"],[/'/,"string","@pop"],[/(@variable)/,"variable"],[/\\$/,"string"],[/$/,"string","@popall"]],dblStringBody:[[/[^\\\$"]/,{cases:{"@eos":{token:"string",next:"@popall"},"@default":"string"}}],[/\\./,"string.escape"],[/"$/,"string","@popall"],[/"/,"string","@pop"],[/(@variable)/,"variable"],[/\\$/,"string"],[/$/,"string","@popall"]]}}}));

File diff suppressed because it is too large
+ 6 - 0
server/resource/page/libs/monaco-editor/vs/basic-languages/ecl/ecl.js


File diff suppressed because it is too large
+ 6 - 0
server/resource/page/libs/monaco-editor/vs/basic-languages/fsharp/fsharp.js


File diff suppressed because it is too large
+ 6 - 0
server/resource/page/libs/monaco-editor/vs/basic-languages/go/go.js


File diff suppressed because it is too large
+ 6 - 0
server/resource/page/libs/monaco-editor/vs/basic-languages/graphql/graphql.js


File diff suppressed because it is too large
+ 6 - 0
server/resource/page/libs/monaco-editor/vs/basic-languages/handlebars/handlebars.js


File diff suppressed because it is too large
+ 6 - 0
server/resource/page/libs/monaco-editor/vs/basic-languages/hcl/hcl.js


File diff suppressed because it is too large
+ 6 - 0
server/resource/page/libs/monaco-editor/vs/basic-languages/html/html.js


+ 7 - 0
server/resource/page/libs/monaco-editor/vs/basic-languages/ini/ini.js

@@ -0,0 +1,7 @@
+/*!-----------------------------------------------------------------------------
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * monaco-languages version: 2.3.0(57af10ae0184db4e0f7f9a92ff972629c39ccb53)
+ * Released under the MIT license
+ * https://github.com/Microsoft/monaco-languages/blob/master/LICENSE.md
+ *-----------------------------------------------------------------------------*/
+define("vs/basic-languages/ini/ini",["require","exports"],(function(e,n){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.language=n.conf=void 0,n.conf={comments:{lineComment:"#"},brackets:[["{","}"],["[","]"],["(",")"]],autoClosingPairs:[{open:"{",close:"}"},{open:"[",close:"]"},{open:"(",close:")"},{open:'"',close:'"'},{open:"'",close:"'"}],surroundingPairs:[{open:"{",close:"}"},{open:"[",close:"]"},{open:"(",close:")"},{open:'"',close:'"'},{open:"'",close:"'"}]},n.language={defaultToken:"",tokenPostfix:".ini",escapes:/\\(?:[abfnrtv\\"']|x[0-9A-Fa-f]{1,4}|u[0-9A-Fa-f]{4}|U[0-9A-Fa-f]{8})/,tokenizer:{root:[[/^\[[^\]]*\]/,"metatag"],[/(^\w+)(\s*)(\=)/,["key","","delimiter"]],{include:"@whitespace"},[/\d+/,"number"],[/"([^"\\]|\\.)*$/,"string.invalid"],[/'([^'\\]|\\.)*$/,"string.invalid"],[/"/,"string",'@string."'],[/'/,"string","@string.'"]],whitespace:[[/[ \t\r\n]+/,""],[/^\s*[#;].*$/,"comment"]],string:[[/[^\\"']+/,"string"],[/@escapes/,"string.escape"],[/\\./,"string.escape.invalid"],[/["']/,{cases:{"$#==$S2":{token:"string",next:"@pop"},"@default":"string"}}]]}}}));

File diff suppressed because it is too large
+ 6 - 0
server/resource/page/libs/monaco-editor/vs/basic-languages/java/java.js


File diff suppressed because it is too large
+ 6 - 0
server/resource/page/libs/monaco-editor/vs/basic-languages/javascript/javascript.js


File diff suppressed because it is too large
+ 6 - 0
server/resource/page/libs/monaco-editor/vs/basic-languages/julia/julia.js


File diff suppressed because it is too large
+ 6 - 0
server/resource/page/libs/monaco-editor/vs/basic-languages/kotlin/kotlin.js


File diff suppressed because it is too large
+ 6 - 0
server/resource/page/libs/monaco-editor/vs/basic-languages/less/less.js


File diff suppressed because it is too large
+ 6 - 0
server/resource/page/libs/monaco-editor/vs/basic-languages/lexon/lexon.js


File diff suppressed because it is too large
+ 6 - 0
server/resource/page/libs/monaco-editor/vs/basic-languages/lua/lua.js


File diff suppressed because it is too large
+ 6 - 0
server/resource/page/libs/monaco-editor/vs/basic-languages/m3/m3.js


File diff suppressed because it is too large
+ 6 - 0
server/resource/page/libs/monaco-editor/vs/basic-languages/markdown/markdown.js


File diff suppressed because it is too large
+ 6 - 0
server/resource/page/libs/monaco-editor/vs/basic-languages/mips/mips.js


File diff suppressed because it is too large
+ 6 - 0
server/resource/page/libs/monaco-editor/vs/basic-languages/msdax/msdax.js


File diff suppressed because it is too large
+ 6 - 0
server/resource/page/libs/monaco-editor/vs/basic-languages/mysql/mysql.js


File diff suppressed because it is too large
+ 6 - 0
server/resource/page/libs/monaco-editor/vs/basic-languages/objective-c/objective-c.js


File diff suppressed because it is too large
+ 6 - 0
server/resource/page/libs/monaco-editor/vs/basic-languages/pascal/pascal.js


File diff suppressed because it is too large
+ 6 - 0
server/resource/page/libs/monaco-editor/vs/basic-languages/pascaligo/pascaligo.js


File diff suppressed because it is too large
+ 6 - 0
server/resource/page/libs/monaco-editor/vs/basic-languages/perl/perl.js


File diff suppressed because it is too large
+ 6 - 0
server/resource/page/libs/monaco-editor/vs/basic-languages/pgsql/pgsql.js


File diff suppressed because it is too large
+ 6 - 0
server/resource/page/libs/monaco-editor/vs/basic-languages/php/php.js


File diff suppressed because it is too large
+ 6 - 0
server/resource/page/libs/monaco-editor/vs/basic-languages/postiats/postiats.js


File diff suppressed because it is too large
+ 6 - 0
server/resource/page/libs/monaco-editor/vs/basic-languages/powerquery/powerquery.js


File diff suppressed because it is too large
+ 6 - 0
server/resource/page/libs/monaco-editor/vs/basic-languages/powershell/powershell.js


File diff suppressed because it is too large
+ 6 - 0
server/resource/page/libs/monaco-editor/vs/basic-languages/pug/pug.js


File diff suppressed because it is too large
+ 6 - 0
server/resource/page/libs/monaco-editor/vs/basic-languages/python/python.js


File diff suppressed because it is too large
+ 6 - 0
server/resource/page/libs/monaco-editor/vs/basic-languages/r/r.js


File diff suppressed because it is too large
+ 6 - 0
server/resource/page/libs/monaco-editor/vs/basic-languages/razor/razor.js


File diff suppressed because it is too large
+ 6 - 0
server/resource/page/libs/monaco-editor/vs/basic-languages/redis/redis.js


File diff suppressed because it is too large
+ 6 - 0
server/resource/page/libs/monaco-editor/vs/basic-languages/redshift/redshift.js


File diff suppressed because it is too large
+ 6 - 0
server/resource/page/libs/monaco-editor/vs/basic-languages/restructuredtext/restructuredtext.js


File diff suppressed because it is too large
+ 6 - 0
server/resource/page/libs/monaco-editor/vs/basic-languages/ruby/ruby.js


File diff suppressed because it is too large
+ 6 - 0
server/resource/page/libs/monaco-editor/vs/basic-languages/rust/rust.js


+ 7 - 0
server/resource/page/libs/monaco-editor/vs/basic-languages/sb/sb.js

@@ -0,0 +1,7 @@
+/*!-----------------------------------------------------------------------------
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * monaco-languages version: 2.3.0(57af10ae0184db4e0f7f9a92ff972629c39ccb53)
+ * Released under the MIT license
+ * https://github.com/Microsoft/monaco-languages/blob/master/LICENSE.md
+ *-----------------------------------------------------------------------------*/
+define("vs/basic-languages/sb/sb",["require","exports"],(function(e,o){"use strict";Object.defineProperty(o,"__esModule",{value:!0}),o.language=o.conf=void 0,o.conf={comments:{lineComment:"'"},brackets:[["(",")"],["[","]"],["If","EndIf"],["While","EndWhile"],["For","EndFor"],["Sub","EndSub"]],autoClosingPairs:[{open:'"',close:'"',notIn:["string","comment"]},{open:"(",close:")",notIn:["string","comment"]},{open:"[",close:"]",notIn:["string","comment"]}]},o.language={defaultToken:"",tokenPostfix:".sb",ignoreCase:!0,brackets:[{token:"delimiter.array",open:"[",close:"]"},{token:"delimiter.parenthesis",open:"(",close:")"},{token:"keyword.tag-if",open:"If",close:"EndIf"},{token:"keyword.tag-while",open:"While",close:"EndWhile"},{token:"keyword.tag-for",open:"For",close:"EndFor"},{token:"keyword.tag-sub",open:"Sub",close:"EndSub"}],keywords:["Else","ElseIf","EndFor","EndIf","EndSub","EndWhile","For","Goto","If","Step","Sub","Then","To","While"],tagwords:["If","Sub","While","For"],operators:[">","<","<>","<=",">=","And","Or","+","-","*","/","="],identifier:/[a-zA-Z_][\w]*/,symbols:/[=><:+\-*\/%\.,]+/,escapes:/\\(?:[abfnrtv\\"']|x[0-9A-Fa-f]{1,4}|u[0-9A-Fa-f]{4}|U[0-9A-Fa-f]{8})/,tokenizer:{root:[{include:"@whitespace"},[/(@identifier)(?=[.])/,"type"],[/@identifier/,{cases:{"@keywords":{token:"keyword.$0"},"@operators":"operator","@default":"variable.name"}}],[/([.])(@identifier)/,{cases:{$2:["delimiter","type.member"],"@default":""}}],[/\d*\.\d+/,"number.float"],[/\d+/,"number"],[/[()\[\]]/,"@brackets"],[/@symbols/,{cases:{"@operators":"operator","@default":"delimiter"}}],[/"([^"\\]|\\.)*$/,"string.invalid"],[/"/,"string","@string"]],whitespace:[[/[ \t\r\n]+/,""],[/(\').*$/,"comment"]],string:[[/[^\\"]+/,"string"],[/@escapes/,"string.escape"],[/\\./,"string.escape.invalid"],[/"C?/,"string","@pop"]]}}}));

File diff suppressed because it is too large
+ 6 - 0
server/resource/page/libs/monaco-editor/vs/basic-languages/scala/scala.js


+ 7 - 0
server/resource/page/libs/monaco-editor/vs/basic-languages/scheme/scheme.js

@@ -0,0 +1,7 @@
+/*!-----------------------------------------------------------------------------
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * monaco-languages version: 2.3.0(57af10ae0184db4e0f7f9a92ff972629c39ccb53)
+ * Released under the MIT license
+ * https://github.com/Microsoft/monaco-languages/blob/master/LICENSE.md
+ *-----------------------------------------------------------------------------*/
+define("vs/basic-languages/scheme/scheme",["require","exports"],(function(e,o){"use strict";Object.defineProperty(o,"__esModule",{value:!0}),o.language=o.conf=void 0,o.conf={comments:{lineComment:";",blockComment:["#|","|#"]},brackets:[["(",")"],["{","}"],["[","]"]],autoClosingPairs:[{open:"{",close:"}"},{open:"[",close:"]"},{open:"(",close:")"},{open:'"',close:'"'}],surroundingPairs:[{open:"{",close:"}"},{open:"[",close:"]"},{open:"(",close:")"},{open:'"',close:'"'}]},o.language={defaultToken:"",ignoreCase:!0,tokenPostfix:".scheme",brackets:[{open:"(",close:")",token:"delimiter.parenthesis"},{open:"{",close:"}",token:"delimiter.curly"},{open:"[",close:"]",token:"delimiter.square"}],keywords:["case","do","let","loop","if","else","when","cons","car","cdr","cond","lambda","lambda*","syntax-rules","format","set!","quote","eval","append","list","list?","member?","load"],constants:["#t","#f"],operators:["eq?","eqv?","equal?","and","or","not","null?"],tokenizer:{root:[[/#[xXoObB][0-9a-fA-F]+/,"number.hex"],[/[+-]?\d+(?:(?:\.\d*)?(?:[eE][+-]?\d+)?)?/,"number.float"],[/(?:\b(?:(define|define-syntax|define-macro))\b)(\s+)((?:\w|\-|\!|\?)*)/,["keyword","white","variable"]],{include:"@whitespace"},{include:"@strings"},[/[a-zA-Z_#][a-zA-Z0-9_\-\?\!\*]*/,{cases:{"@keywords":"keyword","@constants":"constant","@operators":"operators","@default":"identifier"}}]],comment:[[/[^\|#]+/,"comment"],[/#\|/,"comment","@push"],[/\|#/,"comment","@pop"],[/[\|#]/,"comment"]],whitespace:[[/[ \t\r\n]+/,"white"],[/#\|/,"comment","@comment"],[/;.*$/,"comment"]],strings:[[/"$/,"string","@popall"],[/"(?=.)/,"string","@multiLineString"]],multiLineString:[[/[^\\"]+$/,"string","@popall"],[/[^\\"]+/,"string"],[/\\./,"string.escape"],[/"/,"string","@popall"],[/\\$/,"string"]]}}}));

File diff suppressed because it is too large
+ 6 - 0
server/resource/page/libs/monaco-editor/vs/basic-languages/scss/scss.js


File diff suppressed because it is too large
+ 6 - 0
server/resource/page/libs/monaco-editor/vs/basic-languages/shell/shell.js


File diff suppressed because it is too large
+ 6 - 0
server/resource/page/libs/monaco-editor/vs/basic-languages/solidity/solidity.js


File diff suppressed because it is too large
+ 6 - 0
server/resource/page/libs/monaco-editor/vs/basic-languages/sophia/sophia.js


File diff suppressed because it is too large
+ 6 - 0
server/resource/page/libs/monaco-editor/vs/basic-languages/sql/sql.js


File diff suppressed because it is too large
+ 6 - 0
server/resource/page/libs/monaco-editor/vs/basic-languages/st/st.js


File diff suppressed because it is too large
+ 9 - 0
server/resource/page/libs/monaco-editor/vs/basic-languages/swift/swift.js


File diff suppressed because it is too large
+ 6 - 0
server/resource/page/libs/monaco-editor/vs/basic-languages/systemverilog/systemverilog.js


Some files were not shown because too many files changed in this diff