update 格式化全部代码

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/SystemConstants.java

@@ -85,7 +85,7 @@ public interface SystemConstants {
     /**
      * 排除敏感属性字段
      */
-    String[] EXCLUDE_PROPERTIES = { "password", "oldPassword", "newPassword", "confirmPassword" };
+    String[] EXCLUDE_PROPERTIES = {"password", "oldPassword", "newPassword", "confirmPassword"};
 
 
 }

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/base/BaseException.java

@@ -1,11 +1,11 @@
 package org.dromara.common.core.exception.base;
 
 import lombok.AllArgsConstructor;
-import org.dromara.common.core.utils.MessageUtils;
-import org.dromara.common.core.utils.StringUtils;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
+import org.dromara.common.core.utils.MessageUtils;
+import org.dromara.common.core.utils.StringUtils;
 
 import java.io.Serial;
 

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/MapstructUtils.java

@@ -14,7 +14,6 @@ import java.util.Map;
  * Mapstruct 工具类
  * <p>参考文档：<a href="https://mapstruct.plus/introduction/quick-start.html">mapstruct-plus</a></p>
  *
- *
  * @author Michelle.Chung
  */
 @NoArgsConstructor(access = AccessLevel.PRIVATE)

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/StreamUtils.java

@@ -60,7 +60,7 @@ public class StreamUtils {
      * @return 找到符合条件的第一个元素，没有则返回 null
      */
     public static <E> E findFirstValue(Collection<E> collection, Predicate<E> function) {
-        return findFirst(collection,function).orElse(null);
+        return findFirst(collection, function).orElse(null);
     }
 
     /**
@@ -87,7 +87,7 @@ public class StreamUtils {
      * @return 找到符合条件的任意一个元素，没有则返回null
      */
     public static <E> E findAnyValue(Collection<E> collection, Predicate<E> function) {
-        return findAny(collection,function).orElse(null);
+        return findAny(collection, function).orElse(null);
     }
 
     /**
@@ -179,6 +179,7 @@ public class StreamUtils {
 
     /**
      * 获取 map 中的数据作为新 Map 的 value ，key 不变
+     *
      * @param map  需要处理的map
      * @param take 取值函数
      * @param <K>  map中的key类型

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ThreadUtils.java

@@ -6,7 +6,10 @@ import lombok.NoArgsConstructor;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-import java.util.concurrent.*;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
 import java.util.function.Supplier;
 
 /**

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ip/AddressUtils.java

@@ -29,7 +29,7 @@ public class AddressUtils {
      */
     public static String getRealAddressByIP(String ip) {
         // 处理空串并过滤HTML标签
-        ip = HtmlUtil.cleanHtmlTag(StringUtils.blankToDefault(ip,""));
+        ip = HtmlUtil.cleanHtmlTag(StringUtils.blankToDefault(ip, ""));
         // 判断是否为IPv4
         boolean isIPv4 = NetUtils.isIPv4(ip);
         // 判断是否为IPv6

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/reflect/ReflectUtils.java

@@ -1,9 +1,9 @@
 package org.dromara.common.core.utils.reflect;
 
 import cn.hutool.core.util.ReflectUtil;
-import org.dromara.common.core.utils.StringUtils;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
+import org.dromara.common.core.utils.StringUtils;
 
 import java.lang.reflect.Method;
 

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/enums/EnumPattern.java

@@ -3,7 +3,10 @@ package org.dromara.common.core.validate.enums;
 import jakarta.validation.Constraint;
 import jakarta.validation.Payload;
 
-import java.lang.annotation.*;
+import java.lang.annotation.Documented;
+import java.lang.annotation.Repeatable;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
 
 import static java.lang.annotation.ElementType.*;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/xss/Xss.java

@@ -2,6 +2,7 @@ package org.dromara.common.core.xss;
 
 import jakarta.validation.Constraint;
 import jakarta.validation.Payload;
+
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/config/SpringDocConfig.java

@@ -6,9 +6,9 @@ import io.swagger.v3.oas.models.info.Info;
 import io.swagger.v3.oas.models.security.SecurityRequirement;
 import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.doc.config.properties.SpringDocProperties;
 import org.dromara.common.doc.core.customizer.ClassTagOperationCustomizer;
 import org.dromara.common.doc.core.customizer.JavadocOperationCustomizer;
-import org.dromara.common.doc.config.properties.SpringDocProperties;
 import org.dromara.common.doc.core.resolver.JavadocResolver;
 import org.dromara.common.doc.core.resolver.SaTokenAnnotationMetadataJavadocResolver;
 import org.springdoc.core.configuration.SpringDocConfiguration;

ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/config/properties/SpringDocProperties.java

@@ -56,7 +56,7 @@ public class SpringDocProperties {
      * </p>
      *
      * @see io.swagger.v3.oas.models.info.Info
-     *
+     * <p>
      * 为了 springboot 自动生产配置提示信息，所以这里复制一个类出来
      */
     @Data

ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/core/customizer/ClassTagOperationCustomizer.java

@@ -18,13 +18,7 @@ import org.springframework.util.CollectionUtils;
 import org.springframework.web.method.HandlerMethod;
 
 import java.io.StringReader;
-import java.util.ArrayList;
+import java.util.*;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;

ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/core/model/SaTokenSecurityMetadata.java

@@ -86,7 +86,7 @@ public class SaTokenSecurityMetadata {
             return sb.toString();
         }
 
-        if (!ignore && permissions.isEmpty() && roles.isEmpty()){
+        if (!ignore && permissions.isEmpty() && roles.isEmpty()) {
             sb.append("> **权限策略**：需要登录<br><br>");
             return sb.toString();
         }

ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/core/resolver/AbstractMetadataJavadocResolver.java

@@ -82,6 +82,7 @@ public abstract class AbstractMetadataJavadocResolver<M> implements JavadocResol
 
     /**
      * 执行解析并返回解析到的 Javadoc 内容
+     *
      * @param handlerMethod 处理器方法
      * @param operation     Swagger Operation实例
      * @param metadata      元信息
@@ -91,66 +92,73 @@ public abstract class AbstractMetadataJavadocResolver<M> implements JavadocResol
 
     /**
      * 检查处理器方法所属的类上是否存在注解
+     *
      * @param handlerMethod   处理器方法
      * @param annotationClass 注解类
      * @return 是否存在注解
      */
-    public boolean hasClassAnnotation(HandlerMethod handlerMethod,Class<? extends Annotation> annotationClass){
+    public boolean hasClassAnnotation(HandlerMethod handlerMethod, Class<? extends Annotation> annotationClass) {
         return AnnotationUtil.hasAnnotation(handlerMethod.getBeanType(), annotationClass);
     }
 
     /**
      * 检查处理器方法所属的类上是否存在注解
+     *
      * @param handlerMethod      处理器方法
      * @param annotationTypeName 注解类名称
      * @return 是否存在注解
      */
-    public boolean hasClassAnnotation(HandlerMethod handlerMethod, String annotationTypeName){
+    public boolean hasClassAnnotation(HandlerMethod handlerMethod, String annotationTypeName) {
         return AnnotationUtil.hasAnnotation(handlerMethod.getBeanType(), annotationTypeName);
     }
 
     /**
      * 检查处理器方法上是否存在注解
+     *
      * @param handlerMethod   处理器方法
      * @param annotationClass 注解类
      * @return 是否存在注解
      */
-    public boolean hasMethodAnnotation(HandlerMethod handlerMethod,Class<? extends Annotation> annotationClass){
+    public boolean hasMethodAnnotation(HandlerMethod handlerMethod, Class<? extends Annotation> annotationClass) {
         return AnnotationUtil.hasAnnotation(handlerMethod.getMethod(), annotationClass);
     }
 
     /**
      * 检查处理器方法上是否存在注解
+     *
      * @param handlerMethod      处理器方法
      * @param annotationTypeName 注解类名称
      * @return 是否存在注解
      */
-    public boolean hasMethodAnnotation(HandlerMethod handlerMethod, String annotationTypeName){
+    public boolean hasMethodAnnotation(HandlerMethod handlerMethod, String annotationTypeName) {
         return AnnotationUtil.hasAnnotation(handlerMethod.getMethod(), annotationTypeName);
     }
 
     /**
      * 检查处理器方法上是否存在注解
+     *
      * @param handlerMethod   处理器方法
      * @param annotationClass 注解类
      * @return 是否存在注解
      */
-    public boolean hasAnnotation(HandlerMethod handlerMethod,Class<? extends Annotation> annotationClass){
+    public boolean hasAnnotation(HandlerMethod handlerMethod, Class<? extends Annotation> annotationClass) {
         return this.hasClassAnnotation(handlerMethod, annotationClass) || this.hasMethodAnnotation(handlerMethod, annotationClass);
     }
 
     /**
      * 检查处理器方法上是否存在注解
+     *
      * @param handlerMethod      处理器方法
      * @param annotationTypeName 注解类名称
      * @return 是否存在注解
      */
-    public boolean hasAnnotation(HandlerMethod handlerMethod, String annotationTypeName){
+    public boolean hasAnnotation(HandlerMethod handlerMethod, String annotationTypeName) {
         return this.hasClassAnnotation(handlerMethod, annotationTypeName) || this.hasMethodAnnotation(handlerMethod, annotationTypeName);
     }
 
     /**
      * 获取处理器方法所属类上的注解的值
+     *
      * @param handlerMethod   处理器方法
      * @param annotationClass 注解类
      * @return 注解的值
@@ -161,6 +169,7 @@ public abstract class AbstractMetadataJavadocResolver<M> implements JavadocResol
 
     /**
      * 获取处理器方法所属类上的注解的值
+     *
      * @param handlerMethod       处理器方法
      * @param annotationClassName 注解类名称
      * @return 注解的值
@@ -173,6 +182,7 @@ public abstract class AbstractMetadataJavadocResolver<M> implements JavadocResol
 
     /**
      * 获取处理器方法上的注解的值
+     *
      * @param handlerMethod   处理器方法
      * @param annotationClass 注解类
      * @return 注解的值
@@ -183,6 +193,7 @@ public abstract class AbstractMetadataJavadocResolver<M> implements JavadocResol
 
     /**
      * 获取处理器方法所属类上的注解的值
+     *
      * @param handlerMethod       处理器方法
      * @param annotationClassName 注解类名称
      * @return 注解的值

ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/core/resolver/SaTokenAnnotationMetadataJavadocResolver.java

@@ -106,7 +106,7 @@ public class SaTokenAnnotationMetadataJavadocResolver extends AbstractMetadataJa
      * @param order 顺序值
      */
     public SaTokenAnnotationMetadataJavadocResolver(int order) {
-        this(DEFAULT_METADATA_PROVIDER,order);
+        this(DEFAULT_METADATA_PROVIDER, order);
     }
 
     /**
@@ -116,7 +116,7 @@ public class SaTokenAnnotationMetadataJavadocResolver extends AbstractMetadataJa
      * @param order            顺序值
      */
     public SaTokenAnnotationMetadataJavadocResolver(Supplier<SaTokenSecurityMetadata> metadataProvider, int order) {
-        super(metadataProvider,order);
+        super(metadataProvider, order);
     }
 
     /**
@@ -141,7 +141,7 @@ public class SaTokenAnnotationMetadataJavadocResolver extends AbstractMetadataJa
     @Override
     public String resolve(HandlerMethod handlerMethod, Operation operation, SaTokenSecurityMetadata metadata) {
         // 检查是否忽略校验
-        if(hasAnnotation(handlerMethod, SA_IGNORE_CLASS_NAME)){
+        if (hasAnnotation(handlerMethod, SA_IGNORE_CLASS_NAME)) {
             metadata.setIgnore(true);
             return metadata.toMarkdownString();
         }
@@ -176,10 +176,10 @@ public class SaTokenAnnotationMetadataJavadocResolver extends AbstractMetadataJa
     private void resolvePermissionAnnotation(SaTokenSecurityMetadata metadata, Map<String, Object> annotationValueMap) {
         try {
             // 反射获取注解属性
-            Object value = annotationValueMap.get( "value");
+            Object value = annotationValueMap.get("value");
-            Object mode = annotationValueMap.get( "mode");
+            Object mode = annotationValueMap.get("mode");
-            Object type = annotationValueMap.get( "type");
+            Object type = annotationValueMap.get("type");
-            Object orRole = annotationValueMap.get( "orRole");
+            Object orRole = annotationValueMap.get("orRole");
 
             String[] values = Convert.toStrArray(value);
             String modeStr = mode != null ? mode.toString() : "AND";

ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/EncryptContext.java

@@ -1,8 +1,8 @@
 package org.dromara.common.encrypt.core;
 
+import lombok.Data;
 import org.dromara.common.encrypt.enums.AlgorithmType;
 import org.dromara.common.encrypt.enums.EncodeType;
-import lombok.Data;
 
 /**
  * 加密上下文 用于encryptor传递必要的参数。

ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/properties/ApiDecryptProperties.java

@@ -5,6 +5,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
 
 /**
  * api解密属性配置类
+ *
  * @author wdhcr
  */
 @Data

ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/properties/EncryptorProperties.java

@@ -1,8 +1,8 @@
 package org.dromara.common.encrypt.properties;
 
+import lombok.Data;
 import org.dromara.common.encrypt.enums.AlgorithmType;
 import org.dromara.common.encrypt.enums.EncodeType;
-import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
 /**

ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/CellMerge.java

@@ -6,7 +6,7 @@ import java.lang.annotation.*;
 
 /**
  * excel 列单元格合并(合并列相同项)
- *
+ * <p>
  * 需搭配 {@link CellMergeStrategy} 策略使用
  *
  * @author Lion Li

ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/ExcelNotation.java

@@ -7,6 +7,7 @@ import java.lang.annotation.Target;
 
 /**
  * 批注 此注解仅用于单表头 不支持多层级表头
+ *
  * @author guzhouyanyu
  */
 @Target({ElementType.FIELD})

ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/ExcelRequired.java

@@ -9,6 +9,7 @@ import java.lang.annotation.Target;
 
 /**
  * 是否必填 此注解仅用于单表头 不支持多层级表头
+ *
  * @author guzhouyanyu
  */
 @Target({ElementType.FIELD})

ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/convert/ExcelEnumConvert.java

@@ -3,6 +3,7 @@ package org.dromara.common.excel.convert;
 import cn.hutool.core.annotation.AnnotationUtil;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.ObjectUtil;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.fesod.sheet.converters.Converter;
 import org.apache.fesod.sheet.enums.CellDataTypeEnum;
 import org.apache.fesod.sheet.metadata.GlobalConfiguration;
@@ -11,7 +12,6 @@ import org.apache.fesod.sheet.metadata.data.WriteCellData;
 import org.apache.fesod.sheet.metadata.property.ExcelContentProperty;
 import org.dromara.common.core.utils.reflect.ReflectUtils;
 import org.dromara.common.excel.annotation.ExcelEnumFormat;
-import lombok.extern.slf4j.Slf4j;
 
 import java.lang.reflect.Field;
 import java.util.HashMap;

ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/CellMergeHandler.java

@@ -3,10 +3,10 @@ package org.dromara.common.excel.core;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ReflectUtil;
 import cn.hutool.core.util.StrUtil;
+import lombok.SneakyThrows;
 import org.apache.fesod.sheet.annotation.ExcelIgnore;
 import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated;
 import org.apache.fesod.sheet.annotation.ExcelProperty;
-import lombok.SneakyThrows;
 import org.apache.poi.ss.util.CellRangeAddress;
 import org.dromara.common.core.utils.reflect.ReflectUtils;
 import org.dromara.common.excel.annotation.CellMerge;

ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/DefaultExcelListener.java

@@ -1,6 +1,10 @@
 package org.dromara.common.excel.core;
 
 import cn.hutool.core.util.StrUtil;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.ConstraintViolationException;
+import lombok.NoArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.fesod.sheet.context.AnalysisContext;
 import org.apache.fesod.sheet.event.AnalysisEventListener;
 import org.apache.fesod.sheet.exception.ExcelAnalysisException;
@@ -8,10 +12,6 @@ import org.apache.fesod.sheet.exception.ExcelDataConvertException;
 import org.dromara.common.core.utils.StreamUtils;
 import org.dromara.common.core.utils.ValidatorUtils;
 import org.dromara.common.json.utils.JsonUtils;
-import jakarta.validation.ConstraintViolation;
-import jakarta.validation.ConstraintViolationException;
-import lombok.NoArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
 
 import java.util.Map;
 import java.util.Set;

ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/DropDownOptions.java

@@ -25,23 +25,28 @@ import java.util.stream.Collectors;
 @NoArgsConstructor
 @SuppressWarnings("unused")
 public class DropDownOptions {
+
     /**
      * 一级下拉所在列index，从0开始算
      */
     private int index = 0;
+
     /**
      * 二级下拉所在的index，从0开始算，不能与一级相同
      */
     private int nextIndex = 0;
+
     /**
      * 一级下拉所包含的数据
      */
     private List<String> options = new ArrayList<>();
+
     /**
      * 二级下拉所包含的数据Map
      * <p>以每一个一级选项值为Key，每个一级选项对应的二级数据为Value</p>
      */
     private Map<String, List<String>> nextOptions = new HashMap<>();
+
     /**
      * 分隔符
      */

ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/utils/ExcelBuilder.java

@@ -25,19 +25,10 @@ import org.apache.fesod.sheet.write.style.row.SimpleRowHeightStyleStrategy;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.core.utils.file.FileUtils;
 import org.dromara.common.excel.convert.ExcelBigNumberConvert;
-import org.dromara.common.excel.core.CellMergeStrategy;
+import org.dromara.common.excel.core.*;
-import org.dromara.common.excel.core.DefaultExcelListener;
-import org.dromara.common.excel.core.DropDownOptions;
-import org.dromara.common.excel.core.ExcelDownHandler;
-import org.dromara.common.excel.core.ExcelListener;
-import org.dromara.common.excel.core.ExcelResult;
 import org.dromara.common.excel.handler.DataWriteHandler;
 
-import java.io.ByteArrayOutputStream;
+import java.io.*;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;

ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/utils/ExcelWriterWrapper.java

@@ -125,8 +125,6 @@ public record ExcelWriterWrapper<T>(ExcelWriter excelWriter) {
         return new ExcelWriterWrapper<>(excelWriter);
     }
 
-    // -------------------------------- sheet start
-
     /**
      * 创建工作表。
      *
@@ -207,10 +205,6 @@ public record ExcelWriterWrapper<T>(ExcelWriter excelWriter) {
         return FesodSheet.writerSheet();
     }
 
-    // -------------------------------- sheet end
-
-    // -------------------------------- table start
-
     /**
      * 创建表格。
      *

ruoyi-common/ruoyi-common-json/src/main/java/org/dromara/common/json/handler/BigNumberSerializer.java

@@ -13,6 +13,10 @@ import tools.jackson.databind.ser.jdk.NumberSerializer;
 @JacksonStdImpl
 public class BigNumberSerializer extends NumberSerializer {
 
+    /**
+     * 提供实例
+     */
+    public static final BigNumberSerializer INSTANCE = new BigNumberSerializer(Number.class);
     /**
      * 根据 JS Number.MAX_SAFE_INTEGER 与 Number.MIN_SAFE_INTEGER 得来
      */
@@ -22,11 +26,6 @@ public class BigNumberSerializer extends NumberSerializer {
      */
     private static final long MIN_SAFE_INTEGER = -9007199254740991L;
 
-    /**
-     * 提供实例
-     */
-    public static final BigNumberSerializer INSTANCE = new BigNumberSerializer(Number.class);
-
     /**
      * 构造大数字序列化器。
      *

ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/aspect/LogAspect.java

@@ -9,9 +9,9 @@ import jakarta.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.time.StopWatch;
 import org.aspectj.lang.JoinPoint;
-import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
 import org.dromara.common.core.constant.SystemConstants;
 import org.dromara.common.core.utils.ServletUtils;
 import org.dromara.common.core.utils.SpringUtils;

ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/event/LoginInfoEvent.java

@@ -1,8 +1,7 @@
 package org.dromara.common.log.event;
 
-import lombok.Data;
-
 import jakarta.servlet.http.HttpServletRequest;
+import lombok.Data;
 
 import java.io.Serial;
 import java.io.Serializable;

ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/query/SubQuery.java

@@ -2,22 +2,13 @@ package org.dromara.common.mybatis.core.query;
 
 import com.baomidou.mybatisplus.core.metadata.TableInfo;
 import com.baomidou.mybatisplus.core.metadata.TableInfoHelper;
-import com.baomidou.mybatisplus.core.toolkit.Assert;
+import com.baomidou.mybatisplus.core.toolkit.*;
-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.baomidou.mybatisplus.core.toolkit.Constants;
-import com.baomidou.mybatisplus.core.toolkit.LambdaUtils;
-import com.baomidou.mybatisplus.core.toolkit.StringPool;
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.support.ColumnCache;
 import com.baomidou.mybatisplus.core.toolkit.support.LambdaMeta;
 import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
 import org.apache.ibatis.reflection.property.PropertyNamer;
 
-import java.util.ArrayList;
+import java.util.*;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 

ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/config/Config.java

@@ -5,19 +5,20 @@ package org.dromara.common.oss.config;
  *
  * @param <T> 配置类型
  * @param <B> 配置构建器类型
- *
  * @author 秋辞未寒
  */
-public interface Config<T,B> {
+public interface Config<T, B> {
 
     /**
      * 配置对象拷贝
+     *
      * @return 拷贝后的新配置对象
      */
     T copy();
 
     /**
      * 转为构建器对象
+     *
      * @return 构建器对象
      */
     B toBuilder();

ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/constant/OssConstant.java

@@ -35,6 +35,6 @@ public interface OssConstant {
     /**
      * 云服务商
      */
-    String[] CLOUD_SERVICE = new String[] {"aliyun", "qcloud", "qiniu", "obs"};
+    String[] CLOUD_SERVICE = new String[]{"aliyun", "qcloud", "qiniu", "obs"};
 
 }

ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/enums/AccessPolicy.java

@@ -20,17 +20,17 @@ public enum AccessPolicy {
     /**
      * 私有
      */
-    PRIVATE(0,BucketCannedACL.PRIVATE, ObjectCannedACL.PRIVATE),
+    PRIVATE(0, BucketCannedACL.PRIVATE, ObjectCannedACL.PRIVATE),
 
     /**
      * 公有读写
      */
-    PUBLIC_READ_WRITE(1,BucketCannedACL.PUBLIC_READ_WRITE, ObjectCannedACL.PUBLIC_READ_WRITE),
+    PUBLIC_READ_WRITE(1, BucketCannedACL.PUBLIC_READ_WRITE, ObjectCannedACL.PUBLIC_READ_WRITE),
 
     /**
      * 公有只读
      */
-    PUBLIC_READ(2,BucketCannedACL.PUBLIC_READ, ObjectCannedACL.PUBLIC_READ);
+    PUBLIC_READ(2, BucketCannedACL.PUBLIC_READ, ObjectCannedACL.PUBLIC_READ);
 
     /**
      * 访问策略类型

ruoyi-common/ruoyi-common-push/src/main/java/org/dromara/common/push/annotation/ConditionalOnMessageTransport.java

@@ -3,11 +3,7 @@ package org.dromara.common.push.annotation;
 import org.dromara.common.push.condition.MessageTransportCondition;
 import org.springframework.context.annotation.Conditional;
 
-import java.lang.annotation.Documented;
+import java.lang.annotation.*;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
 
 /**
  * 按消息推送传输方式启用组件。

ruoyi-common/ruoyi-common-push/src/main/java/org/dromara/common/push/config/MessageWebSocketConfiguration.java

@@ -1,10 +1,10 @@
 package org.dromara.common.push.config;
 
 import org.dromara.common.push.annotation.ConditionalOnMessageTransport;
-import org.dromara.common.push.listener.MessageTopicListener;
 import org.dromara.common.push.core.WebSocketSessionManager;
 import org.dromara.common.push.handler.PlusWebSocketHandler;
 import org.dromara.common.push.interceptor.PlusWebSocketInterceptor;
+import org.dromara.common.push.listener.MessageTopicListener;
 import org.dromara.common.push.properties.MessageProperties;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.context.annotation.Bean;

ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/config/RedisConfig.java

@@ -24,7 +24,6 @@ import tools.jackson.databind.module.SimpleModule;
 
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.List;
 import java.util.TimeZone;
 
 /**

ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/utils/RedisUtils.java

@@ -561,15 +561,16 @@ public class RedisUtils {
 
     /**
      * 获得缓存的基本对象列表(全局匹配忽略租户 自行拼接租户id)
-     * <P>
+     * <p>
      * limit-设置扫描的限制数量(默认为0,查询全部)
      * pattern-设置键的匹配模式(默认为null)
      * chunkSize-设置每次扫描的块大小(默认为0,本方法设置为1000)
      * type-设置键的类型(默认为null,查询全部类型)
      * </P>
-     * @see KeysScanOptions
+     *
      * @param pattern 字符串前缀
      * @return 对象列表
+     * @see KeysScanOptions
      */
     public static Collection<String> keys(final String pattern) {
         return keys(KeysScanOptions.defaults().pattern(pattern).chunkSize(1000));
@@ -579,14 +580,14 @@ public class RedisUtils {
      * 通过扫描参数获取缓存的基本对象列表
      *
      * @param keysScanOptions 扫描参数
-     * <P>
+     *                        <p>
      *                        limit-设置扫描的限制数量(默认为0,查询全部)
      *                        pattern-设置键的匹配模式(默认为null)
      *                        chunkSize-设置每次扫描的块大小(默认为0)
      *                        type-设置键的类型(默认为null,查询全部类型)
      *                        </P>
-     * @see KeysScanOptions
      * @return 对象列表
+     * @see KeysScanOptions
      */
     public static Collection<String> keys(final KeysScanOptions keysScanOptions) {
         Stream<String> keysStream = CLIENT.getKeys().getKeysStream(keysScanOptions);

ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/core/service/SaPermissionImpl.java

@@ -9,8 +9,8 @@ import org.dromara.common.core.utils.SpringUtils;
 import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.system.api.model.LoginUser;
 
-import java.util.Collection;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 import java.util.function.BiFunction;
 

ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/utils/LoginHelper.java

@@ -1,9 +1,9 @@
 package org.dromara.common.satoken.utils;
 
+import cn.dev33.satoken.exception.NotLoginException;
 import cn.dev33.satoken.session.SaSession;
 import cn.dev33.satoken.stp.StpUtil;
 import cn.dev33.satoken.stp.parameter.SaLoginParameter;
-import cn.dev33.satoken.exception.NotLoginException;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.http.useragent.UserAgent;

ruoyi-common/ruoyi-common-security/src/main/java/org/dromara/common/security/handler/AllUrlHandler.java

@@ -1,8 +1,8 @@
 package org.dromara.common.security.handler;
 
 import cn.hutool.core.util.ReUtil;
-import org.dromara.common.core.utils.SpringUtils;
 import lombok.Data;
+import org.dromara.common.core.utils.SpringUtils;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.web.method.HandlerMethod;
 import org.springframework.web.servlet.mvc.method.RequestMappingInfo;

ruoyi-common/ruoyi-common-sensitive/src/main/java/org/dromara/common/sensitive/annotation/Sensitive.java

@@ -2,11 +2,7 @@ package org.dromara.common.sensitive.annotation;
 
 import org.dromara.common.sensitive.core.SensitiveStrategy;
 
-import java.lang.annotation.Documented;
+import java.lang.annotation.*;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
 
 /**
  * 数据脱敏注解

ruoyi-common/ruoyi-common-social/src/main/java/me/zhyd/oauth/request/AbstractAuthWeChatEnterpriseRequest.java

@@ -31,7 +31,7 @@ public abstract class AbstractAuthWeChatEnterpriseRequest extends AuthDefaultReq
      * @param source 授权来源
      */
     public AbstractAuthWeChatEnterpriseRequest(AuthConfig config, AuthSource source) {
-        super(config,source);
+        super(config, source);
     }
 
 

ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/topiam/AuthTopIamRequest.java

@@ -124,7 +124,6 @@ public class AuthTopIamRequest extends AuthDefaultRequest {
             .add("Authorization", "Bearer " + authToken.getAccessToken()), false).getBody();
     }
 
-
     /**
      * 生成 TopIAM 授权地址。
      *

ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/utils/SocialUtils.java

@@ -69,7 +69,8 @@ public class SocialUtils  {
             case "coding" -> new AuthCodingRequest(builder.build(), STATE_CACHE);
             case "oschina" -> new AuthOschinaRequest(builder.build(), STATE_CACHE);
             // 支付宝在创建回调地址时，不允许使用localhost或者127.0.0.1，所以这儿的回调地址使用的局域网内的ip
-            case "alipay_wallet" -> new AuthAlipayRequest(builder.build(), socialProperties.getType().get("alipay_wallet").getAlipayPublicKey(), STATE_CACHE);
+            case "alipay_wallet" ->
+                new AuthAlipayRequest(builder.build(), socialProperties.getType().get("alipay_wallet").getAlipayPublicKey(), STATE_CACHE);
             case "qq" -> new AuthQqRequest(builder.build(), STATE_CACHE);
             case "wechat_open" -> new AuthWeChatOpenRequest(builder.build(), STATE_CACHE);
             case "taobao" -> new AuthTaobaoRequest(builder.build(), STATE_CACHE);
@@ -77,9 +78,11 @@ public class SocialUtils  {
             case "linkedin" -> new AuthLinkedinRequest(builder.build(), STATE_CACHE);
             case "microsoft" -> new AuthMicrosoftRequest(builder.tenantId(obj.getTenantId()).build(), STATE_CACHE);
             case "renren" -> new AuthRenrenRequest(builder.build(), STATE_CACHE);
-            case "stack_overflow" -> new AuthStackOverflowRequest(builder.stackOverflowKey(obj.getStackOverflowKey()).build(), STATE_CACHE);
+            case "stack_overflow" ->
+                new AuthStackOverflowRequest(builder.stackOverflowKey(obj.getStackOverflowKey()).build(), STATE_CACHE);
             case "huawei" -> new AuthHuaweiV3Request(builder.build(), STATE_CACHE);
-            case "wechat_enterprise" -> new AuthWeChatEnterpriseQrcodeV2Request(builder.agentId(obj.getAgentId()).build(), STATE_CACHE);
+            case "wechat_enterprise" ->
+                new AuthWeChatEnterpriseQrcodeV2Request(builder.agentId(obj.getAgentId()).build(), STATE_CACHE);
             case "gitlab" -> new AuthGitlabRequest(builder.build(), STATE_CACHE);
             case "wechat_mp" -> new AuthWeChatMpRequest(builder.build(), STATE_CACHE);
             case "aliyun" -> new AuthAliyunRequest(builder.build(), STATE_CACHE);

ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/annotation/Translation.java

@@ -1,10 +1,6 @@
 package org.dromara.common.translation.annotation;
 
-import java.lang.annotation.Documented;
+import java.lang.annotation.*;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
 
 /**
  * 通用翻译注解

ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/TranslationInterface.java

@@ -7,13 +7,7 @@ import org.dromara.common.translation.annotation.TranslationType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.Arrays;
+import java.util.*;
-import java.util.Collection;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.Set;
 import java.util.function.Function;
 
 /**
@@ -88,8 +82,8 @@ public interface TranslationInterface<T> {
      *
      * @param ids    原始 ID 字符串
      * @param mapper ID 到值的映射函数
-     * @return 拼接后的结果字符串
      * @param <E>    值类型
+     * @return 拼接后的结果字符串
      */
     default <E> String joinMappedValues(String ids, Function<Long, E> mapper) {
         return StreamUtils.join(parseLongIds(ids), id -> {

ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/handler/TranslationJsonFieldProcessor.java

@@ -12,12 +12,7 @@ import org.dromara.common.translation.annotation.TranslationType;
 import org.dromara.common.translation.core.TranslationInterface;
 import org.springframework.core.annotation.Order;
 
-import java.util.Collections;
+import java.util.*;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
 
 /**
  * 翻译响应处理器。

ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/core/I18nLocaleResolver.java

@@ -1,9 +1,9 @@
 package org.dromara.common.web.core;
 
-import org.springframework.web.servlet.LocaleResolver;
-
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
+import org.springframework.web.servlet.LocaleResolver;
+
 import java.util.Locale;
 
 /**

ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/filter/RepeatableFilter.java

@@ -1,10 +1,10 @@
 package org.dromara.common.web.filter;
 
-import org.dromara.common.core.utils.StringUtils;
-import org.springframework.http.MediaType;
-
 import jakarta.servlet.*;
 import jakarta.servlet.http.HttpServletRequest;
+import org.dromara.common.core.utils.StringUtils;
+import org.springframework.http.MediaType;
+
 import java.io.IOException;
 
 /**

ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/filter/RepeatedlyRequestWrapper.java

@@ -1,13 +1,12 @@
 package org.dromara.common.web.filter;
 
 import cn.hutool.core.io.IoUtil;
-import org.dromara.common.core.constant.Constants;
-
 import jakarta.servlet.ReadListener;
 import jakarta.servlet.ServletInputStream;
 import jakarta.servlet.ServletResponse;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletRequestWrapper;
+import org.dromara.common.core.constant.Constants;
 
 import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;

ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/filter/XssFilter.java

@@ -1,13 +1,13 @@
 package org.dromara.common.web.filter;
 
+import jakarta.servlet.*;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.web.config.properties.XssProperties;
 import org.springframework.http.HttpMethod;
 
-import jakarta.servlet.*;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;

ruoyi-extend/ruoyi-snailai-server/src/main/java/com/aizuda/snail/ai/starter/filter/ActuatorAuthFilter.java

@@ -1,11 +1,6 @@
 package com.aizuda.snail.ai.starter.filter;
 
-import jakarta.servlet.Filter;
+import jakarta.servlet.*;
-import jakarta.servlet.FilterChain;
-import jakarta.servlet.FilterConfig;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.ServletRequest;
-import jakarta.servlet.ServletResponse;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 

ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisPubSubController.java

@@ -1,8 +1,8 @@
 package org.dromara.demo.controller;
 
+import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.domain.R;
 import org.dromara.common.redis.utils.RedisUtils;
-import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;

ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/SmsController.java

@@ -61,7 +61,7 @@ public class SmsController {
      * @param phone 手机号
      */
     @GetMapping("/addBlacklist")
-    public R<Object> addBlacklist(String phone){
+    public R<Object> addBlacklist(String phone) {
         SmsBlend smsBlend = SmsFactory.getSmsBlend("config1");
         smsBlend.joinInBlacklist(phone);
         return R.ok();
@@ -73,7 +73,7 @@ public class SmsController {
      * @param phone 手机号
      */
     @GetMapping("/removeBlacklist")
-    public R<Object> removeBlacklist(String phone){
+    public R<Object> removeBlacklist(String phone) {
         SmsBlend smsBlend = SmsFactory.getSmsBlend("config1");
         smsBlend.removeFromBlacklist(phone);
         return R.ok();

ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestDemoController.java

@@ -1,36 +1,36 @@
 package org.dromara.demo.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+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.utils.MapstructUtils;
 import org.dromara.common.core.utils.ValidatorUtils;
 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.web.core.BaseController;
-import org.dromara.common.redis.annotation.RepeatSubmit;
-import org.dromara.common.mybatis.core.page.PageQuery;
-import org.dromara.common.core.domain.PageResult;
 import org.dromara.common.excel.core.ExcelResult;
 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.redis.annotation.RepeatSubmit;
+import org.dromara.common.web.core.BaseController;
 import org.dromara.demo.domain.TestDemo;
 import org.dromara.demo.domain.bo.TestDemoBo;
 import org.dromara.demo.domain.vo.TestDemoImportVo;
 import org.dromara.demo.domain.vo.TestDemoVo;
 import org.dromara.demo.service.ITestDemoService;
-import lombok.RequiredArgsConstructor;
 import org.springframework.http.MediaType;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
-import jakarta.servlet.http.HttpServletResponse;
+import java.util.Arrays;
-import jakarta.validation.constraints.NotEmpty;
+import java.util.List;
-import jakarta.validation.constraints.NotNull;
-
-import java.util.*;
 import java.util.concurrent.TimeUnit;
 
 /**

ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestI18nController.java

@@ -1,17 +1,16 @@
 package org.dromara.demo.controller;
 
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
 import org.dromara.common.core.domain.R;
 import org.dromara.common.core.utils.MessageUtils;
-import lombok.Data;
 import org.hibernate.validator.constraints.Range;
 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 jakarta.validation.constraints.NotNull;
-
 
 /**
  * 测试国际化

ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestSensitiveController.java

@@ -1,11 +1,11 @@
 package org.dromara.demo.controller;
 
-import org.dromara.common.core.domain.R;
-import org.dromara.common.web.core.BaseController;
-import org.dromara.common.sensitive.annotation.Sensitive;
-import org.dromara.common.sensitive.core.SensitiveStrategy;
 import lombok.Data;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.sensitive.annotation.Sensitive;
 import org.dromara.common.sensitive.core.SensitiveService;
+import org.dromara.common.sensitive.core.SensitiveStrategy;
+import org.dromara.common.web.core.BaseController;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;

ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestTreeController.java

@@ -1,25 +1,25 @@
 package org.dromara.demo.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
 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.web.core.BaseController;
 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.demo.domain.bo.TestTreeBo;
 import org.dromara.demo.domain.vo.TestTreeVo;
 import org.dromara.demo.service.ITestTreeService;
-import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.validation.constraints.NotEmpty;
-import jakarta.validation.constraints.NotNull;
 import java.util.Arrays;
 import java.util.List;
 

ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/queue/PriorityQueueController.java

@@ -1,10 +1,10 @@
 package org.dromara.demo.controller.queue;
 
 import cn.hutool.core.util.RandomUtil;
-import org.dromara.common.core.domain.R;
-import org.dromara.common.redis.utils.QueueUtils;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.redis.utils.QueueUtils;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;

ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/TestDemoEncrypt.java

@@ -1,10 +1,10 @@
 package org.dromara.demo.domain;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import org.dromara.common.encrypt.annotation.EncryptField;
-import org.dromara.common.encrypt.enums.AlgorithmType;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.dromara.common.encrypt.annotation.EncryptField;
+import org.dromara.common.encrypt.enums.AlgorithmType;
 
 /**
  * 测试加密字段实体。

ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/ExportDemoVo.java

@@ -1,12 +1,12 @@
 package org.dromara.demo.domain.vo;
 
-import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated;
-import org.apache.fesod.sheet.annotation.ExcelProperty;
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated;
+import org.apache.fesod.sheet.annotation.ExcelProperty;
 import org.dromara.common.core.enums.UserStatus;
 import org.dromara.common.core.validate.AddGroup;
 import org.dromara.common.core.validate.EditGroup;

ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/TestDemoImportVo.java

@@ -1,11 +1,10 @@
 package org.dromara.demo.domain.vo;
 
-import org.apache.fesod.sheet.annotation.ExcelProperty;
 import io.github.linpeilie.annotations.AutoMapper;
-import lombok.Data;
-
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+import org.apache.fesod.sheet.annotation.ExcelProperty;
 import org.dromara.demo.domain.TestDemo;
 
 /**

ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/TestDemoVo.java

@@ -1,5 +1,7 @@
 package org.dromara.demo.domain.vo;
 
+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.apache.fesod.sheet.annotation.format.DateTimeFormat;
@@ -8,8 +10,6 @@ import org.dromara.common.excel.annotation.ExcelRequired;
 import org.dromara.common.translation.annotation.Translation;
 import org.dromara.common.translation.constant.TransConstant;
 import org.dromara.demo.domain.TestDemo;
-import io.github.linpeilie.annotations.AutoMapper;
-import lombok.Data;
 
 import java.io.Serial;
 import java.io.Serializable;

ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/TestTreeVo.java

@@ -1,10 +1,10 @@
 package org.dromara.demo.domain.vo;
 
+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.demo.domain.TestTree;
-import io.github.linpeilie.annotations.AutoMapper;
-import lombok.Data;
 
 import java.io.Serial;
 import java.io.Serializable;

ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/ITestDemoService.java

@@ -1,7 +1,7 @@
 package org.dromara.demo.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.demo.domain.TestDemo;
 import org.dromara.demo.domain.bo.TestDemoBo;
 import org.dromara.demo.domain.vo.TestDemoVo;

ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/ExportExcelServiceImpl.java

@@ -1,10 +1,10 @@
 package org.dromara.demo.service.impl;
 
 import cn.hutool.core.util.RandomUtil;
-import org.apache.fesod.sheet.write.metadata.WriteSheet;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.Data;
 import lombok.RequiredArgsConstructor;
+import org.apache.fesod.sheet.write.metadata.WriteSheet;
 import org.dromara.common.core.constant.SystemConstants;
 import org.dromara.common.core.utils.StreamUtils;
 import org.dromara.common.core.utils.StringUtils;

ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/TestTreeServiceImpl.java

@@ -39,13 +39,13 @@ public class TestTreeServiceImpl implements ITestTreeService {
         return treeMapper.selectVoById(id);
     }
 
-    // @DS("slave") // 切换从库查询
     /**
      * 查询符合条件的测试树表列表。
      *
      * @param bo 查询条件
      * @return 结果列表
      */
+    // @DS("slave") // 切换从库查询
     @Override
     public List<TestTreeVo> queryList(TestTreeBo bo) {
         LambdaQueryWrapper<TestTree> lqw = buildQueryWrapper(bo);

ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/config/MyBatisDataSourceMonitor.java

@@ -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();
             }
         }

ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/controller/GenController.java

@@ -6,13 +6,13 @@ import cn.hutool.core.io.IoUtil;
 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.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.mybatis.helper.DataBaseHelper;
+import org.dromara.common.redis.annotation.RepeatSubmit;
 import org.dromara.common.web.core.BaseController;
 import org.dromara.gen.domain.GenTable;
 import org.dromara.gen.domain.GenTableColumn;

ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/domain/GenTable.java

@@ -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;

ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/mapper/GenTableMapper.java

@@ -20,7 +20,6 @@ public interface GenTableMapper extends BaseMapperPlus<GenTable, GenTable> {
      *
      * @param dataName 数据源名称，用于选择不同的数据源
      * @return 当前数据库中的表名列表
-     *
      * @DS("") 使用默认数据源执行查询操作
      */
     @DS("")

ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/service/IGenTableService.java

@@ -1,7 +1,7 @@
 package org.dromara.gen.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.gen.domain.GenTable;
 import org.dromara.gen.domain.GenTableColumn;
 

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/CacheController.java

@@ -62,6 +62,7 @@ public class CacheController {
      * @param dbSize       数据库
      * @param commandStats 命令统计
      */
-    public record CacheListInfoVo(Properties info, Long dbSize, List<Map<String, String>> commandStats) {}
+    public record CacheListInfoVo(Properties info, Long dbSize, List<Map<String, String>> commandStats) {
+    }
 
 }

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysClientBo.java

@@ -28,7 +28,7 @@ public class SysClientBo implements Serializable {
     /**
      * id
      */
-    @NotNull(message = "id不能为空", groups = { EditGroup.class })
+    @NotNull(message = "id不能为空", groups = {EditGroup.class})
     private Long id;
 
     /**
@@ -39,19 +39,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;
 
     /**

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysSocialBo.java

@@ -28,25 +28,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;
 
     /**
@@ -67,7 +67,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;
 
     /**

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDeptVo.java

@@ -10,8 +10,8 @@ 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;
 
 /**

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysLoginInfoVo.java

@@ -13,7 +13,6 @@ import java.io.Serializable;
 import java.time.LocalDateTime;
 
 
-
 /**
  * 系统访问记录视图对象 sys_login_info
  *

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysMenuVo.java

@@ -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;
 
 

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysNoticeVo.java

@@ -11,7 +11,6 @@ import java.io.Serializable;
 import java.time.LocalDateTime;
 
 
-
 /**
  * 通知公告视图对象 sys_notice
  *

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysLoginInfoServiceImpl.java

@@ -14,8 +14,8 @@ import org.dromara.common.core.utils.ServletUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.core.utils.ip.AddressUtils;
 import org.dromara.common.log.event.LoginInfoEvent;
-import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.mapper.LambdaCrudChainWrapper;
+import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.system.domain.SysLoginInfo;
 import org.dromara.system.domain.bo.SysLoginInfoBo;
@@ -66,14 +66,13 @@ public class SysLoginInfoServiceImpl implements ISysLoginInfoService {
         }
 
         String address = AddressUtils.getRealAddressByIP(ip);
-        StringBuilder s = new StringBuilder();
+        String s = getBlock(ip) +
-        s.append(getBlock(ip));
+            address +
-        s.append(address);
+            getBlock(loginInfoEvent.getUsername()) +
-        s.append(getBlock(loginInfoEvent.getUsername()));
+            getBlock(loginInfoEvent.getStatus()) +
-        s.append(getBlock(loginInfoEvent.getStatus()));
+            getBlock(loginInfoEvent.getMessage());
-        s.append(getBlock(loginInfoEvent.getMessage()));
         // 打印信息到日志
-        log.info(s.toString(), loginInfoEvent.getArgs());
+        log.info(s, loginInfoEvent.getArgs());
         // 获取客户端操作系统
         String os = userAgent.getOs().getName();
         // 获取客户端浏览器
@@ -110,7 +109,7 @@ public class SysLoginInfoServiceImpl implements ISysLoginInfoService {
         if (msg == null) {
             msg = "";
         }
-        return "[" + msg.toString() + "]";
+        return "[" + msg + "]";
     }
 
     /**

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java

@@ -11,11 +11,7 @@ import lombok.extern.slf4j.Slf4j;
 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.*;
-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.file.FileUtils;
 import org.dromara.common.json.utils.JsonUtils;
 import org.dromara.common.mybatis.core.page.PageQuery;

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysRoleServiceImpl.java

@@ -365,7 +365,6 @@ public class SysRoleServiceImpl implements ISysRoleService, RoleService {
     }
 
 
-
     /**
      * 新增角色菜单信息
      *

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/ConditionalOnEnable.java

@@ -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 {
 }

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/TaskAssigneeEnum.java

@@ -102,7 +102,6 @@ public enum TaskAssigneeEnum {
             .collect(Collectors.toList());
     }
 
-    /**
     /**
      * 获取所有办理人类型的代码列表，通常用于程序内部逻辑判断。
      *

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/TaskStatusEnum.java

@@ -77,21 +77,19 @@ public enum TaskStatusEnum {
      */
     TIMEOUT("timeout", "超时");
 
-    /**
-     * 状态
-     */
-    private final String status;
-
-    /**
-     * 状态描述。
-     */
-    private final String desc;
-
     /**
      * 状态编码与描述缓存。
      */
     private static final Map<String, String> STATUS_DESC_MAP = Arrays.stream(values())
         .collect(Collectors.toConcurrentMap(TaskStatusEnum::getStatus, TaskStatusEnum::getDesc));
+    /**
+     * 状态
+     */
+    private final String status;
+    /**
+     * 状态描述。
+     */
+    private final String desc;
 
     /**
      * 根据状态编码获取任务业务状态描述。

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwSpelController.java

@@ -63,7 +63,7 @@ public class FlwSpelController extends BaseController {
     }
 
     /**
-    /**
+     * /**
      * 新增流程 SpEL 表达式定义。
      *
      * @param bo 表达式信息

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwTaskController.java

@@ -89,7 +89,7 @@ public class FlwTaskController extends BaseController {
     }
 
     /**
-    /**
+     * /**
      * 查询全部待办任务。
      *
      * @param flowTaskBo 参数
@@ -126,7 +126,7 @@ public class FlwTaskController extends BaseController {
     }
 
     /**
-    /**
+     * /**
      * 根据任务 id 查询任务详情。
      *
      * @param taskId 任务id
@@ -138,7 +138,7 @@ public class FlwTaskController extends BaseController {
     }
 
     /**
-    /**
+     * /**
      * 获取流程下一节点信息。
      *
      * @param bo 参数
@@ -150,7 +150,7 @@ public class FlwTaskController extends BaseController {
     }
 
     /**
-    /**
+     * /**
      * 终止流程任务。
      *
      * @param bo 参数
@@ -216,7 +216,6 @@ public class FlwTaskController extends BaseController {
         return R.ok(flwTaskService.getBackTaskNode(taskId, nowNodeCode));
     }
 
-    /**
     /**
      * 获取当前任务的所有办理人。
      *

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/TestLeaveController.java

@@ -53,7 +53,7 @@ public class TestLeaveController extends BaseController {
     }
 
     /**
-    /**
+     * /**
      * 导出请假列表。
      *
      * @param bo       查询条件

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowCategoryBo.java

@@ -27,7 +27,7 @@ public class FlowCategoryBo implements Serializable {
     /**
      * 流程分类ID
      */
-    @NotNull(message = "流程分类ID不能为空", groups = { EditGroup.class })
+    @NotNull(message = "流程分类ID不能为空", groups = {EditGroup.class})
     private Long categoryId;
 
     /**

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowSpelBo.java

@@ -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;
 
     /**

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowTaskVo.java

@@ -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;

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwSpelServiceImpl.java

@@ -49,7 +49,7 @@ public class FlwSpelServiceImpl implements IFlwSpelService {
      * @return 流程spel表达式定义
      */
     @Override
-    public FlowSpelVo queryById(Long id){
+    public FlowSpelVo queryById(Long id) {
         return spelMapper.selectVoById(id);
     }
 
@@ -132,7 +132,7 @@ public class FlwSpelServiceImpl implements IFlwSpelService {
      *
      * @param entity 待保存的 SpEL 表达式实体
      */
-    private void validEntityBeforeSave(FlowSpel entity){
+    private void validEntityBeforeSave(FlowSpel entity) {
         if (StringUtils.isNotBlank(entity.getViewSpel())) {
             boolean exists = spelMapper.lambda()
                 .eq(FlowSpel::getViewSpel, entity.getViewSpel())
@@ -153,7 +153,7 @@ public class FlwSpelServiceImpl implements IFlwSpelService {
      */
     @Override
     public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
-        if (isValid){
+        if (isValid) {
             //TODO 做一些业务上的校验,判断是否需要校验
         }
         return spelMapper.deleteByIds(ids) > 0;

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/TestLeaveServiceImpl.java

@@ -60,10 +60,7 @@ public class TestLeaveServiceImpl implements ITestLeaveService {
      * @return boolean
      */
     public boolean eval(Integer leaveDays) {
-        if (leaveDays <= 2) {
+        return leaveDays <= 2;
-            return true;
-        }
-        return false;
     }
 
     /**