refactor: user_id int32 (#11)

TensoRaws · Jul 14, 2024 · cad38b7 · cad38b7
1 parent b023e97
commit cad38b7
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/internal/router/api/v1/api.go b/internal/router/api/v1/api.go
@@ -46,6 +46,7 @@ func NewAPI() *gin.Engine {
 			// 用户查询他人信息
 			user.GET("profile/",
 				jwt.RequireAuth(cache.Clients[cache.JWTBlacklist], false),
+				middleware_cache.Response(cache.Clients[cache.RespCache], 1*time.Minute),
 				user_service.ProfileOthers,
 			)
 

diff --git a/internal/service/user/profile.go b/internal/service/user/profile.go
@@ -24,7 +24,7 @@ type ProfileResponse struct {
 	Username   string   `json:"username"`
 }
 
-type UserProfileRequest struct {
+type ProfileOthersRequest struct {
 	UserId int `form:"user_id" binding:"required"`
 }
 
@@ -36,13 +36,13 @@ func ProfileMe(c *gin.Context) {
 		return
 	}
 
-	user, err := dao.GetUserByID(int32(userID))
+	user, err := dao.GetUserByID(userID)
 	if err != nil {
 		util.AbortWithMsg(c, "User not found")
 		return
 	}
 
-	roles, err := dao.GetUserRolesByID(int32(userID))
+	roles, err := dao.GetUserRolesByID(userID)
 	if err != nil {
 		log.Logger.Info("Failed to get user roles: " + err.Error())
 		roles = []string{}
@@ -59,7 +59,7 @@ func ProfileMe(c *gin.Context) {
 		Private:    user.Private,
 		Roles:      roles,
 		Signature:  user.Signature,
-		UserID:     int32(user.UserID),
+		UserID:     user.UserID,
 		Username:   user.Username,
 	})
 
@@ -69,7 +69,7 @@ func ProfileMe(c *gin.Context) {
 // ProfileOthers 用户查询他人信息 (GET /profile)
 func ProfileOthers(c *gin.Context) {
 	// 绑定参数
-	var req UserProfileRequest
+	var req ProfileOthersRequest
 	if err := c.ShouldBindQuery(&req); err != nil {
 		util.AbortWithMsg(c, "invalid request")
 		return
@@ -81,7 +81,7 @@ func ProfileOthers(c *gin.Context) {
 		return
 	}
 	// 仅用于鉴权不使用
-	_, err = dao.GetUserByID(int32(userID))
+	_, err = dao.GetUserByID(userID)
 	if err != nil {
 		util.AbortWithMsg(c, "User not found")
 		return
@@ -93,7 +93,7 @@ func ProfileOthers(c *gin.Context) {
 		return
 	}
 
-	roles, err := dao.GetUserRolesByID(int32(userID))
+	roles, err := dao.GetUserRolesByID(userID)
 	if err != nil {
 		log.Logger.Info("Failed to get user roles: " + err.Error())
 		roles = []string{}
@@ -110,14 +110,13 @@ func ProfileOthers(c *gin.Context) {
 			Inviter:    "",
 			LastActive: "",
 			Private:    user.Private,
-			Roles:      []string{},
+			Roles:      nil,
 			Signature:  "",
 			UserID:     user.UserID,
 			Username:   user.Username,
 		})
 	} else {
 		// 显示全部信息
-
 		util.OKWithData(c, ProfileResponse{
 			Avatar:     user.Avatar,
 			Background: user.Background,

diff --git a/internal/service/user/reset.go b/internal/service/user/reset.go
@@ -27,7 +27,7 @@ func ResetPassword(c *gin.Context) {
 		return
 	}
 
-	user, err := dao.GetUserByID(int32(userID))
+	user, err := dao.GetUserByID(userID)
 	if err != nil {
 		util.AbortWithMsg(c, "User not found")
 		return

diff --git a/module/util/gin.go b/module/util/gin.go
@@ -9,7 +9,7 @@ import (
 )
 
 // GetUserIDFromGinContext 从 RequireAuth 处读取 user_id
-func GetUserIDFromGinContext(c *gin.Context) (int64, error) {
+func GetUserIDFromGinContext(c *gin.Context) (int32, error) {
 	userIDstr := c.GetString("user_id")
 	// 未登录
 	if len(userIDstr) == 0 {
@@ -18,7 +18,7 @@ func GetUserIDFromGinContext(c *gin.Context) (int64, error) {
 	// 已登录
 	userID, err := strconv.ParseInt(userIDstr, 10, 64)
 
-	return userID, err
+	return int32(userID), err
 }
 
 // OKWithMsg 返回成功信息