diff --git a/src/main/java/cn/com/tenlion/operator/daoother/operator/callback/ISysCallbackDao.java b/src/main/java/cn/com/tenlion/operator/dao/callback/ISysCallbackDao.java similarity index 87% rename from src/main/java/cn/com/tenlion/operator/daoother/operator/callback/ISysCallbackDao.java rename to src/main/java/cn/com/tenlion/operator/dao/callback/ISysCallbackDao.java index 01fe3d6..9bd8846 100644 --- a/src/main/java/cn/com/tenlion/operator/daoother/operator/callback/ISysCallbackDao.java +++ b/src/main/java/cn/com/tenlion/operator/dao/callback/ISysCallbackDao.java @@ -1,4 +1,4 @@ -package cn.com.tenlion.operator.daoother.operator.callback; +package cn.com.tenlion.operator.dao.callback; import cn.com.tenlion.operator.pojo.pos.callback.SysCallbackPO; import org.springframework.stereotype.Repository; diff --git a/src/main/java/cn/com/tenlion/operator/serviceother/operator/sys/callback/SysCallbackService.java b/src/main/java/cn/com/tenlion/operator/service/sys/callback/SysCallbackService.java similarity index 90% rename from src/main/java/cn/com/tenlion/operator/serviceother/operator/sys/callback/SysCallbackService.java rename to src/main/java/cn/com/tenlion/operator/service/sys/callback/SysCallbackService.java index 1ea90ae..3eccc88 100644 --- a/src/main/java/cn/com/tenlion/operator/serviceother/operator/sys/callback/SysCallbackService.java +++ b/src/main/java/cn/com/tenlion/operator/service/sys/callback/SysCallbackService.java @@ -1,9 +1,9 @@ -package cn.com.tenlion.operator.serviceother.operator.sys.callback; +package cn.com.tenlion.operator.service.sys.callback; -import cn.com.tenlion.operator.daoother.operator.callback.ISysCallbackDao; +import cn.com.tenlion.operator.dao.callback.ISysCallbackDao; import cn.com.tenlion.operator.enums.SysCallbackStatusEnum; import cn.com.tenlion.operator.pojo.pos.callback.SysCallbackPO; -import cn.com.tenlion.operator.serviceother.operator.sys.task.SysTaskService; +import cn.com.tenlion.operator.service.sys.task.SysTaskService; import com.alibaba.fastjson.JSONObject; import ink.wgink.common.base.DefaultBaseService; import ink.wgink.util.UUIDUtil; diff --git a/src/main/java/cn/com/tenlion/operator/serviceother/operator/sys/callback/SysCallbackTask.java b/src/main/java/cn/com/tenlion/operator/service/sys/callback/SysCallbackTask.java similarity index 96% rename from src/main/java/cn/com/tenlion/operator/serviceother/operator/sys/callback/SysCallbackTask.java rename to src/main/java/cn/com/tenlion/operator/service/sys/callback/SysCallbackTask.java index 17066c5..91e19aa 100644 --- a/src/main/java/cn/com/tenlion/operator/serviceother/operator/sys/callback/SysCallbackTask.java +++ b/src/main/java/cn/com/tenlion/operator/service/sys/callback/SysCallbackTask.java @@ -1,8 +1,8 @@ -package cn.com.tenlion.operator.serviceother.operator.sys.callback; +package cn.com.tenlion.operator.service.sys.callback; import cn.com.tenlion.operator.enums.SysCallbackStatusEnum; import cn.com.tenlion.operator.pojo.pos.callback.SysCallbackPO; -import cn.com.tenlion.operator.serviceother.operator.sys.task.SysTaskService; +import cn.com.tenlion.operator.service.sys.task.SysTaskService; import ink.wgink.exceptions.base.SystemException; import org.apache.commons.lang3.StringUtils; import org.quartz.Job; diff --git a/src/main/java/cn/com/tenlion/operator/serviceother/operator/sys/task/SysTaskService.java b/src/main/java/cn/com/tenlion/operator/service/sys/task/SysTaskService.java similarity index 90% rename from src/main/java/cn/com/tenlion/operator/serviceother/operator/sys/task/SysTaskService.java rename to src/main/java/cn/com/tenlion/operator/service/sys/task/SysTaskService.java index 25529a3..e0bd776 100644 --- a/src/main/java/cn/com/tenlion/operator/serviceother/operator/sys/task/SysTaskService.java +++ b/src/main/java/cn/com/tenlion/operator/service/sys/task/SysTaskService.java @@ -1,11 +1,10 @@ -package cn.com.tenlion.operator.serviceother.operator.sys.task; +package cn.com.tenlion.operator.service.sys.task; import cn.com.tenlion.operator.pojo.pos.callback.SysCallbackPO; -import cn.com.tenlion.operator.serviceother.operator.sys.callback.SysCallbackService; -import cn.com.tenlion.operator.serviceother.operator.sys.callback.SysCallbackTask; +import cn.com.tenlion.operator.service.sys.callback.SysCallbackService; +import cn.com.tenlion.operator.service.sys.callback.SysCallbackTask; import ink.wgink.common.base.DefaultBaseService; import ink.wgink.util.UUIDUtil; -import ink.wgink.util.thread.CachedThreadPoolUtil; import org.quartz.*; import org.quartz.impl.StdSchedulerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/cn/com/tenlion/operator/serviceother/operator/accountrecharge/impl/AccountRechargeServiceImpl.java b/src/main/java/cn/com/tenlion/operator/serviceother/operator/accountrecharge/impl/AccountRechargeServiceImpl.java index 5714153..4ed1ae8 100644 --- a/src/main/java/cn/com/tenlion/operator/serviceother/operator/accountrecharge/impl/AccountRechargeServiceImpl.java +++ b/src/main/java/cn/com/tenlion/operator/serviceother/operator/accountrecharge/impl/AccountRechargeServiceImpl.java @@ -26,7 +26,7 @@ import cn.com.tenlion.operator.serviceother.operator.account.IAccountService; import cn.com.tenlion.operator.serviceother.operator.accountitem.IAccountItemService; import cn.com.tenlion.operator.serviceother.operator.accountrecharge.IAccountRechargeService; import cn.com.tenlion.operator.service.user.info.IUserInfoService; -import cn.com.tenlion.operator.serviceother.operator.sys.callback.SysCallbackService; +import cn.com.tenlion.operator.service.sys.callback.SysCallbackService; import cn.com.tenlion.operator.util.PayUtil; import cn.com.tenlion.operator.util.TenlionSMS; import cn.com.tenlion.operator.util.UserUtil; diff --git a/src/main/java/cn/com/tenlion/operator/task/SystemStart.java b/src/main/java/cn/com/tenlion/operator/task/SystemStart.java index 0bd4268..1d3bf0f 100644 --- a/src/main/java/cn/com/tenlion/operator/task/SystemStart.java +++ b/src/main/java/cn/com/tenlion/operator/task/SystemStart.java @@ -2,13 +2,12 @@ package cn.com.tenlion.operator.task; import cn.com.tenlion.operator.enums.SysCallbackStatusEnum; import cn.com.tenlion.operator.pojo.pos.callback.SysCallbackPO; -import cn.com.tenlion.operator.serviceother.operator.sys.callback.SysCallbackService; -import cn.com.tenlion.operator.serviceother.operator.sys.task.SysTaskService; +import cn.com.tenlion.operator.service.sys.callback.SysCallbackService; +import cn.com.tenlion.operator.service.sys.task.SysTaskService; import ink.wgink.interfaces.start.IApplicationStart; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import java.util.List; diff --git a/src/main/resources/mybatis/mapper-operator/callback/sys-callback-mapper.xml b/src/main/resources/mybatis/mapper/callback/sys-callback-mapper.xml similarity index 97% rename from src/main/resources/mybatis/mapper-operator/callback/sys-callback-mapper.xml rename to src/main/resources/mybatis/mapper/callback/sys-callback-mapper.xml index 421b936..0f7e05f 100644 --- a/src/main/resources/mybatis/mapper-operator/callback/sys-callback-mapper.xml +++ b/src/main/resources/mybatis/mapper/callback/sys-callback-mapper.xml @@ -1,6 +1,6 @@ - +