application.yml update, spring.config.import.prod

tsi-comm-server/src/main/java/com/tsi/comm/server/controller/TsiCommServerRestController.java

@@ -29,7 +29,7 @@ public class TsiCommServerRestController {
     @GetMapping(value = "/info", produces = {"application/json; charset=utf8"})
     public String info() {
         String sep = System.lineSeparator();
-        String heading = "--------------------------------------------------------------------------------------------------------------------------------";
+        String heading = "----------------------------------------------------------------------------------------------------------------------------------";
 
         StringBuilder sb = new StringBuilder();
         sb.append(heading).append(sep);
@@ -50,20 +50,23 @@ public class TsiCommServerRestController {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         sdf.setTimeZone(java.util.TimeZone.getTimeZone("GMT+9"));
 
-        sb.append(String.format(" %10s %4s %7s %19s %19s %9s %6s %19s  Remote-Address", "Node ID", "INTC", "Connect", "Connect Time", "Disconnect Time", "Connected", "Closed", "Last-Recv-Time")).append(sep);
+        sb.append(String.format("   SEQ[U] %10s %4s %7s %19s %19s %9s %6s %19s  Remote-Address", "Node ID", "INTC", "Connect", "Connect Time", "Disconnect Time", "Connected", "Closed", "Last-Recv-Time")).append(sep);
         sb.append(heading).append(sep);
 
+        int ii = 1;
         for (Map.Entry<Long, TsiNodeVo> obj : this.nodeManager.getTsiNodeVoMap().entrySet()) {
             TsiNodeVo node = obj.getValue();
             String check = (node.isInstalled() ? "Y" : "N");
             check = check + (node.isSendNode() ? "Y" : "N");
             check = check + (node.isSendTest() ? "Y" : "N");
             check = check + (node.isSendCvim() ? "Y" : "N");
+            String unknownNode = "   ";
             if (node.isRegistered()) {
                 registered++;
             }
             else {
                 unknown++;
+                unknownNode = "***";
             }
 
             String connect;
@@ -71,19 +74,19 @@ public class TsiCommServerRestController {
             if (node.isConnect()) {
                 connected++;
                 connect = "Y";
-                info = NettyUtils.getRemoteAddress(node.getChannel());
+                info = NettyUtils.getRemoteIpAddress(node.getChannel());
             }
             else {
                 connect = "N";
-                info = "---";
+                info = "---.---.---.---";
             }
 
             String connectTm = sdf.format(new Date(node.getConnectTm()));
             String disconnectTm = sdf.format(new Date(node.getDisconnectTm()));
             String lastCommTm = sdf.format(new Date(node.getLastCommTm()));
 
-            sb.append(String.format(" %10s %4s %7s %19s %19s %9d %6d %19s  %s",
-                    node.getKey(), check, connect, connectTm, disconnectTm, node.getConnectCount().get(), node.getDisconnectCount().get(), lastCommTm, info)).append(sep);
+            sb.append(String.format(" %5d%3s %10s %4s %7s %19s %19s %9d %6d %19s  %s",
+                    ii++, unknownNode, node.getKey(), check, connect, connectTm, disconnectTm, node.getConnectCount().get(), node.getDisconnectCount().get(), lastCommTm, info)).append(sep);
         }
 
         sb.append(heading).append(sep);
@@ -92,5 +95,4 @@ public class TsiCommServerRestController {
         return sb.toString();
     }
 
-
 }