Skip to content

Commit c676ac1

Browse files
author
piexlmax
committed
Merge remote-tracking branch 'origin/main'
2 parents 05d560c + 1e9b44d commit c676ac1

File tree

8 files changed

+28
-12
lines changed

8 files changed

+28
-12
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/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_base_menu.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ 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
@@ -118,7 +118,7 @@ func (baseMenuService *BaseMenuService) UpdateBaseMenu(menu system.SysBaseMenu)
118118
//@param: id float64
119119
//@return: err error, menu model.SysBaseMenu
120120

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

‎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/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)