u

code/base-project/base-go-v2/internal/api/auth/index.go

@@ -1,14 +1,15 @@
 package auth
 
 import (
+	"base-go-v2/internal/api/money"
 	"base-go-v2/internal/db"
 	response "base-go-v2/internal/reponse"
 	"base-go-v2/internal/router"
 	"base-go-v2/internal/routinex"
+	"base-go-v2/internal/utils/idgen"
 	"base-go-v2/internal/utils/jwtx"
 	"base-go-v2/internal/utils/mapx"
 	"base-go-v2/internal/utils/timex"
-	"base-go-v2/internal/utils/uid"
 )
 
 func InitAuthRouter(r *router.Router) {
@@ -85,7 +86,7 @@ func loginDefault(c *router.Context) error {
 			Send()
 	}
 
-	userId := user.GetInt("id")
+	userId := user.GetInt64("id")
 
 	// 创建 Access Token 和 Refresh Token
 	accessToken, err := jwtx.CreateAccessToken(userId)
@@ -99,8 +100,8 @@ func loginDefault(c *router.Context) error {
 
 	// 返回数据
 	respData := mapx.New().
-		SetIntToString("userId", userId).
 		SetKV(
+			"userId", userId,
 			"username", user.GetString("username"),
 			"seqNo", user.GetInt("seq_no"),
 			"gender", user.GetInt("gender"),
@@ -140,9 +141,10 @@ func registerDefault(c *router.Context) error {
 		return response.Fail(c).Message("该账号已被注册").Send()
 	}
 
+	userId := idgen.NextId()
 	// 构造新用户数据
 	newUserData := mapx.New().SetKV(
-		"id", uid.NextID(),
+		"id", userId,
 		"account", account,
 		"password", password,
 	)
@@ -150,10 +152,16 @@ func registerDefault(c *router.Context) error {
 	// 插入新用户
 	insertedRows, err := db.InsertOne("user_info", newUserData)
 	if err != nil {
+		return response.Fail(c).Message("注册失败").Send()
 	}
+
 	if insertedRows != 1 {
 		return response.Fail(c).Message("注册失败").Send()
 	}
 
+	err = money.InitDefaultCategories(userId)
+	if err != nil {
+		return c.AddError(err)
+	}
 	return response.Success(c).Message("注册成功").Send()
 }