From ab3caa18b8c71d36f8f9dc31224adffe5bd1c8d3 Mon Sep 17 00:00:00 2001
From: zy_Java <654600784@qq.com>
Date: Fri, 9 Apr 2021 11:21:15 +0800
Subject: [PATCH] 20210409v1.5

---
 .../java/com/ccsens/tall/service/TaskDeliverService.java   | 5 +++--
 tall/src/main/resources/application-dev.yml                | 7 ++++---
 tall/src/main/resources/application-prod.yml               | 7 ++++---
 tall/src/main/resources/application-test.yml               | 5 +++--
 util/src/main/java/com/ccsens/util/PropUtil.java           | 2 +-
 5 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/tall/src/main/java/com/ccsens/tall/service/TaskDeliverService.java b/tall/src/main/java/com/ccsens/tall/service/TaskDeliverService.java
index ccac3969..71745605 100644
--- a/tall/src/main/java/com/ccsens/tall/service/TaskDeliverService.java
+++ b/tall/src/main/java/com/ccsens/tall/service/TaskDeliverService.java
@@ -332,9 +332,10 @@ public class TaskDeliverService implements ITaskDeliverService {
             business.setOperation(WebConstant.Wps.USER_OPERATION_NEW);
             business.setPrivilege(WebConstant.Wps.PROJECT_PRIVILEGE_READ);
             wpsService.saveFile(business);
-        }else {
-            throw new BaseException(CodeEnum.NOT_DELIVER_FILE);
         }
+//        else {
+//            throw new BaseException(CodeEnum.NOT_DELIVER_FILE);
+//        }
     }
 
     /**
diff --git a/tall/src/main/resources/application-dev.yml b/tall/src/main/resources/application-dev.yml
index aee7521b..f48fb9ba 100644
--- a/tall/src/main/resources/application-dev.yml
+++ b/tall/src/main/resources/application-dev.yml
@@ -41,8 +41,9 @@ file:
   domain: http://localhost:7030/v1.0/
   imgDomain: http://localhost:7030/v1.0/uploads
 #filedeal: http://localhost:8001/file/query
-filedeal: https://test.tall.wiki/file/query
+
 project:
   # redis是否需要加载 0：否 1 是
-  redisUpdate: 1
-  redisUpdateUrl: http://localhost:8001/constant/updateAll/
\ No newline at end of file
+  redisUpdate: 0
+  redisUpdateUrl: http://localhost:8001/constant/updateAll/
+  filedeal: https://test.tall.wiki/file/query
\ No newline at end of file
diff --git a/tall/src/main/resources/application-prod.yml b/tall/src/main/resources/application-prod.yml
index eae2197b..bc045ea7 100644
--- a/tall/src/main/resources/application-prod.yml
+++ b/tall/src/main/resources/application-prod.yml
@@ -46,8 +46,9 @@ file:
   path: /home/cloud/tall/uploads/
   domain: https://www.tall.wiki/gateway/tall/v1.0/
   imgDomain: https://www.tall.wiki/gateway/tall/v1.0/uploads
-filedeal: https://www.tall.wiki/filedeal/file/query
+
 project:
   # redis是否需要加载 0：否 1 是
-  redisUpdate: 1
-  redisUpdateUrl: https://www.tall.wiki/filedeal/constant/updateAll/
\ No newline at end of file
+  redisUpdate: 0
+  redisUpdateUrl: https://www.tall.wiki/filedeal/constant/updateAll/
+  filedeal: https://www.tall.wiki/filedeal/file/query
\ No newline at end of file
diff --git a/tall/src/main/resources/application-test.yml b/tall/src/main/resources/application-test.yml
index d10fd999..fda899da 100644
--- a/tall/src/main/resources/application-test.yml
+++ b/tall/src/main/resources/application-test.yml
@@ -46,11 +46,12 @@ file:
   path: /home/cloud/tall/uploads/
   domain: https://test.tall.wiki/gateway/tall/v1.0/
   imgDomain: https://test.tall.wiki/gateway/tall/v1.0/uploads
-filedeal: https://test.tall.wiki/filedeal/file/query
+
 project:
   # redis是否需要加载 0：否 1 是
-  redisUpdate: 1
+  redisUpdate: 0
   redisUpdateUrl: http://127.0.0.1:8001/constant/updateAll/
+  filedeal: https://test.tall.wiki/filedeal/file/query
 #file:
 #  domain: http://192.168.0.99/gateway/tall/v1.0/
 #  imgDomain: http://192.168.0.99/gateway/tall/v1.0/uploads
\ No newline at end of file
diff --git a/util/src/main/java/com/ccsens/util/PropUtil.java b/util/src/main/java/com/ccsens/util/PropUtil.java
index 3b04da69..8d89990f 100644
--- a/util/src/main/java/com/ccsens/util/PropUtil.java
+++ b/util/src/main/java/com/ccsens/util/PropUtil.java
@@ -109,7 +109,7 @@ public class PropUtil {
     public void setAccessPath(String accessPath) {
         PropUtil.accessPath = accessPath;
     }
-    @Value("${filedeal:}")
+    @Value("${project.filedeal:}")
     public void setFiledeal(String filedeal) {
         PropUtil.filedeal = filedeal;
     }