Merge 77cc8a3ffa into 2fb0fce0b1

Co-authored-by: jinwei2 <jinwei2@enmonster.com>

frontend/package.json

@@ -9,7 +9,7 @@
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
     "react-json-view": "^1.21.3",
-    "react-scripts": "5.0.1",
+    "react-scripts": "4.0.3",
     "web-vitals": "^1.0.1"
   },
   "proxy": "http://localhost:8080",

src/main/java/org/apache/rocketmq/dashboard/config/RMQConfigure.java

@@ -38,6 +38,8 @@ import static org.apache.rocketmq.client.ClientConfig.SEND_MESSAGE_WITH_VIP_CHAN
 @Configuration
 @ConfigurationProperties(prefix = "rocketmq.config")
 public class RMQConfigure {
+    private static final String ROCKET_MQ_AK_PROPERTY = "rocketmq.config.accessKey";
+    private static final String ROCKET_MQ_SK_PROPERTY = "rocketmq.config.secretKey";
 
     private Logger logger = LoggerFactory.getLogger(RMQConfigure.class);
     //use rocketmq.namesrv.addr first,if it is empty,than use system proerty or system env
@@ -52,9 +54,9 @@ public class RMQConfigure {
 
     private boolean loginRequired = false;
 
-    private String accessKey;
+    private String accessKey = System.getProperty(ROCKET_MQ_AK_PROPERTY, System.getenv("ROCKET_MQ_AK"));
 
-    private String secretKey;
+    private String secretKey = System.getProperty(ROCKET_MQ_SK_PROPERTY, System.getenv("ROCKET_MQ_SK"));
 
     private boolean useTLS = false;
 
@@ -67,7 +69,11 @@ public class RMQConfigure {
     }
 
     public void setAccessKey(String accessKey) {
-        this.accessKey = accessKey;
+        if (StringUtils.isNotBlank(accessKey)) {
+            this.accessKey = accessKey;
+            System.setProperty(ROCKET_MQ_AK_PROPERTY, accessKey);
+            logger.info("setAccessKey accessKey={}", accessKey);
+        }
     }
 
     public String getSecretKey() {
@@ -75,7 +81,11 @@ public class RMQConfigure {
     }
 
     public void setSecretKey(String secretKey) {
-        this.secretKey = secretKey;
+        if (StringUtils.isNotBlank(secretKey)) {
+            this.secretKey = secretKey;
+            System.setProperty(ROCKET_MQ_SK_PROPERTY, secretKey);
+            logger.info("setAccessKey accessKey={}", secretKey);
+        }
     }
 
     public String getNamesrvAddr() {

src/main/resources/static/view/pages/cluster.html

@@ -50,7 +50,14 @@
                 <td class="text-center">{{instance.address}}</td>
                 <td class="text-center">{{instance.brokerVersionDesc}}</td>
                 <td class="text-center">{{instance.putTps.split(' ')[0]| number:2}}</td>
-                <td class="text-center">{{instance.getTransferedTps.split(' ')[0]| number:2}}</td>
+                <td class="text-center">
+                    <span ng-if="!instance.getTransferedTps || !instance.getTransferedTps.trim()">
+                        {{instance.getTransferredTps.split(' ')[0] | number:2}}
+                    </span>
+                    <span ng-if="instance.getTransferedTps && instance.getTransferedTps.trim()">
+                        {{instance.getTransferedTps.split(' ')[0] | number:2}}
+                    </span>
+                </td>
                 <td class="text-center">{{instance.msgPutTotalTodayMorning -
                     instance.msgPutTotalYesterdayMorning}}
                 </td>