fix bug

internal/api/user/user.go

@@ -15,7 +15,6 @@ import (
 	"Open_IM/pkg/utils"
 	"context"
 	"github.com/gin-gonic/gin"
-	"github.com/golang/protobuf/ptypes/wrappers"
 	"net/http"
 	"strings"
 )
@@ -216,9 +215,6 @@ func UpdateUserInfo(c *gin.Context) {
 		return
 	}
 	log.NewInfo(params.OperationID, "UpdateUserInfo args ", req.String())
-	if params.GlobalRecvMsgOpt != nil {
-		req.GlobalRecvMsgOpt = &wrappers.Int32Value{Value: *params.GlobalRecvMsgOpt}
-	}
 	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImUserName, req.OperationID)
 	if etcdConn == nil {
 		errMsg := req.OperationID + "getcdv3.GetConn == nil"

internal/rpc/user/user.go

@@ -383,27 +383,12 @@ func (s *userServer) UpdateUserInfo(ctx context.Context, req *pbUser.UpdateUserI
 	if req.UserInfo.Birth != 0 {
 		user.Birth = utils.UnixSecondToTime(int64(req.UserInfo.Birth))
 	}
-	m := make(map[string]interface{}, 1)
-	if req.GlobalRecvMsgOpt != nil {
-		log.NewDebug(req.OperationID, utils.GetSelfFuncName(), req.GlobalRecvMsgOpt, "set GlobalRecvMsgOpt")
-		m["global_recv_msg_opt"] = req.GlobalRecvMsgOpt.Value
-		err := db.DB.SetUserGlobalMsgRecvOpt(user.UserID, req.GlobalRecvMsgOpt.Value)
-		if err != nil {
-			log.NewError(req.OperationID, utils.GetSelfFuncName(), "SetUserGlobalMsgRecvOpt failed ", err.Error(), user)
-			return &pbUser.UpdateUserInfoResp{CommonResp: &pbUser.CommonResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: constant.ErrDB.ErrMsg}}, nil
-		}
-		err = imdb.UpdateUserInfoByMap(user, m)
-		if err != nil {
-			log.NewError(req.OperationID, "UpdateUserInfo failed ", err.Error(), user)
-			return &pbUser.UpdateUserInfoResp{CommonResp: &pbUser.CommonResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: constant.ErrDB.ErrMsg}}, nil
-		}
-	} else {
+
 	err := imdb.UpdateUserInfo(user)
 	if err != nil {
 		log.NewError(req.OperationID, "UpdateUserInfo failed ", err.Error(), user)
 		return &pbUser.UpdateUserInfoResp{CommonResp: &pbUser.CommonResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: constant.ErrDB.ErrMsg}}, nil
 	}
-	}
 	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImFriendName, req.OperationID)
 	if etcdConn == nil {
 		errMsg := req.OperationID + "getcdv3.GetConn == nil"

pkg/base_info/public_struct.go

@@ -13,7 +13,6 @@ type ApiUserInfo struct {
 	PhoneNumber string `json:"phoneNumber" binding:"omitempty,max=32"`
 	Birth       uint32 `json:"birth" binding:"omitempty"`
 	Email       string `json:"email" binding:"omitempty,max=64"`
-	GlobalRecvMsgOpt *int32 `json:"globalRecvMsgOpt" binding:"omitempty,oneof=0 1 2"`
 	Ex          string `json:"ex" binding:"omitempty,max=1024"`
 }