From 091edbdfaf4501d992c5738aacea81ef14bf95a2 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 09 七月 2025 17:11:51 +0800
Subject: [PATCH] 111
---
server/admin/src/main/java/com/doumee/config/quartz/SnippetScanner.java | 1 -
server/admin/src/main/java/com/doumee/job/CommonTestJob.java | 0
server/admin/src/main/java/com/doumee/job/DistributableTestJob.java | 0
server/services/src/main/java/com/doumee/biz/system/impl/SystemJobTriggerBizImpl.java | 1 -
server/admin/src/main/java/com/doumee/job/DistributableTestJobDistributer.java | 0
server/admin/src/main/java/com/doumee/core/job/SchedulerProxy.java | 1 -
server/admin/src/main/java/com/doumee/config/quartz/SnippetScannerConfig.java | 0
server/services/src/main/java/com/doumee/core/job/JobParam.java | 5 +++--
server/admin/src/main/java/com/doumee/config/quartz/JobHandlerWithDisallowConcurrent.java | 0
server/web/src/main/resources/application.yml | 2 +-
server/admin/src/main/resources/application.yml | 2 +-
server/admin/src/main/java/com/doumee/config/quartz/JobHandler.java | 0
server/admin/src/main/java/com/doumee/config/quartz/JobInitializer.java | 3 +--
13 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/config/quartz/JobHandler.java b/server/admin/src/main/java/com/doumee/config/quartz/JobHandler.java
similarity index 100%
rename from server/services/src/main/java/com/doumee/config/quartz/JobHandler.java
rename to server/admin/src/main/java/com/doumee/config/quartz/JobHandler.java
diff --git a/server/services/src/main/java/com/doumee/config/quartz/JobHandlerWithDisallowConcurrent.java b/server/admin/src/main/java/com/doumee/config/quartz/JobHandlerWithDisallowConcurrent.java
similarity index 100%
rename from server/services/src/main/java/com/doumee/config/quartz/JobHandlerWithDisallowConcurrent.java
rename to server/admin/src/main/java/com/doumee/config/quartz/JobHandlerWithDisallowConcurrent.java
diff --git a/server/services/src/main/java/com/doumee/config/quartz/JobInitializer.java b/server/admin/src/main/java/com/doumee/config/quartz/JobInitializer.java
similarity index 98%
rename from server/services/src/main/java/com/doumee/config/quartz/JobInitializer.java
rename to server/admin/src/main/java/com/doumee/config/quartz/JobInitializer.java
index bbf214f..ead56e0 100644
--- a/server/services/src/main/java/com/doumee/config/quartz/JobInitializer.java
+++ b/server/admin/src/main/java/com/doumee/config/quartz/JobInitializer.java
@@ -1,8 +1,8 @@
package com.doumee.config.quartz;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.doumee.core.constants.Constants;
import com.doumee.core.job.SchedulerProxy;
+import com.doumee.core.constants.Constants;
import com.doumee.dao.system.SystemJobMapper;
import com.doumee.dao.system.SystemJobSnippetMapper;
import com.doumee.dao.system.model.SystemJob;
@@ -12,7 +12,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-import javax.annotation.PostConstruct;
import java.util.List;
/**
diff --git a/server/services/src/main/java/com/doumee/config/quartz/SnippetScanner.java b/server/admin/src/main/java/com/doumee/config/quartz/SnippetScanner.java
similarity index 98%
rename from server/services/src/main/java/com/doumee/config/quartz/SnippetScanner.java
rename to server/admin/src/main/java/com/doumee/config/quartz/SnippetScanner.java
index c1a61ed..2c73ad5 100644
--- a/server/services/src/main/java/com/doumee/config/quartz/SnippetScanner.java
+++ b/server/admin/src/main/java/com/doumee/config/quartz/SnippetScanner.java
@@ -14,7 +14,6 @@
import org.springframework.scheduling.quartz.QuartzJobBean;
import org.springframework.stereotype.Component;
-import java.util.Date;
import java.util.List;
/**
diff --git a/server/services/src/main/java/com/doumee/config/quartz/SnippetScannerConfig.java b/server/admin/src/main/java/com/doumee/config/quartz/SnippetScannerConfig.java
similarity index 100%
rename from server/services/src/main/java/com/doumee/config/quartz/SnippetScannerConfig.java
rename to server/admin/src/main/java/com/doumee/config/quartz/SnippetScannerConfig.java
diff --git a/server/services/src/main/java/com/doumee/core/job/SchedulerProxy.java b/server/admin/src/main/java/com/doumee/core/job/SchedulerProxy.java
similarity index 97%
rename from server/services/src/main/java/com/doumee/core/job/SchedulerProxy.java
rename to server/admin/src/main/java/com/doumee/core/job/SchedulerProxy.java
index 4ecf7a1..57311f3 100644
--- a/server/services/src/main/java/com/doumee/core/job/SchedulerProxy.java
+++ b/server/admin/src/main/java/com/doumee/core/job/SchedulerProxy.java
@@ -3,7 +3,6 @@
import com.doumee.config.quartz.JobHandler;
import com.doumee.config.quartz.JobHandlerWithDisallowConcurrent;
import com.doumee.core.constants.Constants;
-import com.doumee.core.utils.Utils;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
diff --git a/server/services/src/main/java/com/doumee/job/CommonTestJob.java b/server/admin/src/main/java/com/doumee/job/CommonTestJob.java
similarity index 100%
rename from server/services/src/main/java/com/doumee/job/CommonTestJob.java
rename to server/admin/src/main/java/com/doumee/job/CommonTestJob.java
diff --git a/server/services/src/main/java/com/doumee/job/DistributableTestJob.java b/server/admin/src/main/java/com/doumee/job/DistributableTestJob.java
similarity index 100%
rename from server/services/src/main/java/com/doumee/job/DistributableTestJob.java
rename to server/admin/src/main/java/com/doumee/job/DistributableTestJob.java
diff --git a/server/services/src/main/java/com/doumee/job/DistributableTestJobDistributer.java b/server/admin/src/main/java/com/doumee/job/DistributableTestJobDistributer.java
similarity index 100%
rename from server/services/src/main/java/com/doumee/job/DistributableTestJobDistributer.java
rename to server/admin/src/main/java/com/doumee/job/DistributableTestJobDistributer.java
diff --git a/server/admin/src/main/resources/application.yml b/server/admin/src/main/resources/application.yml
index fc3b292..f84faf7 100644
--- a/server/admin/src/main/resources/application.yml
+++ b/server/admin/src/main/resources/application.yml
@@ -12,7 +12,7 @@
spring:
profiles:
- active: pro
+ active: dev
# JSON杩斿洖閰嶇疆
jackson:
# 榛樿鏃跺尯
diff --git a/server/services/src/main/java/com/doumee/biz/system/impl/SystemJobTriggerBizImpl.java b/server/services/src/main/java/com/doumee/biz/system/impl/SystemJobTriggerBizImpl.java
index b802b3c..9b3fba6 100644
--- a/server/services/src/main/java/com/doumee/biz/system/impl/SystemJobTriggerBizImpl.java
+++ b/server/services/src/main/java/com/doumee/biz/system/impl/SystemJobTriggerBizImpl.java
@@ -17,7 +17,6 @@
import com.doumee.dao.system.model.SystemJob;
import com.doumee.dao.system.model.SystemJobLog;
import com.doumee.dao.system.model.SystemJobSnippet;
-import com.doumee.service.system.SystemJobLogService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.RandomStringUtils;
import org.apache.commons.lang3.StringUtils;
diff --git a/server/services/src/main/java/com/doumee/core/job/JobParam.java b/server/services/src/main/java/com/doumee/core/job/JobParam.java
index 718e2d2..32fa90d 100644
--- a/server/services/src/main/java/com/doumee/core/job/JobParam.java
+++ b/server/services/src/main/java/com/doumee/core/job/JobParam.java
@@ -1,9 +1,10 @@
package com.doumee.core.job;
import com.alibaba.fastjson.JSON;
-import com.doumee.core.constants.Constants;
-import java.util.*;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
/**
* JOB鍏ュ弬
diff --git a/server/web/src/main/resources/application.yml b/server/web/src/main/resources/application.yml
index 28dea6f..17dde0d 100644
--- a/server/web/src/main/resources/application.yml
+++ b/server/web/src/main/resources/application.yml
@@ -12,7 +12,7 @@
spring:
profiles:
- active: pro
+ active: dev
# JSON杩斿洖閰嶇疆
jackson:
# 榛樿鏃跺尯
--
Gitblit v1.9.3