|
|
@@ -7,11 +7,11 @@ eureka.instance.lease-expiration-duration-in-seconds=30
|
|
7
|
7
|
|
|
8
|
8
|
#数据库驱动
|
|
9
|
9
|
spring.datasource.driverClassName = com.mysql.jdbc.Driver
|
|
10
|
|
-spring.datasource.url = jdbc:mysql://172.16.0.46:3306/depot-yunnan?useUnicode=true&characterEncoding=utf-8&useSSL=false
|
|
|
10
|
+spring.datasource.url = jdbc:mysql://localhost:3306/depot_yunnan?useUnicode=true&characterEncoding=utf-8&useSSL=false
|
|
11
|
11
|
spring.datasource.username = root
|
|
12
|
|
-spring.datasource.password = 123456
|
|
|
12
|
+spring.datasource.password = root
|
|
13
|
13
|
|
|
14
|
|
-eureka.client.serviceUrl.defaultZone=http://172.16.0.46:9511/eureka/
|
|
|
14
|
+eureka.client.serviceUrl.defaultZone=http://localhost:9001/eureka/
|
|
15
|
15
|
|
|
16
|
16
|
spring.application.name=depot-web
|
|
17
|
17
|
|
|
|
@@ -20,13 +20,13 @@ spring.application.name=depot-web
|
|
20
|
20
|
#eureka.client.fetch-registry=false
|
|
21
|
21
|
|
|
22
|
22
|
# Redis数据库索引(默认为0)
|
|
23
|
|
-spring.redis.database=1
|
|
|
23
|
+spring.redis.database=0
|
|
24
|
24
|
# Redis服务器地址
|
|
25
|
|
-spring.redis.host=172.16.0.46
|
|
|
25
|
+spring.redis.host=localhost
|
|
26
|
26
|
# Redis服务器连接端口
|
|
27
|
|
-spring.redis.port=6679
|
|
|
27
|
+spring.redis.port=6379
|
|
28
|
28
|
# Redis服务器连接密码(默认为空)
|
|
29
|
|
-spring.redis.password=123456
|
|
|
29
|
+spring.redis.password=
|
|
30
|
30
|
# 连接池最大连接数(使用负值表示没有限制)
|
|
31
|
31
|
spring.redis.jedis.pool.max-active=8
|
|
32
|
32
|
# 连接池最大阻塞等待时间(使用负值表示没有限制)
|
|
|
@@ -58,7 +58,7 @@ zuul.host.socket-timeout-millis=60000
|
|
58
|
58
|
|
|
59
|
59
|
spring.servlet.multipart.max-file-size=10MB
|
|
60
|
60
|
spring.servlet.multipart.max-request-size=20MB
|
|
61
|
|
-spring.servlet.multipart.location=/var/lib/docker/uploadTmp
|
|
|
61
|
+
|
|
62
|
62
|
#图片路径
|
|
63
|
|
-web.upload-path=/home/depot/depot-web/apache-tomcat-8.0.53/webapps/ROOT/WEB-INF/classes/static
|
|
|
63
|
+web.upload-path=/Users/zhang/work/yunnan/depot-web-yunnan/src/main/resources/static
|
|
64
|
64
|
spring.resources.static-locations=classpath:/META-INF/resources/,classpath:/resources/,classpath:/static/,classpath:/public/,file:${web.upload-path}
|