♻️ refactored login-related code

app/core/api/internal/logic/oauth/gitee_callback_logic.go

@@ -149,7 +149,7 @@ func (l *GiteeCallbackLogic) GiteeCallback(w http.ResponseWriter, r *http.Reques
 			_ = tx.Rollback()
 			return "", err
 		}
-		data, err := HandleOauthLoginResponse(addUser, l.svcCtx, r, w, l.ctx)
+		data, err := HandleOauthLoginResponse(addUser, l.svcCtx, r, l.ctx)
 		if err != nil {
 			_ = tx.Rollback()
 			return "", err
@@ -167,7 +167,7 @@ func (l *GiteeCallbackLogic) GiteeCallback(w http.ResponseWriter, r *http.Reques
 			return "", err
 		}
 
-		data, err := HandleOauthLoginResponse(authUserInfo, l.svcCtx, r, w, l.ctx)
+		data, err := HandleOauthLoginResponse(authUserInfo, l.svcCtx, r, l.ctx)
 		if err != nil {
 			_ = tx.Rollback()
 			return "", err
@@ -180,13 +180,12 @@ func (l *GiteeCallbackLogic) GiteeCallback(w http.ResponseWriter, r *http.Reques
 }
 
 // HandleOauthLoginResponse 处理登录响应
-func HandleOauthLoginResponse(scaAuthUser *model.ScaAuthUser, svcCtx *svc.ServiceContext, r *http.Request, w http.ResponseWriter, ctx context.Context) (string, error) {
-	data, err := user.HandleUserLogin(scaAuthUser, svcCtx, true, r, w, ctx)
+func HandleOauthLoginResponse(scaAuthUser *model.ScaAuthUser, svcCtx *svc.ServiceContext, r *http.Request, ctx context.Context) (string, error) {
+	data, err := user.HandleLoginJWT(scaAuthUser, svcCtx, true, r, ctx)
 	if err != nil {
 		return "", err
 	}
-	responseData := response.SuccessWithData(data)
-	marshalData, err := json.Marshal(responseData)
+	marshalData, err := json.Marshal(response.SuccessWithData(data))
 	if err != nil {
 		return "", err
 	}

app/core/api/internal/logic/oauth/github_callback_logic.go

@@ -149,7 +149,7 @@ func (l *GithubCallbackLogic) GithubCallback(w http.ResponseWriter, r *http.Requ
 			return "", err
 		}
 
-		data, err := HandleOauthLoginResponse(addUser, l.svcCtx, r, w, l.ctx)
+		data, err := HandleOauthLoginResponse(addUser, l.svcCtx, r, l.ctx)
 		if err != nil {
 			_ = tx.Rollback()
 			return "", err
@@ -167,7 +167,7 @@ func (l *GithubCallbackLogic) GithubCallback(w http.ResponseWriter, r *http.Requ
 			return "", err
 		}
 
-		data, err := HandleOauthLoginResponse(authUserInfo, l.svcCtx, r, w, l.ctx)
+		data, err := HandleOauthLoginResponse(authUserInfo, l.svcCtx, r, l.ctx)
 		if err != nil {
 			_ = tx.Rollback()
 			return "", err

app/core/api/internal/logic/oauth/qq_callback_logic.go

@@ -149,7 +149,7 @@ func (l *QqCallbackLogic) QqCallback(w http.ResponseWriter, r *http.Request, req
 			return "", err
 		}
 
-		data, err := HandleOauthLoginResponse(addUser, l.svcCtx, r, w, l.ctx)
+		data, err := HandleOauthLoginResponse(addUser, l.svcCtx, r, l.ctx)
 		if err != nil {
 			_ = tx.Rollback()
 			return "", err
@@ -167,7 +167,7 @@ func (l *QqCallbackLogic) QqCallback(w http.ResponseWriter, r *http.Request, req
 			return "", err
 		}
 
-		data, err := HandleOauthLoginResponse(authUserInfo, l.svcCtx, r, w, l.ctx)
+		data, err := HandleOauthLoginResponse(authUserInfo, l.svcCtx, r, l.ctx)
 		if err != nil {
 			_ = tx.Rollback()
 			return "", err

app/core/api/internal/logic/oauth/wechat_callback_logic.go

@@ -1,208 +0,0 @@
-package oauth
-
-import (
-	"context"
-	"encoding/json"
-	"errors"
-	"net/http"
-	"strconv"
-	"strings"
-
-	"github.com/ArtisanCloud/PowerLibs/v3/http/helper"
-	"github.com/ArtisanCloud/PowerWeChat/v3/src/kernel/contract"
-	"github.com/ArtisanCloud/PowerWeChat/v3/src/kernel/messages"
-	models2 "github.com/ArtisanCloud/PowerWeChat/v3/src/kernel/models"
-	"github.com/ArtisanCloud/PowerWeChat/v3/src/officialAccount/server/handlers/models"
-	"github.com/yitter/idgenerator-go/idgen"
-	"github.com/zeromicro/go-zero/core/logx"
-	"gorm.io/gorm"
-
-	"schisandra-album-cloud-microservices/app/core/api/common/constant"
-	"schisandra-album-cloud-microservices/app/core/api/common/i18n"
-	randomname "schisandra-album-cloud-microservices/app/core/api/common/random_name"
-	"schisandra-album-cloud-microservices/app/core/api/common/utils"
-	"schisandra-album-cloud-microservices/app/core/api/internal/logic/user"
-	"schisandra-album-cloud-microservices/app/core/api/internal/logic/websocket"
-	"schisandra-album-cloud-microservices/app/core/api/internal/svc"
-	"schisandra-album-cloud-microservices/app/core/api/repository/mysql/model"
-)
-
-type WechatCallbackLogic struct {
-	logx.Logger
-	ctx    context.Context
-	svcCtx *svc.ServiceContext
-}
-
-func NewWechatCallbackLogic(ctx context.Context, svcCtx *svc.ServiceContext) *WechatCallbackLogic {
-	return &WechatCallbackLogic{
-		Logger: logx.WithContext(ctx),
-		ctx:    ctx,
-		svcCtx: svcCtx,
-	}
-}
-
-func (l *WechatCallbackLogic) WechatCallback(w http.ResponseWriter, r *http.Request) error {
-	_, err := l.svcCtx.WechatPublic.Server.VerifyURL(r)
-	if err != nil {
-		return err
-	}
-	rs, err := l.svcCtx.WechatPublic.Server.Notify(r, func(event contract.EventInterface) interface{} {
-		switch event.GetMsgType() {
-		case models2.CALLBACK_MSG_TYPE_EVENT:
-			switch event.GetEvent() {
-			case models.CALLBACK_EVENT_SUBSCRIBE:
-				msg := models.EventSubscribe{}
-				err = event.ReadMessage(&msg)
-				if err != nil {
-					println(err.Error())
-					return err
-				}
-				key := strings.TrimPrefix(msg.EventKey, "qrscene_")
-				err = l.HandlerWechatLogin(msg.FromUserName, key, w, r)
-				if err != nil {
-					return messages.NewText(i18n.FormatText(l.ctx, "login.loginFailed"))
-				}
-				return messages.NewText(i18n.FormatText(l.ctx, "login.loginSuccess"))
-
-			case models.CALLBACK_EVENT_UNSUBSCRIBE:
-				msg := models.EventUnSubscribe{}
-				err = event.ReadMessage(&msg)
-				if err != nil {
-					println(err.Error())
-					return err
-				}
-				return messages.NewText("ok")
-
-			case models.CALLBACK_EVENT_SCAN:
-				msg := models.EventScan{}
-				err = event.ReadMessage(&msg)
-				if err != nil {
-					println(err.Error())
-					return err
-				}
-				err = l.HandlerWechatLogin(msg.FromUserName, msg.EventKey, w, r)
-				if err != nil {
-					return messages.NewText(i18n.FormatText(l.ctx, "login.loginFailed"))
-				}
-				return messages.NewText(i18n.FormatText(l.ctx, "login.loginSuccess"))
-
-			}
-
-		case models2.CALLBACK_MSG_TYPE_TEXT:
-			msg := models.MessageText{}
-			err = event.ReadMessage(&msg)
-			if err != nil {
-				println(err.Error())
-				return err
-			}
-		}
-		return messages.NewText("ok")
-
-	})
-	if err != nil {
-		return err
-	}
-	err = helper.HttpResponseSend(rs, w)
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
-// HandlerWechatLogin 处理微信登录
-func (l *WechatCallbackLogic) HandlerWechatLogin(openId string, clientId string, w http.ResponseWriter, r *http.Request) error {
-	if openId == "" {
-		return errors.New("openId is empty")
-	}
-	tx := l.svcCtx.DB.Begin()
-
-	userSocial := l.svcCtx.DB.ScaAuthUserSocial
-	socialUser, err := tx.ScaAuthUserSocial.Where(userSocial.OpenID.Eq(openId), userSocial.Source.Eq(constant.OAuthSourceWechat)).First()
-	if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
-		return err
-	}
-
-	if socialUser == nil {
-		// 创建用户
-		uid := idgen.NextId()
-		uidStr := strconv.FormatInt(uid, 10)
-		avatar := utils.GenerateAvatar(uidStr)
-		name := randomname.GenerateName()
-
-		male := constant.Male
-		addUser := &model.ScaAuthUser{
-			UID:      uidStr,
-			Avatar:   avatar,
-			Username: openId,
-			Nickname: name,
-			Gender:   male,
-		}
-		err = tx.ScaAuthUser.Create(addUser)
-		if err != nil {
-			_ = tx.Rollback()
-			return err
-		}
-
-		wechatUser := constant.OAuthSourceWechat
-		newSocialUser := &model.ScaAuthUserSocial{
-			UserID: uidStr,
-			OpenID: openId,
-			Source: wechatUser,
-		}
-		err = tx.ScaAuthUserSocial.Create(newSocialUser)
-		if err != nil {
-			_ = tx.Rollback()
-			return err
-		}
-
-		if res, err := l.svcCtx.CasbinEnforcer.AddRoleForUser(uidStr, constant.User); !res || err != nil {
-			_ = tx.Rollback()
-			return err
-		}
-
-		data, err := user.HandleUserLogin(addUser, l.svcCtx, true, r, w, l.ctx)
-		if err != nil {
-			_ = tx.Rollback()
-			return err
-		}
-		marshal, err := json.Marshal(data)
-		if err != nil {
-			_ = tx.Rollback()
-			return err
-		}
-		err = websocket.QrcodeWebSocketHandler.SendMessageToClient(clientId, marshal)
-		if err != nil {
-			_ = tx.Rollback()
-			return err
-		}
-
-	} else {
-		authUser := l.svcCtx.DB.ScaAuthUser
-
-		authUserInfo, err := tx.ScaAuthUser.Where(authUser.UID.Eq(socialUser.UserID)).First()
-		if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
-			_ = tx.Rollback()
-			return err
-		}
-
-		data, err := user.HandleUserLogin(authUserInfo, l.svcCtx, true, r, w, l.ctx)
-		if err != nil {
-			_ = tx.Rollback()
-			return err
-		}
-		marshal, err := json.Marshal(data)
-		if err != nil {
-			_ = tx.Rollback()
-			return err
-		}
-		err = websocket.QrcodeWebSocketHandler.SendMessageToClient(clientId, marshal)
-		if err != nil {
-			_ = tx.Rollback()
-			return err
-		}
-	}
-	if err = tx.Commit(); err != nil {
-		return err
-	}
-	return nil
-}

app/core/api/internal/logic/oauth/wechat_offiaccount_callback_logic.go

@@ -0,0 +1,112 @@
+package oauth
+
+import (
+	"context"
+	"encoding/json"
+	"github.com/ArtisanCloud/PowerWeChat/v3/src/kernel/contract"
+	"github.com/ArtisanCloud/PowerWeChat/v3/src/kernel/messages"
+	models2 "github.com/ArtisanCloud/PowerWeChat/v3/src/kernel/models"
+	"github.com/ArtisanCloud/PowerWeChat/v3/src/officialAccount/server/handlers/models"
+	"net/http"
+	"schisandra-album-cloud-microservices/app/core/api/common/i18n"
+	"schisandra-album-cloud-microservices/app/core/api/common/response"
+	"schisandra-album-cloud-microservices/app/core/api/internal/logic/websocket"
+	"strings"
+
+	"github.com/zeromicro/go-zero/core/logx"
+	"schisandra-album-cloud-microservices/app/core/api/internal/svc"
+)
+
+type WechatOffiaccountCallbackLogic struct {
+	logx.Logger
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+}
+type MessageData struct {
+	Openid   string `json:"openid"`
+	ClientId string `json:"client_id"`
+}
+
+func NewWechatOffiaccountCallbackLogic(ctx context.Context, svcCtx *svc.ServiceContext) *WechatOffiaccountCallbackLogic {
+	return &WechatOffiaccountCallbackLogic{
+		Logger: logx.WithContext(ctx),
+		ctx:    ctx,
+		svcCtx: svcCtx,
+	}
+}
+
+func (l *WechatOffiaccountCallbackLogic) WechatOffiaccountCallback(r *http.Request) (*http.Response, error) {
+	rs, err := l.svcCtx.WechatOfficial.Server.Notify(r, func(event contract.EventInterface) interface{} {
+		switch event.GetMsgType() {
+		case models2.CALLBACK_MSG_TYPE_EVENT:
+			switch event.GetEvent() {
+			case models.CALLBACK_EVENT_SUBSCRIBE:
+				msg := models.EventSubscribe{}
+				err := event.ReadMessage(&msg)
+				if err != nil {
+					logx.Error(err.Error())
+					return "error"
+				}
+				key := strings.TrimPrefix(msg.EventKey, "qrscene_")
+				err = l.SendMessage(msg.FromUserName, key)
+				if err != nil {
+					return messages.NewText(i18n.FormatText(l.ctx, "login.loginFailed"))
+				}
+				return messages.NewText(i18n.FormatText(l.ctx, "login.loginSuccess"))
+
+			case models.CALLBACK_EVENT_UNSUBSCRIBE:
+				msg := models.EventUnSubscribe{}
+				err := event.ReadMessage(&msg)
+				if err != nil {
+					logx.Error(err.Error())
+					return "error"
+				}
+				return messages.NewText("ok")
+
+			case models.CALLBACK_EVENT_SCAN:
+				msg := models.EventScan{}
+				err := event.ReadMessage(&msg)
+				if err != nil {
+					logx.Error(err.Error())
+					return "error"
+				}
+				err = l.SendMessage(msg.FromUserName, msg.EventKey)
+				if err != nil {
+					return messages.NewText(i18n.FormatText(l.ctx, "login.loginFailed"))
+				}
+				return messages.NewText(i18n.FormatText(l.ctx, "login.loginSuccess"))
+
+			}
+
+		case models2.CALLBACK_MSG_TYPE_TEXT:
+			msg := models.MessageText{}
+			err := event.ReadMessage(&msg)
+			if err != nil {
+				logx.Error(err.Error())
+				return "error"
+			}
+		}
+		return messages.NewText("ok")
+	})
+	if err != nil {
+		return nil, err
+	}
+	return rs, nil
+}
+
+// SendMessage 发送消息到客户端
+func (l *WechatOffiaccountCallbackLogic) SendMessage(openId string, clientId string) error {
+	messageData := MessageData{
+		Openid:   openId,
+		ClientId: clientId,
+	}
+	jsonData, err := json.Marshal(response.SuccessWithData(messageData))
+	if err != nil {
+		return err
+	}
+	err = websocket.QrcodeWebSocketHandler.SendMessageToClient(clientId, jsonData)
+	if err != nil {
+		return err
+	}
+	return nil
+}

app/core/api/internal/logic/oauth/wechat_offiaccount_callback_verify_logic.go

@@ -0,0 +1,31 @@
+package oauth
+
+import (
+	"context"
+	"net/http"
+
+	"github.com/zeromicro/go-zero/core/logx"
+	"schisandra-album-cloud-microservices/app/core/api/internal/svc"
+)
+
+type WechatOffiaccountCallbackVerifyLogic struct {
+	logx.Logger
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+}
+
+func NewWechatOffiaccountCallbackVerifyLogic(ctx context.Context, svcCtx *svc.ServiceContext) *WechatOffiaccountCallbackVerifyLogic {
+	return &WechatOffiaccountCallbackVerifyLogic{
+		Logger: logx.WithContext(ctx),
+		ctx:    ctx,
+		svcCtx: svcCtx,
+	}
+}
+
+func (l *WechatOffiaccountCallbackVerifyLogic) WechatOffiaccountCallbackVerify(r *http.Request) (*http.Response, error) {
+	rs, err := l.svcCtx.WechatOfficial.Server.VerifyURL(r)
+	if err != nil {
+		return nil, err
+	}
+	return rs, nil
+}

app/core/api/internal/logic/token/refresh_token_logic.go

@@ -30,12 +30,8 @@ func NewRefreshTokenLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Refr
 }
 
 func (l *RefreshTokenLogic) RefreshToken(r *http.Request) (resp *types.Response, err error) {
-	session, err := l.svcCtx.Session.Get(r, constant.SESSION_KEY)
-	if err != nil {
-		return nil, err
-	}
-	userId, ok := session.Values["user_id"].(string)
-	if !ok {
+	userId := r.Header.Get(constant.UID_HEADER_KEY)
+	if userId == "" {
 		return response.ErrorWithCode(403), nil
 	}
 	tokenData := l.svcCtx.RedisClient.Get(l.ctx, constant.UserTokenPrefix+userId).Val()
@@ -47,6 +43,9 @@ func (l *RefreshTokenLogic) RefreshToken(r *http.Request) (resp *types.Response,
 	if err != nil {
 		return nil, err
 	}
+	if redisTokenData.Revoked {
+		return response.ErrorWithCode(403), nil
+	}
 	refreshToken, result := jwt.ParseRefreshToken(l.svcCtx.Config.Auth.AccessSecret, redisTokenData.RefreshToken)
 	if !result {
 		return response.ErrorWithCode(403), nil
@@ -62,6 +61,7 @@ func (l *RefreshTokenLogic) RefreshToken(r *http.Request) (resp *types.Response,
 		AccessToken:  accessToken,
 		RefreshToken: redisTokenData.RefreshToken,
 		UID:          refreshToken.UserID,
+		Revoked:      false,
 	}
 	err = l.svcCtx.RedisClient.Set(l.ctx, constant.UserTokenPrefix+refreshToken.UserID, redisToken, time.Hour*24*7).Err()
 	if err != nil {

app/core/api/internal/logic/user/account_login_logic.go

@@ -3,7 +3,8 @@ package user
 import (
 	"context"
 	"errors"
-	"github.com/rbcervilla/redisstore/v9"
+	"github.com/lionsoul2014/ip2region/binding/golang/xdb"
+	"github.com/mssola/useragent"
 	"net/http"
 	"time"
 
@@ -65,19 +66,20 @@ func (l *AccountLoginLogic) AccountLogin(w http.ResponseWriter, r *http.Request,
 	if !utils.Verify(userInfo.Password, req.Password) {
 		return response.ErrorWithI18n(l.ctx, "login.invalidPassword"), nil
 	}
-	data, err := HandleUserLogin(userInfo, l.svcCtx, req.AutoLogin, r, w, l.ctx)
+	data, err := HandleLoginJWT(userInfo, l.svcCtx, req.AutoLogin, r, l.ctx)
 	if err != nil {
 		return nil, err
 	}
-	// 记录用户登录设备
-	if err = GetUserLoginDevice(userInfo.UID, r, l.svcCtx.Ip2Region, l.svcCtx.DB); err != nil {
-		return nil, err
-	}
 	return response.SuccessWithData(data), nil
 }
 
-// HandleUserLogin 处理用户登录
-func HandleUserLogin(user *model.ScaAuthUser, svcCtx *svc.ServiceContext, autoLogin bool, r *http.Request, w http.ResponseWriter, ctx context.Context) (*types.LoginResponse, error) {
+// HandleLoginJWT 处理用户登录
+func HandleLoginJWT(user *model.ScaAuthUser, svcCtx *svc.ServiceContext, autoLogin bool, r *http.Request, ctx context.Context) (*types.LoginResponse, error) {
+	// 获取用户登录设备
+	err := GetUserLoginDevice(user.UID, r, svcCtx.Ip2Region, svcCtx.DB)
+	if err != nil {
+		return nil, err
+	}
 	// 生成jwt token
 	accessToken := jwt.GenerateAccessToken(svcCtx.Config.Auth.AccessSecret, jwt.AccessJWTPayload{
 		UserID: user.UID,
@@ -85,9 +87,9 @@ func HandleUserLogin(user *model.ScaAuthUser, svcCtx *svc.ServiceContext, autoLo
 	})
 	var days time.Duration
 	if autoLogin {
-		days = 7 * 24 * time.Hour
+		days = 24 * time.Hour
 	} else {
-		days = time.Hour * 24
+		days = time.Hour * 1
 	}
 	refreshToken := jwt.GenerateRefreshToken(svcCtx.Config.Auth.AccessSecret, jwt.RefreshJWTPayload{
 		UserID: user.UID,
@@ -106,29 +108,76 @@ func HandleUserLogin(user *model.ScaAuthUser, svcCtx *svc.ServiceContext, autoLo
 		AccessToken:  accessToken,
 		RefreshToken: refreshToken,
 		UID:          user.UID,
+		Revoked:      false,
 	}
-	err := svcCtx.RedisClient.Set(ctx, constant.UserTokenPrefix+user.UID, redisToken, days).Err()
-	if err != nil {
-		return nil, err
-	}
-	err = HandlerSession(r, w, user.UID, svcCtx.Session)
+	err = svcCtx.RedisClient.Set(ctx, constant.UserTokenPrefix+user.UID, redisToken, days).Err()
 	if err != nil {
 		return nil, err
 	}
 	return &data, nil
-
 }
 
-// HandlerSession is a function to set the user_id in the session
-func HandlerSession(r *http.Request, w http.ResponseWriter, userID string, redisSession *redisstore.RedisStore) error {
-	session, err := redisSession.Get(r, constant.SESSION_KEY)
+// GetUserLoginDevice 获取用户登录设备
+func GetUserLoginDevice(userId string, r *http.Request, ip2location *xdb.Searcher, DB *query.Query) error {
+	userAgent := r.UserAgent()
+	if userAgent == "" {
+		return errors.New("user agent not found")
+	}
+	ip := utils.GetClientIP(r)
+	location, err := ip2location.SearchByStr(ip)
 	if err != nil {
 		return err
 	}
-	session.Values["user_id"] = userID
-	err = session.Save(r, w)
-	if err != nil {
+	location = utils.RemoveZeroAndAdjust(location)
+
+	ua := useragent.New(userAgent)
+	isBot := ua.Bot()
+	browser, browserVersion := ua.Browser()
+	os := ua.OS()
+	mobile := ua.Mobile()
+	mozilla := ua.Mozilla()
+	platform := ua.Platform()
+	engine, engineVersion := ua.Engine()
+	var newIsBot int64 = 0
+	var newIsMobile int64 = 0
+	if isBot {
+		newIsBot = 1
+	}
+	if mobile {
+		newIsMobile = 1
+	}
+	userDevice := DB.ScaAuthUserDevice
+	device, err := userDevice.Where(userDevice.UserID.Eq(userId), userDevice.IP.Eq(ip), userDevice.Agent.Eq(userAgent)).First()
+	if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
 		return err
 	}
-	return nil
+	newDevice := &model.ScaAuthUserDevice{
+		UserID:          userId,
+		Bot:             newIsBot,
+		Agent:           userAgent,
+		Browser:         browser,
+		BrowserVersion:  browserVersion,
+		EngineName:      engine,
+		EngineVersion:   engineVersion,
+		IP:              ip,
+		Location:        location,
+		OperatingSystem: os,
+		Mobile:          newIsMobile,
+		Mozilla:         mozilla,
+		Platform:        platform,
+	}
+	if device == nil {
+		// 创建新的设备记录
+		err = DB.ScaAuthUserDevice.Create(newDevice)
+		if err != nil {
+			return err
+		}
+		return nil
+	} else {
+		resultInfo, err := userDevice.Where(userDevice.ID.Eq(device.ID)).Updates(newDevice)
+		if err != nil || resultInfo.RowsAffected == 0 {
+			return errors.New("update device failed")
+		}
+		return nil
+	}
 }

app/core/api/internal/logic/user/get_user_device_logic.go

@@ -1,115 +0,0 @@
-package user
-
-import (
-	"context"
-	"errors"
-	"github.com/lionsoul2014/ip2region/binding/golang/xdb"
-	"github.com/mssola/useragent"
-	"gorm.io/gorm"
-	"net/http"
-	"schisandra-album-cloud-microservices/app/core/api/common/jwt"
-	"schisandra-album-cloud-microservices/app/core/api/common/response"
-	"schisandra-album-cloud-microservices/app/core/api/common/utils"
-	"schisandra-album-cloud-microservices/app/core/api/repository/mysql/model"
-	"schisandra-album-cloud-microservices/app/core/api/repository/mysql/query"
-
-	"schisandra-album-cloud-microservices/app/core/api/internal/svc"
-	"schisandra-album-cloud-microservices/app/core/api/internal/types"
-
-	"github.com/zeromicro/go-zero/core/logx"
-)
-
-type GetUserDeviceLogic struct {
-	logx.Logger
-	ctx    context.Context
-	svcCtx *svc.ServiceContext
-}
-
-func NewGetUserDeviceLogic(ctx context.Context, svcCtx *svc.ServiceContext) *GetUserDeviceLogic {
-	return &GetUserDeviceLogic{
-		Logger: logx.WithContext(ctx),
-		ctx:    ctx,
-		svcCtx: svcCtx,
-	}
-}
-
-func (l *GetUserDeviceLogic) GetUserDevice(r *http.Request, w http.ResponseWriter, req *types.UserDeviceRequest) (resp *types.Response, err error) {
-	token, ok := jwt.ParseAccessToken(l.svcCtx.Config.Auth.AccessSecret, req.AccessToken)
-	if !ok {
-		return response.Error(), nil
-	}
-	err = HandlerSession(r, w, token.UserID, l.svcCtx.Session)
-	if err != nil {
-		return nil, err
-	}
-	err = GetUserLoginDevice(token.UserID, r, l.svcCtx.Ip2Region, l.svcCtx.DB)
-	if err != nil {
-		return nil, err
-	}
-	return response.Success(), nil
-}
-
-// GetUserLoginDevice 获取用户登录设备
-func GetUserLoginDevice(userId string, r *http.Request, ip2location *xdb.Searcher, DB *query.Query) error {
-	userAgent := r.Header.Get("User-Agent")
-	if userAgent == "" {
-		return errors.New("user agent not found")
-	}
-	ip := utils.GetClientIP(r)
-	location, err := ip2location.SearchByStr(ip)
-	if err != nil {
-		return err
-	}
-	location = utils.RemoveZeroAndAdjust(location)
-
-	ua := useragent.New(userAgent)
-	isBot := ua.Bot()
-	browser, browserVersion := ua.Browser()
-	os := ua.OS()
-	mobile := ua.Mobile()
-	mozilla := ua.Mozilla()
-	platform := ua.Platform()
-	engine, engineVersion := ua.Engine()
-	var newIsBot int64 = 0
-	var newIsMobile int64 = 0
-	if isBot {
-		newIsBot = 1
-	}
-	if mobile {
-		newIsMobile = 1
-	}
-	userDevice := DB.ScaAuthUserDevice
-	device, err := userDevice.Where(userDevice.UserID.Eq(userId), userDevice.IP.Eq(ip), userDevice.Agent.Eq(userAgent)).First()
-	if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
-		return err
-	}
-	newDevice := &model.ScaAuthUserDevice{
-		UserID:          userId,
-		Bot:             newIsBot,
-		Agent:           userAgent,
-		Browser:         browser,
-		BrowserVersion:  browserVersion,
-		EngineName:      engine,
-		EngineVersion:   engineVersion,
-		IP:              ip,
-		Location:        location,
-		OperatingSystem: os,
-		Mobile:          newIsMobile,
-		Mozilla:         mozilla,
-		Platform:        platform,
-	}
-	if device == nil {
-		// 创建新的设备记录
-		err = DB.ScaAuthUserDevice.Create(newDevice)
-		if err != nil {
-			return err
-		}
-		return nil
-	} else {
-		resultInfo, err := userDevice.Where(userDevice.ID.Eq(device.ID)).Updates(newDevice)
-		if err != nil || resultInfo.RowsAffected == 0 {
-			return errors.New("update device failed")
-		}
-		return nil
-	}
-}

app/core/api/internal/logic/user/get_wechat_offiaccount_qrcode_logic.go

@@ -1,37 +1,36 @@
-package oauth
+package user
 
 import (
 	"context"
 	"encoding/json"
-	"net/http"
-	"time"
-
 	"github.com/ArtisanCloud/PowerWeChat/v3/src/basicService/qrCode/response"
-
+	"net/http"
 	"schisandra-album-cloud-microservices/app/core/api/common/constant"
 	response2 "schisandra-album-cloud-microservices/app/core/api/common/response"
 	"schisandra-album-cloud-microservices/app/core/api/common/utils"
+	"time"
+
 	"schisandra-album-cloud-microservices/app/core/api/internal/svc"
 	"schisandra-album-cloud-microservices/app/core/api/internal/types"
 
 	"github.com/zeromicro/go-zero/core/logx"
 )
 
-type GetWechatQrcodeLogic struct {
+type GetWechatOffiaccountQrcodeLogic struct {
 	logx.Logger
 	ctx    context.Context
 	svcCtx *svc.ServiceContext
 }
 
-func NewGetWechatQrcodeLogic(ctx context.Context, svcCtx *svc.ServiceContext) *GetWechatQrcodeLogic {
-	return &GetWechatQrcodeLogic{
+func NewGetWechatOffiaccountQrcodeLogic(ctx context.Context, svcCtx *svc.ServiceContext) *GetWechatOffiaccountQrcodeLogic {
+	return &GetWechatOffiaccountQrcodeLogic{
 		Logger: logx.WithContext(ctx),
 		ctx:    ctx,
 		svcCtx: svcCtx,
 	}
 }
 
-func (l *GetWechatQrcodeLogic) GetWechatQrcode(r *http.Request, req *types.OAuthWechatRequest) (resp *types.Response, err error) {
+func (l *GetWechatOffiaccountQrcodeLogic) GetWechatOffiaccountQrcode(r *http.Request, req *types.OAuthWechatRequest) (resp *types.Response, err error) {
 	ip := utils.GetClientIP(r) // 使用工具函数获取客户端IP
 	key := constant.UserQrcodePrefix + ip
 
@@ -46,7 +45,7 @@ func (l *GetWechatQrcodeLogic) GetWechatQrcode(r *http.Request, req *types.OAuth
 	}
 
 	// 生成临时二维码
-	data, err := l.svcCtx.WechatPublic.QRCode.Temporary(l.ctx, req.Client_id, 7*24*3600)
+	data, err := l.svcCtx.WechatOfficial.QRCode.Temporary(l.ctx, req.Client_id, 7*24*3600)
 	if err != nil {
 		return nil, err
 	}

app/core/api/internal/logic/user/phone_login_logic.go

@@ -79,32 +79,22 @@ func (l *PhoneLoginLogic) PhoneLogin(r *http.Request, w http.ResponseWriter, req
 			_ = tx.Rollback()
 			return nil, err
 		}
-		data, err := HandleUserLogin(user, l.svcCtx, req.AutoLogin, r, w, l.ctx)
+		data, err := HandleLoginJWT(user, l.svcCtx, req.AutoLogin, r, l.ctx)
 		if err != nil {
 			_ = tx.Rollback()
 			return nil, err
 		}
-		// 记录用户登录设备
-		if err = GetUserLoginDevice(user.UID, r, l.svcCtx.Ip2Region, l.svcCtx.DB); err != nil {
-			_ = tx.Rollback()
-			return nil, err
-		}
 		err = tx.Commit()
 		if err != nil {
 			return nil, err
 		}
 		return response.SuccessWithData(data), nil
 	} else {
-		data, err := HandleUserLogin(userInfo, l.svcCtx, req.AutoLogin, r, w, l.ctx)
+		data, err := HandleLoginJWT(userInfo, l.svcCtx, req.AutoLogin, r, l.ctx)
 		if err != nil {
 			_ = tx.Rollback()
 			return nil, err
 		}
-		// 记录用户登录设备
-		if err = GetUserLoginDevice(userInfo.UID, r, l.svcCtx.Ip2Region, l.svcCtx.DB); err != nil {
-			_ = tx.Rollback()
-			return nil, err
-		}
 		err = tx.Commit()
 		if err != nil {
 			return nil, err

app/core/api/internal/logic/user/wechat_offiaccount_login_logic.go

@@ -0,0 +1,107 @@
+package user
+
+import (
+	"context"
+	"errors"
+	"github.com/yitter/idgenerator-go/idgen"
+	"gorm.io/gorm"
+	"net/http"
+	"schisandra-album-cloud-microservices/app/core/api/common/constant"
+	randomname "schisandra-album-cloud-microservices/app/core/api/common/random_name"
+	"schisandra-album-cloud-microservices/app/core/api/common/response"
+	"schisandra-album-cloud-microservices/app/core/api/common/utils"
+	"schisandra-album-cloud-microservices/app/core/api/repository/mysql/model"
+	"strconv"
+
+	"schisandra-album-cloud-microservices/app/core/api/internal/svc"
+	"schisandra-album-cloud-microservices/app/core/api/internal/types"
+
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type WechatOffiaccountLoginLogic struct {
+	logx.Logger
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+}
+
+func NewWechatOffiaccountLoginLogic(ctx context.Context, svcCtx *svc.ServiceContext) *WechatOffiaccountLoginLogic {
+	return &WechatOffiaccountLoginLogic{
+		Logger: logx.WithContext(ctx),
+		ctx:    ctx,
+		svcCtx: svcCtx,
+	}
+}
+
+func (l *WechatOffiaccountLoginLogic) WechatOffiaccountLogin(r *http.Request, req *types.WechatOffiaccountLoginRequest) (resp *types.Response, err error) {
+	tx := l.svcCtx.DB.Begin()
+	userSocial := l.svcCtx.DB.ScaAuthUserSocial
+	socialUser, err := tx.ScaAuthUserSocial.Where(userSocial.OpenID.Eq(req.Openid), userSocial.Source.Eq(constant.OAuthSourceWechat)).First()
+	if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
+		return nil, err
+	}
+	if socialUser == nil {
+		// 创建用户
+		uid := idgen.NextId()
+		uidStr := strconv.FormatInt(uid, 10)
+		avatar := utils.GenerateAvatar(uidStr)
+		name := randomname.GenerateName()
+
+		addUser := &model.ScaAuthUser{
+			UID:      uidStr,
+			Avatar:   avatar,
+			Username: req.Openid,
+			Nickname: name,
+			Gender:   constant.Male,
+		}
+		err = tx.ScaAuthUser.Create(addUser)
+		if err != nil {
+			_ = tx.Rollback()
+			return nil, err
+		}
+
+		newSocialUser := &model.ScaAuthUserSocial{
+			UserID: uidStr,
+			OpenID: req.Openid,
+			Source: constant.OAuthSourceWechat,
+		}
+		err = tx.ScaAuthUserSocial.Create(newSocialUser)
+		if err != nil {
+			_ = tx.Rollback()
+			return nil, err
+		}
+
+		if res, err := l.svcCtx.CasbinEnforcer.AddRoleForUser(uidStr, constant.User); !res || err != nil {
+			_ = tx.Rollback()
+			return nil, err
+		}
+
+		data, err := HandleLoginJWT(addUser, l.svcCtx, true, r, l.ctx)
+		if err != nil {
+			_ = tx.Rollback()
+			return nil, err
+		}
+		if err = tx.Commit(); err != nil {
+			return nil, err
+		}
+		return response.SuccessWithData(data), nil
+	} else {
+		authUser := l.svcCtx.DB.ScaAuthUser
+
+		authUserInfo, err := tx.ScaAuthUser.Where(authUser.UID.Eq(socialUser.UserID)).First()
+		if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
+			_ = tx.Rollback()
+			return nil, err
+		}
+		data, err := HandleLoginJWT(authUserInfo, l.svcCtx, true, r, l.ctx)
+		if err != nil {
+			_ = tx.Rollback()
+			return nil, err
+		}
+		if err = tx.Commit(); err != nil {
+			return nil, err
+		}
+		return response.SuccessWithData(data), nil
+
+	}
+}