Refactor code

pkg/common/config/config.go

@@ -164,23 +164,73 @@ type config struct {
 		BadgeCount bool   `yaml:"badgeCount"`
 	}
 	Notification struct {
+		///////////////////////group/////////////////////////////
 		GroupCreated struct {
 			Conversation PConversation `yaml:"conversation"`
 			OfflinePush  POfflinePush  `yaml:"offlinePush"`
 			DefaultTips  PDefaultTips  `yaml:"defaultTips"`
 		}
 
-		GroupInfoChanged struct {
+		GroupInfoSet struct {
 			Conversation PConversation `yaml:"conversation"`
 			OfflinePush  POfflinePush  `yaml:"offlinePush"`
 			DefaultTips  PDefaultTips  `yaml:"defaultTips"`
 		}
 
-		ApplyJoinGroup struct {
+		JoinGroupApplication struct {
 			Conversation PConversation `yaml:"conversation"`
 			OfflinePush  POfflinePush  `yaml:"offlinePush"`
 			DefaultTips  PDefaultTips  `yaml:"defaultTips"`
 		}
+
+		MemberQuit struct {
+			Conversation PConversation `yaml:"conversation"`
+			OfflinePush  POfflinePush  `yaml:"offlinePush"`
+			DefaultTips  PDefaultTips  `yaml:"defaultTips"`
+		}
+
+		GroupApplicationAccepted struct {
+			Conversation PConversation `yaml:"conversation"`
+			OfflinePush  POfflinePush  `yaml:"offlinePush"`
+			DefaultTips  PDefaultTips  `yaml:"defaultTips"`
+		}
+
+		GroupApplicationRejected struct {
+			Conversation PConversation `yaml:"conversation"`
+			OfflinePush  POfflinePush  `yaml:"offlinePush"`
+			DefaultTips  PDefaultTips  `yaml:"defaultTips"`
+		}
+
+		GroupOwnerTransferred struct {
+			Conversation PConversation `yaml:"conversation"`
+			OfflinePush  POfflinePush  `yaml:"offlinePush"`
+			DefaultTips  PDefaultTips  `yaml:"defaultTips"`
+		}
+
+		MemberKicked struct {
+			Conversation PConversation `yaml:"conversation"`
+			OfflinePush  POfflinePush  `yaml:"offlinePush"`
+			DefaultTips  PDefaultTips  `yaml:"defaultTips"`
+		}
+
+		MemberInvited struct {
+			Conversation PConversation `yaml:"conversation"`
+			OfflinePush  POfflinePush  `yaml:"offlinePush"`
+			DefaultTips  PDefaultTips  `yaml:"defaultTips"`
+		}
+
+		MemberEnter struct {
+			Conversation PConversation `yaml:"conversation"`
+			OfflinePush  POfflinePush  `yaml:"offlinePush"`
+			DefaultTips  PDefaultTips  `yaml:"defaultTips"`
+		}
+		////////////////////////user///////////////////////
+		UserInfoUpdated struct {
+			Conversation PConversation `yaml:"conversation"`
+			OfflinePush  POfflinePush  `yaml:"offlinePush"`
+			DefaultTips  PDefaultTips  `yaml:"defaultTips"`
+		}
+
 		//////////////////////friend///////////////////////
 		FriendApplication struct {
 			Conversation PConversation `yaml:"conversation"`

pkg/proto/auth/auth.proto

@@ -9,7 +9,7 @@ message CommonResp{
 }
 
 message UserRegisterReq {
-    open_im_sdk.UserInfo UserInfo = 1;
+    server_api_params.UserInfo UserInfo = 1;
     string OperationID = 2;
 }
 message UserRegisterResp {

pkg/proto/chat/chat.proto

@@ -6,18 +6,18 @@ option go_package = "./chat;pbChat";//The generated go pb file is in the current
 message MsgDataToMQ{
   string token =1;
   string operationID = 2;
-  open_im_sdk.MsgData msgData = 3;
+  server_api_params.MsgData msgData = 3;
 }
 
 
 message MsgDataToDB {
-  open_im_sdk.MsgData msgData = 1;
+  server_api_params.MsgData msgData = 1;
   string operationID = 2;
 
 }
 message PushMsgDataToMQ{
   string OperationID = 1;
-  open_im_sdk.MsgData msgData = 2;
+  server_api_params.MsgData msgData = 2;
 }
 
 //message PullMessageReq {
@@ -87,7 +87,7 @@ message SendMsgReq {
 
 string token =1;
 string operationID = 2;
-open_im_sdk.MsgData msgData = 3;
+server_api_params.MsgData msgData = 3;
 
 
 }
@@ -102,7 +102,7 @@ message SendMsgResp {
 }
 service Chat {
   rpc GetMaxAndMinSeq(GetMaxAndMinSeqReq) returns(GetMaxAndMinSeqResp);
-  rpc PullMessage(open_im_sdk.PullMessageReq) returns(open_im_sdk.PullMessageResp);
+  rpc PullMessage(server_api_params.PullMessageReq) returns(server_api_params.PullMessageResp);
-  rpc PullMessageBySeqList(open_im_sdk.PullMessageBySeqListReq) returns(open_im_sdk.PullMessageBySeqListResp);
+  rpc PullMessageBySeqList(server_api_params.PullMessageBySeqListReq) returns(server_api_params.PullMessageBySeqListResp);
   rpc SendMsg(SendMsgReq) returns(SendMsgResp);
 }

pkg/proto/relay/relay.proto

@@ -5,7 +5,7 @@ package relay;
 
 message OnlinePushMsgReq {
   string OperationID = 1;
-  open_im_sdk.MsgData msgData = 2;
+  server_api_params.MsgData msgData = 2;
 }
 message OnlinePushMsgResp{
 repeated SingleMsgToUser resp = 1;