Browse Source

状态码以及token更新

huangyan 9 months ago
parent
commit
ca197b4a63
8 changed files with 338 additions and 336 deletions
  1. 124 124
      app/controller/user.go
  2. 17 17
      app/middlewares/token_middleware.go
  3. 15 15
      app/router.go
  4. 129 127
      app/service/imp/user_imp.go
  5. 15 15
      app/service/user_service.go
  6. 16 16
      global/redis.go
  7. 1 1
      go.mod
  8. 21 21
      main.go

+ 124 - 124
app/controller/user.go

@@ -1,18 +1,18 @@
 package controller
 
 import (
-	"Ic_ouath/app/e"
-	"Ic_ouath/app/service"
-	"Ic_ouath/app/service/imp"
-	"Ic_ouath/global"
-	"Ic_ouath/models"
-	"Ic_ouath/page"
-	"Ic_ouath/simple_zap"
-	"Ic_ouath/utils"
-	"context"
-	"github.com/astaxie/beego/validation"
-	"github.com/gin-gonic/gin"
-	"github.com/go-playground/validator/v10"
+    "Ic_ouath/app/e"
+    "Ic_ouath/app/service"
+    "Ic_ouath/app/service/imp"
+    "Ic_ouath/global"
+    "Ic_ouath/models"
+    "Ic_ouath/page"
+    "Ic_ouath/simple_zap"
+    "Ic_ouath/utils"
+    "context"
+    "github.com/astaxie/beego/validation"
+    "github.com/gin-gonic/gin"
+    "github.com/go-playground/validator/v10"
 )
 
 var users service.User = &imp.User{}
@@ -26,14 +26,14 @@ var users service.User = &imp.User{}
 // @Accept application/json
 // @Router /user [post]
 func PhoneRegist(c *gin.Context) {
-	var userRegist models.UserRegist
-	err := c.ShouldBindJSON(&userRegist)
-	if err != nil {
-		e.ResponseError(c, e.JSONParsingFailed)
-		return
-	}
-	rescode := users.PhoneRegist(userRegist)
-	e.ResponseError(c, rescode)
+    var userRegist models.UserRegist
+    err := c.ShouldBindJSON(&userRegist)
+    if err != nil {
+        e.ResponseError(c, e.JSONParsingFailed)
+        return
+    }
+    rescode := users.PhoneRegist(userRegist)
+    e.ResponseError(c, rescode)
 }
 
 // SendCode 发送验证码
@@ -45,21 +45,21 @@ func PhoneRegist(c *gin.Context) {
 // @Accept application/json
 // @Router /sendcode [post]
 func SendCode(c *gin.Context) {
-	phone := c.PostForm("phone")
-	utils.SendModel(phone)
-	v := validation.Validation{}
-	v.Mobile(phone, "phone")
-	v.Required(phone, "phone")
-	if v.HasErrors() {
-		e.ResponseWithMsg(c, e.ThePhoneNumberIsWrong, "手机号码格式不正确")
-	} else {
-		rescode := utils.SendModel(phone)
-		if rescode != e.SUCCESS {
-			e.ResponseWithMsg(c, rescode, rescode.GetMsg())
-		} else {
-			e.ResponseSuccess(c, "发送成功")
-		}
-	}
+    phone := c.PostForm("phone")
+    utils.SendModel(phone)
+    v := validation.Validation{}
+    v.Mobile(phone, "phone")
+    v.Required(phone, "phone")
+    if v.HasErrors() {
+        e.ResponseWithMsg(c, e.ThePhoneNumberIsWrong, "手机号码格式不正确")
+    } else {
+        rescode := utils.SendModel(phone)
+        if rescode != e.SUCCESS {
+            e.ResponseWithMsg(c, rescode, rescode.GetMsg())
+        } else {
+            e.ResponseSuccess(c, "发送成功")
+        }
+    }
 }
 
 // Login 账号登录
@@ -71,19 +71,19 @@ func SendCode(c *gin.Context) {
 // @Accept application/json
 // @Router /user [post]
 func Login(c *gin.Context) {
-	var userRegist models.UserRegist
-	err := c.ShouldBindJSON(&userRegist)
-	if err != nil {
-		e.ResponseWithMsg(c, e.JSONParsingFailed, e.JSONParsingFailed.GetMsg())
-		return
-	} else {
-		login, rescode := users.Login(userRegist)
-		if rescode == e.SUCCESS {
-			e.ResponseSuccess(c, login)
-		} else {
-			e.ResponseWithMsg(c, rescode, rescode.GetMsg())
-		}
-	}
+    var userRegist models.UserRegist
+    err := c.ShouldBindJSON(&userRegist)
+    if err != nil {
+        e.ResponseWithMsg(c, e.JSONParsingFailed, e.JSONParsingFailed.GetMsg())
+        return
+    } else {
+        login, rescode := users.Login(userRegist)
+        if rescode == e.SUCCESS {
+            e.ResponseSuccess(c, login)
+        } else {
+            e.ResponseWithMsg(c, rescode, rescode.GetMsg())
+        }
+    }
 }
 
 // CodeLogin  验证码登录
@@ -95,31 +95,31 @@ func Login(c *gin.Context) {
 // @Accept application/json
 // @Router /codelogin [post]
 func CodeLogin(c *gin.Context) {
-	var userRegist models.UserRegist
-	err := c.ShouldBindJSON(&userRegist)
-	if err != nil {
-		e.ResponseWithMsg(c, e.JSONParsingFailed, e.JSONParsingFailed.GetMsg())
-		simple_zap.WithCtx(context.Background()).Sugar().Warn(err, e.JSONParsingFailed.GetMsg())
-		return
-	}
-	login, rescode := users.CodeLogin(userRegist)
-	if rescode == e.SUCCESS {
-		e.ResponseSuccess(c, login)
-	} else {
-		e.ResponseWithMsg(c, rescode, rescode.GetMsg())
-		simple_zap.WithCtx(context.Background()).Sugar().Warn(err, rescode.GetMsg())
-	}
+    var userRegist models.UserRegist
+    err := c.ShouldBindJSON(&userRegist)
+    if err != nil {
+        e.ResponseWithMsg(c, e.JSONParsingFailed, e.JSONParsingFailed.GetMsg())
+        simple_zap.WithCtx(context.Background()).Sugar().Warn(err, e.JSONParsingFailed.GetMsg())
+        return
+    }
+    login, rescode := users.CodeLogin(userRegist)
+    if rescode == e.SUCCESS {
+        e.ResponseSuccess(c, login)
+    } else {
+        e.ResponseWithMsg(c, rescode, rescode.GetMsg())
+        simple_zap.WithCtx(context.Background()).Sugar().Warn(err, rescode.GetMsg())
+    }
 }
 
 // GetUserAll 获取所有用户
 
 func GetUserAll(c *gin.Context) {
-	user, rescode := users.GetUserAll()
-	if rescode == e.SUCCESS {
-		e.ResponseSuccess(c, user)
-	} else {
-		e.ResponseWithMsg(c, rescode, rescode.GetMsg())
-	}
+    user, rescode := users.GetUserAll()
+    if rescode == e.SUCCESS {
+        e.ResponseSuccess(c, user)
+    } else {
+        e.ResponseWithMsg(c, rescode, rescode.GetMsg())
+    }
 }
 
 // GetUserAlls 获取所有用户
@@ -131,20 +131,20 @@ func GetUserAll(c *gin.Context) {
 // @Accept application/json
 // @Router /admin/getalluser [post]
 func GetUserAlls(c *gin.Context) {
-	var pages page.PageParams
-	err := c.ShouldBindJSON(&pages)
-	if err != nil {
-		e.ResponseWithMsg(c, e.JSONParsingFailed, e.JSONParsingFailed.GetMsg())
-		simple_zap.WithCtx(context.Background()).Sugar().Warn(err, e.JSONParsingFailed.GetMsg())
-		return
-	}
-	result, total, err := page.Paginate(global.DBLink, pages, models.User{})
-	if err != nil {
-		e.ResponseWithMsg(c, e.PaginationFailed, e.PaginationFailed.GetMsg())
-		simple_zap.WithCtx(context.Background()).Sugar().Warn(err, e.PaginationFailed.GetMsg())
-		return
-	}
-	e.ResPonsePage(c, result, total, pages)
+    var pages page.PageParams
+    err := c.ShouldBindJSON(&pages)
+    if err != nil {
+        e.ResponseWithMsg(c, e.JSONParsingFailed, e.JSONParsingFailed.GetMsg())
+        simple_zap.WithCtx(context.Background()).Sugar().Warn(err, e.JSONParsingFailed.GetMsg())
+        return
+    }
+    result, total, err := page.Paginate(global.DBLink, pages, models.User{})
+    if err != nil {
+        e.ResponseWithMsg(c, e.PaginationFailed, e.PaginationFailed.GetMsg())
+        simple_zap.WithCtx(context.Background()).Sugar().Warn(err, e.PaginationFailed.GetMsg())
+        return
+    }
+    e.ResPonsePage(c, result, total, pages)
 }
 
 // UpdateUserById 修改用户信息
@@ -156,22 +156,22 @@ func GetUserAlls(c *gin.Context) {
 // @Accept application/json
 // @Router /admin/user [post]
 func UpdateUserById(c *gin.Context) {
-	var userVo models.UserVo
-	userId := c.MustGet("user_id")
-	err := c.ShouldBindJSON(&userVo)
-	if err != nil {
-		e.ResponseWithMsg(c, e.JSONParsingFailed, e.JSONParsingFailed.GetMsg())
-		simple_zap.WithCtx(context.Background()).Sugar().Warn(err, e.JSONParsingFailed.GetMsg())
-		return
-	}
-	recode := users.UpdateUser(userId, userVo)
-	if recode == e.SUCCESS {
-		e.ResponseSuccess(c, "修改成功")
-	} else {
-		e.ResponseWithMsg(c, recode, recode.GetMsg())
-		simple_zap.WithCtx(context.Background()).Sugar().Info(err, recode.GetMsg())
+    var userVo models.UserVo
+    userId := c.MustGet("user_id")
+    err := c.ShouldBindJSON(&userVo)
+    if err != nil {
+        e.ResponseWithMsg(c, e.JSONParsingFailed, e.JSONParsingFailed.GetMsg())
+        simple_zap.WithCtx(context.Background()).Sugar().Warn(err, e.JSONParsingFailed.GetMsg())
+        return
+    }
+    recode := users.UpdateUser(userId, userVo)
+    if recode == e.SUCCESS {
+        e.ResponseSuccess(c, "修改成功")
+    } else {
+        e.ResponseWithMsg(c, recode, recode.GetMsg())
+        simple_zap.WithCtx(context.Background()).Sugar().Info(err, recode.GetMsg())
 
-	}
+    }
 }
 
 // DeleteUserById 删除用户信息
@@ -183,14 +183,14 @@ func UpdateUserById(c *gin.Context) {
 // @Accept application/json
 // @Router /admin/user [delete]
 func DeleteUserById(c *gin.Context) {
-	ids := c.QueryArray("ids")
-	recode := users.DeleteUser(ids)
-	if recode == e.SUCCESS {
-		e.ResponseSuccess(c, "删除成功")
-	} else {
-		e.ResponseWithMsg(c, recode, recode.GetMsg())
-		simple_zap.WithCtx(context.Background()).Sugar().Info(recode.GetMsg())
-	}
+    ids := c.QueryArray("ids")
+    recode := users.DeleteUser(ids)
+    if recode == e.SUCCESS {
+        e.ResponseSuccess(c, "删除成功")
+    } else {
+        e.ResponseWithMsg(c, recode, recode.GetMsg())
+        simple_zap.WithCtx(context.Background()).Sugar().Info(recode.GetMsg())
+    }
 
 }
 
@@ -203,23 +203,23 @@ func DeleteUserById(c *gin.Context) {
 // @Accept application/json
 // @Router /user [post]
 func UpdatePassword(c *gin.Context) {
-	var userRegist models.UserUpdate
-	err := c.ShouldBindJSON(&userRegist)
-	if err != nil {
-		e.ResponseError(c, e.JSONParsingFailed)
-		return
-	}
-	validate := validator.New()
-	err = validate.Struct(userRegist)
-	if err != nil {
-		e.ResponseWithMsg(c, e.ERROR, err.Error())
-		return
-	}
-	rescode := users.UpdatePassword(userRegist)
-	if rescode == e.SUCCESS {
-		e.ResponseSuccess(c, nil)
-		return
-	} else {
-		e.ResponseWithMsg(c, rescode, rescode.GetMsg())
-	}
+    var userRegist models.UserUpdate
+    err := c.ShouldBindJSON(&userRegist)
+    if err != nil {
+        e.ResponseError(c, e.JSONParsingFailed)
+        return
+    }
+    validate := validator.New()
+    err = validate.Struct(userRegist)
+    if err != nil {
+        e.ResponseWithMsg(c, e.ERROR, err.Error())
+        return
+    }
+    rescode := users.UpdatePassword(userRegist)
+    if rescode == e.SUCCESS {
+        e.ResponseSuccess(c, nil)
+        return
+    } else {
+        e.ResponseWithMsg(c, rescode, rescode.GetMsg())
+    }
 }

+ 17 - 17
app/middlewares/token_middleware.go

@@ -1,24 +1,24 @@
 package middleware
 
 import (
-	"Ic_ouath/app/e"
-	"Ic_ouath/utils"
-	"github.com/gin-gonic/gin"
+    "Ic_ouath/app/e"
+    "Ic_ouath/utils"
+    "github.com/gin-gonic/gin"
 )
 
 func Authentication() gin.HandlerFunc {
-	return func(c *gin.Context) {
-		header := c.GetHeader("Authorization")
-		token, err := utils.ParseToken(header)
-		if err != nil {
-			e.ResponseWithMsg(c, e.TokenIsInvalid, e.TokenIsInvalid.GetMsg())
-			c.Abort()
-			return
-		} else if token.Role != "admin" {
-			e.ResponseWithMsg(c, e.TokenIsInvalid, e.TokenIsInvalid.GetMsg())
-			c.Abort()
-		}
-		c.Set("user_id", token.UserId)
-		c.Next()
-	}
+    return func(c *gin.Context) {
+        header := c.GetHeader("Authorization")
+        token, err := utils.ParseToken(header)
+        if err != nil {
+            e.ResponseWithMsg(c, e.TokenIsInvalid, e.TokenIsInvalid.GetMsg())
+            c.Abort()
+            return
+        } else if token.Role != "admin" {
+            e.ResponseWithMsg(c, e.TokenIsInvalid, e.TokenIsInvalid.GetMsg())
+            c.Abort()
+        }
+        c.Set("user_id", token.UserId)
+        c.Next()
+    }
 }

+ 15 - 15
app/router.go

@@ -1,22 +1,22 @@
 package app
 
 import (
-	middleware "Ic_ouath/app/middlewares"
-	"Ic_ouath/app/routers"
-	_ "Ic_ouath/docs"
-	"Ic_ouath/global"
-	"github.com/gin-gonic/gin"
-	swaggerFiles "github.com/swaggo/files"
-	ginSwagger "github.com/swaggo/gin-swagger"
+    middleware "Ic_ouath/app/middlewares"
+    "Ic_ouath/app/routers"
+    _ "Ic_ouath/docs"
+    "Ic_ouath/global"
+    "github.com/gin-gonic/gin"
+    swaggerFiles "github.com/swaggo/files"
+    ginSwagger "github.com/swaggo/gin-swagger"
 )
 
 func InitRouter() error {
-	engine := gin.New()
-	//记录日志
-	//	engine.Use(middleware.LoggerToFile())
-	engine.Use(middleware.Cors())
-	engine.GET("/swagger/*any", ginSwagger.DisablingWrapHandler(swaggerFiles.Handler, "NAME_OF_ENV_VARIABLE"))
-	gin.SetMode(global.ServerSetting.Mode)
-	routers.UserRouter(engine)
-	return engine.Run(global.ServerSetting.Port)
+    engine := gin.New()
+    //记录日志
+    //	engine.Use(middleware.LoggerToFile())
+    engine.Use(middleware.Cors())
+    engine.GET("/swagger/*any", ginSwagger.DisablingWrapHandler(swaggerFiles.Handler, "NAME_OF_ENV_VARIABLE"))
+    gin.SetMode(global.ServerSetting.Mode)
+    routers.UserRouter(engine)
+    return engine.Run(global.ServerSetting.Port)
 }

+ 129 - 127
app/service/imp/user_imp.go

@@ -1,159 +1,161 @@
 package imp
 
 import (
-	"Ic_ouath/app/e"
-	"Ic_ouath/global"
-	"Ic_ouath/models"
-	"Ic_ouath/utils"
-	"context"
-	"fmt"
-	"strconv"
+    "Ic_ouath/app/e"
+    "Ic_ouath/global"
+    "Ic_ouath/models"
+    "Ic_ouath/utils"
+    "context"
+    "fmt"
+    "strconv"
 )
 
 type User struct{}
 
 func (u *User) UpdatePassword(user models.UserUpdate) e.Rescode {
-	//TODO implement me
-	var users models.User
-	tx := global.DBLink.Where("phone=?", user.Phone).Find(&users)
-	ctx := context.Background()
-	result, err := global.Rdb.Get(ctx, user.Phone).Result()
-	if err != nil {
-		return e.CodeIsError
-	} else if result != user.Code {
-		return e.CodeIsError
-	}
-	if tx.RowsAffected > 0 {
-		user.Password = utils.MD5(user.Password)
-		tx = global.DBLink.Model(&users).Where("phone=?", user.Phone).Update("password", user.Password)
-		if tx.RowsAffected > 0 {
-			return e.SUCCESS
-		}
-		return e.ERROR
-	}
-	return e.TheSystemIsAbnormal
+    //TODO implement me
+    var users models.User
+    tx := global.DBLink.Where("phone=?", user.Phone).Find(&users)
+    ctx := context.Background()
+    result, err := global.Rdb.Get(ctx, user.Phone).Result()
+    if err != nil {
+        return e.CodeIsError
+    } else if result != user.Code {
+        return e.CodeIsError
+    }
+    if tx.RowsAffected > 0 {
+        user.Password = utils.MD5(user.Password)
+        tx = global.DBLink.Model(&users).Where("phone=?", user.Phone).Update("password", user.Password)
+        if tx.RowsAffected > 0 {
+            return e.SUCCESS
+        }
+        return e.ERROR
+    }
+    return e.TheSystemIsAbnormal
 }
 
 func (u *User) PhoneRegist(userRegist models.UserRegist) e.Rescode {
-	//查找账号是否注册或者手机号已经注册,一个手机号只能注册一个账号
-	tx := global.DBLink.Where("account = ?", userRegist.Account).Find(&models.User{})
-	row := global.DBLink.Where("phone = ?", userRegist.Phone).Find(&models.User{})
-	if row.RowsAffected > 0 {
-		return e.AlreadyExists
-	}
-	if tx.RowsAffected > 0 {
-		return e.AlreadyExists
-	} else {
-		ctx := context.Background()
-		result, err := global.Rdb.Get(ctx, userRegist.Phone).Result()
-		if err != nil {
-			return e.TheVerificationCodeWasNotSent
-		} else if result != userRegist.Code {
-			return e.CodeIsError
-		}
-		var user = models.User{
-			Phone:    userRegist.Phone,
-			Account:  userRegist.Account,
-			Password: utils.MD5(userRegist.Password),
-			Username: userRegist.Username,
-			State:    true,
-		}
-		tx = global.DBLink.Create(&user)
-		if tx.RowsAffected > 0 {
-			return e.SUCCESS
-		}
-	}
-	return e.ERROR
+    //查找账号是否注册或者手机号已经注册,一个手机号只能注册一个账号
+    tx := global.DBLink.Where("account = ?", userRegist.Account).Find(&models.User{})
+    row := global.DBLink.Where("phone = ?", userRegist.Phone).Find(&models.User{})
+    if row.RowsAffected > 0 {
+        return e.AlreadyExists
+    }
+    if tx.RowsAffected > 0 {
+        return e.AlreadyExists
+    } else {
+        ctx := context.Background()
+        result, err := global.Rdb.Get(ctx, userRegist.Phone).Result()
+        if err != nil {
+            return e.TheVerificationCodeWasNotSent
+        } else if result != userRegist.Code {
+            return e.CodeIsError
+        }
+        var user = models.User{
+            Phone:    userRegist.Phone,
+            Account:  userRegist.Account,
+            Password: utils.MD5(userRegist.Password),
+            Username: userRegist.Username,
+            State:    true,
+        }
+        tx = global.DBLink.Create(&user)
+        if tx.RowsAffected > 0 {
+            return e.SUCCESS
+        }
+    }
+    return e.ERROR
 }
 
 // Login 账号密码登录
 func (u *User) Login(userRegist models.UserRegist) (models.UserDto, e.Rescode) {
-	var count int64
-	var userdto models.UserDto
-	var user models.User
-	md5 := utils.MD5(userRegist.Password)
-	global.DBLink.Where("account=?", userRegist.Account).Where("password=?", md5).Find(&user).Count(&count)
-	if count > 0 {
-		token, err := utils.CreateToken(user.ID, user.Username, user.Role)
-		if err != nil {
-			return userdto, e.TokenIsFaild
-		} else {
-			userdto.Token = token
-			userdto.Username = user.Username
-			userdto.Account = user.Account
-			userdto.Avatar = user.Avatar
-			userdto.ID = user.ID
-			return userdto, e.SUCCESS
-		}
-	} else {
-		return userdto, e.ThePasswordIsWrongOrThePhoneNumberIsIncorrect
-	}
+    var count int64
+    var userdto models.UserDto
+    var user models.User
+    md5 := utils.MD5(userRegist.Password)
+    global.DBLink.Where("account=?", userRegist.Account).Where("password=?", md5).Find(&user).Count(&count)
+    if count > 0 {
+        token, err := utils.CreateToken(user.ID, user.Username, user.Role)
+        token = "manage:" + token
+        if err != nil {
+            return userdto, e.TokenIsFaild
+        } else {
+            userdto.Token = token
+            userdto.Username = user.Username
+            userdto.Account = user.Account
+            userdto.Avatar = user.Avatar
+            userdto.ID = user.ID
+            return userdto, e.SUCCESS
+        }
+    } else {
+        return userdto, e.ThePasswordIsWrongOrThePhoneNumberIsIncorrect
+    }
 }
 
 // CodeLogin 验证码登录
 func (u *User) CodeLogin(userRegist models.UserRegist) (models.UserDto, e.Rescode) {
-	var user models.User
-	var userdto models.UserDto
-	tx := global.DBLink.Where("phone=?", userRegist.Phone).Find(&user)
-	ctx := context.Background()
-	result, err := global.Rdb.Get(ctx, userRegist.Phone).Result()
-	if err != nil {
-		return userdto, e.CodeIsError
-	} else if result != userRegist.Code {
-		return userdto, e.CodeIsError
-	}
-	token, err := utils.CreateToken(user.ID, user.Username, user.Role)
-	userdto.Token = token
-	if tx.RowsAffected > 0 {
-		userdto.Username = user.Username
-		userdto.Account = user.Account
-		userdto.Avatar = user.Avatar
-		userdto.ID = user.ID
-		return userdto, e.SUCCESS
-	} else {
-		return models.UserDto{}, e.GoToRegister
-	}
+    var user models.User
+    var userdto models.UserDto
+    tx := global.DBLink.Where("phone=?", userRegist.Phone).Find(&user)
+    ctx := context.Background()
+    result, err := global.Rdb.Get(ctx, userRegist.Phone).Result()
+    if err != nil {
+        return userdto, e.CodeIsError
+    } else if result != userRegist.Code {
+        return userdto, e.CodeIsError
+    }
+    token, err := utils.CreateToken(user.ID, user.Username, user.Role)
+    token = "manage:" + token
+    userdto.Token = token
+    if tx.RowsAffected > 0 {
+        userdto.Username = user.Username
+        userdto.Account = user.Account
+        userdto.Avatar = user.Avatar
+        userdto.ID = user.ID
+        return userdto, e.SUCCESS
+    } else {
+        return models.UserDto{}, e.GoToRegister
+    }
 }
 
 // GetUserAll 获取所有用户
 func (u *User) GetUserAll() ([]models.User, e.Rescode) {
-	//TODO implement me
-	var users []models.User
-	tx := global.DBLink.Find(&users)
-	if tx.RowsAffected > 0 {
-		return users, e.SUCCESS
-	}
-	return users, e.TheUserIsEmpty
+    //TODO implement me
+    var users []models.User
+    tx := global.DBLink.Find(&users)
+    if tx.RowsAffected > 0 {
+        return users, e.SUCCESS
+    }
+    return users, e.TheUserIsEmpty
 }
 
 // UpdateUser 更新用户
 func (u *User) UpdateUser(id any, uservo models.UserVo) e.Rescode {
-	var user models.User
-	atoi, _ := strconv.Atoi(fmt.Sprint(id))
-	tx := global.DBLink.Model(&user).
-		Where("id=?", uservo.Id).
-		Updates(models.User{
-			Username: uservo.Username,
-			State:    uservo.State,
-			Avatar:   uservo.Avatar,
-			Account:  uservo.Account,
-			Phone:    uservo.Phone,
-			Password: utils.MD5(uservo.Password),
-			UpdateBy: atoi,
-		})
-	if tx.RowsAffected > 0 {
-		return e.SUCCESS
-	}
-	return e.UPDATEFAIL
+    var user models.User
+    atoi, _ := strconv.Atoi(fmt.Sprint(id))
+    tx := global.DBLink.Model(&user).
+        Where("id=?", uservo.Id).
+        Updates(models.User{
+            Username: uservo.Username,
+            State:    uservo.State,
+            Avatar:   uservo.Avatar,
+            Account:  uservo.Account,
+            Phone:    uservo.Phone,
+            Password: utils.MD5(uservo.Password),
+            UpdateBy: atoi,
+        })
+    if tx.RowsAffected > 0 {
+        return e.SUCCESS
+    }
+    return e.UPDATEFAIL
 }
 
 // DeleteUser 删除用户
 func (u *User) DeleteUser(ids []string) e.Rescode {
-	for _, id := range ids {
-		tx := global.DBLink.Where("id=?", id).Delete(&models.User{})
-		if tx.RowsAffected > 0 {
-			return e.SUCCESS
-		}
-	}
-	return e.DELETEFAIL
+    for _, id := range ids {
+        tx := global.DBLink.Where("id=?", id).Delete(&models.User{})
+        if tx.RowsAffected > 0 {
+            return e.SUCCESS
+        }
+    }
+    return e.DELETEFAIL
 }

+ 15 - 15
app/service/user_service.go

@@ -1,22 +1,22 @@
 package service
 
 import (
-	"Ic_ouath/app/e"
-	"Ic_ouath/models"
+    "Ic_ouath/app/e"
+    "Ic_ouath/models"
 )
 
 type User interface {
-	// PhoneRegist 手机号注册
-	PhoneRegist(user models.UserRegist) e.Rescode
-	// Login 账号密码登录
-	Login(user models.UserRegist) (models.UserDto, e.Rescode)
-	// CodeLogin 验证码登录
-	CodeLogin(user models.UserRegist) (models.UserDto, e.Rescode)
-	// GetUserAll 获取所有用户
-	GetUserAll() ([]models.User, e.Rescode)
-	//UpdateUser 更新用户信息
-	UpdateUser(id any, user models.UserVo) e.Rescode
-	// DeleteUser 删除用户信息
-	DeleteUser(ids []string) e.Rescode
-	UpdatePassword(user models.UserUpdate) e.Rescode
+    // PhoneRegist 手机号注册
+    PhoneRegist(user models.UserRegist) e.Rescode
+    // Login 账号密码登录
+    Login(user models.UserRegist) (models.UserDto, e.Rescode)
+    // CodeLogin 验证码登录
+    CodeLogin(user models.UserRegist) (models.UserDto, e.Rescode)
+    // GetUserAll 获取所有用户
+    GetUserAll() ([]models.User, e.Rescode)
+    //UpdateUser 更新用户信息
+    UpdateUser(id any, user models.UserVo) e.Rescode
+    // DeleteUser 删除用户信息
+    DeleteUser(ids []string) e.Rescode
+    UpdatePassword(user models.UserUpdate) e.Rescode
 }

+ 16 - 16
global/redis.go

@@ -1,25 +1,25 @@
 package global
 
 import (
-	"Ic_ouath/simple_zap"
-	"context"
-	"github.com/go-redis/redis/v8"
+    "Ic_ouath/simple_zap"
+    "context"
+    "github.com/go-redis/redis/v8"
 )
 
 var Rdb *redis.Client
 
 func SetupRedisLink() {
-	//addr := RedisSetting.Addr
-	//password := RedisSetting.Password
-	//db := RedisSetting.DB
-	Rdb = redis.NewClient(&redis.Options{
-		Addr:     RedisSetting.Addr,
-		Password: "",
-		DB:       0,
-	})
-	ctx := context.Background()
-	_, err := Rdb.Ping(ctx).Result()
-	if err != nil {
-		simple_zap.WithCtx(context.Background()).Sugar().Warn("redis连接失败", err)
-	}
+    //addr := RedisSetting.Addr
+    //password := RedisSetting.Password
+    //db := RedisSetting.DB
+    Rdb = redis.NewClient(&redis.Options{
+        Addr:     RedisSetting.Addr,
+        Password: "",
+        DB:       0,
+    })
+    ctx := context.Background()
+    _, err := Rdb.Ping(ctx).Result()
+    if err != nil {
+        simple_zap.WithCtx(context.Background()).Sugar().Warn("redis连接失败", err)
+    }
 }

+ 1 - 1
go.mod

@@ -6,6 +6,7 @@ require (
 	github.com/astaxie/beego v1.12.3
 	github.com/bytedance/sonic v1.11.3
 	github.com/gin-gonic/gin v1.9.1
+	github.com/go-playground/validator/v10 v10.19.0
 	github.com/go-redis/redis/v8 v8.11.5
 	github.com/go-resty/resty/v2 v2.12.0
 	github.com/golang-jwt/jwt/v4 v4.5.0
@@ -40,7 +41,6 @@ require (
 	github.com/go-openapi/swag v0.19.15 // indirect
 	github.com/go-playground/locales v0.14.1 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect
-	github.com/go-playground/validator/v10 v10.19.0 // indirect
 	github.com/go-sql-driver/mysql v1.7.0 // indirect
 	github.com/goccy/go-json v0.10.2 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect

+ 21 - 21
main.go

@@ -1,25 +1,25 @@
 package main
 
 import (
-	"Ic_ouath/app"
-	"Ic_ouath/global"
-	"Ic_ouath/nats"
-	_ "Ic_ouath/nats"
-	"Ic_ouath/simple_zap"
-	"context"
+    "Ic_ouath/app"
+    "Ic_ouath/global"
+    "Ic_ouath/nats"
+    _ "Ic_ouath/nats"
+    "Ic_ouath/simple_zap"
+    "context"
 )
 
 func init() {
-	err := global.SetupSetting()
-	if err != nil {
-		simple_zap.WithCtx(context.Background()).Sugar().Warn(err, "配置文件读取失败")
-	}
-	err = global.SetupDBLink()
-	if err != nil {
-		simple_zap.WithCtx(context.Background()).Sugar().Warn(err, "数据库连接失败")
-	}
-	global.SetupRedisLink()
-	nats.SetupNats()
+    err := global.SetupSetting()
+    if err != nil {
+        simple_zap.WithCtx(context.Background()).Sugar().Warn(err, "配置文件读取失败")
+    }
+    err = global.SetupDBLink()
+    if err != nil {
+        simple_zap.WithCtx(context.Background()).Sugar().Warn(err, "数据库连接失败")
+    }
+    global.SetupRedisLink()
+    nats.SetupNats()
 
 }
 
@@ -31,9 +31,9 @@ func init() {
 //
 //go:generate swag init --parseDependency --parseDepth=6
 func main() {
-	err := app.InitRouter()
-	if err != nil {
-		simple_zap.WithCtx(context.Background()).Sugar().Warn(err, "项目初始化失败")
-		return
-	}
+    err := app.InitRouter()
+    if err != nil {
+        simple_zap.WithCtx(context.Background()).Sugar().Warn(err, "项目初始化失败")
+        return
+    }
 }