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

# Conflicts:
#	src/main/java/com/yingxin/prms/service/business/Manager.java

src/main/java/com/yingxin/prms/service/business/Manager.java

@@ -403,7 +403,9 @@ public class Manager {
         for(FlowNode node : flowNodes){
             TcpFlowNodeDto nodeDto = new TcpFlowNodeDto();
             long faultCount=0;
-
+            if(node.getServerPath()==null || node.getServerPath().isEmpty()){
+                nodeDto.setCategory("machine");
+            }else{
                 try {
                     faultCount = getFaultCount(node.getServerPath());
                     if(faultCount>0){
@@ -415,6 +417,7 @@ public class Manager {
                 } catch (Exception e) {
                     faultCount = 0;
                 }
+            }
             nodeDto.setFaultCount((int) faultCount);
             nodeDto.setKey(node.getCluster_name());
             nodeDto.setUrl(node.getServerPath());