system and basic springboot up 2.3

pom.xml

@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.0.0.RELEASE</version>
+		<version>2.3.12.RELEASE</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
@@ -22,7 +22,8 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<java.version>1.8</java.version>
-		<spring-cloud.version>Finchley.M8</spring-cloud.version>
+		<skipTests>true</skipTests>
+		<spring-cloud.version>Hoxton.SR12</spring-cloud.version>
 	</properties>
 
 	<dependencies>
@@ -47,7 +48,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-netflix-eureka-server</artifactId>
+			<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
 		</dependency>
 		<dependency>
             <groupId>org.springframework.cloud</groupId>

src/main/java/com/chinaitop/DepotBasicApplication.java

@@ -3,11 +3,9 @@ package com.chinaitop;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
 
 @EnableEurekaClient
-@EnableDiscoveryClient
 @SpringBootApplication
 @MapperScan(basePackages = {"com.chinaitop.depot.*.mapper"})
 public class DepotBasicApplication {

src/main/resources/bootstrap.yml

@@ -1,54 +1,42 @@
 server:
   port: 9022
-  maxHttpHeaderSize: 102400
   tomcat:
     uri-encoding: utf-8
-
 # 注册中心配置
 eureka:
   client:
     service-url:
-      defaultZone: http://172.16.0.46:9511/eureka/
+      defaultZone: http://172.16.0.8:9001/eureka/,http://172.16.0.9:9001/eureka/
   instance:
     prefer-ip-address: true
     # 每隔10s发送一次心跳(默认30s)
     lease-renewal-interval-in-seconds: 10
     # 告知服务端30秒还未收到心跳的话，就将该服务移除列表(默认90s)
     lease-expiration-duration-in-seconds: 30
-
 spring:
   application:
     name: depot-basic
 
   # 数据库配置
   datasource:
-    driverClassName: com.mysql.jdbc.Driver
-    url: jdbc:mysql://172.16.0.5:3306/depot?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2b8
+    driverClassName: com.mysql.cj.jdbc.Driver
+    url: jdbc:mysql://101.36.160.140:10311/depot_yunnan?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2b8
     username: root
     password: 123456
-    #验证连接是否有效。此参数必须设置为非空字符串，下面三项设置成true才能生效
-    validation-query: SELECT 1
-    #指明连接是否被空闲连接回收器(如果有)进行检验.如果检测失败,则连接将被从池中去除.
-    test-while-idle: true
-    #指明是否在从池中取出连接前进行检验,如果检验失败,则从池中去除连接并尝试取出另一个
-    test-on-borrow: false
-    #指明是否在归还到池中前进行检验
-    test-on-return: true
-    time-between-eviction-runs-millis: 18800
   # 缓存配置
   session:
     store-type: redis
 
   redis:
-    database: 1
-    host: 172.16.0.46
-    port: 6679
+    database: 13
+    host: 172.16.0.2
+    port: 6379
     password: 123456
-    timeout: 3000
+    timeout: 3000ms
     jedis:
       pool:
         max-active: 8
-        max-wait: -1
+        max-wait: -1ms
         max-idle: 8
         min-idle: 0
   # 静态资源配置