Skip to content

G
gin-vue-admin

pleasure / gin-vue-admin
与 Fork 源项目一致

Fork自 FLIPPED-AURORA / gin-vue-admin

通知 1
Star 0
Fork 0
G
gin-vue-admin

前往新版Gitcode，体验更适合开发者的 AI 搜索 >>

提交 6f751209 编写于 作者: S songzhibin97
浏览文件
操作

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

This reverts commit bb33c312, reversing
changes made to b9b4bc6b.
上级 bb33c312
展开全部 隐藏空白更改
内联 并排
Showing with 950 addition and 1739 deletion
server/api/v1/autocode/autocodeExample.go
浏览文件 @ 6f751209
...@@ -78,7 +78,7 @@ func (autoCodeExampleApi *AutoCodeExampleApi) UpdateAutoCodeExample(c *gin.Conte ...@@ -78,7 +78,7 @@ func (autoCodeExampleApi *AutoCodeExampleApi) UpdateAutoCodeExample(c *gin.Conte
// @Security ApiKeyAuth // @Security ApiKeyAuth
// @accept application/json // @accept application/json
// @Produce application/json // @Produce application/json
// @Param data query autocode.AutoCodeExample true "用id查询AutoCodeExample" // @Param data body autocode.AutoCodeExample true "用id查询AutoCodeExample"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"查询成功"}" // @Success 200 {string} string "{"success":true,"data":{},"msg":"查询成功"}"
// @Router /autoCodeExample/findAutoCodeExample [get] // @Router /autoCodeExample/findAutoCodeExample [get]
func (autoCodeExampleApi *AutoCodeExampleApi) FindAutoCodeExample(c *gin.Context) { func (autoCodeExampleApi *AutoCodeExampleApi) FindAutoCodeExample(c *gin.Context) {
...@@ -101,7 +101,7 @@ func (autoCodeExampleApi *AutoCodeExampleApi) FindAutoCodeExample(c *gin.Context ...@@ -101,7 +101,7 @@ func (autoCodeExampleApi *AutoCodeExampleApi) FindAutoCodeExample(c *gin.Context
// @Security ApiKeyAuth // @Security ApiKeyAuth
// @accept application/json // @accept application/json
// @Produce application/json // @Produce application/json
// @Param data query autocodeReq.AutoCodeExampleSearch true "页码, 每页大小, 搜索条件" // @Param data body autocodeReq.AutoCodeExampleSearch true "页码, 每页大小, 搜索条件"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}" // @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
// @Router /autoCodeExample/getAutoCodeExampleList [get] // @Router /autoCodeExample/getAutoCodeExampleList [get]
func (autoCodeExampleApi *AutoCodeExampleApi) GetAutoCodeExampleList(c *gin.Context) { func (autoCodeExampleApi *AutoCodeExampleApi) GetAutoCodeExampleList(c *gin.Context) {
......
server/api/v1/example/exa_customer.go
浏览文件 @ 6f751209
...@@ -94,7 +94,7 @@ func (e *CustomerApi) UpdateExaCustomer(c *gin.Context) { ...@@ -94,7 +94,7 @@ func (e *CustomerApi) UpdateExaCustomer(c *gin.Context) {
// @Security ApiKeyAuth // @Security ApiKeyAuth
// @accept application/json // @accept application/json
// @Produce application/json // @Produce application/json
// @Param data query example.ExaCustomer true "客户ID" // @Param data body example.ExaCustomer true "客户ID"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}" // @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
// @Router /customer/customer [get] // @Router /customer/customer [get]
func (e *CustomerApi) GetExaCustomer(c *gin.Context) { func (e *CustomerApi) GetExaCustomer(c *gin.Context) {
...@@ -118,7 +118,7 @@ func (e *CustomerApi) GetExaCustomer(c *gin.Context) { ...@@ -118,7 +118,7 @@ func (e *CustomerApi) GetExaCustomer(c *gin.Context) {
// @Security ApiKeyAuth // @Security ApiKeyAuth
// @accept application/json // @accept application/json
// @Produce application/json // @Produce application/json
// @Param data query request.PageInfo true "页码, 每页大小" // @Param data body request.PageInfo true "页码, 每页大小"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}" // @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
// @Router /customer/customerList [get] // @Router /customer/customerList [get]
func (e *CustomerApi) GetExaCustomerList(c *gin.Context) { func (e *CustomerApi) GetExaCustomerList(c *gin.Context) {
......
server/api/v1/system/sys_captcha.go
浏览文件 @ 6f751209
...@@ -10,7 +10,7 @@ import ( ...@@ -10,7 +10,7 @@ import (
) )
// 当开启多服务器部署时，替换下面的配置，使用redis共享存储验证码 // 当开启多服务器部署时，替换下面的配置，使用redis共享存储验证码
//var store = captcha.NewDefaultRedisStore() // var store = captcha.NewDefaultRedisStore()
var store = base64Captcha.DefaultMemStore var store = base64Captcha.DefaultMemStore
type BaseApi struct { type BaseApi struct {
...@@ -27,7 +27,6 @@ func (b *BaseApi) Captcha(c *gin.Context) { ...@@ -27,7 +27,6 @@ func (b *BaseApi) Captcha(c *gin.Context) {
// 字符,公式,验证码配置 // 字符,公式,验证码配置
// 生成默认数字的driver // 生成默认数字的driver
driver := base64Captcha.NewDriverDigit(global.GVA_CONFIG.Captcha.ImgHeight, global.GVA_CONFIG.Captcha.ImgWidth, global.GVA_CONFIG.Captcha.KeyLong, 0.7, 80) 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) cp := base64Captcha.NewCaptcha(driver, store)
if id, b64s, err := cp.Generate(); err != nil { if id, b64s, err := cp.Generate(); err != nil {
global.GVA_LOG.Error("验证码获取失败!", zap.Any("err", err)) global.GVA_LOG.Error("验证码获取失败!", zap.Any("err", err))
......
server/api/v1/system/sys_dictionary.go
浏览文件 @ 6f751209
...@@ -75,7 +75,7 @@ func (s *DictionaryApi) UpdateSysDictionary(c *gin.Context) { ...@@ -75,7 +75,7 @@ func (s *DictionaryApi) UpdateSysDictionary(c *gin.Context) {
// @Security ApiKeyAuth // @Security ApiKeyAuth
// @accept application/json // @accept application/json
// @Produce application/json // @Produce application/json
// @Param data query system.SysDictionary true "ID或字典英名" // @Param data body system.SysDictionary true "ID或字典英名"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"查询成功"}" // @Success 200 {string} string "{"success":true,"data":{},"msg":"查询成功"}"
// @Router /sysDictionary/findSysDictionary [get] // @Router /sysDictionary/findSysDictionary [get]
func (s *DictionaryApi) FindSysDictionary(c *gin.Context) { func (s *DictionaryApi) FindSysDictionary(c *gin.Context) {
...@@ -94,7 +94,7 @@ func (s *DictionaryApi) FindSysDictionary(c *gin.Context) { ...@@ -94,7 +94,7 @@ func (s *DictionaryApi) FindSysDictionary(c *gin.Context) {
// @Security ApiKeyAuth // @Security ApiKeyAuth
// @accept application/json // @accept application/json
// @Produce application/json // @Produce application/json
// @Param data query request.SysDictionarySearch true "页码, 每页大小, 搜索条件" // @Param data body request.SysDictionarySearch true "页码, 每页大小, 搜索条件"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}" // @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
// @Router /sysDictionary/getSysDictionaryList [get] // @Router /sysDictionary/getSysDictionaryList [get]
func (s *DictionaryApi) GetSysDictionaryList(c *gin.Context) { func (s *DictionaryApi) GetSysDictionaryList(c *gin.Context) {
......
server/api/v1/system/sys_dictionary_detail.go
浏览文件 @ 6f751209
...@@ -75,7 +75,7 @@ func (s *DictionaryDetailApi) UpdateSysDictionaryDetail(c *gin.Context) { ...@@ -75,7 +75,7 @@ func (s *DictionaryDetailApi) UpdateSysDictionaryDetail(c *gin.Context) {
// @Security ApiKeyAuth // @Security ApiKeyAuth
// @accept application/json // @accept application/json
// @Produce application/json // @Produce application/json
// @Param data query system.SysDictionaryDetail true "用id查询SysDictionaryDetail" // @Param data body system.SysDictionaryDetail true "用id查询SysDictionaryDetail"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"查询成功"}" // @Success 200 {string} string "{"success":true,"data":{},"msg":"查询成功"}"
// @Router /sysDictionaryDetail/findSysDictionaryDetail [get] // @Router /sysDictionaryDetail/findSysDictionaryDetail [get]
func (s *DictionaryDetailApi) FindSysDictionaryDetail(c *gin.Context) { func (s *DictionaryDetailApi) FindSysDictionaryDetail(c *gin.Context) {
...@@ -98,7 +98,7 @@ func (s *DictionaryDetailApi) FindSysDictionaryDetail(c *gin.Context) { ...@@ -98,7 +98,7 @@ func (s *DictionaryDetailApi) FindSysDictionaryDetail(c *gin.Context) {
// @Security ApiKeyAuth // @Security ApiKeyAuth
// @accept application/json // @accept application/json
// @Produce application/json // @Produce application/json
// @Param data query request.SysDictionaryDetailSearch true "页码, 每页大小, 搜索条件" // @Param data body request.SysDictionaryDetailSearch true "页码, 每页大小, 搜索条件"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}" // @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
// @Router /sysDictionaryDetail/getSysDictionaryDetailList [get] // @Router /sysDictionaryDetail/getSysDictionaryDetailList [get]
func (s *DictionaryDetailApi) GetSysDictionaryDetailList(c *gin.Context) { func (s *DictionaryDetailApi) GetSysDictionaryDetailList(c *gin.Context) {
......
server/api/v1/system/sys_menu.go
浏览文件 @ 6f751209
...@@ -81,7 +81,7 @@ func (a *AuthorityMenuApi) AddMenuAuthority(c *gin.Context) { ...@@ -81,7 +81,7 @@ func (a *AuthorityMenuApi) AddMenuAuthority(c *gin.Context) {
// @Produce application/json // @Produce application/json
// @Param data body request.GetAuthorityId true "角色ID" // @Param data body request.GetAuthorityId true "角色ID"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}" // @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
// @Router /menu/getMenuAuthority [post] // @Router /menu/GetMenuAuthority [post]
func (a *AuthorityMenuApi) GetMenuAuthority(c *gin.Context) { func (a *AuthorityMenuApi) GetMenuAuthority(c *gin.Context) {
var param request.GetAuthorityId var param request.GetAuthorityId
_ = c.ShouldBindJSON(&param) _ = c.ShouldBindJSON(&param)
......
server/api/v1/system/sys_operation_record.go
浏览文件 @ 6f751209
...@@ -76,7 +76,7 @@ func (s *OperationRecordApi) DeleteSysOperationRecordByIds(c *gin.Context) { ...@@ -76,7 +76,7 @@ func (s *OperationRecordApi) DeleteSysOperationRecordByIds(c *gin.Context) {
// @Security ApiKeyAuth // @Security ApiKeyAuth
// @accept application/json // @accept application/json
// @Produce application/json // @Produce application/json
// @Param data query system.SysOperationRecord true "Id" // @Param data body system.SysOperationRecord true "Id"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"查询成功"}" // @Success 200 {string} string "{"success":true,"data":{},"msg":"查询成功"}"
// @Router /sysOperationRecord/findSysOperationRecord [get] // @Router /sysOperationRecord/findSysOperationRecord [get]
func (s *OperationRecordApi) FindSysOperationRecord(c *gin.Context) { func (s *OperationRecordApi) FindSysOperationRecord(c *gin.Context) {
...@@ -99,7 +99,7 @@ func (s *OperationRecordApi) FindSysOperationRecord(c *gin.Context) { ...@@ -99,7 +99,7 @@ func (s *OperationRecordApi) FindSysOperationRecord(c *gin.Context) {
// @Security ApiKeyAuth // @Security ApiKeyAuth
// @accept application/json // @accept application/json
// @Produce application/json // @Produce application/json
// @Param data query request.SysOperationRecordSearch true "页码, 每页大小, 搜索条件" // @Param data body request.SysOperationRecordSearch true "页码, 每页大小, 搜索条件"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}" // @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
// @Router /sysOperationRecord/getSysOperationRecordList [get] // @Router /sysOperationRecord/getSysOperationRecordList [get]
func (s *OperationRecordApi) GetSysOperationRecordList(c *gin.Context) { func (s *OperationRecordApi) GetSysOperationRecordList(c *gin.Context) {
......
server/api/v1/system/sys_user.go
浏览文件 @ 6f751209
...@@ -143,7 +143,7 @@ func (b *BaseApi) Register(c *gin.Context) { ...@@ -143,7 +143,7 @@ func (b *BaseApi) Register(c *gin.Context) {
// @Produce application/json // @Produce application/json
// @Param data body systemReq.ChangePasswordStruct true "用户名, 原密码, 新密码" // @Param data body systemReq.ChangePasswordStruct true "用户名, 原密码, 新密码"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"修改成功"}" // @Success 200 {string} string "{"success":true,"data":{},"msg":"修改成功"}"
// @Router /user/changePassword [post] // @Router /user/changePassword [put]
func (b *BaseApi) ChangePassword(c *gin.Context) { func (b *BaseApi) ChangePassword(c *gin.Context) {
var user systemReq.ChangePasswordStruct var user systemReq.ChangePasswordStruct
_ = c.ShouldBindJSON(&user) _ = c.ShouldBindJSON(&user)
......
server/config.yaml
浏览文件 @ 6f751209
...@@ -132,4 +132,3 @@ Timer: ...@@ -132,4 +132,3 @@ Timer:
{ tableName: "sys_operation_records" , compareField: "created_at", interval: "2160h" }, { tableName: "sys_operation_records" , compareField: "created_at", interval: "2160h" },
#{ tableName: "log2" , compareField: "created_at", interval: "2160h" } #{ tableName: "log2" , compareField: "created_at", interval: "2160h" }
] ]
server/config/oss.go
浏览文件 @ 6f751209
...@@ -20,7 +20,7 @@ type AliyunOSS struct { ...@@ -20,7 +20,7 @@ type AliyunOSS struct {
AccessKeySecret string `mapstructure:"access-key-secret" json:"accessKeySecret" yaml:"access-key-secret"` AccessKeySecret string `mapstructure:"access-key-secret" json:"accessKeySecret" yaml:"access-key-secret"`
BucketName string `mapstructure:"bucket-name" json:"bucketName" yaml:"bucket-name"` BucketName string `mapstructure:"bucket-name" json:"bucketName" yaml:"bucket-name"`
BucketUrl string `mapstructure:"bucket-url" json:"bucketUrl" yaml:"bucket-url"` BucketUrl string `mapstructure:"bucket-url" json:"bucketUrl" yaml:"bucket-url"`
BasePath string `mapstructure:"base-path" json:"basePath" yaml:"base-path"` BasePath string `mapstructure:"base-path" json:"basePath" yaml:"base-path"`
} }
type TencentCOS struct { type TencentCOS struct {
Bucket string `mapstructure:"bucket" json:"bucket" yaml:"bucket"` Bucket string `mapstructure:"bucket" json:"bucket" yaml:"bucket"`
......
server/docs/docs.go
浏览文件 @ 6f751209
此差异已折叠。
server/docs/swagger.json
浏览文件 @ 6f751209
此差异已折叠。
server/docs/swagger.yaml
浏览文件 @ 6f751209
...@@ -387,6 +387,27 @@ definitions: ...@@ -387,6 +387,27 @@ definitions:
$ref: '#/definitions/system.SysBaseMenu' $ref: '#/definitions/system.SysBaseMenu'
type: array type: array
type: object 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: request.AutoHistoryByID:
properties: properties:
id: id:
...@@ -493,10 +514,6 @@ definitions: ...@@ -493,10 +514,6 @@ definitions:
properties: properties:
authorityId: authorityId:
type: string type: string
authorityIds:
items:
type: string
type: array
headerImg: headerImg:
type: string type: string
nickName: nickName:
...@@ -547,25 +564,135 @@ definitions: ...@@ -547,25 +564,135 @@ definitions:
authorityId: authorityId:
description: 角色ID description: 角色ID
type: string type: string
uuid:
description: 用户UUID
type: string
type: object type: object
request.SetUserAuthorities: request.SysAutoHistory:
properties: properties:
authorityIds: page:
description: 角色ID description: 页码
items: type: integer
type: string pageSize:
type: array description: 每页大小
type: integer
type: object
request.SysDictionaryDetailSearch:
properties:
createdAt:
description: 创建时间
type: string
id: 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: integer
type: object type: object
request.SysAutoHistory: request.SysDictionarySearch:
properties:
createdAt:
description: 创建时间
type: string
desc:
description: 描述
type: string
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:
properties: 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: page:
description: 页码 description: 页码
type: integer type: integer
pageSize: pageSize:
description: 每页大小 description: 每页大小
type: integer 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 type: object
response.SysAuthorityCopyResponse: response.SysAuthorityCopyResponse:
properties: properties:
...@@ -882,10 +1009,6 @@ definitions: ...@@ -882,10 +1009,6 @@ definitions:
activeColor: activeColor:
description: 活跃颜色 description: 活跃颜色
type: string type: string
authorities:
items:
$ref: '#/definitions/system.SysAuthority'
type: array
authority: authority:
$ref: '#/definitions/system.SysAuthority' $ref: '#/definitions/system.SysAuthority'
authorityId: authorityId:
...@@ -1521,22 +1644,12 @@ paths: ...@@ -1521,22 +1644,12 @@ paths:
consumes: consumes:
- application/json - application/json
parameters: parameters:
- description: 展示值 - description: 用id查询AutoCodeExample
in: query in: body
name: autoCodeExampleField name: data
type: string required: true
- description: 创建时间 schema:
in: query $ref: '#/definitions/autocode.AutoCodeExample'
name: createdAt
type: string
- description: 主键ID
in: query
name: id
type: integer
- description: 更新时间
in: query
name: updatedAt
type: string
produces: produces:
- application/json - application/json
responses: responses:
...@@ -1554,30 +1667,12 @@ paths: ...@@ -1554,30 +1667,12 @@ paths:
consumes: consumes:
- application/json - application/json
parameters: parameters:
- description: 展示值 - description: 页码, 每页大小, 搜索条件
in: query in: body
name: autoCodeExampleField name: data
type: string required: true
- description: 创建时间 schema:
in: query $ref: '#/definitions/request.AutoCodeExampleSearch'
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: produces:
- application/json - application/json
responses: responses:
...@@ -1721,34 +1816,12 @@ paths: ...@@ -1721,34 +1816,12 @@ paths:
consumes: consumes:
- application/json - application/json
parameters: parameters:
- description: 创建时间 - description: 客户ID
in: query in: body
name: createdAt name: data
type: string required: true
- description: 客户名 schema:
in: query $ref: '#/definitions/example.ExaCustomer'
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: produces:
- application/json - application/json
responses: responses:
...@@ -1810,14 +1883,12 @@ paths: ...@@ -1810,14 +1883,12 @@ paths:
consumes: consumes:
- application/json - application/json
parameters: parameters:
- description: 页码 - description: 页码, 每页大小
in: query in: body
name: page name: data
type: integer required: true
- description: 每页大小 schema:
in: query $ref: '#/definitions/request.PageInfo'
name: pageSize
type: integer
produces: produces:
- application/json - application/json
responses: responses:
...@@ -2100,6 +2171,29 @@ paths: ...@@ -2100,6 +2171,29 @@ paths:
summary: jwt加入黑名单 summary: jwt加入黑名单
tags: tags:
- Jwt - 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: /menu/addBaseMenu:
post: post:
consumes: consumes:
...@@ -2234,29 +2328,6 @@ paths: ...@@ -2234,29 +2328,6 @@ paths:
summary: 获取用户动态路由 summary: 获取用户动态路由
tags: tags:
- AuthorityMenu - 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: /menu/getMenuList:
post: post:
consumes: consumes:
...@@ -2354,34 +2425,12 @@ paths: ...@@ -2354,34 +2425,12 @@ paths:
consumes: consumes:
- application/json - application/json
parameters: parameters:
- description: 创建时间 - description: ID或字典英名
in: query in: body
name: createdAt name: data
type: string required: true
- description: 描述 schema:
in: query $ref: '#/definitions/system.SysDictionary'
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: produces:
- application/json - application/json
responses: responses:
...@@ -2399,42 +2448,12 @@ paths: ...@@ -2399,42 +2448,12 @@ paths:
consumes: consumes:
- application/json - application/json
parameters: parameters:
- description: 创建时间 - description: 页码, 每页大小, 搜索条件
in: query in: body
name: createdAt name: data
type: string required: true
- description: 描述 schema:
in: query $ref: '#/definitions/request.SysDictionarySearch'
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: produces:
- application/json - application/json
responses: responses:
...@@ -2521,38 +2540,12 @@ paths: ...@@ -2521,38 +2540,12 @@ paths:
consumes: consumes:
- application/json - application/json
parameters: parameters:
- description: 创建时间 - description: 用id查询SysDictionaryDetail
in: query in: body
name: createdAt name: data
type: string required: true
- description: 主键ID schema:
in: query $ref: '#/definitions/system.SysDictionaryDetail'
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: produces:
- application/json - application/json
responses: responses:
...@@ -2570,46 +2563,12 @@ paths: ...@@ -2570,46 +2563,12 @@ paths:
consumes: consumes:
- application/json - application/json
parameters: parameters:
- description: 创建时间 - description: 页码, 每页大小, 搜索条件
in: query in: body
name: createdAt name: data
type: string required: true
- description: 主键ID schema:
in: query $ref: '#/definitions/request.SysDictionaryDetailSearch'
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: produces:
- application/json - application/json
responses: responses:
...@@ -2719,58 +2678,12 @@ paths: ...@@ -2719,58 +2678,12 @@ paths:
consumes: consumes:
- application/json - application/json
parameters: parameters:
- description: 代理 - description: Id
in: query in: body
name: agent name: data
type: string required: true
- description: 请求Body schema:
in: query $ref: '#/definitions/system.SysOperationRecord'
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: produces:
- application/json - application/json
responses: responses:
...@@ -2788,66 +2701,12 @@ paths: ...@@ -2788,66 +2701,12 @@ paths:
consumes: consumes:
- application/json - application/json
parameters: parameters:
- description: 代理 - description: 页码, 每页大小, 搜索条件
in: query in: body
name: agent name: data
type: string required: true
- description: 请求Body schema:
in: query $ref: '#/definitions/request.SysOperationRecordSearch'
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: produces:
- application/json - application/json
responses: responses:
...@@ -2924,7 +2783,7 @@ paths: ...@@ -2924,7 +2783,7 @@ paths:
tags: tags:
- System - System
/user/changePassword: /user/changePassword:
post: put:
parameters: parameters:
- description: 用户名, 原密码, 新密码 - description: 用户名, 原密码, 新密码
in: body in: body
...@@ -2967,22 +2826,6 @@ paths: ...@@ -2967,22 +2826,6 @@ paths:
summary: 删除用户 summary: 删除用户
tags: tags:
- SysUser - 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: /user/getUserList:
post: post:
consumes: consumes:
...@@ -3025,29 +2868,6 @@ paths: ...@@ -3025,29 +2868,6 @@ paths:
summary: 用户注册账号 summary: 用户注册账号
tags: tags:
- SysUser - 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: /user/setUserAuthority:
post: post:
consumes: consumes:
...@@ -3068,7 +2888,7 @@ paths: ...@@ -3068,7 +2888,7 @@ paths:
type: string type: string
security: security:
- ApiKeyAuth: [] - ApiKeyAuth: []
summary: 更改用户权限 summary: 设置用户权限
tags: tags:
- SysUser - SysUser
/user/setUserInfo: /user/setUserInfo:
......
server/go.mod
浏览文件 @ 6f751209
...@@ -3,6 +3,7 @@ module github.com/flipped-aurora/gin-vue-admin ...@@ -3,6 +3,7 @@ module github.com/flipped-aurora/gin-vue-admin
go 1.15 go 1.15
require ( require (
github.com/360EntSecGroup-Skylar/excelize/v2 v2.3.2
github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d // indirect github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d // indirect
github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751
github.com/aliyun/aliyun-oss-go-sdk v2.1.6+incompatible github.com/aliyun/aliyun-oss-go-sdk v2.1.6+incompatible
...@@ -47,8 +48,9 @@ require ( ...@@ -47,8 +48,9 @@ require (
github.com/tebeka/strftime v0.1.3 // indirect github.com/tebeka/strftime v0.1.3 // indirect
github.com/tencentyun/cos-go-sdk-v5 v0.7.19 github.com/tencentyun/cos-go-sdk-v5 v0.7.19
github.com/unrolled/secure v1.0.7 github.com/unrolled/secure v1.0.7
github.com/xuri/excelize/v2 v2.4.1
go.uber.org/zap v1.10.0 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/sync v0.0.0-20210220032951-036812b2e83c
golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c // indirect golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c // indirect
golang.org/x/tools v0.1.5 // indirect golang.org/x/tools v0.1.5 // indirect
......
server/model/common/request/common.go
浏览文件 @ 6f751209
...@@ -17,7 +17,7 @@ type IdsReq struct { ...@@ -17,7 +17,7 @@ type IdsReq struct {
// Get role by id structure // Get role by id structure
type GetAuthorityId struct { type GetAuthorityId struct {
AuthorityId string `json:"authorityId" form:"authorityId"` // 角色ID AuthorityId string // 角色ID
} }
type Empty struct{} type Empty struct{}
server/model/system/request/sys_menu.go
浏览文件 @ 6f751209
...@@ -7,8 +7,8 @@ import ( ...@@ -7,8 +7,8 @@ import (
// Add menu authority info structure // Add menu authority info structure
type AddMenuAuthorityInfo struct { type AddMenuAuthorityInfo struct {
Menus []system.SysBaseMenu `json:"menus"` Menus []system.SysBaseMenu
AuthorityId string `json:"authorityId"` // 角色ID AuthorityId string // 角色ID
} }
func DefaultMenu() []system.SysBaseMenu { func DefaultMenu() []system.SysBaseMenu {
......
server/model/system/sys_system.go
浏览文件 @ 6f751209
...@@ -6,5 +6,5 @@ import ( ...@@ -6,5 +6,5 @@ import (
// 配置文件结构体 // 配置文件结构体
type System struct { type System struct {
Config config.Server `json:"config"` Config config.Server
} }
server/resource/template/server/api.go.tpl
浏览文件 @ 6f751209
...@@ -103,7 +103,7 @@ func ({{.Abbreviation}}Api *{{.StructName}}Api) Update{{.StructName}}(c *gin.Con ...@@ -103,7 +103,7 @@ func ({{.Abbreviation}}Api *{{.StructName}}Api) Update{{.StructName}}(c *gin.Con
// @Security ApiKeyAuth // @Security ApiKeyAuth
// @accept application/json // @accept application/json
// @Produce application/json // @Produce application/json
// @Param data query autocode.{{.StructName}} true "用id查询{{.StructName}}" // @Param data body autocode.{{.StructName}} true "用id查询{{.StructName}}"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"查询成功"}" // @Success 200 {string} string "{"success":true,"data":{},"msg":"查询成功"}"
// @Router /{{.Abbreviation}}/find{{.StructName}} [get] // @Router /{{.Abbreviation}}/find{{.StructName}} [get]
func ({{.Abbreviation}}Api *{{.StructName}}Api) Find{{.StructName}}(c *gin.Context) { func ({{.Abbreviation}}Api *{{.StructName}}Api) Find{{.StructName}}(c *gin.Context) {
...@@ -123,7 +123,7 @@ func ({{.Abbreviation}}Api *{{.StructName}}Api) Find{{.StructName}}(c *gin.Conte ...@@ -123,7 +123,7 @@ func ({{.Abbreviation}}Api *{{.StructName}}Api) Find{{.StructName}}(c *gin.Conte
// @Security ApiKeyAuth // @Security ApiKeyAuth
// @accept application/json // @accept application/json
// @Produce application/json // @Produce application/json
// @Param data query autocodeReq.{{.StructName}}Search true "分页获取{{.StructName}}列表" // @Param data body autocodeReq.{{.StructName}}Search true "分页获取{{.StructName}}列表"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}" // @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
// @Router /{{.Abbreviation}}/get{{.StructName}}List [get] // @Router /{{.Abbreviation}}/get{{.StructName}}List [get]
func ({{.Abbreviation}}Api *{{.StructName}}Api) Get{{.StructName}}List(c *gin.Context) { func ({{.Abbreviation}}Api *{{.StructName}}Api) Get{{.StructName}}List(c *gin.Context) {
......
server/resource/template/web/api.js.tpl
浏览文件 @ 6f751209
...@@ -69,7 +69,7 @@ export const update{{.StructName}} = (data) => { ...@@ -69,7 +69,7 @@ export const update{{.StructName}} = (data) => {
// @Security ApiKeyAuth // @Security ApiKeyAuth
// @accept application/json // @accept application/json
// @Produce application/json // @Produce application/json
// @Param data query model.{{.StructName}} true "用id查询{{.StructName}}" // @Param data body model.{{.StructName}} true "用id查询{{.StructName}}"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"查询成功"}" // @Success 200 {string} string "{"success":true,"data":{},"msg":"查询成功"}"
// @Router /{{.Abbreviation}}/find{{.StructName}} [get] // @Router /{{.Abbreviation}}/find{{.StructName}} [get]
export const find{{.StructName}} = (params) => { export const find{{.StructName}} = (params) => {
...@@ -85,7 +85,7 @@ export const find{{.StructName}} = (params) => { ...@@ -85,7 +85,7 @@ export const find{{.StructName}} = (params) => {
// @Security ApiKeyAuth // @Security ApiKeyAuth
// @accept application/json // @accept application/json
// @Produce application/json // @Produce application/json
// @Param data query request.PageInfo true "分页获取{{.StructName}}列表" // @Param data body request.PageInfo true "分页获取{{.StructName}}列表"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}" // @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
// @Router /{{.Abbreviation}}/get{{.StructName}}List [get] // @Router /{{.Abbreviation}}/get{{.StructName}}List [get]
export const get{{.StructName}}List = (params) => { export const get{{.StructName}}List = (params) => {
...@@ -94,4 +94,4 @@ export const get{{.StructName}}List = (params) => { ...@@ -94,4 +94,4 @@ export const get{{.StructName}}List = (params) => {
method: 'get', method: 'get',
params params
}) })
} }
\ No newline at end of file
server/resource/template/web/form.vue.tpl
浏览文件 @ 6f751209
...@@ -3,35 +3,35 @@ ...@@ -3,35 +3,35 @@
<el-form :model="formData" label-position="right" label-width="80px"> <el-form :model="formData" label-position="right" label-width="80px">
{{- range .Fields}} {{- range .Fields}}
<el-form-item label="{{.FieldDesc}}:"> <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> <el-switch active-color="#13ce66" inactive-color="#ff4949" active-text="是" inactive-text="否" v-model="formData.{{.FieldJson}}" clearable ></el-switch>
{{- end }} {{ end -}}
{{- if eq .FieldType "string" }} {{ if eq .FieldType "string" -}}
<el-input v-model="formData.{{.FieldJson}}" clearable placeholder="请输入" /> <el-input v-model="formData.{{.FieldJson}}" clearable placeholder="请输入" />
{{- end }} {{ end -}}
{{- if eq .FieldType "int" }} {{ if eq .FieldType "int" -}}
{{- if .DictType }} {{ if .DictType -}}
<el-select v-model="formData.{{ .FieldJson }}" placeholder="请选择" clearable> <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 v-for="(item,key) in {{ .DictType }}Options" :key="key" :label="item.label" :value="item.value"></el-option>
</el-select> </el-select>
{{- else }} {{ else -}}
<el-input v-model.number="formData.{{ .FieldJson }}" clearable placeholder="请输入" /> <el-input v-model.number="formData.{{ .FieldJson }}" clearable placeholder="请输入"/>
{{- end }} {{ end -}}
{{- end }} {{ end -}}
{{- if eq .FieldType "time.Time" }} {{ if eq .FieldType "time.Time" }}
<el-date-picker type="date" placeholder="选择日期" v-model="formData.{{ .FieldJson }}" clearable></el-date-picker> <el-date-picker type="date" placeholder="选择日期" v-model="formData.{{ .FieldJson }}" clearable></el-date-picker>
{{- end }} {{ end -}}
{{- if eq .FieldType "float64" }} {{ if eq .FieldType "float64" }}
<el-input-number v-model="formData.{{ .FieldJson }}" :precision="2" clearable></el-input-number> <el-input-number v-model="formData.{{ .FieldJson }}" :precision="2" clearable></el-input-number>
{{- end }} {{ end -}}
</el-form-item> </el-form-item>
{{- end }} {{ end -}}
<el-form-item> <el-form-item>
<el-button size="mini" type="primary" @click="save">保存</el-button> <el-button size="mini" type="primary" @click="save">保存</el-button>
<el-button size="mini" type="primary" @click="back">返回</el-button> <el-button size="mini" type="primary" @click="back">返回</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
</template> </template>
<script> <script>
...@@ -47,29 +47,29 @@ export default { ...@@ -47,29 +47,29 @@ export default {
data() { data() {
return { return {
type: '', type: '',
{{- range .Fields}} {{range .Fields}}
{{- if .DictType }} {{- if .DictType }}
{{ .DictType }}Options: [], {{ .DictType }}Options: [],
{{- end }} {{ end -}}
{{- end }} {{end -}}
formData: { formData: {
{{- range .Fields}} {{range .Fields}}
{{- if eq .FieldType "bool" }} {{- if eq .FieldType "bool" -}}
{{.FieldJson}}: false, {{.FieldJson}}: false,
{{- end }} {{ end -}}
{{- if eq .FieldType "string" }} {{- if eq .FieldType "string" -}}
{{.FieldJson}}: '', {{.FieldJson}}: '',
{{- end }} {{ end -}}
{{- if eq .FieldType "int" }} {{- if eq .FieldType "int" -}}
{{.FieldJson}}: 0, {{.FieldJson}}: 0,
{{- end }} {{ end -}}
{{- if eq .FieldType "time.Time" }} {{- if eq .FieldType "time.Time" -}}
{{.FieldJson}}: new Date(), {{.FieldJson}}: new Date(),
{{- end }} {{ end -}}
{{- if eq .FieldType "float64" }} {{- if eq .FieldType "float64" -}}
{{.FieldJson}}: 0, {{.FieldJson}}: 0,
{{- end }} {{ end -}}
{{- end }} {{ end }}
} }
} }
}, },
...@@ -84,10 +84,10 @@ export default { ...@@ -84,10 +84,10 @@ export default {
} else { } else {
this.type = 'create' this.type = 'create'
} }
{{- range .Fields }} {{ range .Fields -}}
{{- if .DictType }} {{- if .DictType }}
await this.getDict('{{.DictType}}') await this.getDict("{{.DictType}}")
{{- end }} {{ end -}}
{{- end }} {{- end }}
}, },
methods: { methods: {
...@@ -119,4 +119,4 @@ export default { ...@@ -119,4 +119,4 @@ export default {
</script> </script>
<style> <style>
</style> </style>
\ No newline at end of file
server/resource/template/web/table.vue.tpl
浏览文件 @ 6f751209
...@@ -19,8 +19,8 @@ ...@@ -19,8 +19,8 @@
</el-form-item> </el-form-item>
{{- else }} {{- else }}
<el-form-item label="{{.FieldDesc}}"> <el-form-item label="{{.FieldDesc}}">
<el-input v-model="searchInfo.{{.FieldJson}}" placeholder="搜索条件" /> <el-input placeholder="搜索条件" v-model="searchInfo.{{.FieldJson}}" />
</el-form-item>{{ end }}{{ end }}{{ end }} </el-form-item> {{ end }} {{ end }} {{ end }}
<el-form-item> <el-form-item>
<el-button size="mini" type="primary" icon="el-icon-search" @click="onSubmit">查询</el-button> <el-button size="mini" type="primary" icon="el-icon-search" @click="onSubmit">查询</el-button>
<el-button size="mini" type="primary" icon="el-icon-plus" @click="openDialog">新增</el-button> <el-button size="mini" type="primary" icon="el-icon-plus" @click="openDialog">新增</el-button>
...@@ -52,16 +52,15 @@ ...@@ -52,16 +52,15 @@
{{- if .DictType}} {{- if .DictType}}
<el-table-column label="{{.FieldDesc}}" prop="{{.FieldJson}}" width="120"> <el-table-column label="{{.FieldDesc}}" prop="{{.FieldJson}}" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
{{"{{"}} filterDict(scope.row.{{.FieldJson}},"{{.DictType}}") {{"}}"}} {{"{{"}}filterDict(scope.row.{{.FieldJson}},"{{.DictType}}"){{"}}"}}
</template> </template>
</el-table-column> </el-table-column>
{{- else if eq .FieldType "bool" }} {{- else if eq .FieldType "bool" }}
<el-table-column label="{{.FieldDesc}}" prop="{{.FieldJson}}" width="120"> <el-table-column label="{{.FieldDesc}}" prop="{{.FieldJson}}" width="120">
<template slot-scope="scope">{{ "{{scope.row."}}{{.FieldJson}}{{"|formatBoolean}}" }}</template> <template slot-scope="scope">{{ "{{scope.row."}}{{.FieldJson}}{{"|formatBoolean}}" }}</template>
</el-table-column> {{- else }} </el-table-column> {{- else }}
<el-table-column label="{{.FieldDesc}}" prop="{{.FieldJson}}" width="120" /> <el-table-column label="{{.FieldDesc}}" prop="{{.FieldJson}}" width="120" /> {{ end -}}
{{- end }} {{ end -}}
{{- end }}
<el-table-column label="按钮组"> <el-table-column label="按钮组">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="small" type="primary" icon="el-icon-edit" class="table-button" @click="update{{.StructName}}(scope.row)">变更</el-button> <el-button size="small" type="primary" icon="el-icon-edit" class="table-button" @click="update{{.StructName}}(scope.row)">变更</el-button>
...@@ -83,30 +82,30 @@ ...@@ -83,30 +82,30 @@
<el-form :model="formData" label-position="right" label-width="80px"> <el-form :model="formData" label-position="right" label-width="80px">
{{- range .Fields}} {{- range .Fields}}
<el-form-item label="{{.FieldDesc}}:"> <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> <el-switch active-color="#13ce66" inactive-color="#ff4949" active-text="是" inactive-text="否" v-model="formData.{{.FieldJson}}" clearable ></el-switch>
{{- end }} {{ end -}}
{{- if eq .FieldType "string" }} {{ if eq .FieldType "string" }}
<el-input v-model="formData.{{.FieldJson}}" clearable placeholder="请输入" /> <el-input v-model="formData.{{.FieldJson}}" clearable placeholder="请输入" />
{{- end }} {{ end -}}
{{- if eq .FieldType "int" }} {{ if eq .FieldType "int" }}
{{- if .DictType}} {{- if .DictType}}
<el-select v-model="formData.{{ .FieldJson }}" placeholder="请选择" clearable> <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 v-for="(item,key) in {{ .DictType }}Options" :key="key" :label="item.label" :value="item.value" />
</el-select> </el-select>
{{- else }} {{ else }}
<el-input v-model.number="formData.{{ .FieldJson }}" clearable placeholder="请输入" /> <el-input v-model.number="formData.{{ .FieldJson }}" clearable placeholder="请输入" />
{{- end }} {{ end -}}
{{- end }} {{ end -}}
{{- if eq .FieldType "time.Time" }} {{ if eq .FieldType "time.Time" }}
<el-date-picker type="date" placeholder="选择日期" v-model="formData.{{ .FieldJson }}" clearable /> <el-date-picker type="date" placeholder="选择日期" v-model="formData.{{ .FieldJson }}" clearable />
{{- end }} {{ end -}}
{{- if eq .FieldType "float64" }} {{- if eq .FieldType "float64" }}
<el-input-number v-model="formData.{{ .FieldJson }}" :precision="2" clearable /> <el-input-number v-model="formData.{{ .FieldJson }}" :precision="2" clearable />
{{- end }} {{ end -}}
</el-form-item> </el-form-item>
{{- end }} {{- end }}
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="closeDialog">取 消</el-button> <el-button @click="closeDialog">取 消</el-button>
<el-button type="primary" @click="enterDialog">确 定</el-button> <el-button type="primary" @click="enterDialog">确 定</el-button>
...@@ -128,23 +127,6 @@ import { formatTimeToStr } from '@/utils/date' ...@@ -128,23 +127,6 @@ import { formatTimeToStr } from '@/utils/date'
import infoList from '@/mixins/infoList' import infoList from '@/mixins/infoList'
export default { export default {
name: '{{.StructName}}', 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], mixins: [infoList],
data() { data() {
return { return {
...@@ -153,49 +135,66 @@ export default { ...@@ -153,49 +135,66 @@ export default {
type: '', type: '',
deleteVisible: false, deleteVisible: false,
multipleSelection: [], multipleSelection: [],
{{- range .Fields}} {{ range .Fields}}
{{- if .DictType }} {{- if .DictType }}
{{ .DictType }}Options: [], {{ .DictType }}Options: [],
{{- end }} {{ end -}}
{{- end }} {{ end }}
formData: { formData: {
{{- range .Fields}} {{range .Fields}}
{{- if eq .FieldType "bool" }} {{- if eq .FieldType "bool" -}}
{{.FieldJson}}: false, {{.FieldJson}}: false,
{{- end }} {{ end -}}
{{- if eq .FieldType "string" }} {{- if eq .FieldType "string" -}}
{{.FieldJson}}: '', {{.FieldJson}}: '',
{{- end }} {{ end -}}
{{- if eq .FieldType "int" }} {{- if eq .FieldType "int" -}}
{{.FieldJson}}: 0, {{.FieldJson}}: 0,
{{- end }} {{ end -}}
{{- if eq .FieldType "time.Time" }} {{- if eq .FieldType "time.Time" -}}
{{.FieldJson}}: new Date(), {{.FieldJson}}: new Date(),
{{- end }} {{ end -}}
{{- if eq .FieldType "float64" }} {{- if eq .FieldType "float64" -}}
{{.FieldJson}}: 0, {{.FieldJson}}: 0,
{{- end }} {{ end -}}
{{- 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 ''
} }
} }
}, },
async created() { async created() {
await this.getTableData() await this.getTableData()
{{- range .Fields }} {{ range .Fields -}}
{{- if .DictType }} {{- if .DictType }}
await this.getDict('{{.DictType}}') await this.getDict('{{.DictType}}')
{{- end }} {{ end -}}
{{- end }} {{- end }}
}, },
methods: { methods: {
// 条件搜索前端看此方法 // 条件搜索前端看此方法
onSubmit() { onSubmit() {
this.page = 1 this.page = 1
this.pageSize = 10 this.pageSize = 10
{{- range .Fields}}{{- if eq .FieldType "bool" }} {{- range .Fields}} {{- if eq .FieldType "bool" }}
if (this.searchInfo.{{.FieldJson}} === ""){ if (this.searchInfo.{{.FieldJson}} === ""){
this.searchInfo.{{.FieldJson}}=null this.searchInfo.{{.FieldJson}}=null
}{{ end }}{{ end }} } {{ end }} {{ end }}
this.getTableData() this.getTableData()
}, },
handleSelectionChange(val) { handleSelectionChange(val) {
...@@ -247,23 +246,23 @@ export default { ...@@ -247,23 +246,23 @@ export default {
closeDialog() { closeDialog() {
this.dialogFormVisible = false this.dialogFormVisible = false
this.formData = { this.formData = {
{{- range .Fields}} {{range .Fields}}
{{- if eq .FieldType "bool" }} {{- if eq .FieldType "bool" -}}
{{.FieldJson}}: false, {{.FieldJson}}: false,
{{- end }} {{ end -}}
{{- if eq .FieldType "string" }} {{- if eq .FieldType "string" -}}
{{.FieldJson}}: '', {{.FieldJson}}: '',
{{- end }} {{ end -}}
{{- if eq .FieldType "int" }} {{- if eq .FieldType "int" -}}
{{.FieldJson}}: 0, {{.FieldJson}}: 0,
{{- end }} {{ end -}}
{{- if eq .FieldType "time.Time" }} {{- if eq .FieldType "time.Time" -}}
{{.FieldJson}}: new Date(), {{.FieldJson}}: new Date(),
{{- end }} {{ end -}}
{{- if eq .FieldType "float64" }} {{- if eq .FieldType "float64" -}}
{{.FieldJson}}: 0, {{.FieldJson}}: 0,
{{- end }} {{ end -}}
{{- end }} {{ end }}
} }
}, },
async delete{{.StructName}}(row) { async delete{{.StructName}}(row) {
...@@ -273,7 +272,7 @@ export default { ...@@ -273,7 +272,7 @@ export default {
type: 'success', type: 'success',
message: '删除成功' message: '删除成功'
}) })
if (this.tableData.length === 1 && this.page > 1) { if (this.tableData.length === 1 && this.page > 1 ) {
this.page-- this.page--
} }
this.getTableData() this.getTableData()
...@@ -282,10 +281,10 @@ export default { ...@@ -282,10 +281,10 @@ export default {
async enterDialog() { async enterDialog() {
let res let res
switch (this.type) { switch (this.type) {
case 'create': case "create":
res = await create{{.StructName}}(this.formData) res = await create{{.StructName}}(this.formData)
break break
case 'update': case "update":
res = await update{{.StructName}}(this.formData) res = await update{{.StructName}}(this.formData)
break break
default: default:
......
server/utils/validator.go
浏览文件 @ 6f751209
...@@ -3,7 +3,6 @@ package utils ...@@ -3,7 +3,6 @@ package utils
import ( import (
"errors" "errors"
"reflect" "reflect"
"regexp"
"strconv" "strconv"
"strings" "strings"
) )
...@@ -38,15 +37,6 @@ func NotEmpty() string { ...@@ -38,15 +37,6 @@ func NotEmpty() string {
return "notEmpty" 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) //@author: [piexlmax](https://github.com/piexlmax)
//@function: Lt //@function: Lt
//@description: 小于入参(<) 如果为string array Slice则为长度比较 如果是 int uint float 则为数值比较 //@description: 小于入参(<) 如果为string array Slice则为长度比较 如果是 int uint float 则为数值比较
...@@ -143,10 +133,6 @@ func Verify(st interface{}, roleMap Rules) (err error) { ...@@ -143,10 +133,6 @@ func Verify(st interface{}, roleMap Rules) (err error) {
if isBlank(val) { if isBlank(val) {
return errors.New(tagVal.Name + "值不能为空") 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]]: case compareMap[strings.Split(v, "=")[0]]:
if !compareVerify(val, v) { if !compareVerify(val, v) {
return errors.New(tagVal.Name + "长度或值不在合法范围," + v) return errors.New(tagVal.Name + "长度或值不在合法范围," + v)
...@@ -280,7 +266,3 @@ func compare(value interface{}, VerifyStr string) bool { ...@@ -280,7 +266,3 @@ func compare(value interface{}, VerifyStr string) bool {
return false return false
} }
} }
func regexpMatch(rule, matchStr string) bool {
return regexp.MustCompile(rule).MatchString(matchStr)
}
web/.eslintrc.js
浏览文件 @ 6f751209
...@@ -52,7 +52,7 @@ module.exports = { ...@@ -52,7 +52,7 @@ module.exports = {
properties: 'always' properties: 'always'
} }
], ],
'comma-dangle': [2, 'only-multiline'], 'comma-dangle': [2, 'never'],
'comma-spacing': [ 'comma-spacing': [
2, 2,
{ {
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或