From 38779e77618d173ee31fb5b10161140af64b7058 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 02 十一月 2023 17:06:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/platform/src/main/java/com/doumee/task/ScheduleTool.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/server/platform/src/main/java/com/doumee/task/ScheduleTool.java b/server/platform/src/main/java/com/doumee/task/ScheduleTool.java
index cb4c2c2..ef5de1a 100644
--- a/server/platform/src/main/java/com/doumee/task/ScheduleTool.java
+++ b/server/platform/src/main/java/com/doumee/task/ScheduleTool.java
@@ -77,9 +77,15 @@
*/
// @Scheduled(cron = "0/30 * * * * ? ")
public void autoRefreshLockStatus() throws Exception {
+<<<<<<< HEAD
+ log.info("=====================寮�濮嬪埛鏂伴獞琛屼腑鐨勬暟鍏呭�兼湭寮�閿佸け璐�=======================");
+ memberRidesService.autoRefreshLockStatus();
+ log.info("=====================寮�濮嬪埛鏂伴獞琛屼腑鐨勬暟鍏呭�兼湭寮�閿佸け璐�=======================");
+=======
log.info("=====================寮�濮嬪畾鏃跺埛鏂伴獞琛屼腑鐨勬暟鍏呭�兼湭寮�閿佸け璐�=======================");
memberRidesService.autoRefreshLockStatus();
log.info("=====================缁撴潫瀹氭椂鍒锋柊楠戣涓殑鏁板厖鍊兼湭寮�閿佸け璐�=======================");
+>>>>>>> 50c564c2568e7fb52d8dcbcbebb937a6a8284eeb
}
@@ -87,7 +93,11 @@
* 绔欑偣杞﹁締婊℃灦鐜囬璀�
* @throws Exception
*/
+<<<<<<< HEAD
+ @Scheduled(fixedDelay = 1000L * 60L * 10L)
+=======
// @Scheduled(fixedDelay = 1000L * 60L * 3L)
+>>>>>>> 50c564c2568e7fb52d8dcbcbebb937a6a8284eeb
public void siteReserves() throws Exception {
log.info("=====================寮�濮� 绔欑偣杞﹁締婊℃灦鐜囬璀�=======================");
sitesService.siteReservesNotice();;
--
Gitblit v1.9.3