From 0dc12c2d2f8ac50eecae6f29f8efc1e4c49d3079 Mon Sep 17 00:00:00 2001 From: xujun Date: Thu, 6 Aug 2026 11:11:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E5=B7=A5=E5=85=B7=E5=8C=85?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8F=B7=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=B8=B8?= =?UTF-8?q?=E9=87=8F=E6=8E=A5=E5=8F=A3=E4=B8=BA=E5=B8=B8=E9=87=8F=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 10 +--------- .../app/common/call/SysCallInterceptor.java | 5 +++-- .../java/xtools/app/common/jar/init/InitJar.java | 4 ++-- .../xtools/app/common/jar/utils/RunJarUtils.java | 6 ++++-- .../java/xtools/app/common/job/base/BaseJob.java | 5 +++-- .../app/common/log/filter/HttpLogFilter.java | 6 ++++-- .../app/common/mq/handle/MqErrorHandle.java | 6 ++++-- .../service/base/GenDatasourceBaseService.java | 2 +- .../gen/service/base/GenTableBaseService.java | 2 +- .../service/base/GenTableColumnBaseService.java | 2 +- .../app/gen/service/impl/GenServiceImpl.java | 16 ++++++++++++++-- .../templates/gen/service/serviceBase.java.vm | 2 +- .../xtools/app/sys/auth/filter/AuthFilter.java | 6 ++++-- .../xtools/app/sys/auth/utils/AuthUtils.java | 4 ++-- .../xtools/app/sys/auth/utils/PremUtils.java | 4 ++-- .../main/java/xtools/app/sys/init/InitSys.java | 4 ++-- .../sys/service/base/SysAddressBaseService.java | 2 +- .../app/sys/service/base/SysDeptBaseService.java | 2 +- .../app/sys/service/base/SysDictBaseService.java | 6 +++--- .../sys/service/base/SysDictItemBaseService.java | 2 +- .../app/sys/service/base/SysFileBaseService.java | 2 +- .../app/sys/service/base/SysLogBaseService.java | 2 +- .../sys/service/base/SysLogTotalBaseService.java | 2 +- .../app/sys/service/base/SysMenuBaseService.java | 2 +- .../sys/service/base/SysNoticeBaseService.java | 2 +- .../sys/service/base/SysOptLogBaseService.java | 2 +- .../sys/service/base/SysParamBaseService.java | 2 +- .../app/sys/service/base/SysRiskBaseService.java | 2 +- .../app/sys/service/base/SysRoleBaseService.java | 2 +- .../sys/service/base/SysRoleMenuBaseService.java | 2 +- .../app/sys/service/base/SysTaskBaseService.java | 2 +- .../base/SysUpdateHistoryBaseService.java | 2 +- .../app/sys/service/base/SysUserBaseService.java | 2 +- .../service/base/SysUserNoticeBaseService.java | 2 +- .../base/SysUserNoticeInfoBaseService.java | 2 +- .../base/SysUserPasswdRuleBaseService.java | 2 +- .../sys/service/base/SysUserRoleBaseService.java | 2 +- .../app/sys/service/impl/LogBusServiceImpl.java | 6 ++++-- .../sys/service/impl/SysAddressServiceImpl.java | 4 ++-- .../app/sys/service/impl/SysBaseServiceImpl.java | 4 ++-- .../app/sys/service/impl/SysDeptServiceImpl.java | 4 ++-- .../app/sys/service/impl/SysDictServiceImpl.java | 4 ++-- .../app/sys/service/impl/SysFileServiceImpl.java | 6 ++++-- .../app/sys/service/impl/SysLogServiceImpl.java | 7 +++++-- .../sys/service/impl/SysLogTotalServiceImpl.java | 7 +++++-- .../sys/service/impl/SysLoginServiceImpl.java | 12 ++++++++---- .../app/sys/service/impl/SysMenuServiceImpl.java | 7 +++++-- .../sys/service/impl/SysMonitorServiceImpl.java | 7 +++++-- .../sys/service/impl/SysNoticeServiceImpl.java | 4 ++-- .../sys/service/impl/SysOptLogServiceImpl.java | 10 ++++++++-- .../sys/service/impl/SysParamServiceImpl.java | 6 ++++-- .../sys/service/impl/SysPasswdServiceImpl.java | 4 ++-- .../app/sys/service/impl/SysPermServiceImpl.java | 6 ++++-- .../app/sys/service/impl/SysRiskServiceImpl.java | 7 +++++-- .../app/sys/service/impl/SysRoleServiceImpl.java | 5 +++-- .../app/sys/service/impl/SysTaskServiceImpl.java | 8 ++++++-- .../impl/SysUserNoticeInfoServiceImpl.java | 4 ++-- .../service/impl/SysUserNoticeServiceImpl.java | 5 +++-- .../impl/SysUserPasswdRuleServiceImpl.java | 6 ++++-- .../app/sys/service/impl/SysUserServiceImpl.java | 4 ++-- .../app/sys/file/aop/StorageServiceAop.java | 5 +++-- .../file/service/impl/SysFileOptServiceImpl.java | 8 ++++++-- .../service/impl/EsSysLogServiceImpl.java | 4 ++-- .../app/sys/param/utils/SysParamUtils.java | 6 ++++-- .../main/java/xtools/app/sys/risk/IpRisk.java | 4 ++-- .../main/java/xtools/app/sys/risk/UriRisk.java | 4 ++-- .../xtools/app/sys/risk/utils/IpRiskUtils.java | 5 +++-- .../app/sys/risk/utils/RiskCaffeineUtils.java | 5 +++-- .../xtools/app/sys/risk/utils/UriRiskUtils.java | 3 +-- .../app/sys/scheduled/init/InitSysScheduled.java | 4 ++-- .../service/base/SysScheduledBaseService.java | 2 +- .../service/impl/SysScheduledServiceImpl.java | 6 ++++-- .../app/sys/scheduled/utils/ScheduledUtils.java | 3 +-- .../app/sys/tag/config/WebMvcSwaggerConfig.java | 4 ++-- .../tag/interceptor/SwaggerTagInterceptor.java | 4 ++-- 75 files changed, 199 insertions(+), 135 deletions(-) diff --git a/pom.xml b/pom.xml index ca200b4..dfd19f6 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ org.xujun xtools-parent-cloud - 5.0.0 + 5.1.0 @@ -172,14 +172,6 @@ ${project.version} - - - - org.xujun - xtools-app-demo-biz - ${project.version} - - diff --git a/xtools-app-common/xtools-app-common-call/src/main/java/xtools/app/common/call/SysCallInterceptor.java b/xtools-app-common/xtools-app-common-call/src/main/java/xtools/app/common/call/SysCallInterceptor.java index 6615921..662c6b1 100644 --- a/xtools-app-common/xtools-app-common-call/src/main/java/xtools/app/common/call/SysCallInterceptor.java +++ b/xtools-app-common/xtools-app-common-call/src/main/java/xtools/app/common/call/SysCallInterceptor.java @@ -6,7 +6,6 @@ import org.springframework.http.HttpHeaders; import org.springframework.http.HttpRequest; import org.springframework.stereotype.Component; import xtools.app.common.cache.enums.AppCache; -import xtools.base.config.BaseParams; import xtools.boot.api.constant.BootCommonConstant; import xtools.boot.cache.redis.base.RedisService; import xtools.boot.core.holder.CommonHolder; @@ -16,6 +15,8 @@ import xtools.core.UuidUtils; import java.util.Map; +import static xtools.base.config.Constants.CP_NUM0; + /** *

Title : SysCallInterceptor

*

Description : SysCallInterceptor

@@ -28,7 +29,7 @@ import java.util.Map; * @date : 2026/2/27 14:55 */ @Component -public class SysCallInterceptor implements CallInterceptor, BaseParams { +public class SysCallInterceptor implements CallInterceptor { /** * 缓存参数 diff --git a/xtools-app-common/xtools-app-common-jar/src/main/java/xtools/app/common/jar/init/InitJar.java b/xtools-app-common/xtools-app-common-jar/src/main/java/xtools/app/common/jar/init/InitJar.java index 3ec78e8..76e3cab 100644 --- a/xtools-app-common/xtools-app-common-jar/src/main/java/xtools/app/common/jar/init/InitJar.java +++ b/xtools-app-common/xtools-app-common-jar/src/main/java/xtools/app/common/jar/init/InitJar.java @@ -8,7 +8,7 @@ import org.springframework.boot.ApplicationRunner; import org.springframework.core.annotation.Order; import org.springframework.stereotype.Component; import xtools.app.common.cache.enums.AppCache; -import xtools.base.config.BaseParams; +import xtools.base.config.Constants; import xtools.boot.cache.redis.base.RedisService; import xtools.boot.core.utils.JarUtils; import xtools.boot.log.LogBus; @@ -32,7 +32,7 @@ import java.util.List; * @date : 2026/2/2 14:13 */ @Component -@Order(BaseParams.CP_NUM200) +@Order(Constants.CP_NUM200) public class InitJar implements ApplicationRunner { /** diff --git a/xtools-app-common/xtools-app-common-jar/src/main/java/xtools/app/common/jar/utils/RunJarUtils.java b/xtools-app-common/xtools-app-common-jar/src/main/java/xtools/app/common/jar/utils/RunJarUtils.java index 6782a55..04e1e51 100644 --- a/xtools-app-common/xtools-app-common-jar/src/main/java/xtools/app/common/jar/utils/RunJarUtils.java +++ b/xtools-app-common/xtools-app-common-jar/src/main/java/xtools/app/common/jar/utils/RunJarUtils.java @@ -3,7 +3,6 @@ package xtools.app.common.jar.utils; import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; import xtools.app.common.cache.enums.AppCache; -import xtools.base.config.BaseParams; import xtools.boot.cache.redis.utils.RedisUtils; import java.util.ArrayList; @@ -11,6 +10,9 @@ import java.util.List; import java.util.Objects; import java.util.Set; +import static xtools.base.config.Constants.CP_ASTERISK; +import static xtools.base.config.Constants.CP_EMPTY; + /** *

Title : RunJarUtils

*

Description : RunJarUtils

@@ -22,7 +24,7 @@ import java.util.Set; * @version : 1.0.0 * @date : 2026/2/18 21:11 */ -public class RunJarUtils implements BaseParams { +public class RunJarUtils { /** * 缓存参数 diff --git a/xtools-app-common/xtools-app-common-job/src/main/java/xtools/app/common/job/base/BaseJob.java b/xtools-app-common/xtools-app-common-job/src/main/java/xtools/app/common/job/base/BaseJob.java index 14ac813..2efc0b5 100644 --- a/xtools-app-common/xtools-app-common-job/src/main/java/xtools/app/common/job/base/BaseJob.java +++ b/xtools-app-common/xtools-app-common-job/src/main/java/xtools/app/common/job/base/BaseJob.java @@ -1,7 +1,6 @@ package xtools.app.common.job.base; import xtools.app.common.cache.enums.AppCache; -import xtools.base.config.BaseParams; import xtools.boot.cache.redis.base.RedisService; import xtools.boot.cache.redis.utils.RedisUtils; import xtools.boot.core.interfaces.JobInterface; @@ -16,6 +15,8 @@ import xtools.core.time.InstantUtils; import java.time.Instant; import java.util.Objects; +import static xtools.base.config.Constants.CP_LINE; + /** *

Title : BaseJob

*

Description : BaseJob

@@ -27,7 +28,7 @@ import java.util.Objects; * @version : 1.0.0 * @date : 2026/2/23 17:36 */ -public abstract class BaseJob implements Runnable, BaseParams, JobInterface { +public abstract class BaseJob implements Runnable, JobInterface { /** * 锁参数 diff --git a/xtools-app-common/xtools-app-common-log/xtools-app-common-log-filter/src/main/java/xtools/app/common/log/filter/HttpLogFilter.java b/xtools-app-common/xtools-app-common-log/xtools-app-common-log-filter/src/main/java/xtools/app/common/log/filter/HttpLogFilter.java index 76d8d3e..f882965 100644 --- a/xtools-app-common/xtools-app-common-log/xtools-app-common-log-filter/src/main/java/xtools/app/common/log/filter/HttpLogFilter.java +++ b/xtools-app-common/xtools-app-common-log/xtools-app-common-log-filter/src/main/java/xtools/app/common/log/filter/HttpLogFilter.java @@ -13,7 +13,6 @@ import org.springframework.util.StopWatch; import org.springframework.web.util.ContentCachingRequestWrapper; import org.springframework.web.util.ContentCachingResponseWrapper; import xtools.app.common.log.whitelist.HttpLogWhitelist; -import xtools.base.config.BaseParams; import xtools.boot.api.model.dto.log.LogTrack; import xtools.boot.core.utils.PathPatternUtils; import xtools.boot.core.utils.SpringContextUtils; @@ -35,6 +34,9 @@ import java.util.HashSet; import java.util.Objects; import java.util.Set; +import static xtools.base.config.Constants.CP_NUM0; +import static xtools.base.config.Constants.CP_NUM200; + /** *

Title : HttpLogFilter

*

Description : HttpLogFilter

@@ -47,7 +49,7 @@ import java.util.Set; * @date : 2026/1/6 16:37 */ @Component -public class HttpLogFilter extends BaseFilter implements Ordered, BaseParams { +public class HttpLogFilter extends BaseFilter implements Ordered { /** * 日志白名单 diff --git a/xtools-app-common/xtools-app-common-mq/src/main/java/xtools/app/common/mq/handle/MqErrorHandle.java b/xtools-app-common/xtools-app-common-mq/src/main/java/xtools/app/common/mq/handle/MqErrorHandle.java index a703049..4f4ef1d 100644 --- a/xtools-app-common/xtools-app-common-mq/src/main/java/xtools/app/common/mq/handle/MqErrorHandle.java +++ b/xtools-app-common/xtools-app-common-mq/src/main/java/xtools/app/common/mq/handle/MqErrorHandle.java @@ -4,11 +4,13 @@ import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; import xtools.app.common.cache.enums.AppCache; -import xtools.base.config.BaseParams; import xtools.boot.cache.redis.base.RedisService; import xtools.boot.mq.base.handle.BaseErrorHandle; import xtools.extend.encrypt.Sm3Utils; +import static xtools.base.config.Constants.CP_NUM1000; +import static xtools.base.config.Constants.CP_NUM3; + /** *

Title : MqErrorHandle

*

Description : MqErrorHandle

@@ -22,7 +24,7 @@ import xtools.extend.encrypt.Sm3Utils; */ @Slf4j @Component -public class MqErrorHandle implements BaseErrorHandle, BaseParams { +public class MqErrorHandle implements BaseErrorHandle { /** * 缓存参数 diff --git a/xtools-app-gen/xtools-app-gen-biz/src/main/java/xtools/app/gen/service/base/GenDatasourceBaseService.java b/xtools-app-gen/xtools-app-gen-biz/src/main/java/xtools/app/gen/service/base/GenDatasourceBaseService.java index aab6552..f8c0bf3 100644 --- a/xtools-app-gen/xtools-app-gen-biz/src/main/java/xtools/app/gen/service/base/GenDatasourceBaseService.java +++ b/xtools-app-gen/xtools-app-gen-biz/src/main/java/xtools/app/gen/service/base/GenDatasourceBaseService.java @@ -1,6 +1,6 @@ package xtools.app.gen.service.base; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.baomidou.mybatisplus.spring.service.impl.ServiceImpl; import org.springframework.stereotype.Component; import xtools.app.gen.mapper.GenDatasourceMapper; import xtools.app.gen.model.entity.GenDatasource; diff --git a/xtools-app-gen/xtools-app-gen-biz/src/main/java/xtools/app/gen/service/base/GenTableBaseService.java b/xtools-app-gen/xtools-app-gen-biz/src/main/java/xtools/app/gen/service/base/GenTableBaseService.java index dc3319e..a15862f 100644 --- a/xtools-app-gen/xtools-app-gen-biz/src/main/java/xtools/app/gen/service/base/GenTableBaseService.java +++ b/xtools-app-gen/xtools-app-gen-biz/src/main/java/xtools/app/gen/service/base/GenTableBaseService.java @@ -1,6 +1,6 @@ package xtools.app.gen.service.base; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.baomidou.mybatisplus.spring.service.impl.ServiceImpl; import org.springframework.stereotype.Component; import xtools.app.gen.mapper.GenTableMapper; import xtools.app.gen.model.entity.GenTable; diff --git a/xtools-app-gen/xtools-app-gen-biz/src/main/java/xtools/app/gen/service/base/GenTableColumnBaseService.java b/xtools-app-gen/xtools-app-gen-biz/src/main/java/xtools/app/gen/service/base/GenTableColumnBaseService.java index 03afe89..ef4fe96 100644 --- a/xtools-app-gen/xtools-app-gen-biz/src/main/java/xtools/app/gen/service/base/GenTableColumnBaseService.java +++ b/xtools-app-gen/xtools-app-gen-biz/src/main/java/xtools/app/gen/service/base/GenTableColumnBaseService.java @@ -1,6 +1,6 @@ package xtools.app.gen.service.base; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.baomidou.mybatisplus.spring.service.impl.ServiceImpl; import org.springframework.stereotype.Component; import xtools.app.gen.mapper.GenTableColumnMapper; import xtools.app.gen.model.entity.GenTableColumn; diff --git a/xtools-app-gen/xtools-app-gen-biz/src/main/java/xtools/app/gen/service/impl/GenServiceImpl.java b/xtools-app-gen/xtools-app-gen-biz/src/main/java/xtools/app/gen/service/impl/GenServiceImpl.java index 6878159..5087f4c 100644 --- a/xtools-app-gen/xtools-app-gen-biz/src/main/java/xtools/app/gen/service/impl/GenServiceImpl.java +++ b/xtools-app-gen/xtools-app-gen-biz/src/main/java/xtools/app/gen/service/impl/GenServiceImpl.java @@ -28,7 +28,6 @@ import xtools.app.gen.service.base.GenTableBaseService; import xtools.app.gen.service.base.GenTableColumnBaseService; import xtools.app.gen.utils.DatasourceUtils; import xtools.app.gen.utils.GenUtils; -import xtools.base.config.BaseParams; import xtools.boot.api.exection.BizError; import xtools.boot.api.exection.BizWarning; import xtools.boot.api.model.dto.Result; @@ -61,6 +60,19 @@ import java.util.regex.Pattern; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; +import static xtools.base.config.Constants.CP_COLON; +import static xtools.base.config.Constants.CP_DOT; +import static xtools.base.config.Constants.CP_EMPTY; +import static xtools.base.config.Constants.CP_LINE; +import static xtools.base.config.Constants.CP_NEGATIVE1; +import static xtools.base.config.Constants.CP_NUM0; +import static xtools.base.config.Constants.CP_NUM1; +import static xtools.base.config.Constants.CP_NUM2; +import static xtools.base.config.Constants.CP_NUM20; +import static xtools.base.config.Constants.CP_NUM3; +import static xtools.base.config.Constants.CP_SLASH; +import static xtools.base.config.Constants.CP_UNDERLINE; + /** *

Title : GenServiceImpl

*

Description : GenServiceImpl

@@ -75,7 +87,7 @@ import java.util.zip.ZipOutputStream; @Primary @Service @RequiredArgsConstructor -public class GenServiceImpl implements GenService, BaseParams { +public class GenServiceImpl implements GenService { private final GenProperties genProperties; diff --git a/xtools-app-gen/xtools-app-gen-biz/src/main/resources/templates/gen/service/serviceBase.java.vm b/xtools-app-gen/xtools-app-gen-biz/src/main/resources/templates/gen/service/serviceBase.java.vm index 11b75d6..8ff76b2 100644 --- a/xtools-app-gen/xtools-app-gen-biz/src/main/resources/templates/gen/service/serviceBase.java.vm +++ b/xtools-app-gen/xtools-app-gen-biz/src/main/resources/templates/gen/service/serviceBase.java.vm @@ -1,6 +1,6 @@ package ${table.packageName}.${subPackageName}; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.baomidou.mybatisplus.spring.service.impl.ServiceImpl; import org.springframework.stereotype.Component; import ${table.packageName}.mapper.${table.entityName}Mapper; diff --git a/xtools-app-sys/xtools-app-sys-auth/src/main/java/xtools/app/sys/auth/filter/AuthFilter.java b/xtools-app-sys/xtools-app-sys-auth/src/main/java/xtools/app/sys/auth/filter/AuthFilter.java index f3dbbae..5892207 100644 --- a/xtools-app-sys/xtools-app-sys-auth/src/main/java/xtools/app/sys/auth/filter/AuthFilter.java +++ b/xtools-app-sys/xtools-app-sys-auth/src/main/java/xtools/app/sys/auth/filter/AuthFilter.java @@ -15,7 +15,6 @@ import xtools.app.sys.auth.model.dto.OptLogDto; import xtools.app.sys.auth.utils.AuthUtils; import xtools.app.sys.auth.utils.PremUtils; import xtools.app.sys.auth.whitelist.AuthWhitelist; -import xtools.base.config.BaseParams; import xtools.boot.api.constant.BootCommonConstant; import xtools.boot.api.enums.ResultType; import xtools.boot.api.model.dto.Result; @@ -40,6 +39,9 @@ import java.util.HashSet; import java.util.Objects; import java.util.Set; +import static xtools.base.config.Constants.CP_NUM1; +import static xtools.base.config.Constants.CP_NUM200; + /** *

Title : AuthFilter

*

Description : AuthFilter

@@ -52,7 +54,7 @@ import java.util.Set; * @date : 2026/1/31 21:18 */ @Component -public class AuthFilter extends BaseFilter implements Ordered, BootCommonConstant, BaseParams { +public class AuthFilter extends BaseFilter implements Ordered, BootCommonConstant { /** * 微服务标识 diff --git a/xtools-app-sys/xtools-app-sys-auth/src/main/java/xtools/app/sys/auth/utils/AuthUtils.java b/xtools-app-sys/xtools-app-sys-auth/src/main/java/xtools/app/sys/auth/utils/AuthUtils.java index 42d9521..bb3cd5d 100644 --- a/xtools-app-sys/xtools-app-sys-auth/src/main/java/xtools/app/sys/auth/utils/AuthUtils.java +++ b/xtools-app-sys/xtools-app-sys-auth/src/main/java/xtools/app/sys/auth/utils/AuthUtils.java @@ -6,7 +6,7 @@ import jakarta.servlet.http.HttpServletRequest; import xtools.app.common.cache.enums.AppCache; import xtools.app.sys.auth.model.dto.LoginUserDto; import xtools.app.sys.auth.model.dto.TokenDto; -import xtools.base.config.BaseParams; +import static xtools.base.config.Constants.*; import xtools.boot.api.constant.BootCommonConstant; import xtools.boot.api.exection.BizError; import xtools.boot.api.exection.UnauthorizedError; @@ -36,7 +36,7 @@ import java.util.concurrent.ConcurrentHashMap; * @version : 1.0.0 * @date : 2026/1/31 20:44 */ -public class AuthUtils implements BaseParams { +public class AuthUtils { /** * 缓存参数 diff --git a/xtools-app-sys/xtools-app-sys-auth/src/main/java/xtools/app/sys/auth/utils/PremUtils.java b/xtools-app-sys/xtools-app-sys-auth/src/main/java/xtools/app/sys/auth/utils/PremUtils.java index 82be357..87c287e 100644 --- a/xtools-app-sys/xtools-app-sys-auth/src/main/java/xtools/app/sys/auth/utils/PremUtils.java +++ b/xtools-app-sys/xtools-app-sys-auth/src/main/java/xtools/app/sys/auth/utils/PremUtils.java @@ -5,7 +5,7 @@ import org.springframework.util.AntPathMatcher; import org.springframework.util.PathMatcher; import xtools.app.common.cache.enums.AppCache; import xtools.app.sys.auth.model.dto.InterfacePermDto; -import xtools.base.config.BaseParams; +import static xtools.base.config.Constants.*; import xtools.boot.cache.redis.base.RedisService; import xtools.boot.cache.redis.utils.RedisUtils; import xtools.core.CollectionUtils; @@ -26,7 +26,7 @@ import java.util.Map; * @version : 1.0.0 * @date : 2026/2/2 18:31 */ -public class PremUtils implements BaseParams { +public class PremUtils { /** * 缓存参数 diff --git a/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/init/InitSys.java b/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/init/InitSys.java index 8fdae1e..4c61107 100644 --- a/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/init/InitSys.java +++ b/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/init/InitSys.java @@ -12,7 +12,7 @@ import xtools.app.sys.service.SysMonitorService; import xtools.app.sys.service.SysParamService; import xtools.app.sys.service.SysPermService; import xtools.app.sys.service.SysUpdateHistoryService; -import xtools.base.config.BaseParams; +import xtools.base.config.Constants; import xtools.boot.log.LogBus; import xtools.boot.log.enums.LogBusBaseType; import xtools.boot.log.holder.LogTrackHolder; @@ -31,7 +31,7 @@ import xtools.core.enums.LogLevel; * @date : 2026/2/2 14:13 */ @Component -@Order(BaseParams.CP_NUM200) +@Order(Constants.CP_NUM200) @RequiredArgsConstructor public class InitSys implements ApplicationRunner { diff --git a/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/base/SysAddressBaseService.java b/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/base/SysAddressBaseService.java index 2d3e6d1..fc321a8 100644 --- a/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/base/SysAddressBaseService.java +++ b/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/base/SysAddressBaseService.java @@ -1,6 +1,6 @@ package xtools.app.sys.service.base; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.baomidou.mybatisplus.spring.service.impl.ServiceImpl; import org.springframework.stereotype.Component; import xtools.app.sys.mapper.SysAddressMapper; import xtools.app.sys.model.entity.SysAddress; diff --git a/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/base/SysDeptBaseService.java b/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/base/SysDeptBaseService.java index da1d01f..23f8297 100644 --- a/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/base/SysDeptBaseService.java +++ b/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/base/SysDeptBaseService.java @@ -1,7 +1,7 @@ package xtools.app.sys.service.base; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.baomidou.mybatisplus.spring.service.impl.ServiceImpl; import org.springframework.stereotype.Component; import xtools.app.sys.mapper.SysDeptMapper; import xtools.app.sys.model.entity.SysDept; diff --git a/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/base/SysDictBaseService.java b/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/base/SysDictBaseService.java index 6567591..133e401 100644 --- a/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/base/SysDictBaseService.java +++ b/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/base/SysDictBaseService.java @@ -1,11 +1,11 @@ package xtools.app.sys.service.base; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.baomidou.mybatisplus.spring.service.impl.ServiceImpl; import org.springframework.stereotype.Component; import xtools.app.sys.mapper.SysDictMapper; import xtools.app.sys.model.entity.SysDict; -import xtools.base.config.BaseParams; +import static xtools.base.config.Constants.*; /** *

Title : SysDictBaseService

@@ -17,7 +17,7 @@ import xtools.base.config.BaseParams; * @date : 2026-01-28 10:34:37 */ @Component -public class SysDictBaseService extends ServiceImpl implements BaseParams { +public class SysDictBaseService extends ServiceImpl { /** * 根据字典编码查询字典 diff --git a/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/base/SysDictItemBaseService.java b/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/base/SysDictItemBaseService.java index 629b342..477c289 100644 --- a/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/base/SysDictItemBaseService.java +++ b/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/base/SysDictItemBaseService.java @@ -1,6 +1,6 @@ package xtools.app.sys.service.base; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.baomidou.mybatisplus.spring.service.impl.ServiceImpl; import org.springframework.stereotype.Component; import xtools.app.sys.mapper.SysDictItemMapper; import xtools.app.sys.model.entity.SysDictItem; diff --git a/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/base/SysFileBaseService.java b/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/base/SysFileBaseService.java index efae2e8..1e4ed53 100644 --- a/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/base/SysFileBaseService.java +++ b/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/base/SysFileBaseService.java @@ -1,6 +1,6 @@ package xtools.app.sys.service.base; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.baomidou.mybatisplus.spring.service.impl.ServiceImpl; import org.springframework.stereotype.Component; import xtools.app.sys.mapper.SysFileMapper; import xtools.app.sys.model.entity.SysFile; diff --git a/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/base/SysLogBaseService.java b/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/base/SysLogBaseService.java index 4581ab1..7bc5d63 100644 --- a/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/base/SysLogBaseService.java +++ b/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/base/SysLogBaseService.java @@ -1,6 +1,6 @@ package xtools.app.sys.service.base; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.baomidou.mybatisplus.spring.service.impl.ServiceImpl; import org.springframework.stereotype.Component; import xtools.app.sys.mapper.SysLogMapper; import xtools.app.sys.model.entity.SysLog; diff --git a/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/base/SysLogTotalBaseService.java b/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/base/SysLogTotalBaseService.java index 834c97f..da98528 100644 --- a/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/base/SysLogTotalBaseService.java +++ b/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/base/SysLogTotalBaseService.java @@ -1,6 +1,6 @@ package xtools.app.sys.service.base; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.baomidou.mybatisplus.spring.service.impl.ServiceImpl; import org.springframework.stereotype.Component; import xtools.app.sys.mapper.SysLogTotalMapper; diff --git a/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/base/SysMenuBaseService.java b/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/base/SysMenuBaseService.java index c795d75..8e094ce 100644 --- a/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/base/SysMenuBaseService.java +++ b/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/base/SysMenuBaseService.java @@ -1,7 +1,7 @@ package xtools.app.sys.service.base; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.baomidou.mybatisplus.spring.service.impl.ServiceImpl; import org.springframework.stereotype.Component; import xtools.app.sys.mapper.SysMenuMapper; import xtools.app.sys.model.dto.resp.SysMenuTreeResp; diff --git a/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/base/SysNoticeBaseService.java b/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/base/SysNoticeBaseService.java index d5c9fc9..0fdb3e2 100644 --- a/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/base/SysNoticeBaseService.java +++ b/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/base/SysNoticeBaseService.java @@ -1,6 +1,6 @@ package xtools.app.sys.service.base; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.baomidou.mybatisplus.spring.service.impl.ServiceImpl; import org.springframework.stereotype.Component; import xtools.app.sys.mapper.SysNoticeMapper; import xtools.app.sys.model.entity.SysNotice; diff --git a/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/base/SysOptLogBaseService.java b/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/base/SysOptLogBaseService.java index de0f4c8..a754e69 100644 --- a/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/base/SysOptLogBaseService.java +++ b/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/base/SysOptLogBaseService.java @@ -1,6 +1,6 @@ package xtools.app.sys.service.base; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.baomidou.mybatisplus.spring.service.impl.ServiceImpl; import org.springframework.stereotype.Component; import xtools.app.sys.mapper.SysOptLogMapper; diff --git a/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/base/SysParamBaseService.java b/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/base/SysParamBaseService.java index 592afd2..65904c7 100644 --- a/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/base/SysParamBaseService.java +++ b/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/base/SysParamBaseService.java @@ -1,6 +1,6 @@ package xtools.app.sys.service.base; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.baomidou.mybatisplus.spring.service.impl.ServiceImpl; import org.springframework.stereotype.Component; import xtools.app.sys.mapper.SysParamMapper; import xtools.app.sys.model.entity.SysParam; diff --git a/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/base/SysRiskBaseService.java b/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/base/SysRiskBaseService.java index 09fd4f9..d42a89c 100644 --- a/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/base/SysRiskBaseService.java +++ b/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/base/SysRiskBaseService.java @@ -1,6 +1,6 @@ package xtools.app.sys.service.base; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.baomidou.mybatisplus.spring.service.impl.ServiceImpl; import org.springframework.stereotype.Component; import xtools.app.sys.mapper.SysRiskMapper; diff --git a/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/base/SysRoleBaseService.java b/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/base/SysRoleBaseService.java index d55d963..6d9cd14 100644 --- a/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/base/SysRoleBaseService.java +++ b/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/base/SysRoleBaseService.java @@ -1,6 +1,6 @@ package xtools.app.sys.service.base; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.baomidou.mybatisplus.spring.service.impl.ServiceImpl; import org.springframework.stereotype.Component; import xtools.app.sys.mapper.SysRoleMapper; import xtools.app.sys.model.entity.SysRole; diff --git a/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/base/SysRoleMenuBaseService.java b/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/base/SysRoleMenuBaseService.java index 695715b..761c4dd 100644 --- a/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/base/SysRoleMenuBaseService.java +++ b/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/base/SysRoleMenuBaseService.java @@ -1,7 +1,7 @@ package xtools.app.sys.service.base; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.baomidou.mybatisplus.spring.service.impl.ServiceImpl; import org.springframework.stereotype.Component; import xtools.app.sys.mapper.SysRoleMenuMapper; import xtools.app.sys.model.entity.SysRoleMenu; diff --git a/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/base/SysTaskBaseService.java b/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/base/SysTaskBaseService.java index 5c7b37d..cf126b7 100644 --- a/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/base/SysTaskBaseService.java +++ b/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/base/SysTaskBaseService.java @@ -1,6 +1,6 @@ package xtools.app.sys.service.base; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.baomidou.mybatisplus.spring.service.impl.ServiceImpl; import org.springframework.stereotype.Component; import xtools.app.sys.mapper.SysTaskMapper; import xtools.app.sys.model.entity.SysTask; diff --git a/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/base/SysUpdateHistoryBaseService.java b/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/base/SysUpdateHistoryBaseService.java index 7e64816..b5ec4c3 100644 --- a/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/base/SysUpdateHistoryBaseService.java +++ b/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/base/SysUpdateHistoryBaseService.java @@ -1,6 +1,6 @@ package xtools.app.sys.service.base; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.baomidou.mybatisplus.spring.service.impl.ServiceImpl; import org.springframework.stereotype.Component; import xtools.app.sys.mapper.SysUpdateHistoryMapper; import xtools.app.sys.model.entity.SysUpdateHistory; diff --git a/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/base/SysUserBaseService.java b/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/base/SysUserBaseService.java index ebe0424..5f6f97e 100644 --- a/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/base/SysUserBaseService.java +++ b/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/base/SysUserBaseService.java @@ -1,7 +1,7 @@ package xtools.app.sys.service.base; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.baomidou.mybatisplus.spring.service.impl.ServiceImpl; import org.springframework.stereotype.Component; import xtools.app.sys.mapper.SysUserMapper; import xtools.app.sys.model.entity.SysUser; diff --git a/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/base/SysUserNoticeBaseService.java b/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/base/SysUserNoticeBaseService.java index 82aa1c1..a1334f8 100644 --- a/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/base/SysUserNoticeBaseService.java +++ b/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/base/SysUserNoticeBaseService.java @@ -1,6 +1,6 @@ package xtools.app.sys.service.base; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.baomidou.mybatisplus.spring.service.impl.ServiceImpl; import org.springframework.stereotype.Component; import xtools.app.sys.mapper.SysUserNoticeMapper; import xtools.app.sys.model.entity.SysUserNotice; diff --git a/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/base/SysUserNoticeInfoBaseService.java b/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/base/SysUserNoticeInfoBaseService.java index ce1ec66..7a5dac3 100644 --- a/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/base/SysUserNoticeInfoBaseService.java +++ b/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/base/SysUserNoticeInfoBaseService.java @@ -1,6 +1,6 @@ package xtools.app.sys.service.base; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.baomidou.mybatisplus.spring.service.impl.ServiceImpl; import org.springframework.stereotype.Component; import xtools.app.sys.mapper.SysUserNoticeInfoMapper; import xtools.app.sys.model.entity.SysUserNoticeInfo; diff --git a/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/base/SysUserPasswdRuleBaseService.java b/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/base/SysUserPasswdRuleBaseService.java index 9cabd90..15331fa 100644 --- a/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/base/SysUserPasswdRuleBaseService.java +++ b/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/base/SysUserPasswdRuleBaseService.java @@ -1,6 +1,6 @@ package xtools.app.sys.service.base; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.baomidou.mybatisplus.spring.service.impl.ServiceImpl; import org.springframework.stereotype.Component; import xtools.app.sys.mapper.SysUserPasswdRuleMapper; diff --git a/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/base/SysUserRoleBaseService.java b/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/base/SysUserRoleBaseService.java index 53b7c12..6ba0ad9 100644 --- a/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/base/SysUserRoleBaseService.java +++ b/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/base/SysUserRoleBaseService.java @@ -1,7 +1,7 @@ package xtools.app.sys.service.base; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.baomidou.mybatisplus.spring.service.impl.ServiceImpl; import org.springframework.stereotype.Component; import xtools.app.sys.mapper.SysUserRoleMapper; import xtools.app.sys.model.entity.SysUserRole; diff --git a/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/LogBusServiceImpl.java b/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/LogBusServiceImpl.java index fe96440..2ae7692 100644 --- a/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/LogBusServiceImpl.java +++ b/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/LogBusServiceImpl.java @@ -14,7 +14,6 @@ import xtools.app.sys.model.entity.SysLogTotal; import xtools.app.sys.service.SysLogService; import xtools.app.sys.service.SysOptLogService; import xtools.app.sys.service.base.SysLogTotalBaseService; -import xtools.base.config.BaseParams; import xtools.boot.api.model.dto.log.LogTrack; import xtools.boot.cache.redis.base.RedisService; import xtools.boot.log.enums.LogBusBaseType; @@ -35,6 +34,9 @@ import java.util.List; import java.util.Map; import java.util.Objects; +import static xtools.base.config.Constants.CP_NUM0; +import static xtools.base.config.Constants.CP_NUM16; + /** *

Title : LogBusServiceImpl

*

Description : LogBusServiceImpl

@@ -50,7 +52,7 @@ import java.util.Objects; @Primary @Service @RequiredArgsConstructor -public class LogBusServiceImpl implements LogBusService, BaseParams { +public class LogBusServiceImpl implements LogBusService { /** * 缓存参数 diff --git a/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysAddressServiceImpl.java b/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysAddressServiceImpl.java index ed6a423..157c380 100644 --- a/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysAddressServiceImpl.java +++ b/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysAddressServiceImpl.java @@ -14,7 +14,7 @@ import xtools.app.sys.model.dto.resp.SysAddressResp; import xtools.app.sys.model.entity.SysAddress; import xtools.app.sys.service.SysAddressService; import xtools.app.sys.service.base.SysAddressBaseService; -import xtools.base.config.BaseParams; +import static xtools.base.config.Constants.*; import xtools.boot.api.model.dto.Result; import xtools.boot.cache.redis.base.RedisService; import xtools.core.StringUtils; @@ -33,7 +33,7 @@ import java.util.Objects; @Primary @Service @RequiredArgsConstructor -public class SysAddressServiceImpl implements SysAddressService, BaseParams { +public class SysAddressServiceImpl implements SysAddressService { /** * 缓存参数 diff --git a/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysBaseServiceImpl.java b/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysBaseServiceImpl.java index 311c649..a8b66eb 100644 --- a/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysBaseServiceImpl.java +++ b/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysBaseServiceImpl.java @@ -26,7 +26,7 @@ import xtools.app.sys.service.SysUserPasswdRuleService; import xtools.app.sys.service.SysUserService; import xtools.app.sys.service.base.SysUserBaseService; import xtools.app.sys.utils.PasswdUtils; -import xtools.base.config.BaseParams; +import static xtools.base.config.Constants.*; import xtools.boot.api.exection.BizError; import xtools.boot.api.exection.BizWarning; import xtools.boot.api.model.dto.Result; @@ -56,7 +56,7 @@ import java.util.Objects; @Primary @Service @RequiredArgsConstructor -public class SysBaseServiceImpl implements SysBaseService, BaseParams { +public class SysBaseServiceImpl implements SysBaseService { private final SysCommonService sysCommonService; diff --git a/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysDeptServiceImpl.java b/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysDeptServiceImpl.java index f346ecb..25dcc0b 100644 --- a/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysDeptServiceImpl.java +++ b/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysDeptServiceImpl.java @@ -15,7 +15,7 @@ import xtools.app.sys.model.dto.resp.SysDeptTreeResp; import xtools.app.sys.model.entity.SysDept; import xtools.app.sys.service.SysDeptService; import xtools.app.sys.service.base.SysDeptBaseService; -import xtools.base.config.BaseParams; +import static xtools.base.config.Constants.*; import xtools.boot.api.exection.BizError; import xtools.boot.api.exection.BizWarning; import xtools.boot.api.model.dto.Result; @@ -50,7 +50,7 @@ import java.util.stream.Collectors; @Primary @Service @RequiredArgsConstructor -public class SysDeptServiceImpl implements SysDeptService, BaseParams { +public class SysDeptServiceImpl implements SysDeptService { private final SysDeptBaseService sysDeptBaseService; diff --git a/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysDictServiceImpl.java b/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysDictServiceImpl.java index 18f9c8d..1a148b6 100644 --- a/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysDictServiceImpl.java +++ b/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysDictServiceImpl.java @@ -16,7 +16,7 @@ import xtools.app.sys.model.entity.SysDict; import xtools.app.sys.service.SysDictItemService; import xtools.app.sys.service.SysDictService; import xtools.app.sys.service.base.SysDictBaseService; -import xtools.base.config.BaseParams; +import static xtools.base.config.Constants.*; import xtools.boot.api.enums.StatusEnum; import xtools.boot.api.exection.BizError; import xtools.boot.api.exection.BizWarning; @@ -42,7 +42,7 @@ import java.util.Objects; @Primary @Service @RequiredArgsConstructor -public class SysDictServiceImpl implements SysDictService, BaseParams { +public class SysDictServiceImpl implements SysDictService { private final SysDictItemService sysDictItemService; diff --git a/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysFileServiceImpl.java b/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysFileServiceImpl.java index 144192c..e4c8974 100644 --- a/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysFileServiceImpl.java +++ b/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysFileServiceImpl.java @@ -22,7 +22,6 @@ import xtools.app.sys.model.dto.resp.SysFileResp; import xtools.app.sys.model.entity.SysFile; import xtools.app.sys.service.SysFileService; import xtools.app.sys.service.base.SysFileBaseService; -import xtools.base.config.BaseParams; import xtools.boot.api.enums.FileDataType; import xtools.boot.api.exection.BizError; import xtools.boot.api.exection.BizWarning; @@ -51,6 +50,9 @@ import java.util.List; import java.util.Objects; import java.util.Set; +import static xtools.base.config.Constants.CP_NUM0; +import static xtools.base.config.Constants.CP_NUM1; + /** *

Title : SysFileServiceImpl

*

Description : 系统文件表 ServiceImpl

@@ -64,7 +66,7 @@ import java.util.Set; @Primary @Service @RequiredArgsConstructor -public class SysFileServiceImpl implements SysFileService, BaseParams { +public class SysFileServiceImpl implements SysFileService { private final SysFileBaseService sysFileBaseService; diff --git a/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysLogServiceImpl.java b/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysLogServiceImpl.java index 96980d6..722e972 100644 --- a/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysLogServiceImpl.java +++ b/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysLogServiceImpl.java @@ -9,7 +9,6 @@ import xtools.app.sys.model.dto.resp.SysLogResp; import xtools.app.sys.model.entity.SysLog; import xtools.app.sys.service.SysLogService; import xtools.app.sys.service.base.SysLogBaseService; -import xtools.base.config.BaseParams; import xtools.boot.api.model.dto.Result; import xtools.boot.api.model.dto.page.PageReq; import xtools.boot.api.model.dto.page.PageResp; @@ -21,6 +20,10 @@ import java.time.Instant; import java.util.List; import java.util.Objects; +import static xtools.base.config.Constants.CP_NUM0; +import static xtools.base.config.Constants.CP_NUM1; +import static xtools.base.config.Constants.CP_NUM2; + /** *

Title : SysLogServiceImpl

*

Description : 日志记录表 ServiceImpl

@@ -30,7 +33,7 @@ import java.util.Objects; * @version : 1.0.0 * @date : 2026-02-07 20:09:03 */ -public class SysLogServiceImpl implements SysLogService, BaseParams { +public class SysLogServiceImpl implements SysLogService { @Resource private SysLogBaseService sysLogBaseService; diff --git a/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysLogTotalServiceImpl.java b/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysLogTotalServiceImpl.java index 211ff87..5a90846 100644 --- a/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysLogTotalServiceImpl.java +++ b/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysLogTotalServiceImpl.java @@ -8,7 +8,6 @@ import xtools.app.sys.model.dto.req.SysLogTotalStatsReq; import xtools.app.sys.model.dto.resp.SysLogTotalStatsResp; import xtools.app.sys.service.SysLogTotalService; import xtools.app.sys.service.base.SysLogTotalBaseService; -import xtools.base.config.BaseParams; import xtools.boot.api.exection.BizWarning; import xtools.boot.api.model.dto.Result; import xtools.core.CollectionUtils; @@ -22,6 +21,10 @@ import java.util.List; import java.util.Map; import java.util.Objects; +import static xtools.base.config.Constants.CP_NUM0; +import static xtools.base.config.Constants.CP_NUM1; +import static xtools.base.config.Constants.CP_NUM2; + /** *

Title : SysLogTotalServiceImpl

*

Description : 系统日志统计表 ServiceImpl

@@ -34,7 +37,7 @@ import java.util.Objects; @Primary @Service @RequiredArgsConstructor -public class SysLogTotalServiceImpl implements SysLogTotalService, BaseParams { +public class SysLogTotalServiceImpl implements SysLogTotalService { private final SysLogTotalBaseService sysLogTotalBaseService; diff --git a/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysLoginServiceImpl.java b/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysLoginServiceImpl.java index 63c1acb..52df663 100644 --- a/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysLoginServiceImpl.java +++ b/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysLoginServiceImpl.java @@ -22,7 +22,6 @@ import xtools.app.sys.service.SysUserPasswdRuleService; import xtools.app.sys.service.base.SysUserBaseService; import xtools.app.sys.service.base.SysUserRoleBaseService; import xtools.app.sys.utils.PasswdUtils; -import xtools.base.config.BaseParams; import xtools.boot.api.exection.BizError; import xtools.boot.api.exection.BizWarning; import xtools.boot.api.model.dto.Result; @@ -42,6 +41,11 @@ import java.time.temporal.ChronoUnit; import java.util.List; import java.util.Objects; +import static xtools.base.config.Constants.CP_NUM0; +import static xtools.base.config.Constants.CP_NUM1; +import static xtools.base.config.Constants.CP_NUM2; +import static xtools.base.config.Constants.CP_NUM60; + /** *

Title : SysLoginServiceImpl

*

Description : SysLoginServiceImpl

@@ -56,7 +60,7 @@ import java.util.Objects; @Primary @Service @RequiredArgsConstructor -public class SysLoginServiceImpl implements SysLoginService, BaseParams { +public class SysLoginServiceImpl implements SysLoginService { private final SysCommonService sysCommonService; @@ -234,12 +238,12 @@ public class SysLoginServiceImpl implements SysLoginService, BaseParams { Long count = redisService.incr(key); if (count >= rule.getErrorPasswdCount()) { // 大于阈值锁定 - redisService.set(getLockKey(id), CP_NUM1, (long) rule.getErrorPasswdLockMinutes() * BaseParams.CP_NUM60); + redisService.set(getLockKey(id), CP_NUM1, (long) rule.getErrorPasswdLockMinutes() * CP_NUM60); redisService.del(key); throw new BizWarning("密码错误次数超过" + rule.getErrorPasswdCount() + "次,账户已锁定" + rule.getErrorPasswdLockMinutes() + "分钟"); } else { // 更新密码错误时间窗口 - redisService.expire(key, (long) rule.getErrorPasswdWindowMinutes() * BaseParams.CP_NUM60); + redisService.expire(key, (long) rule.getErrorPasswdWindowMinutes() * CP_NUM60); } } diff --git a/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysMenuServiceImpl.java b/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysMenuServiceImpl.java index 84f70f3..166ee0e 100644 --- a/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysMenuServiceImpl.java +++ b/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysMenuServiceImpl.java @@ -20,7 +20,6 @@ import xtools.app.sys.service.SysMenuService; import xtools.app.sys.service.SysPermService; import xtools.app.sys.service.base.SysMenuBaseService; import xtools.app.sys.service.base.SysRoleMenuBaseService; -import xtools.base.config.BaseParams; import xtools.boot.api.exection.BizError; import xtools.boot.api.exection.BizWarning; import xtools.boot.api.model.dto.Result; @@ -42,6 +41,10 @@ import java.util.Set; import java.util.StringJoiner; import java.util.stream.Collectors; +import static xtools.base.config.Constants.CP_COLON; +import static xtools.base.config.Constants.CP_COMMA; +import static xtools.base.config.Constants.CP_EMPTY; + /** *

Title : SysMenuServiceImpl

*

Description : 系统菜单表 ServiceImpl

@@ -54,7 +57,7 @@ import java.util.stream.Collectors; @Primary @Service @RequiredArgsConstructor -public class SysMenuServiceImpl implements SysMenuService, BaseParams { +public class SysMenuServiceImpl implements SysMenuService { private final SysPermService sysPermService; diff --git a/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysMonitorServiceImpl.java b/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysMonitorServiceImpl.java index e8cd0c6..e1cf371 100644 --- a/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysMonitorServiceImpl.java +++ b/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysMonitorServiceImpl.java @@ -5,7 +5,6 @@ import jakarta.annotation.Resource; import org.springframework.context.annotation.Primary; import org.springframework.stereotype.Service; import xtools.app.sys.service.SysMonitorService; -import xtools.base.config.BaseParams; import xtools.boot.api.model.dto.Result; import xtools.boot.cache.redis.monitor.RedisMonitor; import xtools.boot.db.mybatis.enums.MySqlMonitorEnums; @@ -17,6 +16,10 @@ import xtools.extend.dto.monitor.HardwareInfoDto; import java.util.List; +import static xtools.base.config.Constants.CP_NUM1; +import static xtools.base.config.Constants.CP_NUM10; +import static xtools.base.config.Constants.CP_NUM60; + /** *

Title : SysMonitorServiceImpl

*

Description : SysMonitorServiceImpl

@@ -30,7 +33,7 @@ import java.util.List; */ @Primary @Service -public class SysMonitorServiceImpl implements SysMonitorService, BaseParams { +public class SysMonitorServiceImpl implements SysMonitorService { @Resource private RedisMonitor redisMonitor; diff --git a/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysNoticeServiceImpl.java b/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysNoticeServiceImpl.java index 45b4370..d706286 100644 --- a/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysNoticeServiceImpl.java +++ b/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysNoticeServiceImpl.java @@ -23,7 +23,7 @@ import xtools.app.sys.service.SysUserNoticeService; import xtools.app.sys.service.base.SysNoticeBaseService; import xtools.app.sys.service.base.SysUserBaseService; import xtools.app.sys.service.base.SysUserNoticeBaseService; -import xtools.base.config.BaseParams; +import static xtools.base.config.Constants.*; import xtools.boot.api.exection.BizError; import xtools.boot.api.exection.BizWarning; import xtools.boot.api.model.dto.Result; @@ -53,7 +53,7 @@ import java.util.stream.Collectors; @Primary @Service @RequiredArgsConstructor -public class SysNoticeServiceImpl implements SysNoticeService, BaseParams { +public class SysNoticeServiceImpl implements SysNoticeService { private final SysFileOptService sysFileOptService; diff --git a/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysOptLogServiceImpl.java b/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysOptLogServiceImpl.java index c78c240..6c62eff 100644 --- a/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysOptLogServiceImpl.java +++ b/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysOptLogServiceImpl.java @@ -20,7 +20,6 @@ import xtools.app.sys.model.dto.resp.SysOptLogTitleTreeResp; import xtools.app.sys.model.entity.SysOptLog; import xtools.app.sys.service.SysOptLogService; import xtools.app.sys.service.base.SysOptLogBaseService; -import xtools.base.config.BaseParams; import xtools.boot.api.exection.BizWarning; import xtools.boot.api.model.dto.Result; import xtools.boot.api.model.dto.page.PageReq; @@ -40,6 +39,13 @@ import java.util.Objects; import java.util.function.Function; import java.util.stream.Collectors; +import static xtools.base.config.Constants.CP_LINE; +import static xtools.base.config.Constants.CP_NEGATIVE1; +import static xtools.base.config.Constants.CP_NUM0; +import static xtools.base.config.Constants.CP_NUM1; +import static xtools.base.config.Constants.CP_NUM16; +import static xtools.base.config.Constants.CP_NUM2; + /** *

Title : SysOptLogServiceImpl

*

Description : 系统操作日志 ServiceImpl

@@ -53,7 +59,7 @@ import java.util.stream.Collectors; @Primary @Service @RequiredArgsConstructor -public class SysOptLogServiceImpl implements SysOptLogService, BaseParams { +public class SysOptLogServiceImpl implements SysOptLogService { private final SysConfig sysConfig; diff --git a/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysParamServiceImpl.java b/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysParamServiceImpl.java index c75eb15..fdc6187 100644 --- a/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysParamServiceImpl.java +++ b/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysParamServiceImpl.java @@ -26,7 +26,6 @@ import xtools.app.sys.model.entity.SysParam; import xtools.app.sys.param.utils.SysParamUtils; import xtools.app.sys.service.SysParamService; import xtools.app.sys.service.base.SysParamBaseService; -import xtools.base.config.BaseParams; import xtools.boot.api.exection.BizError; import xtools.boot.api.exection.BizWarning; import xtools.boot.api.model.dto.Result; @@ -44,6 +43,9 @@ import java.util.Map; import java.util.Objects; import java.util.stream.Collectors; +import static xtools.base.config.Constants.CP_NUM1; +import static xtools.base.config.Constants.CP_NUM2; + /** *

Title : SysParamServiceImpl

*

Description : 系统参数表 ServiceImpl

@@ -57,7 +59,7 @@ import java.util.stream.Collectors; @Primary @Service @RequiredArgsConstructor -public class SysParamServiceImpl implements SysParamService, BaseParams { +public class SysParamServiceImpl implements SysParamService { private final SysParamBaseService sysParamBaseService; private final SysDictItemApi sysDictItemApi; diff --git a/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysPasswdServiceImpl.java b/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysPasswdServiceImpl.java index 9df3950..1b58339 100644 --- a/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysPasswdServiceImpl.java +++ b/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysPasswdServiceImpl.java @@ -6,7 +6,7 @@ import org.springframework.stereotype.Service; import xtools.app.sys.model.entity.SysUserPasswdRule; import xtools.app.sys.service.SysPasswdService; import xtools.app.sys.service.SysUserPasswdRuleService; -import xtools.base.config.BaseParams; +import static xtools.base.config.Constants.*; import xtools.boot.api.exection.BizError; import xtools.boot.api.exection.BizWarning; import xtools.core.StringUtils; @@ -30,7 +30,7 @@ import java.util.regex.Pattern; @Primary @Service @RequiredArgsConstructor -public class SysPasswdServiceImpl implements SysPasswdService, BaseParams { +public class SysPasswdServiceImpl implements SysPasswdService { /** * 键盘连续字符序列 diff --git a/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysPermServiceImpl.java b/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysPermServiceImpl.java index 88e0a7d..0bed8f4 100644 --- a/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysPermServiceImpl.java +++ b/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysPermServiceImpl.java @@ -10,7 +10,6 @@ import xtools.app.sys.auth.utils.PremUtils; import xtools.app.sys.mapper.SysMenuMapper; import xtools.app.sys.model.entity.SysInterfacePerm; import xtools.app.sys.service.SysPermService; -import xtools.base.config.BaseParams; import xtools.boot.cache.redis.base.RedisService; import xtools.core.ArrUtils; import xtools.core.CollectionUtils; @@ -22,6 +21,9 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import static xtools.base.config.Constants.CP_COLON; +import static xtools.base.config.Constants.CP_NUM16; + /** *

Title : SysPermServiceImpl

*

Description : SysPermServiceImpl

@@ -37,7 +39,7 @@ import java.util.Map; @Primary @Service @RequiredArgsConstructor -public class SysPermServiceImpl implements SysPermService, BaseParams { +public class SysPermServiceImpl implements SysPermService { private final SysMenuMapper sysMenuMapper; diff --git a/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysRiskServiceImpl.java b/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysRiskServiceImpl.java index 4c7ec76..141e9ee 100644 --- a/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysRiskServiceImpl.java +++ b/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysRiskServiceImpl.java @@ -21,7 +21,6 @@ import xtools.app.sys.risk.utils.IpRiskUtils; import xtools.app.sys.risk.utils.UriRiskUtils; import xtools.app.sys.service.SysRiskService; import xtools.app.sys.service.base.SysRiskBaseService; -import xtools.base.config.BaseParams; import xtools.boot.api.exection.BizError; import xtools.boot.api.exection.BizWarning; import xtools.boot.api.model.dto.Result; @@ -37,6 +36,10 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; +import static xtools.base.config.Constants.CP_COMMA; +import static xtools.base.config.Constants.CP_EMPTY; +import static xtools.base.config.Constants.CP_NUM1; + /** *

Title : SysRiskServiceImpl

*

Description : 系统风控表 ServiceImpl

@@ -49,7 +52,7 @@ import java.util.Objects; @Primary @Service @RequiredArgsConstructor -public class SysRiskServiceImpl implements SysRiskService, BaseParams { +public class SysRiskServiceImpl implements SysRiskService { private final SysRiskBaseService sysRiskBaseService; diff --git a/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysRoleServiceImpl.java b/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysRoleServiceImpl.java index 2a3d856..8388e38 100644 --- a/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysRoleServiceImpl.java +++ b/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysRoleServiceImpl.java @@ -16,7 +16,6 @@ import xtools.app.sys.service.SysPermService; import xtools.app.sys.service.SysRoleService; import xtools.app.sys.service.base.SysRoleBaseService; import xtools.app.sys.service.base.SysUserRoleBaseService; -import xtools.base.config.BaseParams; import xtools.boot.api.exection.BizError; import xtools.boot.api.exection.BizWarning; import xtools.boot.api.model.dto.Result; @@ -28,6 +27,8 @@ import xtools.core.StringUtils; import java.util.List; import java.util.Objects; +import static xtools.base.config.Constants.CP_NUM1; + /** *

Title : SysRoleServiceImpl

*

Description : 系统角色表 ServiceImpl

@@ -40,7 +41,7 @@ import java.util.Objects; @Primary @Service @RequiredArgsConstructor -public class SysRoleServiceImpl implements SysRoleService, BaseParams { +public class SysRoleServiceImpl implements SysRoleService { private final SysPermService sysPermService; diff --git a/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysTaskServiceImpl.java b/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysTaskServiceImpl.java index 45ce924..c03978d 100644 --- a/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysTaskServiceImpl.java +++ b/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysTaskServiceImpl.java @@ -16,7 +16,6 @@ import xtools.app.sys.model.dto.resp.SysTaskStatsResp; import xtools.app.sys.model.entity.SysTask; import xtools.app.sys.service.SysTaskService; import xtools.app.sys.service.base.SysTaskBaseService; -import xtools.base.config.BaseParams; import xtools.boot.api.exection.BizWarning; import xtools.boot.api.model.dto.Result; import xtools.boot.api.model.dto.log.LogTrack; @@ -35,6 +34,11 @@ import java.time.Instant; import java.util.List; import java.util.Objects; +import static xtools.base.config.Constants.CP_NUM0; +import static xtools.base.config.Constants.CP_NUM1; +import static xtools.base.config.Constants.CP_NUM1000; +import static xtools.base.config.Constants.CP_NUM2; + /** *

Title : SysTaskServiceImpl

*

Description : 系统任务 ServiceImpl

@@ -48,7 +52,7 @@ import java.util.Objects; @Primary @Service @RequiredArgsConstructor -public class SysTaskServiceImpl implements SysTaskService, BaseParams { +public class SysTaskServiceImpl implements SysTaskService { private final SysTaskBaseService sysTaskBaseService; diff --git a/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysUserNoticeInfoServiceImpl.java b/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysUserNoticeInfoServiceImpl.java index b6a27d5..bc88b22 100644 --- a/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysUserNoticeInfoServiceImpl.java +++ b/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysUserNoticeInfoServiceImpl.java @@ -17,7 +17,7 @@ import xtools.app.sys.service.SysUserNoticeInfoService; import xtools.app.sys.service.base.SysNoticeBaseService; import xtools.app.sys.service.base.SysUserNoticeBaseService; import xtools.app.sys.service.base.SysUserNoticeInfoBaseService; -import xtools.base.config.BaseParams; +import static xtools.base.config.Constants.*; import xtools.boot.api.enums.DeleteEnum; import xtools.boot.api.exection.BizError; import xtools.boot.api.model.dto.Result; @@ -43,7 +43,7 @@ import java.util.Objects; @Primary @Service @RequiredArgsConstructor -public class SysUserNoticeInfoServiceImpl implements SysUserNoticeInfoService, BaseParams { +public class SysUserNoticeInfoServiceImpl implements SysUserNoticeInfoService { private final SysNoticeBaseService sysNoticeBaseService; diff --git a/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysUserNoticeServiceImpl.java b/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysUserNoticeServiceImpl.java index 773275b..71d6e53 100644 --- a/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysUserNoticeServiceImpl.java +++ b/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysUserNoticeServiceImpl.java @@ -19,7 +19,6 @@ import xtools.app.sys.service.SysUserNoticeService; import xtools.app.sys.service.base.SysNoticeBaseService; import xtools.app.sys.service.base.SysUserBaseService; import xtools.app.sys.service.base.SysUserNoticeBaseService; -import xtools.base.config.BaseParams; import xtools.boot.api.enums.DeleteEnum; import xtools.boot.api.exection.BizError; import xtools.boot.api.exection.BizWarning; @@ -37,6 +36,8 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; +import static xtools.base.config.Constants.CP_NUM1; + /** *

Title : SysUserNoticeServiceImpl

*

Description : 系统用户通知公告表 ServiceImpl

@@ -49,7 +50,7 @@ import java.util.Objects; @Primary @Service @RequiredArgsConstructor -public class SysUserNoticeServiceImpl implements SysUserNoticeService, BaseParams { +public class SysUserNoticeServiceImpl implements SysUserNoticeService { private final SysUserNoticeBaseService sysUserNoticeBaseService; diff --git a/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysUserPasswdRuleServiceImpl.java b/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysUserPasswdRuleServiceImpl.java index eb7b6c0..50c089c 100644 --- a/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysUserPasswdRuleServiceImpl.java +++ b/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysUserPasswdRuleServiceImpl.java @@ -19,7 +19,6 @@ import xtools.app.sys.model.dto.resp.SysUserPasswdRuleResp; import xtools.app.sys.model.entity.SysUserPasswdRule; import xtools.app.sys.service.SysUserPasswdRuleService; import xtools.app.sys.service.base.SysUserPasswdRuleBaseService; -import xtools.base.config.BaseParams; import xtools.boot.api.exection.BizError; import xtools.boot.api.exection.BizWarning; import xtools.boot.api.model.dto.Result; @@ -33,6 +32,9 @@ import xtools.core.StringUtils; import java.util.List; import java.util.Objects; +import static xtools.base.config.Constants.CP_NUM0; +import static xtools.base.config.Constants.CP_NUM1; + /** *

Title : SysUserPasswdRuleServiceImpl

*

Description : 用户名密码规则 ServiceImpl

@@ -45,7 +47,7 @@ import java.util.Objects; @Primary @Service @RequiredArgsConstructor -public class SysUserPasswdRuleServiceImpl implements SysUserPasswdRuleService, BaseParams { +public class SysUserPasswdRuleServiceImpl implements SysUserPasswdRuleService { private final static AppCache CACHE_PARAM = AppCache.SYS_CACHE_AP_RULE; diff --git a/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysUserServiceImpl.java b/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysUserServiceImpl.java index 080a8bc..fc128d3 100644 --- a/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysUserServiceImpl.java +++ b/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysUserServiceImpl.java @@ -23,7 +23,7 @@ import xtools.app.sys.service.base.SysDeptBaseService; import xtools.app.sys.service.base.SysUserBaseService; import xtools.app.sys.service.base.SysUserRoleBaseService; import xtools.app.sys.utils.PasswdUtils; -import xtools.base.config.BaseParams; +import static xtools.base.config.Constants.*; import xtools.boot.api.exection.BizError; import xtools.boot.api.exection.BizWarning; import xtools.boot.api.model.dto.Result; @@ -58,7 +58,7 @@ import java.util.Objects; @Primary @Service @RequiredArgsConstructor -public class SysUserServiceImpl implements SysUserService, BaseParams { +public class SysUserServiceImpl implements SysUserService { private final SysConfig sysConfig; diff --git a/xtools-app-sys/xtools-app-sys-file/src/main/java/xtools/app/sys/file/aop/StorageServiceAop.java b/xtools-app-sys/xtools-app-sys-file/src/main/java/xtools/app/sys/file/aop/StorageServiceAop.java index dc6eaa4..d818562 100644 --- a/xtools-app-sys/xtools-app-sys-file/src/main/java/xtools/app/sys/file/aop/StorageServiceAop.java +++ b/xtools-app-sys/xtools-app-sys-file/src/main/java/xtools/app/sys/file/aop/StorageServiceAop.java @@ -6,7 +6,6 @@ import org.aspectj.lang.annotation.Around; import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Pointcut; import org.springframework.stereotype.Component; -import xtools.base.config.BaseParams; import xtools.boot.api.model.dto.log.LogTrack; import xtools.boot.log.LogBus; import xtools.boot.log.enums.LogBusBaseType; @@ -17,6 +16,8 @@ import java.io.InputStream; import java.io.OutputStream; import java.util.Objects; +import static xtools.base.config.Constants.CP_NUM0; + /** *

Title : StorageServiceAop

*

Description : StorageServiceAop

@@ -30,7 +31,7 @@ import java.util.Objects; */ @Aspect @Component -public class StorageServiceAop implements BaseParams { +public class StorageServiceAop { /** * 方法切面 diff --git a/xtools-app-sys/xtools-app-sys-file/src/main/java/xtools/app/sys/file/service/impl/SysFileOptServiceImpl.java b/xtools-app-sys/xtools-app-sys-file/src/main/java/xtools/app/sys/file/service/impl/SysFileOptServiceImpl.java index fd586b9..0deb514 100644 --- a/xtools-app-sys/xtools-app-sys-file/src/main/java/xtools/app/sys/file/service/impl/SysFileOptServiceImpl.java +++ b/xtools-app-sys/xtools-app-sys-file/src/main/java/xtools/app/sys/file/service/impl/SysFileOptServiceImpl.java @@ -12,7 +12,6 @@ import xtools.app.sys.file.service.SysFileOptService; import xtools.app.sys.model.dto.req.SysFileAddReq; import xtools.app.sys.model.dto.req.SysFileChangeReq; import xtools.app.sys.model.dto.resp.SysFileResp; -import xtools.base.config.BaseParams; import xtools.boot.api.enums.FileDataType; import xtools.boot.api.exection.BizError; import xtools.boot.api.model.dto.Result; @@ -41,6 +40,11 @@ import java.util.Calendar; import java.util.List; import java.util.Objects; +import static xtools.base.config.Constants.CP_LINE; +import static xtools.base.config.Constants.CP_NEGATIVE1; +import static xtools.base.config.Constants.CP_NUM0; +import static xtools.base.config.Constants.CP_NUM1; + /** *

Title : SysFileOptServiceImpl

*

Description : SysFileOptServiceImpl

@@ -55,7 +59,7 @@ import java.util.Objects; @Slf4j @Service @RequiredArgsConstructor -public class SysFileOptServiceImpl implements SysFileOptService, BaseParams { +public class SysFileOptServiceImpl implements SysFileOptService { /** * 文件最大长度 diff --git a/xtools-app-sys/xtools-app-sys-log-bus-elasticsearch/src/main/java/xtools/app/sys/log/bus/elasticsearch/service/impl/EsSysLogServiceImpl.java b/xtools-app-sys/xtools-app-sys-log-bus-elasticsearch/src/main/java/xtools/app/sys/log/bus/elasticsearch/service/impl/EsSysLogServiceImpl.java index 2e3efb3..9020f79 100644 --- a/xtools-app-sys/xtools-app-sys-log-bus-elasticsearch/src/main/java/xtools/app/sys/log/bus/elasticsearch/service/impl/EsSysLogServiceImpl.java +++ b/xtools-app-sys/xtools-app-sys-log-bus-elasticsearch/src/main/java/xtools/app/sys/log/bus/elasticsearch/service/impl/EsSysLogServiceImpl.java @@ -11,7 +11,7 @@ import xtools.app.sys.model.dto.req.SysLogPageReq; import xtools.app.sys.model.dto.resp.SysLogResp; import xtools.app.sys.model.entity.SysLog; import xtools.app.sys.service.SysLogService; -import xtools.base.config.BaseParams; +import static xtools.base.config.Constants.*; import xtools.boot.api.exection.BizError; import xtools.boot.api.model.dto.Result; import xtools.boot.api.model.dto.page.PageReq; @@ -39,7 +39,7 @@ import java.util.Objects; * @version : 1.0.0 * @date : 2026/2/13 19:43 */ -public class EsSysLogServiceImpl implements SysLogService, BaseParams { +public class EsSysLogServiceImpl implements SysLogService { @Resource private EsSysLogRepository esSysLogRepository; diff --git a/xtools-app-sys/xtools-app-sys-param/src/main/java/xtools/app/sys/param/utils/SysParamUtils.java b/xtools-app-sys/xtools-app-sys-param/src/main/java/xtools/app/sys/param/utils/SysParamUtils.java index d78dd01..e3a0999 100644 --- a/xtools-app-sys/xtools-app-sys-param/src/main/java/xtools/app/sys/param/utils/SysParamUtils.java +++ b/xtools-app-sys/xtools-app-sys-param/src/main/java/xtools/app/sys/param/utils/SysParamUtils.java @@ -6,7 +6,6 @@ import lombok.extern.slf4j.Slf4j; import xtools.app.common.cache.enums.AppCache; import xtools.app.sys.param.enums.SysParamBaseEnum; import xtools.app.sys.param.enums.SysParamDataType; -import xtools.base.config.BaseParams; import xtools.boot.api.exection.BizError; import xtools.boot.cache.redis.base.RedisService; import xtools.boot.cache.redis.utils.RedisUtils; @@ -15,6 +14,9 @@ import xtools.core.CollectionUtils; import java.util.List; import java.util.Objects; +import static xtools.base.config.Constants.CP_COLON; +import static xtools.base.config.Constants.CP_NUM1; + /** *

Title : SysParamUtils

*

Description : SysParamUtils

@@ -27,7 +29,7 @@ import java.util.Objects; * @date : 2026/3/18 15:50 */ @Slf4j -public class SysParamUtils implements BaseParams { +public class SysParamUtils { /** * 系统参数缓存 diff --git a/xtools-app-sys/xtools-app-sys-risk/src/main/java/xtools/app/sys/risk/IpRisk.java b/xtools-app-sys/xtools-app-sys-risk/src/main/java/xtools/app/sys/risk/IpRisk.java index 2dd07a8..9134ac2 100644 --- a/xtools-app-sys/xtools-app-sys-risk/src/main/java/xtools/app/sys/risk/IpRisk.java +++ b/xtools-app-sys/xtools-app-sys-risk/src/main/java/xtools/app/sys/risk/IpRisk.java @@ -8,7 +8,7 @@ import xtools.app.sys.api.SysRiskApi; import xtools.app.sys.enums.SysRiskType; import xtools.app.sys.model.dto.resp.SysRiskResp; import xtools.app.sys.risk.utils.IpRiskUtils; -import xtools.base.config.BaseParams; +import static xtools.base.config.Constants.*; import xtools.boot.cache.redis.base.RedisService; import xtools.core.CollectionUtils; @@ -28,7 +28,7 @@ import java.util.List; @Slf4j @Component @RequiredArgsConstructor -public class IpRisk implements BaseParams { +public class IpRisk { private final SysRiskApi sysRiskApi; diff --git a/xtools-app-sys/xtools-app-sys-risk/src/main/java/xtools/app/sys/risk/UriRisk.java b/xtools-app-sys/xtools-app-sys-risk/src/main/java/xtools/app/sys/risk/UriRisk.java index bd19113..ffd56f7 100644 --- a/xtools-app-sys/xtools-app-sys-risk/src/main/java/xtools/app/sys/risk/UriRisk.java +++ b/xtools-app-sys/xtools-app-sys-risk/src/main/java/xtools/app/sys/risk/UriRisk.java @@ -8,7 +8,7 @@ import xtools.app.sys.enums.SysRiskType; import xtools.app.sys.model.dto.resp.SysRiskResp; import xtools.app.sys.risk.utils.RiskCaffeineUtils; import xtools.app.sys.risk.utils.UriRiskUtils; -import xtools.base.config.BaseParams; +import static xtools.base.config.Constants.*; import xtools.core.CollectionUtils; import java.util.List; @@ -27,7 +27,7 @@ import java.util.List; @Slf4j @Component @RequiredArgsConstructor -public class UriRisk implements BaseParams { +public class UriRisk { private final SysRiskApi sysRiskApi; diff --git a/xtools-app-sys/xtools-app-sys-risk/src/main/java/xtools/app/sys/risk/utils/IpRiskUtils.java b/xtools-app-sys/xtools-app-sys-risk/src/main/java/xtools/app/sys/risk/utils/IpRiskUtils.java index 0c3a501..fc378a5 100644 --- a/xtools-app-sys/xtools-app-sys-risk/src/main/java/xtools/app/sys/risk/utils/IpRiskUtils.java +++ b/xtools-app-sys/xtools-app-sys-risk/src/main/java/xtools/app/sys/risk/utils/IpRiskUtils.java @@ -1,7 +1,6 @@ package xtools.app.sys.risk.utils; import xtools.app.common.cache.enums.AppCache; -import xtools.base.config.BaseParams; import xtools.boot.cache.redis.base.RedisService; import xtools.boot.cache.redis.utils.RedisUtils; import xtools.core.ArrUtils; @@ -11,6 +10,8 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; +import static xtools.base.config.Constants.CP_NUM0; + /** *

Title : IpRiskUtils

*

Description : IpRiskUtils

@@ -22,7 +23,7 @@ import java.util.stream.Collectors; * @version : 1.0.0 * @date : 2026/4/8 16:29 */ -public class IpRiskUtils implements BaseParams { +public class IpRiskUtils { /** * IP风控缓存 diff --git a/xtools-app-sys/xtools-app-sys-risk/src/main/java/xtools/app/sys/risk/utils/RiskCaffeineUtils.java b/xtools-app-sys/xtools-app-sys-risk/src/main/java/xtools/app/sys/risk/utils/RiskCaffeineUtils.java index ff30396..ec6854e 100644 --- a/xtools-app-sys/xtools-app-sys-risk/src/main/java/xtools/app/sys/risk/utils/RiskCaffeineUtils.java +++ b/xtools-app-sys/xtools-app-sys-risk/src/main/java/xtools/app/sys/risk/utils/RiskCaffeineUtils.java @@ -2,7 +2,6 @@ package xtools.app.sys.risk.utils; import com.github.benmanes.caffeine.cache.Cache; import com.github.benmanes.caffeine.cache.Caffeine; -import xtools.base.config.BaseParams; import xtools.boot.cache.redis.utils.RedisUtils; import xtools.core.ArrUtils; import xtools.core.StringUtils; @@ -12,6 +11,8 @@ import java.util.List; import java.util.Objects; import java.util.concurrent.TimeUnit; +import static xtools.base.config.Constants.CP_NUM20; + /** *

Title : RiskCaffeineUtils

*

Description : RiskCaffeineUtils

@@ -23,7 +24,7 @@ import java.util.concurrent.TimeUnit; * @version : 1.0.0 * @date : 2026/4/25 14:28 */ -public class RiskCaffeineUtils implements BaseParams { +public class RiskCaffeineUtils { /** * URI风控缓存 diff --git a/xtools-app-sys/xtools-app-sys-risk/src/main/java/xtools/app/sys/risk/utils/UriRiskUtils.java b/xtools-app-sys/xtools-app-sys-risk/src/main/java/xtools/app/sys/risk/utils/UriRiskUtils.java index d577e5d..26124f6 100644 --- a/xtools-app-sys/xtools-app-sys-risk/src/main/java/xtools/app/sys/risk/utils/UriRiskUtils.java +++ b/xtools-app-sys/xtools-app-sys-risk/src/main/java/xtools/app/sys/risk/utils/UriRiskUtils.java @@ -1,7 +1,6 @@ package xtools.app.sys.risk.utils; import xtools.app.common.cache.enums.AppCache; -import xtools.base.config.BaseParams; import xtools.boot.cache.redis.base.RedisService; import xtools.boot.cache.redis.utils.RedisUtils; import xtools.core.StringUtils; @@ -17,7 +16,7 @@ import xtools.core.StringUtils; * @version : 1.0.0 * @date : 2026/4/8 16:32 */ -public class UriRiskUtils implements BaseParams { +public class UriRiskUtils { /** * URI风控缓存 diff --git a/xtools-app-sys/xtools-app-sys-scheduled/src/main/java/xtools/app/sys/scheduled/init/InitSysScheduled.java b/xtools-app-sys/xtools-app-sys-scheduled/src/main/java/xtools/app/sys/scheduled/init/InitSysScheduled.java index 573cbe8..60713ea 100644 --- a/xtools-app-sys/xtools-app-sys-scheduled/src/main/java/xtools/app/sys/scheduled/init/InitSysScheduled.java +++ b/xtools-app-sys/xtools-app-sys-scheduled/src/main/java/xtools/app/sys/scheduled/init/InitSysScheduled.java @@ -7,7 +7,7 @@ import org.springframework.boot.ApplicationRunner; import org.springframework.core.annotation.Order; import org.springframework.stereotype.Component; import xtools.app.sys.scheduled.service.SysScheduledService; -import xtools.base.config.BaseParams; +import xtools.base.config.Constants; import xtools.boot.log.LogBus; import xtools.boot.log.enums.LogBusBaseType; import xtools.boot.log.holder.LogTrackHolder; @@ -26,7 +26,7 @@ import xtools.core.enums.LogLevel; * @date : 2026/2/2 14:13 */ @Component -@Order(BaseParams.CP_NUM200) +@Order(Constants.CP_NUM200) @RequiredArgsConstructor public class InitSysScheduled implements ApplicationRunner { diff --git a/xtools-app-sys/xtools-app-sys-scheduled/src/main/java/xtools/app/sys/scheduled/service/base/SysScheduledBaseService.java b/xtools-app-sys/xtools-app-sys-scheduled/src/main/java/xtools/app/sys/scheduled/service/base/SysScheduledBaseService.java index bc9ad7a..e566354 100644 --- a/xtools-app-sys/xtools-app-sys-scheduled/src/main/java/xtools/app/sys/scheduled/service/base/SysScheduledBaseService.java +++ b/xtools-app-sys/xtools-app-sys-scheduled/src/main/java/xtools/app/sys/scheduled/service/base/SysScheduledBaseService.java @@ -1,6 +1,6 @@ package xtools.app.sys.scheduled.service.base; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.baomidou.mybatisplus.spring.service.impl.ServiceImpl; import org.springframework.stereotype.Component; import xtools.app.sys.scheduled.mapper.SysScheduledMapper; import xtools.app.sys.scheduled.model.entity.SysScheduled; diff --git a/xtools-app-sys/xtools-app-sys-scheduled/src/main/java/xtools/app/sys/scheduled/service/impl/SysScheduledServiceImpl.java b/xtools-app-sys/xtools-app-sys-scheduled/src/main/java/xtools/app/sys/scheduled/service/impl/SysScheduledServiceImpl.java index d9e8f48..0331a20 100644 --- a/xtools-app-sys/xtools-app-sys-scheduled/src/main/java/xtools/app/sys/scheduled/service/impl/SysScheduledServiceImpl.java +++ b/xtools-app-sys/xtools-app-sys-scheduled/src/main/java/xtools/app/sys/scheduled/service/impl/SysScheduledServiceImpl.java @@ -17,7 +17,6 @@ import xtools.app.sys.scheduled.model.entity.SysScheduled; import xtools.app.sys.scheduled.service.SysScheduledService; import xtools.app.sys.scheduled.service.base.SysScheduledBaseService; import xtools.app.sys.scheduled.utils.ScheduledUtils; -import xtools.base.config.BaseParams; import xtools.boot.api.enums.StatusEnum; import xtools.boot.api.exection.BizError; import xtools.boot.api.exection.BizWarning; @@ -35,6 +34,9 @@ import xtools.core.enums.LogLevel; import java.util.List; import java.util.Objects; +import static xtools.base.config.Constants.CP_NUM0; +import static xtools.base.config.Constants.CP_NUM1; + /** *

Title : SysScheduledServiceImpl

*

Description : 定时任务 ServiceImpl

@@ -48,7 +50,7 @@ import java.util.Objects; @Primary @Service @RequiredArgsConstructor -public class SysScheduledServiceImpl implements SysScheduledService, BaseParams { +public class SysScheduledServiceImpl implements SysScheduledService { private final SysScheduledBaseService sysScheduledBaseService; diff --git a/xtools-app-sys/xtools-app-sys-scheduled/src/main/java/xtools/app/sys/scheduled/utils/ScheduledUtils.java b/xtools-app-sys/xtools-app-sys-scheduled/src/main/java/xtools/app/sys/scheduled/utils/ScheduledUtils.java index f078d22..02e7379 100644 --- a/xtools-app-sys/xtools-app-sys-scheduled/src/main/java/xtools/app/sys/scheduled/utils/ScheduledUtils.java +++ b/xtools-app-sys/xtools-app-sys-scheduled/src/main/java/xtools/app/sys/scheduled/utils/ScheduledUtils.java @@ -4,7 +4,6 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.scheduling.TaskScheduler; import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; import org.springframework.scheduling.support.CronTrigger; -import xtools.base.config.BaseParams; import xtools.boot.api.exection.BizError; import xtools.core.StringUtils; import xtools.core.extend.CheckUtils; @@ -25,7 +24,7 @@ import java.util.concurrent.ScheduledFuture; * @date : 2026/2/23 09:46 */ @Slf4j -public class ScheduledUtils implements BaseParams { +public class ScheduledUtils { /** * 任务线程池 diff --git a/xtools-app-sys/xtools-app-sys-tag/src/main/java/xtools/app/sys/tag/config/WebMvcSwaggerConfig.java b/xtools-app-sys/xtools-app-sys-tag/src/main/java/xtools/app/sys/tag/config/WebMvcSwaggerConfig.java index c26bc62..6114535 100644 --- a/xtools-app-sys/xtools-app-sys-tag/src/main/java/xtools/app/sys/tag/config/WebMvcSwaggerConfig.java +++ b/xtools-app-sys/xtools-app-sys-tag/src/main/java/xtools/app/sys/tag/config/WebMvcSwaggerConfig.java @@ -5,7 +5,7 @@ import org.springframework.context.annotation.Configuration; import org.springframework.web.servlet.config.annotation.InterceptorRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; import xtools.app.sys.tag.interceptor.SwaggerTagInterceptor; -import xtools.base.config.BaseParams; +import static xtools.base.config.Constants.*; /** *

Title : WebMvcSwaggerConfig

@@ -19,7 +19,7 @@ import xtools.base.config.BaseParams; * @date : 2026/6/2 16:44:47 */ @Configuration -public class WebMvcSwaggerConfig implements WebMvcConfigurer, BaseParams { +public class WebMvcSwaggerConfig implements WebMvcConfigurer { @Resource private SwaggerTagInterceptor swaggerTagInterceptor; diff --git a/xtools-app-sys/xtools-app-sys-tag/src/main/java/xtools/app/sys/tag/interceptor/SwaggerTagInterceptor.java b/xtools-app-sys/xtools-app-sys-tag/src/main/java/xtools/app/sys/tag/interceptor/SwaggerTagInterceptor.java index 3192118..de6b7f1 100644 --- a/xtools-app-sys/xtools-app-sys-tag/src/main/java/xtools/app/sys/tag/interceptor/SwaggerTagInterceptor.java +++ b/xtools-app-sys/xtools-app-sys-tag/src/main/java/xtools/app/sys/tag/interceptor/SwaggerTagInterceptor.java @@ -9,7 +9,7 @@ import org.jspecify.annotations.NonNull; import org.springframework.stereotype.Component; import org.springframework.web.method.HandlerMethod; import org.springframework.web.servlet.HandlerInterceptor; -import xtools.base.config.BaseParams; +import static xtools.base.config.Constants.*; import xtools.boot.api.constant.BootCommonConstant; import xtools.boot.core.holder.CommonHolder; import xtools.core.StringUtils; @@ -30,7 +30,7 @@ import java.util.StringJoiner; */ @Slf4j @Component -public class SwaggerTagInterceptor implements HandlerInterceptor, BootCommonConstant, BaseParams { +public class SwaggerTagInterceptor implements HandlerInterceptor, BootCommonConstant { /** * 进入Handler方法之前执行