Merge branch 'master' into for-yx

license/doc/README.md

@@ -3,3 +3,4 @@
 > 1. 执行update.2023.1.sql
 > 2. 原来的root账号要换成邮箱，包括user_name和notify字段，两个都填超管账号邮箱。 
 > 3. 证书文件ca.crt/server.crt/server.pkcs8.key拷贝到正确的目录下。
+> 4. 在yml中定义前端网页地址other.web。
\ No newline at end of file

license/src/main/java/iot/sixiang/license/config/ThreadPoolConfig.java

@@ -65,7 +65,7 @@ public class ThreadPoolConfig {
         threadPoolTaskExecutor.setMaxPoolSize(10);
         threadPoolTaskExecutor.setKeepAliveSeconds(3);
         threadPoolTaskExecutor.setQueueCapacity(1000);
-        threadPoolTaskExecutor.setRejectedExecutionHandler(new ThreadPoolExecutor.AbortPolicy());
+        threadPoolTaskExecutor.setRejectedExecutionHandler(new ThreadPoolExecutor.CallerRunsPolicy());
         threadPoolTaskExecutor.initialize();
         return threadPoolTaskExecutor;
     }