zs

pom.xml

@@ -13,7 +13,7 @@
     <version>0.0.1-SNAPSHOT</version>
     <name>adaptation-master</name>
     <description>Demo project for Spring Boot</description>
-
+    <packaging>jar</packaging>
     <properties>
         <java.version>1.8</java.version>
     </properties>
@@ -25,10 +25,10 @@
         </dependency>
 
         <!--webSocket 后台向前端推送消息-->
-        <dependency>
+        <!--<dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-websocket</artifactId>
-        </dependency>
+        </dependency>-->
         <dependency>
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
@@ -95,11 +95,11 @@
             <artifactId>commons-compress</artifactId>
             <version>1.8.1</version>
         </dependency>
-        <dependency>
+       <!-- <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-websocket</artifactId>
-<!--            <version>4.3.17.RELEASE</version>-->
-        </dependency>
+&lt;!&ndash;            <version>4.3.17.RELEASE</version>&ndash;&gt;
+        </dependency>-->
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -131,11 +131,6 @@
             <artifactId>snakeyaml</artifactId>
             <version>1.25</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.zookeeper</groupId>
-            <artifactId>zookeeper</artifactId>
-            <version>3.3.4</version>
-        </dependency>
         <dependency>
             <groupId>ant</groupId>
             <artifactId>ant</artifactId>
@@ -160,6 +155,14 @@
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.5</version>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 

src/main/java/com/zjty/adaptationmaster/base/configuration/WebSocketConfig.java

@@ -2,12 +2,11 @@ package com.zjty.adaptationmaster.base.configuration;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.web.socket.server.standard.ServerEndpointExporter;
 
 @Configuration
 public class WebSocketConfig {
-    @Bean
+    /*@Bean
     public ServerEndpointExporter serverEndpointExporter() {
         return new ServerEndpointExporter();
-    }
+    }*/
 }

src/main/java/com/zjty/adaptationmaster/base/enums/Const.java

 package com.zjty.adaptationmaster.base.enums;
 
+
+import org.apache.tomcat.websocket.server.WsFilter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;

src/main/resources/application-dev.properties

 # mysql数据库配置
-spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.datasource.url=jdbc:mysql://localhost:3306/adaptation?useSSL=false&serverTimezone=UTC&characterEncoding=utf-8
-spring.datasource.username=root
-spring.datasource.password=root
+spring.datasource.driver-class-name=org.postgresql.Driver
+spring.datasource.url=jdbc:postgresql://localhost:5866/adaptation
+spring.datasource.username=sysdba
+spring.datasource.password=highgo@123
 

src/main/resources/application.properties

@@ -38,6 +38,9 @@ spring.thymeleaf.cache=false
 spring.mvc.static-path-pattern=/**
 spring.resources.static-locations=classpath:/uploads/
 
+spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.PostgreSQLDialect
+spring.jpa.properties.hibernate.temp.use_jdbc_metadata_defaults = false
+
 #highgo
 highgo.driver=org.postgresql.Driver
 highgo.connectionType=postgresql