diff --git a/cmd/open_im_api/main.go b/cmd/open_im_api/main.go
index 0a83053d1..ea126b1c8 100644
--- a/cmd/open_im_api/main.go
+++ b/cmd/open_im_api/main.go
@@ -34,14 +34,14 @@ func main() {
 		friendRouterGroup.POST("/add_friend", friend.AddFriend)                     //1
 		friendRouterGroup.POST("/get_friend_apply_list", friend.GetFriendApplyList) //1
 		friendRouterGroup.POST("/get_self_apply_list", friend.GetSelfApplyList)     //1
-		friendRouterGroup.POST("/get_friend_list", friend.GetFriendList)
+		friendRouterGroup.POST("/get_friend_list", friend.GetFriendList)            //1
 		friendRouterGroup.POST("/add_blacklist", friend.AddBlacklist)
 		friendRouterGroup.POST("/get_blacklist", friend.GetBlacklist)
 		friendRouterGroup.POST("/remove_blacklist", friend.RemoveBlacklist)
 		friendRouterGroup.POST("/delete_friend", friend.DeleteFriend)
-		friendRouterGroup.POST("/add_friend_response", friend.AddFriendResponse)
-		friendRouterGroup.POST("/set_friend_comment", friend.SetFriendComment)
-		friendRouterGroup.POST("/is_friend", friend.IsFriend)
+		friendRouterGroup.POST("/add_friend_response", friend.AddFriendResponse) //1
+		friendRouterGroup.POST("/set_friend_remark", friend.SetFriendRemark)     //1
+		friendRouterGroup.POST("/is_friend", friend.IsFriend)                    //1
 		friendRouterGroup.POST("/import_friend", friend.ImportFriend)
 	}
 	//group related routing group
diff --git a/internal/api/friend/friend.go b/internal/api/friend/friend.go
index 0fa12600f..1a27effb9 100644
--- a/internal/api/friend/friend.go
+++ b/internal/api/friend/friend.go
@@ -215,14 +215,14 @@ func GetBlacklist(c *gin.Context) {
 	c.JSON(http.StatusOK, resp)
 }
 
-func SetFriendComment(c *gin.Context) {
-	params := api.SetFriendCommentReq{}
+func SetFriendRemark(c *gin.Context) {
+	params := api.SetFriendRemarkReq{}
 	if err := c.BindJSON(&params); err != nil {
 		log.NewError("0", "BindJSON failed ", err.Error())
 		c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()})
 		return
 	}
-	req := &rpc.SetFriendCommentReq{CommID: &rpc.CommID{}}
+	req := &rpc.SetFriendRemarkReq{CommID: &rpc.CommID{}}
 	utils.CopyStructFields(req.CommID, &params.ParamsCommFriend)
 	req.Remark = params.Remark
 	var ok bool
@@ -236,13 +236,13 @@ func SetFriendComment(c *gin.Context) {
 
 	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImFriendName)
 	client := rpc.NewFriendClient(etcdConn)
-	RpcResp, err := client.SetFriendComment(context.Background(), req)
+	RpcResp, err := client.SetFriendRemark(context.Background(), req)
 	if err != nil {
 		log.NewError(req.CommID.OperationID, "SetFriendComment failed ", err.Error(), req.String())
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": "call set friend comment rpc server failed"})
 		return
 	}
-	resp := api.SetFriendCommentResp{CommResp: api.CommResp{ErrCode: RpcResp.CommonResp.ErrCode, ErrMsg: RpcResp.CommonResp.ErrMsg}}
+	resp := api.SetFriendRemarkResp{CommResp: api.CommResp{ErrCode: RpcResp.CommonResp.ErrCode, ErrMsg: RpcResp.CommonResp.ErrMsg}}
 
 	log.NewInfo(req.CommID.OperationID, "SetFriendComment api return ", resp)
 	c.JSON(http.StatusOK, resp)
@@ -305,7 +305,9 @@ func IsFriend(c *gin.Context) {
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": "call add friend rpc server failed"})
 		return
 	}
-	resp := api.IsFriendResp{CommResp: api.CommResp{ErrCode: RpcResp.ErrCode, ErrMsg: RpcResp.ErrMsg}, Response: RpcResp.Response}
+	resp := api.IsFriendResp{CommResp: api.CommResp{ErrCode: RpcResp.ErrCode, ErrMsg: RpcResp.ErrMsg}}
+	resp.Response.Friend = RpcResp.Response
+
 	log.NewInfo(req.CommID.OperationID, "IsFriend api return ", resp)
 	c.JSON(http.StatusOK, resp)
 }
@@ -352,7 +354,7 @@ func GetFriendList(c *gin.Context) {
 		return
 	}
 	req := &rpc.GetFriendListReq{CommID: &rpc.CommID{}}
-	utils.CopyStructFields(req.CommID, &params.ParamsCommFriend)
+	utils.CopyStructFields(req.CommID, &params)
 	var ok bool
 	ok, req.CommID.OpUserID = token_verify.GetUserIDFromToken(c.Request.Header.Get("token"))
 	if !ok {
@@ -372,6 +374,9 @@ func GetFriendList(c *gin.Context) {
 	}
 
 	resp := api.GetFriendListResp{CommResp: api.CommResp{ErrCode: RpcResp.ErrCode, ErrMsg: RpcResp.ErrMsg}, FriendInfoList: RpcResp.FriendInfoList}
+	if len(resp.FriendInfoList) == 0 {
+		resp.FriendInfoList = []*open_im_sdk.FriendInfo{}
+	}
 	log.NewInfo(req.CommID.OperationID, "GetFriendList api return ", resp)
 	c.JSON(http.StatusOK, resp)
 }
diff --git a/internal/rpc/friend/firend.go b/internal/rpc/friend/firend.go
index e0ba79824..4fe757f11 100644
--- a/internal/rpc/friend/firend.go
+++ b/internal/rpc/friend/firend.go
@@ -116,7 +116,7 @@ func (s *friendServer) AddBlacklist(ctx context.Context, req *pbFriend.AddBlackl
 		log.NewError(req.CommID.OperationID, "CheckAccess false ", req.CommID.OpUserID, req.CommID.FromUserID)
 		return &pbFriend.AddBlacklistResp{CommonResp: &pbFriend.CommonResp{ErrCode: constant.ErrAccess.ErrCode, ErrMsg: constant.ErrAccess.ErrMsg}}, nil
 	}
-	black := imdb.Black{OwnerUserID: req.CommID.FromUserID, BlockUserID: req.CommID.ToUserID}
+	black := imdb.Black{OwnerUserID: req.CommID.FromUserID, BlockUserID: req.CommID.ToUserID, OperatorUserID: req.CommID.OpUserID}
 
 	err := imdb.InsertInToUserBlackList(black)
 	if err != nil {
@@ -257,15 +257,16 @@ func (s *friendServer) AddFriendResponse(ctx context.Context, req *pbFriend.AddF
 
 		_, err = imdb.GetFriendRelationshipFromFriend(req.CommID.ToUserID, req.CommID.FromUserID)
 		if err == nil {
-			log.NewWarn(req.CommID.OperationID, "FindFriendRelationshipFromFriend exist", req.CommID.ToUserID, req.CommID.FromUserID)
+			log.NewWarn(req.CommID.OperationID, "GetFriendRelationshipFromFriend exist", req.CommID.ToUserID, req.CommID.FromUserID)
+		} else {
+			toInsertFollow := imdb.Friend{OwnerUserID: req.CommID.ToUserID, FriendUserID: req.CommID.FromUserID, OperatorUserID: req.CommID.OpUserID}
+			err = imdb.InsertToFriend(&toInsertFollow)
+			if err != nil {
+				log.NewError(req.CommID.OperationID, "InsertToFriend failed ", err.Error(), toInsertFollow)
+				return &pbFriend.AddFriendResponseResp{CommonResp: &pbFriend.CommonResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: constant.ErrDB.ErrMsg}}, nil
+			}
+			chat.FriendAddedNotification(req.CommID.OperationID, req.CommID.OpUserID, req.CommID.FromUserID, req.CommID.ToUserID)
 		}
-		toInsertFollow := imdb.Friend{OwnerUserID: req.CommID.ToUserID, FriendUserID: req.CommID.FromUserID, OperatorUserID: req.CommID.OpUserID}
-		err = imdb.InsertToFriend(&toInsertFollow)
-		if err != nil {
-			log.NewError(req.CommID.OperationID, "InsertToFriend failed ", err.Error(), toInsertFollow)
-			return &pbFriend.AddFriendResponseResp{CommonResp: &pbFriend.CommonResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: constant.ErrDB.ErrMsg}}, nil
-		}
-		chat.FriendAddedNotification(req.CommID.OperationID, req.CommID.OpUserID, req.CommID.FromUserID, req.CommID.ToUserID)
 	}
 
 	chat.FriendApplicationProcessedNotification(req)
@@ -324,22 +325,22 @@ func (s *friendServer) GetBlacklist(ctx context.Context, req *pbFriend.GetBlackl
 	return &pbFriend.GetBlacklistResp{BlackUserInfoList: userInfoList}, nil
 }
 
-func (s *friendServer) SetFriendComment(ctx context.Context, req *pbFriend.SetFriendCommentReq) (*pbFriend.SetFriendCommentResp, error) {
+func (s *friendServer) SetFriendRemark(ctx context.Context, req *pbFriend.SetFriendRemarkReq) (*pbFriend.SetFriendRemarkResp, error) {
 	log.NewInfo(req.CommID.OperationID, "SetFriendComment args ", req.String())
 	//Parse token, to find current user information
 	if !token_verify.CheckAccess(req.CommID.OpUserID, req.CommID.FromUserID) {
 		log.NewError(req.CommID.OperationID, "CheckAccess false ", req.CommID.OpUserID, req.CommID.FromUserID)
-		return &pbFriend.SetFriendCommentResp{CommonResp: &pbFriend.CommonResp{ErrCode: constant.ErrAccess.ErrCode, ErrMsg: constant.ErrAccess.ErrMsg}}, nil
+		return &pbFriend.SetFriendRemarkResp{CommonResp: &pbFriend.CommonResp{ErrCode: constant.ErrAccess.ErrCode, ErrMsg: constant.ErrAccess.ErrMsg}}, nil
 	}
 
 	err := imdb.UpdateFriendComment(req.CommID.FromUserID, req.CommID.ToUserID, req.Remark)
 	if err != nil {
 		log.NewError(req.CommID.OperationID, "UpdateFriendComment failed ", req.CommID.FromUserID, req.CommID.ToUserID, req.Remark)
-		return &pbFriend.SetFriendCommentResp{CommonResp: &pbFriend.CommonResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: constant.ErrDB.ErrMsg}}, nil
+		return &pbFriend.SetFriendRemarkResp{CommonResp: &pbFriend.CommonResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: constant.ErrDB.ErrMsg}}, nil
 	}
 	log.NewInfo(req.CommID.OperationID, "rpc SetFriendComment ok")
 	chat.FriendInfoChangedNotification(req.CommID.OperationID, req.CommID.OpUserID, req.CommID.FromUserID, req.CommID.ToUserID)
-	return &pbFriend.SetFriendCommentResp{CommonResp: &pbFriend.CommonResp{}}, nil
+	return &pbFriend.SetFriendRemarkResp{CommonResp: &pbFriend.CommonResp{}}, nil
 }
 
 func (s *friendServer) RemoveBlacklist(ctx context.Context, req *pbFriend.RemoveBlacklistReq) (*pbFriend.RemoveBlacklistResp, error) {
@@ -407,9 +408,9 @@ func (s *friendServer) GetFriendList(ctx context.Context, req *pbFriend.GetFrien
 	}
 	var userInfoList []*sdkws.FriendInfo
 	for _, friendUser := range friends {
-
-		var friendUserInfo sdkws.FriendInfo
-		utils.CopyStructFields(&friendUserInfo, friendUser)
+		friendUserInfo := sdkws.FriendInfo{FriendUser: &sdkws.UserInfo{}}
+		cp.FriendDBCopyOpenIM(&friendUserInfo, &friendUser)
+		log.NewDebug(req.CommID.OperationID, "friends : ", friendUser, "openim friends: ", friendUserInfo)
 		userInfoList = append(userInfoList, &friendUserInfo)
 	}
 	log.NewInfo(req.CommID.OperationID, "rpc GetFriendList ok", pbFriend.GetFriendListResp{FriendInfoList: userInfoList})
@@ -458,7 +459,7 @@ func (s *friendServer) GetSelfApplyList(ctx context.Context, req *pbFriend.GetSe
 	var selfApplyOtherUserList []*sdkws.FriendRequest
 	for _, selfApplyOtherUserInfo := range usersInfo {
 		var userInfo sdkws.FriendRequest // pbFriend.ApplyUserInfo
-		cp.FriendRequestDBCopyOpenIM(&userInfo, selfApplyOtherUserInfo)
+		cp.FriendRequestDBCopyOpenIM(&userInfo, &selfApplyOtherUserInfo)
 		selfApplyOtherUserList = append(selfApplyOtherUserList, &userInfo)
 	}
 	log.NewInfo(req.CommID.OperationID, "rpc GetSelfApplyList ok", pbFriend.GetSelfApplyListResp{FriendRequestList: selfApplyOtherUserList})
diff --git a/pkg/base_info/friend_api_struct.go b/pkg/base_info/friend_api_struct.go
index a45e7ccfa..5d7f33d27 100644
--- a/pkg/base_info/friend_api_struct.go
+++ b/pkg/base_info/friend_api_struct.go
@@ -35,7 +35,9 @@ type AddFriendResp struct {
 
 type AddFriendResponseReq struct {
 	ParamsCommFriend
-	Flag      int32  `json:"flag" binding:"required"`
+	//binding:"oneof=0 1 2"`
+	//}
+	Flag      int32  `json:"flag" binding:"required,oneof=-1 0 1"`
 	HandleMsg string `json:"handleMsg"`
 }
 type AddFriendResponseResp struct {
@@ -69,11 +71,11 @@ type BlackUserInfo struct {
 	open_im_sdk.PublicUserInfo
 }
 
-type SetFriendCommentReq struct {
+type SetFriendRemarkReq struct {
 	ParamsCommFriend
 	Remark string `json:"remark" binding:"required"`
 }
-type SetFriendCommentResp struct {
+type SetFriendRemarkResp struct {
 	CommResp
 }
 
@@ -87,9 +89,12 @@ type RemoveBlackListResp struct {
 type IsFriendReq struct {
 	ParamsCommFriend
 }
+type Response struct {
+	Friend bool `json:"isFriend"`
+}
 type IsFriendResp struct {
 	CommResp
-	Response bool `json:"response"`
+	Response Response `json:"data"`
 }
 
 type GetFriendsInfoReq struct {
@@ -101,7 +106,8 @@ type GetFriendsInfoResp struct {
 }
 
 type GetFriendListReq struct {
-	ParamsCommFriend
+	OperationID string `json:"operationID" binding:"required"`
+	FromUserID  string `json:"fromUserID" binding:"required"`
 }
 type GetFriendListResp struct {
 	CommResp
diff --git a/pkg/common/db/mysql_model/im_mysql_model/model_struct.go b/pkg/common/db/mysql_model/im_mysql_model/model_struct.go
index 29125d813..bd35c6314 100644
--- a/pkg/common/db/mysql_model/im_mysql_model/model_struct.go
+++ b/pkg/common/db/mysql_model/im_mysql_model/model_struct.go
@@ -161,6 +161,6 @@ type Black struct {
 	CreateTime     time.Time `gorm:"column:create_time"`
 	BlockUserID    string    `gorm:"column:block_user_id;primaryKey;"`
 	AddSource      int32     `gorm:"column:add_source"`
-	OperatorUserID int32     `gorm:"column:operator_user_id"`
+	OperatorUserID string    `gorm:"column:operator_user_id"`
 	Ex             string    `gorm:"column:ex"`
 }
diff --git a/pkg/common/utils/utils.go b/pkg/common/utils/utils.go
index ca67f33e2..61dc47be0 100644
--- a/pkg/common/utils/utils.go
+++ b/pkg/common/utils/utils.go
@@ -14,12 +14,12 @@ func OperationIDGenerator() string {
 	return strconv.FormatInt(time.Now().UnixNano()+int64(rand.Uint32()), 10)
 }
 
-func FriendOpenIMCopyDB(dst *imdb.Friend, src open_im_sdk.FriendInfo) {
+func FriendOpenIMCopyDB(dst *imdb.Friend, src *open_im_sdk.FriendInfo) {
 	utils.CopyStructFields(dst, src)
 	dst.FriendUserID = src.FriendUser.UserID
 }
 
-func FriendDBCopyOpenIM(dst *open_im_sdk.FriendInfo, src imdb.Friend) {
+func FriendDBCopyOpenIM(dst *open_im_sdk.FriendInfo, src *imdb.Friend) {
 	utils.CopyStructFields(dst, src)
 	user, _ := imdb.GetUserByUserID(src.FriendUserID)
 	if user != nil {
@@ -30,21 +30,21 @@ func FriendDBCopyOpenIM(dst *open_im_sdk.FriendInfo, src imdb.Friend) {
 }
 
 //
-func FriendRequestOpenIMCopyDB(dst *imdb.FriendRequest, src open_im_sdk.FriendRequest) {
+func FriendRequestOpenIMCopyDB(dst *imdb.FriendRequest, src *open_im_sdk.FriendRequest) {
 	utils.CopyStructFields(dst, src)
 }
 
-func FriendRequestDBCopyOpenIM(dst *open_im_sdk.FriendRequest, src imdb.FriendRequest) {
+func FriendRequestDBCopyOpenIM(dst *open_im_sdk.FriendRequest, src *imdb.FriendRequest) {
 	utils.CopyStructFields(dst, src)
 	dst.CreateTime = src.CreateTime.Unix()
 	dst.HandleTime = src.HandleTime.Unix()
 }
 
-func GroupOpenIMCopyDB(dst *imdb.Group, src open_im_sdk.GroupInfo) {
+func GroupOpenIMCopyDB(dst *imdb.Group, src *open_im_sdk.GroupInfo) {
 	utils.CopyStructFields(dst, src)
 }
 
-func GroupDBCopyOpenIM(dst *open_im_sdk.GroupInfo, src imdb.Group) {
+func GroupDBCopyOpenIM(dst *open_im_sdk.GroupInfo, src *imdb.Group) {
 	utils.CopyStructFields(dst, src)
 	user, _ := imdb.GetGroupOwnerInfoByGroupID(src.GroupID)
 	if user != nil {
@@ -54,11 +54,11 @@ func GroupDBCopyOpenIM(dst *open_im_sdk.GroupInfo, src imdb.Group) {
 	dst.CreateTime = src.CreateTime.Unix()
 }
 
-func GroupMemberOpenIMCopyDB(dst *imdb.GroupMember, src open_im_sdk.GroupMemberFullInfo) {
+func GroupMemberOpenIMCopyDB(dst *imdb.GroupMember, src *open_im_sdk.GroupMemberFullInfo) {
 	utils.CopyStructFields(dst, src)
 }
 
-func GroupMemberDBCopyOpenIM(dst *open_im_sdk.GroupMemberFullInfo, src imdb.GroupMember) {
+func GroupMemberDBCopyOpenIM(dst *open_im_sdk.GroupMemberFullInfo, src *imdb.GroupMember) {
 	utils.CopyStructFields(dst, src)
 	if token_verify.IsMangerUserID(src.UserID) {
 		u, _ := imdb.GetUserByUserID(src.UserID)
@@ -70,31 +70,31 @@ func GroupMemberDBCopyOpenIM(dst *open_im_sdk.GroupMemberFullInfo, src imdb.Grou
 	dst.JoinTime = src.JoinTime.Unix()
 }
 
-func GroupRequestOpenIMCopyDB(dst *imdb.GroupRequest, src open_im_sdk.GroupRequest) {
+func GroupRequestOpenIMCopyDB(dst *imdb.GroupRequest, src *open_im_sdk.GroupRequest) {
 	utils.CopyStructFields(dst, src)
 }
 
-func GroupRequestDBCopyOpenIM(dst *open_im_sdk.GroupRequest, src imdb.GroupRequest) {
+func GroupRequestDBCopyOpenIM(dst *open_im_sdk.GroupRequest, src *imdb.GroupRequest) {
 	utils.CopyStructFields(dst, src)
 	dst.ReqTime = src.ReqTime.Unix()
 	dst.HandleTime = src.HandledTime.Unix()
 }
 
-func UserOpenIMCopyDB(dst *imdb.User, src open_im_sdk.UserInfo) {
+func UserOpenIMCopyDB(dst *imdb.User, src *open_im_sdk.UserInfo) {
 	utils.CopyStructFields(dst, src)
 }
 
-func UserDBCopyOpenIM(dst *open_im_sdk.UserInfo, src imdb.User) {
+func UserDBCopyOpenIM(dst *open_im_sdk.UserInfo, src *imdb.User) {
 	utils.CopyStructFields(dst, src)
 	dst.CreateTime = src.CreateTime.Unix()
 }
 
-func BlackOpenIMCopyDB(dst *imdb.Black, src open_im_sdk.BlackInfo) {
+func BlackOpenIMCopyDB(dst *imdb.Black, src *open_im_sdk.BlackInfo) {
 	utils.CopyStructFields(dst, src)
 	dst.BlockUserID = src.BlackUserInfo.UserID
 }
 
-func BlackDBCopyOpenIM(dst *open_im_sdk.BlackInfo, src imdb.Black) {
+func BlackDBCopyOpenIM(dst *open_im_sdk.BlackInfo, src *imdb.Black) {
 	utils.CopyStructFields(dst, src)
 	dst.CreateTime = src.CreateTime.Unix()
 	user, _ := imdb.GetUserByUserID(src.BlockUserID)
diff --git a/pkg/proto/friend/friend.pb.go b/pkg/proto/friend/friend.pb.go
index 67efb3483..941dd457b 100644
--- a/pkg/proto/friend/friend.pb.go
+++ b/pkg/proto/friend/friend.pb.go
@@ -36,7 +36,7 @@ func (m *CommonResp) Reset()         { *m = CommonResp{} }
 func (m *CommonResp) String() string { return proto.CompactTextString(m) }
 func (*CommonResp) ProtoMessage()    {}
 func (*CommonResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_friend_a4d5a06cd0a3d99f, []int{0}
+	return fileDescriptor_friend_69e6f38cd215d5ef, []int{0}
 }
 func (m *CommonResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CommonResp.Unmarshal(m, b)
@@ -84,7 +84,7 @@ func (m *CommID) Reset()         { *m = CommID{} }
 func (m *CommID) String() string { return proto.CompactTextString(m) }
 func (*CommID) ProtoMessage()    {}
 func (*CommID) Descriptor() ([]byte, []int) {
-	return fileDescriptor_friend_a4d5a06cd0a3d99f, []int{1}
+	return fileDescriptor_friend_69e6f38cd215d5ef, []int{1}
 }
 func (m *CommID) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CommID.Unmarshal(m, b)
@@ -143,7 +143,7 @@ func (m *GetFriendsInfoReq) Reset()         { *m = GetFriendsInfoReq{} }
 func (m *GetFriendsInfoReq) String() string { return proto.CompactTextString(m) }
 func (*GetFriendsInfoReq) ProtoMessage()    {}
 func (*GetFriendsInfoReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_friend_a4d5a06cd0a3d99f, []int{2}
+	return fileDescriptor_friend_69e6f38cd215d5ef, []int{2}
 }
 func (m *GetFriendsInfoReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetFriendsInfoReq.Unmarshal(m, b)
@@ -183,7 +183,7 @@ func (m *GetFriendInfoResp) Reset()         { *m = GetFriendInfoResp{} }
 func (m *GetFriendInfoResp) String() string { return proto.CompactTextString(m) }
 func (*GetFriendInfoResp) ProtoMessage()    {}
 func (*GetFriendInfoResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_friend_a4d5a06cd0a3d99f, []int{3}
+	return fileDescriptor_friend_69e6f38cd215d5ef, []int{3}
 }
 func (m *GetFriendInfoResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetFriendInfoResp.Unmarshal(m, b)
@@ -236,7 +236,7 @@ func (m *AddFriendReq) Reset()         { *m = AddFriendReq{} }
 func (m *AddFriendReq) String() string { return proto.CompactTextString(m) }
 func (*AddFriendReq) ProtoMessage()    {}
 func (*AddFriendReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_friend_a4d5a06cd0a3d99f, []int{4}
+	return fileDescriptor_friend_69e6f38cd215d5ef, []int{4}
 }
 func (m *AddFriendReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AddFriendReq.Unmarshal(m, b)
@@ -281,7 +281,7 @@ func (m *AddFriendResp) Reset()         { *m = AddFriendResp{} }
 func (m *AddFriendResp) String() string { return proto.CompactTextString(m) }
 func (*AddFriendResp) ProtoMessage()    {}
 func (*AddFriendResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_friend_a4d5a06cd0a3d99f, []int{5}
+	return fileDescriptor_friend_69e6f38cd215d5ef, []int{5}
 }
 func (m *AddFriendResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AddFriendResp.Unmarshal(m, b)
@@ -322,7 +322,7 @@ func (m *ImportFriendReq) Reset()         { *m = ImportFriendReq{} }
 func (m *ImportFriendReq) String() string { return proto.CompactTextString(m) }
 func (*ImportFriendReq) ProtoMessage()    {}
 func (*ImportFriendReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_friend_a4d5a06cd0a3d99f, []int{6}
+	return fileDescriptor_friend_69e6f38cd215d5ef, []int{6}
 }
 func (m *ImportFriendReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ImportFriendReq.Unmarshal(m, b)
@@ -382,7 +382,7 @@ func (m *ImportFriendResp) Reset()         { *m = ImportFriendResp{} }
 func (m *ImportFriendResp) String() string { return proto.CompactTextString(m) }
 func (*ImportFriendResp) ProtoMessage()    {}
 func (*ImportFriendResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_friend_a4d5a06cd0a3d99f, []int{7}
+	return fileDescriptor_friend_69e6f38cd215d5ef, []int{7}
 }
 func (m *ImportFriendResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ImportFriendResp.Unmarshal(m, b)
@@ -427,7 +427,7 @@ func (m *GetFriendApplyListReq) Reset()         { *m = GetFriendApplyListReq{} }
 func (m *GetFriendApplyListReq) String() string { return proto.CompactTextString(m) }
 func (*GetFriendApplyListReq) ProtoMessage()    {}
 func (*GetFriendApplyListReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_friend_a4d5a06cd0a3d99f, []int{8}
+	return fileDescriptor_friend_69e6f38cd215d5ef, []int{8}
 }
 func (m *GetFriendApplyListReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetFriendApplyListReq.Unmarshal(m, b)
@@ -467,7 +467,7 @@ func (m *GetFriendApplyListResp) Reset()         { *m = GetFriendApplyListResp{}
 func (m *GetFriendApplyListResp) String() string { return proto.CompactTextString(m) }
 func (*GetFriendApplyListResp) ProtoMessage()    {}
 func (*GetFriendApplyListResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_friend_a4d5a06cd0a3d99f, []int{9}
+	return fileDescriptor_friend_69e6f38cd215d5ef, []int{9}
 }
 func (m *GetFriendApplyListResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetFriendApplyListResp.Unmarshal(m, b)
@@ -519,7 +519,7 @@ func (m *GetFriendListReq) Reset()         { *m = GetFriendListReq{} }
 func (m *GetFriendListReq) String() string { return proto.CompactTextString(m) }
 func (*GetFriendListReq) ProtoMessage()    {}
 func (*GetFriendListReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_friend_a4d5a06cd0a3d99f, []int{10}
+	return fileDescriptor_friend_69e6f38cd215d5ef, []int{10}
 }
 func (m *GetFriendListReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetFriendListReq.Unmarshal(m, b)
@@ -559,7 +559,7 @@ func (m *GetFriendListResp) Reset()         { *m = GetFriendListResp{} }
 func (m *GetFriendListResp) String() string { return proto.CompactTextString(m) }
 func (*GetFriendListResp) ProtoMessage()    {}
 func (*GetFriendListResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_friend_a4d5a06cd0a3d99f, []int{11}
+	return fileDescriptor_friend_69e6f38cd215d5ef, []int{11}
 }
 func (m *GetFriendListResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetFriendListResp.Unmarshal(m, b)
@@ -611,7 +611,7 @@ func (m *AddBlacklistReq) Reset()         { *m = AddBlacklistReq{} }
 func (m *AddBlacklistReq) String() string { return proto.CompactTextString(m) }
 func (*AddBlacklistReq) ProtoMessage()    {}
 func (*AddBlacklistReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_friend_a4d5a06cd0a3d99f, []int{12}
+	return fileDescriptor_friend_69e6f38cd215d5ef, []int{12}
 }
 func (m *AddBlacklistReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AddBlacklistReq.Unmarshal(m, b)
@@ -649,7 +649,7 @@ func (m *AddBlacklistResp) Reset()         { *m = AddBlacklistResp{} }
 func (m *AddBlacklistResp) String() string { return proto.CompactTextString(m) }
 func (*AddBlacklistResp) ProtoMessage()    {}
 func (*AddBlacklistResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_friend_a4d5a06cd0a3d99f, []int{13}
+	return fileDescriptor_friend_69e6f38cd215d5ef, []int{13}
 }
 func (m *AddBlacklistResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AddBlacklistResp.Unmarshal(m, b)
@@ -687,7 +687,7 @@ func (m *RemoveBlacklistReq) Reset()         { *m = RemoveBlacklistReq{} }
 func (m *RemoveBlacklistReq) String() string { return proto.CompactTextString(m) }
 func (*RemoveBlacklistReq) ProtoMessage()    {}
 func (*RemoveBlacklistReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_friend_a4d5a06cd0a3d99f, []int{14}
+	return fileDescriptor_friend_69e6f38cd215d5ef, []int{14}
 }
 func (m *RemoveBlacklistReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RemoveBlacklistReq.Unmarshal(m, b)
@@ -725,7 +725,7 @@ func (m *RemoveBlacklistResp) Reset()         { *m = RemoveBlacklistResp{} }
 func (m *RemoveBlacklistResp) String() string { return proto.CompactTextString(m) }
 func (*RemoveBlacklistResp) ProtoMessage()    {}
 func (*RemoveBlacklistResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_friend_a4d5a06cd0a3d99f, []int{15}
+	return fileDescriptor_friend_69e6f38cd215d5ef, []int{15}
 }
 func (m *RemoveBlacklistResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RemoveBlacklistResp.Unmarshal(m, b)
@@ -763,7 +763,7 @@ func (m *GetBlacklistReq) Reset()         { *m = GetBlacklistReq{} }
 func (m *GetBlacklistReq) String() string { return proto.CompactTextString(m) }
 func (*GetBlacklistReq) ProtoMessage()    {}
 func (*GetBlacklistReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_friend_a4d5a06cd0a3d99f, []int{16}
+	return fileDescriptor_friend_69e6f38cd215d5ef, []int{16}
 }
 func (m *GetBlacklistReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetBlacklistReq.Unmarshal(m, b)
@@ -803,7 +803,7 @@ func (m *GetBlacklistResp) Reset()         { *m = GetBlacklistResp{} }
 func (m *GetBlacklistResp) String() string { return proto.CompactTextString(m) }
 func (*GetBlacklistResp) ProtoMessage()    {}
 func (*GetBlacklistResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_friend_a4d5a06cd0a3d99f, []int{17}
+	return fileDescriptor_friend_69e6f38cd215d5ef, []int{17}
 }
 func (m *GetBlacklistResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetBlacklistResp.Unmarshal(m, b)
@@ -855,7 +855,7 @@ func (m *IsFriendReq) Reset()         { *m = IsFriendReq{} }
 func (m *IsFriendReq) String() string { return proto.CompactTextString(m) }
 func (*IsFriendReq) ProtoMessage()    {}
 func (*IsFriendReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_friend_a4d5a06cd0a3d99f, []int{18}
+	return fileDescriptor_friend_69e6f38cd215d5ef, []int{18}
 }
 func (m *IsFriendReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_IsFriendReq.Unmarshal(m, b)
@@ -895,7 +895,7 @@ func (m *IsFriendResp) Reset()         { *m = IsFriendResp{} }
 func (m *IsFriendResp) String() string { return proto.CompactTextString(m) }
 func (*IsFriendResp) ProtoMessage()    {}
 func (*IsFriendResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_friend_a4d5a06cd0a3d99f, []int{19}
+	return fileDescriptor_friend_69e6f38cd215d5ef, []int{19}
 }
 func (m *IsFriendResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_IsFriendResp.Unmarshal(m, b)
@@ -947,7 +947,7 @@ func (m *IsInBlackListReq) Reset()         { *m = IsInBlackListReq{} }
 func (m *IsInBlackListReq) String() string { return proto.CompactTextString(m) }
 func (*IsInBlackListReq) ProtoMessage()    {}
 func (*IsInBlackListReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_friend_a4d5a06cd0a3d99f, []int{20}
+	return fileDescriptor_friend_69e6f38cd215d5ef, []int{20}
 }
 func (m *IsInBlackListReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_IsInBlackListReq.Unmarshal(m, b)
@@ -987,7 +987,7 @@ func (m *IsInBlackListResp) Reset()         { *m = IsInBlackListResp{} }
 func (m *IsInBlackListResp) String() string { return proto.CompactTextString(m) }
 func (*IsInBlackListResp) ProtoMessage()    {}
 func (*IsInBlackListResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_friend_a4d5a06cd0a3d99f, []int{21}
+	return fileDescriptor_friend_69e6f38cd215d5ef, []int{21}
 }
 func (m *IsInBlackListResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_IsInBlackListResp.Unmarshal(m, b)
@@ -1039,7 +1039,7 @@ func (m *DeleteFriendReq) Reset()         { *m = DeleteFriendReq{} }
 func (m *DeleteFriendReq) String() string { return proto.CompactTextString(m) }
 func (*DeleteFriendReq) ProtoMessage()    {}
 func (*DeleteFriendReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_friend_a4d5a06cd0a3d99f, []int{22}
+	return fileDescriptor_friend_69e6f38cd215d5ef, []int{22}
 }
 func (m *DeleteFriendReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteFriendReq.Unmarshal(m, b)
@@ -1077,7 +1077,7 @@ func (m *DeleteFriendResp) Reset()         { *m = DeleteFriendResp{} }
 func (m *DeleteFriendResp) String() string { return proto.CompactTextString(m) }
 func (*DeleteFriendResp) ProtoMessage()    {}
 func (*DeleteFriendResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_friend_a4d5a06cd0a3d99f, []int{23}
+	return fileDescriptor_friend_69e6f38cd215d5ef, []int{23}
 }
 func (m *DeleteFriendResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteFriendResp.Unmarshal(m, b)
@@ -1118,7 +1118,7 @@ func (m *AddFriendResponseReq) Reset()         { *m = AddFriendResponseReq{} }
 func (m *AddFriendResponseReq) String() string { return proto.CompactTextString(m) }
 func (*AddFriendResponseReq) ProtoMessage()    {}
 func (*AddFriendResponseReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_friend_a4d5a06cd0a3d99f, []int{24}
+	return fileDescriptor_friend_69e6f38cd215d5ef, []int{24}
 }
 func (m *AddFriendResponseReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AddFriendResponseReq.Unmarshal(m, b)
@@ -1170,7 +1170,7 @@ func (m *AddFriendResponseResp) Reset()         { *m = AddFriendResponseResp{} }
 func (m *AddFriendResponseResp) String() string { return proto.CompactTextString(m) }
 func (*AddFriendResponseResp) ProtoMessage()    {}
 func (*AddFriendResponseResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_friend_a4d5a06cd0a3d99f, []int{25}
+	return fileDescriptor_friend_69e6f38cd215d5ef, []int{25}
 }
 func (m *AddFriendResponseResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AddFriendResponseResp.Unmarshal(m, b)
@@ -1197,7 +1197,7 @@ func (m *AddFriendResponseResp) GetCommonResp() *CommonResp {
 	return nil
 }
 
-type SetFriendCommentReq struct {
+type SetFriendRemarkReq struct {
 	CommID               *CommID  `protobuf:"bytes,1,opt,name=CommID" json:"CommID,omitempty"`
 	Remark               string   `protobuf:"bytes,2,opt,name=Remark" json:"Remark,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
@@ -1205,76 +1205,76 @@ type SetFriendCommentReq struct {
 	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *SetFriendCommentReq) Reset()         { *m = SetFriendCommentReq{} }
-func (m *SetFriendCommentReq) String() string { return proto.CompactTextString(m) }
-func (*SetFriendCommentReq) ProtoMessage()    {}
-func (*SetFriendCommentReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_friend_a4d5a06cd0a3d99f, []int{26}
+func (m *SetFriendRemarkReq) Reset()         { *m = SetFriendRemarkReq{} }
+func (m *SetFriendRemarkReq) String() string { return proto.CompactTextString(m) }
+func (*SetFriendRemarkReq) ProtoMessage()    {}
+func (*SetFriendRemarkReq) Descriptor() ([]byte, []int) {
+	return fileDescriptor_friend_69e6f38cd215d5ef, []int{26}
 }
-func (m *SetFriendCommentReq) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_SetFriendCommentReq.Unmarshal(m, b)
+func (m *SetFriendRemarkReq) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SetFriendRemarkReq.Unmarshal(m, b)
 }
-func (m *SetFriendCommentReq) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_SetFriendCommentReq.Marshal(b, m, deterministic)
+func (m *SetFriendRemarkReq) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SetFriendRemarkReq.Marshal(b, m, deterministic)
 }
-func (dst *SetFriendCommentReq) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SetFriendCommentReq.Merge(dst, src)
+func (dst *SetFriendRemarkReq) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SetFriendRemarkReq.Merge(dst, src)
 }
-func (m *SetFriendCommentReq) XXX_Size() int {
-	return xxx_messageInfo_SetFriendCommentReq.Size(m)
+func (m *SetFriendRemarkReq) XXX_Size() int {
+	return xxx_messageInfo_SetFriendRemarkReq.Size(m)
 }
-func (m *SetFriendCommentReq) XXX_DiscardUnknown() {
-	xxx_messageInfo_SetFriendCommentReq.DiscardUnknown(m)
+func (m *SetFriendRemarkReq) XXX_DiscardUnknown() {
+	xxx_messageInfo_SetFriendRemarkReq.DiscardUnknown(m)
 }
 
-var xxx_messageInfo_SetFriendCommentReq proto.InternalMessageInfo
+var xxx_messageInfo_SetFriendRemarkReq proto.InternalMessageInfo
 
-func (m *SetFriendCommentReq) GetCommID() *CommID {
+func (m *SetFriendRemarkReq) GetCommID() *CommID {
 	if m != nil {
 		return m.CommID
 	}
 	return nil
 }
 
-func (m *SetFriendCommentReq) GetRemark() string {
+func (m *SetFriendRemarkReq) GetRemark() string {
 	if m != nil {
 		return m.Remark
 	}
 	return ""
 }
 
-type SetFriendCommentResp struct {
+type SetFriendRemarkResp struct {
 	CommonResp           *CommonResp `protobuf:"bytes,1,opt,name=CommonResp" json:"CommonResp,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}    `json:"-"`
 	XXX_unrecognized     []byte      `json:"-"`
 	XXX_sizecache        int32       `json:"-"`
 }
 
-func (m *SetFriendCommentResp) Reset()         { *m = SetFriendCommentResp{} }
-func (m *SetFriendCommentResp) String() string { return proto.CompactTextString(m) }
-func (*SetFriendCommentResp) ProtoMessage()    {}
-func (*SetFriendCommentResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_friend_a4d5a06cd0a3d99f, []int{27}
+func (m *SetFriendRemarkResp) Reset()         { *m = SetFriendRemarkResp{} }
+func (m *SetFriendRemarkResp) String() string { return proto.CompactTextString(m) }
+func (*SetFriendRemarkResp) ProtoMessage()    {}
+func (*SetFriendRemarkResp) Descriptor() ([]byte, []int) {
+	return fileDescriptor_friend_69e6f38cd215d5ef, []int{27}
 }
-func (m *SetFriendCommentResp) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_SetFriendCommentResp.Unmarshal(m, b)
+func (m *SetFriendRemarkResp) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SetFriendRemarkResp.Unmarshal(m, b)
 }
-func (m *SetFriendCommentResp) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_SetFriendCommentResp.Marshal(b, m, deterministic)
+func (m *SetFriendRemarkResp) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SetFriendRemarkResp.Marshal(b, m, deterministic)
 }
-func (dst *SetFriendCommentResp) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SetFriendCommentResp.Merge(dst, src)
+func (dst *SetFriendRemarkResp) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SetFriendRemarkResp.Merge(dst, src)
 }
-func (m *SetFriendCommentResp) XXX_Size() int {
-	return xxx_messageInfo_SetFriendCommentResp.Size(m)
+func (m *SetFriendRemarkResp) XXX_Size() int {
+	return xxx_messageInfo_SetFriendRemarkResp.Size(m)
 }
-func (m *SetFriendCommentResp) XXX_DiscardUnknown() {
-	xxx_messageInfo_SetFriendCommentResp.DiscardUnknown(m)
+func (m *SetFriendRemarkResp) XXX_DiscardUnknown() {
+	xxx_messageInfo_SetFriendRemarkResp.DiscardUnknown(m)
 }
 
-var xxx_messageInfo_SetFriendCommentResp proto.InternalMessageInfo
+var xxx_messageInfo_SetFriendRemarkResp proto.InternalMessageInfo
 
-func (m *SetFriendCommentResp) GetCommonResp() *CommonResp {
+func (m *SetFriendRemarkResp) GetCommonResp() *CommonResp {
 	if m != nil {
 		return m.CommonResp
 	}
@@ -1292,7 +1292,7 @@ func (m *GetSelfApplyListReq) Reset()         { *m = GetSelfApplyListReq{} }
 func (m *GetSelfApplyListReq) String() string { return proto.CompactTextString(m) }
 func (*GetSelfApplyListReq) ProtoMessage()    {}
 func (*GetSelfApplyListReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_friend_a4d5a06cd0a3d99f, []int{28}
+	return fileDescriptor_friend_69e6f38cd215d5ef, []int{28}
 }
 func (m *GetSelfApplyListReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetSelfApplyListReq.Unmarshal(m, b)
@@ -1332,7 +1332,7 @@ func (m *GetSelfApplyListResp) Reset()         { *m = GetSelfApplyListResp{} }
 func (m *GetSelfApplyListResp) String() string { return proto.CompactTextString(m) }
 func (*GetSelfApplyListResp) ProtoMessage()    {}
 func (*GetSelfApplyListResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_friend_a4d5a06cd0a3d99f, []int{29}
+	return fileDescriptor_friend_69e6f38cd215d5ef, []int{29}
 }
 func (m *GetSelfApplyListResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetSelfApplyListResp.Unmarshal(m, b)
@@ -1400,8 +1400,8 @@ func init() {
 	proto.RegisterType((*DeleteFriendResp)(nil), "friend.DeleteFriendResp")
 	proto.RegisterType((*AddFriendResponseReq)(nil), "friend.AddFriendResponseReq")
 	proto.RegisterType((*AddFriendResponseResp)(nil), "friend.AddFriendResponseResp")
-	proto.RegisterType((*SetFriendCommentReq)(nil), "friend.SetFriendCommentReq")
-	proto.RegisterType((*SetFriendCommentResp)(nil), "friend.SetFriendCommentResp")
+	proto.RegisterType((*SetFriendRemarkReq)(nil), "friend.SetFriendRemarkReq")
+	proto.RegisterType((*SetFriendRemarkResp)(nil), "friend.SetFriendRemarkResp")
 	proto.RegisterType((*GetSelfApplyListReq)(nil), "friend.GetSelfApplyListReq")
 	proto.RegisterType((*GetSelfApplyListResp)(nil), "friend.GetSelfApplyListResp")
 }
@@ -1429,7 +1429,7 @@ type FriendClient interface {
 	GetBlacklist(ctx context.Context, in *GetBlacklistReq, opts ...grpc.CallOption) (*GetBlacklistResp, error)
 	DeleteFriend(ctx context.Context, in *DeleteFriendReq, opts ...grpc.CallOption) (*DeleteFriendResp, error)
 	AddFriendResponse(ctx context.Context, in *AddFriendResponseReq, opts ...grpc.CallOption) (*AddFriendResponseResp, error)
-	SetFriendComment(ctx context.Context, in *SetFriendCommentReq, opts ...grpc.CallOption) (*SetFriendCommentResp, error)
+	SetFriendRemark(ctx context.Context, in *SetFriendRemarkReq, opts ...grpc.CallOption) (*SetFriendRemarkResp, error)
 	ImportFriend(ctx context.Context, in *ImportFriendReq, opts ...grpc.CallOption) (*ImportFriendResp, error)
 }
 
@@ -1540,9 +1540,9 @@ func (c *friendClient) AddFriendResponse(ctx context.Context, in *AddFriendRespo
 	return out, nil
 }
 
-func (c *friendClient) SetFriendComment(ctx context.Context, in *SetFriendCommentReq, opts ...grpc.CallOption) (*SetFriendCommentResp, error) {
-	out := new(SetFriendCommentResp)
-	err := grpc.Invoke(ctx, "/friend.friend/setFriendComment", in, out, c.cc, opts...)
+func (c *friendClient) SetFriendRemark(ctx context.Context, in *SetFriendRemarkReq, opts ...grpc.CallOption) (*SetFriendRemarkResp, error) {
+	out := new(SetFriendRemarkResp)
+	err := grpc.Invoke(ctx, "/friend.friend/setFriendRemark", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1573,7 +1573,7 @@ type FriendServer interface {
 	GetBlacklist(context.Context, *GetBlacklistReq) (*GetBlacklistResp, error)
 	DeleteFriend(context.Context, *DeleteFriendReq) (*DeleteFriendResp, error)
 	AddFriendResponse(context.Context, *AddFriendResponseReq) (*AddFriendResponseResp, error)
-	SetFriendComment(context.Context, *SetFriendCommentReq) (*SetFriendCommentResp, error)
+	SetFriendRemark(context.Context, *SetFriendRemarkReq) (*SetFriendRemarkResp, error)
 	ImportFriend(context.Context, *ImportFriendReq) (*ImportFriendResp, error)
 }
 
@@ -1779,20 +1779,20 @@ func _Friend_AddFriendResponse_Handler(srv interface{}, ctx context.Context, dec
 	return interceptor(ctx, in, info, handler)
 }
 
-func _Friend_SetFriendComment_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(SetFriendCommentReq)
+func _Friend_SetFriendRemark_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(SetFriendRemarkReq)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
 	if interceptor == nil {
-		return srv.(FriendServer).SetFriendComment(ctx, in)
+		return srv.(FriendServer).SetFriendRemark(ctx, in)
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/friend.friend/SetFriendComment",
+		FullMethod: "/friend.friend/SetFriendRemark",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(FriendServer).SetFriendComment(ctx, req.(*SetFriendCommentReq))
+		return srv.(FriendServer).SetFriendRemark(ctx, req.(*SetFriendRemarkReq))
 	}
 	return interceptor(ctx, in, info, handler)
 }
@@ -1864,8 +1864,8 @@ var _Friend_serviceDesc = grpc.ServiceDesc{
 			Handler:    _Friend_AddFriendResponse_Handler,
 		},
 		{
-			MethodName: "setFriendComment",
-			Handler:    _Friend_SetFriendComment_Handler,
+			MethodName: "setFriendRemark",
+			Handler:    _Friend_SetFriendRemark_Handler,
 		},
 		{
 			MethodName: "importFriend",
@@ -1876,66 +1876,66 @@ var _Friend_serviceDesc = grpc.ServiceDesc{
 	Metadata: "friend/friend.proto",
 }
 
-func init() { proto.RegisterFile("friend/friend.proto", fileDescriptor_friend_a4d5a06cd0a3d99f) }
+func init() { proto.RegisterFile("friend/friend.proto", fileDescriptor_friend_69e6f38cd215d5ef) }
 
-var fileDescriptor_friend_a4d5a06cd0a3d99f = []byte{
-	// 919 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x57, 0xcb, 0x4f, 0xf3, 0x46,
-	0x10, 0x97, 0x09, 0x84, 0x64, 0x12, 0x48, 0xb2, 0x09, 0x90, 0x9a, 0x87, 0x52, 0x1f, 0xaa, 0xa8,
-	0x87, 0x44, 0x4a, 0x45, 0x55, 0x4a, 0x5b, 0x14, 0x08, 0xa1, 0xa6, 0xa5, 0x20, 0x53, 0x2e, 0x55,
-	0x25, 0x64, 0xf0, 0x26, 0xb5, 0xe2, 0xd8, 0x8b, 0xd7, 0x14, 0xf5, 0xd2, 0x43, 0x0f, 0xbd, 0x56,
-	0xaa, 0x7a, 0xeb, 0xad, 0x7f, 0x69, 0x65, 0xaf, 0x1d, 0xaf, 0x1f, 0x41, 0x9f, 0xcd, 0x27, 0x7d,
-	0x27, 0x98, 0x99, 0x9d, 0xf1, 0x6f, 0x1e, 0xfb, 0x9b, 0x0d, 0x34, 0x27, 0xb6, 0x8e, 0x4d, 0xad,
-	0xcf, 0xfe, 0xf4, 0x88, 0x6d, 0x39, 0x16, 0x2a, 0x32, 0x49, 0xfc, 0xf8, 0x9a, 0x60, 0xf3, 0x5e,
-	0xbe, 0xea, 0x93, 0xd9, 0xb4, 0xef, 0x99, 0xfa, 0x54, 0x9b, 0xdd, 0xbf, 0xd0, 0xfe, 0x0b, 0x65,
-	0x47, 0xa5, 0x6f, 0x00, 0xce, 0xac, 0xf9, 0xdc, 0x32, 0x15, 0x4c, 0x09, 0x6a, 0xc3, 0x3a, 0xb6,
-	0xed, 0x33, 0x4b, 0xc3, 0x6d, 0xa1, 0x23, 0x74, 0xd7, 0x94, 0x40, 0x44, 0xdb, 0x50, 0xc4, 0xb6,
-	0x7d, 0x45, 0xa7, 0xed, 0x95, 0x8e, 0xd0, 0x2d, 0x2b, 0xbe, 0x24, 0xfd, 0x21, 0x40, 0xd1, 0x0d,
-	0x20, 0x8f, 0x90, 0x08, 0xa5, 0x6b, 0x72, 0x47, 0xb1, 0x2d, 0x8f, 0x3c, 0xef, 0xb2, 0xb2, 0x90,
-	0x51, 0x07, 0x2a, 0xd7, 0x04, 0xdb, 0xaa, 0xa3, 0x5b, 0xa6, 0x3c, 0xf2, 0x63, 0xf0, 0x2a, 0xd7,
-	0xfb, 0x47, 0xcb, 0xf7, 0x5e, 0x65, 0xde, 0x81, 0x8c, 0x0e, 0x00, 0xc6, 0xb6, 0x35, 0xf7, 0xad,
-	0x6b, 0x9e, 0x95, 0xd3, 0x48, 0xc7, 0xd0, 0xb8, 0xc0, 0xce, 0xd8, 0x4b, 0x9a, 0xca, 0xe6, 0xc4,
-	0x52, 0xf0, 0x13, 0xfa, 0x24, 0x00, 0xe6, 0x81, 0xa9, 0x0c, 0x36, 0x7b, 0x7e, 0x8d, 0x98, 0x56,
-	0xf1, 0xad, 0xd2, 0x9f, 0x02, 0xe7, 0xcd, 0x9c, 0x59, 0x25, 0xce, 0xa3, 0x95, 0x38, 0x0f, 0x2b,
-	0x71, 0x1e, 0xa9, 0x04, 0x93, 0xd0, 0x09, 0x6c, 0x86, 0x31, 0xbe, 0xd7, 0xa9, 0xd3, 0x2e, 0x74,
-	0x0a, 0xdd, 0xca, 0x60, 0xa7, 0x67, 0xb9, 0x5d, 0xd0, 0xe7, 0xf7, 0x54, 0x9b, 0xf5, 0xb8, 0xcf,
-	0xc4, 0x8e, 0x4b, 0x3f, 0x40, 0x75, 0xa8, 0x69, 0x4c, 0x99, 0x21, 0x01, 0x17, 0x90, 0x82, 0x9f,
-	0x38, 0x40, 0x4c, 0x92, 0xce, 0x60, 0x83, 0x8b, 0x47, 0x09, 0x1a, 0xf0, 0xbd, 0xf6, 0x83, 0x22,
-	0x3e, 0x28, 0xb3, 0x28, 0xdc, 0x29, 0xe9, 0x5f, 0x01, 0x6a, 0xf2, 0x9c, 0x58, 0xb6, 0x13, 0x02,
-	0xfb, 0x14, 0xea, 0x4c, 0x60, 0xe5, 0xf7, 0x72, 0x15, 0x3a, 0x85, 0x6e, 0x59, 0x49, 0xe8, 0xdf,
-	0xa1, 0xf1, 0xd1, 0xe6, 0x16, 0xe2, 0xcd, 0x8d, 0x8c, 0xd5, 0x6a, 0x74, 0xac, 0xa4, 0xdf, 0xa1,
-	0x1e, 0x05, 0x97, 0x2f, 0x4b, 0xf4, 0x39, 0x6c, 0x8f, 0x55, 0xdd, 0xc0, 0x5a, 0x22, 0xaf, 0x15,
-	0x2f, 0xaf, 0x25, 0x56, 0xe9, 0x04, 0xb6, 0x16, 0xa3, 0x33, 0x24, 0xc4, 0xf8, 0xcd, 0xd5, 0x66,
-	0x19, 0xbe, 0x7f, 0x04, 0xd8, 0x4e, 0x8b, 0x90, 0x6b, 0x02, 0xbf, 0x85, 0xc6, 0xa2, 0x49, 0xcf,
-	0x98, 0x3a, 0xdc, 0x10, 0x8a, 0x29, 0x43, 0xe8, 0x9f, 0x52, 0x92, 0x4e, 0xd2, 0x97, 0x50, 0x5f,
-	0xa0, 0xca, 0x9a, 0x52, 0xe4, 0x3e, 0xbd, 0x21, 0x9b, 0x37, 0xdf, 0xa7, 0x23, 0xa8, 0x0d, 0x35,
-	0xed, 0xd4, 0x50, 0x1f, 0x67, 0x46, 0xc6, 0x1c, 0xc6, 0x50, 0x8f, 0xba, 0xe6, 0xbc, 0x3d, 0x5f,
-	0x01, 0x52, 0xf0, 0xdc, 0xfa, 0x15, 0xe7, 0x42, 0x21, 0x43, 0x33, 0xe1, 0x9d, 0x13, 0xc8, 0x11,
-	0xd4, 0x2e, 0xb0, 0x93, 0x0b, 0xc5, 0x5f, 0x82, 0x37, 0x0c, 0x51, 0x0c, 0xd9, 0xdb, 0x29, 0x43,
-	0xc3, 0x0b, 0xe1, 0xdd, 0x9e, 0x68, 0x47, 0x77, 0x23, 0x1d, 0xbd, 0x79, 0x7e, 0x30, 0xf4, 0xc7,
-	0xe0, 0x98, 0x92, 0xf4, 0x92, 0x0e, 0xa1, 0x22, 0xd3, 0xcc, 0x3c, 0x29, 0xfd, 0x0c, 0xd5, 0xd0,
-	0x2d, 0x57, 0x0e, 0x22, 0x94, 0x5c, 0x4f, 0xcb, 0xa4, 0xd8, 0x23, 0xaa, 0x92, 0xb2, 0x90, 0xdd,
-	0x2b, 0x23, 0x53, 0xd9, 0xf4, 0xd0, 0x66, 0xbd, 0x32, 0x2a, 0x34, 0x62, 0xbe, 0xef, 0x1d, 0xde,
-	0x11, 0xd4, 0x46, 0xd8, 0xc0, 0x0e, 0xce, 0x5e, 0xb7, 0x31, 0xd4, 0xa3, 0xae, 0x39, 0x67, 0x90,
-	0x40, 0x2b, 0xb2, 0x8f, 0x5c, 0x5c, 0x59, 0xf6, 0x1c, 0x82, 0xd5, 0x89, 0xa1, 0xb2, 0xa4, 0xd7,
-	0x14, 0xef, 0x7f, 0xb4, 0x07, 0xe5, 0x5f, 0x54, 0x53, 0x33, 0xb0, 0x5b, 0x0d, 0xb6, 0x3b, 0x42,
-	0x85, 0xf4, 0x1d, 0x6c, 0xa5, 0x7c, 0x31, 0x27, 0xfc, 0x3b, 0x68, 0xde, 0x06, 0xb4, 0xe6, 0xaa,
-	0xb1, 0xe9, 0x64, 0xde, 0xd2, 0x73, 0xd5, 0x9e, 0x85, 0x5b, 0xda, 0x95, 0xa4, 0x4b, 0x68, 0x25,
-	0xc3, 0xe6, 0x84, 0xf8, 0x35, 0x34, 0x2f, 0xb0, 0x73, 0x8b, 0x8d, 0x49, 0xae, 0x65, 0xf4, 0xb7,
-	0x00, 0xad, 0xa4, 0xff, 0x87, 0x5d, 0x45, 0x83, 0xff, 0xd6, 0xc1, 0x7f, 0xce, 0xa2, 0x2f, 0xa0,
-	0xac, 0x06, 0xed, 0x44, 0xad, 0x20, 0x09, 0xfe, 0xcd, 0x24, 0x6e, 0xa5, 0x68, 0x29, 0x41, 0xb7,
-	0x80, 0xa6, 0x89, 0x2d, 0x8b, 0xf6, 0x83, 0xc3, 0xa9, 0x3b, 0x5c, 0x3c, 0x78, 0xcd, 0x4c, 0x09,
-	0xba, 0x82, 0xfa, 0x34, 0x56, 0x2d, 0xb4, 0xcb, 0xf9, 0xc4, 0xfb, 0x20, 0xee, 0x2d, 0x37, 0x52,
-	0x82, 0x46, 0xb0, 0x31, 0xe5, 0xd7, 0x26, 0x6a, 0x27, 0xbe, 0x1f, 0x04, 0xfa, 0x68, 0x89, 0x85,
-	0x12, 0x34, 0x84, 0xaa, 0xca, 0x6d, 0x2e, 0xb4, 0xc3, 0x15, 0x84, 0xa7, 0x7f, 0xb1, 0x9d, 0x6e,
-	0xa0, 0x04, 0x5d, 0x42, 0xcd, 0x8e, 0xae, 0x1d, 0x24, 0x06, 0x87, 0x93, 0xdb, 0x4c, 0xdc, 0x5d,
-	0x6a, 0xa3, 0x04, 0x1d, 0x42, 0x49, 0xf7, 0x39, 0x17, 0x35, 0x83, 0x83, 0x1c, 0x79, 0x8b, 0xad,
-	0xa4, 0x92, 0xd5, 0x42, 0xe7, 0x09, 0x31, 0xac, 0x45, 0x9c, 0x63, 0xc3, 0x5a, 0x24, 0x19, 0x74,
-	0x08, 0xd5, 0x29, 0xb7, 0xb8, 0xc2, 0x5a, 0xc4, 0x56, 0xa1, 0xd8, 0x4e, 0x37, 0xb0, 0x10, 0x1a,
-	0xc7, 0x7d, 0x61, 0x88, 0x18, 0x99, 0x86, 0x21, 0x12, 0x54, 0x79, 0x03, 0x0d, 0x35, 0x4e, 0x42,
-	0x68, 0x2f, 0x75, 0x4e, 0x7d, 0x46, 0x14, 0xf7, 0x5f, 0xb1, 0xb2, 0xc1, 0xa3, 0x31, 0xca, 0x08,
-	0x07, 0x2f, 0x85, 0xa3, 0xc2, 0xc1, 0x4b, 0x65, 0x9a, 0x21, 0x54, 0x75, 0xee, 0x11, 0x1d, 0xe6,
-	0x18, 0x7b, 0xf7, 0x87, 0x39, 0xc6, 0xdf, 0xdc, 0xa7, 0x8d, 0x9f, 0x6a, 0x3d, 0xff, 0x27, 0xe8,
-	0x31, 0xfb, 0xf3, 0x50, 0xf4, 0x7e, 0x5f, 0x7e, 0xf6, 0x7f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xcc,
-	0xd1, 0x9d, 0x13, 0xa1, 0x0e, 0x00, 0x00,
+var fileDescriptor_friend_69e6f38cd215d5ef = []byte{
+	// 916 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x57, 0xcd, 0x4f, 0xeb, 0x46,
+	0x10, 0x97, 0x09, 0x84, 0x64, 0x12, 0x48, 0xb2, 0x09, 0x90, 0x9a, 0x0f, 0xa5, 0x3e, 0x54, 0x51,
+	0x0f, 0x89, 0x94, 0x8a, 0xaa, 0x94, 0xb6, 0x28, 0x10, 0x42, 0xdd, 0x96, 0x82, 0x0c, 0xbd, 0x54,
+	0x95, 0x90, 0xc1, 0x9b, 0xd4, 0x8a, 0x63, 0x2f, 0x5e, 0x53, 0xd4, 0x4b, 0x0f, 0x3d, 0xf4, 0x5a,
+	0xa9, 0xea, 0xed, 0x1d, 0xde, 0xbf, 0xfa, 0x64, 0xaf, 0x1d, 0xaf, 0x3f, 0x82, 0x9e, 0xcd, 0x93,
+	0xde, 0x09, 0x66, 0x66, 0x7f, 0xe3, 0xf9, 0xda, 0xf9, 0x6d, 0xa0, 0x39, 0xb1, 0x75, 0x6c, 0x6a,
+	0x7d, 0xf6, 0xa7, 0x47, 0x6c, 0xcb, 0xb1, 0x50, 0x91, 0x49, 0xe2, 0xa7, 0x57, 0x04, 0x9b, 0x77,
+	0xf2, 0x65, 0x9f, 0xcc, 0xa6, 0x7d, 0xcf, 0xd4, 0xa7, 0xda, 0xec, 0xee, 0x99, 0xf6, 0x9f, 0x29,
+	0x3b, 0x2a, 0x7d, 0x07, 0x70, 0x66, 0xcd, 0xe7, 0x96, 0xa9, 0x60, 0x4a, 0x50, 0x1b, 0xd6, 0xb1,
+	0x6d, 0x9f, 0x59, 0x1a, 0x6e, 0x0b, 0x1d, 0xa1, 0xbb, 0xa6, 0x04, 0x22, 0xda, 0x86, 0x22, 0xb6,
+	0xed, 0x4b, 0x3a, 0x6d, 0xaf, 0x74, 0x84, 0x6e, 0x59, 0xf1, 0x25, 0xe9, 0x6f, 0x01, 0x8a, 0xae,
+	0x03, 0x79, 0x84, 0x44, 0x28, 0x5d, 0x91, 0x5f, 0x28, 0xb6, 0xe5, 0x91, 0x87, 0x2e, 0x2b, 0x0b,
+	0x19, 0x75, 0xa0, 0x72, 0x45, 0xb0, 0xad, 0x3a, 0xba, 0x65, 0xca, 0x23, 0xdf, 0x07, 0xaf, 0x72,
+	0xd1, 0xb7, 0x96, 0x8f, 0x5e, 0x65, 0xe8, 0x40, 0x46, 0x07, 0x00, 0x63, 0xdb, 0x9a, 0xfb, 0xd6,
+	0x35, 0xcf, 0xca, 0x69, 0xa4, 0x63, 0x68, 0x5c, 0x60, 0x67, 0xec, 0x25, 0x4d, 0x65, 0x73, 0x62,
+	0x29, 0xf8, 0x11, 0x7d, 0x16, 0x04, 0xe6, 0x05, 0x53, 0x19, 0x6c, 0xf6, 0xfc, 0x1a, 0x31, 0xad,
+	0xe2, 0x5b, 0xa5, 0x7f, 0x04, 0x0e, 0xcd, 0xc0, 0xac, 0x12, 0xe7, 0xd1, 0x4a, 0x9c, 0x87, 0x95,
+	0x38, 0x8f, 0x54, 0x82, 0x49, 0xe8, 0x04, 0x36, 0x43, 0x1f, 0x3f, 0xe9, 0xd4, 0x69, 0x17, 0x3a,
+	0x85, 0x6e, 0x65, 0xb0, 0xd3, 0xb3, 0xdc, 0x2e, 0xe8, 0xf3, 0x3b, 0xaa, 0xcd, 0x7a, 0xdc, 0x67,
+	0x62, 0xc7, 0xa5, 0x9f, 0xa1, 0x3a, 0xd4, 0x34, 0xa6, 0xcc, 0x90, 0x80, 0x1b, 0x90, 0x82, 0x1f,
+	0xb9, 0x80, 0x98, 0x24, 0x9d, 0xc1, 0x06, 0xe7, 0x8f, 0x12, 0x34, 0xe0, 0x7b, 0xed, 0x3b, 0x45,
+	0xbc, 0x53, 0x66, 0x51, 0xb8, 0x53, 0xd2, 0x1b, 0x01, 0x6a, 0xf2, 0x9c, 0x58, 0xb6, 0x13, 0x06,
+	0xf6, 0x39, 0xd4, 0x99, 0xc0, 0xca, 0xef, 0xe5, 0x2a, 0x74, 0x0a, 0xdd, 0xb2, 0x92, 0xd0, 0xbf,
+	0x47, 0xe3, 0xa3, 0xcd, 0x2d, 0xc4, 0x9b, 0x1b, 0x19, 0xab, 0xd5, 0xe8, 0x58, 0x49, 0x7f, 0x41,
+	0x3d, 0x1a, 0x5c, 0xbe, 0x2c, 0xd1, 0x97, 0xb0, 0x3d, 0x56, 0x75, 0x03, 0x6b, 0x89, 0xbc, 0x56,
+	0xbc, 0xbc, 0x96, 0x58, 0xa5, 0x13, 0xd8, 0x5a, 0x8c, 0xce, 0x90, 0x10, 0xe3, 0x4f, 0x57, 0x9b,
+	0x65, 0xf8, 0xfe, 0x17, 0x60, 0x3b, 0xcd, 0x43, 0xae, 0x09, 0xfc, 0x1e, 0x1a, 0x8b, 0x26, 0x3d,
+	0x61, 0xea, 0x70, 0x43, 0x28, 0xa6, 0x0c, 0xa1, 0x7f, 0x4a, 0x49, 0x82, 0xa4, 0xaf, 0xa1, 0xbe,
+	0x88, 0x2a, 0x6b, 0x4a, 0x91, 0xfb, 0xf4, 0x8a, 0x6c, 0x5e, 0x7d, 0x9f, 0x8e, 0xa0, 0x36, 0xd4,
+	0xb4, 0x53, 0x43, 0x7d, 0x98, 0x19, 0x19, 0x73, 0x18, 0x43, 0x3d, 0x0a, 0xcd, 0x79, 0x7b, 0xbe,
+	0x01, 0xa4, 0xe0, 0xb9, 0xf5, 0x07, 0xce, 0x15, 0x85, 0x0c, 0xcd, 0x04, 0x3a, 0x67, 0x20, 0x47,
+	0x50, 0xbb, 0xc0, 0x4e, 0xae, 0x28, 0xfe, 0x15, 0xbc, 0x61, 0x88, 0xc6, 0x90, 0xbd, 0x9d, 0x32,
+	0x34, 0x3c, 0x17, 0xde, 0xed, 0x89, 0x76, 0x74, 0x37, 0xd2, 0xd1, 0xeb, 0xa7, 0x7b, 0x43, 0x7f,
+	0x08, 0x8e, 0x29, 0x49, 0x94, 0x74, 0x08, 0x15, 0x99, 0x66, 0xde, 0x93, 0xd2, 0x6f, 0x50, 0x0d,
+	0x61, 0xb9, 0x72, 0x10, 0xa1, 0xe4, 0x22, 0x2d, 0x93, 0x62, 0x6f, 0x51, 0x95, 0x94, 0x85, 0xec,
+	0x5e, 0x19, 0x99, 0xca, 0xa6, 0x17, 0x6d, 0xd6, 0x2b, 0xa3, 0x42, 0x23, 0x86, 0xfd, 0xe0, 0xe1,
+	0x1d, 0x41, 0x6d, 0x84, 0x0d, 0xec, 0xe0, 0xec, 0x75, 0x1b, 0x43, 0x3d, 0x0a, 0xcd, 0x39, 0x83,
+	0x04, 0x5a, 0x11, 0x3e, 0x72, 0xe3, 0xca, 0xc2, 0x73, 0x08, 0x56, 0x27, 0x86, 0xca, 0x92, 0x5e,
+	0x53, 0xbc, 0xff, 0xd1, 0x1e, 0x94, 0x7f, 0x57, 0x4d, 0xcd, 0xc0, 0x6e, 0x35, 0x18, 0x77, 0x84,
+	0x0a, 0xe9, 0x47, 0xd8, 0x4a, 0xf9, 0x62, 0xce, 0xf0, 0x6f, 0x01, 0xdd, 0xe0, 0x05, 0xd1, 0xcc,
+	0x55, 0x7b, 0x96, 0x99, 0xa4, 0x5d, 0x50, 0x48, 0xd2, 0xae, 0xe4, 0xde, 0xf1, 0x84, 0xd7, 0x9c,
+	0x01, 0x7e, 0x0b, 0xcd, 0x0b, 0xec, 0xdc, 0x60, 0x63, 0x92, 0x8b, 0x8a, 0xfe, 0x13, 0xa0, 0x95,
+	0xc4, 0x7f, 0x5c, 0x22, 0x1a, 0xbc, 0x5d, 0x07, 0xff, 0x31, 0x8b, 0xbe, 0x82, 0xb2, 0x1a, 0x34,
+	0x13, 0xb5, 0x82, 0x24, 0xf8, 0x17, 0x93, 0xb8, 0x95, 0xa2, 0xa5, 0x04, 0xdd, 0x00, 0x9a, 0x26,
+	0x38, 0x16, 0xed, 0x07, 0x87, 0x53, 0x19, 0x5c, 0x3c, 0x78, 0xc9, 0x4c, 0x09, 0xba, 0x84, 0xfa,
+	0x34, 0x56, 0x2d, 0xb4, 0xcb, 0x61, 0xe2, 0x7d, 0x10, 0xf7, 0x96, 0x1b, 0x29, 0x41, 0x23, 0xd8,
+	0x98, 0xf2, 0xa4, 0x89, 0xda, 0x89, 0xef, 0x07, 0x8e, 0x3e, 0x59, 0x62, 0xa1, 0x04, 0x0d, 0xa1,
+	0xaa, 0x72, 0xbc, 0x85, 0x76, 0xb8, 0x82, 0xf0, 0xcb, 0x5f, 0x6c, 0xa7, 0x1b, 0x28, 0x41, 0x3f,
+	0x40, 0xcd, 0x8e, 0x92, 0x0e, 0x12, 0x83, 0xc3, 0x49, 0x2e, 0x13, 0x77, 0x97, 0xda, 0x28, 0x41,
+	0x87, 0x50, 0xd2, 0xfd, 0x8d, 0x8b, 0x9a, 0xc1, 0x41, 0x6e, 0x75, 0x8b, 0xad, 0xa4, 0x92, 0xd5,
+	0x42, 0xe7, 0xd7, 0x61, 0x58, 0x8b, 0xf8, 0x86, 0x0d, 0x6b, 0x91, 0xdc, 0x9f, 0x43, 0xa8, 0x4e,
+	0x39, 0xda, 0x0a, 0x6b, 0x11, 0x23, 0x42, 0xb1, 0x9d, 0x6e, 0x60, 0x2e, 0x34, 0x6e, 0xf3, 0x85,
+	0x2e, 0x62, 0xab, 0x34, 0x74, 0x91, 0x58, 0x94, 0xd7, 0xd0, 0x50, 0xe3, 0x2b, 0x08, 0xed, 0xa5,
+	0xce, 0xa9, 0xbf, 0x0f, 0xc5, 0xfd, 0x17, 0xac, 0xac, 0x41, 0x34, 0xba, 0x31, 0xc2, 0x06, 0x25,
+	0x17, 0x54, 0xd8, 0xa0, 0xb4, 0x35, 0x33, 0x84, 0xaa, 0xce, 0xbd, 0x9f, 0xc3, 0x04, 0x63, 0x4f,
+	0xfe, 0x30, 0xc1, 0xf8, 0x73, 0xfb, 0xb4, 0xf1, 0x6b, 0xad, 0xe7, 0xff, 0xfa, 0x3c, 0x66, 0x7f,
+	0xee, 0x8b, 0xde, 0x4f, 0xcb, 0x2f, 0xde, 0x05, 0x00, 0x00, 0xff, 0xff, 0x85, 0x71, 0x6d, 0x1b,
+	0x9c, 0x0e, 0x00, 0x00,
 }
diff --git a/pkg/proto/friend/friend.proto b/pkg/proto/friend/friend.proto
index 052eb1d9d..780ebbb62 100644
--- a/pkg/proto/friend/friend.proto
+++ b/pkg/proto/friend/friend.proto
@@ -130,11 +130,11 @@ message AddFriendResponseResp{
   CommonResp CommonResp = 1;
 }
 
-message SetFriendCommentReq{
+message SetFriendRemarkReq{
   CommID CommID = 1;
   string Remark = 2;
 }
-message SetFriendCommentResp{
+message SetFriendRemarkResp{
   CommonResp CommonResp = 1;
 }
 
@@ -160,6 +160,6 @@ service friend{
   rpc getBlacklist(GetBlacklistReq) returns(GetBlacklistResp);
   rpc deleteFriend(DeleteFriendReq) returns(DeleteFriendResp);
   rpc addFriendResponse(AddFriendResponseReq) returns(AddFriendResponseResp);
-  rpc setFriendComment(SetFriendCommentReq) returns(SetFriendCommentResp);
+  rpc setFriendRemark(SetFriendRemarkReq) returns(SetFriendRemarkResp);
   rpc importFriend(ImportFriendReq)  returns(ImportFriendResp);
 }
\ No newline at end of file