Merge pull request #14 from buession/development

Release 2.3.3

CHANGELOG.md

@@ -2,6 +2,29 @@
 ===========================
 
 
+## [2.3.3](https://github.com/buession/buession-springboot/releases/tag/v2.3.3) (2024-05-06)
+
+### 🔨依赖升级
+
+- [依赖库版本升级和安全漏洞修复](https://github.com/buession/buession-parent/releases/tag/v2.3.3)
+
+
+### ⭐ 新特性
+
+- **buession-springboot-boot：** 新增线程池自动配置类 ThreadPoolConfiguration
+- **buession-springboot-mybatis：** ConfiguredMapperScannerRegistrar，增加 spring.mybatis.scanner.enabled 开关配置
+
+
+### ⏪ 优化
+
+- **buession-springboot-pac4j：** 优化 Pac4jFilter 类
+- **buession-springboot-shiro：** 优化 Shiro Filter 初始化及处理流程
+- **buession-springboot-mybatis：** SqlSessionFactoryBean 初始化速度优化
+
+
+---
+
+
 ## [2.3.2](https://github.com/buession/buession-springboot/releases/tag/v2.3.2) (2023-12-27)
 
 ### 🔨依赖升级

buession-springboot-boot/pom.xml

@@ -7,7 +7,7 @@
 		<groupId>com.buession.springboot</groupId>
 		<artifactId>buession-springboot-parent</artifactId>
 		<relativePath>../buession-springboot-parent</relativePath>
-		<version>2.3.2</version>
+		<version>2.3.3</version>
 	</parent>
 	<artifactId>buession-springboot-boot</artifactId>
 	<url>https://springboot.buession.com/</url>

buession-springboot-boot/src/main/java/com/buession/springboot/boot/autoconfigure/ThreadPoolConfiguration.java

@@ -0,0 +1,122 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.
+ * See the NOTICE file distributed with this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and limitations under the License.
+ *
+ * =========================================================================================================
+ *
+ * This software consists of voluntary contributions made by many individuals on behalf of the
+ * Apache Software Foundation. For more information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ *
+ * +-------------------------------------------------------------------------------------------------------+
+ * | License: http://www.apache.org/licenses/LICENSE-2.0.txt 										       |
+ * | Author: Yong.Teng <[email protected]> 													       |
+ * | Copyright @ 2013-2024 Buession.com Inc.														       |
+ * +-------------------------------------------------------------------------------------------------------+
+ */
+package com.buession.springboot.boot.autoconfigure;
+
+import com.buession.core.concurrent.DefaultThreadFactory;
+import com.buession.core.concurrent.DefaultThreadPoolExecutor;
+import com.buession.core.converter.mapper.PropertyMapper;
+import com.buession.core.validator.Validate;
+import org.springframework.beans.factory.ObjectProvider;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import java.util.Optional;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.LinkedBlockingDeque;
+import java.util.concurrent.RejectedExecutionHandler;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * 线程池自动配置
+ *
+ * @author Yong.Teng
+ * @since 2.3.3
+ */
+@Configuration(proxyBeanMethods = false)
+@EnableConfigurationProperties(ThreadPoolProperties.class)
+@ConditionalOnProperty(prefix = ThreadPoolProperties.PREFIX, name = "enabled", havingValue = "true")
+public class ThreadPoolConfiguration {
+
+	private final ThreadPoolProperties threadPoolProperties;
+
+	public ThreadPoolConfiguration(ThreadPoolProperties threadPoolProperties) {
+		this.threadPoolProperties = threadPoolProperties;
+	}
+
+	@Bean(name = "threadPoolWorkQueue")
+	@ConditionalOnMissingBean(name = "threadPoolWorkQueue")
+	public BlockingQueue<Runnable> workQueue() {
+		return new LinkedBlockingDeque<>();
+	}
+
+	@Bean(name = "threadPoolThreadFactory")
+	@ConditionalOnMissingBean(name = "threadPoolThreadFactory")
+	public ThreadFactory threadPoolFactory() {
+		final DefaultThreadFactory threadFactory = Validate.hasText(
+				threadPoolProperties.getNamePrefix()) ? new DefaultThreadFactory(
+				threadPoolProperties.getNamePrefix()) : new DefaultThreadFactory();
+		final PropertyMapper propertyMapper = PropertyMapper.get().alwaysApplyingWhenNonNull();
+
+		propertyMapper.from(threadPoolProperties.getPriority()).to(threadFactory::setPriority);
+		propertyMapper.from(threadPoolProperties.getDaemon()).to(threadFactory::setDaemon);
+
+		return threadFactory;
+	}
+
+	@Bean(name = "threadPoolRejectedHandler")
+	@ConditionalOnMissingBean(name = "threadPoolRejectedHandler")
+	public RejectedExecutionHandler rejectedHandler() {
+		return new ThreadPoolExecutor.AbortPolicy();
+	}
+
+	@Bean(name = "threadPoolExecutor")
+	@ConditionalOnMissingBean(name = "threadPoolExecutor")
+	public ThreadPoolExecutor threadPoolExecutor(
+			@Qualifier("threadPoolWorkQueue") ObjectProvider<BlockingQueue<Runnable>> workQueue,
+			@Qualifier("threadPoolThreadFactory") ObjectProvider<ThreadFactory> threadFactory,
+			@Qualifier("threadPoolRejectedHandler") ObjectProvider<RejectedExecutionHandler> rejectedHandler) {
+		final com.buession.core.concurrent.ThreadPoolConfiguration threadPoolConfiguration =
+				new com.buession.core.concurrent.ThreadPoolConfiguration();
+		final PropertyMapper propertyMapper = PropertyMapper.get().alwaysApplyingWhenNonNull();
+
+		propertyMapper.from(threadPoolProperties.getNamePrefix()).to(threadPoolConfiguration::setNamePrefix);
+		propertyMapper.from(threadPoolProperties.getAllowCoreThreadTimeOut())
+				.to(threadPoolConfiguration::setAllowCoreThreadTimeOut);
+		propertyMapper.from(threadPoolProperties.getDaemon()).to(threadPoolConfiguration::setDaemon);
+		propertyMapper.from(threadPoolProperties.getPriority()).to(threadPoolConfiguration::setPriority);
+
+		threadPoolConfiguration.setCorePoolSize(Optional.ofNullable(threadPoolProperties.getCorePoolSize()).orElse(-1));
+		threadPoolConfiguration.setMaximumPoolSize(
+				Optional.ofNullable(threadPoolProperties.getMaximumPoolSize()).orElse(-1));
+
+		if(threadPoolProperties.getKeepAliveTime() != null){
+			threadPoolConfiguration.setKeepAliveTime(threadPoolProperties.getKeepAliveTime().toMillis());
+			threadPoolConfiguration.setKeepAliveTimeTimeUnit(TimeUnit.MILLISECONDS);
+		}
+
+		workQueue.ifAvailable(threadPoolConfiguration::setWorkQueue);
+		threadFactory.ifAvailable(threadPoolConfiguration::setThreadFactory);
+		rejectedHandler.ifAvailable(threadPoolConfiguration::setRejectedHandler);
+
+		return new DefaultThreadPoolExecutor(threadPoolConfiguration);
+	}
+
+}

buession-springboot-boot/src/main/java/com/buession/springboot/boot/autoconfigure/ThreadPoolProperties.java

@@ -0,0 +1,224 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.
+ * See the NOTICE file distributed with this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and limitations under the License.
+ *
+ * =========================================================================================================
+ *
+ * This software consists of voluntary contributions made by many individuals on behalf of the
+ * Apache Software Foundation. For more information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ *
+ * +-------------------------------------------------------------------------------------------------------+
+ * | License: http://www.apache.org/licenses/LICENSE-2.0.txt 										       |
+ * | Author: Yong.Teng <[email protected]> 													       |
+ * | Copyright @ 2013-2024 Buession.com Inc.														       |
+ * +-------------------------------------------------------------------------------------------------------+
+ */
+package com.buession.springboot.boot.autoconfigure;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+import java.time.Duration;
+
+/**
+ * 线程池配置
+ *
+ * @author Yong.Teng
+ * @since 2.3.3
+ */
+@ConfigurationProperties(prefix = ThreadPoolProperties.PREFIX)
+public class ThreadPoolProperties {
+
+	public final static String PREFIX = "spring.thread-pool";
+
+	/**
+	 * 线程名称前缀
+	 */
+	private String namePrefix;
+
+	/**
+	 * 线程池核心线程大小
+	 */
+	private Integer corePoolSize;
+
+	/**
+	 * 线程池最大线程数量
+	 */
+	private Integer maximumPoolSize;
+
+	/**
+	 * 空闲线程存活时间
+	 */
+	private Duration keepAliveTime = Duration.ofSeconds(60);
+
+	/**
+	 * 空闲线程超过 keepAliveTime 后是否直接停掉
+	 */
+	private Boolean allowCoreThreadTimeOut;
+
+	/**
+	 * 是否后台运行
+	 */
+	private Boolean daemon;
+
+	/**
+	 * 优先级
+	 */
+	private Integer priority;
+
+	/**
+	 * 返回线程名称前缀
+	 *
+	 * @return 线程名称前缀
+	 */
+	public String getNamePrefix() {
+		return namePrefix;
+	}
+
+	/**
+	 * 返回线程名称前缀
+	 *
+	 * @param namePrefix
+	 * 		线程名称前缀
+	 */
+	public void setNamePrefix(String namePrefix) {
+		this.namePrefix = namePrefix;
+	}
+
+	/**
+	 * 返回线程池核心线程大小；
+	 * <p>线程池中会维护一个最小的线程数量，即使这些线程处理空闲状态，他们也不会被销毁。</p>
+	 *
+	 * @return 线程池核心线程大小
+	 */
+	public Integer getCorePoolSize() {
+		return corePoolSize;
+	}
+
+	/**
+	 * 设置线程池核心线程大小
+	 * <p>线程池中会维护一个最小的线程数量，即使这些线程处理空闲状态，他们也不会被销毁。</p>
+	 *
+	 * @param corePoolSize
+	 * 		线程池核心线程大小
+	 */
+	public void setCorePoolSize(Integer corePoolSize) {
+		this.corePoolSize = corePoolSize;
+	}
+
+	/**
+	 * 线程池最大线程数量
+	 * <p>一个任务被提交到线程池以后，首先会找有没有空闲存活线程，如果有则直接将任务交给这个空闲线程来执行，
+	 * 如果没有则会缓存到工作队列中，如果工作队列满了，才会创建一个新线程，
+	 * 然后从工作队列的头部取出一个任务交由新线程来处理，而将刚提交的任务放入工作队列尾部。
+	 * 线程池不会无限制的去创建新线程，它会有一个最大线程数量的限制，这个数量即由 maximunPoolSize 指定。</p>
+	 *
+	 * @return 线程池最大线程数量
+	 */
+	public Integer getMaximumPoolSize() {
+		return maximumPoolSize;
+	}
+
+	/**
+	 * 线程池最大线程数量
+	 * <p>一个任务被提交到线程池以后，首先会找有没有空闲存活线程，如果有则直接将任务交给这个空闲线程来执行，
+	 * 如果没有则会缓存到工作队列中，如果工作队列满了，才会创建一个新线程，
+	 * 然后从工作队列的头部取出一个任务交由新线程来处理，而将刚提交的任务放入工作队列尾部。
+	 * 线程池不会无限制的去创建新线程，它会有一个最大线程数量的限制，这个数量即由 maximunPoolSize 指定。</p>
+	 *
+	 * @param maximumPoolSize
+	 * 		线程池最大线程数量
+	 */
+	public void setMaximumPoolSize(Integer maximumPoolSize) {
+		this.maximumPoolSize = maximumPoolSize;
+	}
+
+	/**
+	 * 返回空闲线程存活时间
+	 * <p>一个线程如果处于空闲状态，并且当前的线程数量大于 corePoolSize，那么在指定时间后，这个空闲线程会被销毁，
+	 * 这里的指定时间由 keepAliveTime 来设定。</p>
+	 *
+	 * @return 空闲线程存活时间
+	 */
+	public Duration getKeepAliveTime() {
+		return keepAliveTime;
+	}
+
+	/**
+	 * 设置空闲线程存活时间
+	 * <p>一个线程如果处于空闲状态，并且当前的线程数量大于 corePoolSize，那么在指定时间后，这个空闲线程会被销毁，
+	 * 这里的指定时间由 keepAliveTime 来设定。</p>
+	 *
+	 * @param keepAliveTime
+	 * 		空闲线程存活时间
+	 */
+	public void setKeepAliveTime(Duration keepAliveTime) {
+		this.keepAliveTime = keepAliveTime;
+	}
+
+	/**
+	 * 返回空闲线程超过 keepAliveTime 后是否直接停掉
+	 *
+	 * @return 空闲线程超过 keepAliveTime 后是否直接停掉
+	 */
+	public Boolean getAllowCoreThreadTimeOut() {
+		return allowCoreThreadTimeOut;
+	}
+
+	/**
+	 * 设置空闲线程超过 keepAliveTime 后是否直接停掉
+	 *
+	 * @param allowCoreThreadTimeOut
+	 * 		空闲线程超过 keepAliveTime 后是否直接停掉
+	 */
+	public void setAllowCoreThreadTimeOut(Boolean allowCoreThreadTimeOut) {
+		this.allowCoreThreadTimeOut = allowCoreThreadTimeOut;
+	}
+
+	/**
+	 * 返回是否后台运行
+	 *
+	 * @return 是否后台运行
+	 */
+	public Boolean getDaemon() {
+		return daemon;
+	}
+
+	/**
+	 * 设置是否后台运行
+	 *
+	 * @param daemon
+	 * 		是否后台运行
+	 */
+	public void setDaemon(Boolean daemon) {
+		this.daemon = daemon;
+	}
+
+	/**
+	 * 返回优先级
+	 *
+	 * @return 优先级
+	 */
+	public Integer getPriority() {
+		return priority;
+	}
+
+	/**
+	 * 设置优先级
+	 *
+	 * @param priority
+	 * 		优先级
+	 */
+	public void setPriority(Integer priority) {
+		this.priority = priority;
+	}
+
+}

buession-springboot-boot/src/main/resources/META-INF/spring.factories

@@ -1,2 +1,3 @@
 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-  com.buession.springboot.boot.autoconfigure.MessagePropertyConfiguration
+  com.buession.springboot.boot.autoconfigure.MessagePropertyConfiguration, \
+  com.buession.springboot.boot.autoconfigure.ThreadPoolConfiguration