From 40d06887824bbf8028ffe14514b5050bd30489a5 Mon Sep 17 00:00:00 2001 From: hansha Date: Mon, 5 Aug 2024 16:24:02 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B6=85=E6=97=B6?= =?UTF-8?q?=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 +- .../da/dangan/util/CallThirdInterface.java | 6 +- .../mapper/dangan/AreaSortMapper.xml | 2 +- sql/{dangan-clear.sql => dangan.sql} | 138 +++++++++--------- 4 files changed, 75 insertions(+), 75 deletions(-) rename sql/{dangan-clear.sql => dangan.sql} (97%) diff --git a/README.md b/README.md index a5e4ad8..ceb4566 100644 --- a/README.md +++ b/README.md @@ -34,6 +34,6 @@ #影源扫描仪 授权码：V4tMKPYgFtW8vQr4C0s4/g== 测试临时码：D+1WT4eWDqLseG5433yq9w== #系统中扫描上传 连接打印机的电脑需要安装两个：扫描仪驱动M3230.zip、webscan.exe插件 (已上传到项目) - -#清理后的sql文件：dangan-clear.sql 已上传项目 +webScan默认地址：http://localhost:18989/WebScan/ 访问不到，localhost换成本机ip可以访问扫描仪，每次调用扫描先获取ip替换一下 +#清理后的sql文件：dangan.sql 已上传项目 diff --git a/dangan-dangan/src/main/java/com/da/dangan/util/CallThirdInterface.java b/dangan-dangan/src/main/java/com/da/dangan/util/CallThirdInterface.java index d2387f9..85cc8e1 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/util/CallThirdInterface.java +++ b/dangan-dangan/src/main/java/com/da/dangan/util/CallThirdInterface.java @@ -44,7 +44,7 @@ public class CallThirdInterface { Map map = new HashMap<>();//存放参数 // map.put("taskId", taskId); // 使用Hutool的HttpUtil上传文件 - result = HttpUtil.createPost(url4).timeout(10000) + result = HttpUtil.createPost(url4).timeout(20000) // .addHeaders(headers) .charset(CharsetUtil.CHARSET_UTF_8) //.form("file", file) // 文件名称为"file" @@ -86,7 +86,7 @@ public class CallThirdInterface { Map map = new HashMap<>();//存放参数 // map.put("taskId", taskId); // 使用Hutool的HttpUtil上传文件 - result = HttpUtil.createPost(url2).timeout(10000) + result = HttpUtil.createPost(url2).timeout(20000) // .addHeaders(headers) .charset(CharsetUtil.CHARSET_UTF_8) //.form("file", file) // 文件名称为"file" @@ -120,7 +120,7 @@ public class CallThirdInterface { // 1. 创建HttpRequest对象 - 指定好 url 地址 HttpRequest httpRequest = new HttpRequest(url1); // 2. 设置请求方式，默认是GET请求 - httpRequest.timeout(2000000).setMethod(Method.POST); //设置3min超时 + httpRequest.timeout(600000).setMethod(Method.POST); //设置10min超时 // 3. 设置请求参数 可通过 form表单方法 设置 可以是文件类型 // form方法有很多重载方法,可以一个一个参数设置，也可以将参数封装进一个map集合然后一块儿 // File file = new File("C:\\Users\\hssym\\Downloads\\UBQ.png"); diff --git a/dangan-dangan/src/main/resources/mapper/dangan/AreaSortMapper.xml b/dangan-dangan/src/main/resources/mapper/dangan/AreaSortMapper.xml index b60152b..7fa1069 100644 --- a/dangan-dangan/src/main/resources/mapper/dangan/AreaSortMapper.xml +++ b/dangan-dangan/src/main/resources/mapper/dangan/AreaSortMapper.xml @@ -26,7 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and area_type = #{areaType} and pid = #{pid} - order by pid + order by id