Commit 50bfaa0d authored by fangxinjiang's avatar fangxinjiang

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	yifu-common/yifu-common-seata/src/main/resources/seata-config.yml
parents ebf99abe a6eb7af8
...@@ -28,7 +28,7 @@ seata: ...@@ -28,7 +28,7 @@ seata:
enable-degrade: false # 降级开关 enable-degrade: false # 降级开关
disable-global-transaction: false # 禁用全局事务(默认false) disable-global-transaction: false # 禁用全局事务(默认false)
grouplist: grouplist:
default: 192.168.1.65:8091 default: 192.168.1.65:33091
transport: transport:
shutdown: shutdown:
wait: 3 wait: 3
......
...@@ -50,7 +50,7 @@ spring: ...@@ -50,7 +50,7 @@ spring:
# 数据源配置 # 数据源配置
spring: spring:
redis: redis:
host: yifu-redis host: 127.0.0.1
password: '@yf_2017' password: '@yf_2017'
datasource: datasource:
type: com.zaxxer.hikari.HikariDataSource type: com.zaxxer.hikari.HikariDataSource
...@@ -66,7 +66,7 @@ spring: ...@@ -66,7 +66,7 @@ spring:
# 数据源配置 # 数据源配置
spring: spring:
redis: redis:
host: yifu-redis host: 192.168.1.65
password: '@yf_2017' password: '@yf_2017'
datasource: datasource:
type: com.zaxxer.hikari.HikariDataSource type: com.zaxxer.hikari.HikariDataSource
......
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