blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-11-05 11:52:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: all module update.

Browse Source
This commit is contained in:
Gordon 2024-04-10 12:14:05 +08:00
parent 2ac461d6a7
commit 82f3738c22
3 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/common/cmd/api.go
View File

@ -25,18 +25,18 @@ import (
type ApiCmd struct { type ApiCmd struct {
*RootCmd *RootCmd
ctx context.Context ctx context.Context
configMap map[string]StructEnvPrefix configMap map[string]any
apiConfig api.Config apiConfig api.Config
} }
func NewApiCmd() *ApiCmd { func NewApiCmd() *ApiCmd {
var apiConfig api.Config var apiConfig api.Config
ret := &ApiCmd{apiConfig: apiConfig} ret := &ApiCmd{apiConfig: apiConfig}
ret.configMap = map[string]StructEnvPrefix{ ret.configMap = map[string]any{
OpenIMAPICfgFileName: {EnvPrefix: apiEnvPrefix, ConfigStruct: &apiConfig.RpcConfig}, OpenIMAPICfgFileName: &apiConfig.RpcConfig,
RedisConfigFileName: {EnvPrefix: redisEnvPrefix, ConfigStruct: &apiConfig.RedisConfig}, RedisConfigFileName: &apiConfig.RedisConfig,
ZookeeperConfigFileName: {EnvPrefix: zoopkeeperEnvPrefix, ConfigStruct: &apiConfig.ZookeeperConfig}, ZookeeperConfigFileName: &apiConfig.ZookeeperConfig,
ShareFileName: {EnvPrefix: shareEnvPrefix, ConfigStruct: &apiConfig.Share}, ShareFileName: &apiConfig.Share,
} }
ret.RootCmd = NewRootCmd(program.GetProcessName(), WithConfigMap(ret.configMap)) ret.RootCmd = NewRootCmd(program.GetProcessName(), WithConfigMap(ret.configMap))
ret.ctx = context.WithValue(context.Background(), "version", config.Version) ret.ctx = context.WithValue(context.Background(), "version", config.Version)

16
pkg/common/cmd/cron_task.go
View File

@ -25,20 +25,20 @@ import (
type CronTaskCmd struct { type CronTaskCmd struct {
*RootCmd *RootCmd
ctx context.Context ctx context.Context
configMap map[string]StructEnvPrefix configMap map[string]any
cronTaskConfig tools.CronTaskConfig cronTaskConfig tools.CronTaskConfig
} }
func NewCronTaskCmd() *CronTaskCmd { func NewCronTaskCmd() *CronTaskCmd {
var cronTaskConfig tools.CronTaskConfig var cronTaskConfig tools.CronTaskConfig
ret := &CronTaskCmd{cronTaskConfig: cronTaskConfig} ret := &CronTaskCmd{cronTaskConfig: cronTaskConfig}
ret.configMap = map[string]StructEnvPrefix{ ret.configMap = map[string]any{
OpenIMCronTaskCfgFileName: {EnvPrefix: cornTaskEnvPrefix, ConfigStruct: &cronTaskConfig.CronTask}, OpenIMCronTaskCfgFileName: &cronTaskConfig.CronTask,
RedisConfigFileName: {EnvPrefix: redisEnvPrefix, ConfigStruct: &cronTaskConfig.RedisConfig}, RedisConfigFileName: &cronTaskConfig.RedisConfig,
MongodbConfigFileName: {EnvPrefix: mongodbEnvPrefix, ConfigStruct: &cronTaskConfig.MongodbConfig}, MongodbConfigFileName: &cronTaskConfig.MongodbConfig,
ZookeeperConfigFileName: {EnvPrefix: zoopkeeperEnvPrefix, ConfigStruct: &cronTaskConfig.ZookeeperConfig}, ZookeeperConfigFileName: &cronTaskConfig.ZookeeperConfig,
ShareFileName: {EnvPrefix: shareEnvPrefix, ConfigStruct: &cronTaskConfig.Share}, ShareFileName: &cronTaskConfig.Share,
KafkaConfigFileName: {EnvPrefix: kafkaEnvPrefix, ConfigStruct: &cronTaskConfig.KafkaConfig}, KafkaConfigFileName: &cronTaskConfig.KafkaConfig,
} }
ret.RootCmd = NewRootCmd(program.GetProcessName(), WithConfigMap(ret.configMap)) ret.RootCmd = NewRootCmd(program.GetProcessName(), WithConfigMap(ret.configMap))
ret.ctx = context.WithValue(context.Background(), "version", config.Version) ret.ctx = context.WithValue(context.Background(), "version", config.Version)

3
pkg/common/cmd/root.go
View File

@ -45,9 +45,6 @@ type CmdOpts struct {
loggerPrefixName string loggerPrefixName string
configMap map[string]any configMap map[string]any
} }
type StructEnvPrefix struct {
EnvPrefix string
}
func WithCronTaskLogName() func(*CmdOpts) { func WithCronTaskLogName() func(*CmdOpts) {
return func(opts *CmdOpts) { return func(opts *CmdOpts) {