From cbddf31eccd506aa4a0f9062b55800c4e2c1d524 Mon Sep 17 00:00:00 2001
From: xusd <hugeinfo123>
Date: Tue, 17 Sep 2024 19:08:31 +0800
Subject: [PATCH] 环境配置修正;增加正式环境

---
 dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/service/GridToDoService.java |   26 ++++++++++++++++----------
 1 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/service/GridToDoService.java b/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/service/GridToDoService.java
index f792cf3..fc776f2 100644
--- a/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/service/GridToDoService.java
+++ b/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/service/GridToDoService.java
@@ -7,6 +7,7 @@
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import java.util.HashMap;
@@ -16,15 +17,17 @@
 @Slf4j
 @Service
 public class GridToDoService {
-    private String gridUrl = "http://219.137.166.84:8061";
+    @Value("${grid.url:http://219.137.166.84:8061}")
+    private String gridUrl;
+
 
     public R<GridToDoVo> createToDo(GridToDoVo gridToDoVo) {
-        HeadVo headVo = iniHeadVo();
+        HeadVo headVo = initHeadVo();
         GridToDoRequestVo requestVo = new GridToDoRequestVo();
         requestVo.setHeadVo(headVo);
         requestVo.setBodyVo(gridToDoVo);
         log.info("xsd:{}", JSON.toJSONString(requestVo));
-        log.info("xsd:{}",gridUrl + "/sysUserTodo/save");
+        log.info("xsd:{}", gridUrl + "/sysUserTodo/save");
         String s = null;
         try {
             s = HttpClientUtils.httpPostRaw(gridUrl + "/sysUserTodo/save", JSON.toJSONString(requestVo), new HashMap<>(), "utf-8");
@@ -38,23 +41,26 @@
     }
 
     public R<GridToDoVo> updateToDo(GridToDoVo gridToDoVo) {
-        HeadVo headVo = iniHeadVo();
+        HeadVo headVo = initHeadVo();
         GridToDoRequestVo requestVo = new GridToDoRequestVo();
         requestVo.setHeadVo(headVo);
         requestVo.setBodyVo(gridToDoVo);
         String s = null;
+        log.info("xsd:{}", JSON.toJSONString(requestVo));
+        log.info("xsd:{}", gridUrl + "/sysUserTodo/update");
         try {
             s = HttpClientUtils.httpPostRaw(gridUrl + "/sysUserTodo/update", JSON.toJSONString(requestVo), new HashMap<>(), "utf-8");
         } catch (Exception e) {
             log.info("xsderror:{}", e);
             throw new RuntimeException(e);
         }
-        gridToDoVo = JSONObject.parseObject(s, GridToDoVo.class);
+        log.info("xsd:{}", s);
+        gridToDoVo = JSONObject.parseObject(s).getObject("data", GridToDoVo.class);
         return R.ok(gridToDoVo);
     }
 
     public R<String> deleteToDo(GridIdsVo gridIdsVo) {
-        HeadVo headVo = iniHeadVo();
+        HeadVo headVo = initHeadVo();
         GridToDoDeleteRequestVo requestVo = new GridToDoDeleteRequestVo();
         requestVo.setHeadVo(headVo);
         requestVo.setBodyVo(gridIdsVo);
@@ -62,7 +68,7 @@
         log.info("xsd:{}", gridUrl + "/sysUserTodo/batchDel");
         String s = null;
         try {
-            s = HttpClientUtils.httpPostRaw(gridUrl + "/sysUserTodo/batchDel",  JSON.toJSONString(requestVo), new HashMap<>(), "utf-8");
+            s = HttpClientUtils.httpPostRaw(gridUrl + "/sysUserTodo/batchDel", JSON.toJSONString(requestVo), new HashMap<>(), "utf-8");
         } catch (Exception e) {
             log.info("xsderror:{}", e);
             throw new RuntimeException(e);
@@ -77,7 +83,7 @@
 
     }
 
-    public HeadVo iniHeadVo() {
+    public HeadVo initHeadVo() {
         HeadVo headVo = new HeadVo();
         headVo.setUsername("mtxt001");
         headVo.setPassword("aek8CdcaM");
@@ -87,7 +93,7 @@
     }
 
     public R<List<GridToDoVo>> getToDo(GridGetToDoVo gridGetToDoVo) {
-        HeadVo headVo = iniHeadVo();
+        HeadVo headVo = initHeadVo();
         GridToDoGetRequestVo requestVo = new GridToDoGetRequestVo();
         gridGetToDoVo.setCurrent(1);
         gridGetToDoVo.setSize(10);
@@ -97,7 +103,7 @@
         log.info("xsd:{}", gridUrl + "/sysUserTodo/page");
         String s = null;
         try {
-            s = HttpClientUtils.httpPostRaw(gridUrl + "/sysUserTodo/page",  JSON.toJSONString(requestVo), new HashMap<>(), "utf-8");
+            s = HttpClientUtils.httpPostRaw(gridUrl + "/sysUserTodo/page", JSON.toJSONString(requestVo), new HashMap<>(), "utf-8");
         } catch (Exception e) {
             log.info("xsderror:{}", e);
             throw new RuntimeException(e);

--
Gitblit v1.8.0