From 48590d5d26dd27862339ac0b94319a0af6e508b2 Mon Sep 17 00:00:00 2001 From: xiang Date: Sat, 13 Dec 2025 18:29:21 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 38 +++++++++---------- .../service/DingTalkScriptDomainService.java | 2 +- .../fwd/schedule/FwdImportantMsgJob.java | 18 ++++----- .../fwd/schedule/PullDataFromFWDJob.java | 2 +- .../script/fwd/schedule/TicketGrabTask.java | 2 +- .../fwd/service/DingTalkScriptFWDService.java | 2 +- .../fwd/service/impl/PerformServiceImpl.java | 2 +- .../service/DingTalkScriptGladosService.java | 2 +- .../jntyzx/service/JntyzxServiceImpl.java | 6 +-- .../xb/schedule/xb/FundInfoQueryJob.java | 12 +++--- .../xb/service/DingTalkRobotService.java | 2 +- .../common/schedule/HolidayQueryJob.java | 2 +- .../xservice/common/utils/DateUtils.java | 2 +- script/src/main/resources/application.yml | 2 +- 14 files changed, 47 insertions(+), 47 deletions(-) diff --git a/pom.xml b/pom.xml index ff400d1..fb4ed94 100644 --- a/pom.xml +++ b/pom.xml @@ -28,39 +28,39 @@ - com.xiang.pom + com.xiang + xmc-mysql-starter + 1.0-SNAPSHOT + + + com.xiang + xmc-cache-starter + 1.0-SNAPSHOT + + + com.xiang xmc-common 1.0-SNAPSHOT com.xiang - xservice-common - 2.0 + xmc-message-starter + 1.0-SNAPSHOT com.xiang - xservice-message-starter - 2.0 + xmc-http-starter + 1.0-SNAPSHOT com.xiang - xservice-schedule-starter - 2.0 + xmc-logger-starter + 1.0-SNAPSHOT com.xiang - xservice-cache-starter - 2.0 - - - com.xiang - xservice-http-starter - 2.0 - - - com.xiang - xservice-mysql-starter - 2.0 + xmc-schedule-starter + 1.0-SNAPSHOT diff --git a/script/src/main/java/com/xiang/xservice/application/script/domain/service/DingTalkScriptDomainService.java b/script/src/main/java/com/xiang/xservice/application/script/domain/service/DingTalkScriptDomainService.java index 566fb48..d01d7eb 100644 --- a/script/src/main/java/com/xiang/xservice/application/script/domain/service/DingTalkScriptDomainService.java +++ b/script/src/main/java/com/xiang/xservice/application/script/domain/service/DingTalkScriptDomainService.java @@ -1,6 +1,6 @@ package com.xiang.xservice.application.script.domain.service; -import com.xiang.xservice.basic.xservice.dingTalk.service.DingTalkService; +import com.xiang.xmc.service.message.dingTalk.service.DingTalkService; import com.xiang.xservice.config.DingTalkRobotScriptConfig; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/script/src/main/java/com/xiang/xservice/application/script/fwd/schedule/FwdImportantMsgJob.java b/script/src/main/java/com/xiang/xservice/application/script/fwd/schedule/FwdImportantMsgJob.java index e9ce0db..a765d67 100644 --- a/script/src/main/java/com/xiang/xservice/application/script/fwd/schedule/FwdImportantMsgJob.java +++ b/script/src/main/java/com/xiang/xservice/application/script/fwd/schedule/FwdImportantMsgJob.java @@ -3,13 +3,17 @@ package com.xiang.xservice.application.script.fwd.schedule; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.google.common.collect.Maps; -import com.xiang.xservice.application.script.fwd.entity.pojo.FUserConfig; -import com.xiang.xservice.basic.utils.DateUtils; -import com.xiang.xservice.basic.utils.PrimaryKeyUtils; +import com.xiang.xmc.service.schedule.core.DynamicTaskScheduler; +import com.xiang.xmc.service.schedule.entity.ScheduledTaskEntity; +import com.xiang.xmc.service.schedule.entity.TaskConfig; +import com.xiang.xmc.service.schedule.enums.TaskGroupEnum; +import com.xiang.xmc.service.schedule.enums.TaskStatusEnum; +import com.xiang.xmc.service.schedule.service.IDynamicTaskSchedulerService; import com.xiang.xservice.application.script.fwd.entity.param.FwdOrderTaskParam; import com.xiang.xservice.application.script.fwd.entity.pojo.FPerformConfig; import com.xiang.xservice.application.script.fwd.entity.pojo.FPerformProjectInfo; import com.xiang.xservice.application.script.fwd.entity.pojo.FPerformSeatInfo; +import com.xiang.xservice.application.script.fwd.entity.pojo.FUserConfig; import com.xiang.xservice.application.script.fwd.entity.resp.http.perform.Perform; import com.xiang.xservice.application.script.fwd.entity.resp.http.perform.PerformDetail; import com.xiang.xservice.application.script.fwd.entity.resp.http.perform.PerformInfo; @@ -23,14 +27,10 @@ import com.xiang.xservice.application.script.fwd.service.DingTalkScriptFWDServic import com.xiang.xservice.application.script.fwd.service.IPerformService; import com.xiang.xservice.application.script.fwd.service.IPerformServiceHttp; import com.xiang.xservice.application.script.fwd.utils.TimeSyncUtils; +import com.xiang.xservice.basic.utils.DateUtils; +import com.xiang.xservice.basic.utils.PrimaryKeyUtils; import com.xiang.xservice.common.entity.SysConfigDO; import com.xiang.xservice.common.mapper.SysConfigMapper; -import com.xiang.xservice.schedule.core.DynamicTaskScheduler; -import com.xiang.xservice.schedule.entity.ScheduledTaskEntity; -import com.xiang.xservice.schedule.entity.TaskConfig; -import com.xiang.xservice.schedule.enums.TaskGroupEnum; -import com.xiang.xservice.schedule.enums.TaskStatusEnum; -import com.xiang.xservice.schedule.service.IDynamicTaskSchedulerService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; diff --git a/script/src/main/java/com/xiang/xservice/application/script/fwd/schedule/PullDataFromFWDJob.java b/script/src/main/java/com/xiang/xservice/application/script/fwd/schedule/PullDataFromFWDJob.java index ca3ea3d..c7b0ce7 100644 --- a/script/src/main/java/com/xiang/xservice/application/script/fwd/schedule/PullDataFromFWDJob.java +++ b/script/src/main/java/com/xiang/xservice/application/script/fwd/schedule/PullDataFromFWDJob.java @@ -1,6 +1,7 @@ package com.xiang.xservice.application.script.fwd.schedule; import com.google.common.collect.Lists; +import com.xiang.xmc.service.http.helper.HttpRequestHelper; import com.xiang.xservice.application.script.fwd.entity.pojo.FAudienceConfig; import com.xiang.xservice.application.script.fwd.entity.pojo.FPerformProjectInfo; import com.xiang.xservice.application.script.fwd.entity.pojo.FPerformSeatInfo; @@ -24,7 +25,6 @@ import com.xiang.xservice.basic.common.req.BaseRequest; import com.xiang.xservice.basic.config.MyThreadFactory; import com.xiang.xservice.basic.utils.DateUtils; import com.xiang.xservice.basic.utils.RandomCodeUtils; -import com.xiang.xservice.http.helper.HttpRequestHelper; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; diff --git a/script/src/main/java/com/xiang/xservice/application/script/fwd/schedule/TicketGrabTask.java b/script/src/main/java/com/xiang/xservice/application/script/fwd/schedule/TicketGrabTask.java index 2a77473..05c2649 100644 --- a/script/src/main/java/com/xiang/xservice/application/script/fwd/schedule/TicketGrabTask.java +++ b/script/src/main/java/com/xiang/xservice/application/script/fwd/schedule/TicketGrabTask.java @@ -1,13 +1,13 @@ package com.xiang.xservice.application.script.fwd.schedule; import com.alibaba.fastjson.JSON; +import com.xiang.xmc.service.schedule.service.IDynamicTaskSchedulerService; import com.xiang.xservice.application.script.fwd.entity.param.FwdOrderTaskParam; import com.xiang.xservice.application.script.fwd.entity.pojo.FAudienceConfig; import com.xiang.xservice.application.script.fwd.entity.pojo.FUserConfig; import com.xiang.xservice.application.script.fwd.mapper.FwdAudienceConfigMapper; import com.xiang.xservice.application.script.fwd.mapper.FwdUserConfigMapper; import com.xiang.xservice.application.script.fwd.service.IPerformService; -import com.xiang.xservice.schedule.service.IDynamicTaskSchedulerService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; diff --git a/script/src/main/java/com/xiang/xservice/application/script/fwd/service/DingTalkScriptFWDService.java b/script/src/main/java/com/xiang/xservice/application/script/fwd/service/DingTalkScriptFWDService.java index d4a2450..664c9eb 100644 --- a/script/src/main/java/com/xiang/xservice/application/script/fwd/service/DingTalkScriptFWDService.java +++ b/script/src/main/java/com/xiang/xservice/application/script/fwd/service/DingTalkScriptFWDService.java @@ -1,6 +1,6 @@ package com.xiang.xservice.application.script.fwd.service; -import com.xiang.xservice.basic.xservice.dingTalk.service.DingTalkService; +import com.xiang.xmc.service.message.dingTalk.service.DingTalkService; import com.xiang.xservice.config.DingTalkRobotScriptConfig; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/script/src/main/java/com/xiang/xservice/application/script/fwd/service/impl/PerformServiceImpl.java b/script/src/main/java/com/xiang/xservice/application/script/fwd/service/impl/PerformServiceImpl.java index 198389d..51c06ec 100644 --- a/script/src/main/java/com/xiang/xservice/application/script/fwd/service/impl/PerformServiceImpl.java +++ b/script/src/main/java/com/xiang/xservice/application/script/fwd/service/impl/PerformServiceImpl.java @@ -1,6 +1,7 @@ package com.xiang.xservice.application.script.fwd.service.impl; import com.alibaba.fastjson.JSONObject; +import com.xiang.xmc.service.http.helper.HttpRequestHelper; import com.xiang.xservice.application.script.fwd.constants.PriceRange; import com.xiang.xservice.application.script.fwd.entity.pojo.FPerformConfig; import com.xiang.xservice.application.script.fwd.entity.pojo.FPerformProjectInfo; @@ -16,7 +17,6 @@ import com.xiang.xservice.application.script.fwd.service.DingTalkScriptFWDServic import com.xiang.xservice.application.script.fwd.service.IPerformService; import com.xiang.xservice.application.script.fwd.service.IPerformServiceHttp; import com.xiang.xservice.basic.config.MyThreadFactory; -import com.xiang.xservice.http.helper.HttpRequestHelper; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; diff --git a/script/src/main/java/com/xiang/xservice/application/script/glados/service/DingTalkScriptGladosService.java b/script/src/main/java/com/xiang/xservice/application/script/glados/service/DingTalkScriptGladosService.java index 1eb119e..86bd752 100644 --- a/script/src/main/java/com/xiang/xservice/application/script/glados/service/DingTalkScriptGladosService.java +++ b/script/src/main/java/com/xiang/xservice/application/script/glados/service/DingTalkScriptGladosService.java @@ -1,6 +1,6 @@ package com.xiang.xservice.application.script.glados.service; -import com.xiang.xservice.basic.xservice.dingTalk.service.DingTalkService; +import com.xiang.xmc.service.message.dingTalk.service.DingTalkService; import com.xiang.xservice.config.DingTalkRobotScriptConfig; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/script/src/main/java/com/xiang/xservice/application/script/jntyzx/service/JntyzxServiceImpl.java b/script/src/main/java/com/xiang/xservice/application/script/jntyzx/service/JntyzxServiceImpl.java index 30094b6..65f00c4 100644 --- a/script/src/main/java/com/xiang/xservice/application/script/jntyzx/service/JntyzxServiceImpl.java +++ b/script/src/main/java/com/xiang/xservice/application/script/jntyzx/service/JntyzxServiceImpl.java @@ -2,13 +2,13 @@ package com.xiang.xservice.application.script.jntyzx.service; import com.alibaba.fastjson2.JSONObject; import com.google.common.collect.Maps; -import com.xiang.xservice.basic.utils.HttpUtils; -import com.xiang.xservice.basic.xservice.dingTalk.service.DingTalkService; -import com.xiang.xservice.application.script.xb.common.URLConstants; +import com.xiang.xmc.service.message.dingTalk.service.DingTalkService; import com.xiang.xservice.application.script.jntyzx.entity.resp.JntyzxResponse; import com.xiang.xservice.application.script.jntyzx.entity.resp.query.QueryVenueResponse; import com.xiang.xservice.application.script.jntyzx.entity.resp.query.SitePositionList; import com.xiang.xservice.application.script.jntyzx.entity.resp.query.VenueList; +import com.xiang.xservice.application.script.xb.common.URLConstants; +import com.xiang.xservice.basic.utils.HttpUtils; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; diff --git a/script/src/main/java/com/xiang/xservice/application/script/xb/schedule/xb/FundInfoQueryJob.java b/script/src/main/java/com/xiang/xservice/application/script/xb/schedule/xb/FundInfoQueryJob.java index c703d51..9504210 100644 --- a/script/src/main/java/com/xiang/xservice/application/script/xb/schedule/xb/FundInfoQueryJob.java +++ b/script/src/main/java/com/xiang/xservice/application/script/xb/schedule/xb/FundInfoQueryJob.java @@ -3,18 +3,18 @@ package com.xiang.xservice.application.script.xb.schedule.xb; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson2.JSONObject; import com.google.common.collect.Lists; -import com.xiang.xservice.basic.config.MyThreadFactory; -import com.xiang.xservice.basic.utils.DateUtils; -import com.xiang.xservice.basic.xservice.dingTalk.service.DingTalkService; -import com.xiang.xservice.cache.service.IRedisService; -import com.xiang.xservice.common.entity.DayResult; -import com.xiang.xservice.common.enums.RedisConstant; +import com.xiang.xmc.service.cache.service.IRedisService; +import com.xiang.xmc.service.message.dingTalk.service.DingTalkService; import com.xiang.xservice.application.script.xb.entity.pojo.xb.FundMessage; import com.xiang.xservice.application.script.xb.entity.pojo.xb.XbFundList; import com.xiang.xservice.application.script.xb.entity.response.xbyj.fund.FundInfo; import com.xiang.xservice.application.script.xb.entity.response.xbyj.fund.FundList; import com.xiang.xservice.application.script.xb.repository.XBFundMapper; import com.xiang.xservice.application.script.xb.service.FundService; +import com.xiang.xservice.basic.config.MyThreadFactory; +import com.xiang.xservice.basic.utils.DateUtils; +import com.xiang.xservice.common.entity.DayResult; +import com.xiang.xservice.common.enums.RedisConstant; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; diff --git a/script/src/main/java/com/xiang/xservice/application/script/xb/service/DingTalkRobotService.java b/script/src/main/java/com/xiang/xservice/application/script/xb/service/DingTalkRobotService.java index 3b2b024..2b8594c 100644 --- a/script/src/main/java/com/xiang/xservice/application/script/xb/service/DingTalkRobotService.java +++ b/script/src/main/java/com/xiang/xservice/application/script/xb/service/DingTalkRobotService.java @@ -1,6 +1,6 @@ package com.xiang.xservice.application.script.xb.service; -import com.xiang.xservice.basic.xservice.dingTalk.service.DingTalkService; +import com.xiang.xmc.service.message.dingTalk.service.DingTalkService; import com.xiang.xservice.config.DingTalkRobotXbConfig; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/script/src/main/java/com/xiang/xservice/common/schedule/HolidayQueryJob.java b/script/src/main/java/com/xiang/xservice/common/schedule/HolidayQueryJob.java index 1d43049..cfdbf18 100644 --- a/script/src/main/java/com/xiang/xservice/common/schedule/HolidayQueryJob.java +++ b/script/src/main/java/com/xiang/xservice/common/schedule/HolidayQueryJob.java @@ -3,9 +3,9 @@ package com.xiang.xservice.common.schedule; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.google.common.collect.Maps; +import com.xiang.xmc.service.cache.service.IRedisService; import com.xiang.xservice.basic.utils.DateUtils; import com.xiang.xservice.basic.utils.HttpUtils; -import com.xiang.xservice.cache.service.IRedisService; import com.xiang.xservice.common.entity.DayResult; import com.xiang.xservice.common.enums.RedisConstant; import com.xiang.xservice.common.enums.UrlConstant; diff --git a/script/src/main/java/com/xiang/xservice/common/utils/DateUtils.java b/script/src/main/java/com/xiang/xservice/common/utils/DateUtils.java index b3a708e..4be78af 100644 --- a/script/src/main/java/com/xiang/xservice/common/utils/DateUtils.java +++ b/script/src/main/java/com/xiang/xservice/common/utils/DateUtils.java @@ -1,7 +1,7 @@ package com.xiang.xservice.common.utils; -import com.xiang.xservice.cache.service.IRedisService; +import com.xiang.xmc.service.cache.service.IRedisService; import com.xiang.xservice.common.entity.DayResult; import lombok.AllArgsConstructor; import lombok.RequiredArgsConstructor; diff --git a/script/src/main/resources/application.yml b/script/src/main/resources/application.yml index b719479..c255ba1 100644 --- a/script/src/main/resources/application.yml +++ b/script/src/main/resources/application.yml @@ -16,7 +16,7 @@ server: spring: profiles: - active: test + active: prod application: name: xservice-script-center main: