From 15462c6a27e82fd1bfc889b4d7b85c9f4270331e Mon Sep 17 00:00:00 2001 From: zhanghai <120228220@qq.com> Date: Tue, 6 Aug 2024 16:14:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E4=BB=B6=E7=9A=84?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E8=B6=85=E6=97=B6=E6=97=B6=E9=97=B4=EF=BC=8C?= =?UTF-8?q?=20=E4=BF=AE=E6=94=B9=E7=BA=BF=E7=A8=8B=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/jiashi/FileUploader.java | 6 +++--- src/main/java/com/jiashi/service/UpdateService.java | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/jiashi/FileUploader.java b/src/main/java/com/jiashi/FileUploader.java index bf6aeec..d8d9fb1 100644 --- a/src/main/java/com/jiashi/FileUploader.java +++ b/src/main/java/com/jiashi/FileUploader.java @@ -15,9 +15,9 @@ public class FileUploader { public static CommonResult uploadFilesWithParams(List files, String uploadUrl, List params) throws IOException { OkHttpClient client = new OkHttpClient.Builder() - .connectTimeout(600, TimeUnit.SECONDS) - .readTimeout(600, TimeUnit.SECONDS) - .writeTimeout(600, TimeUnit.SECONDS) + .connectTimeout(6000, TimeUnit.SECONDS) + .readTimeout(6000, TimeUnit.SECONDS) + .writeTimeout(6000, TimeUnit.SECONDS) .build(); MultipartBody.Builder builder = new MultipartBody.Builder(); for (File file : files) { diff --git a/src/main/java/com/jiashi/service/UpdateService.java b/src/main/java/com/jiashi/service/UpdateService.java index c554dff..d2d486e 100644 --- a/src/main/java/com/jiashi/service/UpdateService.java +++ b/src/main/java/com/jiashi/service/UpdateService.java @@ -34,8 +34,8 @@ public class UpdateService { public void upload() { String uniUrl = "http://192.168.8.74"; List cardInfos = null; - ExecutorService executor2 = Executors.newFixedThreadPool(20); - ExecutorService executor = Executors.newFixedThreadPool(60); + ExecutorService executor2 = Executors.newFixedThreadPool(10); + ExecutorService executor = Executors.newFixedThreadPool(90); do { try{ cardInfos = this.updateData(); @@ -69,7 +69,7 @@ public class UpdateService { Future future = executor.submit(() -> { try { String cmd = "C:\\Debug\\lianzhong.exe 003 192.168.8.74 " + cardInfo.getId() + " " + picture.getPicid() + " " + cardInfo.getPatno() + " " + cardInfo.getOutdateStr() + " " + picture.getPicname() + " " + picture.getFileUrl() + " " + uniUrl + " " + picture.getRotatedegree(); - log.info(cmd); +// log.info(cmd); java.lang.Process process = java.lang.Runtime.getRuntime().exec(cmd);//执行命令生成cube process.waitFor(); } catch (Exception e) { @@ -107,7 +107,7 @@ public class UpdateService { List params = new ArrayList<>(); String s = new Gson().toJson(uploadInfos); params.add(new FormField("uploadFileParams", s)); - log.info("请求参数："+s); + log.info("请求参数："+cardInfo.getPatno()); // 上传 try { CommonResult commonResult = FileUploader.uploadFilesWithParams(files, "http://192.168.161.102:9511/fileUploadJpg", params);