merge code

pkg/common/constant/constant.go

@@ -44,6 +44,7 @@ const (
 	GroupMsg       = 201
 
 	//SysRelated
+	NotificationBegin = 1000
 
 	FriendApplicationApprovedNotification = 1201 //add_friend_response
 	FriendApplicationRejectedNotification = 1202 //add_friend_response
@@ -66,6 +67,7 @@ const (
 	MemberKickedNotification             = 1508
 	MemberInvitedNotification            = 1509
 	MemberEnterNotification              = 1510
+	NotificationEnd                      = 2000
 
 	//MsgFrom
 	UserMsgType = 100
@@ -148,6 +150,12 @@ const (
 	Female = 2
 )
 
+const (
+	UnreliableNotification    = 1
+	ReliableNotificationNoMsg = 2
+	ReliableNotificationMsg   = 3
+)
+
 const FriendAcceptTip = "You have successfully become friends, so start chatting"
 
 func GroupIsBanChat(status int32) bool {

pkg/common/constant/error.go

@@ -69,14 +69,22 @@ var (
 )
 
 const (
-	NoError          = 0
-	FormattingError  = 10001
-	DatabaseError    = 10002
-	LogicalError     = 10003
-	ServerError      = 10004
-	HttpError        = 10005
-	IoError          = 10006
-	IntentionalError = 10007
+	NoError              = 0
+	FormattingError      = 10001
+	HasRegistered        = 10002
+	NotRegistered        = 10003
+	PasswordErr          = 10004
+	GetIMTokenErr        = 10005
+	RepeatSendCode       = 10006
+	MailSendCodeErr      = 10007
+	SmsSendCodeErr       = 10008
+	CodeInvalidOrExpired = 10009
+	RegisterFailed       = 10010
+	DatabaseError        = 10002
+	ServerError          = 10004
+	HttpError            = 10005
+	IoError              = 10006
+	IntentionalError     = 10007
 )
 
 func (e ErrInfo) Error() string {