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

Dev

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

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

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

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

common/global/adm.go

@@ -2,7 +2,7 @@ package global
 
 const (
 	// Version go-admin version info
-	Version = "2.0.1"
+	Version = "2.0.5"
 )
 
 var (

config/db.sql

@@ -303,6 +303,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);

go.mod

@@ -6,6 +6,7 @@ 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

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