Merge remote-tracking branch 'origin/3.6.1-code-conventions' into 3.6.1-code-conventions

internal/rpc/msg/delete.go

@@ -42,7 +42,7 @@ func (m *msgServer) validateDeleteSyncOpt(opt *msg.DeleteSyncOpt) (isSyncSelf, i
 }
 
 func (m *msgServer) ClearConversationsMsg(ctx context.Context, req *msg.ClearConversationsMsgReq) (*msg.ClearConversationsMsgResp, error) {
-	if err := authverify.CheckAccessV3(ctx, req.UserID, &m.config.Manager, &m.config.IMAdmin); err != nil {
+	if err := authverify.CheckAccessV3(ctx, req.UserID, &m.config.Share.IMAdmin); err != nil {
 		return nil, err
 	}
 	if err := m.clearConversation(ctx, req.ConversationIDs, req.UserID, req.DeleteSyncOpt); err != nil {
@@ -52,7 +52,7 @@ func (m *msgServer) ClearConversationsMsg(ctx context.Context, req *msg.ClearCon
 }
 
 func (m *msgServer) UserClearAllMsg(ctx context.Context, req *msg.UserClearAllMsgReq) (*msg.UserClearAllMsgResp, error) {
-	if err := authverify.CheckAccessV3(ctx, req.UserID, &m.config.Manager, &m.config.IMAdmin); err != nil {
+	if err := authverify.CheckAccessV3(ctx, req.UserID, &m.config.Share.IMAdmin); err != nil {
 		return nil, err
 	}
 	conversationIDs, err := m.ConversationLocalCache.GetConversationIDs(ctx, req.UserID)
@@ -66,7 +66,7 @@ func (m *msgServer) UserClearAllMsg(ctx context.Context, req *msg.UserClearAllMs
 }
 
 func (m *msgServer) DeleteMsgs(ctx context.Context, req *msg.DeleteMsgsReq) (*msg.DeleteMsgsResp, error) {
-	if err := authverify.CheckAccessV3(ctx, req.UserID, &m.config.Manager, &m.config.IMAdmin); err != nil {
+	if err := authverify.CheckAccessV3(ctx, req.UserID, &m.config.Share.IMAdmin); err != nil {
 		return nil, err
 	}
 	isSyncSelf, isSyncOther := m.validateDeleteSyncOpt(req.DeleteSyncOpt)
@@ -108,7 +108,7 @@ func (m *msgServer) DeleteMsgPhysicalBySeq(ctx context.Context, req *msg.DeleteM
 }
 
 func (m *msgServer) DeleteMsgPhysical(ctx context.Context, req *msg.DeleteMsgPhysicalReq) (*msg.DeleteMsgPhysicalResp, error) {
-	if err := authverify.CheckAdmin(ctx, &m.config.Manager, &m.config.IMAdmin); err != nil {
+	if err := authverify.CheckAdmin(ctx, &m.config.Share.IMAdmin); err != nil {
 		return nil, err
 	}
 	remainTime := timeutil.GetCurrentTimestampBySecond() - req.Timestamp

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)

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)

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) {