Merge pull request #24 from guoshiqiufeng/dev

1.6.7

.springjavaformatconfig

@@ -0,0 +1 @@
+java-baseline=8

README.md

@@ -4,9 +4,9 @@
 #### 介绍
 内核框架
 #### 依赖
-- spring-boot 2.5.10
-- spring-cloud 2020.0.4
-- spring-cloud-alibaba 2021.1
+- spring-boot 2.6.4
+- spring-cloud 2021.0.1
+- spring-cloud-alibaba 2021.0.1.0
 - kernel-dependencies 1.6.3
 #### 代码
 采用阿里巴巴代码规范，使用`spring-javaformat`格式化代码

kernel-all-spring-boot-starter/pom.xml

@@ -20,12 +20,12 @@
     <parent>
         <groupId>com.gitee.fubluesky.kernel</groupId>
         <artifactId>kernel</artifactId>
-        <version>1.6.6</version>
+        <version>1.6.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>kernel-all-spring-boot-starter</artifactId>
-    <version>1.6.6</version>
+    <version>1.6.7</version>
     <description>spring-boot 依赖引用</description>
     <inceptionYear>2021-Now</inceptionYear>
     <packaging>pom</packaging>

kernel-auth/auth-api/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.gitee.fubluesky.kernel</groupId>
         <artifactId>kernel-auth</artifactId>
-        <version>1.6.6</version>
+        <version>1.6.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

kernel-auth/auth-sdk/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.gitee.fubluesky.kernel</groupId>
         <artifactId>kernel-auth</artifactId>
-        <version>1.6.6</version>
+        <version>1.6.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

kernel-auth/auth-spring-boot-starter/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.gitee.fubluesky.kernel</groupId>
         <artifactId>kernel-auth</artifactId>
-        <version>1.6.6</version>
+        <version>1.6.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

kernel-auth/auth-spring-boot-starter/src/main/java/com/gitee/fubluesky/kernel/auth/autoconfigure/AuthAutoConfiguration.java

@@ -30,7 +30,6 @@
 import com.gitee.fubluesky.kernel.security.api.CaptchaApi;
 import com.gitee.fubluesky.kernel.security.api.pojo.CaptchaProperties;
 import com.gitee.fubluesky.kernel.security.autoconfigure.CaptchaAutoConfiguration;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;
@@ -45,39 +44,17 @@
 @AutoConfigureAfter(value = { JwtAutoConfiguration.class, CaptchaAutoConfiguration.class })
 public class AuthAutoConfiguration {
 
-	@Autowired
-	private AuthProperties authProperties;
-
-	@Autowired
-	private LoginApi loginApi;
-
 	@Bean
 	@ConditionalOnMissingBean(PasswordEncryptApi.class)
 	public PasswordEncryptApi passwordEncryptApi() {
 		return new BcryptPasswordEncrypt();
 	}
 
-	@Autowired
-	private PasswordEncryptApi passwordEncryptApi;
-
-	@Autowired
-	private CacheOperatorApi<LoginUser> loginUserTokenCache;
-
-	@Autowired
-	private CacheOperatorApi<LoginUser> loginUserCache;
-
-	@Autowired
-	private CaptchaApi captchaApi;
-
-	@Autowired
-	private CaptchaProperties captchaProperties;
-
-	@Autowired
-	private JwtApi jwtApi;
-
 	@Bean
 	@ConditionalOnMissingBean(AuthApi.class)
-	public AuthApi authApi() {
+	public AuthApi authApi(AuthProperties authProperties, LoginApi loginApi, PasswordEncryptApi passwordEncryptApi,
+			CacheOperatorApi<LoginUser> loginUserTokenCache, CacheOperatorApi<LoginUser> loginUserCache,
+			CaptchaApi captchaApi, CaptchaProperties captchaProperties, JwtApi jwtApi) {
 		return new AuthImpl(authProperties, loginApi, passwordEncryptApi, loginUserTokenCache, loginUserCache,
 				captchaApi, captchaProperties, jwtApi);
 	}

kernel-auth/auth-spring-boot-starter/src/main/java/com/gitee/fubluesky/kernel/auth/autoconfigure/LoginAutoConfiguration.java

@@ -25,7 +25,6 @@
 import com.gitee.fubluesky.kernel.auth.cache.LoginUserTokenRedisCache;
 import com.gitee.fubluesky.kernel.cache.api.CacheOperatorApi;
 import com.gitee.fubluesky.kernel.cache.redis.utils.RedisCacheUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.AutoConfigureBefore;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.context.properties.ConfigurationProperties;
@@ -50,35 +49,26 @@ public AuthProperties authProperties() {
 		return new AuthProperties();
 	}
 
-	@Autowired
-	private AuthProperties authProperties;
-
 	@Bean
 	public RedisTemplate<String, LoginUser> loginUserRedisTemplate(RedisConnectionFactory redisConnectionFactory) {
 		return RedisCacheUtils.getObjectRedisTemplate(redisConnectionFactory);
 	}
 
-	@Autowired
-	private RedisTemplate<String, LoginUser> loginUserRedisTemplate;
-
 	@Bean
 	@ConditionalOnMissingBean(name = "loginUserTokenCache")
-	public CacheOperatorApi<LoginUser> loginUserTokenCache() {
+	public CacheOperatorApi<LoginUser> loginUserTokenCache(RedisTemplate<String, LoginUser> loginUserRedisTemplate) {
 		return new LoginUserTokenRedisCache(loginUserRedisTemplate);
 	}
 
 	@Bean
 	@ConditionalOnMissingBean(name = "loginUserCache")
-	public CacheOperatorApi<LoginUser> loginUserCache() {
+	public CacheOperatorApi<LoginUser> loginUserCache(RedisTemplate<String, LoginUser> loginUserRedisTemplate) {
 		return new LoginUserRedisCache(loginUserRedisTemplate);
 	}
 
-	@Autowired
-	private CacheOperatorApi<LoginUser> loginUserCache;
-
 	@Bean
 	@ConditionalOnMissingBean(LoginApi.class)
-	public LoginApi loginApi() {
+	public LoginApi loginApi(AuthProperties authProperties, CacheOperatorApi<LoginUser> loginUserCache) {
 		return new LoginImpl(authProperties, loginUserCache);
 	}
 

kernel-auth/auth-spring-boot-starter/src/main/java/com/gitee/fubluesky/kernel/auth/autoconfigure/SecurityAutoConfiguration.java

@@ -19,7 +19,6 @@
 
 import com.gitee.fubluesky.kernel.auth.api.pojo.AuthProperties;
 import com.gitee.fubluesky.kernel.auth.security.SecurityConfig;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
@@ -39,11 +38,8 @@
 @ConditionalOnProperty(prefix = "kernel.auth", name = "securityConfigEnabled", matchIfMissing = true)
 public class SecurityAutoConfiguration {
 
-	@Autowired
-	private AuthProperties authProperties;
-
 	@Bean
-	public SecurityConfig securityConfig() {
+	public SecurityConfig securityConfig(AuthProperties authProperties) {
 		return new SecurityConfig(authProperties);
 	}
 

kernel-auth/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.gitee.fubluesky.kernel</groupId>
         <artifactId>kernel</artifactId>
-        <version>1.6.6</version>
+        <version>1.6.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

kernel-cache/cache-api/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.gitee.fubluesky.kernel</groupId>
         <artifactId>kernel-cache</artifactId>
-        <version>1.6.6</version>
+        <version>1.6.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

kernel-cache/cache-redis-spring-boot-starter/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.gitee.fubluesky.kernel</groupId>
         <artifactId>kernel-cache</artifactId>
-        <version>1.6.6</version>
+        <version>1.6.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

kernel-cache/cache-sdk-redis/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.gitee.fubluesky.kernel</groupId>
         <artifactId>kernel-cache</artifactId>
-        <version>1.6.6</version>
+        <version>1.6.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

kernel-cache/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.gitee.fubluesky.kernel</groupId>
         <artifactId>kernel</artifactId>
-        <version>1.6.6</version>
+        <version>1.6.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

kernel-core/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.gitee.fubluesky.kernel</groupId>
         <artifactId>kernel</artifactId>
-        <version>1.6.6</version>
+        <version>1.6.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

kernel-core/src/main/java/com/gitee/fubluesky/kernel/core/util/LocalDateTimeUtils.java

@@ -26,65 +26,66 @@
 
 /**
  * LocalDateTime 工具类
+ *
  * @author yanghq
  * @version 1.0
  * @since 2022-03-02 13:11
  */
 @UtilityClass
 public class LocalDateTimeUtils {
 
-    /**
-     * 获取年开始时间
-     * @param date 时间
-     * @return 年开始时间
-     */
-    public LocalDateTime beginOfYear(LocalDateTime date) {
-        return LocalDateTime.of(LocalDate.from(date.with(TemporalAdjusters.firstDayOfYear())), LocalTime.MIN);
-    }
+	/**
+	 * 获取年开始时间
+	 * @param date 时间
+	 * @return 年开始时间
+	 */
+	public LocalDateTime beginOfYear(LocalDateTime date) {
+		return LocalDateTime.of(LocalDate.from(date.with(TemporalAdjusters.firstDayOfYear())), LocalTime.MIN);
+	}
 
+	/**
+	 * 获取年结束时间
+	 * @param date 时间
+	 * @return 年结束时间
+	 */
+	public LocalDateTime endOfYear(LocalDateTime date) {
+		return LocalDateTime.of(LocalDate.from(date.with(TemporalAdjusters.lastDayOfYear())), LocalTime.MAX);
+	}
 
-    /**
-     * 获取年结束时间
-     * @param date 时间
-     * @return 年结束时间
-     */
-    public LocalDateTime endOfYear(LocalDateTime date) {
-        return LocalDateTime.of(LocalDate.from(date.with(TemporalAdjusters.lastDayOfYear())), LocalTime.MAX);
-    }
+	/**
+	 * 获取月开始时间
+	 * @param date 时间
+	 * @return 月开始时间
+	 */
+	public static LocalDateTime beginOfMonth(LocalDateTime date) {
+		return LocalDateTime.of(LocalDate.from(date.with(TemporalAdjusters.firstDayOfMonth())), LocalTime.MIN);
+	}
 
-    /**
-     * 获取月开始时间
-     * @param date 时间
-     * @return 月开始时间
-     */
-    public static LocalDateTime beginOfMonth(LocalDateTime date) {
-        return LocalDateTime.of(LocalDate.from(date.with(TemporalAdjusters.firstDayOfMonth())), LocalTime.MIN);
-    }
+	/**
+	 * 获取月结束时间
+	 * @param date 时间
+	 * @return 月结束时间
+	 */
+	public static LocalDateTime endOfMonth(LocalDateTime date) {
+		return LocalDateTime.of(LocalDate.from(date.with(TemporalAdjusters.lastDayOfMonth())), LocalTime.MAX);
+	}
 
-    /**
-     * 获取月结束时间
-     * @param date 时间
-     * @return 月结束时间
-     */
-    public static LocalDateTime endOfMonth(LocalDateTime date) {
-        return LocalDateTime.of(LocalDate.from(date.with(TemporalAdjusters.lastDayOfMonth())), LocalTime.MAX);
-    }
+	/**
+	 * 获取日开始时间
+	 * @param date 时间
+	 * @return 日开始时间
+	 */
+	public static LocalDateTime beginOfDay(LocalDateTime date) {
+		return date.with(LocalTime.MIN);
+	}
 
-    /**
-     * 获取日开始时间
-     * @param date 时间
-     * @return 日开始时间
-     */
-    public static LocalDateTime beginOfDay(LocalDateTime date) {
-        return date.with(LocalTime.MIN);
-    }
+	/**
+	 * 获取日结束时间
+	 * @param date 时间
+	 * @return 日结束时间
+	 */
+	public static LocalDateTime endOfDay(LocalDateTime date) {
+		return date.with(LocalTime.MAX);
+	}
 
-    /**
-     * 获取日结束时间
-     * @param date 时间
-     * @return 日结束时间
-     */
-    public static LocalDateTime endOfDay(LocalDateTime date) {
-        return date.with(LocalTime.MAX);
-    }
 }

kernel-db/db-api/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.gitee.fubluesky.kernel</groupId>
         <artifactId>kernel-db</artifactId>
-        <version>1.6.6</version>
+        <version>1.6.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

kernel-db/db-sdk-mybatis-plus/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.gitee.fubluesky.kernel</groupId>
         <artifactId>kernel-db</artifactId>
-        <version>1.6.6</version>
+        <version>1.6.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

kernel-db/db-spring-boot-starter/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.gitee.fubluesky.kernel</groupId>
         <artifactId>kernel-db</artifactId>
-        <version>1.6.6</version>
+        <version>1.6.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

kernel-db/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.gitee.fubluesky.kernel</groupId>
         <artifactId>kernel</artifactId>
-        <version>1.6.6</version>
+        <version>1.6.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

kernel-email/email-api/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.gitee.fubluesky.kernel</groupId>
         <artifactId>kernel-email</artifactId>
-        <version>1.6.6</version>
+        <version>1.6.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

kernel-email/email-sdk-java/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.gitee.fubluesky.kernel</groupId>
         <artifactId>kernel-email</artifactId>
-        <version>1.6.6</version>
+        <version>1.6.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>