Przeglądaj źródła

修改启动配置

hanqingsong 2 lat temu
rodzic
commit
ba27609a1e

+ 2 - 13
pom.xml

@@ -14,7 +14,7 @@
14 14
 	<parent>
15 15
 		<groupId>org.springframework.boot</groupId>
16 16
 		<artifactId>spring-boot-starter-parent</artifactId>
17
-		<version>2.0.0.RELEASE</version>
17
+		<version>2.0.4.RELEASE</version>
18 18
 		<relativePath/> <!-- lookup parent from repository -->
19 19
 	</parent>
20 20
 
@@ -39,17 +39,6 @@
39 39
 			<groupId>mysql</groupId>
40 40
 			<artifactId>mysql-connector-java</artifactId>
41 41
 		</dependency>
42
-		<!-- gbase依赖包 -->  
43
-		<dependency>
44
-	      	<groupId>com.gbase8s</groupId>
45
-	      	<artifactId>ifxjdbc</artifactId>
46
-	      	<version>1.0</version>
47
-	    </dependency>
48
-    	<dependency>
49
-      		<groupId>com.gbase</groupId>
50
-      		<artifactId>druid</artifactId>
51
-      		<version>1.0.28</version>
52
-    	</dependency>
53 42
 		<!-- 引入spring boot自带的pagehelper插件 -->
54 43
 		<dependency>
55 44
 			<groupId>com.github.pagehelper</groupId>
@@ -58,7 +47,7 @@
58 47
 		</dependency>
59 48
 		<dependency>
60 49
 			<groupId>org.springframework.cloud</groupId>
61
-			<artifactId>spring-cloud-starter-netflix-eureka-server</artifactId>
50
+			<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
62 51
 		</dependency>
63 52
 		<dependency>
64 53
             <groupId>org.springframework.cloud</groupId>

+ 0 - 2
src/main/java/com/chinaitop/depot/DepotKeeperAccountApplication.java

@@ -15,8 +15,6 @@ import com.github.pagehelper.autoconfigure.PageHelperAutoConfiguration;
15 15
 public class DepotKeeperAccountApplication {
16 16
 
17 17
 	public static void main(String[] args) {
18
-		System.setProperty("druid.testWhileIdle", "true");
19
-		System.setProperty("druid.validationQuery", "SELECT 1 FROM DUAL");
20 18
 		SpringApplication.run(DepotKeeperAccountApplication.class, args);
21 19
 	}
22 20
 }

+ 11 - 12
src/main/resources/bootstrap.yml

@@ -9,7 +9,7 @@ eureka:
9 9
     service-url:
10 10
       defaultZone: http://localhost:9001/eureka/
11 11
   instance:
12
-    hostname: 172.16.0.16
12
+    hostname: 127.0.0.1
13 13
     prefer-ip-address: true
14 14
     # 每隔10s发送一次心跳(默认30s)
15 15
     lease-renewal-interval-in-seconds: 10
@@ -25,24 +25,23 @@ spring:
25 25
     name: depot-keeper-account
26 26
   # 数据库配置
27 27
   datasource:
28
-    type: com.alibaba.druid.pool.DruidDataSource
29
-    driver-class-name: com.gbasedbt.jdbc.IfxDriver
30
-    url: jdbc:gbasedbt-sqli://101.36.160.140:19089/depot:INFORMIXSERVER=gbaseserver;NEWCODESET=GB18030,GB18030-2000,5488;DB_LOCALE=zh_cn.GB18030-2000;GL_USEGLU=1;IFX_USE_STRENC=true;characterEncoding=utf8;
31
-    username: gbasedbt
32
-    password: cDbK2S0go8
28
+    driver-class-name: com.mysql.jdbc.Driver
29
+    url: jdbc:mysql://101.36.160.140:10311/depot_qh?useUnicode=true&characterEncoding=utf-8&useSSL=false
30
+    username: root
31
+    password: admin@1234
33 32
   # 缓存配置
34 33
   session:
35 34
     store-type: redis
36 35
   redis:
37
-    database: 3
38
-    host: 172.16.0.2
39
-    port: 6379
40
-    password: 123456
41
-    timeout: 3000
36
+    database: 0
37
+    host: 101.36.160.140
38
+    port: 10316
39
+    password: admin@1234
40
+    timeout: 3000ms
42 41
     jedis:
43 42
       pool:
44 43
         max-active: 8
45
-        max-wait: -1
44
+        max-wait: -1ms
46 45
         max-idle: 8
47 46
         min-idle: 0
48 47
   #jackson: