bug fix: getSubscribers (#750)

WeBankBlockchain · Mar 16, 2021 · 25890c8 · 25890c8
1 parent 14517b1
commit 25890c8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/weevent-file/src/main/java/com/webank/weevent/file/inner/AMOPChannel.java b/weevent-file/src/main/java/com/webank/weevent/file/inner/AMOPChannel.java
@@ -154,8 +154,8 @@ public Set<String> getSubscribers(String topic) {
                     subscriberIPs.add(nodeInfo.getIpAndPort());
                     subscriberNodeIds.add(nodeInfo.getNodeID());
                     log.info("subscribers node {}, {}", topic, nodeInfo.getNodeID(), nodeInfo.getIpAndPort());
+                    break;
                 }
-                break;
             }
         }
         log.info("getSubscribers:{} {}", subscriberIPs, subscriberNodeIds);
@@ -627,7 +627,7 @@ public byte[] receiveAmopMsg(AmopMsgIn msg) {
     }
 
     public static boolean matchTopic(String pattenTopic, String topic) {
-        if (pattenTopic == topic) {
+        if (pattenTopic.equals(topic)) {
             return true;
         }
         //verity topic

diff --git a/...essor/src/main/java/com/webank/weevent/processor/controller/TimerSchedulerController.java b/...essor/src/main/java/com/webank/weevent/processor/controller/TimerSchedulerController.java
@@ -14,6 +14,7 @@
 import org.quartz.JobDataMap;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -72,7 +73,7 @@ public BaseRspEntity deleteTimerScheduler(@RequestBody TimerScheduler timerSched
         return resEntity;
     }
 
-    @PostMapping("/checkCorn")
+    @GetMapping("/checkCorn")
     public BaseRspEntity checkCorn(@RequestParam("corn") String corn) {
         BaseRspEntity resEntity = new BaseRspEntity(ConstantsHelper.RET_SUCCESS);
         boolean validExpression = CronExpression.isValidExpression(corn);