Commit 5bb19619 authored by liaozan's avatar liaozan 🏀

Apply format

parent dbf33816
...@@ -8,9 +8,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; ...@@ -8,9 +8,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.boot.context.properties.NestedConfigurationProperty; import org.springframework.boot.context.properties.NestedConfigurationProperty;
import org.springframework.core.annotation.MergedAnnotation; import org.springframework.core.annotation.MergedAnnotation;
import java.util.Collections; import java.util.*;
import java.util.LinkedHashMap;
import java.util.Map;
/** /**
* @author liaozan * @author liaozan
......
...@@ -4,16 +4,11 @@ import cn.hutool.poi.excel.ExcelUtil; ...@@ -4,16 +4,11 @@ import cn.hutool.poi.excel.ExcelUtil;
import com.alibaba.excel.EasyExcel; import com.alibaba.excel.EasyExcel;
import com.schbrain.common.util.support.excel.bean.ExcelReadResult; import com.schbrain.common.util.support.excel.bean.ExcelReadResult;
import com.schbrain.common.util.support.excel.exception.ExcelException; import com.schbrain.common.util.support.excel.exception.ExcelException;
import com.schbrain.common.util.support.excel.listener.ExcelBeanReadListener; import com.schbrain.common.util.support.excel.listener.*;
import com.schbrain.common.util.support.excel.listener.ExcelMapDataReadListener;
import com.schbrain.common.util.support.excel.listener.ExcelReadListenerBase;
import com.schbrain.common.util.support.excel.listener.HierarchicalDataReadListener;
import com.schbrain.common.util.support.excel.listener.HierarchicalDataReadListener.ImportedRecord; import com.schbrain.common.util.support.excel.listener.HierarchicalDataReadListener.ImportedRecord;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
import java.io.File; import java.io.*;
import java.io.InputStream;
import java.io.OutputStream;
import java.nio.file.Path; import java.nio.file.Path;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
......
...@@ -4,10 +4,7 @@ import lombok.Data; ...@@ -4,10 +4,7 @@ import lombok.Data;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import java.io.IOException; import java.io.IOException;
import java.net.Inet4Address; import java.net.*;
import java.net.InetAddress;
import java.net.NetworkInterface;
import java.net.UnknownHostException;
import java.util.Enumeration; import java.util.Enumeration;
/** /**
......
...@@ -2,10 +2,7 @@ package com.schbrain.common.util; ...@@ -2,10 +2,7 @@ package com.schbrain.common.util;
import cn.hutool.extra.spring.SpringUtil; import cn.hutool.extra.spring.SpringUtil;
import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.*;
import com.fasterxml.jackson.databind.JavaType;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.NullNode; import com.fasterxml.jackson.databind.node.NullNode;
import com.schbrain.common.util.exception.JSONException; import com.schbrain.common.util.exception.JSONException;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
...@@ -14,10 +11,7 @@ import org.apache.commons.lang3.StringUtils; ...@@ -14,10 +11,7 @@ import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.reflect.TypeUtils; import org.apache.commons.lang3.reflect.TypeUtils;
import java.lang.reflect.ParameterizedType; import java.lang.reflect.ParameterizedType;
import java.util.ArrayList; import java.util.*;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import static com.fasterxml.jackson.databind.SerializationFeature.INDENT_OUTPUT; import static com.fasterxml.jackson.databind.SerializationFeature.INDENT_OUTPUT;
......
...@@ -9,7 +9,8 @@ import java.util.Collections; ...@@ -9,7 +9,8 @@ import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.function.Function; import java.util.function.Function;
import static com.schbrain.common.constants.PageConstants.*; import static com.schbrain.common.constants.PageConstants.DEFAULT_SEARCH_COUNT;
import static com.schbrain.common.constants.PageConstants.DEFAULT_TOTAL_COUNT;
/** /**
* @author liaozan * @author liaozan
......
...@@ -5,13 +5,8 @@ import lombok.extern.slf4j.Slf4j; ...@@ -5,13 +5,8 @@ import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import java.util.*; import java.util.*;
import java.util.function.Function; import java.util.function.*;
import java.util.function.Predicate; import java.util.stream.*;
import java.util.function.Supplier;
import java.util.stream.Collector;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import java.util.stream.StreamSupport;
import static java.util.Collections.emptyList; import static java.util.Collections.emptyList;
import static java.util.stream.Collectors.*; import static java.util.stream.Collectors.*;
......
...@@ -2,14 +2,10 @@ package com.schbrain.common.util.support; ...@@ -2,14 +2,10 @@ package com.schbrain.common.util.support;
import cn.hutool.core.text.StrPool; import cn.hutool.core.text.StrPool;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.validation.BindingResult; import org.springframework.validation.*;
import org.springframework.validation.FieldError;
import org.springframework.validation.ObjectError;
import javax.validation.ConstraintViolation; import javax.validation.ConstraintViolation;
import java.util.Optional; import java.util.*;
import java.util.Set;
import java.util.StringJoiner;
/** /**
* @author liaozan * @author liaozan
......
...@@ -4,9 +4,7 @@ import cn.hutool.core.text.StrPool; ...@@ -4,9 +4,7 @@ import cn.hutool.core.text.StrPool;
import cn.hutool.extra.spring.SpringUtil; import cn.hutool.extra.spring.SpringUtil;
import com.schbrain.common.exception.BaseException; import com.schbrain.common.exception.BaseException;
import com.schbrain.common.util.ApplicationName; import com.schbrain.common.util.ApplicationName;
import org.redisson.api.RBlockingQueue; import org.redisson.api.*;
import org.redisson.api.RDelayedQueue;
import org.redisson.api.RedissonClient;
import org.springframework.beans.BeansException; import org.springframework.beans.BeansException;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
...@@ -101,4 +99,4 @@ public class DelayedQueueUtils { ...@@ -101,4 +99,4 @@ public class DelayedQueueUtils {
return String.join(StrPool.COLON, APPLICATION_NAME, "delay-queue", queueName); return String.join(StrPool.COLON, APPLICATION_NAME, "delay-queue", queueName);
} }
} }
\ No newline at end of file
...@@ -10,10 +10,7 @@ import com.schbrain.common.util.support.excel.exception.ExcelException; ...@@ -10,10 +10,7 @@ import com.schbrain.common.util.support.excel.exception.ExcelException;
import lombok.*; import lombok.*;
import javax.validation.Validator; import javax.validation.Validator;
import java.util.HashMap; import java.util.*;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
/** /**
* @author liaozan * @author liaozan
......
...@@ -5,14 +5,13 @@ import com.google.common.collect.HashBasedTable; ...@@ -5,14 +5,13 @@ import com.google.common.collect.HashBasedTable;
import com.google.common.collect.Table; import com.google.common.collect.Table;
import com.schbrain.common.util.support.excel.exception.ExcelException; import com.schbrain.common.util.support.excel.exception.ExcelException;
import lombok.Data; import lombok.Data;
import lombok.Getter;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.collections4.MapUtils; import org.apache.commons.collections4.MapUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import java.util.LinkedList; import java.util.*;
import java.util.List;
import java.util.Map;
/** /**
* 层级数据 excel 读取类 * 层级数据 excel 读取类
...@@ -23,6 +22,7 @@ import java.util.Map; ...@@ -23,6 +22,7 @@ import java.util.Map;
@Slf4j @Slf4j
public class HierarchicalDataReadListener extends ExcelReadListenerBase<Map<Integer, String>> { public class HierarchicalDataReadListener extends ExcelReadListenerBase<Map<Integer, String>> {
@Getter
private final List<ImportedRecord> importedRecords = new LinkedList<>(); private final List<ImportedRecord> importedRecords = new LinkedList<>();
private final Table<Integer, Integer, ImportedRecord> coordinateTable = HashBasedTable.create(); private final Table<Integer, Integer, ImportedRecord> coordinateTable = HashBasedTable.create();
...@@ -52,10 +52,6 @@ public class HierarchicalDataReadListener extends ExcelReadListenerBase<Map<Inte ...@@ -52,10 +52,6 @@ public class HierarchicalDataReadListener extends ExcelReadListenerBase<Map<Inte
return true; return true;
} }
public List<ImportedRecord> getImportedRecords() {
return importedRecords;
}
protected void buildImportedRow(Integer rowIndex, Integer columnIndex, String text) { protected void buildImportedRow(Integer rowIndex, Integer columnIndex, String text) {
ImportedRecord importedRecord = new ImportedRecord(); ImportedRecord importedRecord = new ImportedRecord();
importedRecord.setText(text); importedRecord.setText(text);
...@@ -91,4 +87,4 @@ public class HierarchicalDataReadListener extends ExcelReadListenerBase<Map<Inte ...@@ -91,4 +87,4 @@ public class HierarchicalDataReadListener extends ExcelReadListenerBase<Map<Inte
} }
} }
\ No newline at end of file
...@@ -2,16 +2,10 @@ package com.schbrain.common.util.support.jackson; ...@@ -2,16 +2,10 @@ package com.schbrain.common.util.support.jackson;
import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.DatePattern;
import com.fasterxml.jackson.databind.module.SimpleModule; import com.fasterxml.jackson.databind.module.SimpleModule;
import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateDeserializer; import com.fasterxml.jackson.datatype.jsr310.deser.*;
import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer; import com.fasterxml.jackson.datatype.jsr310.ser.*;
import com.fasterxml.jackson.datatype.jsr310.deser.LocalTimeDeserializer;
import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateSerializer; import java.time.*;
import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
import com.fasterxml.jackson.datatype.jsr310.ser.LocalTimeSerializer;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
/** /**
* @author liaozan * @author liaozan
......
...@@ -3,9 +3,7 @@ package com.schbrain.common.enums; ...@@ -3,9 +3,7 @@ package com.schbrain.common.enums;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;
import java.util.Arrays; import java.util.*;
import java.util.Objects;
import java.util.Set;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
......
...@@ -9,9 +9,7 @@ import com.schbrain.framework.dao.BaseDao; ...@@ -9,9 +9,7 @@ import com.schbrain.framework.dao.BaseDao;
import com.schbrain.framework.dao.util.SQLUtil; import com.schbrain.framework.dao.util.SQLUtil;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import java.util.Collections; import java.util.*;
import java.util.LinkedList;
import java.util.List;
/** /**
* @author hzchengyi * @author hzchengyi
...@@ -374,4 +372,4 @@ public class TreeNodeDao<NODE extends TreeNode> { ...@@ -374,4 +372,4 @@ public class TreeNodeDao<NODE extends TreeNode> {
} }
} }
} }
\ No newline at end of file
package com.schbrain.common.web; package com.schbrain.common.web;
import com.schbrain.common.web.exception.DefaultExceptionTranslator; import com.schbrain.common.web.exception.*;
import com.schbrain.common.web.exception.ExceptionHandingWebMvcConfigurer;
import com.schbrain.common.web.exception.ExceptionTranslator;
import com.schbrain.common.web.exception.GlobalExceptionHandler;
import com.schbrain.common.web.properties.WebProperties; import com.schbrain.common.web.properties.WebProperties;
import com.schbrain.common.web.result.ResponseDTO; import com.schbrain.common.web.result.ResponseDTO;
import org.springframework.beans.factory.ObjectProvider; import org.springframework.beans.factory.ObjectProvider;
......
package com.schbrain.common.web; package com.schbrain.common.web;
import com.schbrain.common.web.properties.WebProperties; import com.schbrain.common.web.properties.WebProperties;
import com.schbrain.common.web.servlet.CharacterEncodingServletContextInitializer; import com.schbrain.common.web.servlet.*;
import com.schbrain.common.web.servlet.RequestLoggingFilter;
import com.schbrain.common.web.servlet.TraceIdInitializeServletListener;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.web.servlet.filter.OrderedRequestContextFilter; import org.springframework.boot.web.servlet.filter.OrderedRequestContextFilter;
......
...@@ -7,15 +7,11 @@ import com.schbrain.common.web.support.converter.datetime.DateTimeConvertersWebM ...@@ -7,15 +7,11 @@ import com.schbrain.common.web.support.converter.datetime.DateTimeConvertersWebM
import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.ObjectProvider; import org.springframework.beans.factory.ObjectProvider;
import org.springframework.boot.autoconfigure.AutoConfigurationPackages; import org.springframework.boot.autoconfigure.AutoConfigurationPackages;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.*;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication.Type; import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication.Type;
import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.boot.web.client.RestTemplateBuilder; import org.springframework.boot.web.client.RestTemplateBuilder;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.*;
import org.springframework.context.annotation.Import;
import org.springframework.context.annotation.Lazy;
import org.springframework.web.client.RestTemplate; import org.springframework.web.client.RestTemplate;
import java.util.List; import java.util.List;
......
package com.schbrain.common.web.argument; package com.schbrain.common.web.argument;
import com.fasterxml.jackson.databind.JavaType; import com.fasterxml.jackson.databind.*;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.schbrain.common.util.JacksonUtils; import com.schbrain.common.util.JacksonUtils;
import com.schbrain.common.web.annotation.BodyParam; import com.schbrain.common.web.annotation.BodyParam;
import lombok.Setter; import lombok.Setter;
......
...@@ -5,9 +5,7 @@ import lombok.extern.slf4j.Slf4j; ...@@ -5,9 +5,7 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.web.context.request.ServletWebRequest; import org.springframework.web.context.request.ServletWebRequest;
import org.springframework.web.method.HandlerMethod; import org.springframework.web.method.HandlerMethod;
import org.springframework.web.method.annotation.ExceptionHandlerMethodResolver; import org.springframework.web.method.annotation.ExceptionHandlerMethodResolver;
import org.springframework.web.method.support.HandlerMethodArgumentResolverComposite; import org.springframework.web.method.support.*;
import org.springframework.web.method.support.HandlerMethodReturnValueHandlerComposite;
import org.springframework.web.method.support.ModelAndViewContainer;
import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.ModelAndView;
import org.springframework.web.servlet.handler.AbstractHandlerMethodExceptionResolver; import org.springframework.web.servlet.handler.AbstractHandlerMethodExceptionResolver;
import org.springframework.web.servlet.mvc.method.annotation.ExceptionHandlerExceptionResolver; import org.springframework.web.servlet.mvc.method.annotation.ExceptionHandlerExceptionResolver;
...@@ -17,9 +15,7 @@ import javax.annotation.Nullable; ...@@ -17,9 +15,7 @@ import javax.annotation.Nullable;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.util.ArrayList; import java.util.*;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import static com.schbrain.common.web.utils.HandlerMethodAnnotationUtils.getAnnotation; import static com.schbrain.common.web.utils.HandlerMethodAnnotationUtils.getAnnotation;
......
...@@ -11,13 +11,9 @@ import org.springframework.http.HttpStatus; ...@@ -11,13 +11,9 @@ import org.springframework.http.HttpStatus;
import org.springframework.http.converter.HttpMessageNotReadableException; import org.springframework.http.converter.HttpMessageNotReadableException;
import org.springframework.util.ClassUtils; import org.springframework.util.ClassUtils;
import org.springframework.validation.BindException; import org.springframework.validation.BindException;
import org.springframework.web.HttpMediaTypeNotAcceptableException; import org.springframework.web.*;
import org.springframework.web.HttpMediaTypeNotSupportedException;
import org.springframework.web.HttpRequestMethodNotSupportedException;
import org.springframework.web.bind.*; import org.springframework.web.bind.*;
import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.ResponseStatus;
import org.springframework.web.context.request.async.AsyncRequestTimeoutException; import org.springframework.web.context.request.async.AsyncRequestTimeoutException;
import org.springframework.web.method.annotation.MethodArgumentTypeMismatchException; import org.springframework.web.method.annotation.MethodArgumentTypeMismatchException;
import org.springframework.web.multipart.support.MissingServletRequestPartException; import org.springframework.web.multipart.support.MissingServletRequestPartException;
...@@ -28,8 +24,10 @@ import java.sql.SQLException; ...@@ -28,8 +24,10 @@ import java.sql.SQLException;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import static com.schbrain.common.constants.ResponseCodeConstants.*; import static com.schbrain.common.constants.ResponseCodeConstants.PARAM_INVALID;
import static com.schbrain.common.util.support.ValidationMessageBuilder.*; import static com.schbrain.common.constants.ResponseCodeConstants.SERVER_ERROR;
import static com.schbrain.common.util.support.ValidationMessageBuilder.buildBindingErrorMsg;
import static com.schbrain.common.util.support.ValidationMessageBuilder.buildConstraintViolationErrorMsg;
/** /**
* @author liaozan * @author liaozan
......
...@@ -14,7 +14,8 @@ import javax.servlet.http.HttpServletRequest; ...@@ -14,7 +14,8 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.IOException; import java.io.IOException;
import static com.schbrain.common.web.utils.RequestContentCachingUtils.*; import static com.schbrain.common.web.utils.RequestContentCachingUtils.getRequestBody;
import static com.schbrain.common.web.utils.RequestContentCachingUtils.wrapIfRequired;
/** /**
* 请求日志拦截器 * 请求日志拦截器
......
...@@ -3,17 +3,12 @@ package com.schbrain.maven.plugin.mojo; ...@@ -3,17 +3,12 @@ package com.schbrain.maven.plugin.mojo;
import org.apache.maven.execution.MavenSession; import org.apache.maven.execution.MavenSession;
import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugins.annotations.LifecyclePhase; import org.apache.maven.plugins.annotations.*;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.plugins.annotations.ResolutionScope;
import org.apache.maven.project.MavenProject; import org.apache.maven.project.MavenProject;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.nio.file.Files; import java.nio.file.*;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
...@@ -202,4 +197,4 @@ public class PrepareMojo extends AbstractMojo { ...@@ -202,4 +197,4 @@ public class PrepareMojo extends AbstractMojo {
return builder.deleteCharAt(builder.length() - 1).toString(); return builder.deleteCharAt(builder.length() - 1).toString();
} }
} }
\ No newline at end of file
...@@ -17,7 +17,8 @@ import java.util.Map; ...@@ -17,7 +17,8 @@ import java.util.Map;
import static com.ctrip.framework.apollo.core.ApolloClientSystemConsts.*; import static com.ctrip.framework.apollo.core.ApolloClientSystemConsts.*;
import static com.ctrip.framework.apollo.core.ConfigConsts.APOLLO_META_KEY; import static com.ctrip.framework.apollo.core.ConfigConsts.APOLLO_META_KEY;
import static com.ctrip.framework.apollo.spring.config.PropertySourcesConstants.*; import static com.ctrip.framework.apollo.spring.config.PropertySourcesConstants.APOLLO_BOOTSTRAP_EAGER_LOAD_ENABLED;
import static com.ctrip.framework.apollo.spring.config.PropertySourcesConstants.APOLLO_BOOTSTRAP_ENABLED;
/** /**
* @author liaozan * @author liaozan
......
package com.schbrain.framework.autoconfigure.apollo.event.listener; package com.schbrain.framework.autoconfigure.apollo.event.listener;
import com.schbrain.framework.autoconfigure.apollo.event.ConfigLoadedEvent; import com.schbrain.framework.autoconfigure.apollo.event.ConfigLoadedEvent;
import org.springframework.context.ApplicationContextInitializer; import org.springframework.context.*;
import org.springframework.context.ApplicationListener;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.core.Ordered; import org.springframework.core.Ordered;
/** /**
......
...@@ -3,15 +3,14 @@ package com.schbrain.framework.autoconfigure.apollo.util; ...@@ -3,15 +3,14 @@ package com.schbrain.framework.autoconfigure.apollo.util;
import com.schbrain.framework.autoconfigure.apollo.properties.ApolloProperties; import com.schbrain.framework.autoconfigure.apollo.properties.ApolloProperties;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
import org.springframework.boot.DefaultPropertiesPropertySource; import org.springframework.boot.DefaultPropertiesPropertySource;
import org.springframework.core.env.ConfigurableEnvironment; import org.springframework.core.env.*;
import org.springframework.core.env.MutablePropertySources;
import org.springframework.core.env.PropertySource;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import static com.ctrip.framework.apollo.spring.config.PropertySourcesConstants.*; import static com.ctrip.framework.apollo.spring.config.PropertySourcesConstants.APOLLO_BOOTSTRAP_PROPERTY_SOURCE_NAME;
import static com.ctrip.framework.apollo.spring.config.PropertySourcesConstants.APOLLO_PROPERTY_SOURCE_NAME;
/** /**
* @author liaozan * @author liaozan
......
package com.schbrain.framework.autoconfigure.cache.provider; package com.schbrain.framework.autoconfigure.cache.provider;
import java.time.Duration; import java.time.Duration;
import java.util.Collection; import java.util.*;
import java.util.List;
import java.util.Map;
import java.util.Set;
/** /**
* @author zhuyf * @author zhuyf
......
package com.schbrain.framework.autoconfigure.cache.provider.redis; package com.schbrain.framework.autoconfigure.cache.provider.redis;
import org.springframework.beans.factory.ObjectProvider; import org.springframework.beans.factory.ObjectProvider;
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.*;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.data.redis.connection.RedisConnectionFactory; import org.springframework.data.redis.connection.RedisConnectionFactory;
......
...@@ -6,10 +6,7 @@ import com.schbrain.common.util.JacksonUtils; ...@@ -6,10 +6,7 @@ import com.schbrain.common.util.JacksonUtils;
import com.schbrain.framework.autoconfigure.cache.exception.CacheException; import com.schbrain.framework.autoconfigure.cache.exception.CacheException;
import com.schbrain.framework.autoconfigure.cache.provider.CacheOperation; import com.schbrain.framework.autoconfigure.cache.provider.CacheOperation;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.data.redis.core.Cursor; import org.springframework.data.redis.core.*;
import org.springframework.data.redis.core.RedisCallback;
import org.springframework.data.redis.core.ScanOptions;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.data.redis.serializer.RedisSerializer; import org.springframework.data.redis.serializer.RedisSerializer;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
......
...@@ -4,9 +4,7 @@ import cn.hutool.core.text.StrFormatter; ...@@ -4,9 +4,7 @@ import cn.hutool.core.text.StrFormatter;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import com.schbrain.common.util.EnvUtils; import com.schbrain.common.util.EnvUtils;
import com.schbrain.framework.support.spring.LoggerAwareEnvironmentPostProcessor; import com.schbrain.framework.support.spring.LoggerAwareEnvironmentPostProcessor;
import org.springframework.boot.ConfigurableBootstrapContext; import org.springframework.boot.*;
import org.springframework.boot.DefaultPropertiesPropertySource;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.logging.DeferredLogFactory; import org.springframework.boot.logging.DeferredLogFactory;
import org.springframework.core.env.ConfigurableEnvironment; import org.springframework.core.env.ConfigurableEnvironment;
import org.springframework.util.ClassUtils; import org.springframework.util.ClassUtils;
......
...@@ -4,10 +4,7 @@ import com.alibaba.fastjson2.JSONFactory; ...@@ -4,10 +4,7 @@ import com.alibaba.fastjson2.JSONFactory;
import org.apache.dubbo.common.beans.factory.ScopeBeanFactory; import org.apache.dubbo.common.beans.factory.ScopeBeanFactory;
import org.apache.dubbo.common.utils.SerializeCheckStatus; import org.apache.dubbo.common.utils.SerializeCheckStatus;
import org.apache.dubbo.common.utils.SerializeSecurityManager; import org.apache.dubbo.common.utils.SerializeSecurityManager;
import org.apache.dubbo.rpc.model.ApplicationModel; import org.apache.dubbo.rpc.model.*;
import org.apache.dubbo.rpc.model.FrameworkModel;
import org.apache.dubbo.rpc.model.ModuleModel;
import org.apache.dubbo.rpc.model.ScopeModelInitializer;
/** /**
* @author liaozan * @author liaozan
...@@ -39,4 +36,4 @@ public class DubboSerializeCheckScopeModelInitializer implements ScopeModelIniti ...@@ -39,4 +36,4 @@ public class DubboSerializeCheckScopeModelInitializer implements ScopeModelIniti
} }
} }
\ No newline at end of file
...@@ -3,9 +3,7 @@ package com.schbrain.framework.autoconfigure.kafka; ...@@ -3,9 +3,7 @@ package com.schbrain.framework.autoconfigure.kafka;
import com.schbrain.common.util.EnvUtils; import com.schbrain.common.util.EnvUtils;
import com.schbrain.framework.autoconfigure.kafka.properties.KafkaProperties; import com.schbrain.framework.autoconfigure.kafka.properties.KafkaProperties;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.kafka.config.KafkaListenerContainerFactory; import org.springframework.kafka.config.*;
import org.springframework.kafka.config.KafkaListenerEndpoint;
import org.springframework.kafka.config.KafkaListenerEndpointRegistry;
/** /**
* @author liaozan * @author liaozan
......
...@@ -3,16 +3,11 @@ package com.schbrain.framework.autoconfigure.logger; ...@@ -3,16 +3,11 @@ package com.schbrain.framework.autoconfigure.logger;
import ch.qos.logback.classic.Logger; import ch.qos.logback.classic.Logger;
import ch.qos.logback.classic.LoggerContext; import ch.qos.logback.classic.LoggerContext;
import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.classic.spi.ILoggingEvent;
import ch.qos.logback.core.Appender; import ch.qos.logback.core.*;
import ch.qos.logback.core.ConsoleAppender;
import ch.qos.logback.core.Context;
import ch.qos.logback.core.FileAppender;
import ch.qos.logback.core.rolling.RollingFileAppender; import ch.qos.logback.core.rolling.RollingFileAppender;
import ch.qos.logback.core.rolling.TimeBasedRollingPolicy; import ch.qos.logback.core.rolling.TimeBasedRollingPolicy;
import cn.hutool.json.JSONObject; import cn.hutool.json.JSONObject;
import com.schbrain.common.util.ApplicationName; import com.schbrain.common.util.*;
import com.schbrain.common.util.EnvUtils;
import com.schbrain.common.util.HostInfoHolder;
import com.schbrain.common.util.HostInfoHolder.HostInfo; import com.schbrain.common.util.HostInfoHolder.HostInfo;
import com.schbrain.framework.autoconfigure.logger.logstash.EnhancedLogstashEncoder; import com.schbrain.framework.autoconfigure.logger.logstash.EnhancedLogstashEncoder;
import com.schbrain.framework.autoconfigure.logger.properties.LoggingProperties; import com.schbrain.framework.autoconfigure.logger.properties.LoggingProperties;
......
...@@ -5,13 +5,12 @@ import com.ctrip.framework.apollo.enums.PropertyChangeType; ...@@ -5,13 +5,12 @@ import com.ctrip.framework.apollo.enums.PropertyChangeType;
import com.ctrip.framework.apollo.model.ConfigChange; import com.ctrip.framework.apollo.model.ConfigChange;
import com.ctrip.framework.apollo.model.ConfigChangeEvent; import com.ctrip.framework.apollo.model.ConfigChangeEvent;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.boot.logging.LogLevel; import org.springframework.boot.logging.*;
import org.springframework.boot.logging.LoggerConfiguration;
import org.springframework.boot.logging.LoggingSystem;
import java.util.Set; import java.util.Set;
import static com.ctrip.framework.apollo.enums.PropertyChangeType.*; import static com.ctrip.framework.apollo.enums.PropertyChangeType.ADDED;
import static com.ctrip.framework.apollo.enums.PropertyChangeType.MODIFIED;
import static org.springframework.boot.logging.LoggingSystem.ROOT_LOGGER_NAME; import static org.springframework.boot.logging.LoggingSystem.ROOT_LOGGER_NAME;
/** /**
......
...@@ -20,9 +20,7 @@ import org.springframework.context.ConfigurableApplicationContext; ...@@ -20,9 +20,7 @@ import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.core.env.ConfigurableEnvironment; import org.springframework.core.env.ConfigurableEnvironment;
import java.io.IOException; import java.io.IOException;
import java.nio.file.Files; import java.nio.file.*;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.Map; import java.util.Map;
import static org.springframework.boot.context.logging.LoggingApplicationListener.CONFIG_PROPERTY; import static org.springframework.boot.context.logging.LoggingApplicationListener.CONFIG_PROPERTY;
......
...@@ -12,13 +12,9 @@ import com.schbrain.framework.autoconfigure.mybatis.configuration.MybatisPlusGlo ...@@ -12,13 +12,9 @@ import com.schbrain.framework.autoconfigure.mybatis.configuration.MybatisPlusGlo
import com.schbrain.framework.autoconfigure.mybatis.datasource.DataSourceConnectionPostProcessor; import com.schbrain.framework.autoconfigure.mybatis.datasource.DataSourceConnectionPostProcessor;
import com.schbrain.framework.autoconfigure.mybatis.datasource.customizer.DataSourceCustomizer; import com.schbrain.framework.autoconfigure.mybatis.datasource.customizer.DataSourceCustomizer;
import com.schbrain.framework.autoconfigure.mybatis.datasource.customizer.DefaultDataSourceCustomizer; import com.schbrain.framework.autoconfigure.mybatis.datasource.customizer.DefaultDataSourceCustomizer;
import com.schbrain.framework.autoconfigure.mybatis.datasource.extractor.DataSourcePropertiesExtractor; import com.schbrain.framework.autoconfigure.mybatis.datasource.extractor.*;
import com.schbrain.framework.autoconfigure.mybatis.datasource.extractor.DruidDataSourcePropertiesExtractor;
import com.schbrain.framework.autoconfigure.mybatis.datasource.extractor.HikariDataSourcePropertiesExtractor;
import com.schbrain.framework.autoconfigure.mybatis.listener.TableConstraintCheckerBean; import com.schbrain.framework.autoconfigure.mybatis.listener.TableConstraintCheckerBean;
import com.schbrain.framework.autoconfigure.mybatis.properties.DataSourceConnectionProperties; import com.schbrain.framework.autoconfigure.mybatis.properties.*;
import com.schbrain.framework.autoconfigure.mybatis.properties.DataSourceProperties;
import com.schbrain.framework.autoconfigure.mybatis.properties.MybatisProperties;
import com.schbrain.framework.autoconfigure.mybatis.sql.injector.DefaultMethodSqlInjector; import com.schbrain.framework.autoconfigure.mybatis.sql.injector.DefaultMethodSqlInjector;
import org.springframework.beans.factory.ObjectProvider; import org.springframework.beans.factory.ObjectProvider;
import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.config.BeanDefinition;
...@@ -26,9 +22,7 @@ import org.springframework.boot.autoconfigure.AutoConfiguration; ...@@ -26,9 +22,7 @@ import org.springframework.boot.autoconfigure.AutoConfiguration;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnSingleCandidate; import org.springframework.boot.autoconfigure.condition.ConditionalOnSingleCandidate;
import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.*;
import org.springframework.context.annotation.Import;
import org.springframework.context.annotation.Role;
import javax.sql.DataSource; import javax.sql.DataSource;
import java.util.List; import java.util.List;
...@@ -101,4 +95,4 @@ public class MybatisAutoConfiguration { ...@@ -101,4 +95,4 @@ public class MybatisAutoConfiguration {
return new DataSourceConnectionPostProcessor(dataSourceCustomizers, connectionProperties); return new DataSourceConnectionPostProcessor(dataSourceCustomizers, connectionProperties);
} }
} }
\ No newline at end of file
package com.schbrain.framework.autoconfigure.mybatis.base; package com.schbrain.framework.autoconfigure.mybatis.base;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.schbrain.framework.autoconfigure.mybatis.constant.MybatisConstants; import com.schbrain.framework.autoconfigure.mybatis.constant.MybatisConstants;
import lombok.Data; import lombok.Data;
......
...@@ -3,9 +3,7 @@ package com.schbrain.framework.autoconfigure.mybatis.base; ...@@ -3,9 +3,7 @@ package com.schbrain.framework.autoconfigure.mybatis.base;
import com.baomidou.mybatisplus.core.toolkit.support.SFunction; import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import java.util.Collection; import java.util.*;
import java.util.List;
import java.util.Map;
import java.util.function.Supplier; import java.util.function.Supplier;
public interface BaseService<T extends BaseEntity> extends IService<T> { public interface BaseService<T extends BaseEntity> extends IService<T> {
......
...@@ -20,12 +20,11 @@ import org.springframework.util.ReflectionUtils; ...@@ -20,12 +20,11 @@ import org.springframework.util.ReflectionUtils;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import java.io.Serializable; import java.io.Serializable;
import java.util.Collection; import java.util.*;
import java.util.List;
import java.util.Map;
import java.util.function.Supplier; import java.util.function.Supplier;
import static java.util.Collections.*; import static java.util.Collections.emptyList;
import static java.util.Collections.emptyMap;
/** /**
* @author liaozan * @author liaozan
......
package com.schbrain.framework.autoconfigure.mybatis.biz; package com.schbrain.framework.autoconfigure.mybatis.biz;
import com.baomidou.mybatisplus.core.metadata.TableFieldInfo; import com.baomidou.mybatisplus.core.metadata.*;
import com.baomidou.mybatisplus.core.metadata.TableInfo;
import com.baomidou.mybatisplus.core.metadata.TableInfoHelper;
import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.schbrain.common.exception.BaseException; import com.schbrain.common.exception.BaseException;
import com.schbrain.framework.autoconfigure.mybatis.annotation.BizId; import com.schbrain.framework.autoconfigure.mybatis.annotation.BizId;
...@@ -54,4 +52,4 @@ public class BizIdHelper { ...@@ -54,4 +52,4 @@ public class BizIdHelper {
return fieldInfoList.get(0); return fieldInfoList.get(0);
} }
} }
\ No newline at end of file
...@@ -3,10 +3,7 @@ package com.schbrain.framework.autoconfigure.mybatis.constraint; ...@@ -3,10 +3,7 @@ package com.schbrain.framework.autoconfigure.mybatis.constraint;
import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.jdbc.core.RowMapper; import org.springframework.jdbc.core.RowMapper;
import java.util.ArrayList; import java.util.*;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/** /**
* @author liaozan * @author liaozan
...@@ -36,4 +33,4 @@ public class DefaultTableMetaDataLoader implements TableMetaDataLoader { ...@@ -36,4 +33,4 @@ public class DefaultTableMetaDataLoader implements TableMetaDataLoader {
return metaMap; return metaMap;
} }
} }
\ No newline at end of file
...@@ -9,9 +9,7 @@ import lombok.Getter; ...@@ -9,9 +9,7 @@ import lombok.Getter;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import java.util.ArrayList; import java.util.*;
import java.util.List;
import java.util.Map;
/** /**
* @author liaozan * @author liaozan
...@@ -65,4 +63,4 @@ public class Table { ...@@ -65,4 +63,4 @@ public class Table {
} }
} }
\ No newline at end of file
package com.schbrain.framework.autoconfigure.mybatis.core; package com.schbrain.framework.autoconfigure.mybatis.core;
import org.apache.ibatis.mapping.BoundSql; import org.apache.ibatis.mapping.*;
import org.apache.ibatis.mapping.ParameterMapping;
import org.apache.ibatis.mapping.SqlSource;
import java.util.List; import java.util.List;
......
...@@ -6,9 +6,7 @@ import org.springframework.core.annotation.AnnotationAwareOrderComparator; ...@@ -6,9 +6,7 @@ import org.springframework.core.annotation.AnnotationAwareOrderComparator;
import javax.sql.DataSource; import javax.sql.DataSource;
import java.sql.SQLException; import java.sql.SQLException;
import java.util.List; import java.util.*;
import java.util.Map;
import java.util.Properties;
/** /**
* @author liaozan * @author liaozan
...@@ -36,4 +34,4 @@ public class DefaultDataSourceCustomizer implements DataSourceCustomizer { ...@@ -36,4 +34,4 @@ public class DefaultDataSourceCustomizer implements DataSourceCustomizer {
} }
} }
} }
\ No newline at end of file
...@@ -6,9 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.TableInfoHelper; ...@@ -6,9 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.TableInfoHelper;
import com.baomidou.mybatisplus.core.toolkit.ReflectionKit; import com.baomidou.mybatisplus.core.toolkit.ReflectionKit;
import com.schbrain.common.exception.BaseException; import com.schbrain.common.exception.BaseException;
import com.schbrain.common.util.StreamUtils; import com.schbrain.common.util.StreamUtils;
import com.schbrain.framework.autoconfigure.mybatis.base.BaseEntity; import com.schbrain.framework.autoconfigure.mybatis.base.*;
import com.schbrain.framework.autoconfigure.mybatis.base.BaseEntityWithLogicDelete;
import com.schbrain.framework.autoconfigure.mybatis.base.BaseMapper;
import com.schbrain.framework.autoconfigure.mybatis.constraint.*; import com.schbrain.framework.autoconfigure.mybatis.constraint.*;
import com.schbrain.framework.autoconfigure.mybatis.constraint.Table.FieldInfo; import com.schbrain.framework.autoconfigure.mybatis.constraint.Table.FieldInfo;
import com.schbrain.framework.autoconfigure.mybatis.exception.TableConstraintException; import com.schbrain.framework.autoconfigure.mybatis.exception.TableConstraintException;
...@@ -18,9 +16,7 @@ import org.apache.commons.collections4.CollectionUtils; ...@@ -18,9 +16,7 @@ import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.collections4.MapUtils; import org.apache.commons.collections4.MapUtils;
import org.apache.ibatis.session.SqlSessionFactory; import org.apache.ibatis.session.SqlSessionFactory;
import org.springframework.beans.BeansException; import org.springframework.beans.BeansException;
import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.*;
import org.springframework.beans.factory.BeanFactoryAware;
import org.springframework.beans.factory.SmartInitializingSingleton;
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.util.Assert; import org.springframework.util.Assert;
...@@ -28,9 +24,7 @@ import org.springframework.util.ClassUtils; ...@@ -28,9 +24,7 @@ import org.springframework.util.ClassUtils;
import javax.sql.DataSource; import javax.sql.DataSource;
import java.sql.SQLException; import java.sql.SQLException;
import java.util.ArrayList; import java.util.*;
import java.util.List;
import java.util.Map;
import static java.util.stream.Collectors.toList; import static java.util.stream.Collectors.toList;
......
...@@ -3,10 +3,7 @@ package com.schbrain.framework.autoconfigure.mybatis.type; ...@@ -3,10 +3,7 @@ package com.schbrain.framework.autoconfigure.mybatis.type;
import org.apache.ibatis.type.BaseTypeHandler; import org.apache.ibatis.type.BaseTypeHandler;
import org.apache.ibatis.type.JdbcType; import org.apache.ibatis.type.JdbcType;
import java.sql.CallableStatement; import java.sql.*;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.time.Instant; import java.time.Instant;
/** /**
...@@ -38,4 +35,4 @@ public class InstantToLongTypeHandler extends BaseTypeHandler<Instant> { ...@@ -38,4 +35,4 @@ public class InstantToLongTypeHandler extends BaseTypeHandler<Instant> {
return result == 0 && cs.wasNull() ? null : Instant.ofEpochMilli(result); return result == 0 && cs.wasNull() ? null : Instant.ofEpochMilli(result);
} }
} }
\ No newline at end of file
package com.schbrain.framework.autoconfigure.oss.bean; package com.schbrain.framework.autoconfigure.oss.bean;
import lombok.Data; import lombok.*;
import lombok.EqualsAndHashCode;
import lombok.ToString;
/** /**
* @author lik * @author lik
......
package com.schbrain.framework.autoconfigure.oss.bean; package com.schbrain.framework.autoconfigure.oss.bean;
import lombok.Data; import lombok.*;
import lombok.EqualsAndHashCode;
import lombok.ToString;
import java.util.List; import java.util.List;
......
package com.schbrain.framework.autoconfigure.oss.bean; package com.schbrain.framework.autoconfigure.oss.bean;
import com.aliyun.oss.model.OSSObject; import com.aliyun.oss.model.OSSObject;
import lombok.Data; import lombok.*;
import lombok.EqualsAndHashCode;
import lombok.ToString;
/** /**
* @author liaozan * @author liaozan
......
package com.schbrain.framework.autoconfigure.oss.bean; package com.schbrain.framework.autoconfigure.oss.bean;
import com.aliyuncs.auth.sts.AssumeRoleResponse.Credentials; import com.aliyuncs.auth.sts.AssumeRoleResponse.Credentials;
import lombok.Data; import lombok.*;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor; import java.time.*;
import lombok.ToString;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.time.ZoneOffset;
import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatter;
/** /**
......
package com.schbrain.framework.autoconfigure.oss.bean; package com.schbrain.framework.autoconfigure.oss.bean;
import lombok.Data; import lombok.*;
import lombok.EqualsAndHashCode;
import lombok.ToString;
/** /**
* @author liaozan * @author liaozan
......
...@@ -15,9 +15,7 @@ import com.aliyuncs.auth.sts.AssumeRoleResponse.Credentials; ...@@ -15,9 +15,7 @@ import com.aliyuncs.auth.sts.AssumeRoleResponse.Credentials;
import com.aliyuncs.http.MethodType; import com.aliyuncs.http.MethodType;
import com.aliyuncs.profile.DefaultProfile; import com.aliyuncs.profile.DefaultProfile;
import com.aliyuncs.profile.IClientProfile; import com.aliyuncs.profile.IClientProfile;
import com.schbrain.common.util.ApplicationName; import com.schbrain.common.util.*;
import com.schbrain.common.util.StreamUtils;
import com.schbrain.common.util.ValidateUtils;
import com.schbrain.framework.autoconfigure.oss.bean.*; import com.schbrain.framework.autoconfigure.oss.bean.*;
import com.schbrain.framework.autoconfigure.oss.exception.OssException; import com.schbrain.framework.autoconfigure.oss.exception.OssException;
import com.schbrain.framework.autoconfigure.oss.properties.OssProperties; import com.schbrain.framework.autoconfigure.oss.properties.OssProperties;
......
...@@ -3,9 +3,7 @@ package com.schbrain.framework.support.spring; ...@@ -3,9 +3,7 @@ package com.schbrain.framework.support.spring;
import org.springframework.beans.BeansException; import org.springframework.beans.BeansException;
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
import org.springframework.beans.factory.config.SmartInstantiationAwareBeanPostProcessor; import org.springframework.beans.factory.config.SmartInstantiationAwareBeanPostProcessor;
import org.springframework.context.ApplicationContext; import org.springframework.context.*;
import org.springframework.context.ApplicationContextAware;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.core.ResolvableType; import org.springframework.core.ResolvableType;
import org.springframework.core.env.ConfigurableEnvironment; import org.springframework.core.env.ConfigurableEnvironment;
import org.springframework.util.Assert; import org.springframework.util.Assert;
...@@ -104,4 +102,4 @@ public abstract class GenericBeanPostProcessor<T> implements SmartInstantiationA ...@@ -104,4 +102,4 @@ public abstract class GenericBeanPostProcessor<T> implements SmartInstantiationA
} }
// endregion // endregion
} }
\ No newline at end of file
...@@ -2,10 +2,7 @@ package com.schbrain.framework.support.spring; ...@@ -2,10 +2,7 @@ package com.schbrain.framework.support.spring;
import org.springframework.beans.BeansException; import org.springframework.beans.BeansException;
import org.springframework.boot.web.context.WebServerInitializedEvent; import org.springframework.boot.web.context.WebServerInitializedEvent;
import org.springframework.context.ApplicationContext; import org.springframework.context.*;
import org.springframework.context.ApplicationContextAware;
import org.springframework.context.ApplicationEvent;
import org.springframework.context.ApplicationListener;
import org.springframework.context.event.ApplicationContextEvent; import org.springframework.context.event.ApplicationContextEvent;
import static org.springframework.util.ObjectUtils.nullSafeEquals; import static org.springframework.util.ObjectUtils.nullSafeEquals;
......
...@@ -6,10 +6,7 @@ import cn.hutool.core.util.ArrayUtil; ...@@ -6,10 +6,7 @@ import cn.hutool.core.util.ArrayUtil;
import com.schbrain.common.util.EnvUtils; import com.schbrain.common.util.EnvUtils;
import com.schbrain.common.util.PortUtils; import com.schbrain.common.util.PortUtils;
import com.schbrain.framework.support.spring.LoggerAwareEnvironmentPostProcessor; import com.schbrain.framework.support.spring.LoggerAwareEnvironmentPostProcessor;
import org.springframework.boot.Banner; import org.springframework.boot.*;
import org.springframework.boot.ConfigurableBootstrapContext;
import org.springframework.boot.DefaultPropertiesPropertySource;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.actuate.autoconfigure.health.HealthProperties.Show; import org.springframework.boot.actuate.autoconfigure.health.HealthProperties.Show;
import org.springframework.boot.actuate.info.InfoPropertiesInfoContributor.Mode; import org.springframework.boot.actuate.info.InfoPropertiesInfoContributor.Mode;
import org.springframework.boot.context.config.ConfigDataEnvironmentPostProcessor; import org.springframework.boot.context.config.ConfigDataEnvironmentPostProcessor;
...@@ -20,9 +17,7 @@ import org.springframework.core.env.ConfigurableEnvironment; ...@@ -20,9 +17,7 @@ import org.springframework.core.env.ConfigurableEnvironment;
import org.springframework.util.unit.DataSize; import org.springframework.util.unit.DataSize;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.util.LinkedHashMap; import java.util.*;
import java.util.Map;
import java.util.TimeZone;
/** /**
* @author liaozan * @author liaozan
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment