Procházet zdrojové kódy

spring boot/could 升级

hanqingsong před 2 roky
rodič
revize
10ce0cdfc2
2 změnil soubory, kde provedl 7 přidání a 6 odebrání
  1. 3 2
      pom.xml
  2. 4 4
      src/main/resources/bootstrap.yml

+ 3 - 2
pom.xml

@@ -16,14 +16,15 @@
16 16
     <parent>
17 17
         <groupId>org.springframework.boot</groupId>
18 18
         <artifactId>spring-boot-starter-parent</artifactId>
19
-        <version>2.0.2.RELEASE</version>
19
+        <version>2.3.12.RELEASE</version>
20 20
         <relativePath/> <!-- lookup parent from repository -->
21 21
     </parent>
22 22
     <properties>
23 23
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
24 24
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
25 25
         <java.version>1.8</java.version>
26
-        <spring-cloud.version>Finchley.RELEASE</spring-cloud.version>
26
+        <skipTests>true</skipTests>
27
+        <spring-cloud.version>Hoxton.SR12</spring-cloud.version>
27 28
     </properties>
28 29
 
29 30
     <dependencies>

+ 4 - 4
src/main/resources/bootstrap.yml

@@ -33,7 +33,7 @@ spring:
33 33
     name: depot-intelligent
34 34
   # 数据库配置
35 35
   datasource:
36
-    driver-class-name: com.mysql.jdbc.Driver
36
+    driver-class-name: com.mysql.cj.jdbc.Driver
37 37
     url: jdbc:mysql://101.36.160.140:10311/depot-yunnan?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=UTC
38 38
     username: root
39 39
     password: 123456
@@ -92,7 +92,7 @@ spring:
92 92
     name: depot-intelligent
93 93
   # 数据库配置
94 94
   datasource:
95
-    driver-class-name: com.mysql.jdbc.Driver
95
+    driver-class-name: com.mysql.cj.jdbc.Driver
96 96
     url: jdbc:mysql://121.37.6.72:3306/depot-neimeng?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=UTC
97 97
     username: root
98 98
     password: Huawei1234%^&*
@@ -104,11 +104,11 @@ spring:
104 104
     host: 121.37.6.72
105 105
     port: 6379
106 106
     password: 123456
107
-    timeout: 3000
107
+    timeout: 3000ms
108 108
     jedis:
109 109
       pool:
110 110
         max-active: 8
111
-        max-wait: -1
111
+        max-wait: -1ms
112 112
         max-idle: 8
113 113
         min-idle: 0
114 114
   # 静态资源配置