Merge remote-tracking branch 'origin/tuoyun' into tuoyun

# Conflicts:
#	cmd/Open-IM-SDK-Core
#	pkg/common/config/config.go

internal/api/manage/management_chat.go

@@ -146,7 +146,12 @@ func ManagementSendMsg(c *gin.Context) {
 
 	log.Info("", "", "api ManagementSendMsg call, api call rpc...")
 
-	reply, _ := client.UserSendMsg(context.Background(), pbData)
+	reply, err := client.UserSendMsg(context.Background(), pbData)
+	if err != nil {
+		log.NewError(params.OperationID, "call delete UserSendMsg rpc server failed", err.Error())
+		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": "call UserSendMsg  rpc server failed"})
+		return
+	}
 	log.Info("", "", "api ManagementSendMsg call end..., [data: %s] [reply: %s]", pbData.String(), reply.String())
 
 	c.JSON(http.StatusOK, gin.H{

internal/api/manage/management_user.go

@@ -32,6 +32,10 @@ type paramsGetUsersOnlineStatus struct {
 	OperationID string   `json:"operationID" binding:"required"`
 	UserIDList  []string `json:"userIDList" binding:"required,lte=200"`
 }
+type paramsAccountCheck struct {
+	OperationID string   `json:"operationID" binding:"required"`
+	UserIDList  []string `json:"userIDList" binding:"required,lte=100"`
+}
 
 func DeleteUser(c *gin.Context) {
 	params := paramsDeleteUsers{}
@@ -87,6 +91,32 @@ func GetAllUsersUid(c *gin.Context) {
 	resp := gin.H{"errCode": RpcResp.CommonResp.ErrorCode, "errMsg": RpcResp.CommonResp.ErrorMsg, "uidList": RpcResp.UidList}
 	c.JSON(http.StatusOK, resp)
 
+}
+func AccountCheck(c *gin.Context) {
+	params := paramsAccountCheck{}
+	if err := c.BindJSON(&params); err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()})
+		return
+	}
+	log.InfoByKv("AccountCheck req come here", params.OperationID, params.UserIDList)
+	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImUserName)
+	client := pbUser.NewUserClient(etcdConn)
+	//defer etcdConn.Close()
+
+	req := &pbUser.AccountCheckReq{
+		OperationID: params.OperationID,
+		Token:       c.Request.Header.Get("token"),
+		UidList:     params.UserIDList,
+	}
+	RpcResp, err := client.AccountCheck(context.Background(), req)
+	if err != nil {
+		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": err.Error()})
+		return
+	}
+	log.InfoByKv("call AccountCheck rpc server is success", params.OperationID, "resp args", RpcResp.String())
+	resp := gin.H{"errCode": RpcResp.CommonResp.ErrorCode, "errMsg": RpcResp.CommonResp.ErrorMsg, "result": RpcResp.Result}
+	c.JSON(http.StatusOK, resp)
+
 }
 func GetUsersOnlineStatus(c *gin.Context) {
 	params := paramsGetUsersOnlineStatus{}

internal/msg_gateway/gate/ws_server.go

@@ -9,10 +9,11 @@ import (
 	"Open_IM/pkg/utils"
 	"bytes"
 	"encoding/gob"
-	"github.com/gorilla/websocket"
 	"net/http"
 	"sync"
 	"time"
+
+	"github.com/gorilla/websocket"
 )
 
 type UserConn struct {
@@ -28,8 +29,7 @@ type WServer struct {
 }
 
 func (ws *WServer) onInit(wsPort int) {
-	ip := utils.ServerIP
-	ws.wsAddr = ip + ":" + utils.IntToString(wsPort)
+	ws.wsAddr = ":" + utils.IntToString(wsPort)
 	ws.wsMaxConnNum = config.Config.LongConnSvr.WebsocketMaxConnNum
 	ws.wsConnToUser = make(map[*UserConn]string)
 	ws.wsUserToConn = make(map[string]*UserConn)

internal/rpc/user/management_user.go

@@ -63,3 +63,34 @@ func (s *userServer) GetAllUsersUid(_ context.Context, req *pbUser.GetAllUsersUi
 	}
 
 }
+func (s *userServer) AccountCheck(_ context.Context, req *pbUser.AccountCheckReq) (*pbUser.AccountCheckResp, error) {
+	log.InfoByKv("rpc AccountCheck arrived server", req.OperationID, "args", req.String())
+	c, err := token_verify.ParseToken(req.Token)
+	if err != nil {
+		log.InfoByKv("parse token failed", req.OperationID, "err", err.Error())
+		return &pbUser.AccountCheckResp{CommonResp: &pbUser.CommonResp{ErrorCode: constant.ErrParseToken.ErrCode, ErrorMsg: err.Error()}}, nil
+	}
+	if !utils.IsContain(c.UID, config.Config.Manager.AppManagerUid) {
+		log.ErrorByKv(" Authentication failed", req.OperationID, "args", c)
+		return &pbUser.AccountCheckResp{CommonResp: &pbUser.CommonResp{ErrorCode: 401, ErrorMsg: "not authorized"}}, nil
+	}
+	uidList, err := im_mysql_model.SelectSomeUID(req.UidList)
+	if err != nil {
+		log.ErrorByKv("db get SelectSomeUID failed", req.OperationID, "err", err.Error())
+		return &pbUser.AccountCheckResp{CommonResp: &pbUser.CommonResp{ErrorCode: constant.ErrMysql.ErrCode, ErrorMsg: err.Error()}}, nil
+	} else {
+		var r []*pbUser.AccountCheckResp_SingleUserStatus
+		for _, v := range req.UidList {
+			temp := new(pbUser.AccountCheckResp_SingleUserStatus)
+			temp.UserID = v
+			if utils.IsContain(v, uidList) {
+				temp.AccountStatus = constant.Registered
+			} else {
+				temp.AccountStatus = constant.UnRegistered
+			}
+			r = append(r, temp)
+		}
+		return &pbUser.AccountCheckResp{CommonResp: &pbUser.CommonResp{ErrorCode: 0, ErrorMsg: ""}, Result: r}, nil
+	}
+
+}