Commit 6dc5c169 authored by zuoadmin's avatar zuoadmin

Merge branch 'dev' into 'master'

1,修改配置文件

See merge request !14
parents de11378a c29e8c60
...@@ -15,7 +15,7 @@ spring: ...@@ -15,7 +15,7 @@ spring:
name: service-web name: service-web
# 环境 dev|test|prod # 环境 dev|test|prod
profiles: profiles:
active: dev active: prod
# jackson时间格式化 # jackson时间格式化
jackson: jackson:
time-zone: GMT+8 time-zone: GMT+8
...@@ -58,8 +58,7 @@ mybatis-plus: ...@@ -58,8 +58,7 @@ mybatis-plus:
gexiang: gexiang:
redis: redis:
# hostname: 172.21.6.6 hostname: 172.21.6.6
hostname: 127.0.0.1
database: 0 database: 0
port: 6379 port: 6379
maxTotal: 1000 maxTotal: 1000
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment