合并

server/auth/internal/logic/usergoogleloginlogic.go

@@ -31,7 +31,7 @@ type UserGoogleLoginLogic struct {
 
 	isRegistered  bool   // 是否注册
 	registerToken string // 注册邮箱的token
-	oauthinfo     *auth.OAuthInfo
+	registerInfo  *auth.RegisterToken
 }
 
 func NewUserGoogleLoginLogic(ctx context.Context, svcCtx *svc.ServiceContext) *UserGoogleLoginLogic {
@@ -52,19 +52,11 @@ func (l *UserGoogleLoginLogic) AfterLogic(w http.ResponseWriter, r *http.Request
 	if resp.Code == 200 {
 
 		if !l.isRegistered {
-			now := time.Now()
-			rtoken, err := auth.GenerateRegisterToken(
-				&l.svcCtx.Config.Auth.AccessSecret,
-				l.svcCtx.Config.Auth.AccessExpire,
-				now.Unix(),
-				l.oauthinfo.Id,
-				l.oauthinfo.Platform,
-			)
 
+			rtoken, err := l.svcCtx.TokenManger.Encrypt(l.registerInfo)
 			if err != nil {
 				resp.SetStatus(basic.CodeOAuthRegisterTokenErr)
 			}
-
 			l.registerToken = rtoken
 		}
 
@@ -165,7 +157,8 @@ func (l *UserGoogleLoginLogic) UserGoogleLogin(req *types.RequestGoogleLogin, us
 
 	// 如果密码匹配，则生成 JWT Token。
 	nowSec := time.Now().Unix()
-	jwtToken, err := auth.GenerateJwtToken(&l.svcCtx.Config.Auth.AccessSecret, l.svcCtx.Config.Auth.AccessExpire, nowSec, user.Id, 0)
+
+	jwtToken, err := auth.GenerateJwtTokenUint64(auth.StringToHash(*user.PasswordHash), l.svcCtx.Config.Auth.AccessExpire, nowSec, user.Id, 0)
 
 	// 如果生成 JWT Token 失败，则抛出错误并返回未认证的状态码。
 	if err != nil {

server/auth/internal/logic/userloginlogic.go

@@ -68,8 +68,13 @@ func (l *UserLoginLogic) UserLogin(req *types.RequestUserLogin, userinfo *auth.U
 
 	// 如果密码匹配，则生成 JWT Token。
 	nowSec := time.Now().Unix()
+	us, err := l.svcCtx.SharedState.GetUserState(user.Id)
+	if err != nil {
+		logx.Error(err)
+		return resp.SetStatus(basic.CodeSharedStateErr)
+	}
 
-	jwtToken, err := auth.GenerateJwtToken(&l.svcCtx.Config.Auth.AccessSecret, l.svcCtx.Config.Auth.AccessExpire, nowSec, user.Id, 0)
+	jwtToken, err := auth.GenerateJwtTokenUint64(us.PwdHash, l.svcCtx.Config.Auth.AccessExpire, nowSec, user.Id, 0)
 
 	// 如果生成 JWT Token 失败，则抛出错误并返回未认证的状态码。
 	if err != nil {

server/auth/internal/svc/servicecontext.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"fusenapi/fsm"
 	"fusenapi/server/auth/internal/config"
+	"fusenapi/utils/auth"
 	"fusenapi/utils/autoconfig"
 	"net/http"
 
@@ -21,6 +22,8 @@ type ServiceContext struct {
 
 	MysqlConn *gorm.DB
 	AllModels *gmodel.AllModelsGen
+
+	TokenManger *auth.ConfirmationLink[auth.RegisterToken]
 }
 
 func NewServiceContext(c config.Config) *ServiceContext {
@@ -32,6 +35,7 @@ func NewServiceContext(c config.Config) *ServiceContext {
 		MysqlConn:   conn,
 		SharedState: StateServer,
 		AllModels:   gmodel.NewAllModels(initalize.InitMysql(c.SourceMysql)),
+		TokenManger: auth.NewConfirmationLink[auth.RegisterToken]([]byte(c.Auth.AccessSecret), "http://localhost:9900/api/auth/oauth2/register"),
 	}
 }
 

server/inventory/internal/handler/getcloudlisthandler.go

@@ -15,7 +15,7 @@ func GetCloudListHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 
 		var req types.GetCloudListReq
-		userinfo, err := basic.RequestParse(w, r, svcCtx, &req)
+		userinfo, err := basic.RequestParse(w, r, svcCtx.SharedState, &req)
 		if err != nil {
 			return
 		}