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

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-common/liquidnet-common-base/src/main/java/com/liquidnet/commons/lang/util/DateUtil.java

@@ -37,7 +37,7 @@ public abstract class DateUtil {
         yyyyMMddHHmmss("yyyy-MM-dd HH:mm:ss"),
         yyyyMMddHHmmssTrim("yyyyMMddHHmmss"),
         yyyyMMddHHmmssSSS("yyyyMMddHHmmssSSS"),
-        yyyyMMddHHmmssSSSUnTrim("yyyyMMddHHmmssSSS"),
+        yyyyMMddHHmmssSSSUnTrim("yyyy-MM-dd HH:mm:ss:SSS"),
         yyyyMMddHHmmssS("yyyy-MM-dd HH:mm:ss.S"),
         ddHHmmssTrim("ddHHmmss"),
         yyyy_MM_dd_zh("yyyy年MM月dd日"),

liquidnet-bus-common/liquidnet-common-service-base/src/main/java/com/liquidnet/service/base/UserPathDto.java

@@ -42,6 +42,6 @@ public class UserPathDto implements Serializable {
         instance.params = params.toString().equals("") ? "NanParams" : params.toString();
         instance.result = result.toString().equals("") ? "NanResults" : result.toString();
         instance.userAgent = ServletUtils.getRequest().getHeader("User-Agent");
-        return "MDSKY.NOW.ELK." + uid == "UID" ? CurrentUtil.getCliIpAddr() : uid + " = " + JsonUtils.toJson(instance);
+        return "MDSKY.NOW.ELK." + (uid.equals("UID") ? CurrentUtil.getCliIpAddr() : uid )+ " = " + JsonUtils.toJson(instance);
     }
 }

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

@@ -376,7 +376,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
             currentTime = System.currentTimeMillis();
             AdamAddressesVo addressesVo = orderUtils.getAddress(uid, payOrderParam.getAddressId());//feignAdamBaseClient.queryAddresses(payOrderParam.getAddressId(), uid).getData();
             orderTickets.setExpressContacts(addressesVo.getName());
-            orderTickets.setExpressAddress(addressesVo.getAddress());
+            orderTickets.setExpressAddress(addressesVo.getProvince()+addressesVo.getCity()+addressesVo.getCounty()+addressesVo.getAddress());
             orderTickets.setExpressPhone(addressesVo.getPhone());
             orderTickets.setGetTicketType("express");
             currentTime = System.currentTimeMillis() - currentTime;
@@ -412,7 +412,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
 
         //生成订单 order_ticket_relation
         KylinOrderTicketRelations orderTicketRelations = new KylinOrderTicketRelations();
-        String orderTicketRelationId = IDGenerator.nextSnowId().toString();
+        String orderTicketRelationId = IDGenerator.nextSnowId();
         orderTicketRelations.setOrderTicketRelationsId(orderTicketRelationId);
         orderTicketRelations.setOrderId(orderTicketId);
         orderTicketRelations.setTransferId("");
@@ -706,10 +706,9 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
                 map.put("payCode", payResultVo.getCode());
                 map.put("updatedAt", DateUtil.Formatter.yyyyMMddHHmmss.format(orderTickets.getUpdatedAt()));
                 map.put("changeDate", orderTickets.getUpdatedAt());
-                Document doc = mongoTemplate.getCollection(KylinOrderTicketVo.class.getSimpleName()).findOneAndUpdate(
+                mongoTemplate.getCollection(KylinOrderTicketVo.class.getSimpleName()).updateOne(
                         Query.query(Criteria.where("orderTicketsId").is(payAgainParam.getOrderId())).getQueryObject(),
-                        new BasicDBObject("$set", mongoConverter.convertToMongoType(map)),
-                        new FindOneAndUpdateOptions().returnDocument(ReturnDocument.BEFORE)
+                        new BasicDBObject("$set", mongoConverter.convertToMongoType(map))
                 );
 
                 LocalDateTime strTime = orderTicketData.getChangeDate();
@@ -835,7 +834,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
             orderTicketEntitiesVo.put("updatedAt", timePay);
             orderTicketEntitiesVo.put("changeDate", now);
             mongoTemplate.getCollection(KylinOrderTicketEntitiesVo.class.getSimpleName()).updateMany(
-                    Query.query(Criteria.where("orderId").is(orderTickets.getOrderTicketsId())).getQueryObject(),
+                    Query.query(Criteria.where("orderId").is(orderTicketData.getOrderTicketsId())).getQueryObject(),
                     new BasicDBObject("$set", mongoConverter.convertToMongoType(orderTicketEntitiesVo))
             );