Merge branch 'develop' into test_branch

README.md

@@ -18,6 +18,8 @@
 
 [vue3版本分支地址:https://github.com/flipped-aurora/gin-vue-admin/tree/vue3Develop](https://github.com/flipped-aurora/gin-vue-admin/tree/vue3Develop)
 
+[审批流分支:https://github.com/flipped-aurora/gin-vue-admin/tree/gva_workflow](https://github.com/flipped-aurora/gin-vue-admin/tree/gva_workflow)
+
 # 项目文档
 [在线文档](https://www.gin-vue-admin.com/) : https://www.gin-vue-admin.com/
 
@@ -139,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)

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@[email protected]"

server/README.md

@@ -0,0 +1,44 @@
+
+整理代码结构
+``` lua
+web
+├── api/v1 -- 主要API
+|   ├── sys_initdb.go -- ico
+|   └── sys_user.go --  
+├── config -- 配置文件 设定操作的结构体
+|   ├── auto_code.go -- ico captcha.go
+|   ├── ... -- ico captcha.go
+|   └── zap.go -- core
+├── core -- 主要结构代码
+|   ├── server_other.go -- ico captcha.go
+|   ├── ... -- ico captcha.go
+|   └── zap.go -- 
+├── docs -- 文档系统
+|   ├── docs.go -- ico captcha.go
+|   ├── swagger.json -- json
+|   └── swagger.yaml -- yaml  
+├── global -- global
+├── initialize -- initialize 
+├── middleware -- 中间键
+├── model -- global
+│   ├── request  -- 所有请求model结构体
+|   |   ├── common.go 
+|   |   ├── ...
+|   |   └── sys_user.go -- yaml  
+|   ├── response  -- 返回数据
+|   |   ├── common.go 
+|   |   ├── ...
+|   |   └── sys_user.go -- yaml  
+├── packfile -- 文件写入
+├── resource -- 资源文件
+├── router -- 路由
+├── service -- service层
+├── source -- 文件目录操作 
+├── utils
+├── config.yaml  -- 
+├── Dockerfile  -- docker配置
+├── go.mod    -- mod 配置
+├── go.sum -- sum
+├── latest_log  -- vue-cli 配置
+└── main.go  -- package.json
+```

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)
 	}

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)
 	}
 }
 

server/api/v1/sys_api.go

@@ -7,6 +7,7 @@ import (
 	"gin-vue-admin/model/response"
 	"gin-vue-admin/service"
 	"gin-vue-admin/utils"
+
 	"github.com/gin-gonic/gin"
 	"go.uber.org/zap"
 )
@@ -100,7 +101,7 @@ func GetApiById(c *gin.Context) {
 		response.FailWithMessage(err.Error(), c)
 		return
 	}
-	err, api := service.GetApiById(idInfo.Id)
+	err, api := service.GetApiById(idInfo.ID)
 	if err != nil {
 		global.GVA_LOG.Error("获取失败!", zap.Any("err", err))
 		response.FailWithMessage("获取失败", c)
@@ -147,3 +148,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)
+	}
+}

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)
 }
-

server/api/v1/sys_menu.go

@@ -7,6 +7,7 @@ import (
 	"gin-vue-admin/model/response"
 	"gin-vue-admin/service"
 	"gin-vue-admin/utils"
+
 	"github.com/gin-gonic/gin"
 	"go.uber.org/zap"
 )
@@ -132,7 +133,7 @@ func DeleteBaseMenu(c *gin.Context) {
 		response.FailWithMessage(err.Error(), c)
 		return
 	}
-	if err := service.DeleteBaseMenu(menu.Id); err != nil {
+	if err := service.DeleteBaseMenu(menu.ID); err != nil {
 		global.GVA_LOG.Error("删除失败!", zap.Any("err", err))
 		response.FailWithMessage("删除失败", c)
 	} else {
@@ -182,7 +183,7 @@ func GetBaseMenuById(c *gin.Context) {
 		response.FailWithMessage(err.Error(), c)
 		return
 	}
-	if err, menu := service.GetBaseMenuById(idInfo.Id); err != nil {
+	if err, menu := service.GetBaseMenuById(idInfo.ID); err != nil {
 		global.GVA_LOG.Error("获取失败!", zap.Any("err", err))
 		response.FailWithMessage("获取失败", c)
 	} else {
@@ -214,6 +215,6 @@ func GetMenuList(c *gin.Context) {
 			Total:    total,
 			Page:     pageInfo.Page,
 			PageSize: pageInfo.PageSize,
-		},"获取成功", c)
+		}, "获取成功", c)
 	}
-}
+}

server/api/v1/sys_user.go

@@ -8,11 +8,12 @@ import (
 	"gin-vue-admin/model/response"
 	"gin-vue-admin/service"
 	"gin-vue-admin/utils"
+	"time"
+
 	"github.com/dgrijalva/jwt-go"
 	"github.com/gin-gonic/gin"
 	"github.com/go-redis/redis"
 	"go.uber.org/zap"
-	"time"
 )
 
 // @Tags Base
@@ -217,11 +218,11 @@ func DeleteUser(c *gin.Context) {
 		return
 	}
 	jwtId := getUserID(c)
-	if jwtId == uint(reqId.Id) {
+	if jwtId == uint(reqId.ID) {
 		response.FailWithMessage("删除失败, 自杀失败", c)
 		return
 	}
-	if err := service.DeleteUser(reqId.Id); err != nil {
+	if err := service.DeleteUser(reqId.ID); err != nil {
 		global.GVA_LOG.Error("删除失败!", zap.Any("err", err))
 		response.FailWithMessage("删除失败", c)
 	} else {

server/api/v1/wk_process.go

@@ -1,258 +0,0 @@
-package v1
-
-import (
-	"fmt"
-	"gin-vue-admin/global"
-	"gin-vue-admin/model"
-	"gin-vue-admin/model/request"
-	"gin-vue-admin/model/response"
-	"gin-vue-admin/service"
-	"github.com/gin-gonic/gin"
-)
-
-// @Tags WorkflowProcess
-// @Summary 创建WorkflowProcess
-// @Security ApiKeyAuth
-// @accept application/json
-// @Produce application/json
-// @Param data body model.WorkflowProcess true "创建WorkflowProcess"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
-// @Router /workflowProcess/createWorkflowProcess [post]
-func CreateWorkflowProcess(c *gin.Context) {
-	var workflowProcess model.WorkflowProcess
-	_ = c.ShouldBindJSON(&workflowProcess)
-	err := service.CreateWorkflowProcess(workflowProcess)
-	if err != nil {
-		response.FailWithMessage(fmt.Sprintf("创建失败，%v", err), c)
-	} else {
-		response.OkWithMessage("创建成功", c)
-	}
-}
-
-// @Tags WorkflowProcess
-// @Summary 删除WorkflowProcess
-// @Security ApiKeyAuth
-// @accept application/json
-// @Produce application/json
-// @Param data body model.WorkflowProcess true "删除WorkflowProcess"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"删除成功"}"
-// @Router /workflowProcess/deleteWorkflowProcess [delete]
-func DeleteWorkflowProcess(c *gin.Context) {
-	var workflowProcess model.WorkflowProcess
-	_ = c.ShouldBindJSON(&workflowProcess)
-	err := service.DeleteWorkflowProcess(workflowProcess)
-	if err != nil {
-		response.FailWithMessage(fmt.Sprintf("删除失败，%v", err), c)
-	} else {
-		response.OkWithMessage("删除成功", c)
-	}
-}
-
-// @Tags WorkflowProcess
-// @Summary 批量删除WorkflowProcess
-// @Security ApiKeyAuth
-// @accept application/json
-// @Produce application/json
-// @Param data body request.IdsReq true "批量删除WorkflowProcess"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"删除成功"}"
-// @Router /workflowProcess/deleteWorkflowProcessByIds [delete]
-func DeleteWorkflowProcessByIds(c *gin.Context) {
-	var IDS request.IdsReq
-	_ = c.ShouldBindJSON(&IDS)
-	err := service.DeleteWorkflowProcessByIds(IDS)
-	if err != nil {
-		response.FailWithMessage(fmt.Sprintf("删除失败，%v", err), c)
-	} else {
-		response.OkWithMessage("删除成功", c)
-	}
-}
-
-// @Tags WorkflowProcess
-// @Summary 更新WorkflowProcess
-// @Security ApiKeyAuth
-// @accept application/json
-// @Produce application/json
-// @Param data body model.WorkflowProcess true "更新WorkflowProcess"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"更新成功"}"
-// @Router /workflowProcess/updateWorkflowProcess [put]
-func UpdateWorkflowProcess(c *gin.Context) {
-	var workflowProcess model.WorkflowProcess
-	_ = c.ShouldBindJSON(&workflowProcess)
-	err := service.UpdateWorkflowProcess(&workflowProcess)
-	if err != nil {
-		response.FailWithMessage(fmt.Sprintf("更新失败，%v", err), c)
-	} else {
-		response.OkWithMessage("更新成功", c)
-	}
-}
-
-// @Tags WorkflowProcess
-// @Summary 用id查询WorkflowProcess
-// @Security ApiKeyAuth
-// @accept application/json
-// @Produce application/json
-// @Param data body model.WorkflowProcess true "用id查询WorkflowProcess"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"查询成功"}"
-// @Router /workflowProcess/findWorkflowProcess [get]
-func FindWorkflowProcess(c *gin.Context) {
-	var workflowProcess model.WorkflowProcess
-	_ = c.ShouldBindQuery(&workflowProcess)
-	err, reworkflowProcess := service.GetWorkflowProcess(workflowProcess.ID)
-	if err != nil {
-		response.FailWithMessage(fmt.Sprintf("查询失败，%v", err), c)
-	} else {
-		response.OkWithData(gin.H{"reworkflowProcess": reworkflowProcess}, c)
-	}
-}
-
-// @Tags WorkflowProcess
-// @Summary 用id查询工作流步骤
-// @Security ApiKeyAuth
-// @accept application/json
-// @Produce application/json
-// @Param data body model.WorkflowProcess true "用id查询WorkflowProcess"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"查询成功"}"
-// @Router /workflowProcess/findWorkflowStep [get]
-func FindWorkflowStep(c *gin.Context) {
-	var workflowProcess model.WorkflowProcess
-	_ = c.ShouldBindQuery(&workflowProcess)
-	err, workflow := service.FindWorkflowStep(workflowProcess.ID)
-	if err != nil {
-		response.FailWithMessage(fmt.Sprintf("查询失败，%v", err), c)
-	} else {
-		response.OkWithData(gin.H{"workflow": workflow}, c)
-	}
-}
-
-// @Tags WorkflowProcess
-// @Summary 分页获取WorkflowProcess列表
-// @Security ApiKeyAuth
-// @accept application/json
-// @Produce application/json
-// @Param data body request.WorkflowProcessSearch true "分页获取WorkflowProcess列表"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
-// @Router /workflowProcess/getWorkflowProcessList [get]
-func GetWorkflowProcessList(c *gin.Context) {
-	var pageInfo request.WorkflowProcessSearch
-	_ = c.ShouldBindQuery(&pageInfo)
-	err, list, total := service.GetWorkflowProcessInfoList(pageInfo)
-	if err != nil {
-		response.FailWithMessage(fmt.Sprintf("获取数据失败，%v", err), c)
-	} else {
-		response.OkWithData(response.PageResult{
-			List:     list,
-			Total:    total,
-			Page:     pageInfo.Page,
-			PageSize: pageInfo.PageSize,
-		}, c)
-	}
-}
-
-// @Tags WorkflowProcess
-// @Summary 开启工作流
-// @Security ApiKeyAuth
-// @accept application/json
-// @Produce application/json
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
-// @Router /workflowProcess/startWorkflow [post]
-func StartWorkflow(c *gin.Context) {
-	business := c.Query("businessType")
-	wfInfo := model.WorkflowBusinessStruct[business]()
-	c.ShouldBindJSON(wfInfo)
-	err := service.StartWorkflow(wfInfo)
-	if err != nil {
-		response.FailWithMessage(err.Error(), c)
-		return
-	}
-	response.OkWithMessage("启动成功", c)
-}
-
-// @Tags WorkflowProcess
-// @Summary 提交工作流
-// @Security ApiKeyAuth
-// @accept application/json
-// @Produce application/json
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
-// @Router /workflowProcess/completeWorkflowMove [post]
-func CompleteWorkflowMove(c *gin.Context) {
-	business := c.Query("businessType")
-	wfInfo := model.WorkflowBusinessStruct[business]()
-	c.ShouldBindJSON(wfInfo)
-	err := service.CompleteWorkflowMove(wfInfo)
-	if err != nil {
-		response.FailWithMessage(err.Error(), c)
-		return
-	}
-	response.OkWithMessage("启动成功", c)
-}
-
-// @Tags WorkflowProcess
-// @Summary 我发起的工作流
-// @Security ApiKeyAuth
-// @accept application/json
-// @Produce application/json
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
-// @Router /workflowProcess/getMyStated [get]
-func GetMyStated(c *gin.Context) {
-	if claims, exists := c.Get("claims"); !exists {
-		errStr := "从Gin的Context中获取从jwt解析出来的用户ID失败, 请检查路由是否使用jwt中间件"
-		global.GVA_LOG.Error(errStr)
-		response.FailWithMessage(errStr, c)
-	} else {
-		waitUse := claims.(*request.CustomClaims)
-		err, wfms := service.GetMyStated(waitUse.ID)
-		if err != nil {
-			errStr := err.Error()
-			global.GVA_LOG.Error(errStr)
-			response.FailWithMessage(errStr, c)
-			return
-		}
-		response.OkWithData(gin.H{"wfms": wfms}, c)
-	}
-}
-
-// @Tags WorkflowProcess
-// @Summary 我的待办
-// @Security ApiKeyAuth
-// @accept application/json
-// @Produce application/json
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
-// @Router /workflowProcess/getMyNeed [get]
-func GetMyNeed(c *gin.Context) {
-	if claims, exists := c.Get("claims"); !exists {
-		errStr := "从Gin的Context中获取从jwt解析出来的用户ID失败, 请检查路由是否使用jwt中间件"
-		global.GVA_LOG.Error(errStr)
-		response.FailWithMessage(errStr, c)
-	} else {
-		waitUse := claims.(*request.CustomClaims)
-		err, wfms := service.GetMyNeed(waitUse.ID, waitUse.AuthorityId)
-		if err != nil {
-			errStr := err.Error()
-			global.GVA_LOG.Error(errStr)
-			response.FailWithMessage(errStr, c)
-			return
-		}
-		response.OkWithData(gin.H{"wfms": wfms}, c)
-	}
-}
-
-// @Tags WorkflowProcess
-// @Summary 根据id获取当前节点详情和历史
-// @Security ApiKeyAuth
-// @accept application/json
-// @Produce application/json
-// @Param data body request.GetById true "根据id获取当前节点详情和过往"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
-// @Router /workflowProcess/getWorkflowMoveByID [get]
-func GetWorkflowMoveByID(c *gin.Context) {
-	var req request.GetById
-	_ = c.ShouldBindQuery(&req)
-	err, move, moves, business := service.GetWorkflowMoveByID(req.Id)
-	if err != nil {
-		errStr := err.Error()
-		global.GVA_LOG.Error(errStr)
-		response.FailWithMessage(errStr, c)
-		return
-	}
-	response.OkWithData(gin.H{"move": move, "moves": moves, "business": business}, c)
-}

server/config.yaml

@@ -64,25 +64,26 @@ mysql:
   log-mode: false
   log-zap: ""
 
-autoCode:
-  root: ''
-  server: '/server'
-  server-api: '/api/v1'
-  server-model: '/model'
-  server-request: '/model/request/'
-  server-router: '/router'
-  server-service: '/service'
-
-  web: '/web/src'
-  web-api: '/api'
-  web-form: '/view'
-  web-table: '/view'
-  web-flow: '/view'
-
 # local configuration
 local:
   path: 'uploads/file'
 
+# autocode configuration
+autocode:
+  root: ""
+  server: /server
+  server-api: /api/v1
+  server-initialize: /initialize
+  server-model: /model
+  server-request: /model/request/
+  server-router: /router
+  server-service: /service
+  web: /web/src
+  web-api: /api
+  web-flow: /view
+  web-form: /view
+  web-table: /view
+
 # qiniu configuration (请自行七牛申请对应的 公钥 私钥 bucket �?域名地址)
 qiniu:
   zone: 'ZoneHuadong'

server/config/auto_code.go

@@ -1,16 +1,17 @@
 package config
 
 type Autocode struct {
-	Root     string `mapstructure:"root" json:"root" yaml:"root"`
-	Server   string `mapstructure:"server" json:"server" yaml:"server"`
-	SApi     string `mapstructure:"server-api" json:"serverApi" yaml:"server-api"`
-	SModel   string `mapstructure:"server-model" json:"serverModel" yaml:"server-model"`
-	SRequest string `mapstructure:"server-request" json:"serverRequest"  yaml:"server-request"`
-	SRouter  string `mapstructure:"server-router" json:"serverRouter" yaml:"server-router"`
-	SService string `mapstructure:"server-service" json:"serverService" yaml:"server-service"`
-	Web      string `mapstructure:"web" json:"web" yaml:"web"`
-	WApi     string `mapstructure:"web-api" json:"webApi" yaml:"web-api"`
-	WForm    string `mapstructure:"web-form" json:"webForm" yaml:"web-form"`
-	WTable   string `mapstructure:"web-table" json:"webTable" yaml:"web-table"`
-	WFlow    string `mapstructure:"web-flow" json:"webFlow" yaml:"web-flow"`
+	Root        string `mapstructure:"root" json:"root" yaml:"root"`
+	Server      string `mapstructure:"server" json:"server" yaml:"server"`
+	SApi        string `mapstructure:"server-api" json:"serverApi" yaml:"server-api"`
+	SInitialize string `mapstructure:"server-initialize" json:"serverInitialize" yaml:"server-initialize"`
+	SModel      string `mapstructure:"server-model" json:"serverModel" yaml:"server-model"`
+	SRequest    string `mapstructure:"server-request" json:"serverRequest"  yaml:"server-request"`
+	SRouter     string `mapstructure:"server-router" json:"serverRouter" yaml:"server-router"`
+	SService    string `mapstructure:"server-service" json:"serverService" yaml:"server-service"`
+	Web         string `mapstructure:"web" json:"web" yaml:"web"`
+	WApi        string `mapstructure:"web-api" json:"webApi" yaml:"web-api"`
+	WForm       string `mapstructure:"web-form" json:"webForm" yaml:"web-form"`
+	WTable      string `mapstructure:"web-table" json:"webTable" yaml:"web-table"`
+	WFlow       string `mapstructure:"web-flow" json:"webFlow" yaml:"web-flow"`
 }

server/config/config.go

@@ -8,7 +8,7 @@ type Server struct {
 	Casbin  Casbin  `mapstructure:"casbin" json:"casbin" yaml:"casbin"`
 	System  System  `mapstructure:"system" json:"system" yaml:"system"`
 	Captcha Captcha `mapstructure:"captcha" json:"captcha" yaml:"captcha"`
-	// aoto
+	// auto
 	AutoCode Autocode `mapstructure:"autoCode" json:"autoCode" yaml:"autoCode"`
 	// gorm
 	Mysql Mysql `mapstructure:"mysql" json:"mysql" yaml:"mysql"`

server/config/excel.go

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

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
-}
+}

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"`
-}
+}

server/constant/workflow.go

@@ -1,19 +0,0 @@
-package constant
-
-//定义clazz常量
-
-const (
-	USER_TASK string = "userTask" // 审批节点
-	//SCRIPT_TASK       string = "scriptTask"  //脚本节点
-	//RECEIVE_TASK      string = "receiveTask"
-	//MAIL_TASK         string = "mailTask" //邮件节点
-	//TIMER_START       string = "timerStart" // 定时节点
-	//MESSAGE_START     string = "messageStart" // 消息节点
-	EXCLUSIVE_GATEWAY string = "exclusiveGateway" // 排他网关
-	INCLUSIVE_GATEWAY string = "inclusiveGateway" // 包容网关
-	PARELLEL_GATEWAY  string = "parallelGateway"  // 并行网关
-	FLOW              string = "flow"             // 连线
-	START             string = "start"            // 开始节点
-	END               string = "end"              // 结束节点
-	//PROCESS           string = "process" // 基础节点
-)

server/core/server.go

@@ -17,7 +17,6 @@ func RunWindowsServer() {
 		// 初始化redis服务
 		initialize.Redis()
 	}
-	initialize.InitWkMode()
 	Router := initialize.Routers()
 	Router.Static("/form-generator", "./resource/page")
 
@@ -30,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

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
-}
+}

server/core/server_win.go

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

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

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
 )

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

server/initialize/gorm.go

@@ -48,13 +48,9 @@ func MysqlTables(db *gorm.DB) {
 		model.ExaSimpleUploader{},
 		model.ExaCustomer{},
 		model.SysOperationRecord{},
-		model.WorkflowProcess{},
-		model.WorkflowNode{},
-		model.WorkflowEdge{},
-		model.WorkflowStartPoint{},
-		model.WorkflowEndPoint{},
-		model.WorkflowMove{},
-		model.ExaWfLeave{},
+
+		// Code generated by gin-vue-admin Begin; DO NOT EDIT.
+		// Code generated by gin-vue-admin End; DO NOT EDIT.
 	)
 	if err != nil {
 		global.GVA_LOG.Error("register table failed", zap.Any("err", err))

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
 	}
 }

server/initialize/router.go

@@ -28,7 +28,7 @@ func Routers() *gin.Engine {
 	PublicGroup := Router.Group("")
 	{
 		router.InitBaseRouter(PublicGroup) // 注册基础功能路由 不做鉴权
-		router.InitInitRouter(PublicGroup)  // 自动初始化相关
+		router.InitInitRouter(PublicGroup) // 自动初始化相关
 	}
 	PrivateGroup := Router.Group("")
 	PrivateGroup.Use(middleware.JWTAuth()).Use(middleware.CasbinHandler())
@@ -48,8 +48,10 @@ func Routers() *gin.Engine {
 		router.InitSysOperationRecordRouter(PrivateGroup)    // 操作记录
 		router.InitSysDictionaryDetailRouter(PrivateGroup)   // 字典详情管理
 		router.InitFileUploadAndDownloadRouter(PrivateGroup) // 文件上传下载功能路由
-		router.InitWorkflowProcessRouter(PrivateGroup)       // 工作流相关接口
 		router.InitExcelRouter(PrivateGroup)                 // 表格导入导出
+
+		// Code generated by gin-vue-admin Begin; DO NOT EDIT.
+		// Code generated by gin-vue-admin End; DO NOT EDIT.
 	}
 	global.GVA_LOG.Info("router register success")
 	return Router

server/initialize/workflow.go

@@ -1,22 +0,0 @@
-package initialize
-
-import "gin-vue-admin/model"
-
-func initWorkflowModel() {
-	model.WorkflowBusinessStruct = make(map[string]func() model.GVA_Workflow)
-	model.WorkflowBusinessStruct["leave"] = func() model.GVA_Workflow {
-		return new(model.ExaWfLeaveWorkflow)
-	}
-}
-
-func initWorkflowTable() {
-	model.WorkflowBusinessTable = make(map[string]func() interface{})
-	model.WorkflowBusinessTable["leave"] = func() interface{} {
-		return new(model.ExaWfLeave)
-	}
-}
-
-func InitWkMode() {
-	initWorkflowModel()
-	initWorkflowTable()
-}

server/model/exa_wf_leave.go

@@ -1,25 +0,0 @@
-// 自动生成模板ExaWfLeave
-package model
-
-import (
-	"gin-vue-admin/global"
-	"time"
-)
-
-// 如果含有time.Time 请自行import time包
-type ExaWfLeave struct {
-	global.GVA_MODEL
-	Cause     string    `json:"cause" form:"cause" gorm:"column:cause;comment:"`
-	StartTime time.Time `json:"startTime" form:"startTime" gorm:"column:start_time;comment:"`
-	EndTime   time.Time `json:"endTime" form:"endTime" gorm:"column:end_time;comment:"`
-}
-
-type ExaWfLeaveWorkflow struct {
-	// 工作流操作结构体
-	WorkflowBase `json:"wf"`
-	ExaWfLeave   `json:"business"`
-}
-
-func (ExaWfLeave) TableName() string {
-	return "exa_wf_leaves"
-}

server/model/request/common.go

@@ -8,7 +8,7 @@ type PageInfo struct {
 
 // Find by id structure
 type GetById struct {
-	Id float64 `json:"id" form:"id"`
+	ID float64 `json:"id" form:"id"`
 }
 
 type IdsReq struct {

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
+}

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
+}

server/model/request/sys_workflow.go

@@ -1,8 +0,0 @@
-package request
-
-import "gin-vue-admin/model"
-
-type WorkflowProcessSearch struct {
-	model.WorkflowProcess
-	PageInfo
-}

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"`
 }

server/model/sys_auto_code.go

@@ -4,14 +4,14 @@ import "errors"
 
 // 初始版本自动化代码工具
 type AutoCodeStruct struct {
-	StructName         string  `json:"structName"`
-	TableName          string  `json:"tableName"`
-	PackageName        string  `json:"packageName"`
-	Abbreviation       string  `json:"abbreviation"`
-	Description        string  `json:"description"`
-	AutoCreateApiToSql bool    `json:"autoCreateApiToSql"`
-	AutoMoveFile       bool    `json:"autoMoveFile"`
-	Fields             []Field `json:"fields"`
+	StructName         string   `json:"structName"`
+	TableName          string   `json:"tableName"`
+	PackageName        string   `json:"packageName"`
+	Abbreviation       string   `json:"abbreviation"`
+	Description        string   `json:"description"`
+	AutoCreateApiToSql bool     `json:"autoCreateApiToSql"`
+	AutoMoveFile       bool     `json:"autoMoveFile"`
+	Fields             []*Field `json:"fields"`
 }
 
 type Field struct {

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"`

server/model/sys_workflow.go

@@ -1,155 +0,0 @@
-package model
-
-import (
-	"gin-vue-admin/global"
-	"gorm.io/gorm"
-	"time"
-)
-
-var WorkflowBusinessStruct map[string]func() GVA_Workflow
-var WorkflowBusinessTable map[string]func() interface{}
-
-type GVA_Workflow interface {
-	CreateWorkflowMove() *WorkflowMove
-	GetBusinessType() string
-	GetBusinessID() uint
-	GetWorkflowBase() WorkflowBase
-}
-
-type WorkflowBase struct {
-	WorkflowMoveID    uint   `json:"workflowMoveID" gorm:"-"`
-	BusinessID        uint   `json:"businessID" gorm:"<-:false;column:id"` // 业务对应ID（businessID）的返回
-	BusinessType      string `json:"businessType" gorm:"-"`
-	PromoterID        uint   `json:"promoterID" gorm:"-"`
-	OperatorID        uint   `json:"operatorID" gorm:"-"`
-	WorkflowProcessID string `json:"workflowProcessID" gorm:"-"`
-	WorkflowNodeID    string `json:"workflowNodeID" gorm:"-"`
-	Param             string `json:"param" gorm:"-"`
-	Action            string `json:"action" gorm:"-"`
-}
-
-func (w WorkflowBase) CreateWorkflowMove() (businessModel *WorkflowMove) {
-	return &WorkflowMove{
-		GVA_MODEL:         global.GVA_MODEL{ID: w.WorkflowMoveID},
-		BusinessType:      w.BusinessType,
-		PromoterID:        w.PromoterID,
-		OperatorID:        w.OperatorID,
-		Param:             w.Param,
-		WorkflowProcessID: w.WorkflowProcessID,
-		WorkflowNodeID:    w.WorkflowNodeID,
-		BusinessID:        w.BusinessID,
-		Action:            w.Action,
-		IsActive:          true,
-	}
-}
-
-func (w WorkflowBase) GetBusinessType() (businessType string) {
-	return w.BusinessType
-}
-
-func (w WorkflowBase) GetBusinessID() (businessID uint) {
-	return w.BusinessID
-}
-
-func (w WorkflowBase) GetWorkflowBase() (workflowBase WorkflowBase) {
-	return w
-}
-
-type WorkflowMove struct {
-	global.GVA_MODEL
-	WorkflowProcessID string          `json:"workflowProcessID" gorm:"comment:工作流模板ID"`
-	WorkflowProcess   WorkflowProcess `gorm:"<-:false" json:"workflowProcess" gorm:"comment:工作流模板具体信息"`
-	WorkflowNodeID    string          `json:"workflowNodeID" gorm:"comment:工作流节点ID"`
-	WorkflowNode      WorkflowNode    `gorm:"<-:false" json:"workflowNode" gorm:"comment:工作流节点具体信息"`
-	BusinessType      string          `json:"businessType" gorm:"comment:业务标记"`
-	BusinessID        uint            `json:"businessID" gorm:"comment:业务ID"`
-	PromoterID        uint            `json:"promoterID" gorm:"comment:当前流转发起人"`
-	Promoter          SysUser         `gorm:"<-:false" json:"promoter" gorm:"comment:当前流转发起人信息"`
-	OperatorID        uint            `json:"operatorID" gorm:"comment:当前流转操作人"`
-	Operator          SysUser         `gorm:"<-:false" json:"operator" gorm:"comment:当前流转操作人信息"`
-	Action            string          `json:"action" gorm:"comment:工作流驱动事件"`
-	Param             string          `json:"param" gorm:"comment:工作流驱动参数"`
-	IsActive          bool            `json:"isActive" gorm:"comment:是否是活跃节点 "`
-}
-
-type WorkflowProcess struct {
-	ID          string `json:"id" form:"id" gorm:"comment:流程标识;primaryKey;unique;not null"`
-	CreatedAt   time.Time
-	UpdatedAt   time.Time
-	DeletedAt   gorm.DeletedAt `json:"-" gorm:"index"`
-	Name        string         `json:"name" gorm:"comment:流程名称"`
-	Category    string         `json:"category" gorm:"comment:分类"`
-	Clazz       string         `json:"clazz" gorm:"comment:类型"`
-	Label       string         `json:"label" gorm:"comment:流程标题"`
-	HideIcon    bool           `json:"hideIcon" gorm:"comment:是否隐藏图标"`
-	Description string         `json:"description" gorm:"comment:详细介绍"`
-	View        string         `json:"view" gorm:"comment:前端视图文件"`
-	Nodes       []WorkflowNode `json:"nodes"` // 流程节点数据
-	Edges       []WorkflowEdge `json:"edges"` // 流程链接数据
-}
-
-type WorkflowNode struct {
-	ID                string `json:"id" form:"id" gorm:"comment:节点id;primaryKey;unique;not null"`
-	CreatedAt         time.Time
-	UpdatedAt         time.Time
-	DeletedAt         gorm.DeletedAt `json:"-" gorm:"index"`
-	WorkflowProcessID string         `json:"workflowProcessID" gorm:"comment:流程标识"`
-	Clazz             string         `json:"clazz" gorm:"comment:节点类型"`
-	Label             string         `json:"label" gorm:"comment:节点名称"`
-	Type              string         `json:"type" gorm:"comment:图标类型"`
-	Shape             string         `json:"shape" gorm:"comment:形状"`
-	Description       string         `json:"description" gorm:"comment:详细介绍"`
-	View              string         `json:"view" gorm:"comment:前端视图文件"`
-	X                 float64        `json:"y" gorm:"comment:x位置"`
-	Y                 float64        `json:"x" gorm:"comment:y位置"`
-	WaitState         string         `json:"waitState" gorm:"comment:等待属性"`
-	StateValue        string         `json:"stateValue" gorm:"comment:等待值"`
-	To                string         `json:"to" gorm:"comment:收件人"`
-	Subject           string         `json:"subject" gorm:"comment:标题"`
-	Content           string         `json:"content" gorm:"comment:内容"`
-	Cycle             string         `json:"cycle" gorm:"comment:循环时间"`
-	Duration          string         `json:"duration" gorm:"comment:持续时间"`
-	HideIcon          bool           `json:"hideIcon" gorm:"comment:是否隐藏图标"`
-	DueDate           *time.Time     `json:"dueDate" gorm:"comment:到期时间"`
-	AssignType        string         `json:"assignType" gorm:"comment:审批类型"`
-	AssignValue       string         `json:"assignValue" gorm:"comment:审批类型值"`
-	Success           bool           `json:"success" gorm:"comment:是否成功"`
-}
-
-type WorkflowEdge struct {
-	ID                  string `json:"id" form:"id" gorm:"comment:唯一标识;primaryKey;unique;not null"`
-	CreatedAt           time.Time
-	UpdatedAt           time.Time
-	DeletedAt           gorm.DeletedAt     `json:"-" gorm:"index"`
-	WorkflowProcessID   string             `json:"-" gorm:"comment:流程标识"`
-	Clazz               string             `json:"clazz" gorm:"comment:类型（线）"`
-	Source              string             `json:"source" gorm:"comment:起点节点"`
-	Target              string             `json:"target" gorm:"comment:目标节点"`
-	SourceAnchor        int                `json:"sourceAnchor" gorm:"comment:起点"`
-	TargetAnchor        int                `json:"targetAnchor" gorm:"comment:目标点"`
-	Description         string             `json:"description" gorm:"comment:详细介绍"`
-	Shape               string             `json:"shape" gorm:"comment:形状"`
-	StartPoint          WorkflowStartPoint `json:"startPoint"` // 起点信息
-	EndPoint            WorkflowEndPoint   `json:"endPoint"`   // 终点信息
-	Label               string             `json:"label" gorm:"comment:标题"`
-	HideIcon            bool               `json:"hideIcon" gorm:"comment:隐藏图标"`
-	ConditionExpression string             `json:"conditionExpression" gorm:"comment:条件标识"`
-	Seq                 string             `json:"seq" gorm:"comment:序号"`
-	Reverse             bool               `json:"reverse" gorm:"comment:是否反向"`
-}
-
-type WorkflowStartPoint struct {
-	WorkflowEdgeID string
-	global.GVA_MODEL
-	X     float64 `json:"x"`
-	Y     float64 `json:"y"`
-	Index int     `json:"index"`
-}
-
-type WorkflowEndPoint struct {
-	WorkflowEdgeID string
-	global.GVA_MODEL
-	X     float64 `json:"x"`
-	Y     float64 `json:"y"`
-	Index int     `json:"index"`
-}

server/resource/page/css/parser-example.69e16e51.css

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

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}}]);

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"}}}]]}}}));

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"]]}}}));

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"]]}}}));

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"]]}}}));

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"}}]]}}}));