From b0e78f0fe77e84148495fd2841b5e74272ae004a Mon Sep 17 00:00:00 2001 From: Gordon <46924906+FGadvancer@users.noreply.github.com> Date: Wed, 10 Apr 2024 12:11:34 +0800 Subject: [PATCH 1/2] refactor: all module update. --- internal/rpc/msg/delete.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/rpc/msg/delete.go b/internal/rpc/msg/delete.go index 8f6773c8b..708696e70 100644 --- a/internal/rpc/msg/delete.go +++ b/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 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 2/2] 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) {