root
/
yibu
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

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

This reverts commit 6f751209a5.
main
songzhibin97 3 years ago
parent
6f751209a5
commit
9f91af3b55
23 changed files with 1739 additions and 950 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      server/api/v1/autocode/autocodeExample.go
  2. 4
      server/api/v1/example/exa_customer.go
  3. 1
      server/api/v1/system/sys_captcha.go
  4. 4
      server/api/v1/system/sys_dictionary.go
  5. 4
      server/api/v1/system/sys_dictionary_detail.go
  6. 2
      server/api/v1/system/sys_menu.go
  7. 4
      server/api/v1/system/sys_operation_record.go
  8. 2
      server/api/v1/system/sys_user.go
  9. 1
      server/config.yaml
  10. 873
      server/docs/docs.go
  11. 873
      server/docs/swagger.json
  12. 624
      server/docs/swagger.yaml
  13. 4
      server/go.mod
  14. 2
      server/model/common/request/common.go
  15. 4
      server/model/system/request/sys_menu.go
  16. 2
      server/model/system/sys_system.go
  17. 4
      server/resource/template/server/api.go.tpl
  18. 4
      server/resource/template/web/api.js.tpl
  19. 66
      server/resource/template/web/form.vue.tpl
  20. 125
      server/resource/template/web/table.vue.tpl
  21. 18
      server/utils/validator.go
  22. 2
      web/.eslintrc.js

4
server/api/v1/autocode/autocodeExample.go
View File

@ -78,7 +78,7 @@ func (autoCodeExampleApi *AutoCodeExampleApi) UpdateAutoCodeExample(c *gin.Conte
// @Security ApiKeyAuth
// @accept application/json
// @Produce application/json
// @Param data body autocode.AutoCodeExample true "用id查询AutoCodeExample"
// @Param data query autocode.AutoCodeExample true "用id查询AutoCodeExample"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"查询成功"}"
// @Router /autoCodeExample/findAutoCodeExample [get]
func (autoCodeExampleApi *AutoCodeExampleApi) FindAutoCodeExample(c *gin.Context) {
@ -101,7 +101,7 @@ func (autoCodeExampleApi *AutoCodeExampleApi) FindAutoCodeExample(c *gin.Context
// @Security ApiKeyAuth
// @accept application/json
// @Produce application/json
// @Param data body autocodeReq.AutoCodeExampleSearch true "页码, 每页大小, 搜索条件"
// @Param data query autocodeReq.AutoCodeExampleSearch true "页码, 每页大小, 搜索条件"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
// @Router /autoCodeExample/getAutoCodeExampleList [get]
func (autoCodeExampleApi *AutoCodeExampleApi) GetAutoCodeExampleList(c *gin.Context) {

4
server/api/v1/example/exa_customer.go
View File

@ -94,7 +94,7 @@ func (e *CustomerApi) UpdateExaCustomer(c *gin.Context) {
// @Security ApiKeyAuth
// @accept application/json
// @Produce application/json
// @Param data body example.ExaCustomer true "客户ID"
// @Param data query example.ExaCustomer true "客户ID"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
// @Router /customer/customer [get]
func (e *CustomerApi) GetExaCustomer(c *gin.Context) {
@ -118,7 +118,7 @@ func (e *CustomerApi) GetExaCustomer(c *gin.Context) {
// @Security ApiKeyAuth
// @accept application/json
// @Produce application/json
// @Param data body request.PageInfo true "页码, 每页大小"
// @Param data query request.PageInfo true "页码, 每页大小"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
// @Router /customer/customerList [get]
func (e *CustomerApi) GetExaCustomerList(c *gin.Context) {

1
server/api/v1/system/sys_captcha.go
View File

@ -27,6 +27,7 @@ func (b *BaseApi) Captcha(c *gin.Context) {
// 字符,公式,验证码配置
// 生成默认数字的driver
driver := base64Captcha.NewDriverDigit(global.GVA_CONFIG.Captcha.ImgHeight, global.GVA_CONFIG.Captcha.ImgWidth, global.GVA_CONFIG.Captcha.KeyLong, 0.7, 80)
//cp := base64Captcha.NewCaptcha(driver, store.UseWithCtx(c)) // v8下使用redis
cp := base64Captcha.NewCaptcha(driver, store)
if id, b64s, err := cp.Generate(); err != nil {
global.GVA_LOG.Error("验证码获取失败!", zap.Any("err", err))

4
server/api/v1/system/sys_dictionary.go
View File

@ -75,7 +75,7 @@ func (s *DictionaryApi) UpdateSysDictionary(c *gin.Context) {
// @Security ApiKeyAuth
// @accept application/json
// @Produce application/json
// @Param data body system.SysDictionary true "ID或字典英名"
// @Param data query system.SysDictionary true "ID或字典英名"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"查询成功"}"
// @Router /sysDictionary/findSysDictionary [get]
func (s *DictionaryApi) FindSysDictionary(c *gin.Context) {
@ -94,7 +94,7 @@ func (s *DictionaryApi) FindSysDictionary(c *gin.Context) {
// @Security ApiKeyAuth
// @accept application/json
// @Produce application/json
// @Param data body request.SysDictionarySearch true "页码, 每页大小, 搜索条件"
// @Param data query request.SysDictionarySearch true "页码, 每页大小, 搜索条件"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
// @Router /sysDictionary/getSysDictionaryList [get]
func (s *DictionaryApi) GetSysDictionaryList(c *gin.Context) {

4
server/api/v1/system/sys_dictionary_detail.go
View File

@ -75,7 +75,7 @@ func (s *DictionaryDetailApi) UpdateSysDictionaryDetail(c *gin.Context) {
// @Security ApiKeyAuth
// @accept application/json
// @Produce application/json
// @Param data body system.SysDictionaryDetail true "用id查询SysDictionaryDetail"
// @Param data query system.SysDictionaryDetail true "用id查询SysDictionaryDetail"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"查询成功"}"
// @Router /sysDictionaryDetail/findSysDictionaryDetail [get]
func (s *DictionaryDetailApi) FindSysDictionaryDetail(c *gin.Context) {
@ -98,7 +98,7 @@ func (s *DictionaryDetailApi) FindSysDictionaryDetail(c *gin.Context) {
// @Security ApiKeyAuth
// @accept application/json
// @Produce application/json
// @Param data body request.SysDictionaryDetailSearch true "页码, 每页大小, 搜索条件"
// @Param data query request.SysDictionaryDetailSearch true "页码, 每页大小, 搜索条件"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
// @Router /sysDictionaryDetail/getSysDictionaryDetailList [get]
func (s *DictionaryDetailApi) GetSysDictionaryDetailList(c *gin.Context) {

2
server/api/v1/system/sys_menu.go
View File

@ -81,7 +81,7 @@ func (a *AuthorityMenuApi) AddMenuAuthority(c *gin.Context) {
// @Produce application/json
// @Param data body request.GetAuthorityId true "角色ID"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
// @Router /menu/GetMenuAuthority [post]
// @Router /menu/getMenuAuthority [post]
func (a *AuthorityMenuApi) GetMenuAuthority(c *gin.Context) {
var param request.GetAuthorityId
_ = c.ShouldBindJSON(&param)

4
server/api/v1/system/sys_operation_record.go
View File

@ -76,7 +76,7 @@ func (s *OperationRecordApi) DeleteSysOperationRecordByIds(c *gin.Context) {
// @Security ApiKeyAuth
// @accept application/json
// @Produce application/json
// @Param data body system.SysOperationRecord true "Id"
// @Param data query system.SysOperationRecord true "Id"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"查询成功"}"
// @Router /sysOperationRecord/findSysOperationRecord [get]
func (s *OperationRecordApi) FindSysOperationRecord(c *gin.Context) {
@ -99,7 +99,7 @@ func (s *OperationRecordApi) FindSysOperationRecord(c *gin.Context) {
// @Security ApiKeyAuth
// @accept application/json
// @Produce application/json
// @Param data body request.SysOperationRecordSearch true "页码, 每页大小, 搜索条件"
// @Param data query request.SysOperationRecordSearch true "页码, 每页大小, 搜索条件"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
// @Router /sysOperationRecord/getSysOperationRecordList [get]
func (s *OperationRecordApi) GetSysOperationRecordList(c *gin.Context) {

2
server/api/v1/system/sys_user.go
View File

@ -143,7 +143,7 @@ func (b *BaseApi) Register(c *gin.Context) {
// @Produce application/json
// @Param data body systemReq.ChangePasswordStruct true "用户名, 原密码, 新密码"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"修改成功"}"
// @Router /user/changePassword [put]
// @Router /user/changePassword [post]
func (b *BaseApi) ChangePassword(c *gin.Context) {
var user systemReq.ChangePasswordStruct
_ = c.ShouldBindJSON(&user)

1
server/config.yaml
View File

@ -132,3 +132,4 @@ Timer:
{ tableName: "sys_operation_records" , compareField: "created_at", interval: "2160h" },
#{ tableName: "log2" , compareField: "created_at", interval: "2160h" }
]

873
server/docs/docs.go
File diff suppressed because it is too large
View File

873
server/docs/swagger.json
File diff suppressed because it is too large
View File

624
server/docs/swagger.yaml
View File

@ -387,27 +387,6 @@ definitions:
$ref: '#/definitions/system.SysBaseMenu'
type: array
type: object
request.AutoCodeExampleSearch:
properties:
autoCodeExampleField:
description: 展示值
type: string
createdAt:
description: 创建时间
type: string
id:
description: 主键ID
type: integer
page:
description: 页码
type: integer
pageSize:
description: 每页大小
type: integer
updatedAt:
description: 更新时间
type: string
type: object
request.AutoHistoryByID:
properties:
id:
@ -514,6 +493,10 @@ definitions:
properties:
authorityId:
type: string
authorityIds:
items:
type: string
type: array
headerImg:
type: string
nickName:
@ -564,135 +547,25 @@ definitions:
authorityId:
description: 角色ID
type: string
uuid:
description: 用户UUID
type: string
type: object
request.SysAutoHistory:
request.SetUserAuthorities:
properties:
page:
description: 页码
type: integer
pageSize:
description: 每页大小
type: integer
type: object
request.SysDictionaryDetailSearch:
properties:
createdAt:
description: 创建时间
type: string
id:
description: 主键ID
type: integer
label:
description: 展示值
type: string
page:
description: 页码
type: integer
pageSize:
description: 每页大小
type: integer
sort:
description: 排序标记
type: integer
status:
description: 启用状态
type: boolean
sysDictionaryID:
description: 关联标记
type: integer
updatedAt:
description: 更新时间
type: string
value:
description: 字典值
type: integer
type: object
request.SysDictionarySearch:
properties:
createdAt:
description: 创建时间
type: string
desc:
description: 描述
authorityIds:
description: 角色ID
items:
type: string
type: array
id:
description: 主键ID
type: integer
name:
description: 字典名（中）
type: string
page:
description: 页码
type: integer
pageSize:
description: 每页大小
type: integer
status:
description: 状态
type: boolean
sysDictionaryDetails:
items:
$ref: '#/definitions/system.SysDictionaryDetail'
type: array
type:
description: 字典名（英）
type: string
updatedAt:
description: 更新时间
type: string
type: object
request.SysOperationRecordSearch:
request.SysAutoHistory:
properties:
agent:
description: 代理
type: string
body:
description: 请求Body
type: string
createdAt:
description: 创建时间
type: string
error_message:
description: 错误信息
type: string
id:
description: 主键ID
type: integer
ip:
description: 请求ip
type: string
latency:
description: 延迟
type: string
method:
description: 请求方法
type: string
page:
description: 页码
type: integer
pageSize:
description: 每页大小
type: integer
path:
description: 请求路径
type: string
resp:
description: 响应Body
type: string
status:
description: 请求状态
type: integer
updatedAt:
description: 更新时间
type: string
user:
$ref: '#/definitions/system.SysUser'
user_id:
description: 用户id
type: integer
type: object
response.SysAuthorityCopyResponse:
properties:
@ -1009,6 +882,10 @@ definitions:
activeColor:
description: 活跃颜色
type: string
authorities:
items:
$ref: '#/definitions/system.SysAuthority'
type: array
authority:
$ref: '#/definitions/system.SysAuthority'
authorityId:
@ -1644,12 +1521,22 @@ paths:
consumes:
- application/json
parameters:
- description: 用id查询AutoCodeExample
in: body
name: data
required: true
schema:
$ref: '#/definitions/autocode.AutoCodeExample'
- description: 展示值
in: query
name: autoCodeExampleField
type: string
- description: 创建时间
in: query
name: createdAt
type: string
- description: 主键ID
in: query
name: id
type: integer
- description: 更新时间
in: query
name: updatedAt
type: string
produces:
- application/json
responses:
@ -1667,12 +1554,30 @@ paths:
consumes:
- application/json
parameters:
- description: 页码, 每页大小, 搜索条件
in: body
name: data
required: true
schema:
$ref: '#/definitions/request.AutoCodeExampleSearch'
- description: 展示值
in: query
name: autoCodeExampleField
type: string
- description: 创建时间
in: query
name: createdAt
type: string
- description: 主键ID
in: query
name: id
type: integer
- description: 页码
in: query
name: page
type: integer
- description: 每页大小
in: query
name: pageSize
type: integer
- description: 更新时间
in: query
name: updatedAt
type: string
produces:
- application/json
responses:
@ -1816,12 +1721,34 @@ paths:
consumes:
- application/json
parameters:
- description: 客户ID
in: body
name: data
required: true
schema:
$ref: '#/definitions/example.ExaCustomer'
- description: 创建时间
in: query
name: createdAt
type: string
- description: 客户名
in: query
name: customerName
type: string
- description: 客户手机号
in: query
name: customerPhoneData
type: string
- description: 主键ID
in: query
name: id
type: integer
- description: 管理角色ID
in: query
name: sysUserAuthorityID
type: string
- description: 管理ID
in: query
name: sysUserId
type: integer
- description: 更新时间
in: query
name: updatedAt
type: string
produces:
- application/json
responses:
@ -1883,12 +1810,14 @@ paths:
consumes:
- application/json
parameters:
- description: 页码, 每页大小
in: body
name: data
required: true
schema:
$ref: '#/definitions/request.PageInfo'
- description: 页码
in: query
name: page
type: integer
- description: 每页大小
in: query
name: pageSize
type: integer
produces:
- application/json
responses:
@ -2171,29 +2100,6 @@ paths:
summary: jwt加入黑名单
tags:
- Jwt
/menu/GetMenuAuthority:
post:
consumes:
- application/json
parameters:
- description: 角色ID
in: body
name: data
required: true
schema:
$ref: '#/definitions/request.GetAuthorityId'
produces:
- application/json
responses:
"200":
description: '{"success":true,"data":{},"msg":"获取成功"}'
schema:
type: string
security:
- ApiKeyAuth: []
summary: 获取指定角色menu
tags:
- AuthorityMenu
/menu/addBaseMenu:
post:
consumes:
@ -2328,6 +2234,29 @@ paths:
summary: 获取用户动态路由
tags:
- AuthorityMenu
/menu/getMenuAuthority:
post:
consumes:
- application/json
parameters:
- description: 角色ID
in: body
name: data
required: true
schema:
$ref: '#/definitions/request.GetAuthorityId'
produces:
- application/json
responses:
"200":
description: '{"success":true,"data":{},"msg":"获取成功"}'
schema:
type: string
security:
- ApiKeyAuth: []
summary: 获取指定角色menu
tags:
- AuthorityMenu
/menu/getMenuList:
post:
consumes:
@ -2425,12 +2354,34 @@ paths:
consumes:
- application/json
parameters:
- description: ID或字典英名
in: body
name: data
required: true
schema:
$ref: '#/definitions/system.SysDictionary'
- description: 创建时间
in: query
name: createdAt
type: string
- description: 描述
in: query
name: desc
type: string
- description: 主键ID
in: query
name: id
type: integer
- description: 字典名（中）
in: query
name: name
type: string
- description: 状态
in: query
name: status
type: boolean
- description: 字典名（英）
in: query
name: type
type: string
- description: 更新时间
in: query
name: updatedAt
type: string
produces:
- application/json
responses:
@ -2448,12 +2399,42 @@ paths:
consumes:
- application/json
parameters:
- description: 页码, 每页大小, 搜索条件
in: body
name: data
required: true
schema:
$ref: '#/definitions/request.SysDictionarySearch'
- description: 创建时间
in: query
name: createdAt
type: string
- description: 描述
in: query
name: desc
type: string
- description: 主键ID
in: query
name: id
type: integer
- description: 字典名（中）
in: query
name: name
type: string
- description: 页码
in: query
name: page
type: integer
- description: 每页大小
in: query
name: pageSize
type: integer
- description: 状态
in: query
name: status
type: boolean
- description: 字典名（英）
in: query
name: type
type: string
- description: 更新时间
in: query
name: updatedAt
type: string
produces:
- application/json
responses:
@ -2540,12 +2521,38 @@ paths:
consumes:
- application/json
parameters:
- description: 用id查询SysDictionaryDetail
in: body
name: data
required: true
schema:
$ref: '#/definitions/system.SysDictionaryDetail'
- description: 创建时间
in: query
name: createdAt
type: string
- description: 主键ID
in: query
name: id
type: integer
- description: 展示值
in: query
name: label
type: string
- description: 排序标记
in: query
name: sort
type: integer
- description: 启用状态
in: query
name: status
type: boolean
- description: 关联标记
in: query
name: sysDictionaryID
type: integer
- description: 更新时间
in: query
name: updatedAt
type: string
- description: 字典值
in: query
name: value
type: integer
produces:
- application/json
responses:
@ -2563,12 +2570,46 @@ paths:
consumes:
- application/json
parameters:
- description: 页码, 每页大小, 搜索条件
in: body
name: data
required: true
schema:
$ref: '#/definitions/request.SysDictionaryDetailSearch'
- description: 创建时间
in: query
name: createdAt
type: string
- description: 主键ID
in: query
name: id
type: integer
- description: 展示值
in: query
name: label
type: string
- description: 页码
in: query
name: page
type: integer
- description: 每页大小
in: query
name: pageSize
type: integer
- description: 排序标记
in: query
name: sort
type: integer
- description: 启用状态
in: query
name: status
type: boolean
- description: 关联标记
in: query
name: sysDictionaryID
type: integer
- description: 更新时间
in: query
name: updatedAt
type: string
- description: 字典值
in: query
name: value
type: integer
produces:
- application/json
responses:
@ -2678,12 +2719,58 @@ paths:
consumes:
- application/json
parameters:
- description: Id
in: body
name: data
required: true
schema:
$ref: '#/definitions/system.SysOperationRecord'
- description: 代理
in: query
name: agent
type: string
- description: 请求Body
in: query
name: body
type: string
- description: 创建时间
in: query
name: createdAt
type: string
- description: 错误信息
in: query
name: error_message
type: string
- description: 主键ID
in: query
name: id
type: integer
- description: 请求ip
in: query
name: ip
type: string
- description: 延迟
in: query
name: latency
type: string
- description: 请求方法
in: query
name: method
type: string
- description: 请求路径
in: query
name: path
type: string
- description: 响应Body
in: query
name: resp
type: string
- description: 请求状态
in: query
name: status
type: integer
- description: 更新时间
in: query
name: updatedAt
type: string
- description: 用户id
in: query
name: user_id
type: integer
produces:
- application/json
responses:
@ -2701,12 +2788,66 @@ paths:
consumes:
- application/json
parameters:
- description: 页码, 每页大小, 搜索条件
in: body
name: data
required: true
schema:
$ref: '#/definitions/request.SysOperationRecordSearch'
- description: 代理
in: query
name: agent
type: string
- description: 请求Body
in: query
name: body
type: string
- description: 创建时间
in: query
name: createdAt
type: string
- description: 错误信息
in: query
name: error_message
type: string
- description: 主键ID
in: query
name: id
type: integer
- description: 请求ip
in: query
name: ip
type: string
- description: 延迟
in: query
name: latency
type: string
- description: 请求方法
in: query
name: method
type: string
- description: 页码
in: query
name: page
type: integer
- description: 每页大小
in: query
name: pageSize
type: integer
- description: 请求路径
in: query
name: path
type: string
- description: 响应Body
in: query
name: resp
type: string
- description: 请求状态
in: query
name: status
type: integer
- description: 更新时间
in: query
name: updatedAt
type: string
- description: 用户id
in: query
name: user_id
type: integer
produces:
- application/json
responses:
@ -2783,7 +2924,7 @@ paths:
tags:
- System
/user/changePassword:
put:
post:
parameters:
- description: 用户名, 原密码, 新密码
in: body
@ -2826,6 +2967,22 @@ paths:
summary: 删除用户
tags:
- SysUser
/user/getUserInfo:
get:
consumes:
- application/json
produces:
- application/json
responses:
"200":
description: '{"success":true,"data":{},"msg":"获取成功"}'
schema:
type: string
security:
- ApiKeyAuth: []
summary: 获取用户信息
tags:
- SysUser
/user/getUserList:
post:
consumes:
@ -2868,6 +3025,29 @@ paths:
summary: 用户注册账号
tags:
- SysUser
/user/setUserAuthorities:
post:
consumes:
- application/json
parameters:
- description: 用户UUID, 角色ID
in: body
name: data
required: true
schema:
$ref: '#/definitions/request.SetUserAuthorities'
produces:
- application/json
responses:
"200":
description: '{"success":true,"data":{},"msg":"修改成功"}'
schema:
type: string
security:
- ApiKeyAuth: []
summary: 设置用户权限
tags:
- SysUser
/user/setUserAuthority:
post:
consumes:
@ -2888,7 +3068,7 @@ paths:
type: string
security:
- ApiKeyAuth: []
summary: 设置用户权限
summary: 更改用户权限
tags:
- SysUser
/user/setUserInfo:

4
server/go.mod
View File

@ -3,7 +3,6 @@ module github.com/flipped-aurora/gin-vue-admin
go 1.15
require (
github.com/360EntSecGroup-Skylar/excelize/v2 v2.3.2
github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d // indirect
github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751
github.com/aliyun/aliyun-oss-go-sdk v2.1.6+incompatible
@ -48,9 +47,8 @@ require (
github.com/tebeka/strftime v0.1.3 // indirect
github.com/tencentyun/cos-go-sdk-v5 v0.7.19
github.com/unrolled/secure v1.0.7
github.com/xuri/excelize/v2 v2.4.1
go.uber.org/zap v1.10.0
golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2 // indirect
golang.org/x/net v0.0.0-20210716203947-853a461950ff // indirect
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c // indirect
golang.org/x/tools v0.1.5 // indirect

2
server/model/common/request/common.go
View File

@ -17,7 +17,7 @@ type IdsReq struct {
// Get role by id structure
type GetAuthorityId struct {
AuthorityId string // 角色ID
AuthorityId string `json:"authorityId" form:"authorityId"` // 角色ID
}
type Empty struct{}

4
server/model/system/request/sys_menu.go
View File

@ -7,8 +7,8 @@ import (
// Add menu authority info structure
type AddMenuAuthorityInfo struct {
Menus []system.SysBaseMenu
AuthorityId string // 角色ID
Menus []system.SysBaseMenu `json:"menus"`
AuthorityId string `json:"authorityId"` // 角色ID
}
func DefaultMenu() []system.SysBaseMenu {

2
server/model/system/sys_system.go
View File

@ -6,5 +6,5 @@ import (
// 配置文件结构体
type System struct {
Config config.Server
Config config.Server `json:"config"`
}

4
server/resource/template/server/api.go.tpl
View File

@ -103,7 +103,7 @@ func ({{.Abbreviation}}Api *{{.StructName}}Api) Update{{.StructName}}(c *gin.Con
// @Security ApiKeyAuth
// @accept application/json
// @Produce application/json
// @Param data body autocode.{{.StructName}} true "用id查询{{.StructName}}"
// @Param data query autocode.{{.StructName}} true "用id查询{{.StructName}}"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"查询成功"}"
// @Router /{{.Abbreviation}}/find{{.StructName}} [get]
func ({{.Abbreviation}}Api *{{.StructName}}Api) Find{{.StructName}}(c *gin.Context) {
@ -123,7 +123,7 @@ func ({{.Abbreviation}}Api *{{.StructName}}Api) Find{{.StructName}}(c *gin.Conte
// @Security ApiKeyAuth
// @accept application/json
// @Produce application/json
// @Param data body autocodeReq.{{.StructName}}Search true "分页获取{{.StructName}}列表"
// @Param data query autocodeReq.{{.StructName}}Search true "分页获取{{.StructName}}列表"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
// @Router /{{.Abbreviation}}/get{{.StructName}}List [get]
func ({{.Abbreviation}}Api *{{.StructName}}Api) Get{{.StructName}}List(c *gin.Context) {

4
server/resource/template/web/api.js.tpl
View File

@ -69,7 +69,7 @@ export const update{{.StructName}} = (data) => {
// @Security ApiKeyAuth
// @accept application/json
// @Produce application/json
// @Param data body model.{{.StructName}} true "用id查询{{.StructName}}"
// @Param data query model.{{.StructName}} true "用id查询{{.StructName}}"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"查询成功"}"
// @Router /{{.Abbreviation}}/find{{.StructName}} [get]
export const find{{.StructName}} = (params) => {
@ -85,7 +85,7 @@ export const find{{.StructName}} = (params) => {
// @Security ApiKeyAuth
// @accept application/json
// @Produce application/json
// @Param data body request.PageInfo true "分页获取{{.StructName}}列表"
// @Param data query request.PageInfo true "分页获取{{.StructName}}列表"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
// @Router /{{.Abbreviation}}/get{{.StructName}}List [get]
export const get{{.StructName}}List = (params) => {

66
server/resource/template/web/form.vue.tpl
View File

@ -3,29 +3,29 @@
<el-form :model="formData" label-position="right" label-width="80px">
{{- range .Fields}}
<el-form-item label="{{.FieldDesc}}:">
{{ if eq .FieldType "bool" -}}
{{- if eq .FieldType "bool" }}
<el-switch active-color="#13ce66" inactive-color="#ff4949" active-text="是" inactive-text="否" v-model="formData.{{.FieldJson}}" clearable ></el-switch>
{{ end -}}
{{ if eq .FieldType "string" -}}
{{- end }}
{{- if eq .FieldType "string" }}
<el-input v-model="formData.{{.FieldJson}}" clearable placeholder="请输入" />
{{ end -}}
{{ if eq .FieldType "int" -}}
{{ if .DictType -}}
{{- end }}
{{- if eq .FieldType "int" }}
{{- if .DictType }}
<el-select v-model="formData.{{ .FieldJson }}" placeholder="请选择" clearable>
<el-option v-for="(item,key) in {{ .DictType }}Options" :key="key" :label="item.label" :value="item.value"></el-option>
<el-option v-for="(item,key) in {{ .DictType }}Options" :key="key" :label="item.label" :value="item.value" />
</el-select>
{{ else -}}
{{- else }}
<el-input v-model.number="formData.{{ .FieldJson }}" clearable placeholder="请输入" />
{{ end -}}
{{ end -}}
{{ if eq .FieldType "time.Time" }}
{{- end }}
{{- end }}
{{- if eq .FieldType "time.Time" }}
<el-date-picker type="date" placeholder="选择日期" v-model="formData.{{ .FieldJson }}" clearable></el-date-picker>
{{ end -}}
{{ if eq .FieldType "float64" }}
{{- end }}
{{- if eq .FieldType "float64" }}
<el-input-number v-model="formData.{{ .FieldJson }}" :precision="2" clearable></el-input-number>
{{ end -}}
{{- end }}
</el-form-item>
{{ end -}}
{{- end }}
<el-form-item>
<el-button size="mini" type="primary" @click="save">保存</el-button>
<el-button size="mini" type="primary" @click="back">返回</el-button>
@ -47,29 +47,29 @@ export default {
data() {
return {
type: '',
{{range .Fields}}
{{- range .Fields}}
{{- if .DictType }}
{{ .DictType }}Options: [],
{{ end -}}
{{end -}}
{{- end }}
{{- end }}
formData: {
{{range .Fields}}
{{- if eq .FieldType "bool" -}}
{{- range .Fields}}
{{- if eq .FieldType "bool" }}
{{.FieldJson}}: false,
{{ end -}}
{{- if eq .FieldType "string" -}}
{{- end }}
{{- if eq .FieldType "string" }}
{{.FieldJson}}: '',
{{ end -}}
{{- if eq .FieldType "int" -}}
{{- end }}
{{- if eq .FieldType "int" }}
{{.FieldJson}}: 0,
{{ end -}}
{{- if eq .FieldType "time.Time" -}}
{{- end }}
{{- if eq .FieldType "time.Time" }}
{{.FieldJson}}: new Date(),
{{ end -}}
{{- if eq .FieldType "float64" -}}
{{- end }}
{{- if eq .FieldType "float64" }}
{{.FieldJson}}: 0,
{{ end -}}
{{ end }}
{{- end }}
{{- end }}
}
}
},
@ -84,10 +84,10 @@ export default {
} else {
this.type = 'create'
}
{{ range .Fields -}}
{{- range .Fields }}
{{- if .DictType }}
await this.getDict("{{.DictType}}")
{{ end -}}
await this.getDict('{{.DictType}}')
{{- end }}
{{- end }}
},
methods: {

125
server/resource/template/web/table.vue.tpl
View File

@ -19,7 +19,7 @@
</el-form-item>
{{- else }}
<el-form-item label="{{.FieldDesc}}">
<el-input placeholder="搜索条件" v-model="searchInfo.{{.FieldJson}}" />
<el-input v-model="searchInfo.{{.FieldJson}}" placeholder="搜索条件" />
</el-form-item>{{ end }}{{ end }}{{ end }}
<el-form-item>
<el-button size="mini" type="primary" icon="el-icon-search" @click="onSubmit">查询</el-button>
@ -59,8 +59,9 @@
<el-table-column label="{{.FieldDesc}}" prop="{{.FieldJson}}" width="120">
<template slot-scope="scope">{{ "{{scope.row."}}{{.FieldJson}}{{"|formatBoolean}}" }}</template>
</el-table-column> {{- else }}
<el-table-column label="{{.FieldDesc}}" prop="{{.FieldJson}}" width="120" /> {{ end -}}
{{ end -}}
<el-table-column label="{{.FieldDesc}}" prop="{{.FieldJson}}" width="120" />
{{- end }}
{{- end }}
<el-table-column label="按钮组">
<template slot-scope="scope">
<el-button size="small" type="primary" icon="el-icon-edit" class="table-button" @click="update{{.StructName}}(scope.row)">变更</el-button>
@ -82,27 +83,27 @@
<el-form :model="formData" label-position="right" label-width="80px">
{{- range .Fields}}
<el-form-item label="{{.FieldDesc}}:">
{{ if eq .FieldType "bool" }}
{{- if eq .FieldType "bool" }}
<el-switch active-color="#13ce66" inactive-color="#ff4949" active-text="是" inactive-text="否" v-model="formData.{{.FieldJson}}" clearable ></el-switch>
{{ end -}}
{{ if eq .FieldType "string" }}
{{- end }}
{{- if eq .FieldType "string" }}
<el-input v-model="formData.{{.FieldJson}}" clearable placeholder="请输入" />
{{ end -}}
{{ if eq .FieldType "int" }}
{{- end }}
{{- if eq .FieldType "int" }}
{{- if .DictType}}
<el-select v-model="formData.{{ .FieldJson }}" placeholder="请选择" clearable>
<el-option v-for="(item,key) in {{ .DictType }}Options" :key="key" :label="item.label" :value="item.value" />
</el-select>
{{ else }}
{{- else }}
<el-input v-model.number="formData.{{ .FieldJson }}" clearable placeholder="请输入" />
{{ end -}}
{{ end -}}
{{ if eq .FieldType "time.Time" }}
{{- end }}
{{- end }}
{{- if eq .FieldType "time.Time" }}
<el-date-picker type="date" placeholder="选择日期" v-model="formData.{{ .FieldJson }}" clearable />
{{ end -}}
{{- end }}
{{- if eq .FieldType "float64" }}
<el-input-number v-model="formData.{{ .FieldJson }}" :precision="2" clearable />
{{ end -}}
{{- end }}
</el-form-item>
{{- end }}
</el-form>
@ -127,6 +128,23 @@ import { formatTimeToStr } from '@/utils/date'
import infoList from '@/mixins/infoList'
export default {
name: '{{.StructName}}',
filters: {
formatDate: function(time) {
if (time !== null && time !== '') {
var date = new Date(time)
return formatTimeToStr(date, 'yyyy-MM-dd hh:mm:ss')
} else {
return ''
}
},
formatBoolean: function(bool) {
if (bool != null) {
return bool ? '是' : '否'
} else {
return ''
}
}
},
mixins: [infoList],
data() {
return {
@ -135,55 +153,38 @@ export default {
type: '',
deleteVisible: false,
multipleSelection: [],
{{ range .Fields}}
{{- range .Fields}}
{{- if .DictType }}
{{ .DictType }}Options: [],
{{ end -}}
{{ end }}
{{- end }}
{{- end }}
formData: {
{{range .Fields}}
{{- if eq .FieldType "bool" -}}
{{- range .Fields}}
{{- if eq .FieldType "bool" }}
{{.FieldJson}}: false,
{{ end -}}
{{- if eq .FieldType "string" -}}
{{- end }}
{{- if eq .FieldType "string" }}
{{.FieldJson}}: '',
{{ end -}}
{{- if eq .FieldType "int" -}}
{{- end }}
{{- if eq .FieldType "int" }}
{{.FieldJson}}: 0,
{{ end -}}
{{- if eq .FieldType "time.Time" -}}
{{- end }}
{{- if eq .FieldType "time.Time" }}
{{.FieldJson}}: new Date(),
{{ end -}}
{{- if eq .FieldType "float64" -}}
{{- end }}
{{- if eq .FieldType "float64" }}
{{.FieldJson}}: 0,
{{ end -}}
{{ end }}
}
}
},
filters: {
formatDate: function(time) {
if (time !== null && time !== '') {
var date = new Date(time);
return formatTimeToStr(date, 'yyyy-MM-dd hh:mm:ss');
} else {
return ''
}
},
formatBoolean: function(bool) {
if (bool != null) {
return bool ? '是' : '否'
} else {
return ''
{{- end }}
{{- end }}
}
}
},
async created() {
await this.getTableData()
{{ range .Fields -}}
{{- range .Fields }}
{{- if .DictType }}
await this.getDict('{{.DictType}}')
{{ end -}}
{{- end }}
{{- end }}
},
methods: {
@ -246,23 +247,23 @@ export default {
closeDialog() {
this.dialogFormVisible = false
this.formData = {
{{range .Fields}}
{{- if eq .FieldType "bool" -}}
{{- range .Fields}}
{{- if eq .FieldType "bool" }}
{{.FieldJson}}: false,
{{ end -}}
{{- if eq .FieldType "string" -}}
{{- end }}
{{- if eq .FieldType "string" }}
{{.FieldJson}}: '',
{{ end -}}
{{- if eq .FieldType "int" -}}
{{- end }}
{{- if eq .FieldType "int" }}
{{.FieldJson}}: 0,
{{ end -}}
{{- if eq .FieldType "time.Time" -}}
{{- end }}
{{- if eq .FieldType "time.Time" }}
{{.FieldJson}}: new Date(),
{{ end -}}
{{- if eq .FieldType "float64" -}}
{{- end }}
{{- if eq .FieldType "float64" }}
{{.FieldJson}}: 0,
{{ end -}}
{{ end }}
{{- end }}
{{- end }}
}
},
async delete{{.StructName}}(row) {
@ -281,10 +282,10 @@ export default {
async enterDialog() {
let res
switch (this.type) {
case "create":
case 'create':
res = await create{{.StructName}}(this.formData)
break
case "update":
case 'update':
res = await update{{.StructName}}(this.formData)
break
default:

18
server/utils/validator.go
View File

@ -3,6 +3,7 @@ package utils
import (
"errors"
"reflect"
"regexp"
"strconv"
"strings"
)
@ -37,6 +38,15 @@ func NotEmpty() string {
return "notEmpty"
}
//@author: [zooqkl](https://github.com/zooqkl)
//@function: RegexpMatch
//@description: 正则校验 校验输入项是否满足正则表达式
//@param: rule string
//@return: string
func RegexpMatch(rule string) string {
return "regexp=" + rule
}
//@author: [piexlmax](https://github.com/piexlmax)
//@function: Lt
//@description: 小于入参(<) 如果为string array Slice则为长度比较 如果是 int uint float 则为数值比较
@ -133,6 +143,10 @@ func Verify(st interface{}, roleMap Rules) (err error) {
if isBlank(val) {
return errors.New(tagVal.Name + "值不能为空")
}
case strings.Split(v, "=")[0] == "regexp":
if !regexpMatch(strings.Split(v, "=")[1], val.String()) {
return errors.New(tagVal.Name + "格式校验不通过")
}
case compareMap[strings.Split(v, "=")[0]]:
if !compareVerify(val, v) {
return errors.New(tagVal.Name + "长度或值不在合法范围," + v)
@ -266,3 +280,7 @@ func compare(value interface{}, VerifyStr string) bool {
return false
}
}
func regexpMatch(rule, matchStr string) bool {
return regexp.MustCompile(rule).MatchString(matchStr)
}

2
web/.eslintrc.js
View File

@ -52,7 +52,7 @@ module.exports = {
properties: 'always'
}
],
'comma-dangle': [2, 'never'],
'comma-dangle': [2, 'only-multiline'],
'comma-spacing': [
2,
{

Write Preview
Loading…
Cancel
Save