update 格式化全部代码

2026-06-04 18:11:39 +08:00
parent 5f8902c79a
commit 7fbd6fffcc
271 changed files with 1064 additions and 894 deletions
@@ -25,6 +25,8 @@ import java.util.Map;
@Component
 public class MyBatisDataSourceMonitor implements DataSourceMonitor {

+    private final Map<String, String> features = new HashMap<>();
+
    /**
     * 初始化 anyline 与动态数据源联动所需的元数据解析策略。
     */
@@ -35,8 +37,6 @@ public class MyBatisDataSourceMonitor implements DataSourceMonitor {
        ConfigTable.METADATA_CACHE_SCOPE = 0;
    }

-    private final Map<String, String> features = new HashMap<>();
-
    /**
     * 数据源特征 用来定准 adapter 包含数据库或JDBC协议关键字<br/>
     * 一般会通过 产品名_url 合成 如果返回null 上层方法会通过driver_产品名_url合成
@@ -82,9 +82,9 @@ public class MyBatisDataSourceMonitor implements DataSourceMonitor {
     */
    @Override
    public String key(DataRuntime runtime, Object datasource) {
-        if(datasource instanceof JdbcTemplate jdbc){
+        if (datasource instanceof JdbcTemplate jdbc) {
            DataSource ds = jdbc.getDataSource();
-            if(ds instanceof DynamicRoutingDataSource){
+            if (ds instanceof DynamicRoutingDataSource) {
                return DynamicDataSourceContextHolder.peek();
            }
        }
@@ -2,9 +2,7 @@ package org.dromara.gen.config.properties;

 import cn.hutool.extra.template.TemplateConfig;
 import lombok.Data;
-import org.dromara.common.core.factory.YmlPropertySourceFactory;
 import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.context.annotation.PropertySource;
 import org.springframework.stereotype.Component;

 import java.nio.charset.StandardCharsets;
@@ -41,7 +41,7 @@ public class GenController extends BaseController {
    /**
     * 分页查询代码生成业务列表。
     *
-     * @param genTable 查询条件
+     * @param genTable  查询条件
     * @param pageQuery 分页参数
     * @return 代码生成列表
     */
@@ -72,7 +72,7 @@ public class GenController extends BaseController {
    /**
     * 分页查询数据库表列表。
     *
-     * @param genTable 查询条件
+     * @param genTable  查询条件
     * @param pageQuery 分页参数
     * @return 数据库表列表
     */
@@ -162,7 +162,7 @@ public class GenController extends BaseController {
     * 生成代码（下载方式）
     *
     * @param response HTTP 响应
-     * @param tableId 表ID
+     * @param tableId  表ID
     */
    @SaCheckPermission("tool:gen:code")
    @Log(title = "代码生成", businessType = BusinessType.GENCODE)
@@ -190,7 +190,7 @@ public class GenController extends BaseController {
    /**
     * 批量生成代码
     *
-     * @param response HTTP 响应
+     * @param response   HTTP 响应
     * @param tableIdStr 表ID串
     */
    @SaCheckPermission("tool:gen:code")
@@ -206,7 +206,7 @@ public class GenController extends BaseController {
     * 将生成结果写出为 zip 文件流。
     *
     * @param response HTTP 响应
-     * @param data zip 二进制数据
+     * @param data     zip 二进制数据
     */
    private void genCode(HttpServletResponse response, byte[] data) throws IOException {
        response.reset();
@@ -3,13 +3,13 @@ package org.dromara.gen.domain;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import org.dromara.common.core.utils.StringUtils;
-import org.dromara.common.mybatis.core.domain.BaseEntity;
-import org.dromara.gen.constant.GenConstants;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.gen.constant.GenConstants;

 import java.util.HashMap;
 import java.util.List;
@@ -20,7 +20,6 @@ public interface GenTableMapper extends BaseMapperPlus<GenTable, GenTable> {
     *
     * @param dataName 数据源名称，用于选择不同的数据源
     * @return 当前数据库中的表名列表
-     *
     * @DS("") 使用默认数据源执行查询操作
     */
    @DS("")
@@ -457,16 +457,6 @@ public class GenTableServiceImpl implements IGenTableService {
        return new RenderContext(table, context, templates);
    }

-    /**
-     * 模板渲染上下文。
-     *
-     * @param table     生成表信息
-     * @param context   模板上下文
-     * @param templates 待渲染模板
-     */
-    private record RenderContext(GenTable table, Dict context, List<PathNamedTemplate> templates) {
-    }
-
    /**
     * 修改保存参数校验
     *
@@ -650,4 +640,14 @@ public class GenTableServiceImpl implements IGenTableService {
        }
    }

+    /**
+     * 模板渲染上下文。
+     *
+     * @param table     生成表信息
+     * @param context   模板上下文
+     * @param templates 待渲染模板
+     */
+    private record RenderContext(GenTable table, Dict context, List<PathNamedTemplate> templates) {
+    }
+
 }
@@ -32,11 +32,11 @@ public class TestMapReduceAnnotation1 {
    public ExecuteResult rootMapExecute(MapArgs mapArgs, MapHandler mapHandler) {
        int partitionSize = 50;
        List<List<Integer>> partition = IntStream.rangeClosed(1, 200)
-                .boxed()
-                .collect(Collectors.groupingBy(i -> (i - 1) / partitionSize))
-                .values()
-                .stream()
-                .toList();
+            .boxed()
+            .collect(Collectors.groupingBy(i -> (i - 1) / partitionSize))
+            .values()
+            .stream()
+            .toList();
        SnailJobLog.REMOTE.info("端口:{}完成分配任务", SpringUtil.getProperty("server.port"));
        return mapHandler.doMap(partition, "doCalc");
    }
@@ -2,6 +2,7 @@ package org.dromara.resource.controller;


 import cn.hutool.core.util.RandomUtil;
+import jakarta.validation.constraints.NotBlank;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.common.core.constant.Constants;
@@ -10,17 +11,16 @@ import org.dromara.common.core.domain.R;
 import org.dromara.common.core.exception.ServiceException;
 import org.dromara.common.core.utils.SpringUtils;
 import org.dromara.common.core.utils.regex.RegexValidator;
+import org.dromara.common.mail.config.properties.MailProperties;
 import org.dromara.common.mail.core.MailBuilder;
 import org.dromara.common.redis.annotation.RateLimiter;
-import org.dromara.common.web.core.BaseController;
-import org.dromara.common.mail.config.properties.MailProperties;
 import org.dromara.common.redis.utils.RedisUtils;
+import org.dromara.common.web.core.BaseController;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;

-import jakarta.validation.constraints.NotBlank;
 import java.time.Duration;

 /**
@@ -4,15 +4,15 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
 import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.PageResult;
 import org.dromara.common.core.domain.R;
 import org.dromara.common.core.validate.AddGroup;
 import org.dromara.common.core.validate.EditGroup;
 import org.dromara.common.core.validate.QueryGroup;
-import org.dromara.common.redis.annotation.RepeatSubmit;
 import org.dromara.common.log.annotation.Log;
 import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.mybatis.core.page.PageQuery;
-import org.dromara.common.core.domain.PageResult;
+import org.dromara.common.redis.annotation.RepeatSubmit;
 import org.dromara.common.web.core.BaseController;
 import org.dromara.resource.domain.bo.SysOssConfigBo;
 import org.dromara.resource.domain.vo.SysOssConfigVo;
@@ -2,15 +2,14 @@ package org.dromara.resource.controller;


 import cn.dev33.satoken.annotation.SaCheckPermission;
-import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.constraints.NotEmpty;
 import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.PageResult;
 import org.dromara.common.core.domain.R;
 import org.dromara.common.core.validate.QueryGroup;
 import org.dromara.common.log.annotation.Log;
 import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.mybatis.core.page.PageQuery;
-import org.dromara.common.core.domain.PageResult;
 import org.dromara.common.web.core.BaseController;
 import org.dromara.resource.domain.bo.SysOssBo;
 import org.dromara.resource.domain.vo.SysOssUploadVo;
@@ -1,15 +1,14 @@
 package org.dromara.resource.domain.bo;

 import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 import lombok.Data;
 import org.dromara.common.core.validate.AddGroup;
 import org.dromara.common.core.validate.EditGroup;
 import org.dromara.resource.domain.SysOssConfig;

-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
-import jakarta.validation.constraints.Size;
-
 import java.io.Serial;
 import java.io.Serializable;
 import java.util.HashMap;
@@ -10,6 +10,7 @@ import org.mapstruct.ReportingPolicy;

 /**
 * 用户信息转换器
+ *
 * @author zhujie
 */
@Mapper(componentModel = MappingConstants.ComponentModel.SPRING, unmappedTargetPolicy = ReportingPolicy.IGNORE)
@@ -90,7 +90,7 @@ public class RemoteFileServiceImpl implements RemoteFileService {
     * @return 列表
     */
    @Override
-    public List<RemoteFile> selectByIds(String ossIds){
+    public List<RemoteFile> selectByIds(String ossIds) {
        List<SysOssVo> sysOssVos = sysOssService.listByIds(StringUtils.splitTo(ossIds, Convert::toLong));
        return MapstructUtils.convert(sysOssVos, RemoteFile.class);
    }
@@ -18,9 +18,9 @@ public record OssConfigChangeEvent(
    /**
     * 创建保存 OSS 配置后的变更事件。
     *
-     * @param configKey 当前配置 key
+     * @param configKey    当前配置 key
     * @param oldConfigKey 变更前配置 key
-     * @param configJson 当前配置 JSON
+     * @param configJson   当前配置 JSON
     * @return OSS 配置变更事件
     */
    public static OssConfigChangeEvent save(String configKey, String oldConfigKey, String configJson) {
@@ -1,8 +1,8 @@
 package org.dromara.resource.runner;

-import org.dromara.resource.service.ISysOssConfigService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.dromara.resource.service.ISysOssConfigService;
 import org.springframework.boot.ApplicationArguments;
 import org.springframework.boot.ApplicationRunner;
 import org.springframework.stereotype.Component;
@@ -1,8 +1,8 @@
 package org.dromara.resource.service;


-import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.core.domain.PageResult;
+import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.resource.domain.bo.SysOssConfigBo;
 import org.dromara.resource.domain.vo.SysOssConfigVo;

@@ -1,15 +1,13 @@
 package org.dromara.resource.service;

-import jakarta.servlet.http.HttpServletResponse;
-import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.core.domain.PageResult;
+import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.resource.domain.bo.SysOssBo;
 import org.dromara.resource.domain.vo.SysOssVo;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.multipart.MultipartFile;

 import java.io.File;
-import java.io.IOException;
 import java.util.Collection;
 import java.util.List;

@@ -80,7 +78,7 @@ public interface ISysOssService {
    /**
     * 文件下载方法，支持一次性下载完整文件
     *
-     * @param ossId    OSS对象ID
+     * @param ossId OSS对象ID
     */
    ResponseEntity<byte[]> download(Long ossId);

@@ -133,8 +133,8 @@ public class SysMessageServiceImpl implements ISysMessageService {
            .ge(SysMessage::getCreateTime, LocalDateTime.now().minusDays(BOX_DAYS))
            .and(wrapper ->
                wrapper.eq(SysMessage::getSendUserIds, GLOBAL_USER_IDS)
-                .or()
-                .findInSet(userId, SysMessage::getSendUserIds)
+                    .or()
+                    .findInSet(userId, SysMessage::getSendUserIds)
            )
            .orderByDesc(SysMessage::getCreateTime, SysMessage::getMessageId)
            .list(new Page<>(1, BOX_LIMIT, false));
@@ -8,6 +8,7 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.common.core.constant.CacheNames;
 import org.dromara.common.core.constant.SystemConstants;
+import org.dromara.common.core.domain.PageResult;
 import org.dromara.common.core.exception.ServiceException;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.ObjectUtils;
@@ -15,7 +16,6 @@ import org.dromara.common.core.utils.SpringUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.json.utils.JsonUtils;
 import org.dromara.common.mybatis.core.page.PageQuery;
-import org.dromara.common.core.domain.PageResult;
 import org.dromara.common.mybatis.core.query.QueryBuilder;
 import org.dromara.common.oss.constant.OssConstant;
 import org.dromara.common.redis.utils.CacheUtils;
@@ -10,11 +10,7 @@ import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.constant.CacheNames;
 import org.dromara.common.core.domain.PageResult;
 import org.dromara.common.core.exception.ServiceException;
-import org.dromara.common.core.utils.MapstructUtils;
-import org.dromara.common.core.utils.SpringUtils;
-import org.dromara.common.core.utils.StreamUtils;
-import org.dromara.common.core.utils.StringUtils;
-import org.dromara.common.core.utils.ThreadUtils;
+import org.dromara.common.core.utils.*;
 import org.dromara.common.core.utils.file.FileUtils;
 import org.dromara.common.json.utils.JsonUtils;
 import org.dromara.common.mybatis.core.page.PageQuery;
@@ -5,13 +5,13 @@ import com.baomidou.lock.annotation.Lock4j;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.constant.CacheNames;
+import org.dromara.common.core.domain.PageResult;
 import org.dromara.common.core.domain.R;
 import org.dromara.common.excel.utils.ExcelBuilder;
-import org.dromara.common.redis.annotation.RepeatSubmit;
 import org.dromara.common.log.annotation.Log;
 import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.mybatis.core.page.PageQuery;
-import org.dromara.common.core.domain.PageResult;
+import org.dromara.common.redis.annotation.RepeatSubmit;
 import org.dromara.common.redis.utils.RedisUtils;
 import org.dromara.common.web.core.BaseController;
 import org.dromara.system.domain.bo.SysLoginInfoBo;
@@ -57,6 +57,7 @@ public class SysLoginInfoController extends BaseController {

    /**
     * 批量删除登录日志
+     *
     * @param infoIds 日志ids
     */
    @SaCheckPermission("monitor:logininfo:remove")
@@ -2,21 +2,21 @@ package org.dromara.system.controller.monitor;

 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.lock.annotation.Lock4j;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.PageResult;
 import org.dromara.common.core.domain.R;
-import org.dromara.common.web.core.BaseController;
 import org.dromara.common.excel.utils.ExcelBuilder;
 import org.dromara.common.log.annotation.Log;
 import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.mybatis.core.page.PageQuery;
-import org.dromara.common.core.domain.PageResult;
+import org.dromara.common.web.core.BaseController;
 import org.dromara.system.domain.bo.SysOperLogBo;
 import org.dromara.system.domain.vo.SysOperLogVo;
 import org.dromara.system.service.ISysOperLogService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;

-import jakarta.servlet.http.HttpServletResponse;
 import java.util.List;

 /**
@@ -54,6 +54,7 @@ public class SysOperlogController extends BaseController {

    /**
     * 批量删除操作日志记录
+     *
     * @param operIds 日志ids
     */
    @Log(title = "操作日志", businessType = BusinessType.DELETE)
@@ -6,16 +6,16 @@ import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.bean.BeanUtil;
 import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.constant.CacheNames;
+import org.dromara.common.core.domain.PageResult;
 import org.dromara.common.core.domain.R;
 import org.dromara.common.core.utils.StreamUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.core.utils.ThreadUtils;
-import org.dromara.common.redis.annotation.RepeatSubmit;
-import org.dromara.common.web.core.BaseController;
 import org.dromara.common.log.annotation.Log;
 import org.dromara.common.log.enums.BusinessType;
-import org.dromara.common.core.domain.PageResult;
+import org.dromara.common.redis.annotation.RepeatSubmit;
 import org.dromara.common.redis.utils.RedisUtils;
+import org.dromara.common.web.core.BaseController;
 import org.dromara.system.api.domain.SysUserOnline;
 import org.springframework.web.bind.annotation.*;

@@ -46,7 +46,7 @@ public class SysUserOnlineController extends BaseController {
        // 获取所有未过期的 token
        Collection<String> keys = RedisUtils.keys(CacheNames.ONLINE_TOKEN_KEY + "*");
        List<Supplier<SysUserOnline>> suppliers = keys.stream().map(key -> (Supplier<SysUserOnline>) () -> {
-            String token = StringUtils.substringAfterLast(key, ":");
+            String token = StringUtils.substringAfterLast(key, StringUtils.COLON);
            // 如果已经过期则跳过
            if (StpUtil.stpLogic.getTokenActiveTimeoutByToken(token) < -1) {
                return null;
@@ -5,15 +5,15 @@ import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
 import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.PageResult;
 import org.dromara.common.core.domain.R;
 import org.dromara.common.core.validate.AddGroup;
 import org.dromara.common.core.validate.EditGroup;
 import org.dromara.common.excel.utils.ExcelBuilder;
-import org.dromara.common.redis.annotation.RepeatSubmit;
 import org.dromara.common.log.annotation.Log;
 import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.mybatis.core.page.PageQuery;
-import org.dromara.common.core.domain.PageResult;
+import org.dromara.common.redis.annotation.RepeatSubmit;
 import org.dromara.common.web.core.BaseController;
 import org.dromara.system.domain.bo.SysClientBo;
 import org.dromara.system.domain.vo.SysClientVo;
@@ -1,23 +1,22 @@
 package org.dromara.system.controller.system;

 import cn.dev33.satoken.annotation.SaCheckPermission;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.PageResult;
 import org.dromara.common.core.domain.R;
-import org.dromara.common.redis.annotation.RepeatSubmit;
-import org.dromara.common.web.core.BaseController;
 import org.dromara.common.excel.utils.ExcelBuilder;
 import org.dromara.common.log.annotation.Log;
 import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.mybatis.core.page.PageQuery;
-import org.dromara.common.core.domain.PageResult;
+import org.dromara.common.redis.annotation.RepeatSubmit;
+import org.dromara.common.web.core.BaseController;
 import org.dromara.system.domain.bo.SysConfigBo;
 import org.dromara.system.domain.vo.SysConfigVo;
 import org.dromara.system.service.ISysConfigService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;

-import jakarta.servlet.http.HttpServletResponse;
-
 import java.util.Arrays;
 import java.util.List;

@@ -6,9 +6,9 @@ import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.constant.SystemConstants;
 import org.dromara.common.core.domain.R;
 import org.dromara.common.core.utils.StringUtils;
-import org.dromara.common.redis.annotation.RepeatSubmit;
 import org.dromara.common.log.annotation.Log;
 import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.redis.annotation.RepeatSubmit;
 import org.dromara.common.web.core.BaseController;
 import org.dromara.system.domain.bo.SysDeptBo;
 import org.dromara.system.domain.vo.SysDeptVo;
@@ -2,15 +2,16 @@ package org.dromara.system.controller.system;

 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.util.ObjectUtil;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.PageResult;
 import org.dromara.common.core.domain.R;
-import org.dromara.common.redis.annotation.RepeatSubmit;
-import org.dromara.common.web.core.BaseController;
 import org.dromara.common.excel.utils.ExcelBuilder;
 import org.dromara.common.log.annotation.Log;
 import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.mybatis.core.page.PageQuery;
-import org.dromara.common.core.domain.PageResult;
+import org.dromara.common.redis.annotation.RepeatSubmit;
+import org.dromara.common.web.core.BaseController;
 import org.dromara.system.domain.bo.SysDictDataBo;
 import org.dromara.system.domain.vo.SysDictDataVo;
 import org.dromara.system.service.ISysDictDataService;
@@ -18,7 +19,6 @@ import org.dromara.system.service.ISysDictTypeService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;

-import jakarta.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -1,23 +1,22 @@
 package org.dromara.system.controller.system;

 import cn.dev33.satoken.annotation.SaCheckPermission;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.PageResult;
 import org.dromara.common.core.domain.R;
-import org.dromara.common.redis.annotation.RepeatSubmit;
-import org.dromara.common.web.core.BaseController;
 import org.dromara.common.excel.utils.ExcelBuilder;
 import org.dromara.common.log.annotation.Log;
 import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.mybatis.core.page.PageQuery;
-import org.dromara.common.core.domain.PageResult;
+import org.dromara.common.redis.annotation.RepeatSubmit;
+import org.dromara.common.web.core.BaseController;
 import org.dromara.system.domain.bo.SysDictTypeBo;
 import org.dromara.system.domain.vo.SysDictTypeVo;
 import org.dromara.system.service.ISysDictTypeService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;

-import jakarta.servlet.http.HttpServletResponse;
-
 import java.util.Arrays;
 import java.util.List;

@@ -7,9 +7,9 @@ import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.constant.SystemConstants;
 import org.dromara.common.core.domain.R;
 import org.dromara.common.core.utils.StringUtils;
-import org.dromara.common.redis.annotation.RepeatSubmit;
 import org.dromara.common.log.annotation.Log;
 import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.redis.annotation.RepeatSubmit;
 import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.common.web.core.BaseController;
 import org.dromara.system.domain.SysMenu;
@@ -151,15 +151,6 @@ public class SysMenuController extends BaseController {
        return toAjax(menuService.deleteMenuById(menuId));
    }

-    /**
-     * 角色菜单列表树信息
-     *
-     * @param checkedKeys 选中菜单列表
-     * @param menus       菜单下拉树结构列表
-     */
-    public record MenuTreeSelectVo(List<Long> checkedKeys, List<Tree<Long>> menus) {
-    }
-
    /**
     * 批量级联删除菜单
     *
@@ -178,4 +169,13 @@ public class SysMenuController extends BaseController {
        return R.ok();
    }

+    /**
+     * 角色菜单列表树信息
+     *
+     * @param checkedKeys 选中菜单列表
+     * @param menus       菜单下拉树结构列表
+     */
+    public record MenuTreeSelectVo(List<Long> checkedKeys, List<Tree<Long>> menus) {
+    }
+
 }
@@ -3,16 +3,16 @@ package org.dromara.system.controller.system;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import lombok.RequiredArgsConstructor;
 import org.apache.dubbo.config.annotation.DubboReference;
+import org.dromara.common.core.domain.PageResult;
 import org.dromara.common.core.domain.R;
 import org.dromara.common.core.enums.PushSourceEnum;
 import org.dromara.common.core.enums.PushTypeEnum;
 import org.dromara.common.core.service.DictService;
-import org.dromara.common.redis.annotation.RepeatSubmit;
-import org.dromara.common.web.core.BaseController;
 import org.dromara.common.log.annotation.Log;
 import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.mybatis.core.page.PageQuery;
-import org.dromara.common.core.domain.PageResult;
+import org.dromara.common.redis.annotation.RepeatSubmit;
+import org.dromara.common.web.core.BaseController;
 import org.dromara.resource.api.RemoteMessageService;
 import org.dromara.resource.api.domain.RemotePushPayLoad;
 import org.dromara.system.domain.bo.SysNoticeBo;
@@ -3,22 +3,22 @@ package org.dromara.system.controller.system;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.lang.tree.Tree;
 import cn.hutool.core.util.ObjectUtil;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.constant.SystemConstants;
+import org.dromara.common.core.domain.PageResult;
 import org.dromara.common.core.domain.R;
 import org.dromara.common.excel.utils.ExcelBuilder;
-import org.dromara.common.redis.annotation.RepeatSubmit;
 import org.dromara.common.log.annotation.Log;
 import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.mybatis.core.page.PageQuery;
-import org.dromara.common.core.domain.PageResult;
+import org.dromara.common.redis.annotation.RepeatSubmit;
 import org.dromara.common.web.core.BaseController;
 import org.dromara.system.domain.bo.SysDeptBo;
 import org.dromara.system.domain.bo.SysPostBo;
 import org.dromara.system.domain.vo.SysPostVo;
 import org.dromara.system.service.ISysDeptService;
 import org.dromara.system.service.ISysPostService;
-import jakarta.servlet.http.HttpServletResponse;
-import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;

@@ -12,10 +12,10 @@ import org.dromara.common.core.domain.R;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.core.utils.file.MimeTypeUtils;
 import org.dromara.common.encrypt.annotation.ApiEncrypt;
-import org.dromara.common.redis.annotation.RepeatSubmit;
 import org.dromara.common.log.annotation.Log;
 import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.mybatis.helper.DataPermissionHelper;
+import org.dromara.common.redis.annotation.RepeatSubmit;
 import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.common.web.core.BaseController;
 import org.dromara.resource.api.RemoteFileService;
@@ -141,7 +141,8 @@ public class SysProfileController extends BaseController {
     *
     * @param imgUrl 头像地址
     */
-    public record AvatarVo(String imgUrl) {}
+    public record AvatarVo(String imgUrl) {
+    }

    /**
     * 用户个人信息
@@ -150,7 +151,8 @@ public class SysProfileController extends BaseController {
     * @param roleGroup 用户所属角色组
     * @param postGroup 用户所属岗位组
     */
-    public record ProfileVo(ProfileUserVo user, String roleGroup, String postGroup) {}
+    public record ProfileVo(ProfileUserVo user, String roleGroup, String postGroup) {
+    }

    /**
     * 用户密码修改
@@ -4,14 +4,14 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.lang.tree.Tree;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.PageResult;
 import org.dromara.common.core.domain.R;
 import org.dromara.common.core.utils.SpringUtils;
 import org.dromara.common.excel.utils.ExcelBuilder;
-import org.dromara.common.redis.annotation.RepeatSubmit;
 import org.dromara.common.log.annotation.Log;
 import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.mybatis.core.page.PageQuery;
-import org.dromara.common.core.domain.PageResult;
+import org.dromara.common.redis.annotation.RepeatSubmit;
 import org.dromara.common.web.core.BaseController;
 import org.dromara.system.domain.SysUserRole;
 import org.dromara.system.domain.bo.SysDeptBo;
@@ -257,6 +257,7 @@ public class SysRoleController extends BaseController {
     * @param checkedKeys 选中部门列表
     * @param depts       下拉树结构列表
     */
-    public record DeptTreeSelectVo(List<Long> checkedKeys, List<Tree<Long>> depts) {}
+    public record DeptTreeSelectVo(List<Long> checkedKeys, List<Tree<Long>> depts) {
+    }

 }
@@ -1,28 +1,28 @@
 package org.dromara.system.controller.system;

 import cn.dev33.satoken.annotation.SaCheckPermission;
-import cn.hutool.crypto.digest.BCrypt;
 import cn.hutool.core.lang.tree.Tree;
 import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.crypto.digest.BCrypt;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.constraints.NotNull;
 import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.constant.CacheNames;
 import org.dromara.common.core.constant.SystemConstants;
+import org.dromara.common.core.domain.PageResult;
 import org.dromara.common.core.domain.R;
 import org.dromara.common.core.utils.StreamUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.encrypt.annotation.ApiEncrypt;
 import org.dromara.common.excel.core.ExcelResult;
 import org.dromara.common.excel.utils.ExcelBuilder;
-import org.dromara.common.redis.annotation.RepeatSubmit;
-import org.dromara.common.redis.utils.RedisUtils;
 import org.dromara.common.log.annotation.Log;
 import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.mybatis.core.page.PageQuery;
-import org.dromara.common.core.domain.PageResult;
 import org.dromara.common.mybatis.helper.DataPermissionHelper;
+import org.dromara.common.redis.annotation.RepeatSubmit;
+import org.dromara.common.redis.utils.RedisUtils;
 import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.common.web.core.BaseController;
 import org.dromara.system.api.model.LoginUser;
@@ -32,7 +32,10 @@ import org.dromara.system.domain.bo.SysRoleBo;
 import org.dromara.system.domain.bo.SysUserBo;
 import org.dromara.system.domain.vo.*;
 import org.dromara.system.listener.SysUserImportListener;
-import org.dromara.system.service.*;
+import org.dromara.system.service.ISysDeptService;
+import org.dromara.system.service.ISysPostService;
+import org.dromara.system.service.ISysRoleService;
+import org.dromara.system.service.ISysUserService;
 import org.springframework.http.MediaType;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -195,7 +195,7 @@ public class SysMenu extends BaseEntity {
     * 内链域名特殊字符替换
     */
    public static String innerLinkReplaceEach(String path) {
-        return StringUtils.replaceEach(path, new String[]{Constants.HTTP, Constants.HTTPS, Constants.WWW, ".", ":"},
+        return StringUtils.replaceEach(path, new String[]{Constants.HTTP, Constants.HTTPS, Constants.WWW, ".", StringUtils.COLON},
            new String[]{"", "", "", "/", "/"});
    }
 }
@@ -2,9 +2,9 @@ package org.dromara.system.domain;

 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import org.dromara.common.mybatis.core.domain.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.dromara.common.mybatis.core.domain.BaseEntity;

 /**
 * 岗位表 sys_post
@@ -29,7 +29,7 @@ public class SysClientBo implements Serializable {
    /**
     * id
     */
-    @NotNull(message = "id不能为空", groups = { EditGroup.class })
+    @NotNull(message = "id不能为空", groups = {EditGroup.class})
    private Long id;

    /**
@@ -40,19 +40,19 @@ public class SysClientBo implements Serializable {
    /**
     * 客户端key
     */
-    @NotBlank(message = "客户端key不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotBlank(message = "客户端key不能为空", groups = {AddGroup.class, EditGroup.class})
    private String clientKey;

    /**
     * 客户端秘钥
     */
-    @NotBlank(message = "客户端秘钥不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotBlank(message = "客户端秘钥不能为空", groups = {AddGroup.class, EditGroup.class})
    private String clientSecret;

    /**
     * 授权类型
     */
-    @NotNull(message = "授权类型不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotNull(message = "授权类型不能为空", groups = {AddGroup.class, EditGroup.class})
    private List<String> grantTypeList;

    /**
@@ -2,7 +2,6 @@ package org.dromara.system.domain.bo;

 import io.github.linpeilie.annotations.AutoMapper;
 import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Size;
 import lombok.Data;
 import org.dromara.system.domain.SysConfig;
@@ -2,7 +2,6 @@ package org.dromara.system.domain.bo;

 import io.github.linpeilie.annotations.AutoMapper;
 import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Size;
 import lombok.Data;
 import org.dromara.system.domain.SysDictData;
@@ -30,25 +30,25 @@ public class SysSocialBo implements Serializable {
    /**
     * 主键
     */
-    @NotNull(message = "主键不能为空", groups = { EditGroup.class })
+    @NotNull(message = "主键不能为空", groups = {EditGroup.class})
    private Long id;

    /**
     * 认证唯一ID
     */
-    @NotBlank(message = "的唯一ID不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotBlank(message = "的唯一ID不能为空", groups = {AddGroup.class, EditGroup.class})
    private String authId;

    /**
     * 用户来源
     */
-    @NotBlank(message = "用户来源不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotBlank(message = "用户来源不能为空", groups = {AddGroup.class, EditGroup.class})
    private String source;

    /**
     * 用户的授权令牌
     */
-    @NotBlank(message = "用户的授权令牌不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotBlank(message = "用户的授权令牌不能为空", groups = {AddGroup.class, EditGroup.class})
    private String accessToken;

    /**
@@ -69,7 +69,7 @@ public class SysSocialBo implements Serializable {
    /**
     * 用户的 ID
     */
-    @NotBlank(message = "用户的 ID不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotBlank(message = "用户的 ID不能为空", groups = {AddGroup.class, EditGroup.class})
    private Long userId;

    /**
@@ -9,6 +9,7 @@ import org.mapstruct.ReportingPolicy;

 /**
 * 登录日志转换器
+ *
 * @author zhujie
 */
@Mapper(componentModel = MappingConstants.ComponentModel.SPRING, unmappedTargetPolicy = ReportingPolicy.IGNORE)
@@ -10,6 +10,7 @@ import org.mapstruct.ReportingPolicy;

 /**
 * 操作日志转换器
+ *
 * @author zhujie
 */
@Mapper(componentModel = MappingConstants.ComponentModel.SPRING, unmappedTargetPolicy = ReportingPolicy.IGNORE)
@@ -17,6 +18,7 @@ public interface SysOperLogBoConvert extends BaseMapper<RemoteOperLogBo, SysOper

    /**
     * RemoteOperLogBoToSysOperLogBo
+     *
     * @param remoteOperLogBo 待转换对象
     * @return 转换后对象
     */
@@ -1,18 +1,16 @@
 package org.dromara.system.domain.convert;

 import io.github.linpeilie.BaseMapper;
-import org.dromara.system.api.domain.bo.RemoteOperLogBo;
 import org.dromara.system.api.domain.bo.RemoteUserBo;
-import org.dromara.system.domain.bo.SysOperLogBo;
 import org.dromara.system.domain.bo.SysUserBo;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 import org.mapstruct.MappingConstants;
 import org.mapstruct.ReportingPolicy;
-import org.mapstruct.factory.Mappers;

 /**
 * 用户信息转换器
+ *
 * @author zhujie
 */
@Mapper(componentModel = MappingConstants.ComponentModel.SPRING, unmappedTargetPolicy = ReportingPolicy.IGNORE)
@@ -20,6 +18,7 @@ public interface SysUserBoConvert extends BaseMapper<RemoteUserBo, SysUserBo> {

    /**
     * RemoteUserBoToSysUserBo
+     *
     * @param remoteUserBo 待转换对象
     * @return 转换后对象
     */
@@ -9,6 +9,7 @@ import org.mapstruct.ReportingPolicy;

 /**
 * 租户转换器
+ *
 * @author zhujie
 */
@Mapper(componentModel = MappingConstants.ComponentModel.SPRING, unmappedTargetPolicy = ReportingPolicy.IGNORE)
@@ -1,9 +1,9 @@
 package org.dromara.system.domain.vo;

-import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated;
-import org.apache.fesod.sheet.annotation.ExcelProperty;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
+import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated;
+import org.apache.fesod.sheet.annotation.ExcelProperty;
 import org.dromara.common.excel.annotation.ExcelDictFormat;
 import org.dromara.common.excel.convert.ExcelDictConvert;
 import org.dromara.system.domain.SysClient;
@@ -1,9 +1,9 @@
 package org.dromara.system.domain.vo;

-import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated;
-import org.apache.fesod.sheet.annotation.ExcelProperty;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
+import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated;
+import org.apache.fesod.sheet.annotation.ExcelProperty;
 import org.dromara.common.excel.annotation.ExcelDictFormat;
 import org.dromara.common.excel.convert.ExcelDictConvert;
 import org.dromara.system.domain.SysConfig;
@@ -1,17 +1,17 @@
 package org.dromara.system.domain.vo;

-import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated;
-import org.apache.fesod.sheet.annotation.ExcelProperty;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
+import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated;
+import org.apache.fesod.sheet.annotation.ExcelProperty;
 import org.dromara.common.excel.annotation.ExcelDictFormat;
 import org.dromara.common.excel.convert.ExcelDictConvert;
 import org.dromara.system.domain.SysDept;

 import java.io.Serial;
 import java.io.Serializable;
-import java.util.ArrayList;
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.List;

 /**
@@ -1,9 +1,9 @@
 package org.dromara.system.domain.vo;

-import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated;
-import org.apache.fesod.sheet.annotation.ExcelProperty;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
+import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated;
+import org.apache.fesod.sheet.annotation.ExcelProperty;
 import org.dromara.common.excel.annotation.ExcelDictFormat;
 import org.dromara.common.excel.convert.ExcelDictConvert;
 import org.dromara.system.domain.SysDictData;
@@ -1,9 +1,9 @@
 package org.dromara.system.domain.vo;

-import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated;
-import org.apache.fesod.sheet.annotation.ExcelProperty;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
+import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated;
+import org.apache.fesod.sheet.annotation.ExcelProperty;
 import org.dromara.system.domain.SysDictType;

 import java.io.Serial;
@@ -1,9 +1,9 @@
 package org.dromara.system.domain.vo;

-import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated;
-import org.apache.fesod.sheet.annotation.ExcelProperty;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
+import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated;
+import org.apache.fesod.sheet.annotation.ExcelProperty;
 import org.dromara.common.excel.annotation.ExcelDictFormat;
 import org.dromara.common.excel.convert.ExcelDictConvert;
 import org.dromara.system.domain.SysLoginInfo;
@@ -13,7 +13,6 @@ import java.io.Serializable;
 import java.time.LocalDateTime;


-
 /**
 * 系统访问记录视图对象 sys_login_info
 *
@@ -6,8 +6,8 @@ import org.dromara.system.domain.SysMenu;

 import java.io.Serial;
 import java.io.Serializable;
-import java.util.ArrayList;
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.List;


@@ -11,7 +11,6 @@ import java.io.Serializable;
 import java.time.LocalDateTime;


-
 /**
 * 通知公告视图对象 sys_notice
 *
@@ -1,9 +1,9 @@
 package org.dromara.system.domain.vo;

-import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated;
-import org.apache.fesod.sheet.annotation.ExcelProperty;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
+import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated;
+import org.apache.fesod.sheet.annotation.ExcelProperty;
 import org.dromara.common.excel.annotation.ExcelDictFormat;
 import org.dromara.common.excel.convert.ExcelDictConvert;
 import org.dromara.system.domain.SysOperLog;
@@ -1,9 +1,9 @@
 package org.dromara.system.domain.vo;

-import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated;
-import org.apache.fesod.sheet.annotation.ExcelProperty;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
+import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated;
+import org.apache.fesod.sheet.annotation.ExcelProperty;
 import org.dromara.common.excel.annotation.ExcelDictFormat;
 import org.dromara.common.excel.convert.ExcelDictConvert;
 import org.dromara.common.translation.annotation.Translation;
@@ -15,7 +15,6 @@ import java.io.Serializable;
 import java.time.LocalDateTime;


-
 /**
 * 岗位信息视图对象 sys_post
 *
@@ -1,8 +1,8 @@
 package org.dromara.system.domain.vo;

-import org.apache.fesod.sheet.annotation.ExcelProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.apache.fesod.sheet.annotation.ExcelProperty;
 import org.dromara.common.excel.annotation.ExcelDictFormat;
 import org.dromara.common.excel.convert.ExcelDictConvert;
 import org.dromara.system.listener.DeptExcelConverter;
@@ -1,8 +1,8 @@
 package org.dromara.system.domain.vo;

-import org.apache.fesod.sheet.annotation.ExcelProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.apache.fesod.sheet.annotation.ExcelProperty;
 import org.dromara.common.excel.annotation.ExcelDictFormat;
 import org.dromara.common.excel.annotation.ExcelDynamicOptions;
 import org.dromara.common.excel.convert.ExcelDictConvert;
@@ -2,13 +2,13 @@ package org.dromara.system.domain.vo;

 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
 import org.dromara.common.sensitive.annotation.Sensitive;
 import org.dromara.common.sensitive.core.SensitiveStrategy;
 import org.dromara.common.translation.annotation.Translation;
 import org.dromara.common.translation.constant.TransConstant;
 import org.dromara.system.domain.SysUser;
-import io.github.linpeilie.annotations.AutoMapper;
-import lombok.Data;

 import java.io.Serial;
 import java.io.Serializable;
@@ -4,8 +4,8 @@ import cn.hutool.core.convert.Convert;
 import lombok.RequiredArgsConstructor;
 import org.apache.dubbo.config.annotation.DubboService;
 import org.dromara.common.core.constant.SystemConstants;
-import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.core.domain.PageResult;
+import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.system.api.RemoteTaskAssigneeService;
 import org.dromara.system.api.domain.bo.RemoteTaskAssigneeBo;
 import org.dromara.system.api.domain.vo.RemoteTaskAssigneeVo;
@@ -10,7 +10,10 @@ import org.dromara.common.core.constant.SystemConstants;
 import org.dromara.common.core.enums.UserStatus;
 import org.dromara.common.core.exception.ServiceException;
 import org.dromara.common.core.exception.user.UserException;
-import org.dromara.common.core.utils.*;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StreamUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.core.utils.ThreadUtils;
 import org.dromara.common.mybatis.helper.DataPermissionHelper;
 import org.dromara.system.api.RemoteUserService;
 import org.dromara.system.api.domain.bo.RemoteUserBo;
@@ -59,8 +59,8 @@ public interface SysUserMapper extends BaseMapperPlus<SysUser, SysUserVo>, MPJBa
    /**
     * 根据条件分页查询用户列表
     *
-     * @param user      查询条件
-     * @param deptIds   部门ID集合
+     * @param user    查询条件
+     * @param deptIds 部门ID集合
     * @return 用户信息集合信息
     */
    @DataPermission({
@@ -87,8 +87,8 @@ public interface SysUserMapper extends BaseMapperPlus<SysUser, SysUserVo>, MPJBa
    /**
     * 根据条件分页查询已配用户角色列表
     *
-     * @param page         分页信息
-     * @param user         查询条件
+     * @param page 分页信息
+     * @param user 查询条件
     * @return 用户信息集合信息
     */
    @DataPermission({
@@ -1,7 +1,7 @@
 package org.dromara.system.service;

-import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.core.domain.PageResult;
+import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.system.domain.bo.SysClientBo;
 import org.dromara.system.domain.vo.SysClientVo;

@@ -1,7 +1,7 @@
 package org.dromara.system.service;

-import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.core.domain.PageResult;
+import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.system.domain.bo.SysConfigBo;
 import org.dromara.system.domain.vo.SysConfigVo;

@@ -41,6 +41,7 @@ public interface ISysConfigService {

    /**
     * 获取注册开关
+     *
     * @return true开启，false关闭
     */
    boolean selectRegisterEnabled();
@@ -1,8 +1,8 @@
 package org.dromara.system.service;

 import cn.hutool.core.lang.tree.Tree;
-import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.core.domain.PageResult;
+import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.system.domain.bo.SysDeptBo;
 import org.dromara.system.domain.vo.SysDeptVo;

@@ -1,7 +1,7 @@
 package org.dromara.system.service;

-import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.core.domain.PageResult;
+import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.system.domain.bo.SysDictDataBo;
 import org.dromara.system.domain.vo.SysDictDataVo;

@@ -1,7 +1,7 @@
 package org.dromara.system.service;

-import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.core.domain.PageResult;
+import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.system.domain.bo.SysDictTypeBo;
 import org.dromara.system.domain.vo.SysDictDataVo;
 import org.dromara.system.domain.vo.SysDictTypeVo;
@@ -1,7 +1,7 @@
 package org.dromara.system.service;

-import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.core.domain.PageResult;
+import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.system.domain.bo.SysLoginInfoBo;
 import org.dromara.system.domain.vo.SysLoginInfoVo;

@@ -18,7 +18,7 @@ public interface ISysLoginInfoService {
     * 分页查询登录日志列表
     *
     * @param loginInfo 查询条件
-     * @param pageQuery  分页参数
+     * @param pageQuery 分页参数
     * @return 登录日志分页列表
     */
    PageResult<SysLoginInfoVo> selectPageLoginInfoList(SysLoginInfoBo loginInfo, PageQuery pageQuery);
@@ -1,7 +1,7 @@
 package org.dromara.system.service;

-import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.core.domain.PageResult;
+import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.system.domain.bo.SysNoticeBo;
 import org.dromara.system.domain.vo.SysNoticeVo;

@@ -1,7 +1,7 @@
 package org.dromara.system.service;

-import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.core.domain.PageResult;
+import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.system.domain.bo.SysOperLogBo;
 import org.dromara.system.domain.vo.SysOperLogVo;

@@ -16,7 +16,7 @@ public interface ISysPermissionService {
    /**
     * 获取角色数据权限
     *
-     * @param userId  用户id
+     * @param userId 用户id
     * @return 角色权限信息
     */
    Set<String> getRolePermission(Long userId);
@@ -24,7 +24,7 @@ public interface ISysPermissionService {
    /**
     * 获取菜单数据权限
     *
-     * @param userId  用户id
+     * @param userId 用户id
     * @return 菜单权限信息
     */
    Set<String> getMenuPermission(Long userId);
@@ -1,7 +1,7 @@
 package org.dromara.system.service;

-import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.core.domain.PageResult;
+import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.system.domain.bo.SysPostBo;
 import org.dromara.system.domain.vo.SysPostVo;

@@ -1,7 +1,7 @@
 package org.dromara.system.service;

-import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.core.domain.PageResult;
+import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.system.domain.SysUserRole;
 import org.dromara.system.domain.bo.SysRoleBo;
 import org.dromara.system.domain.vo.SysRoleVo;
@@ -1,7 +1,7 @@
 package org.dromara.system.service;

-import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.core.domain.PageResult;
+import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.system.domain.bo.SysUserBo;
 import org.dromara.system.domain.vo.SysUserExportVo;
 import org.dromara.system.domain.vo.SysUserVo;
@@ -9,10 +9,10 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.constant.CacheNames;
 import org.dromara.common.core.constant.SystemConstants;
+import org.dromara.common.core.domain.PageResult;
 import org.dromara.common.core.exception.ServiceException;
 import org.dromara.common.core.utils.*;
 import org.dromara.common.mybatis.core.page.PageQuery;
-import org.dromara.common.core.domain.PageResult;
 import org.dromara.common.mybatis.core.query.LambdaQueryBuilder;
 import org.dromara.common.mybatis.core.query.QueryBuilder;
 import org.dromara.common.redis.utils.CacheUtils;
@@ -37,7 +37,7 @@ public class SysLoginInfoServiceImpl implements ISysLoginInfoService {
     * 分页查询登录日志列表
     *
     * @param loginInfo 查询条件
-     * @param pageQuery  分页参数
+     * @param pageQuery 分页参数
     * @return 登录日志分页列表
     */
    @Override
@@ -1,6 +1,5 @@
 package org.dromara.system.service.impl;

-import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -10,8 +9,8 @@ import org.dromara.common.core.domain.PageResult;
 import org.dromara.common.core.exception.ServiceException;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.StreamUtils;
-import org.dromara.common.mybatis.core.query.LambdaQueryBuilder;
 import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.query.LambdaQueryBuilder;
 import org.dromara.common.mybatis.core.query.QueryBuilder;
 import org.dromara.system.domain.SysPost;
 import org.dromara.system.domain.SysUserPost;
@@ -10,13 +10,13 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.constant.CacheNames;
 import org.dromara.common.core.constant.SystemConstants;
+import org.dromara.common.core.domain.PageResult;
 import org.dromara.common.core.exception.ServiceException;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.SpringUtils;
 import org.dromara.common.core.utils.StreamUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.PageQuery;
-import org.dromara.common.core.domain.PageResult;
 import org.dromara.common.mybatis.core.query.QueryBuilder;
 import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.system.api.model.LoginUser;
@@ -539,7 +539,7 @@ public class SysRoleServiceImpl implements ISysRoleService {
        }
        // 角色关联的在线用户量过大会导致redis阻塞卡顿 谨慎操作
        keys.parallelStream().forEach(key -> {
-            String token = StringUtils.substringAfterLast(key, ":");
+            String token = StringUtils.substringAfterLast(key, StringUtils.COLON);
            // 如果已经过期则跳过
            if (StpUtil.stpLogic.getTokenActiveTimeoutByToken(token) < -1) {
                return;
@@ -575,7 +575,7 @@ public class SysRoleServiceImpl implements ISysRoleService {
        }
        // 角色关联的在线用户量过大会导致redis阻塞卡顿 谨慎操作
        keys.parallelStream().forEach(key -> {
-            String token = StringUtils.substringAfterLast(key, ":");
+            String token = StringUtils.substringAfterLast(key, StringUtils.COLON);
            // 如果已经过期则跳过
            if (StpUtil.stpLogic.getTokenActiveTimeoutByToken(token) < -1) {
                return;
@@ -11,10 +11,10 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.common.core.constant.CacheNames;
 import org.dromara.common.core.constant.SystemConstants;
+import org.dromara.common.core.domain.PageResult;
 import org.dromara.common.core.exception.ServiceException;
 import org.dromara.common.core.utils.*;
 import org.dromara.common.mybatis.core.page.PageQuery;
-import org.dromara.common.core.domain.PageResult;
 import org.dromara.common.mybatis.core.query.QueryBuilder;
 import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.system.domain.SysUser;
@@ -23,7 +23,7 @@ import java.lang.annotation.Target;
 * @author Lion Li
 */
@Retention(RetentionPolicy.RUNTIME)
-@Target({ ElementType.TYPE, ElementType.METHOD })
+@Target({ElementType.TYPE, ElementType.METHOD})
@ConditionalOnProperty(value = "warm-flow.enabled", havingValue = "true")
 public @interface ConditionalOnEnable {
 }
@@ -9,9 +9,9 @@ import org.dromara.common.core.domain.R;
 import org.dromara.common.core.validate.AddGroup;
 import org.dromara.common.core.validate.EditGroup;
 import org.dromara.common.excel.utils.ExcelBuilder;
-import org.dromara.common.redis.annotation.RepeatSubmit;
 import org.dromara.common.log.annotation.Log;
 import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.redis.annotation.RepeatSubmit;
 import org.dromara.common.web.core.BaseController;
 import org.dromara.workflow.common.ConditionalOnEnable;
 import org.dromara.workflow.common.constant.FlowConstant;
@@ -3,12 +3,12 @@ package org.dromara.workflow.controller;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.PageResult;
 import org.dromara.common.core.domain.R;
-import org.dromara.common.redis.annotation.RepeatSubmit;
 import org.dromara.common.log.annotation.Log;
 import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.mybatis.core.page.PageQuery;
-import org.dromara.common.core.domain.PageResult;
+import org.dromara.common.redis.annotation.RepeatSubmit;
 import org.dromara.common.web.core.BaseController;
 import org.dromara.warm.flow.core.entity.Definition;
 import org.dromara.warm.flow.core.service.DefService;
@@ -3,13 +3,13 @@ package org.dromara.workflow.controller;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.convert.Convert;
 import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.PageResult;
 import org.dromara.common.core.domain.R;
 import org.dromara.common.core.utils.StreamUtils;
-import org.dromara.common.redis.annotation.RepeatSubmit;
 import org.dromara.common.log.annotation.Log;
 import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.mybatis.core.page.PageQuery;
-import org.dromara.common.core.domain.PageResult;
+import org.dromara.common.redis.annotation.RepeatSubmit;
 import org.dromara.common.web.core.BaseController;
 import org.dromara.warm.flow.core.service.InsService;
 import org.dromara.workflow.common.ConditionalOnEnable;
@@ -4,14 +4,14 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
 import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.PageResult;
 import org.dromara.common.core.domain.R;
 import org.dromara.common.core.validate.AddGroup;
 import org.dromara.common.core.validate.EditGroup;
-import org.dromara.common.redis.annotation.RepeatSubmit;
 import org.dromara.common.log.annotation.Log;
 import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.mybatis.core.page.PageQuery;
-import org.dromara.common.core.domain.PageResult;
+import org.dromara.common.redis.annotation.RepeatSubmit;
 import org.dromara.common.web.core.BaseController;
 import org.dromara.workflow.common.ConditionalOnEnable;
 import org.dromara.workflow.domain.bo.FlowSpelBo;
@@ -1,13 +1,13 @@
 package org.dromara.workflow.controller;

 import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.PageResult;
 import org.dromara.common.core.domain.R;
 import org.dromara.common.core.validate.AddGroup;
-import org.dromara.common.redis.annotation.RepeatSubmit;
 import org.dromara.common.log.annotation.Log;
 import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.mybatis.core.page.PageQuery;
-import org.dromara.common.core.domain.PageResult;
+import org.dromara.common.redis.annotation.RepeatSubmit;
 import org.dromara.common.web.core.BaseController;
 import org.dromara.system.api.domain.vo.RemoteUserVo;
 import org.dromara.warm.flow.core.entity.Node;
@@ -191,8 +191,8 @@ public class FlwTaskController extends BaseController {
    /**
     * 获取可驳回的前置节点
     *
-     * @param taskId       任务id
-     * @param nowNodeCode  当前节点
+     * @param taskId      任务id
+     * @param nowNodeCode 当前节点
     */
    @GetMapping("/getBackTaskNode/{taskId}/{nowNodeCode}")
    public R<List<Node>> getBackTaskNode(@PathVariable Long taskId, @PathVariable String nowNodeCode) {
@@ -5,15 +5,15 @@ import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
 import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.PageResult;
 import org.dromara.common.core.domain.R;
 import org.dromara.common.core.validate.AddGroup;
 import org.dromara.common.core.validate.EditGroup;
 import org.dromara.common.excel.utils.ExcelBuilder;
-import org.dromara.common.redis.annotation.RepeatSubmit;
 import org.dromara.common.log.annotation.Log;
 import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.mybatis.core.page.PageQuery;
-import org.dromara.common.core.domain.PageResult;
+import org.dromara.common.redis.annotation.RepeatSubmit;
 import org.dromara.common.web.core.BaseController;
 import org.dromara.workflow.common.ConditionalOnEnable;
 import org.dromara.workflow.domain.bo.TestLeaveBo;
@@ -29,7 +29,7 @@ public class FlowCategoryBo implements Serializable {
    /**
     * 流程分类ID
     */
-    @NotNull(message = "流程分类ID不能为空", groups = { EditGroup.class })
+    @NotNull(message = "流程分类ID不能为空", groups = {EditGroup.class})
    private Long categoryId;

    /**
@@ -48,13 +48,13 @@ public class FlowSpelBo implements Serializable {
    /**
     * 预览spel值
     */
-    @NotBlank(message = "预览spel值不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotBlank(message = "预览spel值不能为空", groups = {AddGroup.class, EditGroup.class})
    private String viewSpel;

    /**
     * 状态（0正常 1停用）
     */
-    @NotBlank(message = "状态（0正常 1停用）不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotBlank(message = "状态（0正常 1停用）不能为空", groups = {AddGroup.class, EditGroup.class})
    private String status;

    /**
@@ -1,15 +1,15 @@
 package org.dromara.workflow.domain.vo;

-import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated;
-import org.apache.fesod.sheet.annotation.ExcelProperty;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
+import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated;
+import org.apache.fesod.sheet.annotation.ExcelProperty;
 import org.dromara.workflow.domain.FlowCategory;

 import java.io.Serial;
 import java.io.Serializable;
-import java.util.ArrayList;
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.List;


@@ -1,9 +1,9 @@
 package org.dromara.workflow.domain.vo;

-import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated;
-import org.apache.fesod.sheet.annotation.ExcelProperty;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
+import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated;
+import org.apache.fesod.sheet.annotation.ExcelProperty;
 import org.dromara.common.excel.annotation.ExcelDictFormat;
 import org.dromara.common.excel.convert.ExcelDictConvert;
 import org.dromara.workflow.domain.FlowSpel;
@@ -1,7 +1,6 @@
 package org.dromara.workflow.domain.vo;

 import lombok.Data;
-import org.dromara.common.core.utils.DateUtils;
 import org.dromara.common.translation.annotation.Translation;
 import org.dromara.common.translation.constant.TransConstant;
 import org.dromara.warm.flow.core.entity.User;
@@ -1,9 +1,9 @@
 package org.dromara.workflow.domain.vo;

-import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated;
-import org.apache.fesod.sheet.annotation.ExcelProperty;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
+import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated;
+import org.apache.fesod.sheet.annotation.ExcelProperty;
 import org.dromara.workflow.domain.TestLeave;

 import java.io.Serial;
@@ -51,10 +51,10 @@ public class FlowProcessEventHandler {
    /**
     * 执行创建任务监听
     *
-     * @param flowCode   流程定义编码
-     * @param instance   实例数据
-     * @param nextTask   任务
-     * @param params     上一个任务的办理参数
+     * @param flowCode 流程定义编码
+     * @param instance 实例数据
+     * @param nextTask 任务
+     * @param params   上一个任务的办理参数
     */
    public void processTaskHandler(String flowCode, Instance instance, Task nextTask, Map<String, Object> params) {
        log.info("【流程任务事件发布】流程编码: {}, 业务ID: {}, 节点类型: {}, 节点编码: {}, 节点名称: {}, 任务ID: {}",
@@ -75,8 +75,8 @@ public class FlowProcessEventHandler {
    /**
     * 删除流程监听
     *
-     * @param flowCode    流程定义编码
-     * @param businessId  业务ID
+     * @param flowCode   流程定义编码
+     * @param businessId 业务ID
     */
    public void processDeleteHandler(String flowCode, String businessId) {
        log.info("【流程删除事件发布】流程编码: {}, 业务ID: {}", flowCode, businessId);
@@ -13,7 +13,6 @@ import org.dromara.common.core.enums.BusinessStatusEnum;
 import org.dromara.common.core.utils.SpringUtils;
 import org.dromara.common.core.utils.StreamUtils;
 import org.dromara.common.core.utils.StringUtils;
-import org.dromara.system.api.domain.vo.RemoteUserVo;
 import org.dromara.system.api.RemoteUserService;
 import org.dromara.warm.flow.core.FlowEngine;
 import org.dromara.warm.flow.core.dto.FlowParams;
@@ -11,7 +11,7 @@ import org.springframework.stereotype.Component;
 /**
 * spel表达式规则组件
 * <p>
- *     通过该组件统一管理流程定义中的spel表达式
+ * 通过该组件统一管理流程定义中的spel表达式
 * </p>
 *
 * @author Michelle.Chung
@@ -1,8 +1,8 @@
 package org.dromara.workflow.service;

 import jakarta.servlet.http.HttpServletResponse;
-import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.core.domain.PageResult;
+import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.warm.flow.orm.entity.FlowDefinition;
 import org.dromara.workflow.domain.vo.FlowDefinitionVo;
 import org.springframework.web.multipart.MultipartFile;
@@ -1,7 +1,7 @@
 package org.dromara.workflow.service;

-import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.core.domain.PageResult;
+import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.warm.flow.orm.entity.FlowInstance;
 import org.dromara.workflow.domain.bo.FlowCancelBo;
 import org.dromara.workflow.domain.bo.FlowInstanceBo;
@@ -1,7 +1,7 @@
 package org.dromara.workflow.service;

-import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.core.domain.PageResult;
+import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.system.api.domain.bo.RemoteTaskAssigneeBo;
 import org.dromara.system.api.domain.vo.RemoteTaskAssigneeVo;
 import org.dromara.workflow.domain.bo.FlowSpelBo;
@@ -1,7 +1,7 @@
 package org.dromara.workflow.service;

-import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.core.domain.PageResult;
+import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.system.api.domain.vo.RemoteUserVo;
 import org.dromara.warm.flow.core.entity.Node;
 import org.dromara.warm.flow.core.entity.Task;
@@ -111,8 +111,8 @@ public interface IFlwTaskService {
    /**
     * 获取可驳回的前置节点
     *
-     * @param taskId       任务id
-     * @param nowNodeCode  当前节点
+     * @param taskId      任务id
+     * @param nowNodeCode 当前节点
     * @return 结果
     */
    List<Node> getBackTaskNode(Long taskId, String nowNodeCode);
@@ -1,7 +1,7 @@
 package org.dromara.workflow.service;

-import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.core.domain.PageResult;
+import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.workflow.domain.bo.TestLeaveBo;
 import org.dromara.workflow.domain.vo.TestLeaveVo;

@@ -3,7 +3,6 @@ package org.dromara.workflow.service.impl;
 import cn.hutool.core.convert.Convert;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.ss.formula.functions.T;
 import org.dromara.common.translation.annotation.TranslationType;
 import org.dromara.common.translation.core.TranslationInterface;
 import org.dromara.workflow.common.ConditionalOnEnable;
@@ -32,7 +31,7 @@ public class CategoryNameTranslationImpl implements TranslationInterface<String>
    /**
     * 将流程分类 ID 翻译为分类名称。
     *
-     * @param key 流程分类 ID
+     * @param key   流程分类 ID
     * @param other 额外参数
     * @return 流程分类名称
     */
@@ -44,7 +43,7 @@ public class CategoryNameTranslationImpl implements TranslationInterface<String>
    /**
     * 批量将流程分类 ID 翻译为分类名称。
     *
-     * @param keys 流程分类 ID 集合
+     * @param keys  流程分类 ID 集合
     * @param other 额外参数
     * @return 流程分类 ID 与分类名称映射
     */
@@ -65,7 +64,7 @@ public class CategoryNameTranslationImpl implements TranslationInterface<String>
    /**
     * 根据原始键构建流程分类名称翻译值。
     *
-     * @param source 原始键
+     * @param source        原始键
     * @param categoryNames 流程分类 ID 与分类名称映射
     * @return 流程分类名称
     */
@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.domain.PageResult;
 import org.dromara.common.core.exception.ServiceException;
 import org.dromara.common.core.utils.StreamUtils;
 import org.dromara.common.core.utils.StringUtils;
@@ -16,7 +17,6 @@ import org.dromara.common.json.utils.JsonUtils;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.query.LambdaQueryBuilder;
 import org.dromara.common.mybatis.core.query.QueryBuilder;
-import org.dromara.common.core.domain.PageResult;
 import org.dromara.warm.flow.core.dto.DefJson;
 import org.dromara.warm.flow.core.enums.NodeType;
 import org.dromara.warm.flow.core.enums.PublishStatus;
--- a/Show More
+++ b/Show More