From c28e6101a5e42a9cdcc51ef6b69599ea15fe2af9 Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期一, 04 十一月 2024 14:31:31 +0800
Subject: [PATCH] 合并代码，解决冲突
---
src/main/java/com/zy/common/task/ActivateScheduler.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/common/task/ActivateScheduler.java b/src/main/java/com/zy/common/task/ActivateScheduler.java
index 4b96119..968b76a 100644
--- a/src/main/java/com/zy/common/task/ActivateScheduler.java
+++ b/src/main/java/com/zy/common/task/ActivateScheduler.java
@@ -18,8 +18,8 @@
public class ActivateScheduler {
// @Scheduled(cron = "0/1 * 8 * * ? ") // 姣忓ぉ8鐐�
- @Scheduled(cron = "* 0/1 * * * ? ") // 姣忓垎閽�
- @PostConstruct
+ //@Scheduled(cron = "* 0/1 * * * ? ") // 姣忓垎閽�
+ //@PostConstruct
private void execute(){
// 鑾峰彇婵�娲荤爜
String activationCode = SystemProperties.getActivationCode(OSinfo.getOSname().getActivationCodePath());
--
Gitblit v1.9.1