Merge branch 'master' of http://120.77.240.215:9701/tianlai3/ioc_sixiang_license

license/doc/README.md

@@ -2,4 +2,5 @@
 ##### 2023.1版本
 > 1. 执行update.2023.1.sql
 > 2. 原来的root账号要换成邮箱，包括user_name和notify字段，两个都填超管账号邮箱。 
-> 3. 证书文件ca.crt/server.crt/server.pkcs8.key拷贝到正确的目录下。
\ No newline at end of file
+> 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;
     }

license/src/main/java/iot/sixiang/license/service/impl/PmsUseServiceImpl.java

@@ -86,6 +86,9 @@ public class PmsUseServiceImpl implements PmsUseService {
         Integer id = reportErrorMsgDTO.getId();
         String errorCode = reportErrorMsgDTO.getErrorCode();
         String errorMsg = reportErrorMsgDTO.getErrorMsg();
+        if (errorMsg != null && errorMsg.contains("\\u")) {
+            errorMsg = CommonUtil.unicodeToStr(errorMsg);
+        }
         PmsUseLog pmsUseLog = new PmsUseLog();
         pmsUseLog.setId(id);
         pmsUseLog.setStatus(0);