From 81cabdda2eb43c5b976d0a652208bb529830a253 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 11 十月 2023 16:45:12 +0800
Subject: [PATCH] 解决获取数简任务状态报错

---
 src/main/java/com/moon/server/service/data/ShuJianService.java |    4 ++++
 src/main/resources/application.yml                             |    8 ++++----
 src/main/java/com/moon/server/helper/HttpHelper.java           |    4 ++++
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/moon/server/helper/HttpHelper.java b/src/main/java/com/moon/server/helper/HttpHelper.java
index bc2bda9..1c02ea0 100644
--- a/src/main/java/com/moon/server/helper/HttpHelper.java
+++ b/src/main/java/com/moon/server/helper/HttpHelper.java
@@ -270,6 +270,10 @@
         if (null == entity) {
             return;
         }
+        if (null == res) {
+            entity.writeTo(response.getOutputStream());
+            return;
+        }
 
         switch (res.getCategory()) {
             case 2:
diff --git a/src/main/java/com/moon/server/service/data/ShuJianService.java b/src/main/java/com/moon/server/service/data/ShuJianService.java
index 62a775d..7e99ab0 100644
--- a/src/main/java/com/moon/server/service/data/ShuJianService.java
+++ b/src/main/java/com/moon/server/service/data/ShuJianService.java
@@ -12,6 +12,7 @@
 import com.moon.server.helper.HttpHelper;
 import com.moon.server.helper.RestHelper;
 import com.moon.server.helper.StringHelper;
+import com.moon.server.helper.WebHelper;
 import com.moon.server.service.sys.LayerService;
 import com.moon.server.service.sys.ResService;
 import org.apache.commons.logging.Log;
@@ -91,6 +92,7 @@
             httpHelper.service(req, res, null, url);
         } catch (Exception ex) {
             log.error(ex.getMessage(), ex);
+            WebHelper.writeJson2Page(res,ex.getMessage());
         }
     }
 
@@ -105,6 +107,7 @@
             httpHelper.service(req, res, null, url);
         } catch (Exception ex) {
             log.error(ex.getMessage(), ex);
+            WebHelper.writeJson2Page(res,ex.getMessage());
         }
     }
 
@@ -119,6 +122,7 @@
             httpHelper.service(req, res, null, url);
         } catch (Exception ex) {
             log.error(ex.getMessage(), ex);
+            WebHelper.writeJson2Page(res,ex.getMessage());
         }
     }
 
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index e106e61..c04d2c7 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -46,12 +46,12 @@
   datasource:
     name: prod
     # JDBC 鍩烘湰閰嶇疆 &currentSchema=public
-    #url: jdbc:postgresql://127.0.0.1:5433/moon?useAffectedRows=true
-    url: jdbc:postgresql://192.168.20.83:5433/moon?useAffectedRows=true
+    url: jdbc:postgresql://127.0.0.1:5433/moon?useAffectedRows=true
+    #url: jdbc:postgresql://192.168.20.83:5433/moon?useAffectedRows=true
     #url: jdbc:postgresql://103.85.165.99:25432/moon?useAffectedRows=true
     username: postgres
-    password: Postgres!_14_moon
-    #password: postgres
+    #password: Postgres!_14_moon
+    password: postgres
     driver-class-name: org.postgresql.Driver
     platform: POSTGRESQL
     type: com.alibaba.druid.pool.DruidDataSource

--
Gitblit v1.9.3