Skip to content

Commit 2086a73

Browse files
committed
feat: 兼容不同版本数据库的json操作
1 parent a5e8980 commit 2086a73

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

server/api/v1/system/sys_user.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package system
22

33
import (
4-
"gorm.io/datatypes"
4+
"github.com/flipped-aurora/gin-vue-admin/server/model/common"
55
"strconv"
66
"time"
77

@@ -424,14 +424,14 @@ func (b *BaseApi) SetSelfInfo(c *gin.Context) {
424424
// @Success 200 {object} response.Response{data=map[string]interface{},msg=string} "设置用户配置"
425425
// @Router /user/SetSelfSetting [put]
426426
func (b *BaseApi) SetSelfSetting(c *gin.Context) {
427-
var req datatypes.JSON
427+
var req common.JSONMap
428428
err := c.ShouldBindJSON(&req)
429429
if err != nil {
430430
response.FailWithMessage(err.Error(), c)
431431
return
432432
}
433433

434-
err = userService.SetSelfSetting(&req, utils.GetUserID(c))
434+
err = userService.SetSelfSetting(req, utils.GetUserID(c))
435435
if err != nil {
436436
global.GVA_LOG.Error("设置失败!", zap.Error(err))
437437
response.FailWithMessage("设置失败", c)

server/service/system/sys_user.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package system
33
import (
44
"errors"
55
"fmt"
6-
"gorm.io/datatypes"
6+
"github.com/flipped-aurora/gin-vue-admin/server/model/common"
77
"time"
88

99
"github.com/flipped-aurora/gin-vue-admin/server/global"
@@ -244,7 +244,7 @@ func (userService *UserService) SetSelfInfo(req system.SysUser) error {
244244
//@param: req datatypes.JSON, uid uint
245245
//@return: err error
246246

247-
func (userService *UserService) SetSelfSetting(req *datatypes.JSON, uid uint) error {
247+
func (userService *UserService) SetSelfSetting(req common.JSONMap, uid uint) error {
248248
return global.GVA_DB.Model(&system.SysUser{}).Where("id = ?", uid).Update("origin_setting", req).Error
249249
}
250250

0 commit comments

Comments
 (0)