Merge pull request #549 from go-admin-team/dev

fix 🐛 gcc强依赖问题修复

.github/workflows/go.yml

@@ -32,3 +32,6 @@ jobs:
 
     - name: Build
       run: go build -v .
+    - name: Release
+      uses: softprops/action-gh-release@v1
+      if: startsWith(github.ref, 'refs/tags/')

app/admin/apis/sys_dept.go

@@ -87,7 +87,7 @@ func (e SysDept) Get(c *gin.Context) {
 // @Tags 部门
 // @Accept  application/json
 // @Product application/json
-// @Param data body dto.SysDeptControl true "data"
+// @Param data body dto.SysDeptInsertReq true "data"
 // @Success 200 {string} string	"{"code": 200, "message": "添加成功"}"
 // @Success 200 {string} string	"{"code": -1, "message": "添加失败"}"
 // @Router /api/v1/dept [post]
@@ -123,7 +123,7 @@ func (e SysDept) Insert(c *gin.Context) {
 // @Accept  application/json
 // @Product application/json
 // @Param id path int true "id"
-// @Param data body dto.SysDeptControl true "body"
+// @Param data body dto.SysDeptUpdateReq true "body"
 // @Success 200 {string} string	"{"code": 200, "message": "添加成功"}"
 // @Success 200 {string} string	"{"code": -1, "message": "添加失败"}"
 // @Router /api/v1/dept/{deptId} [put]
@@ -154,7 +154,7 @@ func (e SysDept) Update(c *gin.Context) {
 // @Summary 删除部门
 // @Description 删除数据
 // @Tags 部门
-// @Param data body dto.SysDeptById true "body"
+// @Param data body dto.SysDeptDeleteReq true "body"
 // @Success 200 {string} string	"{"code": 200, "message": "删除成功"}"
 // @Success 200 {string} string	"{"code": -1, "message": "删除失败"}"
 // @Router /api/v1/dept [delete]

app/admin/apis/sys_opera_log.go

@@ -90,7 +90,7 @@ func (e SysOperaLog) Get(c *gin.Context) {
 // @Summary 删除操作日志
 // @Description 删除数据
 // @Tags 操作日志
-// @Param data body dto.SysOperaLogById true "body"
+// @Param data body dto.SysOperaLogDeleteReq true "body"
 // @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
 // @Router /api/v1/sys-opera-log [delete]
 // @Security Bearer

app/admin/apis/sys_post.go

@@ -2,6 +2,7 @@ package apis
 
 import (
 	"fmt"
+	
 	"github.com/gin-gonic/gin"
 	"github.com/gin-gonic/gin/binding"
 	"github.com/go-admin-team/go-admin-core/sdk/api"
@@ -93,8 +94,7 @@ func (e SysPost) Get(c *gin.Context) {
 // @Accept  application/json
 // @Product application/json
 // @Param data body dto.SysPostInsertReq true "data"
-// @Success 200 {string} string	"{"code": 200, "message": "添加成功"}"
-// @Success 200 {string} string	"{"code": -1, "message": "添加失败"}"
+// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
 // @Router /api/v1/post [post]
 // @Security Bearer
 func (e SysPost) Insert(c *gin.Context) {
@@ -126,8 +126,7 @@ func (e SysPost) Insert(c *gin.Context) {
 // @Accept  application/json
 // @Product application/json
 // @Param data body dto.SysPostUpdateReq true "body"
-// @Success 200 {string} string	"{"code": 200, "message": "添加成功"}"
-// @Success 200 {string} string	"{"code": -1, "message": "添加失败"}"
+// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
 // @Router /api/v1/post/{id} [put]
 // @Security Bearer
 func (e SysPost) Update(c *gin.Context) {
@@ -159,8 +158,7 @@ func (e SysPost) Update(c *gin.Context) {
 // @Description 删除数据
 // @Tags 岗位
 // @Param id body dto.SysPostDeleteReq true "请求参数"
-// @Success 200 {string} string	"{"code": 200, "message": "删除成功"}"
-// @Success 500 {string} string	"{"code": 500, "message": "删除失败"}"
+// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
 // @Router /api/v1/post [delete]
 // @Security Bearer
 func (e SysPost) Delete(c *gin.Context) {
@@ -183,4 +181,4 @@ func (e SysPost) Delete(c *gin.Context) {
 		return
 	}
 	e.OK(req.GetId(), "删除成功")
-}
+}

app/admin/apis/sys_role.go

@@ -98,7 +98,7 @@ func (e SysRole) Get(c *gin.Context) {
 // @Tags 角色/Role
 // @Accept  application/json
 // @Product application/json
-// @Param data body dto.SysRoleControl true "data"
+// @Param data body dto.SysRoleInsertReq true "data"
 // @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
 // @Router /api/v1/role [post]
 // @Security Bearer
@@ -142,7 +142,7 @@ func (e SysRole) Insert(c *gin.Context) {
 // @Tags 角色/Role
 // @Accept  application/json
 // @Product application/json
-// @Param data body dto.SysRoleControl true "body"
+// @Param data body dto.SysRoleUpdateReq true "body"
 // @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
 // @Router /api/v1/role/{id} [put]
 // @Security Bearer
@@ -180,7 +180,7 @@ func (e SysRole) Update(c *gin.Context) {
 // @Summary 删除用户角色
 // @Description 删除数据
 // @Tags 角色/Role
-// @Param data body dto.SysRoleById true "body"
+// @Param data body dto.SysRoleDeleteReq true "body"
 // @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
 // @Router /api/v1/role [delete]
 // @Security Bearer
@@ -227,7 +227,7 @@ func (e SysRole) Update2Status(c *gin.Context) {
 	req := dto.UpdateStatusReq{}
 	err := e.MakeContext(c).
 		MakeOrm().
-		Bind(&req).
+		Bind(&req, binding.JSON, nil).
 		MakeService(&s.Service).
 		Errors
 	if err != nil {
@@ -279,4 +279,4 @@ func (e SysRole) Update2DataScope(c *gin.Context) {
 		return
 	}
 	e.OK(nil, "操作成功")
-}
+}

app/admin/models/sys_api.go

@@ -1,10 +1,14 @@
 package models
 
 import (
+	"bytes"
 	"encoding/json"
 	"fmt"
+	"io/ioutil"
+	"regexp"
 	"strings"
 
+	"github.com/bitly/go-simplejson"
 	"github.com/go-admin-team/go-admin-core/sdk"
 	"github.com/go-admin-team/go-admin-core/sdk/runtime"
 	"github.com/go-admin-team/go-admin-core/storage"
@@ -58,8 +62,21 @@ func SaveSysApi(message storage.Messager) (err error) {
 				strings.Contains(v.RelativePath, "/static/") ||
 				strings.Contains(v.RelativePath, "/form-generator/") ||
 				strings.Contains(v.RelativePath, "/sys/tables") {
+
+				// 根据接口方法注释里的@Summary填充接口名称，适用于代码生成器
+				// 可在此处增加配置路径前缀的if判断，只对代码生成的自建应用进行定向的接口名称填充
+				jsonFile, _ := ioutil.ReadFile("docs/swagger.json")
+				jsonData, _ := simplejson.NewFromReader(bytes.NewReader(jsonFile))
+				urlPath := v.RelativePath
+				idPatten := "(.*)/:(\\w+)" // 正则替换，把:id换成{id}
+				reg, _ := regexp.Compile(idPatten)
+				if reg.MatchString(urlPath) {
+					urlPath = reg.ReplaceAllString(v.RelativePath, "${1}/{${2}}") // 把:id换成{id}
+				}
+				apiTitle, _ := jsonData.Get("paths").Get(urlPath).Get(strings.ToLower(v.HttpMethod)).Get("summary").String()
+
 				err := d.Debug().Where(SysApi{Path: v.RelativePath, Action: v.HttpMethod}).
-					Attrs(SysApi{Handle: v.Handler}).
+					Attrs(SysApi{Handle: v.Handler, Title: apiTitle}).
 					FirstOrCreate(&SysApi{}).
 					//Update("handle", v.Handler).
 					Error

app/admin/router/sys_dept.go

@@ -21,7 +21,7 @@ func registerSysDeptRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddle
 		r.GET("/:id", api.Get)
 		r.POST("", api.Insert)
 		r.PUT("/:id", api.Update)
-		r.DELETE("/:id", api.Delete)
+		r.DELETE("", api.Delete)
 	}
 
 	r1 := v1.Group("").Use(authMiddleware.MiddlewareFunc())

app/admin/service/dto/sys_user.go

@@ -38,8 +38,8 @@ func (m *SysUserGetPageReq) GetNeedSearch() interface{} {
 }
 
 type ResetSysUserPwdReq struct {
-	UserId   int    `json:"userId" comment:"用户ID" binding:"required"` // 用户ID
-	Password string `json:"password" comment:"密码" binding:"required"`
+	UserId   int    `json:"userId" comment:"用户ID" vd:"$>0"` // 用户ID
+	Password string `json:"password" comment:"密码" vd:"len($)>0"`
 	common.ControlBy
 }
 
@@ -98,7 +98,7 @@ type SysUserInsertReq struct {
 	Avatar   string `json:"avatar" comment:"头像"`
 	Sex      string `json:"sex" comment:"性别"`
 	Email    string `json:"email" comment:"邮箱" vd:"len($)>0,email"`
-	DeptId   int    `json:"deptId" comment:"部门" vd:"len($)>0"`
+	DeptId   int    `json:"deptId" comment:"部门" vd:"$>0"`
 	PostId   int    `json:"postId" comment:"岗位"`
 	Remark   string `json:"remark" comment:"备注"`
 	Status   string `json:"status" comment:"状态" vd:"len($)>0" default:"1"`
@@ -185,4 +185,4 @@ func (s *SysUserById) GenerateM() (common.ActiveRecord, error) {
 type PassWord struct {
 	NewPassword string `json:"newPassword" vd:"len($)>0"`
 	OldPassword string `json:"oldPassword" vd:"len($)>0"`
-}
+}

app/admin/service/sys_menu.go

@@ -331,24 +331,39 @@ func (e *SysMenu) getByRoleName(roleName string) ([]models.SysMenu, error) {
 		MenuList = data
 	} else {
 		role.RoleKey = roleName
+		buttons := make([]models.SysMenu,0)
 		err = e.Orm.Debug().Model(&role).Where("role_key = ? ", roleName).Preload("SysMenu", func(db *gorm.DB) *gorm.DB {
-			return db.Where(" menu_type in ('C')").Order("sort")
+			return db.Where(" menu_type in ('F')").Order("sort")
 		}).Find(&role).Error
 		if role.SysMenu != nil {
-			MenuList = *role.SysMenu
+			buttons = *role.SysMenu
 		}
 		mIds := make([]int, 0)
-		for _, menu := range MenuList {
+		for _, menu := range buttons {
 			if menu.ParentId != 0 {
 				mIds = append(mIds, menu.ParentId)
 			}
 		}
-		var data []models.SysMenu
-		err = e.Orm.Where(" menu_type in ('M') and menu_id in ?", mIds).Order("sort").Find(&data).Error
+		var dataC []models.SysMenu
+		err = e.Orm.Where(" menu_type in ('C') and menu_id in ?", mIds).Order("sort").Find(&dataC).Error
 		if err != nil {
 			return nil, err
 		}
-		for _, datum := range data {
+		for _, datum := range dataC {
+			MenuList = append(MenuList, datum)
+		}
+		cIds := make([]int, 0)
+		for _, menu := range MenuList {
+			if menu.ParentId != 0 {
+				cIds = append(cIds, menu.ParentId)
+			}
+		}
+		var dataM []models.SysMenu
+		err = e.Orm.Where(" menu_type in ('M') and menu_id in ?", cIds).Order("sort").Find(&dataM).Error
+		if err != nil {
+			return nil, err
+		}
+		for _, datum := range dataM {
 			MenuList = append(MenuList, datum)
 		}
 	}

app/admin/service/sys_role.go

@@ -142,12 +142,21 @@ func (e *SysRole) Update(c *dto.SysRoleUpdateReq, cb *casbin.SyncedEnforcer) err
 		e.Log.Errorf("delete policy error:%s", err)
 		return err
 	}
-
+	mp:=make(map [string] interface{} ,0)
+	polices := make([][]string, 0)
 	for _, menu := range mlist {
 		for _, api := range menu.SysApi {
-			_, err = cb.AddNamedPolicy("p", model.RoleKey, api.Path, api.Action)
+			if mp[model.RoleKey+"-"+api.Path+"-"+api.Action] != "" {
+				mp[model.RoleKey+"-"+api.Path+"-"+api.Action] = ""
+				//_, err = cb.AddNamedPolicy("p", model.RoleKey, api.Path, api.Action)
+				polices = append(polices, []string{model.RoleKey, api.Path, api.Action})
+			}
 		}
 	}
+	_, err = cb.AddNamedPolicies("p", polices)
+	if err != nil {
+		return err
+	}
 	_ = cb.SavePolicy()
 	return nil
 }

common/global/adm.go

@@ -2,11 +2,11 @@ package global
 
 const (
 	// Version go-admin version info
-	Version = "2.0.1"
+	Version = "2.0.6"
 )
 
 var (
 	Source string
 	Driver string
 	DBName string
-)
+)

common/middleware/auth.go

@@ -20,7 +20,7 @@ func AuthInit() (*jwt.GinJWTMiddleware, error) {
 	}
 	return jwt.New(&jwt.GinJWTMiddleware{
 		Realm:           "test zone",
-		Key:             []byte(config.ApplicationConfig.JwtSecret),
+		Key:             []byte(config.JwtConfig.Secret),
 		Timeout:         timeout,
 		MaxRefresh:      time.Hour,
 		PayloadFunc:     handler.PayloadFunc,
@@ -33,4 +33,4 @@ func AuthInit() (*jwt.GinJWTMiddleware, error) {
 		TimeFunc:        time.Now,
 	})
 
-}
+}

config/db.sql

@@ -200,7 +200,7 @@ COMMIT;
 BEGIN;
 INSERT INTO `sys_menu` VALUES (2, 'Admin', '系统管理', 'api-server', '/admin', '/0/2', 'M', '无', '', 0, 1, '', 'Layout', 10, '0', '1', 0, 1, '2021-05-20 21:58:45.679', '2021-06-17 11:48:40.703', NULL);
 INSERT INTO `sys_menu` VALUES (3, 'SysUserManage', '用户管理', 'user', '/admin/sys-user', '/0/2/3', 'C', '无', 'admin:sysUser:list', 2, 0, '', '/admin/sys-user/index', 10, '0', '1', 0, 1, '2021-05-20 22:08:44.526', '2021-06-17 20:31:14.305', NULL);
-INSERT INTO `sys_menu` VALUES (43, '', '新增管理员1', 'app-group-fill', '', '/0/2/3/43', 'F', 'POST', 'admin:sysUser:add', 3, 0, '', '', 10, '0', '1', 0, 1, '2021-05-20 22:08:44.526', '2021-06-17 20:31:14.305', NULL);
+INSERT INTO `sys_menu` VALUES (43, '', '新增管理员', 'app-group-fill', '', '/0/2/3/43', 'F', 'POST', 'admin:sysUser:add', 3, 0, '', '', 10, '0', '1', 0, 1, '2021-05-20 22:08:44.526', '2021-06-17 20:31:14.305', NULL);
 INSERT INTO `sys_menu` VALUES (44, '', '查询管理员', 'app-group-fill', '', '/0/2/3/44', 'F', 'GET', 'admin:sysUser:query', 3, 0, '', '', 40, '0', '1', 0, 1, '2021-05-20 22:08:44.526', '2021-06-17 20:31:14.305', NULL);
 INSERT INTO `sys_menu` VALUES (45, '', '修改管理员', 'app-group-fill', '', '/0/2/3/45', 'F', 'PUT', 'admin:sysUser:edit', 3, 0, '', '', 30, '0', '1', 0, 1, '2021-05-20 22:08:44.526', '2021-06-17 20:31:14.305', NULL);
 INSERT INTO `sys_menu` VALUES (46, '', '删除管理员', 'app-group-fill', '', '/0/2/3/46', 'F', 'DELETE', 'admin:sysUser:remove', 3, 0, '', '', 20, '0', '1', 0, 1, '2021-05-20 22:08:44.526', '2021-06-17 20:31:14.305', NULL);
@@ -259,37 +259,14 @@ INSERT INTO `sys_menu` VALUES (462, 'sys_job', '创建定时任务', 'app-group-
 INSERT INTO `sys_menu` VALUES (463, 'sys_job', '修改定时任务', 'app-group-fill', '', '/0/459/460/463', 'F', '无', 'job:sysJob:edit', 460, 0, '', '', 0, '0', '1', 1, 1, '2020-08-03 09:17:37.000', '2021-06-05 22:15:03.465', NULL);
 INSERT INTO `sys_menu` VALUES (464, 'sys_job', '删除定时任务', 'app-group-fill', '', '/0/459/460/464', 'F', '无', 'job:sysJob:remove', 460, 0, '', '', 0, '0', '1', 1, 1, '2020-08-03 09:17:37.000', '2021-06-05 22:15:03.465', NULL);
 INSERT INTO `sys_menu` VALUES (471, 'JobLog', '日志', 'bug', '/schedule/log', '/0/459/471', 'C', '', '', 459, 0, '', '/schedule/log', 0, '1', '1', 1, 1, '2020-08-05 21:24:46.000', '2021-06-05 22:15:03.465', NULL);
-INSERT INTO `sys_menu` VALUES (496, 'Sources', '资源管理', 'network', '/sources', '/0/496', 'M', '无', '', 0, 1, '', 'Layout', 50, '0', '1', 1, 1, '2021-05-13 19:56:39.690', '2021-06-05 22:15:03.465', NULL);
-INSERT INTO `sys_menu` VALUES (497, 'File', '文件管理', 'documentation', '/sources/file-manage', '/0/496/497', 'C', '', '', 496, 1, '', '/other/fileManage/index', 0, '0', '1', 1, 1, '2021-05-13 19:56:39.690', '2021-06-05 22:15:03.465', NULL);
-INSERT INTO `sys_menu` VALUES (498, '', '内容管理', 'archived', '/cms', '/0/498', 'M', '无', '', 0, 1, '', 'Layout', 60, '0', '1', 0, 1, '2021-06-05 16:06:16.525', '2021-06-05 22:15:03.465', NULL);
-INSERT INTO `sys_menu` VALUES (499, 'SysCategoryManage', '分类', 'list', '/cms/sys-category', '/0/498/499', 'C', '无', 'cms:sysCategory:list', 498, 1, '', '/sys-category/index', 0, '0', '0', 0, 1, '2021-06-05 16:06:16.525', '2021-06-05 22:15:03.465', NULL);
-INSERT INTO `sys_menu` VALUES (500, '', '分页获取分类', 'app-group-fill', '', '/0/498/499/500', 'F', '无', 'cms:sysCategory:query', 499, 1, '', '', 0, '0', '0', 1, 1, '2021-05-13 19:56:39.690', '2021-06-05 22:15:03.465', NULL);
-INSERT INTO `sys_menu` VALUES (501, '', '创建分类', 'app-group-fill', '', '/0/498/499/501', 'F', '无', 'cms:sysCategory:add', 499, 1, '', '', 0, '0', '0', 1, 1, '2021-05-13 19:56:39.690', '2021-06-05 22:15:03.465', NULL);
-INSERT INTO `sys_menu` VALUES (502, '', '修改分类', 'app-group-fill', '', '/0/498/499/502', 'F', '无', 'cms:sysCategory:edit', 499, 1, '', '', 0, '0', '0', 1, 1, '2021-05-13 19:56:39.690', '2021-06-05 22:15:03.465', NULL);
-INSERT INTO `sys_menu` VALUES (503, '', '删除分类', 'app-group-fill', '', '/0/498/499/503', 'F', '无', 'cms:sysCategory:remove', 499, 1, '', '', 0, '0', '0', 1, 1, '2021-05-13 19:56:39.690', '2021-06-05 22:15:03.465', NULL);
-INSERT INTO `sys_menu` VALUES (511, 'SysContentManage', '内容管理', 'pass', '/cms/sys-content', '/0/498/511', 'C', '无', 'cms:sysContent:list', 498, 1, '', '/sys-content/index', 0, '0', '0', 0, 1, '2021-06-05 16:06:16.525', '2021-06-05 22:15:03.465', NULL);
-INSERT INTO `sys_menu` VALUES (512, '', '分页获取内容管理', 'app-group-fill', '', '/0/510/511/512', 'F', '无', 'cms:sysContent:query', 511, 1, '', '', 0, '0', '0', 1, 1, '2021-05-13 19:56:39.690', '2021-06-05 22:15:03.465', NULL);
-INSERT INTO `sys_menu` VALUES (513, '', '创建内容管理', 'app-group-fill', '', '/0/510/511/513', 'F', '无', 'cms:sysContent:add', 511, 1, '', '', 0, '0', '0', 1, 1, '2021-05-13 19:56:39.690', '2021-06-05 22:15:03.465', NULL);
-INSERT INTO `sys_menu` VALUES (514, '', '修改内容管理', 'app-group-fill', '', '/0/510/511/514', 'F', '无', 'cms:sysContent:edit', 511, 1, '', '', 0, '0', '0', 1, 1, '2021-05-13 19:56:39.690', '2021-06-05 22:15:03.465', NULL);
-INSERT INTO `sys_menu` VALUES (515, '', '删除内容管理', 'app-group-fill', '', '/0/510/511/515', 'F', '无', 'cms:sysContent:remove', 511, 1, '', '', 0, '0', '0', 1, 1, '2021-05-13 19:56:39.690', '2021-06-05 22:15:03.465', NULL);
-INSERT INTO `sys_menu` VALUES (522, 'SysContentCreate', '新增', 'form', '/cms/sys-content/create', '/0/498/522', 'C', '', 'cms:sysContent:add', 498, 0, '', '/syscontent/create.vue', 0, '1', '1', 0, 1, '2021-06-05 16:06:16.525', '2021-06-05 22:15:03.465', NULL);
-INSERT INTO `sys_menu` VALUES (523, 'SysContentEdit', '编辑', 'edit', '/cms/sys-content/edit:id', '/0/498/523', 'C', '', 'cmd:sysContent:edit', 498, 0, '', '/sys-content/edit.vue', 0, '1', '1', 0, 1, '2021-06-05 16:06:16.525', '2021-06-05 22:15:03.465', NULL);
 INSERT INTO `sys_menu` VALUES (528, 'SysApiManage', '接口管理', 'api-doc', '/admin/sys-api', '/0/527/528', 'C', '无', 'admin:sysApi:list', 2, 0, '', '/admin/sys-api/index', 0, '0', '0', 0, 1, '2021-05-20 22:08:44.526', '2021-06-17 11:48:40.703', NULL);
 INSERT INTO `sys_menu` VALUES (529, '', '查询接口', 'app-group-fill', '', '/0/527/528/529', 'F', '无', 'admin:sysApi:query', 528, 0, '', '', 40, '0', '0', 0, 1, '2021-05-20 22:08:44.526', '2021-06-17 11:48:40.703', NULL);
 INSERT INTO `sys_menu` VALUES (531, '', '修改接口', 'app-group-fill', '', '/0/527/528/531', 'F', '无', 'admin:sysApi:edit', 528, 0, '', '', 30, '0', '0', 0, 1, '2021-05-20 22:08:44.526', '2021-06-17 11:48:40.703', NULL);
 INSERT INTO `sys_menu` VALUES (537, 'SysTools', '系统工具', 'system-tools', '/sys-tools', '', 'M', '', '', 0, 0, '', 'Layout', 30, '0', '1', 1, 1, '2021-05-21 11:13:32.166', '2021-06-16 21:26:12.446', NULL);
-INSERT INTO `sys_menu` VALUES (538, 'SysChinaAreaData', '行政区管理', 'nested', '/sys-tools/sys-china-area-data', '', 'C', '', 'sysTools:sysChinaAreaData:list', 537, 0, '', '/sys-tools/sys-china-area-data/index', 0, '0', '1', 1, 1, '2021-05-21 11:18:50.712', '2021-06-16 21:26:12.446', NULL);
 INSERT INTO `sys_menu` VALUES (540, 'SysConfigSet', '参数设置', 'system-tools', '/admin/sys-config/set', '', 'C', '', 'admin:sysConfigSet:list', 2, 0, '', '/admin/sys-config/set', 0, '0', '1', 1, 1, '2021-05-25 16:06:52.560', '2021-06-17 11:48:40.703', NULL);
 INSERT INTO `sys_menu` VALUES (542, '', '修改', 'upload', '', '', 'F', '', 'admin:sysConfigSet:update', 540, 0, '', '', 0, '0', '1', 1, 1, '2021-06-13 11:45:48.670', '2021-06-17 11:48:40.703', NULL);
-INSERT INTO `sys_menu` VALUES (544, '1', '1', '404', '1', '', 'C', '', '1', 0, 0, '', '1', 0, '0', '1', 1, 1, '2021-06-16 21:42:52.603', '2021-06-16 21:43:05.400', '2021-06-16 21:43:14.403');
-INSERT INTO `sys_menu` VALUES (545, '1', '1', 'chart', '1', '', 'C', '', '1', 0, 0, '', '1', 0, '0', '1', 1, 0, '2021-06-16 21:43:39.774', '2021-06-16 21:43:39.774', '2021-06-16 21:48:54.255');
-INSERT INTO `sys_menu` VALUES (546, '1', '1', '404', '1', '', 'C', '', '1', 0, 0, '', '1', 0, '0', '1', 1, 1, '2021-06-16 21:49:13.861', '2021-06-16 21:49:48.583', '2021-06-16 21:49:52.490');
-INSERT INTO `sys_menu_api_rule` VALUES (544, 5);
-INSERT INTO `sys_menu_api_rule` VALUES (546, 5);
 INSERT INTO `sys_menu_api_rule` VALUES (216, 6);
 INSERT INTO `sys_menu_api_rule` VALUES (250, 6);
-INSERT INTO `sys_menu_api_rule` VALUES (546, 6);
-INSERT INTO `sys_menu_api_rule` VALUES (546, 7);
 INSERT INTO `sys_menu_api_rule` VALUES (58, 21);
 INSERT INTO `sys_menu_api_rule` VALUES (236, 21);
 INSERT INTO `sys_menu_api_rule` VALUES (238, 23);
@@ -303,6 +280,7 @@ INSERT INTO `sys_menu_api_rule` VALUES (228, 27);
 INSERT INTO `sys_menu_api_rule` VALUES (230, 28);
 INSERT INTO `sys_menu_api_rule` VALUES (226, 29);
 INSERT INTO `sys_menu_api_rule` VALUES (51, 39);
+INSERT INTO `sys_menu_api_rule` VALUES (51, 135);
 INSERT INTO `sys_menu_api_rule` VALUES (222, 39);
 INSERT INTO `sys_menu_api_rule` VALUES (221, 41);
 INSERT INTO `sys_menu_api_rule` VALUES (52, 44);
@@ -363,4 +341,4 @@ COMMIT;
 
 SET FOREIGN_KEY_CHECKS = 1;
 
--- 数据完成 ;
+-- 数据完成 ;

go.mod

@@ -6,11 +6,12 @@ require (
 	github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751
 	github.com/alibaba/sentinel-golang v0.6.1
 	github.com/aliyun/aliyun-oss-go-sdk v0.0.0-20190307165228-86c17b95fcd5
+	github.com/bitly/go-simplejson v0.5.0
 	github.com/bytedance/go-tagexpr/v2 v2.7.12
 	github.com/casbin/casbin/v2 v2.25.1
-	github.com/gin-gonic/gin v1.7.2
-	github.com/go-admin-team/go-admin-core v1.3.7
-	github.com/go-admin-team/go-admin-core/sdk v1.3.7
+	github.com/gin-gonic/gin v1.7.3
+	github.com/go-admin-team/go-admin-core v1.3.8
+	github.com/go-admin-team/go-admin-core/sdk v1.3.9
 	github.com/google/uuid v1.2.0
 	github.com/mssola/user_agent v0.5.2
 	github.com/opentracing/opentracing-go v1.1.0
@@ -30,8 +31,3 @@ require (
 	gorm.io/driver/sqlite v1.1.5-0.20201206014648-c84401fbe3ba
 	gorm.io/gorm v1.21.11
 )
-
-//replace (
-//	github.com/go-admin-team/go-admin-core => ../go-admin-core
-//	github.com/go-admin-team/go-admin-core/sdk => ../go-admin-core/sdk
-//)

template/v4/no_actions/router_check_role.go.template

@@ -15,7 +15,7 @@ func init() {
 // register{{.ClassName}}Router
 func register{{.ClassName}}Router(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) {
 	api := apis.{{.ClassName}}{}
-	r := v1.Group("/{{.MLTBName}}").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole())
+	r := v1.Group("/{{.ModuleName}}").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole())
 	{
 		r.GET("", api.GetPage)
 		r.GET("/:id", api.Get)

template/v4/no_actions/router_no_check_role.go.template

@@ -14,7 +14,7 @@ func init() {
 // register{{.ClassName}}Router
 func register{{.ClassName}}Router(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) {
 	api := apis.{{.ClassName}}{}
-	r := v1.Group("/{{.MLTBName}}").Use(authMiddleware.MiddlewareFunc())
+	r := v1.Group("/{{.ModuleName}}").Use(authMiddleware.MiddlewareFunc())
 	{
 		r.GET("", api.GetPage)
 		r.GET("/:id", api.Get)

template/v4/vue.go.template

@@ -27,9 +27,9 @@
                                                placeholder="{{$tableComment}}{{.ColumnComment}}" clearable size="small">
                                         <el-option
                                                 v-for="dict in {{.JsonField}}Options"
-                                                :key="dict.dictValue"
-                                                :label="dict.dictLabel"
-                                                :value="dict.dictValue"
+                                                :key="dict.value"
+                                                :label="dict.label"
+                                                :value="dict.value"
                                         />
                                     </el-select>
                                 {{- end}}
@@ -118,22 +118,36 @@
                     {{- end }}
                     <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
                         <template slot-scope="scope">
+                         <el-popconfirm
+                           class="delete-popconfirm"
+                           title="确认要修改吗?"
+                           confirm-button-text="修改"
+                           @onConfirm="handleUpdate(scope.row)"
+                         >
+                           <el-button
+                             slot="reference"
+                             v-permisaction="['{{.PackageName}}:{{.BusinessName}}:edit']"
+                             size="mini"
+                             type="text"
+                             icon="el-icon-edit"
+                           >修改
+                           </el-button>
+                         </el-popconfirm>
+                         <el-popconfirm
+                            class="delete-popconfirm"
+                            title="确认要删除吗?"
+                            confirm-button-text="删除"
+                            @onConfirm="handleDelete(scope.row)"
+                         >
                             <el-button
-                                    v-permisaction="['{{.PackageName}}:{{.BusinessName}}:edit']"
-                                    size="mini"
-                                    type="text"
-                                    icon="el-icon-edit"
-                                    @click="handleUpdate(scope.row)"
-                            >修改
-                            </el-button>
-                            <el-button
-                                    v-permisaction="['{{.PackageName}}:{{.BusinessName}}:remove']"
-                                    size="mini"
-                                    type="text"
-                                    icon="el-icon-delete"
-                                    @click="handleDelete(scope.row)"
+                              slot="reference"
+                              v-permisaction="['{{.PackageName}}:{{.BusinessName}}:remove']"
+                              size="mini"
+                              type="text"
+                              icon="el-icon-delete"
                             >删除
                             </el-button>
+                         </el-popconfirm>
                         </template>
                     </el-table-column>
                 </el-table>
@@ -179,9 +193,9 @@
                                                        placeholder="请选择" {{if eq .IsEdit "false" -}} :disabled="isEdit" {{- end }}>
                                                 <el-option
                                                         v-for="dict in {{.JsonField}}Options"
-                                                        :key="dict.dictValue"
-                                                        :label="dict.dictLabel"
-                                                        :value="dict.dictValue"
+                                                        :key="dict.value"
+                                                        :label="dict.label"
+                                                        :value="dict.value"
                                                 />
                                             </el-select>
                                             {{- end -}}
@@ -189,9 +203,9 @@
                                             <el-radio-group v-model="form.{{.JsonField}}">
                                                 <el-radio
                                                         v-for="dict in {{.JsonField}}Options"
-                                                        :key="dict.dictValue"
-                                                        :label="dict.dictValue"
-                                                >{{"{{"}} dict.dictLabel {{"}}"}}</el-radio>
+                                                        :key="dict.value"
+                                                        :label="dict.value"
+                                                >{{"{{"}} dict.label {{"}}"}}</el-radio>
                                             </el-radio-group>
                                         {{- else if eq "file" .HtmlType -}}
                                             <el-input