pkg/common/jwt/common.go

@@ -38,7 +38,8 @@ func ParseToChatUser(c *gin.Context) (chatUserInfo *accountFiee.ChatUserData, co
 	ctx := context.Background()
 	var originId int64 = 0
 	var newChatUser *accountFiee.ChatUserData
-	check := true
+	switch domain {
+	case config.AppConfig.System.Domain:
 		//fiee token校验
 		token, err = secret.GetJwtFromStr(token)
 		if err != nil {
@@ -47,10 +48,12 @@ func ParseToChatUser(c *gin.Context) (chatUserInfo *accountFiee.ChatUserData, co
 			return
 		}
 		var fieeJwtInfo *accountFiee.DecryptJwtResponse
-	fieeJwtInfo, err = service.AccountFieeProvider.DecryptJwt(ctx, &accountFiee.DecryptJwtRequest{Token: token, Domain: config.AppConfig.System.Domain})
+		fieeJwtInfo, err = service.AccountFieeProvider.DecryptJwt(ctx, &accountFiee.DecryptJwtRequest{Token: token, Domain: domain})
 		if err != nil || fieeJwtInfo.IsOffline {
-		check = false
+			fmt.Println("fiee token decrypt err:", err)
-	} else {
+			code = e.NotLogin
+			return
+		}
 		originId = int64(fieeJwtInfo.ID)
 		newChatUser = &accountFiee.ChatUserData{
 			NickName: fieeJwtInfo.NickName,
@@ -59,11 +62,8 @@ func ParseToChatUser(c *gin.Context) (chatUserInfo *accountFiee.ChatUserData, co
 			Origin:   config.AppConfig.System.Domain,
 			OriginId: int64(fieeJwtInfo.ID),
 		}
-		domain = config.AppConfig.System.Domain
+	case e.ErpDomain:
-		fmt.Println("fiee token decrypt success, domain:", domain)
+		//erp token校验
-	}
-	if !check {
-		// fontree token校验
 		token, err = secret.GetJwtFromStr(token)
 		if err != nil {
 			fmt.Println("fontree token err:", err)
@@ -71,12 +71,12 @@ func ParseToChatUser(c *gin.Context) (chatUserInfo *accountFiee.ChatUserData, co
 			return
 		}
 		var fontreeJwtInfo *account.DecryptJwtResponse
-		fontreeJwtInfo, err = service.AccountProvider.DecryptJwt(ctx, &account.DecryptJwtRequest{Token: token, Domain: e.ErpDomain})
+		fontreeJwtInfo, err = service.AccountProvider.DecryptJwt(ctx, &account.DecryptJwtRequest{Token: token, Domain: domain})
 		if err != nil || fontreeJwtInfo.IsOffline {
-			check = false
+			fmt.Println("fontree token decrypt err:", err)
-
+			code = e.NotLogin
-		} else {
+			return
-			check = true
+		}
 		originId = int64(fontreeJwtInfo.ID)
 		newChatUser = &accountFiee.ChatUserData{
 			NickName: fontreeJwtInfo.NickName,
@@ -85,14 +85,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)
-		}
-	}
-	if !check {
-		fmt.Println("fontree token decrypt err:", err)
-		code = e.NotLogin
-		return
 	}
 	var userQueryRes *accountFiee.GetChatUserListResp
 	userQueryRes, err = service.AccountFieeProvider.GetChatUserList(c, &accountFiee.GetChatUserListRequest{