Merge ca240c6a869025ffe2ac8e09fd64d38c31710026 into d156e1e5199cbc923a919ef422a589c9ca73b385

.env

@@ -2,7 +2,7 @@ MONGO_IMAGE=mongo:7.0
 REDIS_IMAGE=redis:7.0.0
 KAFKA_IMAGE=bitnami/kafka:3.5.1
 MINIO_IMAGE=minio/minio:RELEASE.2024-01-11T07-46-16Z
-ETCD_IMAGE=bitnami/etcd:3.5.13
+ETCD_IMAGE=quay.io/coreos/etcd:v3.5.13
 PROMETHEUS_IMAGE=prom/prometheus:v2.45.6
 ALERTMANAGER_IMAGE=prom/alertmanager:v0.27.0
 GRAFANA_IMAGE=grafana/grafana:11.0.1

.github/workflows/merge-from-milestone.yml

@@ -155,27 +155,11 @@ jobs:
                   '{title: $title, head: $head, base: $base, body: $body}')")
 
               new_pr_number=$(echo "$response" | jq -r '.number')
+              echo "Created PR #$new_pr_number"
 
-              if [[ "$new_pr_number" == "null" || -z "$new_pr_number" ]]; then
-                echo "Failed to create PR. Response: $response"
-              
-                git checkout $TARGET_BRANCH
-
-                git branch -D $cherry_pick_branch
-                
-                echo "Deleted branch: $cherry_pick_branch"
-                git push origin --delete $cherry_pick_branch
-              else
-                echo "Created PR #$new_pr_number"
-
-                curl -s -X POST -H "Authorization: token $GITHUB_TOKEN" \
+              curl -s -X POST -H "Authorization: token $GITHUB_TOKEN" \
                 -H "Accept: application/vnd.github+json" \
                 -d '{"labels": ["milestone-merge"]}' \
                 "https://api.github.com/repos/${{ github.repository }}/issues/$new_pr_number/labels"
-              fi
-
-              echo ""
-              echo "----------------------------------------"
-              echo ""
             fi
           done

config/discovery.yml

@@ -1,11 +1,9 @@
 enable: etcd
 etcd:
   rootDirectory: openim
-  address: [localhost:12379]
-  ## Attention: If you set auth in etcd
-  ## you must also update the username and password in Chat project.
-  username:
-  password:
+  address: [ localhost:12379 ]
+  username: ''
+  password: ''
 
 kubernetes:
   namespace: default
@@ -19,4 +17,4 @@ rpcService:
   group: group-rpc-service
   auth: auth-rpc-service
   conversation: conversation-rpc-service
-  third: third-rpc-service
+  third: third-rpc-service

config/kafka.yml

@@ -1,13 +1,13 @@
-## Kafka authentication
-username:
-password:
-
+# Username for authentication
+username: ''
+# Password for authentication
+password: ''
 # Producer acknowledgment settings
-producerAck:
+producerAck: 
 # Compression type to use (e.g., none, gzip, snappy)
 compressType: none
 # List of Kafka broker addresses
-address: [localhost:19094]
+address: [ localhost:19094 ]
 # Kafka topic for Redis integration
 toRedisTopic: toRedis
 # Kafka topic for MongoDB integration
@@ -29,12 +29,12 @@ tls:
   # Enable or disable TLS
   enableTLS: false
   # CA certificate file path
-  caCrt:
+  caCrt: 
   # Client certificate file path
-  clientCrt:
+  clientCrt: 
   # Client key file path
-  clientKey:
+  clientKey: 
   # Client key password
-  clientKeyPwd:
+  clientKeyPwd: 
   # Whether to skip TLS verification (not recommended for production)
   insecureSkipVerify: false

config/redis.yml

@@ -1,14 +1,7 @@
-address: [localhost:16379]
-username:
+address: [ localhost:16379 ]
+username: 
 password: openIM123
-# redis Mode, including "standalone","cluster","sentinel"
-redisMode: "standalone"
+clusterMode: false
 db: 0
 maxRetry: 10
 poolSize: 100
-# Sentinel configuration (only used when redisMode is "sentinel")
-sentinelMode:
-  masterName: "redis-master"
-  sentinelsAddrs: ["127.0.0.1:26379", "127.0.0.1:26380", "127.0.0.1:26381"]
-  routeByLatency: true
-  routeRandomly: true

config/share.yml

@@ -1,13 +1,6 @@
 secret: openIM123
 
-# imAdminUser: Configuration for instant messaging system administrators
-imAdminUser:
-  # userIDs: List of administrator user IDs.
-  # Each entry here corresponds by index to the matching entry in the nicknames list below.
-  userIDs: [imAdmin]
-  # nicknames: List of administrator display names.
-  # Each entry here corresponds by index to the matching entry in the userIDs list above.
-  nicknames: [superAdmin]
+imAdminUserID: [imAdmin]
 
 # 1: For Android, iOS, Windows, Mac, and web platforms, only one instance can be online at a time
 multiLogin:

config/webhooks.yml

@@ -16,7 +16,7 @@ afterUpdateUserInfoEx:
 afterSendSingleMsg:
   enable: false
   timeout: 5
-  # Only the recvIDs specified in attentionIds will send the callback
+  # Only the recvID specified in attentionIds will send the callback
   # if not set, all user messages will be callback
   attentionIds: []
   # See beforeSendSingleMsg comment.
@@ -36,7 +36,7 @@ beforeMsgModify:
 afterSendGroupMsg:
   enable: false
   timeout: 5
-  # Only the GroupIDs specified in attentionIds will send the callback
+  # Only the recvID specified in attentionIds will send the callback
   # if not set, all user messages will be callback
   attentionIds: []
   # See beforeSendSingleMsg comment.

docker-compose.yml

@@ -83,83 +83,8 @@ services:
       - ETCD_INITIAL_CLUSTER=s1=http://0.0.0.0:2380
       - ETCD_INITIAL_CLUSTER_TOKEN=tkn
       - ETCD_INITIAL_CLUSTER_STATE=new
-      - ALLOW_NONE_AUTHENTICATION=no
-
-      ## Optional: Enable etcd authentication by setting the following credentials
-      # - ETCD_ROOT_USER=root
-      # - ETCD_ROOT_PASSWORD=openIM123
-      # - ETCD_USERNAME=openIM
-      # - ETCD_PASSWORD=openIM123
     volumes:
       - "${DATA_DIR}/components/etcd:/etcd-data"
-    command: >
-      /bin/sh -c '
-        etcd &
-        export ETCDCTL_API=3
-        echo "Waiting for etcd to become healthy..."
-        until etcdctl --endpoints=http://127.0.0.1:2379 endpoint health &>/dev/null; do
-          echo "Waiting for ETCD to start..."
-          sleep 1
-        done
-
-        echo "etcd is healthy."
-
-        if [ -n "$${ETCD_ROOT_USER}" ] && [ -n "$${ETCD_ROOT_PASSWORD}" ] && [ -n "$${ETCD_USERNAME}" ] && [ -n "$${ETCD_PASSWORD}" ]; then
-          echo "Authentication credentials provided. Setting up authentication..."
-
-        echo "Checking authentication status..."
-        if ! etcdctl --endpoints=http://127.0.0.1:2379 auth status | grep -q "Authentication Status: true"; then
-          echo "Authentication is disabled. Creating users and enabling..."
-          
-          # Create users and setup permissions
-          etcdctl --endpoints=http://127.0.0.1:2379 user add $${ETCD_ROOT_USER} --new-user-password=$${ETCD_ROOT_PASSWORD} || true
-          etcdctl --endpoints=http://127.0.0.1:2379 user add $${ETCD_USERNAME} --new-user-password=$${ETCD_PASSWORD} || true
-          
-          etcdctl --endpoints=http://127.0.0.1:2379 role add openim-role || true
-          etcdctl --endpoints=http://127.0.0.1:2379 role grant-permission openim-role --prefix=true readwrite / || true
-          etcdctl --endpoints=http://127.0.0.1:2379 role grant-permission openim-role --prefix=true readwrite "" || true
-          etcdctl --endpoints=http://127.0.0.1:2379 user grant-role $${ETCD_USERNAME} openim-role || true
-          
-          etcdctl --endpoints=http://127.0.0.1:2379 user grant-role $${ETCD_ROOT_USER} $${ETCD_USERNAME} root || true
-          
-          echo "Enabling authentication..."
-          etcdctl --endpoints=http://127.0.0.1:2379 auth enable
-          echo "Authentication enabled successfully"
-        else
-          echo "Authentication is already enabled. Checking OpenIM user..."
-          
-          # Check if openIM user exists and can perform operations
-          if ! etcdctl --endpoints=http://127.0.0.1:2379 --user=$${ETCD_USERNAME}:$${ETCD_PASSWORD} put /test/auth "auth-check" &>/dev/null; then
-            echo "OpenIM user test failed. Recreating user with root credentials..."
-            
-            # Try to create/update the openIM user using root credentials
-            etcdctl --endpoints=http://127.0.0.1:2379 --user=$${ETCD_ROOT_USER}:$${ETCD_ROOT_PASSWORD} user add $${ETCD_USERNAME} --new-user-password=$${ETCD_PASSWORD} --no-password-file || true
-            etcdctl --endpoints=http://127.0.0.1:2379 --user=$${ETCD_ROOT_USER}:$${ETCD_ROOT_PASSWORD} role add openim-role || true
-            etcdctl --endpoints=http://127.0.0.1:2379 --user=$${ETCD_ROOT_USER}:$${ETCD_ROOT_PASSWORD} role grant-permission openim-role --prefix=true readwrite / || true
-            etcdctl --endpoints=http://127.0.0.1:2379 --user=$${ETCD_ROOT_USER}:$${ETCD_ROOT_PASSWORD} role grant-permission openim-role --prefix=true readwrite "" || true
-            etcdctl --endpoints=http://127.0.0.1:2379 --user=$${ETCD_ROOT_USER}:$${ETCD_ROOT_PASSWORD} user grant-role $${ETCD_USERNAME} openim-role || true
-            etcdctl --endpoints=http://127.0.0.1:2379 user grant-role $${ETCD_ROOT_USER} $${ETCD_USERNAME} root || true
-            
-            echo "OpenIM user recreated with required permissions"
-          else
-            echo "OpenIM user exists and has correct permissions"
-            etcdctl --endpoints=http://127.0.0.1:2379 --user=$${ETCD_USERNAME}:$${ETCD_PASSWORD} del /test/auth &>/dev/null
-          fi
-        fi
-        echo "Testing authentication with OpenIM user..."
-        if etcdctl --endpoints=http://127.0.0.1:2379 --user=$${ETCD_USERNAME}:$${ETCD_PASSWORD} put /test/auth "auth-works"; then
-          echo "Authentication working properly"
-          etcdctl --endpoints=http://127.0.0.1:2379 --user=$${ETCD_USERNAME}:$${ETCD_PASSWORD} del /test/auth
-        else
-          echo "WARNING: Authentication test failed"
-          fi
-        else
-          echo "No authentication credentials provided. Running in no-auth mode."
-          echo "To enable authentication, set ETCD_ROOT_USER, ETCD_ROOT_PASSWORD, ETCD_USERNAME, and ETCD_PASSWORD environment variables."
-        fi
-        
-        tail -f /dev/null
-      '
     restart: always
     networks:
       - openim
@@ -179,38 +104,12 @@ services:
       KAFKA_CFG_NODE_ID: 0
       KAFKA_CFG_PROCESS_ROLES: controller,broker
       KAFKA_CFG_CONTROLLER_QUORUM_VOTERS: 0@kafka:9093
+      KAFKA_CFG_LISTENERS: PLAINTEXT://:9092,CONTROLLER://:9093,EXTERNAL://:9094
+      KAFKA_CFG_ADVERTISED_LISTENERS: PLAINTEXT://kafka:9092,EXTERNAL://localhost:19094
+      KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP: CONTROLLER:PLAINTEXT,EXTERNAL:PLAINTEXT,PLAINTEXT:PLAINTEXT
       KAFKA_CFG_CONTROLLER_LISTENER_NAMES: CONTROLLER
       KAFKA_NUM_PARTITIONS: 8
       KAFKA_CFG_AUTO_CREATE_TOPICS_ENABLE: "true"
-
-      KAFKA_CFG_LISTENERS: "PLAINTEXT://:9092,CONTROLLER://:9093,EXTERNAL://:9094"
-      KAFKA_CFG_ADVERTISED_LISTENERS: "PLAINTEXT://kafka:9092,EXTERNAL://localhost:19094"
-      KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP: "CONTROLLER:PLAINTEXT,EXTERNAL:PLAINTEXT,PLAINTEXT:PLAINTEXT"
-      KAFKA_CFG_INTER_BROKER_LISTENER_NAME: "PLAINTEXT"
-
-      # Authentication configuration variables - comment out to disable auth
-      # KAFKA_USERNAME: "openIM"
-      # KAFKA_PASSWORD: "openIM123"
-    command: >
-      /bin/sh -c '
-        if [ -n "$${KAFKA_USERNAME}" ] && [ -n "$${KAFKA_PASSWORD}" ]; then
-          echo "=== Kafka SASL Authentication ENABLED ==="
-          echo "Username: $${KAFKA_USERNAME}"
-          
-          # Set environment variables for SASL authentication
-          export KAFKA_CFG_LISTENERS="SASL_PLAINTEXT://:9092,CONTROLLER://:9093,EXTERNAL://:9094"
-          export KAFKA_CFG_ADVERTISED_LISTENERS="SASL_PLAINTEXT://kafka:9092,EXTERNAL://localhost:19094"
-          export KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP="CONTROLLER:PLAINTEXT,EXTERNAL:SASL_PLAINTEXT,SASL_PLAINTEXT:SASL_PLAINTEXT"
-          export KAFKA_CFG_SASL_ENABLED_MECHANISMS="PLAIN"
-          export KAFKA_CFG_SASL_MECHANISM_INTER_BROKER_PROTOCOL="PLAIN"
-          export KAFKA_CFG_INTER_BROKER_LISTENER_NAME="SASL_PLAINTEXT"
-          export KAFKA_CLIENT_USERS="$${KAFKA_USERNAME}"
-          export KAFKA_CLIENT_PASSWORDS="$${KAFKA_PASSWORD}"
-        fi
-        
-        # Start Kafka with the configured environment
-        exec /opt/bitnami/scripts/kafka/entrypoint.sh /opt/bitnami/scripts/kafka/run.sh
-      '
     networks:
       - openim
 
@@ -249,7 +148,7 @@ services:
       - "11002:80"
     networks:
       - openim
-
+      
   prometheus:
     image: ${PROMETHEUS_IMAGE}
     container_name: prometheus
@@ -262,9 +161,9 @@ services:
       - ./config/instance-down-rules.yml:/etc/prometheus/instance-down-rules.yml
       - ${DATA_DIR}/components/prometheus/data:/prometheus
     command:
-      - "--config.file=/etc/prometheus/prometheus.yml"
-      - "--storage.tsdb.path=/prometheus"
-      - "--web.listen-address=:${PROMETHEUS_PORT}"
+      - '--config.file=/etc/prometheus/prometheus.yml'
+      - '--storage.tsdb.path=/prometheus'
+      - '--web.listen-address=:${PROMETHEUS_PORT}'
     network_mode: host
 
   alertmanager:
@@ -277,8 +176,8 @@ services:
       - ./config/alertmanager.yml:/etc/alertmanager/alertmanager.yml
       - ./config/email.tmpl:/etc/alertmanager/email.tmpl
     command:
-      - "--config.file=/etc/alertmanager/alertmanager.yml"
-      - "--web.listen-address=:${ALERTMANAGER_PORT}"
+      - '--config.file=/etc/alertmanager/alertmanager.yml'
+      - '--web.listen-address=:${ALERTMANAGER_PORT}'
     network_mode: host
 
   grafana:
@@ -310,8 +209,9 @@ services:
       - /sys:/host/sys:ro
       - /:/rootfs:ro
     command:
-      - "--path.procfs=/host/proc"
-      - "--path.sysfs=/host/sys"
-      - "--path.rootfs=/rootfs"
-      - "--web.listen-address=:19100"
+      - '--path.procfs=/host/proc'
+      - '--path.sysfs=/host/sys'
+      - '--path.rootfs=/rootfs'
+      - '--web.listen-address=:19100'
     network_mode: host
+

go.mod

@@ -13,7 +13,7 @@ require (
 	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
 	github.com/mitchellh/mapstructure v1.5.0
 	github.com/openimsdk/protocol v0.0.73-alpha.12
-	github.com/openimsdk/tools v0.0.50-alpha.92
+	github.com/openimsdk/tools v0.0.50-alpha.85
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/prometheus/client_golang v1.18.0
 	github.com/stretchr/testify v1.9.0

go.sum

@@ -349,8 +349,8 @@ github.com/openimsdk/gomake v0.0.15-alpha.5 h1:eEZCEHm+NsmcO3onXZPIUbGFCYPYbsX5b
 github.com/openimsdk/gomake v0.0.15-alpha.5/go.mod h1:PndCozNc2IsQIciyn9mvEblYWZwJmAI+06z94EY+csI=
 github.com/openimsdk/protocol v0.0.73-alpha.12 h1:2NYawXeHChYUeSme6QJ9pOLh+Empce2WmwEtbP4JvKk=
 github.com/openimsdk/protocol v0.0.73-alpha.12/go.mod h1:WF7EuE55vQvpyUAzDXcqg+B+446xQyEba0X35lTINmw=
-github.com/openimsdk/tools v0.0.50-alpha.92 h1:hWfykMhmi7EQEiwgQccJqbgggIuhun/PrVkBnjmj9Ec=
-github.com/openimsdk/tools v0.0.50-alpha.92/go.mod h1:n2poR3asX1e1XZce4O+MOWAp+X02QJRFvhcLCXZdzRo=
+github.com/openimsdk/tools v0.0.50-alpha.85 h1:OqTUYx6r7Zp/eH8FKB08XeNjPV405TUIG9QT6QQ+F+s=
+github.com/openimsdk/tools v0.0.50-alpha.85/go.mod h1:n2poR3asX1e1XZce4O+MOWAp+X02QJRFvhcLCXZdzRo=
 github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6Wq+LM=
 github.com/pelletier/go-toml/v2 v2.2.2/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs=
 github.com/pierrec/lz4/v4 v4.1.21 h1:yOVMLb6qSIDP67pl/5F7RepeKYu/VmTyEXvuMI5d9mQ=

internal/api/router.go

@@ -28,7 +28,6 @@ import (
 	"github.com/openimsdk/tools/discovery/etcd"
 	"github.com/openimsdk/tools/log"
 	"github.com/openimsdk/tools/mw"
-	"github.com/openimsdk/tools/mw/api"
 	clientv3 "go.etcd.io/etcd/client/v3"
 )
 
@@ -97,8 +96,8 @@ func newGinRouter(ctx context.Context, client discovery.SvcDiscoveryRegistry, cf
 	case BestSpeed:
 		r.Use(gzip.Gzip(gzip.BestSpeed))
 	}
-	r.Use(api.GinLogger(), prommetricsGin(), gin.RecoveryWithWriter(gin.DefaultErrorWriter, mw.GinPanicErr), mw.CorsHandler(),
-		mw.GinParseOperationID(), GinParseToken(rpcli.NewAuthClient(authConn)), setGinIsAdmin(cfg.Share.IMAdminUser.UserIDs))
+	r.Use(prommetricsGin(), gin.RecoveryWithWriter(gin.DefaultErrorWriter, mw.GinPanicErr), mw.CorsHandler(),
+		mw.GinParseOperationID(), GinParseToken(rpcli.NewAuthClient(authConn)), setGinIsAdmin(cfg.Share.IMAdminUserID))
 
 	u := NewUserApi(user.NewUserClient(userConn), client, cfg.Discovery.RpcService)
 	{
@@ -232,7 +231,7 @@ func newGinRouter(ctx context.Context, client discovery.SvcDiscoveryRegistry, cf
 		objectGroup.GET("/*name", t.ObjectRedirect)
 	}
 	// Message
-	m := NewMessageApi(msg.NewMsgClient(msgConn), rpcli.NewUserClient(userConn), cfg.Share.IMAdminUser.UserIDs)
+	m := NewMessageApi(msg.NewMsgClient(msgConn), rpcli.NewUserClient(userConn), cfg.Share.IMAdminUserID)
 	{
 		msgGroup := r.Group("/msg")
 		msgGroup.POST("/newest_seq", m.GetSeq)
@@ -309,7 +308,7 @@ func newGinRouter(ctx context.Context, client discovery.SvcDiscoveryRegistry, cf
 	if cfg.Discovery.Enable == config.ETCD {
 		etcdClient = client.(*etcd.SvcDiscoveryRegistryImpl).GetClient()
 	}
-	cm := NewConfigManager(cfg.Share.IMAdminUser.UserIDs, &cfg.AllConfig, etcdClient, string(cfg.ConfigPath))
+	cm := NewConfigManager(cfg.Share.IMAdminUserID, &cfg.AllConfig, etcdClient, string(cfg.ConfigPath))
 	{
 		configGroup := r.Group("/config", cm.CheckAdmin)
 		configGroup.POST("/get_config_list", cm.GetConfigList)

internal/msggateway/ws_server.go

@@ -130,7 +130,7 @@ func NewWsServer(msgGatewayConfig *Config, opts ...Option) *WsServer {
 	for _, o := range opts {
 		o(&config)
 	}
-	//userRpcClient := rpcclient.NewUserRpcClient(client, config.Discovery.RpcService.User, config.Share.IMAdminUser)
+	//userRpcClient := rpcclient.NewUserRpcClient(client, config.Discovery.RpcService.User, config.Share.IMAdminUserID)
 
 	v := validator.New()
 	return &WsServer{

internal/msgtransfer/callback.go

@@ -55,11 +55,9 @@ func (mc *OnlineHistoryMongoConsumerHandler) webhookAfterSendSingleMsg(ctx conte
 	if msg.ContentType == constant.Typing {
 		return
 	}
-
 	if !filterAfterMsg(msg, after) {
 		return
 	}
-
 	cbReq := &cbapi.CallbackAfterSendSingleMsgReq{
 		CommonCallbackReq: toCommonCallback(ctx, msg, cbapi.CallbackAfterSendSingleMsgCommand),
 		RecvID:            msg.RecvID,
@@ -71,11 +69,9 @@ func (mc *OnlineHistoryMongoConsumerHandler) webhookAfterSendGroupMsg(ctx contex
 	if msg.ContentType == constant.Typing {
 		return
 	}
-
 	if !filterAfterMsg(msg, after) {
 		return
 	}
-
 	cbReq := &cbapi.CallbackAfterSendGroupMsgReq{
 		CommonCallbackReq: toCommonCallback(ctx, msg, cbapi.CallbackAfterSendGroupMsgCommand),
 		GroupID:           msg.GroupID,
@@ -102,11 +98,7 @@ func filterAfterMsg(msg *sdkws.MsgData, after *config.AfterConfig) bool {
 
 func filterMsg(msg *sdkws.MsgData, attentionIds []string, deniedTypes []int32) bool {
 	// According to the attentionIds configuration, only some users are sent
-	if len(attentionIds) != 0 && msg.ContentType == constant.SingleChatType && !datautil.Contain(msg.RecvID, attentionIds...) {
-		return false
-	}
-
-	if len(attentionIds) != 0 && msg.ContentType == constant.ReadGroupChatType && !datautil.Contain(msg.GroupID, attentionIds...) {
+	if len(attentionIds) != 0 && !datautil.Contain(msg.RecvID, attentionIds...) {
 		return false
 	}
 

internal/push/push_handler.go

@@ -317,8 +317,8 @@ func (c *ConsumerHandler) groupMessagesHandler(ctx context.Context, groupID stri
 					return err
 				}
 				log.ZDebug(ctx, "GroupDismissedNotificationInfo****", "groupID", groupID, "num", len(*pushToUserIDs), "list", pushToUserIDs)
-				if len(c.config.Share.IMAdminUser.UserIDs) > 0 {
-					ctx = mcontext.WithOpUserIDContext(ctx, c.config.Share.IMAdminUser.UserIDs[0])
+				if len(c.config.Share.IMAdminUserID) > 0 {
+					ctx = mcontext.WithOpUserIDContext(ctx, c.config.Share.IMAdminUserID[0])
 				}
 				defer func(groupID string) {
 					if err := c.groupClient.DismissGroup(ctx, groupID, true); err != nil {

internal/rpc/auth/auth.go

@@ -49,7 +49,6 @@ type authServer struct {
 	RegisterCenter discovery.Conn
 	config         *Config
 	userClient     *rpcli.UserClient
-	adminUserIDs   []string
 }
 
 type Config struct {
@@ -91,11 +90,10 @@ func Start(ctx context.Context, config *Config, client discovery.SvcDiscoveryReg
 			config.Share.Secret,
 			config.RpcConfig.TokenPolicy.Expire,
 			config.Share.MultiLogin,
-			config.Share.IMAdminUser.UserIDs,
+			config.Share.IMAdminUserID,
 		),
-		config:       config,
-		userClient:   rpcli.NewUserClient(userConn),
-		adminUserIDs: config.Share.IMAdminUser.UserIDs,
+		config:     config,
+		userClient: rpcli.NewUserClient(userConn),
 	})
 	return nil
 }
@@ -106,8 +104,8 @@ func (s *authServer) GetAdminToken(ctx context.Context, req *pbauth.GetAdminToke
 		return nil, errs.ErrNoPermission.WrapMsg("secret invalid")
 	}
 
-	if !datautil.Contain(req.UserID, s.adminUserIDs...) {
-		return nil, errs.ErrArgs.WrapMsg("userID is error.", "userID", req.UserID, "adminUserID", s.adminUserIDs)
+	if !datautil.Contain(req.UserID, s.config.Share.IMAdminUserID...) {
+		return nil, errs.ErrArgs.WrapMsg("userID is error.", "userID", req.UserID, "adminUserID", s.config.Share.IMAdminUserID)
 
 	}
 

internal/rpc/group/group.go

@@ -63,7 +63,6 @@ type groupServer struct {
 	userClient         *rpcli.UserClient
 	msgClient          *rpcli.MsgClient
 	conversationClient *rpcli.ConversationClient
-	adminUserIDs       []string
 }
 
 type Config struct {
@@ -117,7 +116,6 @@ func Start(ctx context.Context, config *Config, client discovery.SvcDiscoveryReg
 		userClient:         rpcli.NewUserClient(userConn),
 		msgClient:          rpcli.NewMsgClient(msgConn),
 		conversationClient: rpcli.NewConversationClient(conversationConn),
-		adminUserIDs:       config.Share.IMAdminUser.UserIDs,
 	}
 	gs.db = controller.NewGroupDatabase(rdb, &config.LocalCacheConfig, groupDB, groupMemberDB, groupRequestDB, mgocli.GetTx(), grouphash.NewGroupHashFromGroupServer(&gs))
 	gs.notification = NewNotificationSender(gs.db, config, gs.userClient, gs.msgClient, gs.conversationClient)
@@ -1903,7 +1901,7 @@ func (g *groupServer) GetSpecifiedUserGroupRequestInfo(ctx context.Context, req
 		}
 
 		adminIDs = append(adminIDs, owners[0].UserID)
-		adminIDs = append(adminIDs, g.adminUserIDs...)
+		adminIDs = append(adminIDs, g.config.Share.IMAdminUserID...)
 
 		if !datautil.Contain(opUserID, adminIDs...) {
 			return nil, errs.ErrNoPermission.WrapMsg("opUser no permission")

internal/rpc/msg/callback.go

@@ -16,10 +16,13 @@ package msg
 
 import (
 	"context"
+	"encoding/base64"
 	"encoding/json"
 
+	"github.com/openimsdk/open-im-server/v3/pkg/apistruct"
 	"github.com/openimsdk/open-im-server/v3/pkg/common/webhook"
 	"github.com/openimsdk/tools/errs"
+	"github.com/openimsdk/tools/utils/stringutil"
 
 	cbapi "github.com/openimsdk/open-im-server/v3/pkg/callbackstruct"
 	"github.com/openimsdk/open-im-server/v3/pkg/common/config"
@@ -86,20 +89,19 @@ func (m *msgServer) webhookBeforeSendSingleMsg(ctx context.Context, before *conf
 	})
 }
 
-// Move to msgtransfer
-// func (m *msgServer) webhookAfterSendSingleMsg(ctx context.Context, after *config.AfterConfig, msg *pbchat.SendMsgReq) {
-// 	if msg.MsgData.ContentType == constant.Typing {
-// 		return
-// 	}
-// 	if !filterAfterMsg(msg, after) {
-// 		return
-// 	}
-// 	cbReq := &cbapi.CallbackAfterSendSingleMsgReq{
-// 		CommonCallbackReq: toCommonCallback(ctx, msg, cbapi.CallbackAfterSendSingleMsgCommand),
-// 		RecvID:            msg.MsgData.RecvID,
-// 	}
-// 	m.webhookClient.AsyncPostWithQuery(ctx, cbReq.GetCallbackCommand(), cbReq, &cbapi.CallbackAfterSendSingleMsgResp{}, after, buildKeyMsgDataQuery(msg.MsgData))
-// }
+func (m *msgServer) webhookAfterSendSingleMsg(ctx context.Context, after *config.AfterConfig, msg *pbchat.SendMsgReq) {
+	if msg.MsgData.ContentType == constant.Typing {
+		return
+	}
+	if !filterAfterMsg(msg, after) {
+		return
+	}
+	cbReq := &cbapi.CallbackAfterSendSingleMsgReq{
+		CommonCallbackReq: toCommonCallback(ctx, msg, cbapi.CallbackAfterSendSingleMsgCommand),
+		RecvID:            msg.MsgData.RecvID,
+	}
+	m.webhookClient.AsyncPostWithQuery(ctx, cbReq.GetCallbackCommand(), cbReq, &cbapi.CallbackAfterSendSingleMsgResp{}, after, buildKeyMsgDataQuery(msg.MsgData))
+}
 
 func (m *msgServer) webhookBeforeSendGroupMsg(ctx context.Context, before *config.BeforeConfig, msg *pbchat.SendMsgReq) error {
 	return webhook.WithCondition(ctx, before, func(ctx context.Context) error {
@@ -121,21 +123,20 @@ func (m *msgServer) webhookBeforeSendGroupMsg(ctx context.Context, before *confi
 	})
 }
 
-// Move to msgtransfer
-// func (m *msgServer) webhookAfterSendGroupMsg(ctx context.Context, after *config.AfterConfig, msg *pbchat.SendMsgReq) {
-// 	if msg.MsgData.ContentType == constant.Typing {
-// 		return
-// 	}
-// 	if !filterAfterMsg(msg, after) {
-// 		return
-// 	}
-// 	cbReq := &cbapi.CallbackAfterSendGroupMsgReq{
-// 		CommonCallbackReq: toCommonCallback(ctx, msg, cbapi.CallbackAfterSendGroupMsgCommand),
-// 		GroupID:           msg.MsgData.GroupID,
-// 	}
+func (m *msgServer) webhookAfterSendGroupMsg(ctx context.Context, after *config.AfterConfig, msg *pbchat.SendMsgReq) {
+	if msg.MsgData.ContentType == constant.Typing {
+		return
+	}
+	if !filterAfterMsg(msg, after) {
+		return
+	}
+	cbReq := &cbapi.CallbackAfterSendGroupMsgReq{
+		CommonCallbackReq: toCommonCallback(ctx, msg, cbapi.CallbackAfterSendGroupMsgCommand),
+		GroupID:           msg.MsgData.GroupID,
+	}
 
-// 	m.webhookClient.AsyncPostWithQuery(ctx, cbReq.GetCallbackCommand(), cbReq, &cbapi.CallbackAfterSendGroupMsgResp{}, after, buildKeyMsgDataQuery(msg.MsgData))
-// }
+	m.webhookClient.AsyncPostWithQuery(ctx, cbReq.GetCallbackCommand(), cbReq, &cbapi.CallbackAfterSendGroupMsgResp{}, after, buildKeyMsgDataQuery(msg.MsgData))
+}
 
 func (m *msgServer) webhookBeforeMsgModify(ctx context.Context, before *config.BeforeConfig, msg *pbchat.SendMsgReq, beforeMsgData **sdkws.MsgData) error {
 	return webhook.WithCondition(ctx, before, func(ctx context.Context) error {
@@ -204,14 +205,14 @@ func (m *msgServer) webhookAfterRevokeMsg(ctx context.Context, after *config.Aft
 	m.webhookClient.AsyncPost(ctx, callbackReq.GetCallbackCommand(), callbackReq, &cbapi.CallbackAfterRevokeMsgResp{}, after)
 }
 
-// func buildKeyMsgDataQuery(msg *sdkws.MsgData) map[string]string {
-// 	keyMsgData := apistruct.KeyMsgData{
-// 		SendID:  msg.SendID,
-// 		RecvID:  msg.RecvID,
-// 		GroupID: msg.GroupID,
-// 	}
+func buildKeyMsgDataQuery(msg *sdkws.MsgData) map[string]string {
+	keyMsgData := apistruct.KeyMsgData{
+		SendID:  msg.SendID,
+		RecvID:  msg.RecvID,
+		GroupID: msg.GroupID,
+	}
 
-// 	return map[string]string{
-// 		webhook.Key: base64.StdEncoding.EncodeToString(stringutil.StructToJsonBytes(keyMsgData)),
-// 	}
-// }
+	return map[string]string{
+		webhook.Key: base64.StdEncoding.EncodeToString(stringutil.StructToJsonBytes(keyMsgData)),
+	}
+}

internal/rpc/msg/revoke.go

@@ -109,8 +109,8 @@ func (m *msgServer) RevokeMsg(ctx context.Context, req *msg.RevokeMsgReq) (*msg.
 	revokerUserID := mcontext.GetOpUserID(ctx)
 	var flag bool
 
-	if len(m.config.Share.IMAdminUser.UserIDs) > 0 {
-		flag = datautil.Contain(revokerUserID, m.adminUserIDs...)
+	if len(m.config.Share.IMAdminUserID) > 0 {
+		flag = datautil.Contain(revokerUserID, m.config.Share.IMAdminUserID...)
 	}
 	tips := sdkws.RevokeMsgTips{
 		RevokerUserID:  revokerUserID,

internal/rpc/msg/server.go

@@ -22,6 +22,7 @@ import (
 	"github.com/openimsdk/open-im-server/v3/pkg/dbbuild"
 	"github.com/openimsdk/open-im-server/v3/pkg/mqbuild"
 	"github.com/openimsdk/open-im-server/v3/pkg/rpcli"
+
 	"google.golang.org/grpc"
 
 	"github.com/openimsdk/open-im-server/v3/pkg/common/config"
@@ -70,8 +71,6 @@ type msgServer struct {
 	config                 *Config                          // Global configuration settings.
 	webhookClient          *webhook.Client
 	conversationClient     *rpcli.ConversationClient
-
-	adminUserIDs []string
 }
 
 func (m *msgServer) addInterceptorHandler(interceptorFunc ...MessageInterceptorFunc) {
@@ -146,7 +145,6 @@ func Start(ctx context.Context, config *Config, client discovery.SvcDiscoveryReg
 		config:                 config,
 		webhookClient:          webhook.NewWebhookClient(config.WebhooksConfig.URL),
 		conversationClient:     conversationClient,
-		adminUserIDs:           config.Share.IMAdminUser.UserIDs,
 	}
 
 	s.notificationSender = notification.NewNotificationSender(&config.NotificationConfig, notification.WithLocalSendMsg(s.SendMsg))

internal/rpc/msg/verify.go

@@ -54,7 +54,7 @@ type MessageRevoked struct {
 func (m *msgServer) messageVerification(ctx context.Context, data *msg.SendMsgReq) error {
 	switch data.MsgData.SessionType {
 	case constant.SingleChatType:
-		if datautil.Contain(data.MsgData.SendID, m.adminUserIDs...) {
+		if datautil.Contain(data.MsgData.SendID, m.config.Share.IMAdminUserID...) {
 			return nil
 		}
 		if data.MsgData.ContentType <= constant.NotificationEnd &&
@@ -102,7 +102,7 @@ func (m *msgServer) messageVerification(ctx context.Context, data *msg.SendMsgRe
 			return nil
 		}
 
-		if datautil.Contain(data.MsgData.SendID, m.adminUserIDs...) {
+		if datautil.Contain(data.MsgData.SendID, m.config.Share.IMAdminUserID...) {
 			return nil
 		}
 		if data.MsgData.ContentType <= constant.NotificationEnd &&

internal/rpc/relation/friend.go

@@ -192,7 +192,7 @@ func (s *friendServer) ImportFriends(ctx context.Context, req *relation.ImportFr
 			FromUserID:   req.OwnerUserID,
 			ToUserID:     userID,
 			HandleResult: constant.FriendResponseAgree,
-		}, false)
+		})
 	}
 
 	s.webhookAfterImportFriends(ctx, &s.config.WebhooksConfig.AfterImportFriends, req)
@@ -221,7 +221,7 @@ func (s *friendServer) RespondFriendApply(ctx context.Context, req *relation.Res
 			return nil, err
 		}
 		s.webhookAfterAddFriendAgree(ctx, &s.config.WebhooksConfig.AfterAddFriendAgree, req)
-		s.notificationSender.FriendApplicationAgreedNotification(ctx, req, true)
+		s.notificationSender.FriendApplicationAgreedNotification(ctx, req)
 		return resp, nil
 	}
 	if req.HandleResult == constant.FriendResponseRefuse {

internal/rpc/relation/notification.go

@@ -171,17 +171,11 @@ func (f *FriendNotificationSender) FriendApplicationAddNotification(ctx context.
 	f.Notification(ctx, req.FromUserID, req.ToUserID, constant.FriendApplicationNotification, &tips)
 }
 
-func (f *FriendNotificationSender) FriendApplicationAgreedNotification(ctx context.Context, req *relation.RespondFriendApplyReq, checkReq bool) {
-	var (
-		request *sdkws.FriendRequest
-		err     error
-	)
-	if checkReq {
-		request, err = f.getFriendRequests(ctx, req.FromUserID, req.ToUserID)
-		if err != nil {
-			log.ZError(ctx, "FriendApplicationAgreedNotification get friend request", err, "fromUserID", req.FromUserID, "toUserID", req.ToUserID)
-			return
-		}
+func (f *FriendNotificationSender) FriendApplicationAgreedNotification(ctx context.Context, req *relation.RespondFriendApplyReq) {
+	request, err := f.getFriendRequests(ctx, req.FromUserID, req.ToUserID)
+	if err != nil {
+		log.ZError(ctx, "FriendApplicationAgreedNotification get friend request", err, "fromUserID", req.FromUserID, "toUserID", req.ToUserID)
+		return
 	}
 	tips := sdkws.FriendApplicationApprovedTips{
 		FromToUserID: &sdkws.FromToUserID{

internal/rpc/user/user.go

@@ -65,8 +65,6 @@ type userServer struct {
 	groupClient              *rpcli.GroupClient
 	relationClient           *rpcli.RelationClient
 	clientConfig             controller.ClientConfigDatabase
-
-	adminUserIDs []string
 }
 
 type Config struct {
@@ -94,12 +92,8 @@ func Start(ctx context.Context, config *Config, client discovery.SvcDiscoveryReg
 
 	users := make([]*tablerelation.User, 0)
 
-	for i := range config.Share.IMAdminUser.UserIDs {
-		users = append(users, &tablerelation.User{
-			UserID:         config.Share.IMAdminUser.UserIDs[i],
-			Nickname:       config.Share.IMAdminUser.Nicknames[i],
-			AppMangerLevel: constant.AppAdmin,
-		})
+	for _, v := range config.Share.IMAdminUserID {
+		users = append(users, &tablerelation.User{UserID: v, Nickname: v, AppMangerLevel: constant.AppAdmin})
 	}
 	userDB, err := mgo.NewUserMongo(mgocli.GetDB())
 	if err != nil {
@@ -136,7 +130,6 @@ func Start(ctx context.Context, config *Config, client discovery.SvcDiscoveryReg
 		clientConfig:             controller.NewClientConfigDatabase(clientConfigDB, redis.NewClientConfigCache(rdb, clientConfigDB), mgocli.GetTx()),
 		groupClient:              rpcli.NewGroupClient(groupConn),
 		relationClient:           rpcli.NewRelationClient(friendConn),
-		adminUserIDs:             config.Share.IMAdminUser.UserIDs,
 	}
 	pbuser.RegisterUserServer(server, u)
 	return u.db.InitOnce(context.Background(), users)
@@ -655,7 +648,7 @@ func (s *userServer) userModelToResp(users []*tablerelation.User, pagination pag
 	accounts := make([]*pbuser.NotificationAccountInfo, 0)
 	var total int64
 	for _, v := range users {
-		if v.AppMangerLevel >= constant.AppNotificationAdmin && !datautil.Contain(v.UserID, s.adminUserIDs...) {
+		if v.AppMangerLevel >= constant.AppNotificationAdmin && !datautil.Contain(v.UserID, s.config.Share.IMAdminUserID...) {
 			if appManagerLevel != nil {
 				if v.AppMangerLevel != *appManagerLevel {
 					continue

internal/tools/cron/cron_task.go

@@ -10,6 +10,7 @@ import (
 	"github.com/openimsdk/protocol/third"
 	"github.com/openimsdk/tools/discovery"
 	"github.com/openimsdk/tools/discovery/etcd"
+
 	"github.com/openimsdk/tools/errs"
 	"github.com/openimsdk/tools/log"
 	"github.com/openimsdk/tools/mcontext"
@@ -31,7 +32,7 @@ func Start(ctx context.Context, conf *Config, client discovery.SvcDiscoveryRegis
 		<-ctx.Done()
 		return nil
 	}
-	ctx = mcontext.SetOpUserID(ctx, conf.Share.IMAdminUser.UserIDs[0])
+	ctx = mcontext.SetOpUserID(ctx, conf.Share.IMAdminUserID[0])
 
 	msgConn, err := client.GetConn(ctx, conf.Discovery.RpcService.Msg)
 	if err != nil {
@@ -48,7 +49,6 @@ func Start(ctx context.Context, conf *Config, client discovery.SvcDiscoveryRegis
 		return err
 	}
 
-	var locker Locker
 	if conf.Discovery.Enable == config.ETCD {
 		cm := disetcd.NewConfigManager(client.(*etcd.SvcDiscoveryRegistryImpl).GetClient(), []string{
 			conf.CronTask.GetConfigFileName(),
@@ -56,14 +56,11 @@ func Start(ctx context.Context, conf *Config, client discovery.SvcDiscoveryRegis
 			conf.Discovery.GetConfigFileName(),
 		})
 		cm.Watch(ctx)
-		locker, err = NewEtcdLocker(client.(*etcd.SvcDiscoveryRegistryImpl).GetClient())
-		if err != nil {
-			return err
-		}
 	}
 
-	if locker == nil {
-		locker = emptyLocker{}
+	locker, err := NewEtcdLocker(client.(*etcd.SvcDiscoveryRegistryImpl).GetClient())
+	if err != nil {
+		return err
 	}
 
 	srv := &cronServer{
@@ -95,16 +92,6 @@ func Start(ctx context.Context, conf *Config, client discovery.SvcDiscoveryRegis
 	return nil
 }
 
-type Locker interface {
-	ExecuteWithLock(ctx context.Context, taskName string, task func())
-}
-
-type emptyLocker struct{}
-
-func (emptyLocker) ExecuteWithLock(ctx context.Context, taskName string, task func()) {
-	task()
-}
-
 type cronServer struct {
 	ctx                context.Context
 	config             *Config
@@ -112,7 +99,7 @@ type cronServer struct {
 	msgClient          msg.MsgClient
 	conversationClient pbconversation.ConversationClient
 	thirdClient        third.ThirdClient
-	locker             Locker
+	locker             *EtcdLocker
 }
 
 func (c *cronServer) registerClearS3() error {

pkg/common/config/config.go

@@ -323,22 +323,14 @@ type RPC struct {
 }
 
 type Redis struct {
-	Disable      bool     `yaml:"-"`
-	Address      []string `yaml:"address"`
-	Username     string   `yaml:"username"`
-	Password     string   `yaml:"password"`
-	RedisMode    string   `yaml:"redisMode"`
-	DB           int      `yaml:"db"`
-	MaxRetry     int      `yaml:"maxRetry"`
-	PoolSize     int      `yaml:"poolSize"`
-	SentinelMode Sentinel `yaml:"sentinelMode"`
-}
-
-type Sentinel struct {
-	MasterName     string   `yaml:"masterName"`
-	SentinelAddrs  []string `yaml:"sentinelsAddrs"`
-	RouteByLatency bool     `yaml:"routeByLatency"`
-	RouteRandomly  bool     `yaml:"routeRandomly"`
+	Disable     bool     `yaml:"-"`
+	Address     []string `yaml:"address"`
+	Username    string   `yaml:"username"`
+	Password    string   `yaml:"password"`
+	ClusterMode bool     `yaml:"clusterMode"`
+	DB          int      `yaml:"db"`
+	MaxRetry    int      `yaml:"maxRetry"`
+	PoolSize    int      `yaml:"poolSize"`
 }
 
 type BeforeConfig struct {
@@ -356,11 +348,8 @@ type AfterConfig struct {
 }
 
 type Share struct {
-	Secret      string `yaml:"secret"`
-	IMAdminUser struct {
-		UserIDs   []string `yaml:"userIDs"`
-		Nicknames []string `yaml:"nicknames"`
-	} `yaml:"imAdminUser"`
+	Secret         string         `yaml:"secret"`
+	IMAdminUserID  []string       `yaml:"imAdminUserID"`
 	MultiLogin     MultiLogin     `yaml:"multiLogin"`
 	RPCMaxBodySize MaxRequestBody `yaml:"rpcMaxBodySize"`
 }
@@ -498,19 +487,13 @@ func (m *Mongo) Build() *mongoutil.Config {
 
 func (r *Redis) Build() *redisutil.Config {
 	return &redisutil.Config{
-		RedisMode: r.RedisMode,
-		Address:   r.Address,
-		Username:  r.Username,
-		Password:  r.Password,
-		DB:        r.DB,
-		MaxRetry:  r.MaxRetry,
-		PoolSize:  r.PoolSize,
-		Sentinel: &redisutil.Sentinel{
-			MasterName:     r.SentinelMode.MasterName,
-			SentinelAddrs:  r.SentinelMode.SentinelAddrs,
-			RouteByLatency: r.SentinelMode.RouteByLatency,
-			RouteRandomly:  r.SentinelMode.RouteRandomly,
-		},
+		ClusterMode: r.ClusterMode,
+		Address:     r.Address,
+		Username:    r.Username,
+		Password:    r.Password,
+		DB:          r.DB,
+		MaxRetry:    r.MaxRetry,
+		PoolSize:    r.PoolSize,
 	}
 }
 

pkg/common/discovery/discoveryregister.go

@@ -35,7 +35,7 @@ func NewDiscoveryRegister(discovery *config.Discovery, watchNames []string) (dis
 		return standalone.GetSvcDiscoveryRegistry(), nil
 	}
 	if runtimeenv.RuntimeEnvironment() == config.KUBERNETES {
-		return kubernetes.NewConnManager(discovery.Kubernetes.Namespace, nil,
+		return kubernetes.NewKubernetesConnManager(discovery.Kubernetes.Namespace,
 			grpc.WithDefaultCallOptions(
 				grpc.MaxCallSendMsgSize(1024*1024*20),
 			),

pkg/common/startrpc/start.go

@@ -69,8 +69,8 @@ func Start[T any](ctx context.Context, disc *conf.Discovery, prometheusConfig *c
 		grpcsrv.GrpcServerRequestValidate(),
 		grpcsrv.GrpcServerPanicCapture(),
 	)
-	if shareConfig != nil && len(shareConfig.IMAdminUser.UserIDs) > 0 {
-		options = append(options, grpcServerIMAdminUserID(shareConfig.IMAdminUser.UserIDs))
+	if shareConfig != nil && len(shareConfig.IMAdminUserID) > 0 {
+		options = append(options, grpcServerIMAdminUserID(shareConfig.IMAdminUserID))
 	}
 	var clientOptions []grpc.DialOption
 	if maxRequestBody != nil {

pkg/common/storage/cache/redis/online_test.go

@@ -26,7 +26,7 @@ func TestName111111(t *testing.T) {
 			"172.16.8.124:7005",
 			"172.16.8.124:7006",
 		},
-		RedisMode: "cluster",
+		ClusterMode: true,
 		Password:    "passwd123",
 		//Address:  []string{"localhost:16379"},
 		//Password: "openIM123",

pkg/common/storage/controller/user.go

@@ -97,34 +97,16 @@ func (u *userDatabase) InitOnce(ctx context.Context, users []*model.User) error
 	}
 
 	// Determine which users are missing from the database.
-	var (
-		missing, update []*model.User
-	)
-	existMap := datautil.SliceToMap(existingUsers, func(e *model.User) string {
+	missingUsers := datautil.SliceAnySub(users, existingUsers, func(e *model.User) string {
 		return e.UserID
 	})
-	orgMap := datautil.SliceToMap(users, func(e *model.User) string { return e.UserID })
-	for k, u1 := range orgMap {
-		if u2, ok := existMap[k]; !ok {
-			missing = append(missing, u1)
-		} else if u1.Nickname != u2.Nickname {
-			update = append(update, u1)
-		}
-	}
 
 	// Create records for missing users.
-	if len(missing) > 0 {
-		if err := u.userDB.Create(ctx, missing); err != nil {
+	if len(missingUsers) > 0 {
+		if err := u.userDB.Create(ctx, missingUsers); err != nil {
 			return err
 		}
 	}
-	if len(update) > 0 {
-		for i := range update {
-			if err := u.userDB.UpdateByMap(ctx, update[i].UserID, map[string]any{"nickname": update[i].Nickname}); err != nil {
-				return err
-			}
-		}
-	}
 
 	return nil
 }

test/stress-test-v2/main.go

@@ -446,7 +446,7 @@ func main() {
 			Share: *share,
 			Api:   *apiConfig,
 		},
-		AdminUserID: share.IMAdminUser.UserIDs[0],
+		AdminUserID: share.IMAdminUserID[0],
 		Ctx:         ctx,
 		Cancel:      cancel,
 		HttpClient: &http.Client{

test/stress-test/main.go

@@ -319,7 +319,7 @@ func main() {
 			Share: *share,
 			Api:   *apiConfig,
 		},
-		AdminUserID: share.IMAdminUser.UserIDs[0],
+		AdminUserID: share.IMAdminUserID[0],
 		Ctx:         ctx,
 		Cancel:      cancel,
 		HttpClient: &http.Client{

tools/seq/internal/seq.go

@@ -28,8 +28,6 @@ import (
 	"go.mongodb.org/mongo-driver/mongo/options"
 )
 
-const StructTagName = "yaml"
-
 const (
 	MaxSeq                 = "MAX_SEQ:"
 	MinSeq                 = "MIN_SEQ:"
@@ -56,14 +54,13 @@ func readConfig[T any](dir string, name string) (*T, error) {
 	if err := v.ReadInConfig(); err != nil {
 		return nil, err
 	}
-
+	fn := func(config *mapstructure.DecoderConfig) {
+		config.TagName = "mapstructure"
+	}
 	var conf T
-	if err := v.Unmarshal(&conf, func(config *mapstructure.DecoderConfig) {
-		config.TagName = StructTagName
-	}); err != nil {
+	if err := v.Unmarshal(&conf, fn); err != nil {
 		return nil, err
 	}
-
 	return &conf, nil
 }
 
@@ -72,7 +69,6 @@ func Main(conf string, del time.Duration) error {
 	if err != nil {
 		return err
 	}
-	
 	mongodbConfig, err := readConfig[config.Mongo](conf, config.MongodbConfigFileName)
 	if err != nil {
 		return err