Merge branch 'chat' into dev

pkg/common/ws/wsMessageHandle.go

@@ -9,6 +9,7 @@ package ws
 import (
 	"context"
 	"encoding/json"
+	"fmt"
 	"fonchain-fiee/api/account"
 	"fonchain-fiee/api/accountFiee"
 	"fonchain-fiee/pkg/config"
@@ -47,7 +48,7 @@ func AuthorizationVerify(sourceData []byte) (userInfo *accountFiee.ChatUserData,
 		accountInfo.OriginId = int64(fieeJwtInfo.ID)
 		accountInfo.Account = fieeJwtInfo.Account
 		accountInfo.NickName = fieeJwtInfo.NickName
-	case "fontree":
+	case e.ErpDomain:
 		//erp token校验
 		msg.Content.Auth, err = secret.GetJwtFromStr(msg.Content.Auth)
 		if err != nil {
@@ -75,19 +76,25 @@ func AuthorizationVerify(sourceData []byte) (userInfo *accountFiee.ChatUserData,
 	if err != nil || chatUserQuery.Total == 0 {
 		//注册客服
 		var createUserRes *accountFiee.CreateChatUserResp
-		createUserRes, err = service.AccountFieeProvider.CreateChatUser(ctx, &accountFiee.ChatUserData{
+		var createChatUserReq = &accountFiee.ChatUserData{
 			NickName: accountInfo.NickName,
 			Account:  accountInfo.Account,
-			Role:     2,
+			Role:     1,
 			Origin:   msg.Content.Domain,
 			OriginId: int64(accountInfo.ID),
-		})
+		}
+		if msg.Content.Domain == e.ErpDomain {
+			createChatUserReq.Role = 2
+		}
+		fmt.Printf("注册聊天用户:%#v\n", createChatUserReq)
+		createUserRes, err = service.AccountFieeProvider.CreateChatUser(ctx, createChatUserReq)
 		if err != nil {
 			return
 		}
 		userInfo = createUserRes.GetData()
 	} else {
 		userInfo = chatUserQuery.List[0]
+		fmt.Printf("获取聊天用户:%#v\n", userInfo)
 	}
 	ok = true
 	return

pkg/e/code.go

@@ -13,6 +13,7 @@ const (
 
 const (
 	DomainAdmin = "blockchain"
+	ErpDomain   = "fontree"
 )
 
 const (