Merge remote-tracking branch 'origin/master'

# Conflicts:
#	yifu-common/yifu-common-seata/src/main/resources/seata-config.yml

yifu-common/yifu-common-seata/src/main/resources/seata-config.yml

@@ -28,7 +28,7 @@ seata:
     enable-degrade: false # 降级开关
     disable-global-transaction: false # 禁用全局事务（默认false）
     grouplist:
-      default: 192.168.1.65:8091
+      default: 192.168.1.65:33091
   transport:
     shutdown:
       wait: 3

yifu-provider/provider-biz/src/main/resources/application.yml

@@ -50,7 +50,7 @@ spring:
 # 数据源配置
 spring:
   redis:
-    host: yifu-redis
+    host: 127.0.0.1
     password: '@yf_2017'
   datasource:
     type: com.zaxxer.hikari.HikariDataSource
@@ -66,7 +66,7 @@ spring:
 # 数据源配置
 spring:
   redis:
-    host: yifu-redis
+    host: 192.168.1.65
     password: '@yf_2017'
   datasource:
     type: com.zaxxer.hikari.HikariDataSource