Update

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

@@ -184,6 +184,10 @@ namespace Vbdsm.SocketClients
 
         private long CalcCurrentTime()
         {
+            // DateTime timeUtc = DateTime.UtcNow;
+            // TimeZoneInfo cstZone = TimeZoneInfo.FindSystemTimeZoneById("China Standard Time");
+            // DateTime cstTime = TimeZoneInfo.ConvertTimeFromUtc(timeUtc, cstZone);
+            // Console.WriteLine(cstTime.ToString("yyyyMMddHHmmss"));
             //long time = Convert.ToInt64($"{DateTime.Now:yyyyMMddHH}{(DateTime.Now.Minute - DateTime.Now.Minute % minuteInterval):D2}00");
             long time = Convert.ToInt64($"{DateTime.Now:yyyyMMddHHmm00}");
             time -= (time - (time / 10000) * 10000) % (MinuteInterval * 100);

VB_DSM_V2.1/Scripts/Dockers/docker-compose-web.yml

@@ -39,22 +39,23 @@ services:
     networks:
       - vbdsm-web-net
 
-#  vber-server-web:
-#    build: ../../vbdsm-web
-#    image: vbdsm-web:latest
-#    container_name: vbdsm-web
-#    restart: always
-#    ports:
-#      - "7080:8080"
-#    environment:
-#      - TZ
-#      - SERVER_PORT
-#    volumes:
-#      # 日志文件
-#      - /www/vbdsm/server-logs/web/:/vbdsm/logs/
-#    privileged: true
-#    networks:
-#      - vbdsm-web-net
+  vber-server-web:
+    build: ../../vbdsm-web
+    image: vbdsm-web:latest
+    container_name: vbdsm-web
+    restart: always
+    ports:
+      - "7080:8080"
+    environment:
+      - TZ
+      - SERVER_PORT
+    volumes:
+      # 日志文件
+      - /www/vbdsm/server-logs/web/:/vbdsm/logs/
+      - /www/vbdsm/explorer/fpt:/vbdsm/ftp/
+    privileged: true
+    networks:
+      - vbdsm-web-net
 
 
   vber-server-analysis:
@@ -141,9 +142,8 @@ services:
     image: vbdsm-hj212-data-server:latest
     container_name: vbdsm-hj212-data-server
     restart: always
-#    ports:
-#      # 内部使用了7221端口
-#      - "7776:8080"
+    ports:
+      - "7777:7777"
     environment:
       TZ: Asia/Shanghai
       PARAMS:

VB_DSM_V2.1/vbdsm-web/vbdsm-gov-new/pom.xml

@@ -7,7 +7,7 @@
     <artifactId>vbdsm-gov-new</artifactId>
     <version>2.1.0</version>
 <!--    <packaging>jar</packaging>-->
-    <packaging>jar</packaging>
+    <packaging>war</packaging>
 
 <!--    <name>${project.artifactId}</name>-->
 

VB_DSM_V2.1/vbdsm-web/vbdsm-gov-new/src/main/java/cn/vbdsm/VbdsmGovNewApplication.java

@@ -7,26 +7,26 @@ import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.web.support.SpringBootServletInitializer;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
-@EnableScheduling
-@MapperScan("cn.vbdsm.service.dao")
-@SpringBootApplication
-public class VbdsmGovNewApplication {
-
-    public static void main(String[] args) {
-        SpringApplication.run(VbdsmGovNewApplication.class, args);
-    }
-
-}
 //@EnableScheduling
 //@MapperScan("cn.vbdsm.service.dao")
 //@SpringBootApplication
-//public class VbdsmGovNewApplication extends SpringBootServletInitializer {
-//    @Override
-//    protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
-//        return application.sources(VbdsmGovNewApplication.class);
-//    }
+//public class VbdsmGovNewApplication {
+//
 //    public static void main(String[] args) {
 //        SpringApplication.run(VbdsmGovNewApplication.class, args);
 //    }
 //
 //}
+@EnableScheduling
+@MapperScan("cn.vbdsm.service.dao")
+@SpringBootApplication
+public class VbdsmGovNewApplication extends SpringBootServletInitializer {
+    @Override
+    protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
+        return application.sources(VbdsmGovNewApplication.class);
+    }
+    public static void main(String[] args) {
+        SpringApplication.run(VbdsmGovNewApplication.class, args);
+    }
+
+}