Merge branch 'lk20230605'

blade-service/blade-archive/src/main/java/org/springblade/archive/config/ThreadPoolConfig.java

@@ -13,7 +13,7 @@ public class ThreadPoolConfig {
 
     @Bean(name = "executorService")
     public ExecutorService executorService() {
-        return Executors.newFixedThreadPool(10);
+        return Executors.newFixedThreadPool(20);
     }
 
 }

blade-service/blade-archive/src/main/java/org/springblade/archive/controller/ArchivesAutoController.java

@@ -382,10 +382,10 @@ public class ArchivesAutoController extends BladeController {
 			contractClient.updateIsArchivesAutoById(contractId,1);
 
 			archivesAutoService.archiveAutoMethodThread(projectId,contractId,nodeId);
-			return R.data("自动组卷中,请耐心等待");
+			return R.data("开始自动组卷中,请耐心等待");
 		}catch (Exception e){
 			e.printStackTrace();
-			log.error("自动组卷保错。"+e.getMessage()+"--projectId："+projectId+"-contractId:"+contractId+"-nodeId:"+nodeId);
+			log.error("自动组卷出错。"+e.getMessage()+"--projectId："+projectId+"-contractId:"+contractId+"-nodeId:"+nodeId);
 			//设置自动组卷结束
 			contractClient.updateIsArchivesAutoById(contractId,0);
 			return R.fail(e.getMessage());