Merge branch 'dev' into test

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/logback.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
     <!-- 日志存放路径 -->
-	<property name="log.path" value="./logs/client-admin-web" />
+	<property name="log.path" value="/data/logs/client-admin-web" />
     <!-- 日志输出格式 -->
 	<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
 

liquidnet-bus-config/liquidnet-config/liquidnet-client-admin-web.yml

@@ -61,23 +61,27 @@ server:
 
 # 日志配置-------------------------------------------------------
 logging:
-  #  config: ${liquidnet.logfile.config}
-  file:
-    name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}.log
-    max-size: 200MB
-  pattern:
-    file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
-    console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
-    rolling-file-name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
   level:
-    root: info
-    #以下是为指定包设置日志级别
-    com:
-      liquidnet:
-        client:
-          admin: debug
-    org:
-      springframework: warn
+    com.ruoyi: debug
+    org.springframework: warn
+#logging:
+#  #  config: ${liquidnet.logfile.config}
+#  file:
+#    name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}.log
+#    max-size: 200MB
+#  pattern:
+#    file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
+#    console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
+#    rolling-file-name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
+#  level:
+#    root: info
+#    #以下是为指定包设置日志级别
+#    com:
+#      liquidnet:
+#        client:
+#          admin: debug
+#    org:
+#      springframework: warn
 
 # -----------------------------------------------------------
 

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/DataImpl.java

@@ -798,6 +798,7 @@ public class DataImpl {
                 }
                 roadShowsList.add(roadShows);
             }
+            kylinRoadShowsService.saveBatch(roadShowsList);
 
             return true;
         } catch (Exception e) {

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinOrderTicketsServiceImpl.java

@@ -705,7 +705,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
                 map.put("payType", payAgainParam.getPayType());
                 map.put("payCode", payResultVo.getCode());
                 map.put("updatedAt", DateUtil.Formatter.yyyyMMddHHmmss.format(orderTickets.getUpdatedAt()));
-                map.put("changeDate", DateUtil.Formatter.yyyyMMddHHmmss.format(orderTickets.getUpdatedAt()));
+                map.put("changeDate", orderTickets.getUpdatedAt());
                 mongoTemplate.getCollection(KylinOrderTicketVo.class.getSimpleName()).updateOne(
                         Query.query(Criteria.where("orderTicketsId").is(payAgainParam.getOrderId())).getQueryObject(),
                         new BasicDBObject("$set", mongoConverter.convertToMongoType(map))