Commit 645cd69c authored by AfirSraftGarrier's avatar AfirSraftGarrier

Merge branch 'master' into for-yx

parents 014d7017 23af365a
...@@ -2,4 +2,5 @@ ...@@ -2,4 +2,5 @@
##### 2023.1版本 ##### 2023.1版本
> 1. 执行update.2023.1.sql > 1. 执行update.2023.1.sql
> 2. 原来的root账号要换成邮箱,包括user_name和notify字段,两个都填超管账号邮箱。 > 2. 原来的root账号要换成邮箱,包括user_name和notify字段,两个都填超管账号邮箱。
> 3. 证书文件ca.crt/server.crt/server.pkcs8.key拷贝到正确的目录下。 > 3. 证书文件ca.crt/server.crt/server.pkcs8.key拷贝到正确的目录下。
\ No newline at end of file > 4. 在yml中定义前端网页地址other.web。
\ No newline at end of file
...@@ -65,7 +65,7 @@ public class ThreadPoolConfig { ...@@ -65,7 +65,7 @@ public class ThreadPoolConfig {
threadPoolTaskExecutor.setMaxPoolSize(10); threadPoolTaskExecutor.setMaxPoolSize(10);
threadPoolTaskExecutor.setKeepAliveSeconds(3); threadPoolTaskExecutor.setKeepAliveSeconds(3);
threadPoolTaskExecutor.setQueueCapacity(1000); threadPoolTaskExecutor.setQueueCapacity(1000);
threadPoolTaskExecutor.setRejectedExecutionHandler(new ThreadPoolExecutor.AbortPolicy()); threadPoolTaskExecutor.setRejectedExecutionHandler(new ThreadPoolExecutor.CallerRunsPolicy());
threadPoolTaskExecutor.initialize(); threadPoolTaskExecutor.initialize();
return threadPoolTaskExecutor; return threadPoolTaskExecutor;
} }
......
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