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

补充遗漏的json type

main
蒋吉兆 3 years ago
parent
b05990c9dc
commit
87f86daca1
6 changed files with 186 additions and 214 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 194
      server/config.yaml
  2. 74
      server/docs/docs.go
  3. 74
      server/docs/swagger.json
  4. 52
      server/docs/swagger.yaml
  5. 4
      server/model/system/request/sys_menu.go
  6. 2
      server/model/system/sys_system.go

194
server/config.yaml
View File

@ -1,78 +1,13 @@
# Gin-Vue-Admin Global Configuration
# jwt configuration
jwt:
signing-key: 'qmPlus'
expires-time: 604800
buffer-time: 86400
# zap logger configuration
zap:
level: 'info'
format: 'console'
prefix: '[GIN-VUE-ADMIN]'
director: 'log'
link-name: 'latest_log'
show-line: true
encode-level: 'LowercaseColorLevelEncoder'
stacktrace-key: 'stacktrace'
log-in-console: true
# redis configuration
redis:
db: 0
addr: '127.0.0.1:6379'
password: ''
# email configuration
email:
to: 'xxx@qq.com'
port: 465
from: 'xxx@163.com'
host: 'smtp.163.com'
is-ssl: true
secret: 'xxx'
nickname: 'test'
# casbin configuration
casbin:
model-path: './resource/rbac_model.conf'
# system configuration
system:
env: 'public' # Change to "develop" to skip authentication for development mode
addr: 8888
db-type: 'mysql'
oss-type: 'local' # 控制oss选择走本期还是 七牛等其他仓 自行增加其他oss仓可以在 server/utils/upload/upload.go 中 NewOss函数配置
use-multipoint: false
# captcha configuration
captcha:
key-long: 6
img-width: 240
img-height: 80
# mysql connect configuration
# 未初始化之前请勿手动修改数据库信息！！！如果一定要手动初始化请看（https://www.gin-vue-admin.com/docs/first）
mysql:
path: ''
config: ''
db-name: ''
username: ''
password: ''
max-idle-conns: 10
max-open-conns: 100
log-mode: false
log-zap: ""
# local configuration
local:
path: 'uploads/file'
# autocode configuration
aliyun-oss:
endpoint: yourEndpoint
access-key-id: yourAccessKeyId
access-key-secret: yourAccessKeySecret
bucket-name: yourBucketName
bucket-url: yourBucketUrl
base-path: yourBasePath
autocode: autocode:
transfer-restart: true transfer-restart: true
root: ""
root: E:\gin-vue-admin
server: /server server: /server
server-api: /api/v1/autocode server-api: /api/v1/autocode
server-initialize: /initialize server-initialize: /initialize
@ -82,53 +17,80 @@ autocode:
server-service: /service/autocode server-service: /service/autocode
web: /web/src web: /web/src
web-api: /api web-api: /api
web-flow: /view
web-form: /view web-form: /view
web-table: /view web-table: /view
# qiniu configuration (请自行七牛申请对应的 公钥 私钥 bucket 和 域名地址)
web-flow: /view
captcha:
key-long: 6
img-width: 240
img-height: 80
casbin:
model-path: ./resource/rbac_model.conf
email:
to: xxx@qq.com
port: 465
from: xxx@163.com
host: smtp.163.com
is-ssl: true
secret: xxx
nickname: test
excel:
dir: ./resource/excel/
jwt:
signing-key: qmPlus
expires-time: 604800
buffer-time: 86400
local:
path: uploads/file
mysql:
path: 127.0.0.1:3306
config: charset=utf8mb4&parseTime=True&loc=Local
db-name: gva
username: root
password: Aa@6447985
max-idle-conns: 0
max-open-conns: 0
log-mode: ""
log-zap: false
qiniu: qiniu:
zone: 'ZoneHuaDong'
bucket: ''
img-path: ''
zone: ZoneHuaDong
bucket: ""
img-path: ""
use-https: false use-https: false
access-key: ''
secret-key: ''
access-key: ""
secret-key: ""
use-cdn-domains: false use-cdn-domains: false
# aliyun oss configuration
aliyun-oss:
endpoint: 'yourEndpoint'
access-key-id: 'yourAccessKeyId'
access-key-secret: 'yourAccessKeySecret'
bucket-name: 'yourBucketName'
bucket-url: 'yourBucketUrl'
base-path: 'yourBasePath'
# tencent cos configuration
redis:
db: 0
addr: 127.0.0.1:6379
password: ""
system:
env: public
addr: 8888
db-type: mysql
oss-type: local
use-multipoint: false
tencent-cos: tencent-cos:
bucket: 'xxxxx-10005608'
region: 'ap-shanghai'
secret-id: 'xxxxxxxx'
secret-key: 'xxxxxxxx'
base-url: 'https://gin.vue.admin'
path-prefix: 'gin-vue-admin'
# excel configuration
excel:
dir: './resource/excel/'
# timer task db clear table
Timer:
bucket: xxxxx-10005608
region: ap-shanghai
secret-id: xxxxxxxx
secret-key: xxxxxxxx
base-url: https://gin.vue.admin
path-prefix: gin-vue-admin
timer:
start: true start: true
spec: "@daily" # 定时任务详细配置参考 https://pkg.go.dev/github.com/robfig/cron/v3
detail: [
# tableName: 需要清理的表名
# compareField: 需要比较时间的字段
# interval: 时间间隔, 具体配置详看 time.ParseDuration() 中字符串表示 且不能为负数
# 2160h = 24 * 30 * 3 -> 三个月
{ tableName: "sys_operation_records" , compareField: "created_at", interval: "2160h" },
#{ tableName: "log2" , compareField: "created_at", interval: "2160h" }
]
spec: '@daily'
detail:
- tableName: sys_operation_records
compareField: created_at
interval: 2160h
zap:
level: info
format: console
prefix: '[GIN-VUE-ADMIN]'
director: log
link-name: latest_log
showLine: true
encode-level: LowercaseColorLevelEncoder
stacktrace-key: stacktrace
log-in-console: true

74
server/docs/docs.go
View File

@ -1554,7 +1554,9 @@ var doc = `{
} }
], ],
"responses": { "responses": {
"200": {}
"200": {
"description": ""
}
} }
} }
}, },
@ -1587,7 +1589,9 @@ var doc = `{
} }
], ],
"responses": { "responses": {
"200": {}
"200": {
"description": ""
}
} }
} }
}, },
@ -1944,7 +1948,7 @@ var doc = `{
} }
} }
}, },
"/menu/GetMenuAuthority": {
"/menu/addBaseMenu": {
"post": { "post": {
"security": [ "security": [
{ {
@ -1958,23 +1962,23 @@ var doc = `{
"application/json" "application/json"
], ],
"tags": [ "tags": [
"AuthorityMenu"
"Menu"
], ],
"summary": "获取指定角色menu",
"summary": "新增菜单",
"parameters": [ "parameters": [
{ {
"description": "角色ID",
"description": "路由path, 父菜单ID, 路由name, 对应前端文件路径, 排序标记",
"name": "data", "name": "data",
"in": "body", "in": "body",
"required": true, "required": true,
"schema": { "schema": {
"$ref": "#/definitions/request.GetAuthorityId"
"$ref": "#/definitions/system.SysBaseMenu"
} }
} }
], ],
"responses": { "responses": {
"200": { "200": {
"description": "{\"success\":true,\"data\":{},\"msg\":\"获取成功\"}",
"description": "{\"success\":true,\"data\":{},\"msg\":\"添加成功\"}",
"schema": { "schema": {
"type": "string" "type": "string"
} }
@ -1982,7 +1986,7 @@ var doc = `{
} }
} }
}, },
"/menu/addBaseMenu": {
"/menu/addMenuAuthority": {
"post": { "post": {
"security": [ "security": [
{ {
@ -1996,17 +2000,17 @@ var doc = `{
"application/json" "application/json"
], ],
"tags": [ "tags": [
"Menu"
"AuthorityMenu"
], ],
"summary": "新增菜单",
"summary": "增加menu和角色关联关系",
"parameters": [ "parameters": [
{ {
"description": "路由path, 父菜单ID, 路由name, 对应前端文件路径, 排序标记",
"description": "角色ID",
"name": "data", "name": "data",
"in": "body", "in": "body",
"required": true, "required": true,
"schema": { "schema": {
"$ref": "#/definitions/system.SysBaseMenu"
"$ref": "#/definitions/request.AddMenuAuthorityInfo"
} }
} }
], ],
@ -2020,7 +2024,7 @@ var doc = `{
} }
} }
}, },
"/menu/addMenuAuthority": {
"/menu/deleteBaseMenu": {
"post": { "post": {
"security": [ "security": [
{ {
@ -2034,23 +2038,23 @@ var doc = `{
"application/json" "application/json"
], ],
"tags": [ "tags": [
"AuthorityMenu"
"Menu"
], ],
"summary": "增加menu和角色关联关系",
"summary": "删除菜单",
"parameters": [ "parameters": [
{ {
"description": "角色ID",
"description": "菜单id",
"name": "data", "name": "data",
"in": "body", "in": "body",
"required": true, "required": true,
"schema": { "schema": {
"$ref": "#/definitions/request.AddMenuAuthorityInfo"
"$ref": "#/definitions/request.GetById"
} }
} }
], ],
"responses": { "responses": {
"200": { "200": {
"description": "{\"success\":true,\"data\":{},\"msg\":\"添加成功\"}",
"description": "{\"success\":true,\"data\":{},\"msg\":\"删除成功\"}",
"schema": { "schema": {
"type": "string" "type": "string"
} }
@ -2058,7 +2062,7 @@ var doc = `{
} }
} }
}, },
"/menu/deleteBaseMenu": {
"/menu/getBaseMenuById": {
"post": { "post": {
"security": [ "security": [
{ {
@ -2074,7 +2078,7 @@ var doc = `{
"tags": [ "tags": [
"Menu" "Menu"
], ],
"summary": "删除菜单",
"summary": "根据id获取菜单",
"parameters": [ "parameters": [
{ {
"description": "菜单id", "description": "菜单id",
@ -2088,7 +2092,7 @@ var doc = `{
], ],
"responses": { "responses": {
"200": { "200": {
"description": "{\"success\":true,\"data\":{},\"msg\":\"删除成功\"}",
"description": "{\"success\":true,\"data\":{},\"msg\":\"获取成功\"}",
"schema": { "schema": {
"type": "string" "type": "string"
} }
@ -2096,31 +2100,28 @@ var doc = `{
} }
} }
}, },
"/menu/getBaseMenuById": {
"/menu/getBaseMenuTree": {
"post": { "post": {
"security": [ "security": [
{ {
"ApiKeyAuth": [] "ApiKeyAuth": []
} }
], ],
"consumes": [
"application/json"
],
"produces": [ "produces": [
"application/json" "application/json"
], ],
"tags": [ "tags": [
"Menu"
"AuthorityMenu"
], ],
"summary": "根据id获取菜单",
"summary": "获取用户动态路由",
"parameters": [ "parameters": [
{ {
"description": "菜单id",
"description": "空",
"name": "data", "name": "data",
"in": "body", "in": "body",
"required": true, "required": true,
"schema": { "schema": {
"$ref": "#/definitions/request.GetById"
"$ref": "#/definitions/request.Empty"
} }
} }
], ],
@ -2134,7 +2135,7 @@ var doc = `{
} }
} }
}, },
"/menu/getBaseMenuTree": {
"/menu/getMenu": {
"post": { "post": {
"security": [ "security": [
{ {
@ -2169,28 +2170,31 @@ var doc = `{
} }
} }
}, },
"/menu/getMenu": {
"/menu/getMenuAuthority": {
"post": { "post": {
"security": [ "security": [
{ {
"ApiKeyAuth": [] "ApiKeyAuth": []
} }
], ],
"consumes": [
"application/json"
],
"produces": [ "produces": [
"application/json" "application/json"
], ],
"tags": [ "tags": [
"AuthorityMenu" "AuthorityMenu"
], ],
"summary": "获取用户动态路由",
"summary": "获取指定角色menu",
"parameters": [ "parameters": [
{ {
"description": "空",
"description": "角色ID",
"name": "data", "name": "data",
"in": "body", "in": "body",
"required": true, "required": true,
"schema": { "schema": {
"$ref": "#/definitions/request.Empty"
"$ref": "#/definitions/request.GetAuthorityId"
} }
} }
], ],

74
server/docs/swagger.json
View File

@ -1538,7 +1538,9 @@
} }
], ],
"responses": { "responses": {
"200": {}
"200": {
"description": ""
}
} }
} }
}, },
@ -1571,7 +1573,9 @@
} }
], ],
"responses": { "responses": {
"200": {}
"200": {
"description": ""
}
} }
} }
}, },
@ -1928,7 +1932,7 @@
} }
} }
}, },
"/menu/GetMenuAuthority": {
"/menu/addBaseMenu": {
"post": { "post": {
"security": [ "security": [
{ {
@ -1942,23 +1946,23 @@
"application/json" "application/json"
], ],
"tags": [ "tags": [
"AuthorityMenu"
"Menu"
], ],
"summary": "获取指定角色menu",
"summary": "新增菜单",
"parameters": [ "parameters": [
{ {
"description": "角色ID",
"description": "路由path, 父菜单ID, 路由name, 对应前端文件路径, 排序标记",
"name": "data", "name": "data",
"in": "body", "in": "body",
"required": true, "required": true,
"schema": { "schema": {
"$ref": "#/definitions/request.GetAuthorityId"
"$ref": "#/definitions/system.SysBaseMenu"
} }
} }
], ],
"responses": { "responses": {
"200": { "200": {
"description": "{\"success\":true,\"data\":{},\"msg\":\"获取成功\"}",
"description": "{\"success\":true,\"data\":{},\"msg\":\"添加成功\"}",
"schema": { "schema": {
"type": "string" "type": "string"
} }
@ -1966,7 +1970,7 @@
} }
} }
}, },
"/menu/addBaseMenu": {
"/menu/addMenuAuthority": {
"post": { "post": {
"security": [ "security": [
{ {
@ -1980,17 +1984,17 @@
"application/json" "application/json"
], ],
"tags": [ "tags": [
"Menu"
"AuthorityMenu"
], ],
"summary": "新增菜单",
"summary": "增加menu和角色关联关系",
"parameters": [ "parameters": [
{ {
"description": "路由path, 父菜单ID, 路由name, 对应前端文件路径, 排序标记",
"description": "角色ID",
"name": "data", "name": "data",
"in": "body", "in": "body",
"required": true, "required": true,
"schema": { "schema": {
"$ref": "#/definitions/system.SysBaseMenu"
"$ref": "#/definitions/request.AddMenuAuthorityInfo"
} }
} }
], ],
@ -2004,7 +2008,7 @@
} }
} }
}, },
"/menu/addMenuAuthority": {
"/menu/deleteBaseMenu": {
"post": { "post": {
"security": [ "security": [
{ {
@ -2018,23 +2022,23 @@
"application/json" "application/json"
], ],
"tags": [ "tags": [
"AuthorityMenu"
"Menu"
], ],
"summary": "增加menu和角色关联关系",
"summary": "删除菜单",
"parameters": [ "parameters": [
{ {
"description": "角色ID",
"description": "菜单id",
"name": "data", "name": "data",
"in": "body", "in": "body",
"required": true, "required": true,
"schema": { "schema": {
"$ref": "#/definitions/request.AddMenuAuthorityInfo"
"$ref": "#/definitions/request.GetById"
} }
} }
], ],
"responses": { "responses": {
"200": { "200": {
"description": "{\"success\":true,\"data\":{},\"msg\":\"添加成功\"}",
"description": "{\"success\":true,\"data\":{},\"msg\":\"删除成功\"}",
"schema": { "schema": {
"type": "string" "type": "string"
} }
@ -2042,7 +2046,7 @@
} }
} }
}, },
"/menu/deleteBaseMenu": {
"/menu/getBaseMenuById": {
"post": { "post": {
"security": [ "security": [
{ {
@ -2058,7 +2062,7 @@
"tags": [ "tags": [
"Menu" "Menu"
], ],
"summary": "删除菜单",
"summary": "根据id获取菜单",
"parameters": [ "parameters": [
{ {
"description": "菜单id", "description": "菜单id",
@ -2072,7 +2076,7 @@
], ],
"responses": { "responses": {
"200": { "200": {
"description": "{\"success\":true,\"data\":{},\"msg\":\"删除成功\"}",
"description": "{\"success\":true,\"data\":{},\"msg\":\"获取成功\"}",
"schema": { "schema": {
"type": "string" "type": "string"
} }
@ -2080,31 +2084,28 @@
} }
} }
}, },
"/menu/getBaseMenuById": {
"/menu/getBaseMenuTree": {
"post": { "post": {
"security": [ "security": [
{ {
"ApiKeyAuth": [] "ApiKeyAuth": []
} }
], ],
"consumes": [
"application/json"
],
"produces": [ "produces": [
"application/json" "application/json"
], ],
"tags": [ "tags": [
"Menu"
"AuthorityMenu"
], ],
"summary": "根据id获取菜单",
"summary": "获取用户动态路由",
"parameters": [ "parameters": [
{ {
"description": "菜单id",
"description": "空",
"name": "data", "name": "data",
"in": "body", "in": "body",
"required": true, "required": true,
"schema": { "schema": {
"$ref": "#/definitions/request.GetById"
"$ref": "#/definitions/request.Empty"
} }
} }
], ],
@ -2118,7 +2119,7 @@
} }
} }
}, },
"/menu/getBaseMenuTree": {
"/menu/getMenu": {
"post": { "post": {
"security": [ "security": [
{ {
@ -2153,28 +2154,31 @@
} }
} }
}, },
"/menu/getMenu": {
"/menu/getMenuAuthority": {
"post": { "post": {
"security": [ "security": [
{ {
"ApiKeyAuth": [] "ApiKeyAuth": []
} }
], ],
"consumes": [
"application/json"
],
"produces": [ "produces": [
"application/json" "application/json"
], ],
"tags": [ "tags": [
"AuthorityMenu" "AuthorityMenu"
], ],
"summary": "获取用户动态路由",
"summary": "获取指定角色menu",
"parameters": [ "parameters": [
{ {
"description": "空",
"description": "角色ID",
"name": "data", "name": "data",
"in": "body", "in": "body",
"required": true, "required": true,
"schema": { "schema": {
"$ref": "#/definitions/request.Empty"
"$ref": "#/definitions/request.GetAuthorityId"
} }
} }
], ],

52
server/docs/swagger.yaml
View File

@ -1857,7 +1857,8 @@ paths:
produces: produces:
- application/json - application/json
responses: responses:
"200": {}
"200":
description: ""
security: security:
- ApiKeyAuth: [] - ApiKeyAuth: []
summary: 下载模板 summary: 下载模板
@ -1877,7 +1878,8 @@ paths:
produces: produces:
- application/octet-stream - application/octet-stream
responses: responses:
"200": {}
"200":
description: ""
security: security:
- ApiKeyAuth: [] - ApiKeyAuth: []
summary: 导出Excel summary: 导出Excel
@ -2098,29 +2100,6 @@ 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:
@ -2255,6 +2234,29 @@ 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:

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

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

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

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