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

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/index-topnav.html

@@ -26,7 +26,7 @@
         </div>
         <a th:href="@{/index}">
             <li class="logo hidden-xs">
-                <span class="logo-lg">RuoYi</span>
+                <span class="logo-lg">Modernsky IMS</span>
             </li>
          </a>
         <div class="sidebar-collapse tab-content" id="side-menu">

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/index.html

@@ -26,7 +26,7 @@
         </div>
         <a th:href="@{/index}">
             <li class="logo hidden-xs">
-                <span class="logo-lg">RuoYi</span>
+                <span class="logo-lg">Modernsky IMS</span>
             </li>
          </a>
         <div class="sidebar-collapse">

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

@@ -1021,8 +1021,8 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
 
     @Override
     public boolean checkOrderTime(String userId) {
-        String lock = "orders_lock:checkOrderTime:" + userId;
-        if (redisLockUtil.tryLock(lock, 1, 3600)) {
+        String lock = "order_lock:checkOrderTime:" + userId;
+//        if (redisLockUtil.tryLock(lock, 1, 3600)) {
             try {
                 List<OrderScriptDto> dtoData = orderTicketsMapper.orderScriptDto(userId);
                 LocalDateTime now = LocalDateTime.now();
@@ -1086,10 +1086,12 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
                     //mysql
                     LinkedList<String> sqls = new LinkedList<>();
                     String orderStr = "";
+                    log.debug("orderIdList -> size() :" + orderIdList.size());
                     for (int i = 0; i < orderIdList.size(); i++) {
                         String orderTicketId = orderIdList.get(i).split(",")[0];
-                        orderStr = orderStr+"'"+orderTicketId + "',";
+                        orderStr += "'"+orderTicketId + "',";
                     }
+                    log.debug("orderStr -> STR :" + orderStr.toString());
                     orderStr = orderStr.substring(0, orderStr.length() - 1);
                     sqls.add("UPDATE kylin_order_tickets SET updated_at = '" + now + "' WHERE  order_tickets_id in (" + orderStr + ") ");
                     sqls.add("UPDATE kylin_order_ticket_status SET `status` = 2,updated_at = '" + now + "' WHERE order_id in (" + orderStr + ") ");
@@ -1106,8 +1108,6 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
                     currentTime = System.currentTimeMillis() - currentTime;
                     log.debug("mongo -> time:" + (currentTime) + "毫秒");
 
-//                    redisLockUtil.unlock(lock);
-
                     Thread thread = new Thread(() -> {
                         //redis 列表
                         orderIdList.forEach(t -> {
@@ -1125,16 +1125,14 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
                     });
                     thread.start();
                 }
-
-
             } catch (Exception e) {
                 e.printStackTrace();
             } finally {
-//                redisLockUtil.unlock(lock);
             }
-        } else {
-            log.debug("WARNING     LOCKING");
-        }
+//            redisLockUtil.unlock(lock);
+//        } else {
+//            log.debug("WARNING     LOCKING");
+//        }
         return true;
     }