keepalive ttl * 3

add user.ex

internal/api/user/user.go

@@ -45,7 +45,7 @@ func GetUsersInfo(c *gin.Context) {
 	var publicUserInfoList []*open_im_sdk.PublicUserInfo
 	for _, v := range RpcResp.UserInfoList {
 		publicUserInfoList = append(publicUserInfoList,
-			&open_im_sdk.PublicUserInfo{UserID: v.UserID, Nickname: v.Nickname, FaceURL: v.FaceURL, Gender: v.Gender})
+			&open_im_sdk.PublicUserInfo{UserID: v.UserID, Nickname: v.Nickname, FaceURL: v.FaceURL, Gender: v.Gender, Ex: v.Ex})
 	}
 
 	resp := api.GetUsersInfoResp{CommResp: api.CommResp{ErrCode: RpcResp.CommonResp.ErrCode, ErrMsg: RpcResp.CommonResp.ErrMsg}, UserInfoList: publicUserInfoList}

pkg/grpc-etcdv3/getcdv3/register.go

@@ -38,6 +38,7 @@ func RegisterEtcd4Unique(schema, etcdAddr, myHost string, myPort int, serviceNam
 
 //etcdAddr separated by commas
 func RegisterEtcd(schema, etcdAddr, myHost string, myPort int, serviceName string, ttl int) error {
+	ttl = ttl * 3
 	cli, err := clientv3.New(clientv3.Config{
 		Endpoints: strings.Split(etcdAddr, ","), DialTimeout: 5 * time.Second})
 
@@ -72,11 +73,11 @@ func RegisterEtcd(schema, etcdAddr, myHost string, myPort int, serviceName strin
 	go func() {
 		for {
 			select {
-			case _, ok := <-kresp:
+			case pv, ok := <-kresp:
 				if ok == true {
-					//log.Debug("", "KeepAlive kresp ok", v, schema, etcdAddr, myHost, myPort, serviceName, ttl)
+					log.Debug("", "KeepAlive kresp ok", pv)
 				} else {
-					//log.Error("", "KeepAlive kresp failed", schema, etcdAddr, myHost, myPort, serviceName, ttl)
+					log.Error("", "KeepAlive kresp failed", pv)
 				}
 			}
 		}

pkg/proto/sdk_ws/ws.proto

@@ -40,6 +40,7 @@ message PublicUserInfo{
   string nickname = 2;
   string faceURL = 3;
   int32 gender = 4;
+  string ex = 5;
 }
 
 message UserInfo{
@@ -338,37 +339,6 @@ message ConversationUpdateTips{
 
 }
 
-///callback
-message CommonCallbackURLReq {
- string CallbackCommand = 1 [json_name = "code"];
- string OpenIMServerID = 2;
- string OperationID = 3;
-}
-
-message CommonCallbackURLResp {
- string Code = 1 [json_name = "code"];
- string Msg = 2  [json_name = "msg"];
- string OperationID = 3 [json_name = "operationID"];
-}
-
-message CallbackBeforeSendMsgReq {
- commonReq CommonCallbackURLReq = 1;
-
-}
-
-message CallbackBeforeSendMsgResp {
- commonResp CommonCallbackURLResp = 1;
- string FromUserID = 2;
-}
-
-message CallbackAfterAddFriendReq {
-  commonReq CommonCallbackURLReq = 1;
-}
-
-message CallbackAfterAddFriendResp {
- commonResp CommonCallbackURLResp = 1;
-}
-
 
 ///cms
 message RequestPagination {