Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode

config/config.yaml

@@ -209,8 +209,8 @@ push:
 manager:
   #app管理员userID和对应的secret  建议修改。 用于管理后台登录，也可以用户管理后台对应的api
   appManagerUid: [ "openIM123456","openIM654321", "openIM333", "openIMAdmin"]
-  secrets: [ "openIM1","openIM2", "openIM333", "openIMAdmin"]
+  nickname: [ "系统通知","openIM654321", "openIM333", "openIMAdmin" ]
-  appSysNotificationName: "系统通知"
+
 
 secret: tuoyun
 # 多端互踢策略

pkg/common/config/config.go

@@ -224,7 +224,6 @@ type config struct {
 	}
 	Manager struct {
 		AppManagerUid []string `yaml:"appManagerUid"`
-		//	AppSysNotificationName string   `yaml:"appSysNotificationName"`
 		Nickname      []string `yaml:"nickname"`
 	}