From 82f3738c222f69b07ed49c76697f2d774d3f2bb0 Mon Sep 17 00:00:00 2001 From: Gordon <46924906+FGadvancer@users.noreply.github.com> Date: Wed, 10 Apr 2024 12:14:05 +0800 Subject: [PATCH] refactor: all module update. --- pkg/common/cmd/api.go | 12 ++++++------ pkg/common/cmd/cron_task.go | 16 ++++++++-------- pkg/common/cmd/root.go | 3 --- 3 files changed, 14 insertions(+), 17 deletions(-) diff --git a/pkg/common/cmd/api.go b/pkg/common/cmd/api.go index e25758c59..96bc35d27 100644 --- a/pkg/common/cmd/api.go +++ b/pkg/common/cmd/api.go @@ -25,18 +25,18 @@ import ( type ApiCmd struct { *RootCmd ctx context.Context - configMap map[string]StructEnvPrefix + configMap map[string]any apiConfig api.Config } func NewApiCmd() *ApiCmd { var apiConfig api.Config ret := &ApiCmd{apiConfig: apiConfig} - ret.configMap = map[string]StructEnvPrefix{ - OpenIMAPICfgFileName: {EnvPrefix: apiEnvPrefix, ConfigStruct: &apiConfig.RpcConfig}, - RedisConfigFileName: {EnvPrefix: redisEnvPrefix, ConfigStruct: &apiConfig.RedisConfig}, - ZookeeperConfigFileName: {EnvPrefix: zoopkeeperEnvPrefix, ConfigStruct: &apiConfig.ZookeeperConfig}, - ShareFileName: {EnvPrefix: shareEnvPrefix, ConfigStruct: &apiConfig.Share}, + ret.configMap = map[string]any{ + OpenIMAPICfgFileName: &apiConfig.RpcConfig, + RedisConfigFileName: &apiConfig.RedisConfig, + ZookeeperConfigFileName: &apiConfig.ZookeeperConfig, + ShareFileName: &apiConfig.Share, } ret.RootCmd = NewRootCmd(program.GetProcessName(), WithConfigMap(ret.configMap)) ret.ctx = context.WithValue(context.Background(), "version", config.Version) diff --git a/pkg/common/cmd/cron_task.go b/pkg/common/cmd/cron_task.go index 185e60f7e..3c2aeef7b 100644 --- a/pkg/common/cmd/cron_task.go +++ b/pkg/common/cmd/cron_task.go @@ -25,20 +25,20 @@ import ( type CronTaskCmd struct { *RootCmd ctx context.Context - configMap map[string]StructEnvPrefix + configMap map[string]any cronTaskConfig tools.CronTaskConfig } func NewCronTaskCmd() *CronTaskCmd { var cronTaskConfig tools.CronTaskConfig ret := &CronTaskCmd{cronTaskConfig: cronTaskConfig} - ret.configMap = map[string]StructEnvPrefix{ - OpenIMCronTaskCfgFileName: {EnvPrefix: cornTaskEnvPrefix, ConfigStruct: &cronTaskConfig.CronTask}, - RedisConfigFileName: {EnvPrefix: redisEnvPrefix, ConfigStruct: &cronTaskConfig.RedisConfig}, - MongodbConfigFileName: {EnvPrefix: mongodbEnvPrefix, ConfigStruct: &cronTaskConfig.MongodbConfig}, - ZookeeperConfigFileName: {EnvPrefix: zoopkeeperEnvPrefix, ConfigStruct: &cronTaskConfig.ZookeeperConfig}, - ShareFileName: {EnvPrefix: shareEnvPrefix, ConfigStruct: &cronTaskConfig.Share}, - KafkaConfigFileName: {EnvPrefix: kafkaEnvPrefix, ConfigStruct: &cronTaskConfig.KafkaConfig}, + ret.configMap = map[string]any{ + OpenIMCronTaskCfgFileName: &cronTaskConfig.CronTask, + RedisConfigFileName: &cronTaskConfig.RedisConfig, + MongodbConfigFileName: &cronTaskConfig.MongodbConfig, + ZookeeperConfigFileName: &cronTaskConfig.ZookeeperConfig, + ShareFileName: &cronTaskConfig.Share, + KafkaConfigFileName: &cronTaskConfig.KafkaConfig, } ret.RootCmd = NewRootCmd(program.GetProcessName(), WithConfigMap(ret.configMap)) ret.ctx = context.WithValue(context.Background(), "version", config.Version) diff --git a/pkg/common/cmd/root.go b/pkg/common/cmd/root.go index e9ca944c9..3792cb95f 100644 --- a/pkg/common/cmd/root.go +++ b/pkg/common/cmd/root.go @@ -45,9 +45,6 @@ type CmdOpts struct { loggerPrefixName string configMap map[string]any } -type StructEnvPrefix struct { - EnvPrefix string -} func WithCronTaskLogName() func(*CmdOpts) { return func(opts *CmdOpts) {