push

pkg/apistruct/group.go

@@ -1,7 +1,7 @@
 package apistruct
 
 import (
-	sdkws "Open_IM/pkg/proto/sdkws"
+	sdkws "OpenIM/pkg/proto/sdkws"
 )
 
 type CommResp struct {

pkg/apistruct/manage.go

@@ -1,8 +1,8 @@
 package apistruct
 
 import (
-	pbRelay "Open_IM/pkg/proto/relay"
-	sdkws "Open_IM/pkg/proto/sdkws"
+	pbRelay "OpenIM/pkg/proto/relay"
+	sdkws "OpenIM/pkg/proto/sdkws"
 )
 
 type DeleteUsersReq struct {

pkg/apistruct/msg.go

@@ -1,8 +1,8 @@
 package apistruct
 
 import (
-	"Open_IM/pkg/proto/msg"
-	sdkws "Open_IM/pkg/proto/sdkws"
+	"OpenIM/pkg/proto/msg"
+	sdkws "OpenIM/pkg/proto/sdkws"
 )
 
 type DelMsgReq struct {

pkg/apistruct/user.go

@@ -1,7 +1,7 @@
 package apistruct
 
 import (
-	sdkws "Open_IM/pkg/proto/sdkws"
+	sdkws "OpenIM/pkg/proto/sdkws"
 )
 
 type GetUsersInfoReq struct {

pkg/callbackstruct/common.go

@@ -1,7 +1,7 @@
 package callbackstruct
 
 import (
-	"Open_IM/pkg/common/constant"
+	"OpenIM/pkg/common/constant"
 	"fmt"
 )
 

pkg/callbackstruct/group.go

@@ -1,8 +1,8 @@
 package callbackstruct
 
 import (
-	"Open_IM/pkg/apistruct"
-	common "Open_IM/pkg/proto/sdkws"
+	"OpenIM/pkg/apistruct"
+	common "OpenIM/pkg/proto/sdkws"
 )
 
 type CallbackCommand string

pkg/callbackstruct/message.go

@@ -1,8 +1,8 @@
 package callbackstruct
 
 import (
-	"Open_IM/pkg/proto/msg"
-	sdkws "Open_IM/pkg/proto/sdkws"
+	"OpenIM/pkg/proto/msg"
+	sdkws "OpenIM/pkg/proto/sdkws"
 )
 
 type CallbackBeforeSendSingleMsgReq struct {

pkg/callbackstruct/push.go

@@ -1,6 +1,6 @@
 package callbackstruct
 
-import common "Open_IM/pkg/proto/sdkws"
+import common "OpenIM/pkg/proto/sdkws"
 
 type CallbackBeforePushReq struct {
 	UserStatusBatchCallbackReq

pkg/common/config/config.go

@@ -1,6 +1,7 @@
 package config
 
 import (
+	"flag"
 	"fmt"
 	"io/ioutil"
 	"os"
@@ -16,9 +17,8 @@ var (
 	Root = filepath.Join(filepath.Dir(b), "../../..")
 )
 
-const ConfName = "openIMConf"
-
 var Config config
+var NotificationConfig notificationConfig
 
 type CallBackConfig struct {
 	Enable                 bool  `yaml:"enable"`
@@ -26,6 +26,21 @@ type CallBackConfig struct {
 	CallbackFailedContinue *bool `yaml:"callbackFailedContinue"`
 }
 
+type PConversation struct {
+	ReliabilityLevel int  `yaml:"reliabilityLevel"`
+	UnreadCount      bool `yaml:"unreadCount"`
+}
+
+type POfflinePush struct {
+	PushSwitch bool   `yaml:"switch"`
+	Title      string `yaml:"title"`
+	Desc       string `yaml:"desc"`
+	Ext        string `yaml:"ext"`
+}
+type PDefaultTips struct {
+	Tips string `yaml:"tips"`
+}
+
 type config struct {
 	ServerIP string `yaml:"serverip"`
 
@@ -263,7 +278,6 @@ type config struct {
 		BadgeCount bool   `yaml:"badgeCount"`
 		Production bool   `yaml:"production"`
 	}
-
 	Callback struct {
 		CallbackUrl                        string         `yaml:"callbackUrl"`
 		CallbackBeforeSendSingleMsg        CallBackConfig `yaml:"callbackBeforeSendSingleMsg"`
@@ -282,191 +296,8 @@ type config struct {
 		CallbackBeforeMemberJoinGroup      CallBackConfig `yaml:"callbackBeforeMemberJoinGroup"`
 		CallbackBeforeSetGroupMemberInfo   CallBackConfig `yaml:"callbackBeforeSetGroupMemberInfo"`
 	} `yaml:"callback"`
-	Notification struct {
-		///////////////////////group/////////////////////////////
-		GroupCreated struct {
-			Conversation PConversation `yaml:"conversation"`
-			OfflinePush  POfflinePush  `yaml:"offlinePush"`
-			DefaultTips  PDefaultTips  `yaml:"defaultTips"`
-		} `yaml:"groupCreated"`
-
-		GroupInfoSet struct {
-			Conversation PConversation `yaml:"conversation"`
-			OfflinePush  POfflinePush  `yaml:"offlinePush"`
-			DefaultTips  PDefaultTips  `yaml:"defaultTips"`
-		} `yaml:"groupInfoSet"`
-
-		JoinGroupApplication struct {
-			Conversation PConversation `yaml:"conversation"`
-			OfflinePush  POfflinePush  `yaml:"offlinePush"`
-			DefaultTips  PDefaultTips  `yaml:"defaultTips"`
-		} `yaml:"joinGroupApplication"`
-
-		MemberQuit struct {
-			Conversation PConversation `yaml:"conversation"`
-			OfflinePush  POfflinePush  `yaml:"offlinePush"`
-			DefaultTips  PDefaultTips  `yaml:"defaultTips"`
-		} `yaml:"memberQuit"`
-
-		GroupApplicationAccepted struct {
-			Conversation PConversation `yaml:"conversation"`
-			OfflinePush  POfflinePush  `yaml:"offlinePush"`
-			DefaultTips  PDefaultTips  `yaml:"defaultTips"`
-		} `yaml:"groupApplicationAccepted"`
-
-		GroupApplicationRejected struct {
-			Conversation PConversation `yaml:"conversation"`
-			OfflinePush  POfflinePush  `yaml:"offlinePush"`
-			DefaultTips  PDefaultTips  `yaml:"defaultTips"`
-		} `yaml:"groupApplicationRejected"`
-
-		GroupOwnerTransferred struct {
-			Conversation PConversation `yaml:"conversation"`
-			OfflinePush  POfflinePush  `yaml:"offlinePush"`
-			DefaultTips  PDefaultTips  `yaml:"defaultTips"`
-		} `yaml:"groupOwnerTransferred"`
-
-		MemberKicked struct {
-			Conversation PConversation `yaml:"conversation"`
-			OfflinePush  POfflinePush  `yaml:"offlinePush"`
-			DefaultTips  PDefaultTips  `yaml:"defaultTips"`
-		} `yaml:"memberKicked"`
-
-		MemberInvited struct {
-			Conversation PConversation `yaml:"conversation"`
-			OfflinePush  POfflinePush  `yaml:"offlinePush"`
-			DefaultTips  PDefaultTips  `yaml:"defaultTips"`
-		} `yaml:"memberInvited"`
-
-		MemberEnter struct {
-			Conversation PConversation `yaml:"conversation"`
-			OfflinePush  POfflinePush  `yaml:"offlinePush"`
-			DefaultTips  PDefaultTips  `yaml:"defaultTips"`
-		} `yaml:"memberEnter"`
-
-		GroupDismissed struct {
-			Conversation PConversation `yaml:"conversation"`
-			OfflinePush  POfflinePush  `yaml:"offlinePush"`
-			DefaultTips  PDefaultTips  `yaml:"defaultTips"`
-		} `yaml:"groupDismissed"`
-
-		GroupMuted struct {
-			Conversation PConversation `yaml:"conversation"`
-			OfflinePush  POfflinePush  `yaml:"offlinePush"`
-			DefaultTips  PDefaultTips  `yaml:"defaultTips"`
-		} `yaml:"groupMuted"`
-
-		GroupCancelMuted struct {
-			Conversation PConversation `yaml:"conversation"`
-			OfflinePush  POfflinePush  `yaml:"offlinePush"`
-			DefaultTips  PDefaultTips  `yaml:"defaultTips"`
-		} `yaml:"groupCancelMuted"`
-
-		GroupMemberMuted struct {
-			Conversation PConversation `yaml:"conversation"`
-			OfflinePush  POfflinePush  `yaml:"offlinePush"`
-			DefaultTips  PDefaultTips  `yaml:"defaultTips"`
-		} `yaml:"groupMemberMuted"`
-
-		GroupMemberCancelMuted struct {
-			Conversation PConversation `yaml:"conversation"`
-			OfflinePush  POfflinePush  `yaml:"offlinePush"`
-			DefaultTips  PDefaultTips  `yaml:"defaultTips"`
-		} `yaml:"groupMemberCancelMuted"`
-		GroupMemberInfoSet struct {
-			Conversation PConversation `yaml:"conversation"`
-			OfflinePush  POfflinePush  `yaml:"offlinePush"`
-			DefaultTips  PDefaultTips  `yaml:"defaultTips"`
-		} `yaml:"groupMemberInfoSet"`
-		GroupMemberSetToAdmin struct {
-			Conversation PConversation `yaml:"conversation"`
-			OfflinePush  POfflinePush  `yaml:"offlinePush"`
-			DefaultTips  PDefaultTips  `yaml:"defaultTips"`
-		} `yaml:"groupMemberSetToAdmin"`
-		GroupMemberSetToOrdinary struct {
-			Conversation PConversation `yaml:"conversation"`
-			OfflinePush  POfflinePush  `yaml:"offlinePush"`
-			DefaultTips  PDefaultTips  `yaml:"defaultTips"`
-		} `yaml:"groupMemberSetToOrdinaryUser"`
-
-		////////////////////////user///////////////////////
-		UserInfoUpdated struct {
-			Conversation PConversation `yaml:"conversation"`
-			OfflinePush  POfflinePush  `yaml:"offlinePush"`
-			DefaultTips  PDefaultTips  `yaml:"defaultTips"`
-		} `yaml:"userInfoUpdated"`
-
-		//////////////////////friend///////////////////////
-		FriendApplication struct {
-			Conversation PConversation `yaml:"conversation"`
-			OfflinePush  POfflinePush  `yaml:"offlinePush"`
-			DefaultTips  PDefaultTips  `yaml:"defaultTips"`
-		} `yaml:"friendApplicationAdded"`
-		FriendApplicationApproved struct {
-			Conversation PConversation `yaml:"conversation"`
-			OfflinePush  POfflinePush  `yaml:"offlinePush"`
-			DefaultTips  PDefaultTips  `yaml:"defaultTips"`
-		} `yaml:"friendApplicationApproved"`
-
-		FriendApplicationRejected struct {
-			Conversation PConversation `yaml:"conversation"`
-			OfflinePush  POfflinePush  `yaml:"offlinePush"`
-			DefaultTips  PDefaultTips  `yaml:"defaultTips"`
-		} `yaml:"friendApplicationRejected"`
-
-		FriendAdded struct {
-			Conversation PConversation `yaml:"conversation"`
-			OfflinePush  POfflinePush  `yaml:"offlinePush"`
-			DefaultTips  PDefaultTips  `yaml:"defaultTips"`
-		} `yaml:"friendAdded"`
-
-		FriendDeleted struct {
-			Conversation PConversation `yaml:"conversation"`
-			OfflinePush  POfflinePush  `yaml:"offlinePush"`
-			DefaultTips  PDefaultTips  `yaml:"defaultTips"`
-		} `yaml:"friendDeleted"`
-		FriendRemarkSet struct {
-			Conversation PConversation `yaml:"conversation"`
-			OfflinePush  POfflinePush  `yaml:"offlinePush"`
-			DefaultTips  PDefaultTips  `yaml:"defaultTips"`
-		} `yaml:"friendRemarkSet"`
-		BlackAdded struct {
-			Conversation PConversation `yaml:"conversation"`
-			OfflinePush  POfflinePush  `yaml:"offlinePush"`
-			DefaultTips  PDefaultTips  `yaml:"defaultTips"`
-		} `yaml:"blackAdded"`
-		BlackDeleted struct {
-			Conversation PConversation `yaml:"conversation"`
-			OfflinePush  POfflinePush  `yaml:"offlinePush"`
-			DefaultTips  PDefaultTips  `yaml:"defaultTips"`
-		} `yaml:"blackDeleted"`
-		FriendInfoUpdated struct {
-			Conversation PConversation `yaml:"conversation"`
-			OfflinePush  POfflinePush  `yaml:"offlinePush"`
-			DefaultTips  PDefaultTips  `yaml:"defaultTips"`
-		} `yaml:"friendInfoUpdated"`
-
-		ConversationOptUpdate struct {
-			Conversation PConversation `yaml:"conversation"`
-			OfflinePush  POfflinePush  `yaml:"offlinePush"`
-			DefaultTips  PDefaultTips  `yaml:"defaultTips"`
-		} `yaml:"conversationOptUpdate"`
-		ConversationSetPrivate struct {
-			Conversation PConversation `yaml:"conversation"`
-			OfflinePush  POfflinePush  `yaml:"offlinePush"`
-			DefaultTips  struct {
-				OpenTips  string `yaml:"openTips"`
-				CloseTips string `yaml:"closeTips"`
-			} `yaml:"defaultTips"`
-		} `yaml:"conversationSetPrivate"`
-		Signal struct {
-			OfflinePush struct {
-				Title string `yaml:"title"`
-			} `yaml:"offlinePush"`
-		} `yaml:"signal"`
-	}
-
-	Rtc struct {
+	Notification Notification `yaml:"notification"`
+	Rtc          struct {
 		SignalTimeout string `yaml:"signalTimeout"`
 	} `yaml:"rtc"`
 
@@ -484,74 +315,193 @@ type config struct {
 		MessageTransferPrometheusPort []int `yaml:"messageTransferPrometheusPort"`
 	} `yaml:"prometheus"`
 }
-type PConversation struct {
-	ReliabilityLevel int  `yaml:"reliabilityLevel"`
-	UnreadCount      bool `yaml:"unreadCount"`
+
+type notificationConfig struct {
+	Notification Notification `yaml:"notification"`
 }
 
-type POfflinePush struct {
-	PushSwitch bool   `yaml:"switch"`
-	Title      string `yaml:"title"`
-	Desc       string `yaml:"desc"`
-	Ext        string `yaml:"ext"`
+type Notification struct {
+	GroupCreated struct {
+		Conversation PConversation `yaml:"conversation"`
+		OfflinePush  POfflinePush  `yaml:"offlinePush"`
+		DefaultTips  PDefaultTips  `yaml:"defaultTips"`
+	} `yaml:"groupCreated"`
+
+	GroupInfoSet struct {
+		Conversation PConversation `yaml:"conversation"`
+		OfflinePush  POfflinePush  `yaml:"offlinePush"`
+		DefaultTips  PDefaultTips  `yaml:"defaultTips"`
+	} `yaml:"groupInfoSet"`
+
+	JoinGroupApplication struct {
+		Conversation PConversation `yaml:"conversation"`
+		OfflinePush  POfflinePush  `yaml:"offlinePush"`
+		DefaultTips  PDefaultTips  `yaml:"defaultTips"`
+	} `yaml:"joinGroupApplication"`
+
+	MemberQuit struct {
+		Conversation PConversation `yaml:"conversation"`
+		OfflinePush  POfflinePush  `yaml:"offlinePush"`
+		DefaultTips  PDefaultTips  `yaml:"defaultTips"`
+	} `yaml:"memberQuit"`
+
+	GroupApplicationAccepted struct {
+		Conversation PConversation `yaml:"conversation"`
+		OfflinePush  POfflinePush  `yaml:"offlinePush"`
+		DefaultTips  PDefaultTips  `yaml:"defaultTips"`
+	} `yaml:"groupApplicationAccepted"`
+
+	GroupApplicationRejected struct {
+		Conversation PConversation `yaml:"conversation"`
+		OfflinePush  POfflinePush  `yaml:"offlinePush"`
+		DefaultTips  PDefaultTips  `yaml:"defaultTips"`
+	} `yaml:"groupApplicationRejected"`
+
+	GroupOwnerTransferred struct {
+		Conversation PConversation `yaml:"conversation"`
+		OfflinePush  POfflinePush  `yaml:"offlinePush"`
+		DefaultTips  PDefaultTips  `yaml:"defaultTips"`
+	} `yaml:"groupOwnerTransferred"`
+
+	MemberKicked struct {
+		Conversation PConversation `yaml:"conversation"`
+		OfflinePush  POfflinePush  `yaml:"offlinePush"`
+		DefaultTips  PDefaultTips  `yaml:"defaultTips"`
+	} `yaml:"memberKicked"`
+
+	MemberInvited struct {
+		Conversation PConversation `yaml:"conversation"`
+		OfflinePush  POfflinePush  `yaml:"offlinePush"`
+		DefaultTips  PDefaultTips  `yaml:"defaultTips"`
+	} `yaml:"memberInvited"`
+
+	MemberEnter struct {
+		Conversation PConversation `yaml:"conversation"`
+		OfflinePush  POfflinePush  `yaml:"offlinePush"`
+		DefaultTips  PDefaultTips  `yaml:"defaultTips"`
+	} `yaml:"memberEnter"`
+
+	GroupDismissed struct {
+		Conversation PConversation `yaml:"conversation"`
+		OfflinePush  POfflinePush  `yaml:"offlinePush"`
+		DefaultTips  PDefaultTips  `yaml:"defaultTips"`
+	} `yaml:"groupDismissed"`
+
+	GroupMuted struct {
+		Conversation PConversation `yaml:"conversation"`
+		OfflinePush  POfflinePush  `yaml:"offlinePush"`
+		DefaultTips  PDefaultTips  `yaml:"defaultTips"`
+	} `yaml:"groupMuted"`
+
+	GroupCancelMuted struct {
+		Conversation PConversation `yaml:"conversation"`
+		OfflinePush  POfflinePush  `yaml:"offlinePush"`
+		DefaultTips  PDefaultTips  `yaml:"defaultTips"`
+	} `yaml:"groupCancelMuted"`
+
+	GroupMemberMuted struct {
+		Conversation PConversation `yaml:"conversation"`
+		OfflinePush  POfflinePush  `yaml:"offlinePush"`
+		DefaultTips  PDefaultTips  `yaml:"defaultTips"`
+	} `yaml:"groupMemberMuted"`
+
+	GroupMemberCancelMuted struct {
+		Conversation PConversation `yaml:"conversation"`
+		OfflinePush  POfflinePush  `yaml:"offlinePush"`
+		DefaultTips  PDefaultTips  `yaml:"defaultTips"`
+	} `yaml:"groupMemberCancelMuted"`
+	GroupMemberInfoSet struct {
+		Conversation PConversation `yaml:"conversation"`
+		OfflinePush  POfflinePush  `yaml:"offlinePush"`
+		DefaultTips  PDefaultTips  `yaml:"defaultTips"`
+	} `yaml:"groupMemberInfoSet"`
+	GroupMemberSetToAdmin struct {
+		Conversation PConversation `yaml:"conversation"`
+		OfflinePush  POfflinePush  `yaml:"offlinePush"`
+		DefaultTips  PDefaultTips  `yaml:"defaultTips"`
+	} `yaml:"groupMemberSetToAdmin"`
+	GroupMemberSetToOrdinary struct {
+		Conversation PConversation `yaml:"conversation"`
+		OfflinePush  POfflinePush  `yaml:"offlinePush"`
+		DefaultTips  PDefaultTips  `yaml:"defaultTips"`
+	} `yaml:"groupMemberSetToOrdinaryUser"`
+
+	////////////////////////user///////////////////////
+	UserInfoUpdated struct {
+		Conversation PConversation `yaml:"conversation"`
+		OfflinePush  POfflinePush  `yaml:"offlinePush"`
+		DefaultTips  PDefaultTips  `yaml:"defaultTips"`
+	} `yaml:"userInfoUpdated"`
+
+	//////////////////////friend///////////////////////
+	FriendApplication struct {
+		Conversation PConversation `yaml:"conversation"`
+		OfflinePush  POfflinePush  `yaml:"offlinePush"`
+		DefaultTips  PDefaultTips  `yaml:"defaultTips"`
+	} `yaml:"friendApplicationAdded"`
+	FriendApplicationApproved struct {
+		Conversation PConversation `yaml:"conversation"`
+		OfflinePush  POfflinePush  `yaml:"offlinePush"`
+		DefaultTips  PDefaultTips  `yaml:"defaultTips"`
+	} `yaml:"friendApplicationApproved"`
+
+	FriendApplicationRejected struct {
+		Conversation PConversation `yaml:"conversation"`
+		OfflinePush  POfflinePush  `yaml:"offlinePush"`
+		DefaultTips  PDefaultTips  `yaml:"defaultTips"`
+	} `yaml:"friendApplicationRejected"`
+
+	FriendAdded struct {
+		Conversation PConversation `yaml:"conversation"`
+		OfflinePush  POfflinePush  `yaml:"offlinePush"`
+		DefaultTips  PDefaultTips  `yaml:"defaultTips"`
+	} `yaml:"friendAdded"`
+
+	FriendDeleted struct {
+		Conversation PConversation `yaml:"conversation"`
+		OfflinePush  POfflinePush  `yaml:"offlinePush"`
+		DefaultTips  PDefaultTips  `yaml:"defaultTips"`
+	} `yaml:"friendDeleted"`
+	FriendRemarkSet struct {
+		Conversation PConversation `yaml:"conversation"`
+		OfflinePush  POfflinePush  `yaml:"offlinePush"`
+		DefaultTips  PDefaultTips  `yaml:"defaultTips"`
+	} `yaml:"friendRemarkSet"`
+	BlackAdded struct {
+		Conversation PConversation `yaml:"conversation"`
+		OfflinePush  POfflinePush  `yaml:"offlinePush"`
+		DefaultTips  PDefaultTips  `yaml:"defaultTips"`
+	} `yaml:"blackAdded"`
+	BlackDeleted struct {
+		Conversation PConversation `yaml:"conversation"`
+		OfflinePush  POfflinePush  `yaml:"offlinePush"`
+		DefaultTips  PDefaultTips  `yaml:"defaultTips"`
+	} `yaml:"blackDeleted"`
+	FriendInfoUpdated struct {
+		Conversation PConversation `yaml:"conversation"`
+		OfflinePush  POfflinePush  `yaml:"offlinePush"`
+		DefaultTips  PDefaultTips  `yaml:"defaultTips"`
+	} `yaml:"friendInfoUpdated"`
+
+	ConversationOptUpdate struct {
+		Conversation PConversation `yaml:"conversation"`
+		OfflinePush  POfflinePush  `yaml:"offlinePush"`
+		DefaultTips  PDefaultTips  `yaml:"defaultTips"`
+	} `yaml:"conversationOptUpdate"`
+	ConversationSetPrivate struct {
+		Conversation PConversation `yaml:"conversation"`
+		OfflinePush  POfflinePush  `yaml:"offlinePush"`
+		DefaultTips  struct {
+			OpenTips  string `yaml:"openTips"`
+			CloseTips string `yaml:"closeTips"`
+		} `yaml:"defaultTips"`
+	} `yaml:"conversationSetPrivate"`
+	Signal struct {
+		OfflinePush struct {
+			Title string `yaml:"title"`
+		} `yaml:"offlinePush"`
+	} `yaml:"signal"`
 }
-type PDefaultTips struct {
-	Tips string `yaml:"tips"`
-}
-
-type usualConfig struct {
-	Etcd struct {
-		UserName string `yaml:"userName"`
-		Password string `yaml:"password"`
-		Secret   string `yaml:"secret"`
-	} `yaml:"etcd"`
-	Mysql struct {
-		DBUserName string `yaml:"dbMysqlUserName"`
-		DBPassword string `yaml:"dbMysqlPassword"`
-	} `yaml:"mysql"`
-	Mongo struct {
-		DBUserName string `yaml:"dbUserName"`
-		DBPassword string `yaml:"dbPassword"`
-	} `yaml:"mongo"`
-	Redis struct {
-		DBUserName string `yaml:"dbUserName"`
-		DBPassword string `yaml:"dbPassWord"`
-	} `yaml:"redis"`
-	Kafka struct {
-		SASLUserName string `yaml:"SASLUserName"`
-		SASLPassword string `yaml:"SASLPassword"`
-	} `yaml:"kafka"`
-
-	Credential struct {
-		Minio struct {
-			AccessKeyID     string `yaml:"accessKeyID"`
-			SecretAccessKey string `yaml:"secretAccessKey"`
-			Endpoint        string `yaml:"endpoint"`
-		} `yaml:"minio"`
-	} `yaml:"credential"`
-
-	Secret string `yaml:"secret"`
-
-	Tokenpolicy struct {
-		AccessSecret string `yaml:"accessSecret"`
-		AccessExpire int64  `yaml:"accessExpire"`
-	} `yaml:"tokenpolicy"`
-
-	Messageverify struct {
-		FriendVerify bool `yaml:"friendVerify"`
-	} `yaml:"messageverify"`
-
-	Push struct {
-		Getui struct {
-			PushUrl      string `yaml:"pushUrl"`
-			MasterSecret string `yaml:"masterSecret"`
-			AppKey       string `yaml:"appKey"`
-			Enable       bool   `yaml:"enable"`
-		} `yaml:"getui"`
-	} `yaml:"push"`
-}
-
-var UsualConfig usualConfig
 
 func unmarshalConfig(config interface{}, configPath string) {
 	bytes, err := ioutil.ReadFile(configPath)
@@ -565,7 +515,7 @@ func unmarshalConfig(config interface{}, configPath string) {
 
 func initConfig(config interface{}, configName, configPath string) {
 	if configPath == "" {
-		var env string
+		var env = "CONFIG_NAME"
 		if configName == "config.yaml" {
 			env = "CONFIG_NAME"
 		} else if configName == "usualConfig.yaml" {
@@ -587,75 +537,10 @@ func initConfig(config interface{}, configName, configPath string) {
 	unmarshalConfig(config, configPath)
 }
 
-func InitConfig(configPath string) {
-	initConfig(&Config, "config.yaml", configPath)
-	initConfig(&UsualConfig, "usualConfig.yaml", configPath)
-
-	if Config.Mysql.DBUserName == "" {
-		Config.Mysql.DBUserName = UsualConfig.Mysql.DBUserName
-	}
-	if Config.Mysql.DBPassword == "" {
-		Config.Mysql.DBPassword = UsualConfig.Mysql.DBPassword
-	}
-
-	if Config.Redis.DBUserName == "" {
-		Config.Redis.DBUserName = UsualConfig.Redis.DBUserName
-	}
-	if Config.Redis.DBPassWord == "" {
-		Config.Redis.DBPassWord = UsualConfig.Redis.DBPassword
-	}
-
-	if Config.Mongo.DBUserName == "" {
-		Config.Mongo.DBUserName = UsualConfig.Mongo.DBUserName
-	}
-	if Config.Mongo.DBPassword == "" {
-		Config.Mongo.DBPassword = UsualConfig.Mongo.DBPassword
-	}
-
-	if Config.Kafka.SASLUserName == "" {
-		Config.Kafka.SASLUserName = UsualConfig.Kafka.SASLUserName
-	}
-	if Config.Kafka.SASLPassword == "" {
-		Config.Kafka.SASLPassword = UsualConfig.Kafka.SASLPassword
-	}
-
-	if Config.Credential.Minio.AccessKeyID == "" {
-		Config.Credential.Minio.AccessKeyID = UsualConfig.Credential.Minio.AccessKeyID
-	}
-	if Config.Credential.Minio.SecretAccessKey == "" {
-		Config.Credential.Minio.SecretAccessKey = UsualConfig.Credential.Minio.SecretAccessKey
-	}
-	if Config.Credential.Minio.Endpoint == "" {
-		Config.Credential.Minio.Endpoint = UsualConfig.Credential.Minio.Endpoint
-	}
-
-	if Config.MessageVerify.FriendVerify == nil {
-		Config.MessageVerify.FriendVerify = &UsualConfig.Messageverify.FriendVerify
-	}
-
-	if Config.Push.Getui.MasterSecret == "" {
-		Config.Push.Getui.MasterSecret = UsualConfig.Push.Getui.MasterSecret
-	}
-	if Config.Push.Getui.AppKey == "" {
-		Config.Push.Getui.AppKey = UsualConfig.Push.Getui.AppKey
-	}
-	if Config.Push.Getui.PushUrl == "" {
-		Config.Push.Getui.PushUrl = UsualConfig.Push.Getui.PushUrl
-	}
-	if Config.Push.Getui.Enable == nil {
-		Config.Push.Getui.Enable = &UsualConfig.Push.Getui.Enable
-	}
-	if Config.Secret == "" {
-		Config.Secret = UsualConfig.Secret
-	}
-	if Config.TokenPolicy.AccessExpire == 0 {
-		Config.TokenPolicy.AccessExpire = UsualConfig.Tokenpolicy.AccessExpire
-	}
-	if Config.TokenPolicy.AccessSecret == "" {
-		Config.TokenPolicy.AccessSecret = UsualConfig.Tokenpolicy.AccessSecret
-	}
-}
-
-func init() {
-	InitConfig("")
+func InitConfig() {
+	configPath := flag.String("config_path", "../config/", "config folder")
+	flag.Parse()
+	initConfig(&Config, "config.yaml", *configPath)
+	initConfig(&NotificationConfig, "notification.yaml", *configPath)
+	Config.Notification = NotificationConfig.Notification
 }

pkg/common/db/cache/black.go

@@ -1,9 +1,9 @@
 package cache
 
 import (
-	"Open_IM/pkg/common/db/relation"
-	"Open_IM/pkg/common/tracelog"
-	"Open_IM/pkg/utils"
+	"OpenIM/pkg/common/db/relation"
+	"OpenIM/pkg/common/tracelog"
+	"OpenIM/pkg/utils"
 	"context"
 	"github.com/dtm-labs/rockscache"
 	"github.com/go-redis/redis/v8"

pkg/common/db/cache/conversation.go

@@ -1,10 +1,10 @@
 package cache
 
 import (
-	"Open_IM/pkg/common/db/relation"
-	relationTb "Open_IM/pkg/common/db/table/relation"
-	"Open_IM/pkg/common/tracelog"
-	"Open_IM/pkg/utils"
+	"OpenIM/pkg/common/db/relation"
+	relationTb "OpenIM/pkg/common/db/table/relation"
+	"OpenIM/pkg/common/tracelog"
+	"OpenIM/pkg/utils"
 	"context"
 	"github.com/dtm-labs/rockscache"
 	"github.com/go-redis/redis/v8"

pkg/common/db/cache/extend_msg_set.go

@@ -1,9 +1,9 @@
 package cache
 
 import (
-	"Open_IM/pkg/common/db/table/unrelation"
-	"Open_IM/pkg/common/tracelog"
-	"Open_IM/pkg/utils"
+	"OpenIM/pkg/common/db/table/unrelation"
+	"OpenIM/pkg/common/tracelog"
+	"OpenIM/pkg/utils"
 	"context"
 	"github.com/dtm-labs/rockscache"
 	"time"

pkg/common/db/cache/friend.go

@@ -1,10 +1,10 @@
 package cache
 
 import (
-	"Open_IM/pkg/common/db/relation"
-	relationTb "Open_IM/pkg/common/db/table/relation"
-	"Open_IM/pkg/common/tracelog"
-	"Open_IM/pkg/utils"
+	"OpenIM/pkg/common/db/relation"
+	relationTb "OpenIM/pkg/common/db/table/relation"
+	"OpenIM/pkg/common/tracelog"
+	"OpenIM/pkg/utils"
 	"context"
 	"encoding/json"
 	"github.com/dtm-labs/rockscache"

pkg/common/db/cache/group.go

@@ -1,10 +1,10 @@
 package cache
 
 import (
-	relationTb "Open_IM/pkg/common/db/table/relation"
-	unrelation2 "Open_IM/pkg/common/db/table/unrelation"
-	"Open_IM/pkg/common/tracelog"
-	"Open_IM/pkg/utils"
+	relationTb "OpenIM/pkg/common/db/table/relation"
+	unrelation2 "OpenIM/pkg/common/db/table/unrelation"
+	"OpenIM/pkg/common/tracelog"
+	"OpenIM/pkg/utils"
 	"context"
 	"github.com/dtm-labs/rockscache"
 	"github.com/go-redis/redis/v8"

pkg/common/db/cache/redis.go

@@ -1,12 +1,12 @@
 package cache
 
 import (
-	"Open_IM/pkg/common/config"
-	"Open_IM/pkg/common/constant"
-	pbChat "Open_IM/pkg/proto/msg"
-	pbRtc "Open_IM/pkg/proto/rtc"
-	"Open_IM/pkg/proto/sdkws"
-	"Open_IM/pkg/utils"
+	"OpenIM/pkg/common/config"
+	"OpenIM/pkg/common/constant"
+	pbChat "OpenIM/pkg/proto/msg"
+	pbRtc "OpenIM/pkg/proto/rtc"
+	"OpenIM/pkg/proto/sdkws"
+	"OpenIM/pkg/utils"
 	"context"
 	"errors"
 	"fmt"

pkg/common/db/cache/redis_test.go

@@ -1,9 +1,9 @@
 package cache
 
 import (
-	"Open_IM/pkg/common/constant"
-	pbChat "Open_IM/pkg/proto/msg"
-	common "Open_IM/pkg/proto/sdkws"
+	"OpenIM/pkg/common/constant"
+	pbChat "OpenIM/pkg/proto/msg"
+	common "OpenIM/pkg/proto/sdkws"
 	"context"
 	"flag"
 	"fmt"

pkg/common/db/cache/rockscache.go

@@ -1,7 +1,7 @@
 package cache
 
 import (
-	"Open_IM/pkg/utils"
+	"OpenIM/pkg/utils"
 	"context"
 	"encoding/json"
 	"github.com/dtm-labs/rockscache"

pkg/common/db/cache/token.go

@@ -1,9 +1,9 @@
 package cache
 
 import (
-	"Open_IM/pkg/common/constant"
-	"Open_IM/pkg/common/tokenverify"
-	"Open_IM/pkg/utils"
+	"OpenIM/pkg/common/constant"
+	"OpenIM/pkg/common/tokenverify"
+	"OpenIM/pkg/utils"
 	"context"
 	"github.com/golang-jwt/jwt/v4"
 )

pkg/common/db/cache/user.go

@@ -1,10 +1,10 @@
 package cache
 
 import (
-	"Open_IM/pkg/common/db/relation"
-	relationTb "Open_IM/pkg/common/db/table/relation"
-	"Open_IM/pkg/common/tracelog"
-	"Open_IM/pkg/utils"
+	"OpenIM/pkg/common/db/relation"
+	relationTb "OpenIM/pkg/common/db/table/relation"
+	"OpenIM/pkg/common/tracelog"
+	"OpenIM/pkg/utils"
 	"context"
 	"encoding/json"
 	"github.com/dtm-labs/rockscache"

pkg/common/db/controller/auth.go

@@ -1,7 +1,7 @@
 package controller
 
 import (
-	"Open_IM/pkg/common/db/cache"
+	"OpenIM/pkg/common/db/cache"
 	"context"
 	"github.com/go-redis/redis/v8"
 )

pkg/common/db/controller/black.go

@@ -1,8 +1,8 @@
 package controller
 
 import (
-	"Open_IM/pkg/common/db/table/relation"
-	"Open_IM/pkg/utils"
+	"OpenIM/pkg/common/db/table/relation"
+	"OpenIM/pkg/utils"
 	"context"
 	"errors"
 	"gorm.io/gorm"

pkg/common/db/controller/chatlog.go

@@ -1,9 +1,9 @@
 package controller
 
 import (
-	"Open_IM/pkg/common/db/relation"
-	relationTb "Open_IM/pkg/common/db/table/relation"
-	pbMsg "Open_IM/pkg/proto/msg"
+	"OpenIM/pkg/common/db/relation"
+	relationTb "OpenIM/pkg/common/db/table/relation"
+	pbMsg "OpenIM/pkg/proto/msg"
 	"gorm.io/gorm"
 )
 

pkg/common/db/controller/conversation.go

@@ -1,12 +1,12 @@
 package controller
 
 import (
-	"Open_IM/internal/tx"
-	"Open_IM/pkg/common/constant"
-	"Open_IM/pkg/common/db/cache"
-	"Open_IM/pkg/common/db/relation"
-	relationTb "Open_IM/pkg/common/db/table/relation"
-	"Open_IM/pkg/utils"
+	"OpenIM/internal/tx"
+	"OpenIM/pkg/common/constant"
+	"OpenIM/pkg/common/db/cache"
+	"OpenIM/pkg/common/db/relation"
+	relationTb "OpenIM/pkg/common/db/table/relation"
+	"OpenIM/pkg/utils"
 	"context"
 	"encoding/json"
 )

pkg/common/db/controller/extend_msg.go

@@ -1,8 +1,8 @@
 package controller
 
 import (
-	unRelationTb "Open_IM/pkg/common/db/table/unrelation"
-	"Open_IM/pkg/proto/sdkws"
+	unRelationTb "OpenIM/pkg/common/db/table/unrelation"
+	"OpenIM/pkg/proto/sdkws"
 	"context"
 	"github.com/go-redis/redis/v8"
 	"go.mongodb.org/mongo-driver/mongo"

pkg/common/db/controller/friend.go

@@ -1,10 +1,10 @@
 package controller
 
 import (
-	"Open_IM/internal/tx"
-	"Open_IM/pkg/common/constant"
-	"Open_IM/pkg/common/db/table/relation"
-	"Open_IM/pkg/utils"
+	"OpenIM/internal/tx"
+	"OpenIM/pkg/common/constant"
+	"OpenIM/pkg/common/db/table/relation"
+	"OpenIM/pkg/utils"
 	"context"
 	"errors"
 	"gorm.io/gorm"

pkg/common/db/controller/group.go

@@ -1,12 +1,12 @@
 package controller
 
 import (
-	"Open_IM/internal/tx"
-	"Open_IM/pkg/common/constant"
-	"Open_IM/pkg/common/db/cache"
-	relationTb "Open_IM/pkg/common/db/table/relation"
-	unRelationTb "Open_IM/pkg/common/db/table/unrelation"
-	"Open_IM/pkg/utils"
+	"OpenIM/internal/tx"
+	"OpenIM/pkg/common/constant"
+	"OpenIM/pkg/common/db/cache"
+	relationTb "OpenIM/pkg/common/db/table/relation"
+	unRelationTb "OpenIM/pkg/common/db/table/unrelation"
+	"OpenIM/pkg/utils"
 	"context"
 	"fmt"
 	"github.com/dtm-labs/rockscache"

pkg/common/db/controller/msg.go

@@ -1,20 +1,20 @@
 package controller
 
 import (
-	"Open_IM/pkg/common/constant"
-	"Open_IM/pkg/common/db/cache"
-	unRelationTb "Open_IM/pkg/common/db/table/unrelation"
-	"Open_IM/pkg/common/db/unrelation"
-	"Open_IM/pkg/common/log"
-	"Open_IM/pkg/common/prome"
-	"Open_IM/pkg/common/tracelog"
+	"OpenIM/pkg/common/constant"
+	"OpenIM/pkg/common/db/cache"
+	unRelationTb "OpenIM/pkg/common/db/table/unrelation"
+	"OpenIM/pkg/common/db/unrelation"
+	"OpenIM/pkg/common/log"
+	"OpenIM/pkg/common/prome"
+	"OpenIM/pkg/common/tracelog"
 	"github.com/gogo/protobuf/sortkeys"
 	"sync"
 	"time"
 
-	pbMsg "Open_IM/pkg/proto/msg"
-	"Open_IM/pkg/proto/sdkws"
-	"Open_IM/pkg/utils"
+	pbMsg "OpenIM/pkg/proto/msg"
+	"OpenIM/pkg/proto/sdkws"
+	"OpenIM/pkg/utils"
 	"context"
 	"errors"
 	"github.com/go-redis/redis/v8"
@@ -146,7 +146,6 @@ type MsgDatabase interface {
 	SetUserMinSeq(ctx context.Context, userID string, minSeq int64) (err error)
 
 	JudgeMessageReactionEXISTS(ctx context.Context, clientMsgID string, sessionType int32) (bool, error)
-
 	SetMessageTypeKeyValue(ctx context.Context, clientMsgID string, sessionType int32, typeKey, value string) error
 
 	SetMessageReactionExpire(ctx context.Context, clientMsgID string, sessionType int32, expiration time.Duration) (bool, error)

pkg/common/db/controller/push.go

@@ -1,7 +1,7 @@
 package controller
 
 import (
-	"Open_IM/pkg/common/db/cache"
+	"OpenIM/pkg/common/db/cache"
 	"context"
 )
 

pkg/common/db/controller/user.go

@@ -1,9 +1,9 @@
 package controller
 
 import (
-	"Open_IM/pkg/common/constant"
-	"Open_IM/pkg/common/db/table/relation"
-	"Open_IM/pkg/utils"
+	"OpenIM/pkg/common/constant"
+	"OpenIM/pkg/common/db/table/relation"
+	"OpenIM/pkg/utils"
 	"context"
 )
 

pkg/common/db/localcache/conversation.go

@@ -1,9 +1,9 @@
 package localcache
 
 import (
-	"Open_IM/pkg/common/config"
-	"Open_IM/pkg/discoveryregistry"
-	"Open_IM/pkg/proto/conversation"
+	"OpenIM/pkg/common/config"
+	"OpenIM/pkg/discoveryregistry"
+	"OpenIM/pkg/proto/conversation"
 	"context"
 	"sync"
 )

pkg/common/db/localcache/group.go

@@ -1,10 +1,10 @@
 package localcache
 
 import (
-	"Open_IM/pkg/common/config"
-	"Open_IM/pkg/common/constant"
-	"Open_IM/pkg/discoveryregistry"
-	"Open_IM/pkg/proto/group"
+	"OpenIM/pkg/common/config"
+	"OpenIM/pkg/common/constant"
+	"OpenIM/pkg/discoveryregistry"
+	"OpenIM/pkg/proto/group"
 	"context"
 	"sync"
 )

pkg/common/db/relation/black_model.go

@@ -1,9 +1,9 @@
 package relation
 
 import (
-	"Open_IM/pkg/common/db/table/relation"
-	"Open_IM/pkg/common/tracelog"
-	"Open_IM/pkg/utils"
+	"OpenIM/pkg/common/db/table/relation"
+	"OpenIM/pkg/common/tracelog"
+	"OpenIM/pkg/utils"
 	"context"
 	"gorm.io/gorm"
 )

pkg/common/db/relation/chat_log_model.go

@@ -1,11 +1,11 @@
 package relation
 
 import (
-	"Open_IM/pkg/common/constant"
-	"Open_IM/pkg/common/db/table/relation"
-	pbMsg "Open_IM/pkg/proto/msg"
-	sdkws "Open_IM/pkg/proto/sdkws"
-	"Open_IM/pkg/utils"
+	"OpenIM/pkg/common/constant"
+	"OpenIM/pkg/common/db/table/relation"
+	pbMsg "OpenIM/pkg/proto/msg"
+	sdkws "OpenIM/pkg/proto/sdkws"
+	"OpenIM/pkg/utils"
 	"fmt"
 	"github.com/golang/protobuf/jsonpb"
 	"github.com/golang/protobuf/proto"

pkg/common/db/relation/conversation_model.go

@@ -1,10 +1,10 @@
 package relation
 
 import (
-	"Open_IM/pkg/common/constant"
-	"Open_IM/pkg/common/db/table/relation"
-	"Open_IM/pkg/common/tracelog"
-	"Open_IM/pkg/utils"
+	"OpenIM/pkg/common/constant"
+	"OpenIM/pkg/common/db/table/relation"
+	"OpenIM/pkg/common/tracelog"
+	"OpenIM/pkg/utils"
 	"context"
 	"gorm.io/gorm"
 )

pkg/common/db/relation/friend_model.go

@@ -1,9 +1,9 @@
 package relation
 
 import (
-	"Open_IM/pkg/common/db/table/relation"
-	"Open_IM/pkg/common/tracelog"
-	"Open_IM/pkg/utils"
+	"OpenIM/pkg/common/db/table/relation"
+	"OpenIM/pkg/common/tracelog"
+	"OpenIM/pkg/utils"
 	"context"
 	"gorm.io/gorm"
 )

pkg/common/db/relation/friend_request_model.go

@@ -1,9 +1,9 @@
 package relation
 
 import (
-	"Open_IM/pkg/common/db/table/relation"
-	"Open_IM/pkg/common/tracelog"
-	"Open_IM/pkg/utils"
+	"OpenIM/pkg/common/db/table/relation"
+	"OpenIM/pkg/common/tracelog"
+	"OpenIM/pkg/utils"
 	"context"
 	"gorm.io/gorm"
 )

pkg/common/db/relation/group_member_model.go

@@ -1,10 +1,10 @@
 package relation
 
 import (
-	"Open_IM/pkg/common/constant"
-	"Open_IM/pkg/common/db/table/relation"
-	"Open_IM/pkg/common/tracelog"
-	"Open_IM/pkg/utils"
+	"OpenIM/pkg/common/constant"
+	"OpenIM/pkg/common/db/table/relation"
+	"OpenIM/pkg/common/tracelog"
+	"OpenIM/pkg/utils"
 	"context"
 	"gorm.io/gorm"
 )

pkg/common/db/relation/group_model.go

@@ -1,9 +1,9 @@
 package relation
 
 import (
-	"Open_IM/pkg/common/db/table/relation"
-	"Open_IM/pkg/common/tracelog"
-	"Open_IM/pkg/utils"
+	"OpenIM/pkg/common/db/table/relation"
+	"OpenIM/pkg/common/tracelog"
+	"OpenIM/pkg/utils"
 	"context"
 	"gorm.io/gorm"
 )

pkg/common/db/relation/group_request_model.go

@@ -1,9 +1,9 @@
 package relation
 
 import (
-	"Open_IM/pkg/common/db/table/relation"
-	"Open_IM/pkg/common/tracelog"
-	"Open_IM/pkg/utils"
+	"OpenIM/pkg/common/db/table/relation"
+	"OpenIM/pkg/common/tracelog"
+	"OpenIM/pkg/utils"
 	"context"
 	"gorm.io/gorm"
 )

pkg/common/db/relation/mysql_init.go

@@ -1,7 +1,7 @@
 package relation
 
 import (
-	"Open_IM/pkg/common/config"
+	"OpenIM/pkg/common/config"
 	"fmt"
 	"gorm.io/driver/mysql"
 	"time"

pkg/common/db/relation/user_model.go

@@ -1,9 +1,9 @@
 package relation
 
 import (
-	"Open_IM/pkg/common/db/table/relation"
-	"Open_IM/pkg/common/tracelog"
-	"Open_IM/pkg/utils"
+	"OpenIM/pkg/common/db/table/relation"
+	"OpenIM/pkg/common/tracelog"
+	"OpenIM/pkg/utils"
 	"context"
 	"gorm.io/gorm"
 )

pkg/common/db/relation/utils.go

@@ -1,7 +1,7 @@
 package relation
 
 import (
-	"Open_IM/pkg/utils"
+	"OpenIM/pkg/utils"
 	"gorm.io/gorm"
 )
 

pkg/common/db/table/relation/chatlog.go

@@ -4,7 +4,7 @@ import (
 	"gorm.io/gorm"
 	"time"
 
-	pbMsg "Open_IM/pkg/proto/msg"
+	pbMsg "OpenIM/pkg/proto/msg"
 )
 
 const (

pkg/common/db/table/unrelation/extend_msg_set.go

@@ -1,7 +1,7 @@
 package unrelation
 
 import (
-	"Open_IM/pkg/proto/sdkws"
+	"OpenIM/pkg/proto/sdkws"
 	"context"
 	"strconv"
 	"strings"

pkg/common/db/table/unrelation/msg.go

@@ -1,8 +1,8 @@
 package unrelation
 
 import (
-	"Open_IM/pkg/common/constant"
-	"Open_IM/pkg/proto/sdkws"
+	"OpenIM/pkg/common/constant"
+	"OpenIM/pkg/proto/sdkws"
 	"context"
 	"strconv"
 	"strings"

pkg/common/db/unrelation/extend_msg.go

@@ -1,9 +1,9 @@
 package unrelation
 
 import (
-	unRelationTb "Open_IM/pkg/common/db/table/unrelation"
-	"Open_IM/pkg/proto/sdkws"
-	"Open_IM/pkg/utils"
+	unRelationTb "OpenIM/pkg/common/db/table/unrelation"
+	"OpenIM/pkg/proto/sdkws"
+	"OpenIM/pkg/utils"
 	"context"
 	"errors"
 	"fmt"

pkg/common/db/unrelation/mongo.go

@@ -1,9 +1,9 @@
 package unrelation
 
 import (
-	"Open_IM/pkg/common/config"
-	"Open_IM/pkg/common/db/table/unrelation"
-	"Open_IM/pkg/utils"
+	"OpenIM/pkg/common/config"
+	"OpenIM/pkg/common/db/table/unrelation"
+	"OpenIM/pkg/utils"
 	"context"
 	"fmt"
 	"go.mongodb.org/mongo-driver/mongo"

pkg/common/db/unrelation/msg.go

@@ -1,9 +1,9 @@
 package unrelation
 
 import (
-	table "Open_IM/pkg/common/db/table/unrelation"
-	"Open_IM/pkg/proto/sdkws"
-	"Open_IM/pkg/utils"
+	table "OpenIM/pkg/common/db/table/unrelation"
+	"OpenIM/pkg/proto/sdkws"
+	"OpenIM/pkg/utils"
 	"context"
 	"errors"
 	"fmt"

pkg/common/db/unrelation/super_group.go

@@ -1,9 +1,9 @@
 package unrelation
 
 import (
-	"Open_IM/pkg/common/config"
-	"Open_IM/pkg/common/db/table/unrelation"
-	"Open_IM/pkg/utils"
+	"OpenIM/pkg/common/config"
+	"OpenIM/pkg/common/db/table/unrelation"
+	"OpenIM/pkg/utils"
 	"context"
 	"go.mongodb.org/mongo-driver/bson"
 	"go.mongodb.org/mongo-driver/mongo"

pkg/common/http/http_client.go

@@ -7,9 +7,9 @@
 package http
 
 import (
-	"Open_IM/pkg/callbackstruct"
-	"Open_IM/pkg/common/config"
-	"Open_IM/pkg/common/constant"
+	"OpenIM/pkg/callbackstruct"
+	"OpenIM/pkg/common/config"
+	"OpenIM/pkg/common/constant"
 	"bytes"
 	"encoding/json"
 	"io/ioutil"

pkg/common/kafka/consumer.go

@@ -1,7 +1,7 @@
 package kafka
 
 import (
-	"Open_IM/pkg/common/config"
+	"OpenIM/pkg/common/config"
 	"sync"
 
 	"github.com/Shopify/sarama"

pkg/common/kafka/producer.go

@@ -1,15 +1,15 @@
 package kafka
 
 import (
-	"Open_IM/pkg/common/config"
-	log "Open_IM/pkg/common/log"
-	"Open_IM/pkg/utils"
+	"OpenIM/pkg/common/config"
+	log "OpenIM/pkg/common/log"
+	"OpenIM/pkg/utils"
 	"errors"
 
 	"github.com/Shopify/sarama"
 	"github.com/golang/protobuf/proto"
 
-	prome "Open_IM/pkg/common/prome"
+	prome "OpenIM/pkg/common/prome"
 )
 
 type Producer struct {

pkg/common/log/es_hk.go

@@ -7,7 +7,7 @@
 package log
 
 import (
-	"Open_IM/pkg/common/config"
+	"OpenIM/pkg/common/config"
 	"context"
 	"fmt"
 	elasticV7 "github.com/olivere/elastic/v7"

pkg/common/log/file_line_hk.go

@@ -7,7 +7,7 @@
 package log
 
 import (
-	"Open_IM/pkg/utils"
+	"OpenIM/pkg/utils"
 	"github.com/sirupsen/logrus"
 	"runtime"
 	"strings"

pkg/common/log/logrus.go

@@ -1,8 +1,8 @@
 package log
 
 import (
-	"Open_IM/pkg/common/config"
-	"Open_IM/pkg/common/tracelog"
+	"OpenIM/pkg/common/config"
+	"OpenIM/pkg/common/tracelog"
 	"bufio"
 	"context"
 	//"bufio"

pkg/common/middleware/rpc.go

@@ -1,10 +1,10 @@
 package middleware
 
 import (
-	"Open_IM/pkg/common/constant"
-	"Open_IM/pkg/common/log"
-	"Open_IM/pkg/common/tracelog"
-	"Open_IM/pkg/utils"
+	"OpenIM/pkg/common/constant"
+	"OpenIM/pkg/common/log"
+	"OpenIM/pkg/common/tracelog"
+	"OpenIM/pkg/utils"
 	"context"
 	"fmt"
 	"google.golang.org/grpc"

pkg/common/prome/grpc.go

@@ -5,7 +5,7 @@ import (
 	"encoding/json"
 	"time"
 
-	"Open_IM/pkg/common/log"
+	"OpenIM/pkg/common/log"
 
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/peer"

pkg/common/prome/prometheus.go

@@ -1,7 +1,7 @@
 package prome
 
 import (
-	"Open_IM/pkg/common/config"
+	"OpenIM/pkg/common/config"
 	"bytes"
 	"net/http"
 	"strconv"

pkg/common/tokenverify/jwt_token.go

@@ -1,10 +1,10 @@
 package tokenverify
 
 import (
-	"Open_IM/pkg/common/config"
-	"Open_IM/pkg/common/constant"
-	"Open_IM/pkg/common/tracelog"
-	"Open_IM/pkg/utils"
+	"OpenIM/pkg/common/config"
+	"OpenIM/pkg/common/constant"
+	"OpenIM/pkg/common/tracelog"
+	"OpenIM/pkg/utils"
 	"context"
 	"github.com/golang-jwt/jwt/v4"
 	"time"

pkg/common/tracelog/ctx.go

@@ -1,7 +1,7 @@
 package tracelog
 
 import (
-	"Open_IM/pkg/utils"
+	"OpenIM/pkg/utils"
 	"context"
 	"github.com/sirupsen/logrus"
 	"runtime"

pkg/errs/coderr.go

@@ -1,7 +1,7 @@
 package errs
 
 import (
-	"Open_IM/pkg/utils"
+	"OpenIM/pkg/utils"
 	"fmt"
 	"github.com/pkg/errors"
 	"strings"

pkg/proto/auth/auth.pb.go

@@ -1,12 +1,12 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: auth/auth.proto
 
-package pbAuth // import "Open_IM/pkg/proto/auth"
+package pbAuth // import "OpenIM/pkg/proto/auth"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
-import _ "Open_IM/pkg/proto/sdkws"
+import _ "OpenIM/pkg/proto/sdkws"
 
 import (
 	context "golang.org/x/net/context"

pkg/proto/auth/auth.proto

@@ -1,7 +1,7 @@
 syntax = "proto3";
 import "Open-IM-Server/pkg/proto/sdkws/ws.proto";
 package pbAuth;
-option go_package = "Open_IM/pkg/proto/auth;pbAuth";
+option go_package = "OpenIM/pkg/proto/auth;pbAuth";
 
 
 message userTokenReq {

pkg/proto/auto_proto.sh

@@ -11,7 +11,7 @@ echo "proto file generate success"
 
 
 j=0
-for file in $(find ./Open_IM -name   "*.go"); do # Not recommended, will break on whitespace
+for file in $(find ./OpenIM -name   "*.go"); do # Not recommended, will break on whitespace
     filelist[j]=$file
     j=`expr $j + 1`
 done
@@ -19,10 +19,10 @@ done
 
 for ((i = 0; i < ${#filelist[*]}; i++)); do
   proto=${filelist[$i]}
-  cp $proto  ${proto#*./Open_IM/pkg/proto/}
+  cp $proto  ${proto#*./OpenIM/pkg/proto/}
 done
-rm Open_IM -rf
-#find ./ -type f -path "*.pb.go"|xargs sed -i 's/\".\/sdkws\"/\"Open_IM\/pkg\/proto\/sdkws\"/g'
+rm OpenIM -rf
+#find ./ -type f -path "*.pb.go"|xargs sed -i 's/\".\/sdkws\"/\"OpenIM\/pkg\/proto\/sdkws\"/g'
 
 
 

pkg/proto/conversation/conversation.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: conversation/conversation.proto
 
-package conversation // import "Open_IM/pkg/proto/conversation"
+package conversation // import "OpenIM/pkg/proto/conversation"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"

pkg/proto/conversation/conversation.proto

@@ -1,5 +1,5 @@
 syntax = "proto3";
-option go_package = "Open_IM/pkg/proto/conversation;conversation";
+option go_package = "OpenIM/pkg/proto/conversation;conversation";
 package conversation;
 
 message Conversation{

pkg/proto/file/file.proto

@@ -1,5 +1,5 @@
 syntax = "proto3";
-option go_package = "Open_IM/pkg/proto/file;file";
+option go_package = "OpenIM/pkg/proto/file;file";
 package file;
 
 

pkg/proto/friend/friend.pb.go

@@ -1,12 +1,12 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: friend/friend.proto
 
-package friend // import "Open_IM/pkg/proto/friend"
+package friend // import "OpenIM/pkg/proto/friend"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
-import sdkws "Open_IM/pkg/proto/sdkws"
+import sdkws "OpenIM/pkg/proto/sdkws"
 
 import (
 	context "golang.org/x/net/context"

pkg/proto/friend/friend.proto

@@ -1,6 +1,6 @@
 syntax = "proto3";
 import "Open-IM-Server/pkg/proto/sdkws/ws.proto";
-option go_package = "Open_IM/pkg/proto/friend;friend";
+option go_package = "OpenIM/pkg/proto/friend;friend";
 package friend;
 
 message getPaginationFriendsReq{

pkg/proto/group/group.pb.go

@@ -1,12 +1,12 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: group/group.proto
 
-package group // import "Open_IM/pkg/proto/group"
+package group // import "OpenIM/pkg/proto/group"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
-import sdkws "Open_IM/pkg/proto/sdkws"
+import sdkws "OpenIM/pkg/proto/sdkws"
 import wrapperspb "google.golang.org/protobuf/types/known/wrapperspb"
 
 import (

pkg/proto/group/group.proto

@@ -1,7 +1,7 @@
 syntax = "proto3";
 import "Open-IM-Server/pkg/proto/sdkws/ws.proto";
 import "Open-IM-Server/pkg/proto/sdkws/wrappers.proto";
-option go_package = "Open_IM/pkg/proto/group;group";
+option go_package = "OpenIM/pkg/proto/group;group";
 package group;
 
 

pkg/proto/msg/msg.pb.go

@@ -1,12 +1,12 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: msg/msg.proto
 
-package msg // import "Open_IM/pkg/proto/msg"
+package msg // import "OpenIM/pkg/proto/msg"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
-import sdkws "Open_IM/pkg/proto/sdkws"
+import sdkws "OpenIM/pkg/proto/sdkws"
 import wrapperspb "google.golang.org/protobuf/types/known/wrapperspb"
 
 import (

pkg/proto/msg/msg.proto

@@ -1,7 +1,7 @@
 syntax = "proto3";
 import "Open-IM-Server/pkg/proto/sdkws/ws.proto";
 import "Open-IM-Server/pkg/proto/sdkws/wrappers.proto";
-option go_package = "Open_IM/pkg/proto/msg;msg";
+option go_package = "OpenIM/pkg/proto/msg;msg";
 package msg;
 
 message MsgDataToMQ{

pkg/proto/msggateway/relay.pb.go

@@ -1,12 +1,12 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: relay/relay.proto
 
-package pbRelay // import "Open_IM/pkg/proto/relay"
+package pbRelay // import "OpenIM/pkg/proto/relay"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
-import sdkws "Open_IM/pkg/proto/sdkws"
+import sdkws "OpenIM/pkg/proto/sdkws"
 
 import (
 	context "golang.org/x/net/context"

pkg/proto/msggateway/relay.proto

@@ -1,6 +1,6 @@
 syntax = "proto3";
 import "Open-IM-Server/pkg/proto/sdkws/ws.proto";
-option go_package = "Open_IM/pkg/proto/relay;pbRelay";
+option go_package = "OpenIM/pkg/proto/relay;pbRelay";
 package relay;
 
 message OnlinePushMsgReq {

pkg/proto/push/push.pb.go

@@ -1,12 +1,12 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: push/push.proto
 
-package pbPush // import "Open_IM/pkg/proto/push"
+package pbPush // import "OpenIM/pkg/proto/push"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
-import sdkws "Open_IM/pkg/proto/sdkws"
+import sdkws "OpenIM/pkg/proto/sdkws"
 
 import (
 	context "golang.org/x/net/context"

pkg/proto/push/push.proto

@@ -1,6 +1,6 @@
 syntax = "proto3";
 import "Open-IM-Server/pkg/proto/sdkws/ws.proto";
-option go_package = "Open_IM/pkg/proto/push;pbPush";
+option go_package = "OpenIM/pkg/proto/push;pbPush";
 package push;
 
 message PushMsgReq {

pkg/proto/rtc/rtc.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: rtc/rtc.proto
 
-package rtc // import "Open_IM/pkg/proto/rtc"
+package rtc // import "OpenIM/pkg/proto/rtc"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"

pkg/proto/rtc/rtc.proto

@@ -1,5 +1,5 @@
 syntax = "proto3";
-option go_package = "Open_IM/pkg/proto/rtc;rtc";
+option go_package = "OpenIM/pkg/proto/rtc;rtc";
 package proto;
 
 message CommonResp{

pkg/proto/sdk_ws/group.proto

@@ -1,7 +1,7 @@
 syntax = "proto3";
 import "Open-IM-Server/pkg/proto/sdkws/ws.proto";
 import "Open-IM-Server/pkg/proto/sdkws/wrappers.proto";
-option go_package = "Open_IM/pkg/proto/group;group";
+option go_package = "OpenIM/pkg/proto/group;group";
 package group;
 
 

pkg/proto/sdkws/ws.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: sdkws/ws.proto
 
-package sdkws // import "Open_IM/pkg/proto/sdkws"
+package sdkws // import "OpenIM/pkg/proto/sdkws"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"

pkg/proto/sdkws/ws.proto

@@ -1,6 +1,6 @@
 syntax = "proto3";
 import "Open-IM-Server/pkg/proto/sdkws/wrappers.proto";
-option go_package = "Open_IM/pkg/proto/sdkws;sdkws";
+option go_package = "OpenIM/pkg/proto/sdkws;sdkws";
 package sdkws;
 
 

pkg/proto/user/user.pb.go

@@ -1,13 +1,13 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: user/user.proto
 
-package user // import "Open_IM/pkg/proto/user"
+package user // import "OpenIM/pkg/proto/user"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
-import conversation "Open_IM/pkg/proto/conversation"
-import sdkws "Open_IM/pkg/proto/sdkws"
+import conversation "OpenIM/pkg/proto/conversation"
+import sdkws "OpenIM/pkg/proto/sdkws"
 
 import (
 	context "golang.org/x/net/context"

pkg/proto/user/user.proto

@@ -1,7 +1,7 @@
 syntax = "proto3";
 import "Open-IM-Server/pkg/proto/sdkws/ws.proto";
 import "Open-IM-Server/pkg/proto/conversation/conversation.proto";
-option go_package = "Open_IM/pkg/proto/user;user";
+option go_package = "OpenIM/pkg/proto/user;user";
 package user;
 
 

pkg/statistics/statistics.go

@@ -1,7 +1,7 @@
 package statistics
 
 import (
-	"Open_IM/pkg/common/log"
+	"OpenIM/pkg/common/log"
 	"time"
 )
 

pkg/utils/callback.go

@@ -1,8 +1,8 @@
 package utils
 
 import (
-	"Open_IM/pkg/common/constant"
-	sdkws "Open_IM/pkg/proto/sdkws"
+	"OpenIM/pkg/common/constant"
+	sdkws "OpenIM/pkg/proto/sdkws"
 	"github.com/golang/protobuf/proto"
 )
 

pkg/utils/file.go

@@ -1,7 +1,7 @@
 package utils
 
 import (
-	"Open_IM/pkg/common/constant"
+	"OpenIM/pkg/common/constant"
 	"fmt"
 	"math/rand"
 	"os"

pkg/utils/jwt_token_test.go

@@ -1,9 +1,9 @@
 package utils
 
 import (
-	"Open_IM/pkg/common/config"
-	"Open_IM/pkg/common/constant"
-	"Open_IM/pkg/common/tokenverify"
+	"OpenIM/pkg/common/config"
+	"OpenIM/pkg/common/constant"
+	"OpenIM/pkg/common/tokenverify"
 	"testing"
 	"time"
 

pkg/utils/platform_number_id_to_name_test.go

@@ -1,7 +1,7 @@
 package utils
 
 import (
-	"Open_IM/pkg/common/constant"
+	"OpenIM/pkg/common/constant"
 	"testing"
 
 	"github.com/stretchr/testify/assert"

pkg/utils/strings.go

@@ -7,7 +7,7 @@
 package utils
 
 import (
-	"Open_IM/pkg/common/constant"
+	"OpenIM/pkg/common/constant"
 	"encoding/json"
 	"math/rand"
 	"strconv"