|
|
|
@ -7,6 +7,7 @@ import (
|
|
|
|
|
"Open_IM/pkg/grpc-etcdv3/getcdv3"
|
|
|
|
|
rpc "Open_IM/pkg/proto/auth"
|
|
|
|
|
open_im_sdk "Open_IM/pkg/proto/sdk_ws"
|
|
|
|
|
"Open_IM/pkg/utils"
|
|
|
|
|
"context"
|
|
|
|
|
"github.com/gin-gonic/gin"
|
|
|
|
|
"github.com/jinzhu/copier"
|
|
|
|
@ -28,16 +29,15 @@ func UserRegister(c *gin.Context) {
|
|
|
|
|
return
|
|
|
|
|
}
|
|
|
|
|
req := &rpc.UserRegisterReq{UserInfo: &open_im_sdk.UserInfo{}}
|
|
|
|
|
//utils.CopyStructFields(*req.UserInfo, params)
|
|
|
|
|
utils.CopyStructFields(*req.UserInfo, params)
|
|
|
|
|
copier.Copy(req.UserInfo, ¶ms)
|
|
|
|
|
req.OperationID = params.OperationID
|
|
|
|
|
log.NewInfo(req.OperationID, "UserRegister args ", req.String())
|
|
|
|
|
etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImAuthName)
|
|
|
|
|
client := rpc.NewAuthClient(etcdConn)
|
|
|
|
|
reply, err := client.UserRegister(context.Background(), req)
|
|
|
|
|
|
|
|
|
|
if err != nil || reply.CommonResp.ErrCode != 0 {
|
|
|
|
|
log.NewError("0", "UserRegister failed ", err, reply.CommonResp.ErrCode)
|
|
|
|
|
log.NewError(req.OperationID, "UserRegister failed ", err, reply.CommonResp.ErrCode)
|
|
|
|
|
c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": err.Error()})
|
|
|
|
|
return
|
|
|
|
|
}
|
|
|
|
|