Merge branch 'dev' into test

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-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performances/recommend/add.html

@@ -67,7 +67,7 @@
 
     $('#remoteSearch').remoteSearchPerformance({
         ajax:{
-            url: prefix + "/performance/status?status=(3,6,7,9,10)&",
+            url: prefix + "/performance/status?status=(3,6,7,9,10)",
             type: "get"
         },
         chose: function(text,val){

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performances/roadShow/addPerformances.html

@@ -64,7 +64,7 @@
     // }
     $('#remoteSearch').remoteSearchPerformance({
         ajax:{
-            url: prefix + "/performance/status?status=(3,6,7,9,10)&",
+            url: prefix + "/performance/status?status=(3,6,7,9,10)",
             type: "get"
         },
         chose: function(text,val){

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

@@ -1021,7 +1021,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
 
     @Override
     public boolean checkOrderTime(String userId) {
-        String lock = "orders_lock:checkOrderTime:" + userId;
+        String lock = "order_lock:checkOrderTime:" + userId;
         if (redisLockUtil.tryLock(lock, 1, 3600)) {
             try {
                 List<OrderScriptDto> dtoData = orderTicketsMapper.orderScriptDto(userId);
@@ -1106,8 +1106,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,13 +1123,11 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
                     });
                     thread.start();
                 }
-
-
             } catch (Exception e) {
                 e.printStackTrace();
             } finally {
-//                redisLockUtil.unlock(lock);
             }
+            redisLockUtil.unlock(lock);
         } else {
             log.debug("WARNING     LOCKING");
         }

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

@@ -555,7 +555,7 @@ public class DataUtils {
             HashMap toDayTime = DateUtil.oneDayStartEnd();
             String nowTimeTStr = (String) toDayTime.get("startStr");
             String toDayEndTimeStr = (String) toDayTime.get("endStr");
-            query.addCriteria(Criteria.where("timeStart").gte(nowTimeTStr).lt(toDayEndTimeStr));
+            query.addCriteria(Criteria.where("sellTime").gte(nowTimeTStr).lt(toDayEndTimeStr));
             query.fields().exclude("details");
             query.fields().exclude("noticeImage");
             query.fields().exclude("ticketTimeList");
@@ -572,7 +572,7 @@ public class DataUtils {
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             String threeDaysLaterStr = sdf.format(beforeDayEnd);
 
-            queryT.addCriteria(Criteria.where("timeStart").gte(toDayEndTimeStr).lt(threeDaysLaterStr));
+            queryT.addCriteria(Criteria.where("sellTime").gte(toDayEndTimeStr).lt(threeDaysLaterStr));
             queryT.fields().exclude("details");
             queryT.fields().exclude("noticeImage");
             queryT.fields().exclude("ticketTimeList");