Skip to content

Commit 1d0d00e

Browse files
author
piexlmax
committed
Merge remote-tracking branch 'origin/main'
2 parents 8a5f060 + 2172db4 commit 1d0d00e

File tree

11 files changed

+70
-40
lines changed

11 files changed

+70
-40
lines changed

‎README-en.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
<img src="http://qmplusimg.henrongyi.top/gvalogo.jpg" width=300" height="300" />
44
</div>
55
<div align=center>
6-
<img src="https://img.shields.io/badge/golang-1.14-blue"/>
6+
<img src="https://img.shields.io/badge/golang-1.16-blue"/>
77
<img src="https://img.shields.io/badge/gin-1.7.0-lightBlue"/>
8-
<img src="https://img.shields.io/badge/vue-2.6.10-brightgreen"/>
9-
<img src="https://img.shields.io/badge/element--ui-2.12.0-green"/>
10-
<img src="https://img.shields.io/badge/gorm-1.20.7-red"/>
8+
<img src="https://img.shields.io/badge/vue-3.2.25-brightgreen"/>
9+
<img src="https://img.shields.io/badge/element--plus-2.0.1-green"/>
10+
<img src="https://img.shields.io/badge/gorm-1.22.5-red"/>
1111
</div>
1212

1313
English | [简体中文](./README.md)

‎README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
<div align=center>
66
<img src="https://img.shields.io/badge/golang-1.16-blue"/>
77
<img src="https://img.shields.io/badge/gin-1.7.0-lightBlue"/>
8-
<img src="https://img.shields.io/badge/vue-3.0.0-brightgreen"/>
9-
<img src="https://img.shields.io/badge/element--plus-1.1.0beta8-green"/>
10-
<img src="https://img.shields.io/badge/gorm-1.20.7-red"/>
8+
<img src="https://img.shields.io/badge/vue-3.2.25-brightgreen"/>
9+
<img src="https://img.shields.io/badge/element--plus-2.0.1-green"/>
10+
<img src="https://img.shields.io/badge/gorm-1.22.5-red"/>
1111
</div>
1212

1313
[English](./README-en.md) | 简体中文

‎server/config.yaml

Lines changed: 21 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -84,24 +84,20 @@ pgsql:
8484
log-mode: ""
8585
log-zap: false
8686

87-
db-list: [
88-
{
89-
disabled: true, # 是否启用
90-
type: "", # 数据库的类型,目前支持mysql、pgsql
91-
alias-name: "", # 数据库的名称,注意: alias-name 需要在db-list中唯一
92-
path: '',
93-
port: '',
94-
config: '',
95-
db-name: '',
96-
username: '',
97-
password: '',
98-
max-idle-conns: 10,
99-
max-open-conns: 100,
100-
log-mode: "",
101-
log-zap: false,
102-
}
103-
]
104-
87+
db-list:
88+
- disabled: true # 是否启用
89+
type: "" # 数据库的类型,目前支持mysql、pgsql
90+
alias-name: "" # 数据库的名称,注意: alias-name 需要在db-list中唯一
91+
path: ''
92+
port: ''
93+
config: ''
94+
db-name: ''
95+
username: ''
96+
password: ''
97+
max-idle-conns: 10
98+
max-open-conns: 100
99+
log-mode: ""
100+
log-zap: false
105101

106102

107103
# local configuration
@@ -179,15 +175,13 @@ excel:
179175
Timer:
180176
start: true
181177
spec: "@daily" # 定时任务详细配置参考 https://pkg.go.dev/github.com/robfig/cron/v3
182-
detail: [
183-
# tableName: 需要清理的表名
184-
# compareField: 需要比较时间的字段
185-
# interval: 时间间隔, 具体配置详看 time.ParseDuration() 中字符串表示 且不能为负数
186-
# 2160h = 24 * 30 * 3 -> 三个月
187-
{ tableName: "sys_operation_records" , compareField: "created_at", interval: "2160h" },
188-
{ tableName: "jwt_blacklists" , compareField: "created_at", interval: "168h" }
189-
#{ tableName: "log2" , compareField: "created_at", interval: "2160h" }
190-
]
178+
detail:
179+
- tableName: "sys_operation_records"
180+
compareField: "created_at"
181+
interval: "2160h"
182+
- tableName: "jwt_blacklists"
183+
compareField: "created_at"
184+
interval: "168h"
191185

192186
# 跨域配置
193187
# 需要配合 server/initialize/router.go#L32 使用

‎server/middleware/operation.go

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,12 @@ package middleware
22

33
import (
44
"bytes"
5+
"encoding/json"
56
"io/ioutil"
67
"net/http"
8+
"net/url"
79
"strconv"
10+
"strings"
811
"time"
912

1013
"github.com/flipped-aurora/gin-vue-admin/server/utils"
@@ -30,6 +33,18 @@ func OperationRecord() gin.HandlerFunc {
3033
} else {
3134
c.Request.Body = ioutil.NopCloser(bytes.NewBuffer(body))
3235
}
36+
} else {
37+
query := c.Request.URL.RawQuery
38+
query, _ = url.QueryUnescape(query)
39+
split := strings.Split(query, "&")
40+
m := make(map[string]string)
41+
for _, v := range split {
42+
kv := strings.Split(v, "=")
43+
if len(kv) == 2 {
44+
m[kv[0]] = kv[1]
45+
}
46+
}
47+
body, _ = json.Marshal(&m)
3348
}
3449
claims, _ := utils.GetClaims(c)
3550
if claims.ID != 0 {

‎server/model/common/request/common.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ type PageInfo struct {
88

99
// GetById Find by id structure
1010
type GetById struct {
11-
ID float64 `json:"id" form:"id"` // 主键ID
11+
ID int `json:"id" form:"id"` // 主键ID
1212
}
1313

1414
func (r *GetById) Uint() uint {

‎server/service/system/sys_api.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ func (apiService *ApiService) GetAllApis() (err error, apis []system.SysApi) {
115115
//@param: id float64
116116
//@return: err error, api model.SysApi
117117

118-
func (apiService *ApiService) GetApiById(id float64) (err error, api system.SysApi) {
118+
func (apiService *ApiService) GetApiById(id int) (err error, api system.SysApi) {
119119
err = global.GVA_DB.Where("id = ?", id).First(&api).Error
120120
return
121121
}

‎server/service/system/sys_authority.go

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,23 @@ func (authorityService *AuthorityService) CopyAuthority(copyInfo response.SysAut
5757
if err != nil {
5858
return
5959
}
60+
61+
var btns []system.SysAuthorityBtn
62+
63+
err = global.GVA_DB.Find(&btns, "authority_id = ?", copyInfo.OldAuthorityId).Error
64+
if err != nil {
65+
return
66+
}
67+
if len(btns) > 0 {
68+
for i := range btns {
69+
btns[i].AuthorityId = copyInfo.Authority.AuthorityId
70+
}
71+
err = global.GVA_DB.Create(&btns).Error
72+
73+
if err != nil {
74+
return
75+
}
76+
}
6077
paths := CasbinServiceApp.GetPolicyPathByAuthorityId(copyInfo.OldAuthorityId)
6178
err = CasbinServiceApp.UpdateCasbin(copyInfo.Authority.AuthorityId, paths)
6279
if err != nil {
@@ -113,6 +130,7 @@ func (authorityService *AuthorityService) DeleteAuthority(auth *system.SysAuthor
113130
}
114131
}
115132
err = global.GVA_DB.Delete(&[]system.SysUseAuthority{}, "sys_authority_authority_id = ?", auth.AuthorityId).Error
133+
err = global.GVA_DB.Delete(&[]system.SysAuthorityBtn{}, "authority_id = ?", auth.AuthorityId).Error
116134
CasbinServiceApp.ClearCasbin(0, auth.AuthorityId)
117135
return err
118136
}

‎server/service/system/sys_base_menu.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,14 @@ type BaseMenuService struct{}
1616
//@param: id float64
1717
//@return: err error
1818

19-
func (baseMenuService *BaseMenuService) DeleteBaseMenu(id float64) (err error) {
19+
func (baseMenuService *BaseMenuService) DeleteBaseMenu(id int) (err error) {
2020
err = global.GVA_DB.Preload("MenuBtn").Preload("Parameters").Where("parent_id = ?", id).First(&system.SysBaseMenu{}).Error
2121
if err != nil {
2222
var menu system.SysBaseMenu
2323
db := global.GVA_DB.Preload("SysAuthoritys").Where("id = ?", id).First(&menu).Delete(&menu)
2424
err = global.GVA_DB.Delete(&system.SysBaseMenuParameter{}, "sys_base_menu_id = ?", id).Error
25+
err = global.GVA_DB.Delete(&system.SysBaseMenuBtn{}, "sys_base_menu_id = ?", id).Error
26+
err = global.GVA_DB.Delete(&system.SysAuthorityBtn{}, "sys_menu_id = ?", id).Error
2527
if err != nil {
2628
return err
2729
}
@@ -116,7 +118,7 @@ func (baseMenuService *BaseMenuService) UpdateBaseMenu(menu system.SysBaseMenu)
116118
//@param: id float64
117119
//@return: err error, menu model.SysBaseMenu
118120

119-
func (baseMenuService *BaseMenuService) GetBaseMenuById(id float64) (err error, menu system.SysBaseMenu) {
121+
func (baseMenuService *BaseMenuService) GetBaseMenuById(id int) (err error, menu system.SysBaseMenu) {
120122
err = global.GVA_DB.Preload("MenuBtn").Preload("Parameters").Where("id = ?", id).First(&menu).Error
121123
return
122124
}

‎server/service/system/sys_user.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ func (userService *UserService) SetUserAuthorities(id uint, authorityIds []strin
140140
//@param: id float64
141141
//@return: err error
142142

143-
func (userService *UserService) DeleteUser(id float64) (err error) {
143+
func (userService *UserService) DeleteUser(id int) (err error) {
144144
var user system.SysUser
145145
err = global.GVA_DB.Where("id = ?", id).Delete(&user).Error
146146
if err != nil {

‎web/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
"eslint-plugin-vue": "^7.0.0",
4646
"sass": "^1.26.5",
4747
"sass-loader": "^8.0.2",
48-
"vite": "2.5.10",
48+
"vite": "^2.8.0",
4949
"vite-plugin-banner": "^0.1.3",
5050
"vite-plugin-importer": "^0.2.5"
5151
}

‎web/src/pinia/modules/user.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ export const useUserStore = defineStore('user', () => {
6767
const res = await jsonInBlacklist()
6868
if (res.code === 0) {
6969
token.value = ''
70+
sessionStorage.clear()
7071
localStorage.clear()
7172
router.push({ name: 'Login', replace: true })
7273
window.location.reload()

0 commit comments

Comments
 (0)