Merge remote-tracking branch 'origin/develop' into develop

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/concurrent/threadpool/YFSocialImportThreadPoolExecutor.java

@@ -13,8 +13,8 @@ import java.util.concurrent.TimeUnit;
 
 public class YFSocialImportThreadPoolExecutor extends ThreadPoolExecutor {
 
-    private static final int CORE_POOL_SIZE = 8;
-    private static final int MAX_POOL_SIZE = 12;
+    private static final int CORE_POOL_SIZE = 30;
+    private static final int MAX_POOL_SIZE = 30;
     private static final long KEEP_ALIVE_TIME = 15;
     private static final int CAPACITY = 1024;
 

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TPaymentInfoController.java

@@ -149,7 +149,7 @@ public class TPaymentInfoController {
 	@PostMapping("/importListAdd")
 	@PreAuthorize("@pms.hasPermission('social_tpaymentinfo_batchImport')")
 	public R<List<ErrorMessage>> importListAdd(@RequestBody MultipartFile file, @RequestParam String random) {
-		return tPaymentInfoService.importSocialDiy(file.getInputStream(), random);
+		return tPaymentInfoService.importSocialDiy(file.getInputStream());
 	}
 
 	/**

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/TPaymentInfoService.java

@@ -49,7 +49,7 @@ public interface TPaymentInfoService extends IService<TPaymentInfo> {
 	 * @param inputStream
 	 * @return
 	 */
-	R<List<ErrorMessage>> importSocialDiy(InputStream inputStream, String random);
+	R<List<ErrorMessage>> importSocialDiy(InputStream inputStream);
 
 	/**
 	 * 批量新增缴费库-合肥三险