Przeglądaj źródła

train-server 调整

zhanghaijun 2 lat temu
rodzic
commit
17bcbf59be
100 zmienionych plików z 478 dodań i 144 usunięć
  1. 2 1
      pom.xml
  2. 3 3
      train-common/train-common-web/src/main/java/top/haijunit/web/interceptor/WebInvokeTimeInterceptor.java
  3. 0 0
      train-demo/README.md
  4. 83 0
      train-demo/pom.xml
  5. 0 0
      train-demo/src/assembly/assembly.xml
  6. 0 0
      train-demo/src/assembly/bin/date.bat
  7. 0 0
      train-demo/src/assembly/bin/msgbox.vbs
  8. 0 0
      train-demo/src/assembly/bin/run.bat
  9. 0 0
      train-demo/src/assembly/bin/start-dev.bat
  10. 0 0
      train-demo/src/assembly/bin/start.bat
  11. 0 0
      train-demo/src/assembly/bin/start.sh
  12. 0 0
      train-demo/src/assembly/bin/stop.bat
  13. 0 0
      train-demo/src/assembly/bin/wait-for-it.sh
  14. 16 0
      train-demo/src/main/java/top/haijunit/train/TrainDemoMain.java
  15. 0 0
      train-demo/src/main/java/top/haijunit/train/config/WebSocketConfig.java
  16. 0 0
      train-demo/src/main/java/top/haijunit/train/config/properties/RedisProperties.java
  17. 0 0
      train-demo/src/main/java/top/haijunit/train/config/properties/TrainProperties.java
  18. 36 0
      train-demo/src/main/java/top/haijunit/train/controller/DemoController.java
  19. 0 0
      train-demo/src/main/java/top/haijunit/train/controller/TrainController.java
  20. 30 0
      train-demo/src/main/java/top/haijunit/train/controller/WebSocketController.java
  21. 0 0
      train-demo/src/main/java/top/haijunit/train/domain/SignEntity.java
  22. 0 0
      train-demo/src/main/java/top/haijunit/train/domain/SignEnum.java
  23. 0 0
      train-demo/src/main/java/top/haijunit/train/domain/StatusEnum.java
  24. 0 0
      train-demo/src/main/java/top/haijunit/train/domain/UserEntity.java
  25. 0 0
      train-demo/src/main/java/top/haijunit/train/domain/UserStatusEnum.java
  26. 0 0
      train-demo/src/main/java/top/haijunit/train/domain/constant/ButtonStopStatus.java
  27. 0 0
      train-demo/src/main/java/top/haijunit/train/domain/constant/DirectionEnum.java
  28. 0 0
      train-demo/src/main/java/top/haijunit/train/domain/constant/RouteStatus.java
  29. 0 0
      train-demo/src/main/java/top/haijunit/train/domain/constant/SelectionStatus.java
  30. 0 0
      train-demo/src/main/java/top/haijunit/train/domain/constant/SignalStatus.java
  31. 0 0
      train-demo/src/main/java/top/haijunit/train/domain/constant/StationDoorStatus.java
  32. 0 0
      train-demo/src/main/java/top/haijunit/train/domain/constant/SwitchStatus.java
  33. 0 0
      train-demo/src/main/java/top/haijunit/train/domain/constant/TrainConstant.java
  34. 0 0
      train-demo/src/main/java/top/haijunit/train/domain/dto/PlatformDto.java
  35. 0 0
      train-demo/src/main/java/top/haijunit/train/domain/dto/RouteDto.java
  36. 0 0
      train-demo/src/main/java/top/haijunit/train/domain/dto/TrainDto.java
  37. 0 0
      train-demo/src/main/java/top/haijunit/train/domain/dto/TravelDto.java
  38. 0 0
      train-demo/src/main/java/top/haijunit/train/domain/entity/EmergencyStopEntity.java
  39. 0 0
      train-demo/src/main/java/top/haijunit/train/domain/entity/PlatformEntity.java
  40. 0 0
      train-demo/src/main/java/top/haijunit/train/domain/entity/RouteEntity.java
  41. 0 0
      train-demo/src/main/java/top/haijunit/train/domain/entity/SelectionEntity.java
  42. 0 0
      train-demo/src/main/java/top/haijunit/train/domain/entity/SignStopEntity.java
  43. 0 0
      train-demo/src/main/java/top/haijunit/train/domain/entity/SignalEntity.java
  44. 0 0
      train-demo/src/main/java/top/haijunit/train/domain/entity/StationDoorEntity.java
  45. 0 0
      train-demo/src/main/java/top/haijunit/train/domain/entity/StationEntity.java
  46. 0 0
      train-demo/src/main/java/top/haijunit/train/domain/entity/SwitchEntity.java
  47. 0 0
      train-demo/src/main/java/top/haijunit/train/domain/entity/TrainEntity.java
  48. 0 0
      train-demo/src/main/java/top/haijunit/train/domain/mapper/EmergencyStopMapper.java
  49. 0 0
      train-demo/src/main/java/top/haijunit/train/domain/mapper/PlatformMapper.java
  50. 0 0
      train-demo/src/main/java/top/haijunit/train/domain/mapper/RouteMapper.java
  51. 0 0
      train-demo/src/main/java/top/haijunit/train/domain/mapper/SelectionMapper.java
  52. 0 0
      train-demo/src/main/java/top/haijunit/train/domain/mapper/SignStopMapper.java
  53. 0 0
      train-demo/src/main/java/top/haijunit/train/domain/mapper/SignalMapper.java
  54. 0 0
      train-demo/src/main/java/top/haijunit/train/domain/mapper/StationDoorMapper.java
  55. 0 0
      train-demo/src/main/java/top/haijunit/train/domain/mapper/StationMapper.java
  56. 0 0
      train-demo/src/main/java/top/haijunit/train/domain/mapper/SwitchMapper.java
  57. 0 0
      train-demo/src/main/java/top/haijunit/train/domain/mapper/TrainMapper.java
  58. 0 0
      train-demo/src/main/java/top/haijunit/train/mapper/SignMapper.java
  59. 0 0
      train-demo/src/main/java/top/haijunit/train/mapper/UserMapper.java
  60. 0 0
      train-demo/src/main/java/top/haijunit/train/service/RouteService.java
  61. 0 0
      train-demo/src/main/java/top/haijunit/train/service/TrainApplication.java
  62. 0 0
      train-demo/src/main/java/top/haijunit/train/service/UserService.java
  63. 0 0
      train-demo/src/main/java/top/haijunit/train/service/simulation/train/TrainGlobalHolder.java
  64. 0 0
      train-demo/src/main/java/top/haijunit/train/service/simulation/train/TrainTravel.java
  65. 0 0
      train-demo/src/main/java/top/haijunit/train/service/simulation/train/domain/TrainDate.java
  66. 0 0
      train-demo/src/main/java/top/haijunit/train/service/simulation/train/domain/TrainDateStatus.java
  67. 0 0
      train-demo/src/main/java/top/haijunit/train/service/simulation/train/domain/TrainRoute.java
  68. 0 0
      train-demo/src/main/java/top/haijunit/train/service/simulation/train/service/RouteService.java
  69. 0 0
      train-demo/src/main/java/top/haijunit/train/service/simulation/train/train.txt
  70. 0 0
      train-demo/src/main/java/top/haijunit/train/service/simulation/train/utils/RouteUtil.java
  71. 0 0
      train-demo/src/main/java/top/haijunit/train/utils/CalculateUtil.java
  72. 0 0
      train-demo/src/main/java/top/haijunit/train/utils/RedisManage.java
  73. 0 0
      train-demo/src/main/java/top/haijunit/train/websocket/WebSocketServer.java
  74. 0 0
      train-demo/src/main/resources/application-demo.yml
  75. 97 0
      train-demo/src/main/resources/application.yml
  76. 0 0
      train-demo/src/main/resources/db/changelog/db-server-train-1.xml
  77. 0 0
      train-demo/src/main/resources/db/changelog/db-server-train.xml
  78. 0 0
      train-demo/src/main/resources/db/changelog/db-server.xml
  79. 0 0
      train-demo/src/main/resources/db/changelog/db_sign.txt
  80. 0 0
      train-demo/src/main/resources/db/changelog/信号灯-signal.txt
  81. 0 0
      train-demo/src/main/resources/db/changelog/停车标-stopSign.txt
  82. 0 0
      train-demo/src/main/resources/db/changelog/列车-train.txt
  83. 0 0
      train-demo/src/main/resources/db/changelog/区段-selection.txt
  84. 0 0
      train-demo/src/main/resources/db/changelog/站台-platform.txt
  85. 0 0
      train-demo/src/main/resources/db/changelog/站台门-stationDoor.txt
  86. 0 0
      train-demo/src/main/resources/db/changelog/紧急停车按钮-emergencyStop.txt
  87. 0 0
      train-demo/src/main/resources/db/changelog/车站-station.txt
  88. 0 0
      train-demo/src/main/resources/db/changelog/进路-route.txt
  89. 0 0
      train-demo/src/main/resources/db/changelog/道岔-switch.txt
  90. 106 0
      train-demo/src/main/resources/logback.xml
  91. 0 0
      train-demo/src/main/resources/static/index.html
  92. 75 0
      train-demo/src/main/resources/templates/webSocket.html
  93. 1 1
      train-server/src/test/java/top/haijunit/train/TrainServerMainTests.java
  94. 0 0
      train-demo/src/test/java/top/haijunit/train/mapper/UserMapperTest.java
  95. 4 40
      train-server/pom.xml
  96. 6 2
      train-server/src/main/java/top/haijunit/train/TrainServerMain.java
  97. 11 18
      train-server/src/main/java/top/haijunit/train/controller/DemoController.java
  98. 0 2
      train-server/src/main/java/top/haijunit/train/controller/WebSocketController.java
  99. 8 77
      train-server/src/main/resources/application.yml
  100. 0 0
      train-server/src/main/resources/templates/webSocket.html

+ 2 - 1
pom.xml

@@ -28,8 +28,9 @@
     </properties>
     </properties>
 
 
     <modules>
     <modules>
-        <module>train-server</module>
         <module>train-common</module>
         <module>train-common</module>
+        <module>train-server</module>
+        <module>train-demo</module>
     </modules>
     </modules>
 
 
     <!-- 依赖声明 -->
     <!-- 依赖声明 -->

+ 3 - 3
train-common/train-common-web/src/main/java/top/haijunit/web/interceptor/WebInvokeTimeInterceptor.java

@@ -37,14 +37,14 @@ public class WebInvokeTimeInterceptor implements HandlerInterceptor {
                     BufferedReader reader = request.getReader();
                     BufferedReader reader = request.getReader();
                     jsonParam = IoUtil.read(reader);
                     jsonParam = IoUtil.read(reader);
                 }
                 }
-                log.debug("[PLUS]开始请求 => URL[{}],参数类型[json],参数:[{}]", url, jsonParam);
+                log.info("[TRAIN]开始请求 => URL[{}],参数类型[json],参数:[{}]", url, jsonParam);
             } else {
             } else {
                 Map<String, String[]> parameterMap = request.getParameterMap();
                 Map<String, String[]> parameterMap = request.getParameterMap();
                 if (MapUtil.isNotEmpty(parameterMap)) {
                 if (MapUtil.isNotEmpty(parameterMap)) {
                     String parameters = JsonUtils.toJsonString(parameterMap);
                     String parameters = JsonUtils.toJsonString(parameterMap);
-                    log.debug("[PLUS]开始请求 => URL[{}],参数类型[param],参数:[{}]", url, parameters);
+                    log.info("[TRAIN]开始请求 => URL[{}],参数类型[param],参数:[{}]", url, parameters);
                 } else {
                 } else {
-                    log.debug("[PLUS]开始请求 => URL[{}],无参数", url);
+                    log.info("[TRAIN]开始请求 => URL[{}],无参数", url);
                 }
                 }
             }
             }
         }
         }

train-server/README.md → train-demo/README.md


+ 83 - 0
train-demo/pom.xml

@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>top.haijunit</groupId>
+        <artifactId>mul-agent-virtual-simulation-system</artifactId>
+        <version>${revision}</version>
+    </parent>
+    <artifactId>train-demo</artifactId>
+
+    <properties>
+        <alibaba-ttl.version>2.14.2</alibaba-ttl.version>
+    </properties>
+    <dependencies>
+        <dependency>
+            <groupId>top.haijunit</groupId>
+            <artifactId>train-common-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>top.haijunit</groupId>
+            <artifactId>train-common-mybatis</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>top.haijunit</groupId>
+            <artifactId>train-common-websocket</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>top.haijunit</groupId>
+            <artifactId>train-common-web</artifactId>
+        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.springframework.boot</groupId>-->
+<!--            <artifactId>spring-boot-starter</artifactId>-->
+<!--        </dependency>-->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-thymeleaf</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.liquibase</groupId>
+            <artifactId>liquibase-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/org.redisson/redisson-spring-boot-starter -->
+        <dependency>
+            <groupId>org.redisson</groupId>
+            <artifactId>redisson-spring-boot-starter</artifactId>
+            <version>3.17.1</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+</project>

train-server/src/assembly/assembly.xml → train-demo/src/assembly/assembly.xml


train-server/src/assembly/bin/date.bat → train-demo/src/assembly/bin/date.bat


train-server/src/assembly/bin/msgbox.vbs → train-demo/src/assembly/bin/msgbox.vbs


train-server/src/assembly/bin/run.bat → train-demo/src/assembly/bin/run.bat


train-server/src/assembly/bin/start-dev.bat → train-demo/src/assembly/bin/start-dev.bat


train-server/src/assembly/bin/start.bat → train-demo/src/assembly/bin/start.bat


train-server/src/assembly/bin/start.sh → train-demo/src/assembly/bin/start.sh


train-server/src/assembly/bin/stop.bat → train-demo/src/assembly/bin/stop.bat


train-server/src/assembly/bin/wait-for-it.sh → train-demo/src/assembly/bin/wait-for-it.sh


+ 16 - 0
train-demo/src/main/java/top/haijunit/train/TrainDemoMain.java

@@ -0,0 +1,16 @@
+package top.haijunit.train;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.context.metrics.buffering.BufferingApplicationStartup;
+
+@SpringBootApplication
+public class TrainDemoMain {
+
+    public static void main(String[] args) {
+        SpringApplication application = new SpringApplication(TrainDemoMain.class);
+        application.setApplicationStartup(new BufferingApplicationStartup(2048));
+        application.run(args);
+    }
+
+}

train-server/src/main/java/top/haijunit/train/config/WebSocketConfig.java → train-demo/src/main/java/top/haijunit/train/config/WebSocketConfig.java


train-server/src/main/java/top/haijunit/train/config/properties/RedisProperties.java → train-demo/src/main/java/top/haijunit/train/config/properties/RedisProperties.java


train-server/src/main/java/top/haijunit/train/config/properties/TrainProperties.java → train-demo/src/main/java/top/haijunit/train/config/properties/TrainProperties.java


+ 36 - 0
train-demo/src/main/java/top/haijunit/train/controller/DemoController.java

@@ -0,0 +1,36 @@
+package top.haijunit.train.controller;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import top.haijunit.common.domain.ResultData;
+import top.haijunit.train.domain.UserEntity;
+import top.haijunit.train.service.UserService;
+
+import java.util.List;
+
+/**
+ * @author zhanghaijun
+ * @date 2023/11/7 15:30
+ * @description 示例请求入口
+ */
+@Slf4j
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/demo")
+public class DemoController {
+
+    private final UserService userService;
+
+    @GetMapping("")
+    public ResultData<String> demo() {
+        return ResultData.success("");
+    }
+
+    @GetMapping("/user")
+    public ResultData<List<UserEntity>> getUser() {
+        return ResultData.success(userService.getUserAll());
+    }
+}

train-server/src/main/java/top/haijunit/train/controller/TrainController.java → train-demo/src/main/java/top/haijunit/train/controller/TrainController.java


+ 30 - 0
train-demo/src/main/java/top/haijunit/train/controller/WebSocketController.java

@@ -0,0 +1,30 @@
+package top.haijunit.train.controller;
+
+import top.haijunit.train.websocket.WebSocketServer;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.servlet.ModelAndView;
+
+/**
+ * @author zhanghaijun
+ * @date 2023/11/3 16:36
+ * @description 测试websocket界面
+ */
+@RestController
+public class WebSocketController {
+
+    @GetMapping("/page")
+    public ModelAndView page() {
+        return new ModelAndView("webSocket");
+    }
+
+    @RequestMapping("/push/{toUID}")
+    public ResponseEntity<String> pushToClient(String message, @PathVariable String toUID) throws Exception {
+        WebSocketServer.sendInfo(message, toUID);
+        return ResponseEntity.ok("Send Success!");
+    }
+
+}

train-server/src/main/java/top/haijunit/train/domain/SignEntity.java → train-demo/src/main/java/top/haijunit/train/domain/SignEntity.java


train-server/src/main/java/top/haijunit/train/domain/SignEnum.java → train-demo/src/main/java/top/haijunit/train/domain/SignEnum.java


train-server/src/main/java/top/haijunit/train/domain/StatusEnum.java → train-demo/src/main/java/top/haijunit/train/domain/StatusEnum.java


train-server/src/main/java/top/haijunit/train/domain/UserEntity.java → train-demo/src/main/java/top/haijunit/train/domain/UserEntity.java


train-server/src/main/java/top/haijunit/train/domain/UserStatusEnum.java → train-demo/src/main/java/top/haijunit/train/domain/UserStatusEnum.java


train-server/src/main/java/top/haijunit/train/domain/constant/ButtonStopStatus.java → train-demo/src/main/java/top/haijunit/train/domain/constant/ButtonStopStatus.java


train-server/src/main/java/top/haijunit/train/domain/constant/DirectionEnum.java → train-demo/src/main/java/top/haijunit/train/domain/constant/DirectionEnum.java


train-server/src/main/java/top/haijunit/train/domain/constant/RouteStatus.java → train-demo/src/main/java/top/haijunit/train/domain/constant/RouteStatus.java


train-server/src/main/java/top/haijunit/train/domain/constant/SelectionStatus.java → train-demo/src/main/java/top/haijunit/train/domain/constant/SelectionStatus.java


train-server/src/main/java/top/haijunit/train/domain/constant/SignalStatus.java → train-demo/src/main/java/top/haijunit/train/domain/constant/SignalStatus.java


train-server/src/main/java/top/haijunit/train/domain/constant/StationDoorStatus.java → train-demo/src/main/java/top/haijunit/train/domain/constant/StationDoorStatus.java


train-server/src/main/java/top/haijunit/train/domain/constant/SwitchStatus.java → train-demo/src/main/java/top/haijunit/train/domain/constant/SwitchStatus.java


train-server/src/main/java/top/haijunit/train/domain/constant/TrainConstant.java → train-demo/src/main/java/top/haijunit/train/domain/constant/TrainConstant.java


train-server/src/main/java/top/haijunit/train/domain/dto/PlatformDto.java → train-demo/src/main/java/top/haijunit/train/domain/dto/PlatformDto.java


train-server/src/main/java/top/haijunit/train/domain/dto/RouteDto.java → train-demo/src/main/java/top/haijunit/train/domain/dto/RouteDto.java


train-server/src/main/java/top/haijunit/train/domain/dto/TrainDto.java → train-demo/src/main/java/top/haijunit/train/domain/dto/TrainDto.java


train-server/src/main/java/top/haijunit/train/domain/dto/TravelDto.java → train-demo/src/main/java/top/haijunit/train/domain/dto/TravelDto.java


train-server/src/main/java/top/haijunit/train/domain/entity/EmergencyStopEntity.java → train-demo/src/main/java/top/haijunit/train/domain/entity/EmergencyStopEntity.java


train-server/src/main/java/top/haijunit/train/domain/entity/PlatformEntity.java → train-demo/src/main/java/top/haijunit/train/domain/entity/PlatformEntity.java


train-server/src/main/java/top/haijunit/train/domain/entity/RouteEntity.java → train-demo/src/main/java/top/haijunit/train/domain/entity/RouteEntity.java


train-server/src/main/java/top/haijunit/train/domain/entity/SelectionEntity.java → train-demo/src/main/java/top/haijunit/train/domain/entity/SelectionEntity.java


train-server/src/main/java/top/haijunit/train/domain/entity/SignStopEntity.java → train-demo/src/main/java/top/haijunit/train/domain/entity/SignStopEntity.java


train-server/src/main/java/top/haijunit/train/domain/entity/SignalEntity.java → train-demo/src/main/java/top/haijunit/train/domain/entity/SignalEntity.java


train-server/src/main/java/top/haijunit/train/domain/entity/StationDoorEntity.java → train-demo/src/main/java/top/haijunit/train/domain/entity/StationDoorEntity.java


train-server/src/main/java/top/haijunit/train/domain/entity/StationEntity.java → train-demo/src/main/java/top/haijunit/train/domain/entity/StationEntity.java


train-server/src/main/java/top/haijunit/train/domain/entity/SwitchEntity.java → train-demo/src/main/java/top/haijunit/train/domain/entity/SwitchEntity.java


train-server/src/main/java/top/haijunit/train/domain/entity/TrainEntity.java → train-demo/src/main/java/top/haijunit/train/domain/entity/TrainEntity.java


train-server/src/main/java/top/haijunit/train/domain/mapper/EmergencyStopMapper.java → train-demo/src/main/java/top/haijunit/train/domain/mapper/EmergencyStopMapper.java


train-server/src/main/java/top/haijunit/train/domain/mapper/PlatformMapper.java → train-demo/src/main/java/top/haijunit/train/domain/mapper/PlatformMapper.java


train-server/src/main/java/top/haijunit/train/domain/mapper/RouteMapper.java → train-demo/src/main/java/top/haijunit/train/domain/mapper/RouteMapper.java


train-server/src/main/java/top/haijunit/train/domain/mapper/SelectionMapper.java → train-demo/src/main/java/top/haijunit/train/domain/mapper/SelectionMapper.java


train-server/src/main/java/top/haijunit/train/domain/mapper/SignStopMapper.java → train-demo/src/main/java/top/haijunit/train/domain/mapper/SignStopMapper.java


train-server/src/main/java/top/haijunit/train/domain/mapper/SignalMapper.java → train-demo/src/main/java/top/haijunit/train/domain/mapper/SignalMapper.java


train-server/src/main/java/top/haijunit/train/domain/mapper/StationDoorMapper.java → train-demo/src/main/java/top/haijunit/train/domain/mapper/StationDoorMapper.java


train-server/src/main/java/top/haijunit/train/domain/mapper/StationMapper.java → train-demo/src/main/java/top/haijunit/train/domain/mapper/StationMapper.java


train-server/src/main/java/top/haijunit/train/domain/mapper/SwitchMapper.java → train-demo/src/main/java/top/haijunit/train/domain/mapper/SwitchMapper.java


train-server/src/main/java/top/haijunit/train/domain/mapper/TrainMapper.java → train-demo/src/main/java/top/haijunit/train/domain/mapper/TrainMapper.java


train-server/src/main/java/top/haijunit/train/mapper/SignMapper.java → train-demo/src/main/java/top/haijunit/train/mapper/SignMapper.java


train-server/src/main/java/top/haijunit/train/mapper/UserMapper.java → train-demo/src/main/java/top/haijunit/train/mapper/UserMapper.java


train-server/src/main/java/top/haijunit/train/service/RouteService.java → train-demo/src/main/java/top/haijunit/train/service/RouteService.java


train-server/src/main/java/top/haijunit/train/service/TrainApplication.java → train-demo/src/main/java/top/haijunit/train/service/TrainApplication.java


train-server/src/main/java/top/haijunit/train/service/UserService.java → train-demo/src/main/java/top/haijunit/train/service/UserService.java


train-server/src/main/java/top/haijunit/train/service/simulation/train/TrainGlobalHolder.java → train-demo/src/main/java/top/haijunit/train/service/simulation/train/TrainGlobalHolder.java


train-server/src/main/java/top/haijunit/train/service/simulation/train/TrainTravel.java → train-demo/src/main/java/top/haijunit/train/service/simulation/train/TrainTravel.java


train-server/src/main/java/top/haijunit/train/service/simulation/train/domain/TrainDate.java → train-demo/src/main/java/top/haijunit/train/service/simulation/train/domain/TrainDate.java


train-server/src/main/java/top/haijunit/train/service/simulation/train/domain/TrainDateStatus.java → train-demo/src/main/java/top/haijunit/train/service/simulation/train/domain/TrainDateStatus.java


train-server/src/main/java/top/haijunit/train/service/simulation/train/domain/TrainRoute.java → train-demo/src/main/java/top/haijunit/train/service/simulation/train/domain/TrainRoute.java


train-server/src/main/java/top/haijunit/train/service/simulation/train/service/RouteService.java → train-demo/src/main/java/top/haijunit/train/service/simulation/train/service/RouteService.java


train-server/src/main/java/top/haijunit/train/service/simulation/train/train.txt → train-demo/src/main/java/top/haijunit/train/service/simulation/train/train.txt


train-server/src/main/java/top/haijunit/train/service/simulation/train/utils/RouteUtil.java → train-demo/src/main/java/top/haijunit/train/service/simulation/train/utils/RouteUtil.java


train-server/src/main/java/top/haijunit/train/utils/CalculateUtil.java → train-demo/src/main/java/top/haijunit/train/utils/CalculateUtil.java


train-server/src/main/java/top/haijunit/train/utils/RedisManage.java → train-demo/src/main/java/top/haijunit/train/utils/RedisManage.java


train-server/src/main/java/top/haijunit/train/websocket/WebSocketServer.java → train-demo/src/main/java/top/haijunit/train/websocket/WebSocketServer.java


train-server/src/main/resources/application-demo.yml → train-demo/src/main/resources/application-demo.yml


+ 97 - 0
train-demo/src/main/resources/application.yml

@@ -0,0 +1,97 @@
+train:
+  routes:
+    - S0102
+    - S0104
+    - S0202
+    - S0204
+    - S0302
+    - S0304
+    - S0306
+---
+server:
+  port: 8086
+  servlet:
+    encoding:
+      charset: UTF-8
+      force: true
+    context-path: /
+  undertow:
+    max-http-post-size: -1
+    buffer-size: 512
+    direct-buffers: true
+    threads:
+      io: 8
+      worker: 256
+spring:
+  application:
+    name: train-server
+  profiles:
+    active: @profiles.active@
+  servlet:
+    multipart:
+      max-file-size: 10MB
+      max-request-size: 20MB
+  jackson:
+    date-format: yyyy-MM-dd HH:mm:ss
+    serialization:
+      indent_output: false
+      fail_on_empty_beans: false
+    deserialization:
+      fail_on_unknown_properties: false
+  mvc:
+    format:
+      date-time: yyyy-MM-dd HH:mm:ss
+  liquibase:
+    enabled: true
+    change-log: classpath:/db/changelog/db-server.xml
+  datasource:
+    type: com.zaxxer.hikari.HikariDataSource
+    driver-class-name: org.h2.Driver
+    url: jdbc:h2:./store/db_train;IGNORECASE=TRUE;MODE=MySQL;AUTO_SERVER=TRUE;AUTO_SERVER_PORT=9090;USER=root;PASSWORD=123456
+    username: root
+    password: 123456
+    hikari:
+      minimum-idle: 10
+      maximum-pool-size: 20
+      connectionTimeout: 30000
+      validationTimeout: 5000
+      idleTimeout: 600000
+      maxLifetime: 1800000
+      connectionTestQuery: SELECT 1
+      keepaliveTime: 30000
+  freemarker:
+    enabled: true
+    request-context-attribute: request
+    prefix: /templates/
+    suffix: .html
+    content-type: text/html
+    cache: false
+    charset: UTF-8
+    allow-request-override: false
+    expose-request-attributes: true
+    expose-session-attributes: true
+    expose-spring-macro-helpers: true
+  h2:
+    console:
+      enabled: true
+      path: /h2
+      settings:
+        trace: false
+        web-allow-others: true
+logging:
+  level:
+    top.haijunit: @logging.level@
+    org.springframework: warn
+    org.hibernate.validator: warn
+    org.apache: warn
+  config: classpath:logback.xml
+
+# MyBatisPlus配置
+# https://baomidou.com/config/
+mybatis-plus:
+  mapperPackage: top.haijunit.train.**.mapper
+  mapperLocations: classpath*:mapper/**/*Mapper.xml
+  typeAliasesPackage: top.haijunit.**.domain
+  global-config:
+    dbConfig:
+      idType: ASSIGN_ID

train-server/src/main/resources/db/changelog/db-server-train-1.xml → train-demo/src/main/resources/db/changelog/db-server-train-1.xml


train-server/src/main/resources/db/changelog/db-server-train.xml → train-demo/src/main/resources/db/changelog/db-server-train.xml


train-server/src/main/resources/db/changelog/db-server.xml → train-demo/src/main/resources/db/changelog/db-server.xml


train-server/src/main/resources/db/changelog/db_sign.txt → train-demo/src/main/resources/db/changelog/db_sign.txt


train-server/src/main/resources/db/changelog/信号灯-signal.txt → train-demo/src/main/resources/db/changelog/信号灯-signal.txt


train-server/src/main/resources/db/changelog/停车标-stopSign.txt → train-demo/src/main/resources/db/changelog/停车标-stopSign.txt


train-server/src/main/resources/db/changelog/列车-train.txt → train-demo/src/main/resources/db/changelog/列车-train.txt


train-server/src/main/resources/db/changelog/区段-selection.txt → train-demo/src/main/resources/db/changelog/区段-selection.txt


train-server/src/main/resources/db/changelog/站台-platform.txt → train-demo/src/main/resources/db/changelog/站台-platform.txt


train-server/src/main/resources/db/changelog/站台门-stationDoor.txt → train-demo/src/main/resources/db/changelog/站台门-stationDoor.txt


train-server/src/main/resources/db/changelog/紧急停车按钮-emergencyStop.txt → train-demo/src/main/resources/db/changelog/紧急停车按钮-emergencyStop.txt


train-server/src/main/resources/db/changelog/车站-station.txt → train-demo/src/main/resources/db/changelog/车站-station.txt


train-server/src/main/resources/db/changelog/进路-route.txt → train-demo/src/main/resources/db/changelog/进路-route.txt


train-server/src/main/resources/db/changelog/道岔-switch.txt → train-demo/src/main/resources/db/changelog/道岔-switch.txt


+ 106 - 0
train-demo/src/main/resources/logback.xml

@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration scan="true" scanPeriod="60 seconds" debug="false">
+    <!-- 日志存放路径 -->
+    <property name="log.path" value="logs"/>
+    <property name="console.log.pattern" value="%red(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) - %msg%n"/>
+    <property name="log.pattern" value="%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n"/>
+
+    <!-- 控制台输出 -->
+    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>${console.log.pattern}</pattern>
+            <charset>utf-8</charset>
+        </encoder>
+    </appender>
+    <!-- 控制台输出 -->
+    <appender name="file_console" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${log.path}/console.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 日志文件名格式 -->
+            <fileNamePattern>${log.path}/%d{yyyy-MM-dd}/console.log</fileNamePattern>
+            <!-- 日志最大 7天 -->
+            <maxHistory>7</maxHistory>
+        </rollingPolicy>
+        <encoder>
+            <pattern>${log.pattern}</pattern>
+            <charset>utf-8</charset>
+        </encoder>
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <!-- 过滤的级别 -->
+            <level>INFO</level>
+        </filter>
+    </appender>
+
+    <!-- 系统日志输出 -->
+    <appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${log.path}/info.log</file>
+        <!-- 循环政策:基于时间创建日志文件 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 日志文件名格式 -->
+            <fileNamePattern>${log.path}/%d{yyyy-MM-dd}/info.log</fileNamePattern>
+            <!-- 日志最大的历史 60天 -->
+            <maxHistory>60</maxHistory>
+        </rollingPolicy>
+        <encoder>
+            <pattern>${log.pattern}</pattern>
+        </encoder>
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <!-- 过滤的级别 -->
+            <level>INFO</level>
+            <!-- 匹配时的操作:接收(记录) -->
+            <onMatch>ACCEPT</onMatch>
+            <!-- 不匹配时的操作:拒绝(不记录) -->
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${log.path}/error.log</file>
+        <!-- 循环政策:基于时间创建日志文件 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 日志文件名格式 -->
+            <fileNamePattern>${log.path}/%d{yyyy-MM-dd}/error.log</fileNamePattern>
+            <!-- 日志最大的历史 60天 -->
+            <maxHistory>60</maxHistory>
+        </rollingPolicy>
+        <encoder>
+            <pattern>${log.pattern}</pattern>
+        </encoder>
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <!-- 过滤的级别 -->
+            <level>ERROR</level>
+            <!-- 匹配时的操作:接收(记录) -->
+            <onMatch>ACCEPT</onMatch>
+            <!-- 不匹配时的操作:拒绝(不记录) -->
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <!-- info异步输出 -->
+    <appender name="async_info" class="ch.qos.logback.classic.AsyncAppender">
+        <!-- 不丢失日志.默认的,如果队列的80%已满,则会丢弃TRACT、DEBUG、INFO级别的日志 -->
+        <discardingThreshold>0</discardingThreshold>
+        <!-- 更改默认的队列的深度,该值会影响性能.默认值为256 -->
+        <queueSize>512</queueSize>
+        <!-- 添加附加的appender,最多只能添加一个 -->
+        <appender-ref ref="file_info"/>
+    </appender>
+
+    <!-- error异步输出 -->
+    <appender name="async_error" class="ch.qos.logback.classic.AsyncAppender">
+        <!-- 不丢失日志.默认的,如果队列的80%已满,则会丢弃TRACT、DEBUG、INFO级别的日志 -->
+        <discardingThreshold>0</discardingThreshold>
+        <!-- 更改默认的队列的深度,该值会影响性能.默认值为256 -->
+        <queueSize>512</queueSize>
+        <!-- 添加附加的appender,最多只能添加一个 -->
+        <appender-ref ref="file_error"/>
+    </appender>
+
+    <!--系统操作日志-->
+    <root level="info">
+        <appender-ref ref="console"/>
+        <appender-ref ref="async_info"/>
+        <appender-ref ref="async_error"/>
+        <appender-ref ref="file_console"/>
+    </root>
+</configuration>

train-server/src/main/resources/static/index.html → train-demo/src/main/resources/static/index.html


+ 75 - 0
train-demo/src/main/resources/templates/webSocket.html

@@ -0,0 +1,75 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <title>WebSocket消息通知</title>
+</head>
+<script src="https://cdn.bootcss.com/jquery/3.3.1/jquery.js"></script>
+<script>
+    var socket;
+    //打开WebSocket
+    function openSocket() {
+        if (typeof (WebSocket) === "undefined") {
+            console.log("您的浏览器不支持WebSocket");
+        } else {
+            console.log("您的浏览器支持WebSocket");
+            //实现化WebSocket对象,指定要连接的服务器地址与端口,建立连接.
+            var socketUrl = "http://localhost:8086/socket/" + $("#uid").val();
+            //将https与http协议替换为ws协议
+            socketUrl = socketUrl.replace("https", "ws").replace("http", "ws");
+            console.log(socketUrl);
+            if (socket != null) {
+                socket.close();8
+                socket = null;
+            }
+            socket = new WebSocket(socketUrl);
+            //打开事件
+            socket.onopen = function () {
+                console.log("WebSocket已打开");
+                //socket.send("这是来自客户端的消息" + location.href + new Date());
+            };
+            //获得消息事件
+            socket.onmessage = function (msg) {
+                console.log(msg.data);
+                //发现消息进入,开始处理前端触发逻辑
+            };
+            //关闭事件
+            socket.onclose = function () {
+                console.log("WebSocket已关闭");
+            };
+            //发生了错误事件
+            socket.onerror = function () {
+                console.log("WebSocket发生了错误");
+            }
+        }
+    }
+
+    //发送消息
+    function sendMessage() {
+        if (typeof (WebSocket) === "undefined") {
+            console.log("您的浏览器不支持WebSocket");
+        } else {
+            console.log("您的浏览器支持WebSocket");
+            console.log('{"toUID":"' + $("#toUID").val() + '","Msg":"' + $("#msg").val() + '"}');
+            socket.send('{"toUID":"' + $("#toUID").val() + '","Msg":"' + $("#msg").val() + '"}');
+        }
+    }
+</script>
+<body>
+<p>【uid】:
+<div><input id="uid" name="uid" type="text" value="1"></div>
+<p>【toUID】:
+<div><input id="toUID" name="toUID" type="text" value="2"></div>
+<p>【Msg】:
+<div><input id="msg" name="msg" type="text" value="hello WebSocket2"></div>
+<p>【第一步操作:】:
+<div>
+    <button onclick="openSocket()">开启socket</button>
+</div>
+<p>【第二步操作:】:
+<div>
+    <button onclick="sendMessage()">发送消息</button>
+</div>
+</body>
+
+</html>

+ 1 - 1
train-server/src/test/java/top/haijunit/train/TrainServerMainTests.java

@@ -4,7 +4,7 @@ import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.SpringBootTest;
 
 
 @SpringBootTest
 @SpringBootTest
-class TrainServerMainTests {
+class TrainDemoMainTests {
 
 
     @Test
     @Test
     void contextLoads() {
     void contextLoads() {

train-server/src/test/java/top/haijunit/train/mapper/UserMapperTest.java → train-demo/src/test/java/top/haijunit/train/mapper/UserMapperTest.java


+ 4 - 40
train-server/pom.xml

@@ -1,17 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <modelVersion>4.0.0</modelVersion>
     <parent>
     <parent>
         <groupId>top.haijunit</groupId>
         <groupId>top.haijunit</groupId>
         <artifactId>mul-agent-virtual-simulation-system</artifactId>
         <artifactId>mul-agent-virtual-simulation-system</artifactId>
         <version>${revision}</version>
         <version>${revision}</version>
     </parent>
     </parent>
+
     <artifactId>train-server</artifactId>
     <artifactId>train-server</artifactId>
+    <packaging>jar</packaging>
 
 
-    <properties>
-        <alibaba-ttl.version>2.14.2</alibaba-ttl.version>
-    </properties>
     <dependencies>
     <dependencies>
         <dependency>
         <dependency>
             <groupId>top.haijunit</groupId>
             <groupId>top.haijunit</groupId>
@@ -19,51 +17,17 @@
         </dependency>
         </dependency>
         <dependency>
         <dependency>
             <groupId>top.haijunit</groupId>
             <groupId>top.haijunit</groupId>
-            <artifactId>train-common-mybatis</artifactId>
+            <artifactId>train-common-web</artifactId>
         </dependency>
         </dependency>
         <dependency>
         <dependency>
             <groupId>top.haijunit</groupId>
             <groupId>top.haijunit</groupId>
             <artifactId>train-common-websocket</artifactId>
             <artifactId>train-common-websocket</artifactId>
         </dependency>
         </dependency>
-        <dependency>
-            <groupId>top.haijunit</groupId>
-            <artifactId>train-common-web</artifactId>
-        </dependency>
-<!--        <dependency>-->
-<!--            <groupId>org.springframework.boot</groupId>-->
-<!--            <artifactId>spring-boot-starter</artifactId>-->
-<!--        </dependency>-->
         <dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-thymeleaf</artifactId>
             <artifactId>spring-boot-starter-thymeleaf</artifactId>
         </dependency>
         </dependency>
-        <dependency>
-            <groupId>org.liquibase</groupId>
-            <artifactId>liquibase-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.h2database</groupId>
-            <artifactId>h2</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <!-- https://mvnrepository.com/artifact/org.redisson/redisson-spring-boot-starter -->
-        <dependency>
-            <groupId>org.redisson</groupId>
-            <artifactId>redisson-spring-boot-starter</artifactId>
-            <version>3.17.1</version>
-        </dependency>
     </dependencies>
     </dependencies>
-
     <build>
     <build>
         <plugins>
         <plugins>
             <plugin>
             <plugin>

+ 6 - 2
train-server/src/main/java/top/haijunit/train/TrainServerMain.java

@@ -4,13 +4,17 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.context.metrics.buffering.BufferingApplicationStartup;
 import org.springframework.boot.context.metrics.buffering.BufferingApplicationStartup;
 
 
+/**
+ * @author zhang
+ * @date 2023/11/22 22:50
+ * @description 启动类
+ */
 @SpringBootApplication
 @SpringBootApplication
 public class TrainServerMain {
 public class TrainServerMain {
-
     public static void main(String[] args) {
     public static void main(String[] args) {
         SpringApplication application = new SpringApplication(TrainServerMain.class);
         SpringApplication application = new SpringApplication(TrainServerMain.class);
         application.setApplicationStartup(new BufferingApplicationStartup(2048));
         application.setApplicationStartup(new BufferingApplicationStartup(2048));
+        // application.setBannerMode(Banner.Mode.OFF);
         application.run(args);
         application.run(args);
     }
     }
-
 }
 }

+ 11 - 18
train-server/src/main/java/top/haijunit/train/controller/DemoController.java

@@ -2,35 +2,28 @@ package top.haijunit.train.controller;
 
 
 import lombok.RequiredArgsConstructor;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
 import top.haijunit.common.domain.ResultData;
 import top.haijunit.common.domain.ResultData;
-import top.haijunit.train.domain.UserEntity;
-import top.haijunit.train.service.UserService;
-
-import java.util.List;
 
 
 /**
 /**
- * @author zhanghaijun
- * @date 2023/11/7 15:30
- * @description 示例请求入口
+ * @author zhang
+ * @date 2023/11/22 22:53
+ * @description [一句话描述该类的功能]
  */
  */
-@Slf4j
-@RequiredArgsConstructor
-@RestController
+@Controller
 @RequestMapping("/demo")
 @RequestMapping("/demo")
 public class DemoController {
 public class DemoController {
 
 
-    private final UserService userService;
-
     @GetMapping("")
     @GetMapping("")
+    @ResponseBody
     public ResultData<String> demo() {
     public ResultData<String> demo() {
         return ResultData.success("");
         return ResultData.success("");
     }
     }
 
 
-    @GetMapping("/user")
-    public ResultData<List<UserEntity>> getUser() {
-        return ResultData.success(userService.getUserAll());
+    @RequestMapping("/page")
+    public ModelAndView page() {
+        return new ModelAndView("webSocket");
     }
     }
 }
 }

+ 0 - 2
train-server/src/main/java/top/haijunit/train/controller/WebSocketController.java

@@ -1,6 +1,5 @@
 package top.haijunit.train.controller;
 package top.haijunit.train.controller;
 
 
-import top.haijunit.train.websocket.WebSocketServer;
 import org.springframework.http.ResponseEntity;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -23,7 +22,6 @@ public class WebSocketController {
 
 
     @RequestMapping("/push/{toUID}")
     @RequestMapping("/push/{toUID}")
     public ResponseEntity<String> pushToClient(String message, @PathVariable String toUID) throws Exception {
     public ResponseEntity<String> pushToClient(String message, @PathVariable String toUID) throws Exception {
-        WebSocketServer.sendInfo(message, toUID);
         return ResponseEntity.ok("Send Success!");
         return ResponseEntity.ok("Send Success!");
     }
     }
 
 

+ 8 - 77
train-server/src/main/resources/application.yml

@@ -1,13 +1,3 @@
-train:
-  routes:
-    - S0102
-    - S0104
-    - S0202
-    - S0204
-    - S0302
-    - S0304
-    - S0306
----
 server:
 server:
   port: 8086
   port: 8086
   servlet:
   servlet:
@@ -15,50 +5,15 @@ server:
       charset: UTF-8
       charset: UTF-8
       force: true
       force: true
     context-path: /
     context-path: /
-  undertow:
-    max-http-post-size: -1
-    buffer-size: 512
-    direct-buffers: true
-    threads:
-      io: 8
-      worker: 256
+logging:
+  level:
+    top.haijunit: @logging.level@
+    top.haijunit.web: debug
+    org.springframework: warn
+    org.hibernate.validator: warn
+    org.apache: warn
+  config: classpath:logback.xml
 spring:
 spring:
-  application:
-    name: train-server
-  profiles:
-    active: @profiles.active@
-  servlet:
-    multipart:
-      max-file-size: 10MB
-      max-request-size: 20MB
-  jackson:
-    date-format: yyyy-MM-dd HH:mm:ss
-    serialization:
-      indent_output: false
-      fail_on_empty_beans: false
-    deserialization:
-      fail_on_unknown_properties: false
-  mvc:
-    format:
-      date-time: yyyy-MM-dd HH:mm:ss
-  liquibase:
-    enabled: true
-    change-log: classpath:/db/changelog/db-server.xml
-  datasource:
-    type: com.zaxxer.hikari.HikariDataSource
-    driver-class-name: org.h2.Driver
-    url: jdbc:h2:./store/db_train;IGNORECASE=TRUE;MODE=MySQL;AUTO_SERVER=TRUE;AUTO_SERVER_PORT=9090;USER=root;PASSWORD=123456
-    username: root
-    password: 123456
-    hikari:
-      minimum-idle: 10
-      maximum-pool-size: 20
-      connectionTimeout: 30000
-      validationTimeout: 5000
-      idleTimeout: 600000
-      maxLifetime: 1800000
-      connectionTestQuery: SELECT 1
-      keepaliveTime: 30000
   freemarker:
   freemarker:
     enabled: true
     enabled: true
     request-context-attribute: request
     request-context-attribute: request
@@ -71,27 +26,3 @@ spring:
     expose-request-attributes: true
     expose-request-attributes: true
     expose-session-attributes: true
     expose-session-attributes: true
     expose-spring-macro-helpers: true
     expose-spring-macro-helpers: true
-  h2:
-    console:
-      enabled: true
-      path: /h2
-      settings:
-        trace: false
-        web-allow-others: true
-logging:
-  level:
-    top.haijunit: @logging.level@
-    org.springframework: warn
-    org.hibernate.validator: warn
-    org.apache: warn
-  config: classpath:logback.xml
-
-# MyBatisPlus配置
-# https://baomidou.com/config/
-mybatis-plus:
-  mapperPackage: top.haijunit.train.**.mapper
-  mapperLocations: classpath*:mapper/**/*Mapper.xml
-  typeAliasesPackage: top.haijunit.**.domain
-  global-config:
-    dbConfig:
-      idType: ASSIGN_ID

+ 0 - 0
train-server/src/main/resources/templates/webSocket.html


Niektóre pliki nie zostały wyświetlone z powodu dużej ilości zmienionych plików