Merge remote-tracking branch 'origin/order' into order

# Conflicts:
#	hai-msg/src/main/resources/dev/application.yml

hai-msg/src/main/resources/dev/application.yml

@@ -9,7 +9,7 @@ debug: false
 #datasource数据源设置
 spring:
   datasource:
-    url: jdbc:mysql://139.159.177.244:3306/hsg_order?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false
+    url: jdbc:mysql://139.159.177.244:3306/hfkj?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false
     username: root
     password: HF123456.
     type: com.alibaba.druid.pool.DruidDataSource
@@ -32,7 +32,7 @@ spring:
     host: 139.159.177.244
     port: 36379
     password: HF123456.Redis
-    timeout: 1000
+    timeout: 36000000
     jedis:
       pool:
         max-active: 20
@@ -51,27 +51,22 @@ spring:
       # client:
       # id: provider-id
       #MQTT默认的消息推送主题，实际可在调用接口是指定
-      # default:
+    # default:
     # topic: topic
 rocketmq:
   name-server: 139.159.177.244:9876
   producer:
     #必须指定group
     group: default-group
-
   #配置日期返回至前台为时间戳
   jackson:
     serialization:
       write-dates-as-timestamps: true
 mybatis:
   mapperLocations:
-    - classpath*:sqlmap*/*.xml
+  - classpath*:sqlmap*/*.xml
   type-aliases-package:
     org.springboot.sample.entity
-  configuration:
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-    #开启MyBatis的二级缓存
-    cache-enabled: true
 
 jetcache:
   statIntervalMinutes: 15