Merge branch '2.2.0' of http://shvber.com:8083/Git/VSDSM_SERVER into 2.2.0

VB_DSM_DATA/VbdsmMockData/Vbdsm.Hj212/SocketClients/TpcClient.cs

@@ -13,7 +13,7 @@ namespace Vbdsm.SocketClients
         private Dictionary<string, AsyncTcpSession> Clients { get; }
 
         private int MaxErrorCount { get; }
-        private int MinuteInterval => 15;
+        private int MinuteInterval => 5;
         private long LastRequestTime { get; set; }
         private int ErrorCount { get; set; }
 

VB_DSM_V2.1/vbdsm-data-upload/vbdsm-hj212/vbdsm-hj212-server/src/main/java/cn/vbdsm/hj212/server/executor/ReaTimeExector.java

@@ -50,8 +50,8 @@ public class ReaTimeExector implements IExecutor {
             request.getCtx().channel().writeAndFlush(response);
             return;
         }
-        //校正时间 15分钟间隔
-        time = time - (time - (time / 10000) * 10000) % 1500;
+        //校正时间 5分钟间隔
+        time = time - (time - (time / 10000) * 10000) % 500;
 
 
         DataUploadRequest dataUpload = DataUploadRequest.parse(cp);

VB_DSM_V2.1/vbdsm-web/vbdsm-gov-new/src/main/resources/config/application-dev.yml

@@ -1,5 +1,5 @@
 server:
-  port: 8085
+  port: 7085
 tg:
   db:
     sharding:

VB_DSM_V2.1/vbdsm-web/vbdsm-gov-new/src/main/resources/config/application-prod.yml

@@ -1,5 +1,5 @@
 server:
-  port: 8085
+  port: 7085
 tg:
   db:
     sharding:

VB_DSM_V2.1/vbdsm-web/vbdsm-gov-new/src/main/resources/config/application-test.yml

@@ -1,5 +1,5 @@
 server:
-  port: 8085
+  port: 7085
 tg:
   db:
     sharding:

VB_DSM_V2.1/vbdsm-web/vbdsm-passport/src/main/resources/product/log4j-cfg.xml

@@ -14,7 +14,7 @@
         <param name="append" value="true"/>
         <param name="datePattern" value="'.'yyyy-MM-dd"/>
         <layout class="org.apache.log4j.PatternLayout">
-            <param name="ConversionPattern" value="[%-5p] [%d{yyyy-MM-dd HH:mm:ss}] %c - %m%n"/>
+             <param name="ConversionPattern" value="[%-5p] [%d{yyyy-MM-dd HH:mm:ss}] %c - %m%n"/>
         </layout>
         <filter class="org.apache.log4j.varia.LevelRangeFilter">
             <param name="AcceptOnMatch" value="true"/>