hanqingsong преди 1 година
родител
ревизия
afcde87f5f
променени са 3 файла, в които са добавени 18 реда и са изтрити 6 реда
  1. 16 4
      pom.xml
  2. 1 1
      src/main/resources/bootstrap-dev.yml
  3. 1 1
      src/main/resources/bootstrap-prod.yml

+ 16 - 4
pom.xml

@@ -14,7 +14,7 @@
14
 	<parent>
14
 	<parent>
15
 		<groupId>org.springframework.boot</groupId>
15
 		<groupId>org.springframework.boot</groupId>
16
 		<artifactId>spring-boot-starter-parent</artifactId>
16
 		<artifactId>spring-boot-starter-parent</artifactId>
17
-		<version>2.0.4.RELEASE</version>
17
+		<version>2.3.12.RELEASE</version>
18
 		<relativePath/> <!-- lookup parent from repository -->
18
 		<relativePath/> <!-- lookup parent from repository -->
19
 	</parent>
19
 	</parent>
20
 
20
 
@@ -22,7 +22,7 @@
22
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
22
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
23
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
23
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
24
 		<java.version>1.8</java.version>
24
 		<java.version>1.8</java.version>
25
-		<spring-cloud.version>Finchley.RELEASE</spring-cloud.version>
25
+		<spring-cloud.version>Hoxton.SR12</spring-cloud.version>
26
 		<skipTests>true</skipTests>
26
 		<skipTests>true</skipTests>
27
 	</properties>
27
 	</properties>
28
 
28
 
@@ -34,13 +34,25 @@
34
 		<dependency>
34
 		<dependency>
35
 			<groupId>org.mybatis.spring.boot</groupId>
35
 			<groupId>org.mybatis.spring.boot</groupId>
36
 			<artifactId>mybatis-spring-boot-starter</artifactId>
36
 			<artifactId>mybatis-spring-boot-starter</artifactId>
37
-			<version>1.3.1</version>
37
+			<version>2.1.4</version>
38
+		</dependency>
39
+		<dependency>
40
+			<groupId>com.baomidou</groupId>
41
+			<artifactId>mybatis-plus-boot-starter</artifactId>
42
+			<version>3.4.1</version>
43
+			<!--<version>2.3.3</version>-->
44
+			<!--<exclusions>
45
+                <exclusion>
46
+                    <groupId>com.github.jsqlparser</groupId>
47
+                    <artifactId>jsqlparser</artifactId>
48
+                </exclusion>
49
+            </exclusions>-->
38
 		</dependency>
50
 		</dependency>
39
 		<!-- 引入spring boot自带的pagehelper插件 -->
51
 		<!-- 引入spring boot自带的pagehelper插件 -->
40
 		<dependency>
52
 		<dependency>
41
 			<groupId>com.github.pagehelper</groupId>
53
 			<groupId>com.github.pagehelper</groupId>
42
 			<artifactId>pagehelper-spring-boot-starter</artifactId>
54
 			<artifactId>pagehelper-spring-boot-starter</artifactId>
43
-			<version>1.2.3</version>
55
+			<version>1.4.6</version>
44
 		</dependency>
56
 		</dependency>
45
 		<dependency>
57
 		<dependency>
46
 			<groupId>org.springframework.cloud</groupId>
58
 			<groupId>org.springframework.cloud</groupId>

+ 1 - 1
src/main/resources/bootstrap-dev.yml

@@ -14,7 +14,7 @@ eureka:
14
 spring:
14
 spring:
15
   # 数据库配置
15
   # 数据库配置
16
   datasource:
16
   datasource:
17
-    driver-class-name: com.mysql.jdbc.Driver
17
+    driver-class-name: com.mysql.cj.jdbc.Driver
18
     url: jdbc:mysql://172.16.0.36:3306/depot_qh?useUnicode=true&characterEncoding=utf-8&useSSL=false
18
     url: jdbc:mysql://172.16.0.36:3306/depot_qh?useUnicode=true&characterEncoding=utf-8&useSSL=false
19
     username: root
19
     username: root
20
     password: admin@1234
20
     password: admin@1234

+ 1 - 1
src/main/resources/bootstrap-prod.yml

@@ -14,7 +14,7 @@ eureka:
14
 spring:
14
 spring:
15
   # 数据库配置
15
   # 数据库配置
16
   datasource:
16
   datasource:
17
-    driver-class-name: com.mysql.jdbc.Driver
17
+    driver-class-name: com.mysql.cj.jdbc.Driver
18
     url: jdbc:mysql://172.18.93.244:3306/depot_qh?useUnicode=true&characterEncoding=utf-8&useSSL=false
18
     url: jdbc:mysql://172.18.93.244:3306/depot_qh?useUnicode=true&characterEncoding=utf-8&useSSL=false
19
     username: root
19
     username: root
20
     password: qh_admin@3579
20
     password: qh_admin@3579