fixed:调整v2.5.0测试版bug (#931)
* update readme badge for en * server/middleware/operation.go : fix 当记录日志当请求为GET时,不对query参数进行记录 * update element badge to element--plus-2.0.1-green * fix unmatched type of id field * update badge for vue gorm in readme * fixed:#917 Co-authored-by: helight <helight@helight.info> Co-authored-by: wan9xy <wan9xy@qq.com> Co-authored-by: he <trumanhe0@gmail.com> Co-authored-by: 无星夜 <31583810+TrumanH@users.noreply.github.com>
This commit is contained in:
committed by
GitHub
co-authored by
helight
wan9xy
he
无星夜
parent
c8ce379163
commit
30b16984ed
@@ -2,9 +2,12 @@ package middleware
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"encoding/json"
|
||||
"io/ioutil"
|
||||
"net/http"
|
||||
"net/url"
|
||||
"strconv"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/flipped-aurora/gin-vue-admin/server/utils"
|
||||
@@ -30,6 +33,18 @@ func OperationRecord() gin.HandlerFunc {
|
||||
} else {
|
||||
c.Request.Body = ioutil.NopCloser(bytes.NewBuffer(body))
|
||||
}
|
||||
} else {
|
||||
query := c.Request.URL.RawQuery
|
||||
query, _ = url.QueryUnescape(query)
|
||||
split := strings.Split(query, "&")
|
||||
m := make(map[string]string)
|
||||
for _, v := range split {
|
||||
kv := strings.Split(v, "=")
|
||||
if len(kv) == 2 {
|
||||
m[kv[0]] = kv[1]
|
||||
}
|
||||
}
|
||||
body, _ = json.Marshal(&m)
|
||||
}
|
||||
claims, _ := utils.GetClaims(c)
|
||||
if claims.ID != 0 {
|
||||
|
||||
@@ -8,7 +8,7 @@ type PageInfo struct {
|
||||
|
||||
// GetById Find by id structure
|
||||
type GetById struct {
|
||||
ID float64 `json:"id" form:"id"` // 主键ID
|
||||
ID int `json:"id" form:"id"` // 主键ID
|
||||
}
|
||||
|
||||
func (r *GetById) Uint() uint {
|
||||
|
||||
@@ -115,7 +115,7 @@ func (apiService *ApiService) GetAllApis() (err error, apis []system.SysApi) {
|
||||
//@param: id float64
|
||||
//@return: err error, api model.SysApi
|
||||
|
||||
func (apiService *ApiService) GetApiById(id float64) (err error, api system.SysApi) {
|
||||
func (apiService *ApiService) GetApiById(id int) (err error, api system.SysApi) {
|
||||
err = global.GVA_DB.Where("id = ?", id).First(&api).Error
|
||||
return
|
||||
}
|
||||
|
||||
@@ -16,7 +16,7 @@ type BaseMenuService struct{}
|
||||
//@param: id float64
|
||||
//@return: err error
|
||||
|
||||
func (baseMenuService *BaseMenuService) DeleteBaseMenu(id float64) (err error) {
|
||||
func (baseMenuService *BaseMenuService) DeleteBaseMenu(id int) (err error) {
|
||||
err = global.GVA_DB.Preload("MenuBtn").Preload("Parameters").Where("parent_id = ?", id).First(&system.SysBaseMenu{}).Error
|
||||
if err != nil {
|
||||
var menu system.SysBaseMenu
|
||||
@@ -118,7 +118,7 @@ func (baseMenuService *BaseMenuService) UpdateBaseMenu(menu system.SysBaseMenu)
|
||||
//@param: id float64
|
||||
//@return: err error, menu model.SysBaseMenu
|
||||
|
||||
func (baseMenuService *BaseMenuService) GetBaseMenuById(id float64) (err error, menu system.SysBaseMenu) {
|
||||
func (baseMenuService *BaseMenuService) GetBaseMenuById(id int) (err error, menu system.SysBaseMenu) {
|
||||
err = global.GVA_DB.Preload("MenuBtn").Preload("Parameters").Where("id = ?", id).First(&menu).Error
|
||||
return
|
||||
}
|
||||
|
||||
@@ -140,7 +140,7 @@ func (userService *UserService) SetUserAuthorities(id uint, authorityIds []strin
|
||||
//@param: id float64
|
||||
//@return: err error
|
||||
|
||||
func (userService *UserService) DeleteUser(id float64) (err error) {
|
||||
func (userService *UserService) DeleteUser(id int) (err error) {
|
||||
var user system.SysUser
|
||||
err = global.GVA_DB.Where("id = ?", id).Delete(&user).Error
|
||||
if err != nil {
|
||||
|
||||
Reference in New Issue
Block a user