Merge remote-tracking branch 'origin/developer' into developer

byit-myth-admin/src/main/java/com/byit/service/impl/ApiFlowServiceImpl.java

@@ -137,7 +137,7 @@ public class ApiFlowServiceImpl implements ApiFlowService {
         flow.setWorkspaceId(workspaceId);
         flow.setStartUp(FlowPropertyEnum.IS_START.getCode());
         flow.setExecType(pluginFlow.getConfig().getExecType());
-        flow.setPriority(pluginFlow.getConfig().getPriority());
+        flow.setPriority(StringUtils.isEmpty(pluginFlow.getConfig().getPriority()) || !"2".equals(pluginFlow.getConfig().getPriority()) ? "1" : pluginFlow.getConfig().getPriority());
         flow.setAlarmlAction(pluginFlow.getConfig().getAlarmlAction());
         flow.setAlarmEmail(pluginFlow.getConfig().getAlarmEmail());
         //设置可执行次数
@@ -275,7 +275,7 @@ public class ApiFlowServiceImpl implements ApiFlowService {
             node.setTriggerNextTime(StringUtils.isEmpty(((PluginNode)pluginNode).getConfig().getNodeCron()) ? null : new CronExpression(((PluginNode)pluginNode).getConfig().getNodeCron()).getNextValidTimeAfter(new Date()).getTime());
             node.setPluginUrls(((PluginNode)pluginNode).getConfig().getPluginUrls());
             node.setRoutingStrategy(StringUtils.isEmpty(((PluginNode)pluginNode).getConfig().getRoutingStrategy()) ? "RANDOM" : ((PluginNode)pluginNode).getConfig().getRoutingStrategy());
-            node.setPriority(StringUtils.isEmpty(((PluginNode)pluginNode).getConfig().getPriority()) ? "1" : ((PluginNode)pluginNode).getConfig().getPriority());
+            node.setPriority(StringUtils.isEmpty(((PluginNode)pluginNode).getConfig().getPriority()) || !"2".equals(((PluginNode)pluginNode).getConfig().getPriority()) ? "1" : ((PluginNode)pluginNode).getConfig().getPriority());
             node.setScriptUrls(((PluginNode)pluginNode).getScriptUrls());
             //设置失败重试
             if (null != ((PluginNode)pluginNode).getConfig().getFailedRetryCount()){