From ab706f4076a1c011aea9e0095dad00a914133a2f Mon Sep 17 00:00:00 2001 From: wenxu12345 <44203734@qq.com> Date: Mon, 25 Apr 2022 21:13:32 +0800 Subject: [PATCH] fix bug --- cmd/open_im_api/main.go | 2 +- cmd/open_im_cms_api/main.go | 2 +- internal/api/user/user.go | 32 ++++++++++++++++---------------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/cmd/open_im_api/main.go b/cmd/open_im_api/main.go index b27892d9b..888b7e728 100644 --- a/cmd/open_im_api/main.go +++ b/cmd/open_im_api/main.go @@ -174,7 +174,7 @@ func main() { } go apiThird.MinioInit() - ginPort := flag.Int("port", 10000, "get ginServerPort from cmd,default 10000 as port") + ginPort := flag.Int("port", 10002, "get ginServerPort from cmd,default 10000 as port") flag.Parse() fmt.Println("start api server, port: ", *ginPort) err := r.Run(":" + strconv.Itoa(*ginPort)) diff --git a/cmd/open_im_cms_api/main.go b/cmd/open_im_cms_api/main.go index d4889dc9d..e4061561c 100644 --- a/cmd/open_im_cms_api/main.go +++ b/cmd/open_im_cms_api/main.go @@ -14,7 +14,7 @@ func main() { gin.SetMode(gin.ReleaseMode) router := cms_api.NewGinRouter() router.Use(utils.CorsHandler()) - ginPort := flag.Int("port", 8000, "get ginServerPort from cmd,default 8000 as port") + ginPort := flag.Int("port", 10006, "get ginServerPort from cmd,default 8000 as port") flag.Parse() fmt.Println("start cms api server, port: ", ginPort) router.Run(":" + strconv.Itoa(*ginPort)) diff --git a/internal/api/user/user.go b/internal/api/user/user.go index e56689897..46e51af45 100644 --- a/internal/api/user/user.go +++ b/internal/api/user/user.go @@ -205,22 +205,22 @@ func GetSelfUserInfo(c *gin.Context) { log.NewInfo(req.OperationID, utils.GetSelfFuncName(), updateUserInfoReq.String()) etcdConnCache := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImCacheName) cacheClient := cache.NewCacheClient(etcdConnCache) - cacheResp, err := cacheClient.UpdateUserInfo(context.Background(), updateUserInfoReq) - if err != nil { - log.NewError(req.OperationID, "UpdateUserInfo cache failed ", err.Error(), req.String()) - c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": "call rpc server failed: " + err.Error()}) - return - } - if cacheResp.CommonResp.ErrCode != 0 { - log.NewError(req.OperationID, utils.GetSelfFuncName(), cacheResp.CommonResp.String()) - resp := api.UpdateUserInfoResp{CommResp: api.CommResp{ErrCode: cacheResp.CommonResp.ErrCode, ErrMsg: cacheResp.CommonResp.ErrMsg}} - c.JSON(http.StatusOK, resp) - return - } - resp := api.GetSelfUserInfoResp{CommResp: api.CommResp{ErrCode: RpcResp.CommonResp.ErrCode, ErrMsg: RpcResp.CommonResp.ErrMsg}, UserInfo: RpcResp.UserInfoList[0]} - resp.Data = jsonData.JsonDataOne(resp.UserInfo) - log.NewInfo(req.OperationID, "GetUserInfo api return ", resp) - c.JSON(http.StatusOK, resp) + := cacheClient.UpdateUserInfo(context.Background(), updateUserInfoReq) + //if err != nil { + // log.NewError(req.OperationID, "UpdateUserInfo cache failed ", err.Error(), req.String()) + // c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": "call rpc server failed: " + err.Error()}) + // return + //} + //if cacheResp.CommonResp.ErrCode != 0 { + // log.NewError(req.OperationID, utils.GetSelfFuncName(), cacheResp.CommonResp.String()) + // resp := api.UpdateUserInfoResp{CommResp: api.CommResp{ErrCode: cacheResp.CommonResp.ErrCode, ErrMsg: cacheResp.CommonResp.ErrMsg}} + // c.JSON(http.StatusOK, resp) + // return + //} + //resp := api.GetSelfUserInfoResp{CommResp: api.CommResp{ErrCode: RpcResp.CommonResp.ErrCode, ErrMsg: RpcResp.CommonResp.ErrMsg}, UserInfo: RpcResp.UserInfoList[0]} + //resp.Data = jsonData.JsonDataOne(resp.UserInfo) + //log.NewInfo(req.OperationID, "GetUserInfo api return ", resp) + //c.JSON(http.StatusOK, resp) } else { resp := api.GetSelfUserInfoResp{CommResp: api.CommResp{ErrCode: RpcResp.CommonResp.ErrCode, ErrMsg: RpcResp.CommonResp.ErrMsg}} log.NewInfo(req.OperationID, "GetUserInfo api return ", resp)