Bump semver and react-scripts in /frontend

Bumps [semver](https://github.com/npm/node-semver) to 7.5.4 and updates ancestor dependency [react-scripts](https://github.com/facebook/create-react-app/tree/HEAD/packages/react-scripts). These dependencies need to be updated together.


Updates `semver` from 5.7.1 to 7.5.4
- [Release notes](https://github.com/npm/node-semver/releases)
- [Changelog](https://github.com/npm/node-semver/blob/main/CHANGELOG.md)
- [Commits](https://github.com/npm/node-semver/compare/v5.7.1...v7.5.4)

Updates `react-scripts` from 4.0.3 to 5.0.1
- [Release notes](https://github.com/facebook/create-react-app/releases)
- [Changelog](https://github.com/facebook/create-react-app/blob/main/CHANGELOG-4.x.md)
- [Commits](https://github.com/facebook/create-react-app/commits/react-scripts@5.0.1/packages/react-scripts)

---
updated-dependencies:
- dependency-name: semver
  dependency-type: indirect
- dependency-name: react-scripts
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

.dockerignore

@@ -1 +0,0 @@
-target/

frontend/package.json

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

src/main/docker/Dockerfile

@@ -15,16 +15,9 @@
 # limitations under the License.
 #
 
-FROM maven:3.8.6-openjdk-8 AS builder
-
-ADD . .
-
-# package jar
-RUN mvn clean package -Dmaven.test.skip=true
-
-FROM openjdk:8u342-jdk
-
-# copy jar from the builder stage
-COPY --from=builder target/rocketmq-dashboard-*.jar rocketmq-dashboard.jar
-
-ENTRYPOINT exec java $JAVA_OPTS -jar rocketmq-dashboard.jar
+FROM java:8
+VOLUME /tmp
+ADD rocketmq-dashboard-*.jar rocketmq-dashboard.jar
+RUN sh -c 'touch /rocketmq-dashboard.jar'
+ENV JAVA_OPTS=""
+ENTRYPOINT [ "sh", "-c", "java $JAVA_OPTS -jar /rocketmq-dashboard.jar" ]

src/main/java/org/apache/rocketmq/dashboard/model/request/TopicConfigInfo.java

@@ -31,7 +31,6 @@ public class TopicConfigInfo {
     private int perm;
     private boolean order;
 
-    private String messageType;
     public List<String> getClusterNameList() {
         return clusterNameList;
     }
@@ -92,18 +91,6 @@ public class TopicConfigInfo {
         this.order = order;
     }
 
-
-    public String getMessageType() {
-        return messageType;
-    }
-
-    public void setMessageType(String messageType) {
-        this.messageType = messageType;
-    }
-
-
-
-
     @Override
     public boolean equals(Object o) {
         if (this == o)
@@ -115,13 +102,12 @@ public class TopicConfigInfo {
             readQueueNums == that.readQueueNums &&
             perm == that.perm &&
             order == that.order &&
-            Objects.equal(topicName, that.topicName) &&
-            Objects.equal(messageType, that.messageType);
+            Objects.equal(topicName, that.topicName);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hashCode(topicName, writeQueueNums, readQueueNums, perm, order,messageType);
+        return Objects.hashCode(topicName, writeQueueNums, readQueueNums, perm, order);
     }
 
 }

src/main/java/org/apache/rocketmq/dashboard/service/impl/ClusterServiceImpl.java

@@ -17,7 +17,6 @@
 
 package org.apache.rocketmq.dashboard.service.impl;
 
-import org.apache.rocketmq.common.attribute.TopicMessageType;
 import org.apache.rocketmq.remoting.protocol.body.ClusterInfo;
 import org.apache.rocketmq.remoting.protocol.body.KVTable;
 import org.apache.rocketmq.remoting.protocol.route.BrokerData;
@@ -31,10 +30,8 @@ import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.Arrays;
 import java.util.Map;
 import java.util.Properties;
-import java.util.stream.Collectors;
 
 @Service
 public class ClusterServiceImpl implements ClusterService {
@@ -59,9 +56,6 @@ public class ClusterServiceImpl implements ClusterService {
             }
             resultMap.put("clusterInfo", clusterInfo);
             resultMap.put("brokerServer", brokerServer);
-            // add messageType
-            resultMap.put("messageTypes", Arrays.stream(TopicMessageType.values()).sorted()
-                    .collect(Collectors.toMap(TopicMessageType::getValue, messageType ->String.format("MESSAGE_TYPE_%s",messageType.getValue()))));
             return resultMap;
         }
         catch (Exception err) {

src/main/java/org/apache/rocketmq/dashboard/service/impl/TopicServiceImpl.java

@@ -18,24 +18,25 @@
 package org.apache.rocketmq.dashboard.service.impl;
 
 import com.google.common.base.Throwables;
-import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
+import java.util.stream.Collectors;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.rocketmq.acl.common.AclClientRPCHook;
 import org.apache.rocketmq.acl.common.SessionCredentials;
 import org.apache.rocketmq.client.producer.DefaultMQProducer;
 import org.apache.rocketmq.client.producer.SendResult;
-import org.apache.rocketmq.client.producer.TransactionListener;
-import org.apache.rocketmq.client.producer.TransactionMQProducer;
-import org.apache.rocketmq.client.producer.LocalTransactionState;
 import org.apache.rocketmq.client.trace.TraceContext;
 import org.apache.rocketmq.client.trace.TraceDispatcher;
 import org.apache.rocketmq.common.MixAll;
 import org.apache.rocketmq.common.TopicConfig;
-import org.apache.rocketmq.common.attribute.TopicMessageType;
+import org.apache.rocketmq.remoting.protocol.admin.TopicStatsTable;
 import org.apache.rocketmq.common.message.Message;
-import org.apache.rocketmq.common.message.MessageExt;
+import org.apache.rocketmq.remoting.protocol.body.ClusterInfo;
+import org.apache.rocketmq.remoting.protocol.body.GroupList;
+import org.apache.rocketmq.remoting.protocol.body.TopicList;
+import org.apache.rocketmq.remoting.protocol.route.BrokerData;
+import org.apache.rocketmq.remoting.protocol.route.TopicRouteData;
 import org.apache.rocketmq.common.topic.TopicValidator;
 import org.apache.rocketmq.dashboard.config.RMQConfigure;
 import org.apache.rocketmq.dashboard.model.request.SendTopicMessageRequest;
@@ -43,12 +44,6 @@ import org.apache.rocketmq.dashboard.model.request.TopicConfigInfo;
 import org.apache.rocketmq.dashboard.service.AbstractCommonService;
 import org.apache.rocketmq.dashboard.service.TopicService;
 import org.apache.rocketmq.remoting.RPCHook;
-import org.apache.rocketmq.remoting.protocol.admin.TopicStatsTable;
-import org.apache.rocketmq.remoting.protocol.body.ClusterInfo;
-import org.apache.rocketmq.remoting.protocol.body.GroupList;
-import org.apache.rocketmq.remoting.protocol.body.TopicList;
-import org.apache.rocketmq.remoting.protocol.route.BrokerData;
-import org.apache.rocketmq.remoting.protocol.route.TopicRouteData;
 import org.apache.rocketmq.tools.command.CommandUtil;
 import org.joor.Reflect;
 import org.springframework.beans.BeanUtils;
@@ -60,11 +55,6 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.concurrent.ArrayBlockingQueue;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.stream.Collectors;
-
-import static org.apache.rocketmq.common.TopicAttributes.TOPIC_MESSAGE_TYPE_ATTRIBUTE;
 
 @Service
 public class TopicServiceImpl extends AbstractCommonService implements TopicService {
@@ -78,18 +68,18 @@ public class TopicServiceImpl extends AbstractCommonService implements TopicServ
             TopicList allTopics = mqAdminExt.fetchAllTopicList();
             TopicList sysTopics = getSystemTopicList();
             Set<String> topics =
-                    allTopics.getTopicList().stream().map(topic -> {
-                        if (!skipSysProcess && sysTopics.getTopicList().contains(topic)) {
-                            topic = String.format("%s%s", "%SYS%", topic);
-                        }
-                        return topic;
-                    }).filter(topic -> {
-                        if (skipRetryAndDlq) {
-                            return !(topic.startsWith(MixAll.RETRY_GROUP_TOPIC_PREFIX)
-                                    || topic.startsWith(MixAll.DLQ_GROUP_TOPIC_PREFIX));
-                        }
-                        return true;
-                    }).collect(Collectors.toSet());
+                allTopics.getTopicList().stream().map(topic -> {
+                    if (!skipSysProcess && sysTopics.getTopicList().contains(topic)) {
+                        topic = String.format("%s%s", "%SYS%", topic);
+                    }
+                    return topic;
+                }).filter(topic -> {
+                    if (skipRetryAndDlq) {
+                        return !(topic.startsWith(MixAll.RETRY_GROUP_TOPIC_PREFIX)
+                            || topic.startsWith(MixAll.DLQ_GROUP_TOPIC_PREFIX));
+                    }
+                    return true;
+                }).collect(Collectors.toSet());
             allTopics.getTopicList().clear();
             allTopics.getTopicList().addAll(topics);
             return allTopics;
@@ -133,15 +123,10 @@ public class TopicServiceImpl extends AbstractCommonService implements TopicServ
     public void createOrUpdate(TopicConfigInfo topicCreateOrUpdateRequest) {
         TopicConfig topicConfig = new TopicConfig();
         BeanUtils.copyProperties(topicCreateOrUpdateRequest, topicConfig);
-        String messageType = topicCreateOrUpdateRequest.getMessageType();
-        if (StringUtils.isBlank(messageType)) {
-            messageType = TopicMessageType.NORMAL.name();
-        }
-        topicConfig.setAttributes(ImmutableMap.of("+".concat(TOPIC_MESSAGE_TYPE_ATTRIBUTE.getName()), messageType));
         try {
             ClusterInfo clusterInfo = mqAdminExt.examineBrokerClusterInfo();
             for (String brokerName : changeToBrokerNameSet(clusterInfo.getClusterAddrTable(),
-                    topicCreateOrUpdateRequest.getClusterNameList(), topicCreateOrUpdateRequest.getBrokerNameList())) {
+                topicCreateOrUpdateRequest.getClusterNameList(), topicCreateOrUpdateRequest.getBrokerNameList())) {
                 mqAdminExt.createAndUpdateTopicConfig(clusterInfo.getBrokerAddrTable().get(brokerName).selectBrokerAddr(), topicConfig);
             }
         } catch (Exception err) {
@@ -171,11 +156,6 @@ public class TopicServiceImpl extends AbstractCommonService implements TopicServ
             TopicConfig topicConfig = examineTopicConfig(topic, brokerData.getBrokerName());
             BeanUtils.copyProperties(topicConfig, topicConfigInfo);
             topicConfigInfo.setBrokerNameList(Lists.newArrayList(brokerData.getBrokerName()));
-            String messageType = topicConfig.getAttributes().get(TOPIC_MESSAGE_TYPE_ATTRIBUTE.getName());
-            if (StringUtils.isBlank(messageType)) {
-                messageType = TopicMessageType.UNSPECIFIED.name();
-            }
-            topicConfigInfo.setMessageType(messageType);
             topicConfigInfoList.add(topicConfigInfo);
         }
         return topicConfigInfoList;
@@ -246,12 +226,6 @@ public class TopicServiceImpl extends AbstractCommonService implements TopicServ
         return defaultMQProducer;
     }
 
-    public TransactionMQProducer buildTransactionMQProducer(String producerGroup, RPCHook rpcHook, boolean traceEnabled) {
-        TransactionMQProducer defaultMQProducer = new TransactionMQProducer(null, producerGroup, rpcHook, traceEnabled, TopicValidator.RMQ_SYS_TRACE_TOPIC);
-        defaultMQProducer.setUseTLS(configure.isUseTLS());
-        return defaultMQProducer;
-    }
-
     private TopicList getSystemTopicList() {
         RPCHook rpcHook = null;
         boolean isEnableAcl = !StringUtils.isEmpty(configure.getAccessKey()) && !StringUtils.isEmpty(configure.getSecretKey());
@@ -275,61 +249,32 @@ public class TopicServiceImpl extends AbstractCommonService implements TopicServ
 
     @Override
     public SendResult sendTopicMessageRequest(SendTopicMessageRequest sendTopicMessageRequest) {
-        List<TopicConfigInfo> topicConfigInfos = examineTopicConfig(sendTopicMessageRequest.getTopic());
-        String messageType = topicConfigInfos.get(0).getMessageType();
+        DefaultMQProducer producer = null;
         AclClientRPCHook rpcHook = null;
         if (configure.isACLEnabled()) {
             rpcHook = new AclClientRPCHook(new SessionCredentials(
-                    configure.getAccessKey(),
-                    configure.getSecretKey()
+                configure.getAccessKey(),
+                configure.getSecretKey()
             ));
         }
-        if (TopicMessageType.TRANSACTION.getValue().equals(messageType)) {
-            // transaction message
-            TransactionListener transactionListener = new TransactionListenerImpl();
-
-            TransactionMQProducer producer = buildTransactionMQProducer(MixAll.SELF_TEST_PRODUCER_GROUP, rpcHook, sendTopicMessageRequest.isTraceEnabled());
-            producer.setInstanceName(String.valueOf(System.currentTimeMillis()));
-            producer.setNamesrvAddr(configure.getNamesrvAddr());
-            producer.setTransactionListener(transactionListener);
-            try {
-                producer.start();
-                Message msg = new Message(sendTopicMessageRequest.getTopic(),
-                        sendTopicMessageRequest.getTag(),
-                        sendTopicMessageRequest.getKey(),
-                        sendTopicMessageRequest.getMessageBody().getBytes()
-                );
-                return producer.sendMessageInTransaction(msg, null);
-            } catch (Exception e) {
-                Throwables.throwIfUnchecked(e);
-                throw new RuntimeException(e);
-            } finally {
-                waitSendTraceFinish(producer, sendTopicMessageRequest.isTraceEnabled());
-                producer.shutdown();
-            }
-        } else {
-            // no transaction message
-            DefaultMQProducer producer = null;
-            producer = buildDefaultMQProducer(MixAll.SELF_TEST_PRODUCER_GROUP, rpcHook, sendTopicMessageRequest.isTraceEnabled());
-            producer.setInstanceName(String.valueOf(System.currentTimeMillis()));
-            producer.setNamesrvAddr(configure.getNamesrvAddr());
-            try {
-                producer.start();
-                Message msg = new Message(sendTopicMessageRequest.getTopic(),
-                        sendTopicMessageRequest.getTag(),
-                        sendTopicMessageRequest.getKey(),
-                        sendTopicMessageRequest.getMessageBody().getBytes()
-                );
-                return producer.send(msg);
-            } catch (Exception e) {
-                Throwables.throwIfUnchecked(e);
-                throw new RuntimeException(e);
-            } finally {
-                waitSendTraceFinish(producer, sendTopicMessageRequest.isTraceEnabled());
-                producer.shutdown();
-            }
+        producer = buildDefaultMQProducer(MixAll.SELF_TEST_PRODUCER_GROUP, rpcHook, sendTopicMessageRequest.isTraceEnabled());
+        producer.setInstanceName(String.valueOf(System.currentTimeMillis()));
+        producer.setNamesrvAddr(configure.getNamesrvAddr());
+        try {
+            producer.start();
+            Message msg = new Message(sendTopicMessageRequest.getTopic(),
+                sendTopicMessageRequest.getTag(),
+                sendTopicMessageRequest.getKey(),
+                sendTopicMessageRequest.getMessageBody().getBytes()
+            );
+            return producer.send(msg);
+        } catch (Exception e) {
+            Throwables.throwIfUnchecked(e);
+            throw new RuntimeException(e);
+        } finally {
+            waitSendTraceFinish(producer, sendTopicMessageRequest.isTraceEnabled());
+            producer.shutdown();
         }
-
     }
 
     private void waitSendTraceFinish(DefaultMQProducer producer, boolean traceEnabled) {
@@ -351,20 +296,4 @@ public class TopicServiceImpl extends AbstractCommonService implements TopicServ
         } catch (Exception ignore) {
         }
     }
-
-    static class TransactionListenerImpl implements TransactionListener {
-        private AtomicInteger transactionIndex = new AtomicInteger(0);
-
-        private ConcurrentHashMap<String, Integer> localTrans = new ConcurrentHashMap<>();
-
-        @Override
-        public LocalTransactionState executeLocalTransaction(Message msg, Object arg) {
-            return LocalTransactionState.COMMIT_MESSAGE;
-        }
-
-        @Override
-        public LocalTransactionState checkLocalTransaction(MessageExt msg) {
-            return LocalTransactionState.COMMIT_MESSAGE;
-        }
-    }
 }

src/main/resources/application.yml

@@ -42,9 +42,7 @@ rocketmq:
     # configure multiple namesrv addresses to manage multiple different clusters
     namesrvAddrs:
       - 127.0.0.1:9876
-    #      - 127.0.0.2:9876
-    #      - 10.151.47.32:9876;10.151.47.33:9876;10.151.47.34:9876
-    #      - 10.151.47.30:9876
+      - 127.0.0.2:9876
     # if you use rocketmq version < 3.5.8, rocketmq.config.isVIPChannel should be false.default true
     isVIPChannel:
     # timeout for mqadminExt, default 5000ms
@@ -60,8 +58,8 @@ rocketmq:
     loginRequired: false
     useTLS: false
     # set the accessKey and secretKey if you used acl
-#    accessKey: rocketmq2
-#    secretKey: 12345678
+    accessKey: # if version > 4.4.0
+    secretKey: # if version > 4.4.0
 
 threadpool:
   config:

src/main/resources/static/src/i18n/en.js

@@ -123,11 +123,5 @@ var en = {
     "GROUP_PERM":"Group Permission",
     "SYNCHRONIZE":"Synchronize Data",
     "SHOW":"Show",
-    "HIDE":"Hide",
-    "MESSAGE_TYPE":"messageType",
-    "MESSAGE_TYPE_UNSPECIFIED": "UNSPECIFIED, is NORMAL",
-    "MESSAGE_TYPE_NORMAL": "NORMAL",
-    "MESSAGE_TYPE_FIFO": "FIFO",
-    "MESSAGE_TYPE_DELAY": "DELAY",
-    "MESSAGE_TYPE_TRANSACTION": "TRANSACTION",
+    "HIDE":"Hide"
 }

src/main/resources/static/src/i18n/zh.js

@@ -124,11 +124,5 @@ var zh = {
     "GROUP_PERM":"消费组权限",
     "SYNCHRONIZE":"同步",
     "SHOW":"显示",
-    "HIDE":"隐藏",
-    "MESSAGE_TYPE":"消息类型",
-    "MESSAGE_TYPE_UNSPECIFIED": "未指定,为普通消息",
-    "MESSAGE_TYPE_NORMAL": "普通消息",
-    "MESSAGE_TYPE_FIFO": "顺序消息",
-    "MESSAGE_TYPE_DELAY": "定时/延时消息",
-    "MESSAGE_TYPE_TRANSACTION": "事务消息",
+    "HIDE":"隐藏"
 }

src/main/resources/static/src/topic.js

@@ -328,8 +328,8 @@ module.controller('topicController', ['$scope', 'ngDialog', '$http', 'Notificati
         var bIsUpdate = true;
         if (request == null) {
             request = [{
-                writeQueueNums: 8,
-                readQueueNums: 8,
+                writeQueueNums: 16,
+                readQueueNums: 16,
                 perm: 6,
                 order: false,
                 topicName: "",
@@ -355,7 +355,6 @@ module.controller('topicController', ['$scope', 'ngDialog', '$http', 'Notificati
                         topicRequestList: request,
                         allClusterNameList: Object.keys(resp.data.clusterInfo.clusterAddrTable),
                         allBrokerNameList: Object.keys(resp.data.brokerServer),
-                        allMessageTypeList: resp.data.messageTypes,
                         bIsUpdate: bIsUpdate,
                         writeOperationEnabled: $scope.writeOperationEnabled
                     }

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

@@ -50,14 +50,7 @@
                 <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">
-                    <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.getTransferedTps.split(' ')[0]| number:2}}</td>
                 <td class="text-center">{{instance.msgPutTotalTodayMorning -
                     instance.msgPutTotalYesterdayMorning}}
                 </td>

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

@@ -63,7 +63,6 @@
                             <button class="btn btn-raised btn-sm btn-primary" type="button"
                                     ng-click="openUpdateDialog(topic, sysFlag)">topic {{'CONFIG' |translate}}
                             </button>
-<!--                            todo 发送消息，根据消息类型判断-->
                             <button class="btn btn-raised btn-sm btn-primary" type="button"
                                     ng-show="{{!sysFlag}}"
                                     ng-click="openSendTopicMessageDialog(topic)">{{'SEND_MSG' | translate}}
@@ -190,18 +189,6 @@
                     <span class="text-danger" ng-show="addAppForm.topicName.$error.required">{{'TOPIC_NAME'|translate}}不能为空.</span>
                 </div>
             </div>
-            <!--            设置topic 类型 -->
-            <div class="form-group">
-                <label class="control-label col-sm-2">{{'MESSAGE_TYPE'|translate}}:</label>
-                <div class="col-sm-10">
-                    <select name="mySelectMessageType" chosen ng-disabled="ngDialogData.bIsUpdate"
-                            ng-model="item.messageType"
-                            ng-options="messageType as value | translate  disable when messageType=='UNSPECIFIED' for (messageType , value) in ngDialogData.allMessageTypeList"
-                    >
-                        <option value=""></option>
-                    </select>
-                </div>
-            </div>
             <div class="form-group">
                 <label class="control-label col-sm-2">{{'WRITE_QUEUE_NUMS'|translate}}:</label>
                 <div class="col-sm-10">