refactor: extract nested structures in the config.

pkg/common/config/config.go

@@ -58,37 +58,28 @@ type MYSQL struct {
 	SlowThreshold int      `yaml:"slowThreshold"`
 }
 
-type GlobalConfig struct {
+type Zookeeper struct {
-	Envs struct {
-		Discovery string `yaml:"discovery"`
-	}
-	Zookeeper struct {
 	Schema   string   `yaml:"schema"`
 	ZkAddr   []string `yaml:"address"`
 	Username string   `yaml:"username"`
 	Password string   `yaml:"password"`
-	} `yaml:"zookeeper"`
+}
-
+type Mongo struct {
-	Mysql *MYSQL `yaml:"mysql"`
-
-	Mongo struct {
 	Uri         string   `yaml:"uri"`
 	Address     []string `yaml:"address"`
 	Database    string   `yaml:"database"`
 	Username    string   `yaml:"username"`
 	Password    string   `yaml:"password"`
 	MaxPoolSize int      `yaml:"maxPoolSize"`
-	} `yaml:"mongo"`
+}
-
+type Redis struct {
-	Redis struct {
 	ClusterMode    bool     `yaml:"clusterMode"`
 	Address        []string `yaml:"address"`
 	Username       string   `yaml:"username"`
 	Password       string   `yaml:"password"`
 	EnablePipeline bool     `yaml:"enablePipeline"`
-	} `yaml:"redis"`
+}
-
+type Kafka struct {
-	Kafka struct {
 	Username     string   `yaml:"username"`
 	Password     string   `yaml:"password"`
 	ProducerAck  string   `yaml:"producerAck"`
@@ -116,22 +107,8 @@ type GlobalConfig struct {
 		MsgToMySql string `yaml:"msgToMySql"`
 		MsgToPush  string `yaml:"msgToPush"`
 	} `yaml:"consumerGroupID"`
-	} `yaml:"kafka"`
+}
-
+type Minio struct {
-	Rpc struct {
-		RegisterIP string `yaml:"registerIP"`
-		ListenIP   string `yaml:"listenIP"`
-	} `yaml:"rpc"`
-
-	Api struct {
-		OpenImApiPort []int  `yaml:"openImApiPort"`
-		ListenIP      string `yaml:"listenIP"`
-	} `yaml:"api"`
-
-	Object struct {
-		Enable string `yaml:"enable"`
-		ApiURL string `yaml:"apiURL"`
-		Minio  struct {
 	Bucket          string `yaml:"bucket"`
 	Endpoint        string `yaml:"endpoint"`
 	AccessKeyID     string `yaml:"accessKeyID"`
@@ -139,15 +116,15 @@ type GlobalConfig struct {
 	SessionToken    string `yaml:"sessionToken"`
 	SignEndpoint    string `yaml:"signEndpoint"`
 	PublicRead      bool   `yaml:"publicRead"`
-		} `yaml:"minio"`
+}
-		Cos struct {
+type Cos struct {
 	BucketURL    string `yaml:"bucketURL"`
 	SecretID     string `yaml:"secretID"`
 	SecretKey    string `yaml:"secretKey"`
 	SessionToken string `yaml:"sessionToken"`
 	PublicRead   bool   `yaml:"publicRead"`
-		} `yaml:"cos"`
+}
-		Oss struct {
+type Oss struct {
 	Endpoint        string `yaml:"endpoint"`
 	Bucket          string `yaml:"bucket"`
 	BucketURL       string `yaml:"bucketURL"`
@@ -155,8 +132,8 @@ type GlobalConfig struct {
 	AccessKeySecret string `yaml:"accessKeySecret"`
 	SessionToken    string `yaml:"sessionToken"`
 	PublicRead      bool   `yaml:"publicRead"`
-		} `yaml:"oss"`
+}
-		Kodo struct {
+type Kodo struct {
 	Endpoint        string `yaml:"endpoint"`
 	Bucket          string `yaml:"bucket"`
 	BucketURL       string `yaml:"bucketURL"`
@@ -164,18 +141,29 @@ type GlobalConfig struct {
 	AccessKeySecret string `yaml:"accessKeySecret"`
 	SessionToken    string `yaml:"sessionToken"`
 	PublicRead      bool   `yaml:"publicRead"`
-		} `yaml:"kodo"`
+}
-		Aws struct {
+type Aws struct {
 	Endpoint        string `yaml:"endpoint"`
 	Region          string `yaml:"region"`
 	Bucket          string `yaml:"bucket"`
 	AccessKeyID     string `yaml:"accessKeyID"`
 	AccessKeySecret string `yaml:"accessKeySecret"`
 	PublicRead      bool   `yaml:"publicRead"`
-		} `yaml:"aws"`
+}
-	} `yaml:"object"`
+type Object struct {
-
+	Enable string `yaml:"enable"`
-	RpcPort struct {
+	ApiURL string `yaml:"apiURL"`
+	Minio  Minio  `yaml:"minio"`
+	Cos    Cos    `yaml:"cos"`
+	Oss    Oss    `yaml:"oss"`
+	Kodo   Kodo   `yaml:"kodo"`
+	Aws    Aws    `yaml:"aws"`
+}
+type Api struct {
+	OpenImApiPort []int  `yaml:"openImApiPort"`
+	ListenIP      string `yaml:"listenIP"`
+}
+type RpcPort struct {
 	OpenImUserPort           []int `yaml:"openImUserPort"`
 	OpenImFriendPort         []int `yaml:"openImFriendPort"`
 	OpenImMessagePort        []int `yaml:"openImMessagePort"`
@@ -186,9 +174,16 @@ type GlobalConfig struct {
 	OpenImConversationPort   []int `yaml:"openImConversationPort"`
 	OpenImRtcPort            []int `yaml:"openImRtcPort"`
 	OpenImThirdPort          []int `yaml:"openImThirdPort"`
-	} `yaml:"rpcPort"`
+}
-
+type LongConnSvr struct {
-	RpcRegisterName struct {
+	OpenImMessageGatewayPort []int `yaml:"openImMessageGatewayPort"`
+	OpenImWsPort             []int `yaml:"openImWsPort"`
+	WebsocketMaxConnNum      int   `yaml:"websocketMaxConnNum"`
+	WebsocketMaxMsgLen       int   `yaml:"websocketMaxMsgLen"`
+	WebsocketTimeout         int   `yaml:"websocketTimeout"`
+	WebsocketWriteBufferSize int   `yaml:"websocketWriteBufferSize"`
+}
+type RpcRegisterName struct {
 	OpenImUserName           string `yaml:"openImUserName"`
 	OpenImFriendName         string `yaml:"openImFriendName"`
 	OpenImMsgName            string `yaml:"openImMsgName"`
@@ -198,9 +193,8 @@ type GlobalConfig struct {
 	OpenImAuthName           string `yaml:"openImAuthName"`
 	OpenImConversationName   string `yaml:"openImConversationName"`
 	OpenImThirdName          string `yaml:"openImThirdName"`
-	} `yaml:"rpcRegisterName"`
+}
-
+type Log struct {
-	Log struct {
 	StorageLocation     string `yaml:"storageLocation"`
 	RotationTime        uint   `yaml:"rotationTime"`
 	RemainRotationCount uint   `yaml:"remainRotationCount"`
@@ -208,73 +202,55 @@ type GlobalConfig struct {
 	IsStdout            bool   `yaml:"isStdout"`
 	IsJson              bool   `yaml:"isJson"`
 	WithStack           bool   `yaml:"withStack"`
-	} `yaml:"log"`
+}
-
+type GeTui struct {
-	LongConnSvr struct {
-		OpenImMessageGatewayPort []int `yaml:"openImMessageGatewayPort"`
-		OpenImWsPort             []int `yaml:"openImWsPort"`
-		WebsocketMaxConnNum      int   `yaml:"websocketMaxConnNum"`
-		WebsocketMaxMsgLen       int   `yaml:"websocketMaxMsgLen"`
-		WebsocketTimeout         int   `yaml:"websocketTimeout"`
-		WebsocketWriteBufferSize int   `yaml:"websocketWriteBufferSize"`
-	} `yaml:"longConnSvr"`
-
-	Push struct {
-		MaxConcurrentWorkers int    `yaml:"maxConcurrentWorkers"`
-		Enable               string `yaml:"enable"`
-		GeTui                struct {
 	PushUrl      string `yaml:"pushUrl"`
 	AppKey       string `yaml:"appKey"`
 	Intent       string `yaml:"intent"`
 	MasterSecret string `yaml:"masterSecret"`
 	ChannelID    string `yaml:"channelID"`
 	ChannelName  string `yaml:"channelName"`
-		} `yaml:"geTui"`
+}
-		Fcm struct {
+type Fcm struct {
 	ServiceAccount string `yaml:"serviceAccount"`
-		} `yaml:"fcm"`
+}
-		Jpns struct {
+type Jpns struct {
 	AppKey       string `yaml:"appKey"`
 	MasterSecret string `yaml:"masterSecret"`
 	PushUrl      string `yaml:"pushUrl"`
 	PushIntent   string `yaml:"pushIntent"`
-		} `yaml:"jpns"`
+}
-	}
+type IOSPush struct {
-	Manager struct {
-		UserID   []string `yaml:"userID"`
-		Nickname []string `yaml:"nickname"`
-	} `yaml:"manager"`
-
-	IMAdmin struct {
-		UserID   []string `yaml:"userID"`
-		Nickname []string `yaml:"nickname"`
-	} `yaml:"im-admin"`
-
-	MultiLoginPolicy                  int    `yaml:"multiLoginPolicy"`
-	ChatPersistenceMysql              bool   `yaml:"chatPersistenceMysql"`
-	MsgCacheTimeout                   int    `yaml:"msgCacheTimeout"`
-	GroupMessageHasReadReceiptEnable  bool   `yaml:"groupMessageHasReadReceiptEnable"`
-	SingleMessageHasReadReceiptEnable bool   `yaml:"singleMessageHasReadReceiptEnable"`
-	RetainChatRecords                 int    `yaml:"retainChatRecords"`
-	ChatRecordsClearTime              string `yaml:"chatRecordsClearTime"`
-	MsgDestructTime                   string `yaml:"msgDestructTime"`
-	Secret                            string `yaml:"secret"`
-	EnableCronLocker                  bool   `yaml:"enableCronLocker"`
-	TokenPolicy                       struct {
-		Expire int64 `yaml:"expire"`
-	} `yaml:"tokenPolicy"`
-	MessageVerify struct {
-		FriendVerify *bool `yaml:"friendVerify"`
-	} `yaml:"messageVerify"`
-
-	LocalCache localCache `yaml:"localCache"`
-
-	IOSPush struct {
 	PushSound  string `yaml:"pushSound"`
 	BadgeCount bool   `yaml:"badgeCount"`
 	Production bool   `yaml:"production"`
-	} `yaml:"iosPush"`
+}
-	Callback struct {
+type Push struct {
+	MaxConcurrentWorkers int    `yaml:"maxConcurrentWorkers"`
+	Enable               string `yaml:"enable"`
+	GeTui                GeTui  `yaml:"geTui"`
+	Fcm                  Fcm    `yaml:"fcm"`
+	Jpns                 Jpns   `yaml:"jpns"`
+}
+
+type Prometheus struct {
+	Enable                        bool   `yaml:"enable"`
+	GrafanaUrl                    string `yaml:"grafanaUrl"`
+	ApiPrometheusPort             []int  `yaml:"apiPrometheusPort"`
+	UserPrometheusPort            []int  `yaml:"userPrometheusPort"`
+	FriendPrometheusPort          []int  `yaml:"friendPrometheusPort"`
+	MessagePrometheusPort         []int  `yaml:"messagePrometheusPort"`
+	MessageGatewayPrometheusPort  []int  `yaml:"messageGatewayPrometheusPort"`
+	GroupPrometheusPort           []int  `yaml:"groupPrometheusPort"`
+	AuthPrometheusPort            []int  `yaml:"authPrometheusPort"`
+	PushPrometheusPort            []int  `yaml:"pushPrometheusPort"`
+	ConversationPrometheusPort    []int  `yaml:"conversationPrometheusPort"`
+	RtcPrometheusPort             []int  `yaml:"rtcPrometheusPort"`
+	MessageTransferPrometheusPort []int  `yaml:"messageTransferPrometheusPort"`
+	ThirdPrometheusPort           []int  `yaml:"thirdPrometheusPort"`
+}
+
+type Callback struct {
 	CallbackUrl                        string         `yaml:"url"`
 	CallbackBeforeSendSingleMsg        CallBackConfig `yaml:"beforeSendSingleMsg"`
 	CallbackAfterSendSingleMsg         CallBackConfig `yaml:"afterSendSingleMsg"`
@@ -321,24 +297,72 @@ type GlobalConfig struct {
 	CallbackBeforeImportFriends CallBackConfig `yaml:"importFriendsBefore"`
 	CallbackAfterImportFriends  CallBackConfig `yaml:"importFriendsAfter"`
 	CallbackAfterRemoveBlack    CallBackConfig `yaml:"removeBlackAfter"`
-	} `yaml:"callback"`
+}
 
-	Prometheus struct {
+type GlobalConfig struct {
-		Enable                        bool   `yaml:"enable"`
+	Envs struct {
-		GrafanaUrl                    string `yaml:"grafanaUrl"`
+		Discovery string `yaml:"discovery"`
-		ApiPrometheusPort             []int  `yaml:"apiPrometheusPort"`
+	}
-		UserPrometheusPort            []int  `yaml:"userPrometheusPort"`
+	Zookeeper Zookeeper `yaml:"zookeeper"`
-		FriendPrometheusPort          []int  `yaml:"friendPrometheusPort"`
+
-		MessagePrometheusPort         []int  `yaml:"messagePrometheusPort"`
+	Mysql *MYSQL `yaml:"mysql"`
-		MessageGatewayPrometheusPort  []int  `yaml:"messageGatewayPrometheusPort"`
+
-		GroupPrometheusPort           []int  `yaml:"groupPrometheusPort"`
+	Mongo Mongo `yaml:"mongo"`
-		AuthPrometheusPort            []int  `yaml:"authPrometheusPort"`
+
-		PushPrometheusPort            []int  `yaml:"pushPrometheusPort"`
+	Redis Redis `yaml:"redis"`
-		ConversationPrometheusPort    []int  `yaml:"conversationPrometheusPort"`
+
-		RtcPrometheusPort             []int  `yaml:"rtcPrometheusPort"`
+	Kafka Kafka `yaml:"kafka"`
-		MessageTransferPrometheusPort []int  `yaml:"messageTransferPrometheusPort"`
+
-		ThirdPrometheusPort           []int  `yaml:"thirdPrometheusPort"`
+	Rpc struct {
-	} `yaml:"prometheus"`
+		RegisterIP string `yaml:"registerIP"`
+		ListenIP   string `yaml:"listenIP"`
+	} `yaml:"rpc"`
+
+	Api Api `yaml:"api"`
+
+	Object Object `yaml:"object"`
+
+	RpcPort RpcPort `yaml:"rpcPort"`
+
+	RpcRegisterName RpcRegisterName `yaml:"rpcRegisterName"`
+
+	Log Log `yaml:"log"`
+
+	LongConnSvr LongConnSvr `yaml:"longConnSvr"`
+
+	Push    Push `yaml:"push"`
+	Manager struct {
+		UserID   []string `yaml:"userID"`
+		Nickname []string `yaml:"nickname"`
+	} `yaml:"manager"`
+
+	IMAdmin struct {
+		UserID   []string `yaml:"userID"`
+		Nickname []string `yaml:"nickname"`
+	} `yaml:"im-admin"`
+
+	MultiLoginPolicy                  int    `yaml:"multiLoginPolicy"`
+	MsgCacheTimeout                   int    `yaml:"msgCacheTimeout"`
+	GroupMessageHasReadReceiptEnable  bool   `yaml:"groupMessageHasReadReceiptEnable"`
+	SingleMessageHasReadReceiptEnable bool   `yaml:"singleMessageHasReadReceiptEnable"`
+	RetainChatRecords                 int    `yaml:"retainChatRecords"`
+	ChatRecordsClearTime              string `yaml:"chatRecordsClearTime"`
+	MsgDestructTime                   string `yaml:"msgDestructTime"`
+	Secret                            string `yaml:"secret"`
+	EnableCronLocker                  bool   `yaml:"enableCronLocker"`
+	TokenPolicy                       struct {
+		Expire int64 `yaml:"expire"`
+	} `yaml:"tokenPolicy"`
+	MessageVerify struct {
+		FriendVerify *bool `yaml:"friendVerify"`
+	} `yaml:"messageVerify"`
+
+	LocalCache localCache `yaml:"localCache"`
+
+	IOSPush  IOSPush  `yaml:"iosPush"`
+	Callback Callback `yaml:"callback"`
+
+	Prometheus   Prometheus   `yaml:"prometheus"`
 	Notification notification `yaml:"notification"`
 }