bugfix: fix access key loss after server restart

changes/en-us/develop.md

@@ -37,7 +37,7 @@ Add changes here for all PR submitted to the develop branch.
 - [[#5052](https://github.com/seata/seata/pull/5052)] fix update join condition placeholder param error
 - [[#5031](https://github.com/seata/seata/pull/5031)] fix mysql InsertOnDuplicateUpdate should not use null index value as image sql query condition
 - [[#5075](https://github.com/seata/seata/pull/5075)] fix InsertOnDuplicateUpdateExecutor could not intercept the sql which has no primary and unique key
-
+- [[#5093](https://github.com/seata/seata/pull/5093)] fix access key loss after seata server restart
 
 ### optimize:
 - [[#4774](https://github.com/seata/seata/pull/4774)] optimize mysql8 dependencies for seataio/seata-server image

changes/zh-cn/develop.md

@@ -39,6 +39,7 @@
 - [[#5052](https://github.com/seata/seata/pull/5052)] 修复update join条件中占位符参数问题
 - [[#5031](https://github.com/seata/seata/pull/5031)] 修复InsertOnDuplicateUpdate中不应该使用null值索引作为查询条件
 - [[#5075](https://github.com/seata/seata/pull/5075)] 修复InsertOnDuplicateUpdate无法拦截无主键和唯一索引的SQL
+- [[#5093](https://github.com/seata/seata/pull/5093)] 修复seata server重启后access key丢失问题
 
 ### optimize：
 - [[#4774](https://github.com/seata/seata/pull/4774)] 优化 seataio/seata-server 镜像中的 mysql8 依赖

common/src/main/java/io/seata/common/ConfigurationKeys.java

@@ -740,15 +740,25 @@ public interface ConfigurationKeys {
      */
     String TM_INTERCEPTOR_ORDER = CLIENT_TM_PREFIX + "interceptorOrder";
 
+    /**
+     * The constant ACCESS_KEY.
+     */
+    String ACCESS_KEY = "accesskey";
+
+    /**
+     * The constant SECRET_KEY.
+     */
+    String SECRET_KEY = "secretkey";
+
     /**
      * The constant SEATA_ACCESS_KEY.
      */
-    String SEATA_ACCESS_KEY = SEATA_PREFIX + "accesskey";
+    String SEATA_ACCESS_KEY = SEATA_PREFIX + ACCESS_KEY;
 
     /**
      * The constant SEATA_SECRET_KEY.
      */
-    String SEATA_SECRET_KEY = SEATA_PREFIX + "secretkey";
+    String SEATA_SECRET_KEY = SEATA_PREFIX + SECRET_KEY;
 
     /**
      * The constant EXTRA_DATA_SPLIT_CHAR.

core/src/main/java/io/seata/core/rpc/netty/TmNettyRemotingClient.java

@@ -47,8 +47,6 @@
 
 import static io.seata.core.constants.ConfigurationKeys.EXTRA_DATA_KV_CHAR;
 import static io.seata.core.constants.ConfigurationKeys.EXTRA_DATA_SPLIT_CHAR;
-import static io.seata.core.constants.ConfigurationKeys.SEATA_ACCESS_KEY;
-import static io.seata.core.constants.ConfigurationKeys.SEATA_SECRET_KEY;
 
 /**
  * The rm netty client.
@@ -67,8 +65,8 @@ public final class TmNettyRemotingClient extends AbstractNettyRemotingClient {
     private String applicationId;
     private String transactionServiceGroup;
     private final AuthSigner signer;
-    private String accessKey;
-    private String secretKey;
+    private final String accessKey = ConfigurationFactory.getInstance().getConfig(ConfigurationKeys.ACCESS_KEY,null);
+    private final String secretKey = ConfigurationFactory.getInstance().getConfig(ConfigurationKeys.SECRET_KEY,null);
 
 
     private TmNettyRemotingClient(NettyClientConfig nettyClientConfig,
@@ -99,24 +97,9 @@ public void onChangeEvent(ConfigurationChangeEvent event) {
      * @return the instance
      */
     public static TmNettyRemotingClient getInstance(String applicationId, String transactionServiceGroup) {
-        return getInstance(applicationId, transactionServiceGroup, null, null);
-    }
-
-    /**
-     * Gets instance.
-     *
-     * @param applicationId           the application id
-     * @param transactionServiceGroup the transaction service group
-     * @param accessKey               the access key
-     * @param secretKey               the secret key
-     * @return the instance
-     */
-    public static TmNettyRemotingClient getInstance(String applicationId, String transactionServiceGroup, String accessKey, String secretKey) {
         TmNettyRemotingClient tmRpcClient = getInstance();
         tmRpcClient.setApplicationId(applicationId);
         tmRpcClient.setTransactionServiceGroup(transactionServiceGroup);
-        tmRpcClient.setAccessKey(accessKey);
-        tmRpcClient.setSecretKey(secretKey);
         return tmRpcClient;
     }
 
@@ -162,32 +145,6 @@ public void setTransactionServiceGroup(String transactionServiceGroup) {
         this.transactionServiceGroup = transactionServiceGroup;
     }
 
-    /**
-     * Sets access key.
-     *
-     * @param accessKey the access key
-     */
-    protected void setAccessKey(String accessKey) {
-        if (null != accessKey) {
-            this.accessKey = accessKey;
-            return;
-        }
-        this.accessKey = System.getProperty(SEATA_ACCESS_KEY);
-    }
-
-    /**
-     * Sets secret key.
-     *
-     * @param secretKey the secret key
-     */
-    protected void setSecretKey(String secretKey) {
-        if (null != secretKey) {
-            this.secretKey = secretKey;
-            return;
-        }
-        this.secretKey = System.getProperty(SEATA_SECRET_KEY);
-    }
-
     @Override
     public void init() {
         // registry processor

seata-spring-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/SeataAutoConfiguration.java

@@ -76,9 +76,6 @@ public GlobalTransactionScanner globalTransactionScanner(SeataProperties seataPr
         GlobalTransactionScanner.addScannablePackages(seataProperties.getScanPackages());
         // add excludeBeanNames
         GlobalTransactionScanner.addScannerExcludeBeanNames(seataProperties.getExcludesForScanning());
-        //set accessKey and secretKey
-        GlobalTransactionScanner.setAccessKey(seataProperties.getAccessKey());
-        GlobalTransactionScanner.setSecretKey(seataProperties.getSecretKey());
         // create global transaction scanner
         return new GlobalTransactionScanner(seataProperties.getApplicationId(), seataProperties.getTxServiceGroup(), failureHandler);
     }

spring/src/main/java/io/seata/spring/annotation/GlobalTransactionScanner.java

@@ -100,8 +100,6 @@ public class GlobalTransactionScanner extends AbstractAutoProxyCreator
     private final String applicationId;
     private final String txServiceGroup;
     private final int mode;
-    private static String accessKey;
-    private static String secretKey;
     private volatile boolean disableGlobalTransaction = ConfigurationFactory.getInstance().getBoolean(
             ConfigurationKeys.DISABLE_GLOBAL_TRANSACTION, DEFAULT_DISABLE_GLOBAL_TRANSACTION);
     private final AtomicBoolean initialized = new AtomicBoolean(false);
@@ -180,24 +178,6 @@ public GlobalTransactionScanner(String applicationId, String txServiceGroup, int
         this.failureHandlerHook = failureHandlerHook;
     }
 
-    /**
-     * Sets access key.
-     *
-     * @param accessKey the access key
-     */
-    public static void setAccessKey(String accessKey) {
-        GlobalTransactionScanner.accessKey = accessKey;
-    }
-
-    /**
-     * Sets secret key.
-     *
-     * @param secretKey the secret key
-     */
-    public static void setSecretKey(String secretKey) {
-        GlobalTransactionScanner.secretKey = secretKey;
-    }
-
     @Override
     public void destroy() {
         ShutdownHook.getInstance().destroyAll();
@@ -217,7 +197,7 @@ private void initClient() {
             throw new IllegalArgumentException(String.format("applicationId: %s, txServiceGroup: %s", applicationId, txServiceGroup));
         }
         //init TM
-        TMClient.init(applicationId, txServiceGroup, accessKey, secretKey);
+        TMClient.init(applicationId, txServiceGroup);
         if (LOGGER.isInfoEnabled()) {
             LOGGER.info("Transaction Manager Client is initialized. applicationId[{}] txServiceGroup[{}]", applicationId, txServiceGroup);
         }

tm/src/main/java/io/seata/tm/TMClient.java

@@ -31,19 +31,7 @@ public class TMClient {
      * @param transactionServiceGroup the transaction service group
      */
     public static void init(String applicationId, String transactionServiceGroup) {
-        init(applicationId, transactionServiceGroup, null, null);
-    }
-
-    /**
-     * Init.
-     *
-     * @param applicationId           the application id
-     * @param transactionServiceGroup the transaction service group
-     * @param accessKey               the access key
-     * @param secretKey               the secret key
-     */
-    public static void init(String applicationId, String transactionServiceGroup, String accessKey, String secretKey) {
-        TmNettyRemotingClient tmNettyRemotingClient = TmNettyRemotingClient.getInstance(applicationId, transactionServiceGroup, accessKey, secretKey);
+        TmNettyRemotingClient tmNettyRemotingClient = TmNettyRemotingClient.getInstance(applicationId,transactionServiceGroup);
         tmNettyRemotingClient.init();
     }