diff --git a/pkg/common/jwt/common.go b/pkg/common/jwt/common.go
index 6142464..df3bfc4 100644
--- a/pkg/common/jwt/common.go
+++ b/pkg/common/jwt/common.go
@@ -38,22 +38,19 @@ func ParseToChatUser(c *gin.Context) (chatUserInfo *accountFiee.ChatUserData, co
 	ctx := context.Background()
 	var originId int64 = 0
 	var newChatUser *accountFiee.ChatUserData
-	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: domain})
-		if err != nil || fieeJwtInfo.IsOffline {
-			fmt.Println("fiee token decrypt err:", err)
-			code = e.NotLogin
-			return
-		}
+	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,
@@ -62,8 +59,11 @@ func ParseToChatUser(c *gin.Context) (chatUserInfo *accountFiee.ChatUserData, co
 			Origin:   config.AppConfig.System.Domain,
 			OriginId: int64(fieeJwtInfo.ID),
 		}
-	case e.ErpDomain:
-		//erp token校验
+		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)
@@ -71,21 +71,29 @@ 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: domain})
+		fontreeJwtInfo, err = service.AccountProvider.DecryptJwt(ctx, &account.DecryptJwtRequest{Token: token, Domain: e.ErpDomain})
 		if err != nil || fontreeJwtInfo.IsOffline {
-			fmt.Println("fontree token decrypt err:", err)
-			code = e.NotLogin
-			return
-		}
-		originId = int64(fontreeJwtInfo.ID)
-		newChatUser = &accountFiee.ChatUserData{
-			NickName: fontreeJwtInfo.NickName,
-			Account:  fontreeJwtInfo.Account,
-			Role:     2,
-			Origin:   e.ErpDomain,
-			OriginId: int64(fontreeJwtInfo.ID),
+			check = false
+
+		} else {
+			check = true
+			originId = int64(fontreeJwtInfo.ID)
+			newChatUser = &accountFiee.ChatUserData{
+				NickName: fontreeJwtInfo.NickName,
+				Account:  fontreeJwtInfo.Account,
+				Role:     2,
+				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{
 		Query:    &accountFiee.ChatUserData{Origin: domain, OriginId: originId},