代码优化

framework-base/src/main/java/com/chelvc/framework/base/annotation/Decimal.java

@@ -8,9 +8,9 @@ import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 import java.math.RoundingMode;
 
+import com.chelvc.framework.base.jackson.DecimalFormatSerializer;
 import com.fasterxml.jackson.annotation.JacksonAnnotationsInside;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.chelvc.framework.base.jackson.DecimalFormatSerializer;
 
 /**
  * 小数格式化注解

framework-base/src/main/java/com/chelvc/framework/base/annotation/Enumerate.java

@@ -7,9 +7,9 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+import com.chelvc.framework.base.jackson.EnumerationFormatSerializer;
 import com.fasterxml.jackson.annotation.JacksonAnnotationsInside;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.chelvc.framework.base.jackson.EnumerationFormatSerializer;
 
 /**
  * Jackson枚举对象结构化注解

framework-base/src/main/java/com/chelvc/framework/base/apidoc/CustomizeParameterAnalyser.java

@@ -12,13 +12,13 @@ import java.util.Map;
 
 import com.arsframework.apidoc.core.Parameter;
 import com.arsframework.apidoc.core.ParameterAnalyser;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.chelvc.framework.base.jackson.EnumerationFormatSerializer;
 import com.chelvc.framework.common.model.Enumeration;
 import com.chelvc.framework.common.model.Paging;
 import com.chelvc.framework.common.model.Period;
 import com.chelvc.framework.common.model.Region;
 import com.chelvc.framework.common.util.ObjectUtils;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import org.springframework.util.CollectionUtils;
 
 /**

framework-base/src/main/java/com/chelvc/framework/base/config/CopyingConfigurer.java

@@ -2,9 +2,9 @@ package com.chelvc.framework.base.config;
 
 import java.util.Collection;
 
+import com.chelvc.framework.common.util.ObjectUtils;
 import lombok.extern.slf4j.Slf4j;
 import ma.glasnost.orika.MapperFactory;
-import com.chelvc.framework.common.util.ObjectUtils;
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;

framework-base/src/main/java/com/chelvc/framework/base/config/JacksonConfigurer.java

@@ -1,7 +1,7 @@
 package com.chelvc.framework.base.config;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.chelvc.framework.common.util.JacksonUtils;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;

framework-base/src/main/java/com/chelvc/framework/base/config/MultiserverMvcConfigurer.java

@@ -5,10 +5,10 @@ import java.util.List;
 import java.util.Map;
 import java.util.function.Predicate;
 
-import com.google.common.collect.Maps;
-import lombok.NonNull;
 import com.chelvc.framework.base.context.ApplicationContextHolder;
 import com.chelvc.framework.common.util.StringUtils;
+import com.google.common.collect.Maps;
+import lombok.NonNull;
 import org.springframework.boot.autoconfigure.web.servlet.WebMvcRegistrations;
 import org.springframework.core.io.Resource;
 import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping;

framework-base/src/main/java/com/chelvc/framework/base/config/ResponseWrapConfigurer.java

@@ -4,11 +4,11 @@ import java.util.Collections;
 import java.util.List;
 import javax.annotation.PostConstruct;
 
-import com.google.common.collect.Lists;
-import lombok.RequiredArgsConstructor;
 import com.chelvc.framework.base.interceptor.ResponseWrapInterceptor;
 import com.chelvc.framework.base.interceptor.ResponseWrapper;
 import com.chelvc.framework.base.interceptor.ResultResponseWrapper;
+import com.google.common.collect.Lists;
+import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;

framework-base/src/main/java/com/chelvc/framework/base/config/SpringTaskConfigurer.java

@@ -2,9 +2,9 @@ package com.chelvc.framework.base.config;
 
 import java.util.concurrent.ThreadPoolExecutor;
 
+import com.chelvc.framework.common.util.JacksonUtils;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import com.chelvc.framework.common.util.JacksonUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.task.TaskExecutionProperties;
 import org.springframework.boot.autoconfigure.task.TaskSchedulingProperties;

framework-base/src/main/java/com/chelvc/framework/base/config/SpringTaskProperties.java

@@ -2,8 +2,8 @@ package com.chelvc.framework.base.config;
 
 import java.time.Duration;
 
-import lombok.Data;
 import com.chelvc.framework.common.util.ObjectUtils;
+import lombok.Data;
 import org.springframework.boot.autoconfigure.task.TaskExecutionProperties;
 import org.springframework.boot.autoconfigure.task.TaskSchedulingProperties;
 import org.springframework.boot.context.properties.ConfigurationProperties;

framework-base/src/main/java/com/chelvc/framework/base/context/ApplicationContextHolder.java

@@ -14,14 +14,14 @@ import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
 import com.beust.jcommander.internal.Sets;
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.google.common.collect.Lists;
-import lombok.NonNull;
-import lombok.extern.slf4j.Slf4j;
 import com.chelvc.framework.base.util.SpringUtils;
 import com.chelvc.framework.common.util.JacksonUtils;
 import com.chelvc.framework.common.util.ObjectUtils;
 import com.chelvc.framework.common.util.StringUtils;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.google.common.collect.Lists;
+import lombok.NonNull;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.beans.factory.config.YamlPropertiesFactoryBean;

framework-base/src/main/java/com/chelvc/framework/base/context/JacksonContextHolder.java

@@ -4,10 +4,10 @@ import java.io.IOException;
 import java.io.OutputStream;
 import java.lang.reflect.Type;
 
+import com.chelvc.framework.common.util.JacksonUtils;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.NonNull;
-import com.chelvc.framework.common.util.JacksonUtils;
 
 /**
  * Jackson上下文工具类

framework-base/src/main/java/com/chelvc/framework/base/context/ThreadContextHolder.java

@@ -8,10 +8,10 @@ import java.util.concurrent.ForkJoinPool;
 import java.util.function.Consumer;
 import java.util.function.Supplier;
 
-import lombok.NonNull;
-import lombok.extern.slf4j.Slf4j;
 import com.chelvc.framework.base.model.Session;
 import com.chelvc.framework.common.util.ThreadUtils;
+import lombok.NonNull;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.core.task.TaskExecutor;
 import org.springframework.scheduling.TaskScheduler;
 import org.springframework.util.CollectionUtils;

framework-base/src/main/java/com/chelvc/framework/base/exception/FrameworkException.java

@@ -1,9 +1,9 @@
 package com.chelvc.framework.base.exception;
 
-import lombok.Getter;
-import lombok.NonNull;
 import com.chelvc.framework.base.model.Result;
 import com.chelvc.framework.base.util.HttpUtils;
+import lombok.Getter;
+import lombok.NonNull;
 import org.springframework.http.HttpStatus;
 
 /**

framework-base/src/main/java/com/chelvc/framework/base/interceptor/DynamicLoggingInterceptor.java

@@ -4,9 +4,9 @@ import ch.qos.logback.classic.Level;
 import ch.qos.logback.classic.spi.ILoggingEvent;
 import ch.qos.logback.core.filter.Filter;
 import ch.qos.logback.core.spi.FilterReply;
+import com.chelvc.framework.base.context.ApplicationContextHolder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import com.chelvc.framework.base.context.ApplicationContextHolder;
 
 /**
  * 动态日志处理拦截器

framework-base/src/main/java/com/chelvc/framework/base/interceptor/GlobalExceptionInterceptor.java

@@ -13,17 +13,17 @@ import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
 import javax.validation.ValidationException;
 
-import com.fasterxml.jackson.databind.JsonMappingException;
-import com.fasterxml.jackson.databind.exc.InvalidFormatException;
-import com.google.common.collect.ImmutableMap;
-import lombok.NonNull;
-import lombok.extern.slf4j.Slf4j;
 import com.chelvc.framework.base.context.SessionContextHolder;
 import com.chelvc.framework.base.exception.FrameworkException;
 import com.chelvc.framework.base.model.Result;
 import com.chelvc.framework.base.util.HttpUtils;
 import com.chelvc.framework.common.util.ObjectUtils;
 import com.chelvc.framework.common.util.StringUtils;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.exc.InvalidFormatException;
+import com.google.common.collect.ImmutableMap;
+import lombok.NonNull;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.TypeMismatchException;
 import org.springframework.boot.autoconfigure.web.servlet.error.AbstractErrorController;
 import org.springframework.boot.web.error.ErrorAttributeOptions;

framework-base/src/main/java/com/chelvc/framework/base/interceptor/RequestLoggingInterceptor.java

@@ -3,8 +3,8 @@ package com.chelvc.framework.base.interceptor;
 import java.util.Arrays;
 import javax.servlet.http.HttpServletRequest;
 
-import lombok.extern.slf4j.Slf4j;
 import com.chelvc.framework.base.context.SessionContextHolder;
+import lombok.extern.slf4j.Slf4j;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.Signature;

framework-base/src/main/java/com/chelvc/framework/base/interceptor/ResponseWrapInterceptor.java

@@ -1,9 +1,9 @@
 package com.chelvc.framework.base.interceptor;
 
-import lombok.NonNull;
 import com.chelvc.framework.base.annotation.ResponseWrapping;
 import com.chelvc.framework.base.context.SessionContextHolder;
 import com.chelvc.framework.common.util.ObjectUtils;
+import lombok.NonNull;
 import org.springframework.core.MethodParameter;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;

framework-base/src/main/java/com/chelvc/framework/base/jackson/DecimalFormatSerializer.java

@@ -4,15 +4,15 @@ import java.io.IOException;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 
+import com.chelvc.framework.base.annotation.Decimal;
+import com.chelvc.framework.base.context.SessionContextHolder;
+import com.chelvc.framework.common.util.ObjectUtils;
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.BeanProperty;
 import com.fasterxml.jackson.databind.JsonSerializer;
 import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.ser.ContextualSerializer;
 import com.fasterxml.jackson.databind.ser.std.StdSerializer;
-import com.chelvc.framework.base.annotation.Decimal;
-import com.chelvc.framework.base.context.SessionContextHolder;
-import com.chelvc.framework.common.util.ObjectUtils;
 
 /**
  * Jackson小数序格式化处理器
@@ -21,19 +21,11 @@ import com.chelvc.framework.common.util.ObjectUtils;
  * @date 2023/1/1
  */
 public class DecimalFormatSerializer extends StdSerializer<Number> implements ContextualSerializer {
-    /**
-     * 是否启用
-     */
-    private boolean enabled;
-
-    /**
-     * 小数格式化注解实例
-     */
     private Decimal annotation;
+    private boolean enabled = true;
 
     public DecimalFormatSerializer() {
         super(Number.class);
-        this.enabled = true;
     }
 
     /**
@@ -99,7 +91,7 @@ public class DecimalFormatSerializer extends StdSerializer<Number> implements Co
     @Override
     public void serialize(Number number, JsonGenerator generator, SerializerProvider provider)
             throws IOException {
-        if (!this.enabled || this.annotation == null || number == null) {
+        if (!this.enabled || number == null) {
             generator.writeObject(number);
         } else {
             BigDecimal decimal = number instanceof BigDecimal ? (BigDecimal) number : new BigDecimal(number.toString());
@@ -120,7 +112,7 @@ public class DecimalFormatSerializer extends StdSerializer<Number> implements Co
             this.enabled = false;
         } else {
             this.annotation = this.getDecimalAnnotation(property);
-            this.enabled = this.annotation != null && this.isVersioning(this.annotation);
+            this.enabled = this.annotation == null || this.isVersioning(this.annotation);
         }
         return this;
     }

framework-base/src/main/java/com/chelvc/framework/base/jackson/EnumerationFormatSerializer.java

@@ -2,6 +2,12 @@ package com.chelvc.framework.base.jackson;
 
 import java.io.IOException;
 
+import com.chelvc.framework.base.annotation.Enumerate;
+import com.chelvc.framework.base.context.ApplicationContextHolder;
+import com.chelvc.framework.base.context.SessionContextHolder;
+import com.chelvc.framework.common.model.Enumeration;
+import com.chelvc.framework.common.util.ObjectUtils;
+import com.chelvc.framework.common.util.StringUtils;
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.BeanProperty;
 import com.fasterxml.jackson.databind.JsonSerializer;
@@ -9,12 +15,6 @@ import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.ser.ContextualSerializer;
 import com.fasterxml.jackson.databind.ser.std.StdSerializer;
 import com.google.common.collect.ImmutableMap;
-import com.chelvc.framework.base.annotation.Enumerate;
-import com.chelvc.framework.base.context.ApplicationContextHolder;
-import com.chelvc.framework.base.context.SessionContextHolder;
-import com.chelvc.framework.common.model.Enumeration;
-import com.chelvc.framework.common.util.ObjectUtils;
-import com.chelvc.framework.common.util.StringUtils;
 
 /**
  * Jackson枚举对象结构化处理器
@@ -23,12 +23,11 @@ import com.chelvc.framework.common.util.StringUtils;
  * @date 2023/1/1
  */
 public class EnumerationFormatSerializer extends StdSerializer<Object> implements ContextualSerializer {
-    private boolean enabled;
     private Enumerate annotation;
+    private boolean enabled = true;
 
     public EnumerationFormatSerializer() {
         super(Object.class);
-        this.enabled = true;
     }
 
     /**
@@ -123,7 +122,7 @@ public class EnumerationFormatSerializer extends StdSerializer<Object> implement
     @Override
     public void serialize(Object object, JsonGenerator generator, SerializerProvider provider)
             throws IOException {
-        if (!this.enabled || this.annotation == null || object == null) {
+        if (!this.enabled || object == null) {
             generator.writeObject(object);
         } else {
             generator.writeObject(ImmutableMap.of(
@@ -141,7 +140,7 @@ public class EnumerationFormatSerializer extends StdSerializer<Object> implement
             this.enabled = false;
         } else {
             this.annotation = this.getEnumerateAnnotation(property);
-            this.enabled = this.annotation != null && this.isVersioning(this.annotation);
+            this.enabled = this.annotation == null || this.isVersioning(this.annotation);
         }
         return this;
     }

framework-base/src/main/java/com/chelvc/framework/base/model/Result.java

@@ -3,13 +3,13 @@ package com.chelvc.framework.base.model;
 import java.io.Serializable;
 import java.util.Objects;
 
+import com.chelvc.framework.common.util.ObjectUtils;
 import lombok.AllArgsConstructor;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.NonNull;
 import lombok.ToString;
-import com.chelvc.framework.common.util.ObjectUtils;
 import org.springframework.http.HttpStatus;
 
 /**

framework-base/src/main/java/com/chelvc/framework/base/model/Using.java

@@ -1,7 +1,7 @@
 package com.chelvc.framework.base.model;
 
-import lombok.Getter;
 import com.chelvc.framework.common.model.Enumeration;
+import lombok.Getter;
 
 /**
  * 系统使用枚举

framework-base/src/main/java/com/chelvc/framework/base/util/HttpUtils.java

@@ -17,10 +17,10 @@ import java.util.regex.Pattern;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import com.google.common.collect.Maps;
-import lombok.NonNull;
 import com.chelvc.framework.common.util.HostUtils;
 import com.chelvc.framework.common.util.StringUtils;
+import com.google.common.collect.Maps;
+import lombok.NonNull;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 

framework-base/src/main/java/com/chelvc/framework/base/util/ResourceUtils.java

@@ -4,12 +4,12 @@ import java.util.Collection;
 import java.util.Map;
 import java.util.Objects;
 
-import lombok.NonNull;
 import com.chelvc.framework.base.exception.ParameterInvalidException;
 import com.chelvc.framework.base.exception.ResourceUnavailableException;
 import com.chelvc.framework.base.exception.ResourceUndefinedException;
 import com.chelvc.framework.common.function.Getter;
 import com.chelvc.framework.common.util.ObjectUtils;
+import lombok.NonNull;
 
 /**
  * 资源工具类

framework-base/src/main/java/com/chelvc/framework/base/util/SpringUtils.java

@@ -8,8 +8,8 @@ import java.util.function.Predicate;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import lombok.NonNull;
 import com.chelvc.framework.common.util.StringUtils;
+import lombok.NonNull;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
 import org.springframework.core.io.support.ResourcePatternResolver;

framework-common/src/main/java/com/chelvc/framework/common/function/Handler.java

@@ -3,8 +3,8 @@ package com.chelvc.framework.common.function;
 import java.util.Objects;
 import java.util.function.BiPredicate;
 
-import lombok.NonNull;
 import com.chelvc.framework.common.util.ThreadUtils;
+import lombok.NonNull;
 
 /**
  * 处理方法接口

framework-common/src/main/java/com/chelvc/framework/common/function/Provider.java

@@ -3,8 +3,8 @@ package com.chelvc.framework.common.function;
 import java.util.Objects;
 import java.util.function.BiPredicate;
 
-import lombok.NonNull;
 import com.chelvc.framework.common.util.ThreadUtils;
+import lombok.NonNull;
 
 /**
  * 对象提供方法接口

framework-common/src/main/java/com/chelvc/framework/common/model/Media.java

@@ -5,8 +5,8 @@ import java.util.Objects;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import lombok.Getter;
 import com.chelvc.framework.common.util.StringUtils;
+import lombok.Getter;
 
 /**
  * 媒体类型枚举

framework-common/src/main/java/com/chelvc/framework/common/model/Pagination.java

@@ -4,6 +4,7 @@ import java.io.Serializable;
 import java.util.Collections;
 import java.util.List;
 
+import com.chelvc.framework.common.util.ObjectUtils;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.EqualsAndHashCode;
@@ -11,7 +12,6 @@ import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
 import lombok.experimental.SuperBuilder;
-import com.chelvc.framework.common.util.ObjectUtils;
 
 /**
  * 分页信息

framework-common/src/main/java/com/chelvc/framework/common/model/Paging.java

@@ -3,15 +3,15 @@ package com.chelvc.framework.common.model;
 import java.io.Serializable;
 import java.util.List;
 
+import com.chelvc.framework.common.util.AssertUtils;
+import com.chelvc.framework.common.util.ObjectUtils;
+import com.chelvc.framework.common.util.StringUtils;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
-import com.chelvc.framework.common.util.AssertUtils;
-import com.chelvc.framework.common.util.ObjectUtils;
-import com.chelvc.framework.common.util.StringUtils;
 
 /**
  * 分页信息

framework-common/src/main/java/com/chelvc/framework/common/model/Period.java

@@ -10,6 +10,10 @@ import java.util.Date;
 import java.util.function.Function;
 import java.util.regex.Pattern;
 
+import com.chelvc.framework.common.util.AssertUtils;
+import com.chelvc.framework.common.util.DateUtils;
+import com.chelvc.framework.common.util.ObjectUtils;
+import com.chelvc.framework.common.util.StringUtils;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -17,10 +21,6 @@ import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.NonNull;
-import com.chelvc.framework.common.util.AssertUtils;
-import com.chelvc.framework.common.util.DateUtils;
-import com.chelvc.framework.common.util.ObjectUtils;
-import com.chelvc.framework.common.util.StringUtils;
 
 /**
  * 时间周期对象

framework-common/src/main/java/com/chelvc/framework/common/model/Region.java

@@ -5,6 +5,9 @@ import java.util.Objects;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import com.chelvc.framework.common.util.AssertUtils;
+import com.chelvc.framework.common.util.ObjectUtils;
+import com.chelvc.framework.common.util.StringUtils;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -12,9 +15,6 @@ import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.NonNull;
-import com.chelvc.framework.common.util.AssertUtils;
-import com.chelvc.framework.common.util.ObjectUtils;
-import com.chelvc.framework.common.util.StringUtils;
 
 /**
  * 地区编码

framework-common/src/main/java/com/chelvc/framework/common/model/Version.java

@@ -10,11 +10,11 @@ import java.util.Objects;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
-import com.google.common.collect.Maps;
-import lombok.NonNull;
 import com.chelvc.framework.common.util.ObjectUtils;
 import com.chelvc.framework.common.util.StringUtils;
 import com.chelvc.framework.common.util.TreeUtils;
+import com.google.common.collect.Maps;
+import lombok.NonNull;
 import org.apache.commons.lang3.tuple.Pair;
 
 /**

framework-common/src/main/java/com/chelvc/framework/common/util/JacksonUtils.java

@@ -13,6 +13,9 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
+import com.chelvc.framework.common.model.Paging;
+import com.chelvc.framework.common.model.Period;
+import com.chelvc.framework.common.model.Region;
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.PropertyAccessor;
 import com.fasterxml.jackson.core.JsonGenerator;
@@ -33,9 +36,6 @@ import com.fasterxml.jackson.databind.ser.BeanPropertyWriter;
 import com.fasterxml.jackson.databind.ser.BeanSerializerModifier;
 import com.fasterxml.jackson.databind.ser.SerializerFactory;
 import lombok.NonNull;
-import com.chelvc.framework.common.model.Paging;
-import com.chelvc.framework.common.model.Period;
-import com.chelvc.framework.common.model.Region;
 
 /**
  * Jackson工具类

framework-common/src/main/java/com/chelvc/framework/common/util/TreeUtils.java

@@ -12,9 +12,9 @@ import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
+import com.chelvc.framework.common.model.Tree;
 import com.google.common.collect.Lists;
 import lombok.NonNull;
-import com.chelvc.framework.common.model.Tree;
 
 /**
  * 树工具类

framework-database/src/main/java/com/chelvc/framework/database/config/DatabaseConfigurer.java

@@ -9,8 +9,6 @@ import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.inner.InnerInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.inner.TenantLineInnerInterceptor;
-import lombok.NonNull;
-import lombok.RequiredArgsConstructor;
 import com.chelvc.framework.common.function.Executor;
 import com.chelvc.framework.common.function.Handler;
 import com.chelvc.framework.common.function.Provider;
@@ -18,6 +16,8 @@ import com.chelvc.framework.common.util.ObjectUtils;
 import com.chelvc.framework.database.entity.Transactor;
 import com.chelvc.framework.database.interceptor.DeletedExcludeHandler;
 import com.chelvc.framework.redis.context.RedisContextHolder;
+import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;

framework-database/src/main/java/com/chelvc/framework/database/context/DatabaseContextHolder.java

@@ -18,8 +18,6 @@ import javax.crypto.Cipher;
 import com.baomidou.mybatisplus.core.metadata.TableInfo;
 import com.baomidou.mybatisplus.core.metadata.TableInfoHelper;
 import com.baomidou.mybatisplus.extension.service.IService;
-import lombok.NonNull;
-import lombok.extern.slf4j.Slf4j;
 import com.chelvc.framework.base.context.ApplicationContextHolder;
 import com.chelvc.framework.base.context.SessionContextHolder;
 import com.chelvc.framework.common.function.Executor;
@@ -35,6 +33,8 @@ import com.chelvc.framework.database.entity.Deletable;
 import com.chelvc.framework.database.entity.Transactor;
 import com.chelvc.framework.database.entity.TreeEntity;
 import com.chelvc.framework.database.entity.Updatable;
+import lombok.NonNull;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.ibatis.mapping.SqlCommandType;
 import org.mybatis.spring.SqlSessionTemplate;
 import org.springframework.context.ApplicationContext;

framework-database/src/main/java/com/chelvc/framework/database/entity/BasicEntity.java

@@ -3,13 +3,13 @@ package com.chelvc.framework.database.entity;
 import java.io.Serializable;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.chelvc.framework.database.interceptor.DeletedTypeHandler;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
 import lombok.experimental.SuperBuilder;
-import com.chelvc.framework.database.interceptor.DeletedTypeHandler;
 
 /**
  * 基础数据模型

framework-database/src/main/java/com/chelvc/framework/database/entity/DeleteEntity.java

@@ -3,11 +3,11 @@ package com.chelvc.framework.database.entity;
 import java.io.Serializable;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.chelvc.framework.database.interceptor.DeletedTypeHandler;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
-import com.chelvc.framework.database.interceptor.DeletedTypeHandler;
 
 /**
  * 可删除数据模型

framework-database/src/main/java/com/chelvc/framework/database/interceptor/DatabaseExceptionInterceptor.java

@@ -3,11 +3,11 @@ package com.chelvc.framework.database.interceptor;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import lombok.extern.slf4j.Slf4j;
 import com.chelvc.framework.base.context.SessionContextHolder;
 import com.chelvc.framework.base.exception.ParameterInvalidException;
 import com.chelvc.framework.base.model.Result;
 import com.chelvc.framework.common.util.ErrorUtils;
+import lombok.extern.slf4j.Slf4j;
 import org.mybatis.spring.MyBatisSystemException;
 import org.springframework.core.Ordered;
 import org.springframework.core.annotation.Order;

framework-database/src/main/java/com/chelvc/framework/database/interceptor/DynamicDatasourceInterceptor.java

@@ -6,10 +6,10 @@ import java.util.Set;
 
 import com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceProperties;
 import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
+import com.chelvc.framework.common.util.StringUtils;
 import com.google.common.collect.Maps;
 import lombok.NonNull;
 import lombok.extern.slf4j.Slf4j;
-import com.chelvc.framework.common.util.StringUtils;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;

framework-database/src/main/java/com/chelvc/framework/database/interceptor/FilesTypeHandler.java

@@ -7,9 +7,9 @@ import java.sql.SQLException;
 import java.sql.Types;
 import java.util.List;
 
-import com.fasterxml.jackson.core.type.TypeReference;
 import com.chelvc.framework.base.context.JacksonContextHolder;
 import com.chelvc.framework.common.model.File;
+import com.fasterxml.jackson.core.type.TypeReference;
 import org.apache.ibatis.type.BaseTypeHandler;
 import org.apache.ibatis.type.JdbcType;
 import org.springframework.util.CollectionUtils;

framework-database/src/main/java/com/chelvc/framework/database/interceptor/IntegersTypeHandler.java

@@ -7,8 +7,8 @@ import java.sql.SQLException;
 import java.sql.Types;
 import java.util.List;
 
-import com.fasterxml.jackson.core.type.TypeReference;
 import com.chelvc.framework.base.context.JacksonContextHolder;
+import com.fasterxml.jackson.core.type.TypeReference;
 import org.apache.ibatis.type.BaseTypeHandler;
 import org.apache.ibatis.type.JdbcType;
 import org.springframework.util.CollectionUtils;

framework-database/src/main/java/com/chelvc/framework/database/interceptor/LongsTypeHandler.java

@@ -7,8 +7,8 @@ import java.sql.SQLException;
 import java.sql.Types;
 import java.util.List;
 
-import com.fasterxml.jackson.core.type.TypeReference;
 import com.chelvc.framework.base.context.JacksonContextHolder;
+import com.fasterxml.jackson.core.type.TypeReference;
 import org.apache.ibatis.type.BaseTypeHandler;
 import org.apache.ibatis.type.JdbcType;
 import org.springframework.util.CollectionUtils;

framework-database/src/main/java/com/chelvc/framework/database/interceptor/MappingTypeHandler.java

@@ -7,8 +7,8 @@ import java.sql.SQLException;
 import java.sql.Types;
 import java.util.Map;
 
-import com.fasterxml.jackson.core.type.TypeReference;
 import com.chelvc.framework.base.context.JacksonContextHolder;
+import com.fasterxml.jackson.core.type.TypeReference;
 import org.apache.ibatis.type.BaseTypeHandler;
 import org.apache.ibatis.type.JdbcType;
 import org.springframework.util.CollectionUtils;

framework-database/src/main/java/com/chelvc/framework/database/interceptor/MappingsTypeHandler.java

@@ -8,8 +8,8 @@ import java.sql.Types;
 import java.util.List;
 import java.util.Map;
 
-import com.fasterxml.jackson.core.type.TypeReference;
 import com.chelvc.framework.base.context.JacksonContextHolder;
+import com.fasterxml.jackson.core.type.TypeReference;
 import org.apache.ibatis.type.BaseTypeHandler;
 import org.apache.ibatis.type.JdbcType;
 import org.springframework.util.CollectionUtils;

framework-database/src/main/java/com/chelvc/framework/database/interceptor/ModificationsTypeHandler.java

@@ -7,9 +7,9 @@ import java.sql.SQLException;
 import java.sql.Types;
 import java.util.List;
 
-import com.fasterxml.jackson.core.type.TypeReference;
 import com.chelvc.framework.base.context.JacksonContextHolder;
 import com.chelvc.framework.common.model.Modification;
+import com.fasterxml.jackson.core.type.TypeReference;
 import org.apache.ibatis.type.BaseTypeHandler;
 import org.apache.ibatis.type.JdbcType;
 import org.springframework.util.CollectionUtils;

framework-database/src/main/java/com/chelvc/framework/database/interceptor/PropertyUpdateInterceptor.java

@@ -9,7 +9,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 
-import lombok.RequiredArgsConstructor;
 import com.chelvc.framework.common.function.Provider;
 import com.chelvc.framework.common.util.ObjectUtils;
 import com.chelvc.framework.common.util.StringUtils;
@@ -21,6 +20,7 @@ import com.chelvc.framework.database.entity.Entity;
 import com.chelvc.framework.database.entity.TreeEntity;
 import com.chelvc.framework.database.entity.Updatable;
 import com.chelvc.framework.database.util.EntityUtils;
+import lombok.RequiredArgsConstructor;
 import org.apache.ibatis.cache.CacheKey;
 import org.apache.ibatis.executor.Executor;
 import org.apache.ibatis.executor.statement.StatementHandler;

framework-database/src/main/java/com/chelvc/framework/database/interceptor/StringsTypeHandler.java

@@ -7,8 +7,8 @@ import java.sql.SQLException;
 import java.sql.Types;
 import java.util.List;
 
-import com.fasterxml.jackson.core.type.TypeReference;
 import com.chelvc.framework.base.context.JacksonContextHolder;
+import com.fasterxml.jackson.core.type.TypeReference;
 import org.apache.ibatis.type.BaseTypeHandler;
 import org.apache.ibatis.type.JdbcType;
 import org.springframework.util.CollectionUtils;

framework-database/src/main/java/com/chelvc/framework/database/interceptor/UniqueValidateInterceptor.java

@@ -13,9 +13,6 @@ import com.baomidou.mybatisplus.core.conditions.AbstractWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.support.ColumnCache;
 import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
-import com.google.common.collect.Maps;
-import lombok.Getter;
-import lombok.NonNull;
 import com.chelvc.framework.base.exception.ParameterInvalidException;
 import com.chelvc.framework.common.util.AESUtils;
 import com.chelvc.framework.common.util.AssertUtils;
@@ -25,6 +22,9 @@ import com.chelvc.framework.database.annotation.Unique;
 import com.chelvc.framework.database.context.DatabaseContextHolder;
 import com.chelvc.framework.database.entity.Entity;
 import com.chelvc.framework.database.util.EntityUtils;
+import com.google.common.collect.Maps;
+import lombok.Getter;
+import lombok.NonNull;
 import org.apache.ibatis.executor.Executor;
 import org.apache.ibatis.mapping.MappedStatement;
 import org.apache.ibatis.mapping.SqlCommandType;

framework-database/src/main/java/com/chelvc/framework/database/util/EntityUtils.java

@@ -13,13 +13,13 @@ import com.baomidou.mybatisplus.core.metadata.TableInfoHelper;
 import com.baomidou.mybatisplus.core.toolkit.LambdaUtils;
 import com.baomidou.mybatisplus.core.toolkit.support.ColumnCache;
 import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
-import lombok.Getter;
-import lombok.NonNull;
 import com.chelvc.framework.base.util.SpringUtils;
 import com.chelvc.framework.common.util.AssertUtils;
 import com.chelvc.framework.common.util.ObjectUtils;
 import com.chelvc.framework.database.annotation.Confidential;
 import com.chelvc.framework.database.entity.Entity;
+import lombok.Getter;
+import lombok.NonNull;
 import org.apache.ibatis.reflection.MetaObject;
 import org.apache.ibatis.reflection.SystemMetaObject;
 

framework-database/src/main/java/com/chelvc/framework/database/util/PagingUtils.java

@@ -5,10 +5,10 @@ import java.util.List;
 import java.util.function.Function;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.NonNull;
 import com.chelvc.framework.common.model.Pagination;
 import com.chelvc.framework.common.model.Paging;
 import com.chelvc.framework.common.util.ObjectUtils;
+import lombok.NonNull;
 import org.springframework.util.CollectionUtils;
 
 /**

framework-dubbo/src/main/java/com/chelvc/framework/dubbo/adapter/DubboObjectAdapterHolder.java

@@ -3,9 +3,9 @@ package com.chelvc.framework.dubbo.adapter;
 import java.util.Collection;
 import java.util.Map;
 
+import com.chelvc.framework.base.context.ApplicationContextHolder;
 import com.google.common.collect.Maps;
 import lombok.extern.slf4j.Slf4j;
-import com.chelvc.framework.base.context.ApplicationContextHolder;
 import org.springframework.aop.framework.AopProxyUtils;
 import org.springframework.core.ResolvableType;
 

framework-dubbo/src/main/java/com/chelvc/framework/dubbo/interceptor/DubboExceptionInterceptor.java

@@ -2,9 +2,9 @@ package com.chelvc.framework.dubbo.interceptor;
 
 import java.lang.reflect.Method;
 
-import lombok.extern.slf4j.Slf4j;
 import com.chelvc.framework.base.exception.FrameworkException;
 import com.chelvc.framework.common.util.ErrorUtils;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.common.utils.ReflectUtils;
 import org.apache.dubbo.common.utils.StringUtils;
 import org.apache.dubbo.rpc.Filter;

framework-dubbo/src/main/java/com/chelvc/framework/dubbo/interceptor/DubboProviderInterceptor.java

@@ -1,10 +1,10 @@
 package com.chelvc.framework.dubbo.interceptor;
 
-import lombok.extern.slf4j.Slf4j;
 import com.chelvc.framework.base.context.SessionContextHolder;
 import com.chelvc.framework.base.model.Session;
 import com.chelvc.framework.dubbo.adapter.DubboObjectAdapterHolder;
 import com.chelvc.framework.dubbo.adapter.DubboObjectAdapterWrapper;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.common.constants.CommonConstants;
 import org.apache.dubbo.common.extension.Activate;
 import org.apache.dubbo.rpc.AsyncRpcResult;

framework-email/src/main/java/com/chelvc/framework/email/DefaultEmailHandler.java

@@ -11,12 +11,12 @@ import javax.mail.internet.InternetAddress;
 import javax.mail.internet.MimeBodyPart;
 import javax.mail.internet.MimeMessage;
 
-import lombok.NonNull;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
 import com.chelvc.framework.common.util.EmailUtils;
 import com.chelvc.framework.common.util.StringUtils;
 import com.chelvc.framework.email.config.EmailProperties;
+import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 

framework-feign/src/main/java/com/chelvc/framework/feign/config/FeignConfigurer.java

@@ -1,12 +1,12 @@
 package com.chelvc.framework.feign.config;
 
+import com.chelvc.framework.feign.interceptor.FeignExceptionInterceptor;
 import feign.codec.Decoder;
 import feign.codec.Encoder;
 import feign.codec.ErrorDecoder;
 import feign.form.FormEncoder;
 import feign.optionals.OptionalDecoder;
 import lombok.RequiredArgsConstructor;
-import com.chelvc.framework.feign.interceptor.FeignExceptionInterceptor;
 import org.springframework.beans.factory.ObjectFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.AutoConfigureBefore;

framework-feign/src/main/java/com/chelvc/framework/feign/interceptor/FeignExceptionInterceptor.java

@@ -5,14 +5,14 @@ import java.io.Reader;
 import java.nio.charset.StandardCharsets;
 import java.util.Objects;
 
-import feign.Response;
-import feign.Util;
-import feign.codec.ErrorDecoder;
 import com.chelvc.framework.base.context.JacksonContextHolder;
 import com.chelvc.framework.base.exception.FrameworkException;
 import com.chelvc.framework.base.model.Result;
 import com.chelvc.framework.base.util.HttpUtils;
 import com.chelvc.framework.feign.context.FeignContextHolder;
+import feign.Response;
+import feign.Util;
+import feign.codec.ErrorDecoder;
 
 /**
  * Feign调用异常处理拦截器

framework-feign/src/main/java/com/chelvc/framework/feign/interceptor/FeignHeaderInterceptor.java

@@ -1,9 +1,9 @@
 package com.chelvc.framework.feign.interceptor;
 
+import com.chelvc.framework.feign.context.FeignContextHolder;
 import feign.RequestInterceptor;
 import feign.RequestTemplate;
 import lombok.extern.slf4j.Slf4j;
-import com.chelvc.framework.feign.context.FeignContextHolder;
 import org.springframework.stereotype.Component;
 
 /**

framework-jpush/src/main/java/com/chelvc/framework/jpush/DefaultJPushHandler.java

@@ -36,10 +36,6 @@ import cn.jpush.api.push.model.Message;
 import cn.jpush.api.push.model.PushPayload;
 import cn.jpush.api.push.model.notification.Notification;
 import cn.jpush.api.report.ReceivedsResult;
-import com.google.common.collect.ImmutableMap;
-import lombok.NonNull;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
 import com.chelvc.framework.base.context.JacksonContextHolder;
 import com.chelvc.framework.common.model.Period;
 import com.chelvc.framework.common.model.Platform;
@@ -49,6 +45,10 @@ import com.chelvc.framework.common.util.ObjectUtils;
 import com.chelvc.framework.common.util.StringUtils;
 import com.chelvc.framework.jpush.config.JPushProperties;
 import com.chelvc.framework.jpush.context.JPushContextHolder;
+import com.google.common.collect.ImmutableMap;
+import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;

framework-jpush/src/main/java/com/chelvc/framework/jpush/context/JPushContextHolder.java

@@ -13,14 +13,14 @@ import cn.jpush.api.push.model.audience.Audience;
 import cn.jpush.api.push.model.notification.IosAlert;
 import cn.jpush.api.push.model.notification.IosNotification;
 import cn.jpush.api.push.model.notification.Notification;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Lists;
-import com.google.gson.JsonObject;
-import lombok.NonNull;
 import com.chelvc.framework.base.context.ApplicationContextHolder;
 import com.chelvc.framework.common.model.Platform;
 import com.chelvc.framework.common.util.StringUtils;
 import com.chelvc.framework.jpush.config.JPushProperties;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Lists;
+import com.google.gson.JsonObject;
+import lombok.NonNull;
 import org.springframework.util.CollectionUtils;
 
 /**

framework-kafka/src/main/java/com/chelvc/framework/kafka/config/KafkaProperties.java

@@ -2,11 +2,11 @@ package com.chelvc.framework.kafka.config;
 
 import java.nio.charset.StandardCharsets;
 
+import com.chelvc.framework.common.util.JacksonUtils;
+import com.chelvc.framework.kafka.interceptor.KafkaSessionInterceptor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
-import com.chelvc.framework.common.util.JacksonUtils;
-import com.chelvc.framework.kafka.interceptor.KafkaSessionInterceptor;
 import org.apache.kafka.clients.producer.ProducerConfig;
 import org.apache.kafka.common.serialization.Serializer;
 import org.apache.kafka.common.serialization.StringDeserializer;

framework-location/src/main/java/com/chelvc/framework/location/support/JuheMobileHandler.java

@@ -5,15 +5,15 @@ import java.util.Date;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import lombok.NonNull;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
 import com.chelvc.framework.common.util.DateUtils;
 import com.chelvc.framework.common.util.ObjectUtils;
 import com.chelvc.framework.common.util.StringUtils;
 import com.chelvc.framework.location.MobileHandler;
 import com.chelvc.framework.location.config.JuheLocationProperties;
 import com.chelvc.framework.redis.context.RedisContextHolder;
+import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.data.redis.core.RedisTemplate;

framework-location/src/main/java/com/chelvc/framework/location/support/TencentLocationHandler.java

@@ -4,9 +4,6 @@ import java.util.Objects;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import lombok.NonNull;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
 import com.chelvc.framework.common.model.Region;
 import com.chelvc.framework.common.util.ObjectUtils;
 import com.chelvc.framework.common.util.StringUtils;
@@ -14,6 +11,9 @@ import com.chelvc.framework.location.Address;
 import com.chelvc.framework.location.Area;
 import com.chelvc.framework.location.LocationHandler;
 import com.chelvc.framework.location.config.TencentLocationProperties;
+import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.stereotype.Component;

framework-nacos/src/main/java/com/chelvc/framework/nacos/config/MultiserverNacosConfigurer.java

@@ -3,9 +3,9 @@ package com.chelvc.framework.nacos.config;
 import com.alibaba.cloud.nacos.NacosDiscoveryProperties;
 import com.alibaba.cloud.nacos.registry.NacosRegistration;
 import com.alibaba.cloud.nacos.registry.NacosServiceRegistry;
-import lombok.RequiredArgsConstructor;
 import com.chelvc.framework.base.context.ApplicationContextHolder;
 import com.chelvc.framework.common.util.StringUtils;
+import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.ApplicationArguments;
 import org.springframework.boot.ApplicationRunner;

framework-nacos/src/main/java/com/chelvc/framework/nacos/context/NacosContextHolder.java

@@ -7,12 +7,12 @@ import java.util.stream.Collectors;
 
 import com.alibaba.nacos.api.config.ConfigService;
 import com.alibaba.nacos.api.exception.NacosException;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Maps;
-import lombok.NonNull;
 import com.chelvc.framework.base.context.ApplicationContextHolder;
 import com.chelvc.framework.common.util.ObjectUtils;
 import com.chelvc.framework.common.util.StringUtils;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Maps;
+import lombok.NonNull;
 import org.springframework.core.env.Environment;
 
 /**

framework-oauth/src/main/java/com/chelvc/framework/oauth/interceptor/OauthExceptionInterceptor.java

@@ -3,9 +3,9 @@ package com.chelvc.framework.oauth.interceptor;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import lombok.extern.slf4j.Slf4j;
 import com.chelvc.framework.base.context.SessionContextHolder;
 import com.chelvc.framework.base.model.Result;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.core.Ordered;
 import org.springframework.core.annotation.Order;
 import org.springframework.http.HttpStatus;

framework-oauth/src/main/java/com/chelvc/framework/oauth/token/RedisTokenActiveValidator.java

@@ -2,13 +2,13 @@ package com.chelvc.framework.oauth.token;
 
 import java.util.Objects;
 
-import lombok.NonNull;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
 import com.chelvc.framework.base.context.SessionContextHolder;
 import com.chelvc.framework.common.util.StringUtils;
 import com.chelvc.framework.oauth.config.OauthConfigurer;
 import com.chelvc.framework.oauth.context.OauthContextHolder;
+import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.data.redis.core.RedisTemplate;

framework-oauth/src/main/java/com/chelvc/framework/oauth/token/RedisTokenStore.java

@@ -2,11 +2,11 @@ package com.chelvc.framework.oauth.token;
 
 import java.time.Duration;
 
-import lombok.NonNull;
-import lombok.extern.slf4j.Slf4j;
 import com.chelvc.framework.base.context.SessionContextHolder;
 import com.chelvc.framework.oauth.context.OauthContextHolder;
 import com.chelvc.framework.redis.context.RedisContextHolder;
+import lombok.NonNull;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.oauth2.common.OAuth2AccessToken;

framework-redis/src/main/java/com/chelvc/framework/redis/config/RedisConfigurer.java

@@ -3,6 +3,7 @@ package com.chelvc.framework.redis.config;
 import java.time.Duration;
 import java.util.Collection;
 
+import com.chelvc.framework.base.context.JacksonContextHolder;
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.PropertyAccessor;
@@ -15,7 +16,6 @@ import io.lettuce.core.event.EventBus;
 import io.lettuce.core.resource.ClientResources;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import com.chelvc.framework.base.context.JacksonContextHolder;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.annotation.Autowired;

framework-redis/src/main/java/com/chelvc/framework/redis/context/RedisContextHolder.java

@@ -14,15 +14,15 @@ import java.util.concurrent.ThreadLocalRandom;
 import java.util.function.Function;
 import java.util.function.Supplier;
 
-import com.google.common.collect.Maps;
-import lombok.NonNull;
-import lombok.extern.slf4j.Slf4j;
 import com.chelvc.framework.base.context.ApplicationContextHolder;
 import com.chelvc.framework.common.function.Executor;
 import com.chelvc.framework.common.util.IdentityUtils;
 import com.chelvc.framework.common.util.ObjectUtils;
 import com.chelvc.framework.common.util.StringUtils;
 import com.chelvc.framework.common.util.ThreadUtils;
+import com.google.common.collect.Maps;
+import lombok.NonNull;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.autoconfigure.data.redis.RedisProperties;
 import org.springframework.data.redis.connection.RedisConnection;
 import org.springframework.data.redis.connection.RedisConnectionFactory;

framework-security/src/main/java/com/chelvc/framework/security/annotation/Desensitize.java

@@ -7,10 +7,10 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import com.fasterxml.jackson.annotation.JacksonAnnotationsInside;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.chelvc.framework.base.annotation.Versioning;
 import com.chelvc.framework.security.interceptor.JacksonDesensitizeSerializer;
+import com.fasterxml.jackson.annotation.JacksonAnnotationsInside;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 
 /**
  * 敏感数据脱敏

framework-security/src/main/java/com/chelvc/framework/security/annotation/Encrypt.java

@@ -7,10 +7,10 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import com.fasterxml.jackson.annotation.JacksonAnnotationsInside;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.chelvc.framework.base.annotation.Versioning;
 import com.chelvc.framework.security.interceptor.JacksonEncryptSerializer;
+import com.fasterxml.jackson.annotation.JacksonAnnotationsInside;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 
 /**
  * 敏感数据加密

framework-security/src/main/java/com/chelvc/framework/security/interceptor/JacksonDesensitizeSerializer.java

@@ -4,6 +4,11 @@ import java.io.IOException;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
+import com.chelvc.framework.base.context.SessionContextHolder;
+import com.chelvc.framework.common.util.DesensitizeUtils;
+import com.chelvc.framework.common.util.ObjectUtils;
+import com.chelvc.framework.common.util.StringUtils;
+import com.chelvc.framework.security.annotation.Desensitize;
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.BeanProperty;
 import com.fasterxml.jackson.databind.JsonSerializer;
@@ -11,11 +16,6 @@ import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.ser.ContextualSerializer;
 import com.fasterxml.jackson.databind.ser.std.StdSerializer;
 import lombok.extern.slf4j.Slf4j;
-import com.chelvc.framework.base.context.SessionContextHolder;
-import com.chelvc.framework.common.util.DesensitizeUtils;
-import com.chelvc.framework.common.util.ObjectUtils;
-import com.chelvc.framework.common.util.StringUtils;
-import com.chelvc.framework.security.annotation.Desensitize;
 
 /**
  * 敏感数据脱敏序列化处理器

framework-security/src/main/java/com/chelvc/framework/security/interceptor/JacksonEncryptSerializer.java

@@ -2,17 +2,17 @@ package com.chelvc.framework.security.interceptor;
 
 import java.io.IOException;
 
+import com.chelvc.framework.base.context.SessionContextHolder;
+import com.chelvc.framework.common.util.ObjectUtils;
+import com.chelvc.framework.common.util.StringUtils;
+import com.chelvc.framework.security.annotation.Encrypt;
+import com.chelvc.framework.security.context.SecurityContextHolder;
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.BeanProperty;
 import com.fasterxml.jackson.databind.JsonSerializer;
 import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.ser.ContextualSerializer;
 import com.fasterxml.jackson.databind.ser.std.StdSerializer;
-import com.chelvc.framework.base.context.SessionContextHolder;
-import com.chelvc.framework.common.util.ObjectUtils;
-import com.chelvc.framework.common.util.StringUtils;
-import com.chelvc.framework.security.annotation.Encrypt;
-import com.chelvc.framework.security.context.SecurityContextHolder;
 
 /**
  * 敏感数据加密序列化处理器
@@ -21,12 +21,10 @@ import com.chelvc.framework.security.context.SecurityContextHolder;
  * @date 2023/1/1
  */
 public class JacksonEncryptSerializer extends StdSerializer<String> implements ContextualSerializer {
-    private boolean enabled;
-    private Encrypt annotation;
+    private boolean enabled = true;
 
     public JacksonEncryptSerializer() {
         super(String.class);
-        this.enabled = true;
     }
 
     /**
@@ -61,7 +59,7 @@ public class JacksonEncryptSerializer extends StdSerializer<String> implements C
 
     @Override
     public void serialize(String plaintext, JsonGenerator generator, SerializerProvider provider) throws IOException {
-        if (!this.enabled || this.annotation == null || StringUtils.isEmpty(plaintext)) {
+        if (!this.enabled || StringUtils.isEmpty(plaintext)) {
             generator.writeString(plaintext);
         } else {
             generator.writeString(SecurityContextHolder.encrypt(plaintext, true));
@@ -76,8 +74,8 @@ public class JacksonEncryptSerializer extends StdSerializer<String> implements C
         if (!this.isEncryptProperty(property)) {
             this.enabled = false;
         } else {
-            this.annotation = this.getEncryptAnnotation(property);
-            this.enabled = this.annotation != null && this.isVersioning(this.annotation);
+            Encrypt annotation = this.getEncryptAnnotation(property);
+            this.enabled = annotation == null || this.isVersioning(annotation);
         }
         return this;
     }

framework-security/src/main/java/com/chelvc/framework/security/interceptor/SecurityExceptionInterceptor.java

@@ -3,9 +3,9 @@ package com.chelvc.framework.security.interceptor;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import lombok.extern.slf4j.Slf4j;
 import com.chelvc.framework.base.context.SessionContextHolder;
 import com.chelvc.framework.base.model.Result;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.core.Ordered;
 import org.springframework.core.annotation.Order;
 import org.springframework.http.HttpStatus;

framework-sms/src/main/java/com/chelvc/framework/sms/support/AliyunSmsHandler.java

@@ -7,15 +7,15 @@ import com.aliyun.dysmsapi20170525.Client;
 import com.aliyun.dysmsapi20170525.models.SendSmsRequest;
 import com.aliyun.dysmsapi20170525.models.SendSmsResponse;
 import com.aliyun.dysmsapi20170525.models.SendSmsResponseBody;
-import com.google.common.collect.ImmutableMap;
-import lombok.NonNull;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
 import com.chelvc.framework.base.context.JacksonContextHolder;
 import com.chelvc.framework.base.exception.ResourceUnavailableException;
 import com.chelvc.framework.sms.Captcha;
 import com.chelvc.framework.sms.TemplateSmsHandler;
 import com.chelvc.framework.sms.config.AliyunSmsProperties;
+import com.google.common.collect.ImmutableMap;
+import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.stereotype.Component;

framework-sms/src/main/java/com/chelvc/framework/sms/support/DefaultCaptchaSmsHandler.java

@@ -7,10 +7,6 @@ import java.util.concurrent.ThreadLocalRandom;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
 
-import com.fasterxml.jackson.core.type.TypeReference;
-import lombok.NonNull;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
 import com.chelvc.framework.base.context.ApplicationContextHolder;
 import com.chelvc.framework.base.context.SessionContextHolder;
 import com.chelvc.framework.base.exception.ResourceUnavailableException;
@@ -21,6 +17,10 @@ import com.chelvc.framework.sms.CaptchaSmsHandler;
 import com.chelvc.framework.sms.SmsSession;
 import com.chelvc.framework.sms.TemplateSmsHandler;
 import com.chelvc.framework.sms.config.CaptchaSmsProperties;
+import com.fasterxml.jackson.core.type.TypeReference;
+import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.data.redis.core.RedisTemplate;

framework-sms/src/main/java/com/chelvc/framework/sms/support/LianluSmsHandler.java

@@ -3,13 +3,13 @@ package com.chelvc.framework.sms.support;
 import java.util.Map;
 import java.util.Objects;
 
+import com.chelvc.framework.common.util.CodecUtils;
+import com.chelvc.framework.sms.NormalSmsHandler;
+import com.chelvc.framework.sms.config.LianluSmsProperties;
 import com.google.common.collect.ImmutableMap;
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import com.chelvc.framework.common.util.CodecUtils;
-import com.chelvc.framework.sms.NormalSmsHandler;
-import com.chelvc.framework.sms.config.LianluSmsProperties;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.http.HttpEntity;

framework-sms/src/main/java/com/chelvc/framework/sms/support/TencentSmsHandler.java

@@ -3,16 +3,16 @@ package com.chelvc.framework.sms.support;
 import java.util.Arrays;
 import java.util.Map;
 
-import com.github.qcloudsms.SmsSingleSender;
-import com.github.qcloudsms.SmsSingleSenderResult;
-import lombok.NonNull;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
 import com.chelvc.framework.base.context.JacksonContextHolder;
 import com.chelvc.framework.base.exception.ResourceUnavailableException;
 import com.chelvc.framework.sms.Captcha;
 import com.chelvc.framework.sms.TemplateSmsHandler;
 import com.chelvc.framework.sms.config.TencentSmsProperties;
+import com.github.qcloudsms.SmsSingleSender;
+import com.github.qcloudsms.SmsSingleSenderResult;
+import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.stereotype.Component;

framework-sms/src/main/java/com/chelvc/framework/sms/support/TengyuSmsHandler.java

@@ -3,13 +3,13 @@ package com.chelvc.framework.sms.support;
 import java.util.Map;
 import java.util.Objects;
 
+import com.chelvc.framework.common.util.CodecUtils;
+import com.chelvc.framework.sms.NormalSmsHandler;
+import com.chelvc.framework.sms.config.TengyuSmsProperties;
 import com.google.common.collect.ImmutableMap;
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import com.chelvc.framework.common.util.CodecUtils;
-import com.chelvc.framework.sms.NormalSmsHandler;
-import com.chelvc.framework.sms.config.TengyuSmsProperties;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.http.HttpEntity;

framework-upload/src/main/java/com/chelvc/framework/upload/config/UploadConfigurer.java

@@ -1,5 +1,7 @@
 package com.chelvc.framework.upload.config;
 
+import com.chelvc.framework.base.config.HttpClientProperties;
+import com.chelvc.framework.common.util.StringUtils;
 import com.qcloud.cos.COSClient;
 import com.qcloud.cos.ClientConfig;
 import com.qcloud.cos.auth.BasicCOSCredentials;
@@ -7,8 +9,6 @@ import com.qcloud.cos.auth.COSCredentials;
 import com.qcloud.cos.http.HttpProtocol;
 import com.qcloud.cos.region.Region;
 import lombok.RequiredArgsConstructor;
-import com.chelvc.framework.base.config.HttpClientProperties;
-import com.chelvc.framework.common.util.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.context.annotation.Bean;

framework-upload/src/main/java/com/chelvc/framework/upload/support/StandardUploadHandler.java

@@ -3,13 +3,13 @@ package com.chelvc.framework.upload.support;
 import java.io.File;
 import java.io.InputStream;
 
-import lombok.NonNull;
-import lombok.RequiredArgsConstructor;
 import com.chelvc.framework.base.util.HttpUtils;
 import com.chelvc.framework.common.util.FileUtils;
 import com.chelvc.framework.common.util.StringUtils;
 import com.chelvc.framework.upload.UploadHandler;
 import com.chelvc.framework.upload.config.StandardUploadProperties;
+import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.stereotype.Component;

framework-upload/src/main/java/com/chelvc/framework/upload/support/TencentUploadHandler.java

@@ -3,14 +3,14 @@ package com.chelvc.framework.upload.support;
 import java.io.File;
 import java.io.InputStream;
 
-import com.qcloud.cos.COSClient;
-import com.qcloud.cos.model.ObjectMetadata;
-import lombok.NonNull;
-import lombok.RequiredArgsConstructor;
 import com.chelvc.framework.common.util.FileUtils;
 import com.chelvc.framework.common.util.StringUtils;
 import com.chelvc.framework.upload.UploadHandler;
 import com.chelvc.framework.upload.config.TencentUploadProperties;
+import com.qcloud.cos.COSClient;
+import com.qcloud.cos.model.ObjectMetadata;
+import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.stereotype.Component;

framework-wechat/src/main/java/com/chelvc/framework/wechat/DefaultWechatHandler.java

@@ -10,12 +10,6 @@ import java.util.function.Supplier;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 
-import com.github.wxpay.sdk.WXPayUtil;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Maps;
-import lombok.NonNull;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
 import com.chelvc.framework.base.context.ApplicationContextHolder;
 import com.chelvc.framework.base.context.SessionContextHolder;
 import com.chelvc.framework.common.util.DecimalUtils;
@@ -25,6 +19,12 @@ import com.chelvc.framework.common.util.StringUtils;
 import com.chelvc.framework.redis.context.RedisContextHolder;
 import com.chelvc.framework.wechat.config.WechatProperties;
 import com.chelvc.framework.wechat.context.WechatContextHolder;
+import com.github.wxpay.sdk.WXPayUtil;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Maps;
+import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.http.HttpEntity;

framework-wechat/src/main/java/com/chelvc/framework/wechat/DefaultWechatPublicHandler.java

@@ -17,16 +17,16 @@ import javax.crypto.Cipher;
 import javax.crypto.spec.IvParameterSpec;
 import javax.crypto.spec.SecretKeySpec;
 
-import com.google.common.collect.ImmutableMap;
-import lombok.NonNull;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
 import com.chelvc.framework.common.util.AESUtils;
 import com.chelvc.framework.common.util.AssertUtils;
 import com.chelvc.framework.common.util.ObjectUtils;
 import com.chelvc.framework.common.util.StringUtils;
 import com.chelvc.framework.wechat.config.WechatProperties;
 import com.chelvc.framework.wechat.context.WechatContextHolder;
+import com.google.common.collect.ImmutableMap;
+import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.codec.binary.Hex;
 import org.apache.commons.codec.digest.DigestUtils;

framework-wechat/src/main/java/com/chelvc/framework/wechat/WechatPublicOpenids.java

@@ -28,14 +28,17 @@ public class WechatPublicOpenids extends WechatResponse {
      * 总关注数
      */
     private Integer total;
+
     /**
      * 本次返回数
      */
     private Integer count;
+
     /**
      * openid列表
      */
     private Openids data;
+
     /**
      * 获取数据的起始openid
      */

framework-wechat/src/main/java/com/chelvc/framework/wechat/config/WechatConfigurer.java

@@ -1,10 +1,10 @@
 package com.chelvc.framework.wechat.config;
 
-import lombok.RequiredArgsConstructor;
 import com.chelvc.framework.common.util.StringUtils;
 import com.chelvc.framework.wechat.DefaultWechatPublicHandler;
 import com.chelvc.framework.wechat.WechatHandler;
 import com.chelvc.framework.wechat.WechatPublicHandler;
+import lombok.RequiredArgsConstructor;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.BeanPostProcessor;

framework-wechat/src/main/java/com/chelvc/framework/wechat/config/WechatProperties.java

@@ -3,8 +3,8 @@ package com.chelvc.framework.wechat.config;
 import java.util.Collections;
 import java.util.List;
 
-import lombok.Data;
 import com.chelvc.framework.wechat.PayMode;
+import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Configuration;
 

framework-wechat/src/main/java/com/chelvc/framework/wechat/context/WechatContextHolder.java

@@ -5,15 +5,15 @@ import java.util.Objects;
 import java.util.function.BiFunction;
 import java.util.function.Supplier;
 
-import com.github.wxpay.sdk.WXPayUtil;
-import lombok.NonNull;
-import lombok.extern.slf4j.Slf4j;
 import com.chelvc.framework.base.context.ApplicationContextHolder;
 import com.chelvc.framework.base.context.JacksonContextHolder;
 import com.chelvc.framework.common.util.AESUtils;
 import com.chelvc.framework.common.util.ObjectUtils;
 import com.chelvc.framework.wechat.WechatPublicHandler;
 import com.chelvc.framework.wechat.WechatResponse;
+import com.github.wxpay.sdk.WXPayUtil;
+import lombok.NonNull;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.codec.binary.Base64;
 
 /**