Merge remote-tracking branch 'origin/master'

README.md

@@ -29,10 +29,11 @@
 
 ## 在线体验
 
-- admin/admin123  
+- admin/admin123  sysAdmin/123456
 
 #影源扫描仪    授权码：V4tMKPYgFtW8vQr4C0s4/g==
 测试临时码：D+1WT4eWDqLseG5433yq9w==
 #系统中扫描上传   连接打印机的电脑需要安装两个：扫描仪驱动M3230.zip、webscan.exe插件 (已上传到项目)   
 
-#TODO timeout时间修改    第三方接口修改  
+#清理后的sql文件：dangan-clear.sql 已上传项目
+

dangan-admin/src/main/resources/application.yml

@@ -93,7 +93,7 @@ spring:
 # token配置
 token:
   #是否允许账户多终端同时登录（true允许 false不允许）
-  soloLogin: true
+  soloLogin: false
   # 令牌自定义标识
   header: Authorization
   # 令牌密钥
@@ -134,17 +134,20 @@ xss:
 
 ocr:
   #第三方访问地址  #深县服务器IP：20.206.150.166
-  url1: https://4493yu98cz42.vicp.fun/upload_api
+  #url1: http://ocr.nat300.top/upload_api
+  #url1: https://4493yu98cz42.vicp.fun/upload_api
   #url1: http://123.57.142.195:443/upload_api
-  #url1: http://20.206.150.166:22443/upload_api
+  url1: http://20.206.150.166:22443/upload_api
 
-  url2: https://4493yu98cz42.vicp.fun/get_result
+  #url2: http://ocr.nat300.top/get_result
+  #url2: https://4493yu98cz42.vicp.fun/get_result
   #url2: http://123.57.142.195:443/get_result
-  #url2: http://20.206.150.166:22443/get_result
+  url2: http://20.206.150.166:22443/get_result
 
   #url3: http://123.57.142.195:443/get_file_count
-  #url3: http://20.206.150.166:22443/get_file_count
+  #url3: http://20.206.150.166:22443/get_file_count   前端task.vue用
 
-  url4: https://4493yu98cz42.vicp.fun/clear
+  #url4: http://ocr.nat300.top/clear
+  #url4: https://4493yu98cz42.vicp.fun/clear
   #url4: http://123.57.142.195:443/clear
-  #url4: http://20.206.150.166:22443/clear
+  url4: http://20.206.150.166:22443/clear

dangan-dangan/src/main/java/com/da/dangan/domain/DaPicturesRecard.java

@@ -43,7 +43,7 @@ public class DaPicturesRecard extends BaseEntity
     private String muPath;
 
     /** 业务类型(字典) */
-    @Excel(name = "业务类型(字典)")
+    @Excel(name = "业务类型",dictType = "yw_type")
     private String ywType;
 
     /** 对应档案记录id */
@@ -51,11 +51,11 @@ public class DaPicturesRecard extends BaseEntity
     private Long daJlId;
 
     /** 是否已识别 */
-    @Excel(name = "是否已识别")
+    @Excel(name = "是否已识别(0否1是)")
     private String recognize;
 
     /** 是否纠错(字典0否1是) */
-    @Excel(name = "是否纠错(字典0否1是)")
+    @Excel(name = "是否纠错(0否1是)")
     private String errorCorrect;
 
     /**

dangan-dangan/src/main/java/com/da/dangan/util/CallThirdInterface.java

@@ -120,7 +120,7 @@ public  class CallThirdInterface {
             // 1. 创建HttpRequest对象 - 指定好 url 地址
             HttpRequest httpRequest = new HttpRequest(url1);
             // 2. 设置请求方式，默认是GET请求
-            httpRequest.timeout(180000).setMethod(Method.POST);  //设置3min超时
+            httpRequest.timeout(300000).setMethod(Method.POST);  //设置3min超时
             // 3. 设置请求参数 可通过 form表单方法 设置   可以是文件类型
             //    form方法有很多重载方法,可以一个一个参数设置，也可以将参数封装进一个map集合然后一块儿
             // File file = new File("C:\\Users\\hssym\\Downloads\\UBQ.png");

dangan-dangan/src/main/resources/mapper/dangan/DaPicturesRecardMapper.xml

@@ -32,6 +32,7 @@
         left join da_user_catalog uc on p.mu_id = uc.mu_id
         <where>
             <if test="userId != null"> and uc.user_id = #{userId}</if>
+            <if test="id != null "> and id = #{id}</if>
             <if test="picName != null  and picName != ''"> and pic_name like concat('%', #{picName}, '%')</if>
             <if test="picUrl != null  and picUrl != ''"> and pic_url = #{picUrl}</if>
             <if test="wlsjId != null "> and wlsj_id = #{wlsjId}</if>

dangan-ui/src/views/dangan/task/index.vue

@@ -312,9 +312,9 @@
       /** 查询识别进度 */
       getProgress() {
         // 向给定ID的用户发起请求
-        axios.post('http://ocr.nat300.top/get_file_count',`taskId=${this.form.id}`, {
-        //axios.post('http://123.57.142.195:443/get_file_count',`taskId=${this.form.id}`, {
-          //axios.post('http://20.206.150.166:22443/get_file_count',`taskId=${this.form.id}`, {
+        //axios.post('https://4493yu98cz42.vicp.fun/get_file_count',`taskId=${this.form.id}`, {
+        //axios.post('http://ocr.nat300.top/get_file_count',`taskId=${this.form.id}`, {
+          axios.post('http://20.206.150.166:22443/get_file_count',`taskId=${this.form.id}`, {
           headers: {
             'Content-Type': 'application/x-www-form-urlencoded'
           }