From 3533242855bf2689c56b40451fa584e63ca69218 Mon Sep 17 00:00:00 2001 From: jjxu <428192774@qq.com> Date: Sun, 15 Jun 2025 12:28:30 +0800 Subject: [PATCH] Update common.go --- pkg/common/jwt/common.go | 65 +++++++++++++++++++--------------------- 1 file changed, 31 insertions(+), 34 deletions(-) diff --git a/pkg/common/jwt/common.go b/pkg/common/jwt/common.go index 2315c73..9bb31e1 100644 --- a/pkg/common/jwt/common.go +++ b/pkg/common/jwt/common.go @@ -21,8 +21,7 @@ import ( // ParseToChatUser 将token信息转换为聊天室用户信息 func ParseToChatUser(c *gin.Context) (chatUserInfo *accountFiee.ChatUserData, code e.ErrorCodeType) { - fmt.Println(c.GetHeader("Domain")) - domain := c.GetHeader("domain") + domain := c.GetHeader("Domain") if domain == "" { domain = config.AppConfig.System.Domain } @@ -38,42 +37,41 @@ func ParseToChatUser(c *gin.Context) (chatUserInfo *accountFiee.ChatUserData, co var originId int64 = 0 var newChatUser *accountFiee.ChatUserData check := true - //fiee token校验 - token, err = secret.GetJwtFromStr(token) - if err != nil { - fmt.Println("fiee token err:", err) - code = e.NotLogin - return - } - var fieeJwtInfo *accountFiee.DecryptJwtResponse - fieeJwtInfo, err = service.AccountFieeProvider.DecryptJwt(ctx, &accountFiee.DecryptJwtRequest{Token: token, Domain: config.AppConfig.System.Domain}) - if err != nil || fieeJwtInfo.IsOffline { - check = false - } else { - originId = int64(fieeJwtInfo.ID) - newChatUser = &accountFiee.ChatUserData{ - NickName: fieeJwtInfo.NickName, - Account: fieeJwtInfo.Account, - Role: 1, - Origin: config.AppConfig.System.Domain, - OriginId: int64(fieeJwtInfo.ID), + switch domain { + case config.AppConfig.System.Domain: //fiee token校验 + token, err = secret.GetJwtFromStr(token) + if err != nil { + fmt.Println("fiee token err:", err) + code = e.NotLogin + return + } + var fieeJwtInfo *accountFiee.DecryptJwtResponse + fieeJwtInfo, err = service.AccountFieeProvider.DecryptJwt(ctx, &accountFiee.DecryptJwtRequest{Token: token, Domain: config.AppConfig.System.Domain}) + if err != nil || fieeJwtInfo.IsOffline { + check = false + } else { + originId = int64(fieeJwtInfo.ID) + newChatUser = &accountFiee.ChatUserData{ + NickName: fieeJwtInfo.NickName, + Account: fieeJwtInfo.Account, + Role: 1, + Origin: config.AppConfig.System.Domain, + OriginId: int64(fieeJwtInfo.ID), + } + domain = config.AppConfig.System.Domain + fmt.Println("fiee token decrypt success, domain:", domain) + } + case e.ErpDomain: //erp token校验 + token, err = secret.GetJwtFromStr(token) + if err != nil { + fmt.Println("fontree token err:", err) + code = e.NotLogin + return } - domain = config.AppConfig.System.Domain - fmt.Println("fiee token decrypt success, domain:", domain) - } - if !check { - // fontree token校验 - // token, err = secret.GetJwtFromStr(token) - // if err != nil { - // fmt.Println("fontree token err:", err) - // code = e.NotLogin - // return - // } var fontreeJwtInfo *account.DecryptJwtResponse fontreeJwtInfo, err = service.AccountProvider.DecryptJwt(ctx, &account.DecryptJwtRequest{Token: token, Domain: e.ErpDomain}) if err != nil || fontreeJwtInfo.IsOffline { check = false - } else { check = true originId = int64(fontreeJwtInfo.ID) @@ -84,7 +82,6 @@ func ParseToChatUser(c *gin.Context) (chatUserInfo *accountFiee.ChatUserData, co Origin: e.ErpDomain, OriginId: int64(fontreeJwtInfo.ID), } - domain = e.ErpDomain fmt.Println("fontree token decrypt success, domain:", domain) } }