system and basic springboot up 2.3

pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.1.2.RELEASE</version>
+        <version>2.3.12.RELEASE</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>com.chinaitop</groupId>
@@ -15,7 +15,8 @@
 
     <properties>
         <java.version>1.8</java.version>
-        <spring-cloud.version>Greenwich.RELEASE</spring-cloud.version>
+        <skipTests>true</skipTests>
+        <spring-cloud.version>Hoxton.SR12</spring-cloud.version>
     </properties>
 
     <dependencies>
@@ -112,12 +113,6 @@
 		    <artifactId>commons-io</artifactId>
 		    <version>1.3.2</version>
 		</dependency>
-		
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-        </dependency>
         <!-- 阿里巴巴json -->
 		<dependency>
 			<groupId>com.alibaba</groupId>

src/main/java/com/chinaitop/depot/DepotSystemApplication.java

@@ -3,13 +3,11 @@ package com.chinaitop.depot;
 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;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 @EnableEurekaClient
-@EnableDiscoveryClient
 @SpringBootApplication
 @EnableFeignClients
 @EnableTransactionManagement

src/main/resources/bootstrap.yml

@@ -7,7 +7,7 @@ server:
 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)
@@ -21,22 +21,22 @@ spring:
   # 数据库配置
   datasource:
     driverClassName: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://172.16.0.5:3306/depot?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2b8
+    url: jdbc:mysql://101.36.160.140:10311/depot_yunnan?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2b8
     username: root
     password: 123456
   # 缓存配置
   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
   # 静态资源配置
@@ -47,7 +47,7 @@ web:
   upload-path: /upload
 
 #设置全局变量判断是云端还是库端；1云端，2本地
-localOrCloud: 1
+localOrCloud: 2
 
 #设置出入库连接
 forTheConnection: http://101.36.160.210:9901/Base/Main.action