Przeglądaj źródła

deploy 20251202

shjung 2 tygodni temu
rodzic
commit
d0bfbe2a70

+ 7 - 23
.idea/workspace.xml

@@ -6,7 +6,8 @@
   <component name="ChangeListManager">
     <list default="true" id="137ea174-7fc0-49e0-a3b0-3deac854d820" name="Changes" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/utic-traf-server/src/main/java/com/utic/center/utic/traf/server/controller/UticTrafServerRestController.java" beforeDir="false" afterPath="$PROJECT_DIR$/utic-traf-server/src/main/java/com/utic/center/utic/traf/server/controller/UticTrafServerRestController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/utic-ptis-server/src/main/java/com/utic/center/utic/ptis/server/controller/UticPtisServerRestController.java" beforeDir="false" afterPath="$PROJECT_DIR$/utic-ptis-server/src/main/java/com/utic/center/utic/ptis/server/controller/UticPtisServerRestController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/utic-stat-server/src/main/java/com/utic/center/utic/stat/server/controller/UticStatServerRestController.java" beforeDir="false" afterPath="$PROJECT_DIR$/utic-stat-server/src/main/java/com/utic/center/utic/stat/server/controller/UticStatServerRestController.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -76,24 +77,6 @@
                 <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
                 <item name="utic-center" type="f1a62948:ProjectNode" />
               </path>
-              <path>
-                <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
-                <item name="utic-center" type="f1a62948:ProjectNode" />
-                <item name="utic-traf-server" type="2d1252cf:ModuleNode" />
-              </path>
-              <path>
-                <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
-                <item name="utic-center" type="f1a62948:ProjectNode" />
-                <item name="utic-traf-server" type="2d1252cf:ModuleNode" />
-                <item name="Tasks" type="e4a08cd1:TasksNode" />
-              </path>
-              <path>
-                <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
-                <item name="utic-center" type="f1a62948:ProjectNode" />
-                <item name="utic-traf-server" type="2d1252cf:ModuleNode" />
-                <item name="Tasks" type="e4a08cd1:TasksNode" />
-                <item name="build" type="c8890929:TasksNode$1" />
-              </path>
             </expand>
             <select />
           </tree_state>
@@ -302,7 +285,7 @@
       </map>
     </option>
   </component>
-  <component name="RunManager" selected="Spring Boot.UticTrafServerApplication">
+  <component name="RunManager" selected="Gradle.utic-center:utic-ptis-server [bootJar]">
     <configuration name="utic-center:utic-ptis-server [bootJar]" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
       <ExternalSystemSettings>
         <option name="executionName" />
@@ -467,11 +450,11 @@
     </list>
     <recent_temporary>
       <list>
+        <item itemvalue="Gradle.utic-center:utic-ptis-server [bootJar]" />
+        <item itemvalue="Gradle.utic-center:utic-stat-server [bootJar]" />
         <item itemvalue="Gradle.utic-center:utic-traf-server [bootJar]" />
         <item itemvalue="Gradle.utic-center:utic-traf-server [clean]" />
-        <item itemvalue="Gradle.utic-center:utic-stat-server [bootJar]" />
         <item itemvalue="Gradle.utic-center:utic-stat-server [clean]" />
-        <item itemvalue="Gradle.utic-center:utic-ptis-server [bootJar]" />
       </list>
     </recent_temporary>
   </component>
@@ -675,7 +658,8 @@
       <workItem from="1764120821351" duration="9619000" />
       <workItem from="1764288753051" duration="4745000" />
       <workItem from="1764295010115" duration="940000" />
-      <workItem from="1764295955042" duration="816000" />
+      <workItem from="1764295955042" duration="1041000" />
+      <workItem from="1764638699990" duration="2555000" />
     </task>
     <servers />
   </component>

+ 1 - 1
utic-ptis-server/src/main/java/com/utic/center/utic/ptis/server/controller/UticPtisServerRestController.java

@@ -39,7 +39,7 @@ public class UticPtisServerRestController {
     @GetMapping(value = "/info", produces = {"application/json; charset=utf8"})
     public String infoString() {
         String sep = System.lineSeparator();
-        String heading = "---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------";
+        String heading = "----------------------------------------------------------------------------------------------------------------------------------------------------------------";
 
         StringBuilder sb = new StringBuilder();
         sb.append(sep);

+ 2 - 2
utic-stat-server/src/main/java/com/utic/center/utic/stat/server/controller/UticStatServerRestController.java

@@ -20,7 +20,7 @@ public class UticStatServerRestController {
     @GetMapping(value = "/info", produces = {"application/json; charset=utf8"})
     public String infoString() {
         String sep = System.lineSeparator();
-        String heading = "------------------------------------------------------------------------------------------------------------";
+        String heading = "---------------------------------------------------------------------------------------------------------------------";
 
         StringBuilder sb = new StringBuilder();
         sb.append(sep);
@@ -30,7 +30,7 @@ public class UticStatServerRestController {
         sb.append(String.format("Process: %s(%s), Booting: %s, Now: %s",
                 this.config.getProcessId(), this.config.getProcessName(), this.config.getBootingTime(), TimeUtils.now())).append(sep);
         sb.append(heading).append(sep);
-        sb.append(String.format("%s %-20.20s %-20.20s    TOTAL  01_TRAF  04_ETLP  05_FLTR  05_STAT  15_STAT  01_PTRN",
+        sb.append(String.format("%s %-20.20s %-20.20s    TOTAL  01_TRAF  04_ETLP  05_FLTR  05_STAT  15_STAT  1H_PTRN",
                 " SEQ", "Start", "End")).append(sep);
         sb.append(heading).append(sep);
         int total = 0;