修改读取配置文件

src/main/java/com/mortals/xhx/daemon/applicationservice/CaptureThread.java

@@ -9,6 +9,7 @@ import cn.hutool.http.HttpUtil;
 import cn.hutool.json.JSONObject;
 import cn.hutool.setting.dialect.Props;
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONValidator;
 import com.alibaba.fastjson.TypeReference;
 import com.mortals.framework.common.Rest;
 import com.mortals.xhx.common.code.YesNoEnum;
@@ -28,6 +29,7 @@ import org.pcap4j.packet.TcpPacket;
 import java.io.EOFException;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
+import java.nio.charset.Charset;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -239,21 +241,20 @@ public class CaptureThread implements Runnable {
             log.info("配置文件不存在,返回!");
             return;
         }
-        Props props = new Props(confPath);
-        //获取窗口id 默认值为0
-        windowId = props.getInt("windowId", 0);
-        //读取当前设置的窗口id
-/*        HcpReq hcpReq = new HcpReq();
-        hcpReq.setWindowid(windowId);//todo 读取窗口 共享文件
-        String hcpUrl = hcpGovUrl + "?affairCode=" + affairCode;
-        hcpReq.setUrl(hcpUrl);
 
-        String body = JSON.toJSONString(hcpReq);
-        // log.info("req url:{},body:{}", url, body);*/
+        String json = FileUtil.readString(confPath, Charset.forName("UTF-8"));
+
+        boolean jsonBoolean = JSONValidator.from(json).validate();
+        if (!jsonBoolean) {
+            log.info("配置文件格式错误,返回!:{}", json);
+            return;
+        }
+        HcpReq hcpReq = JSON.parseObject(json, HcpReq.class);
+
         String hcpUrl = hcpGovUrl + "?affairCode=" + affairCode;
         Map<String, Object> paramMap = new HashMap<>();
         paramMap.put("url", hcpUrl);
-        paramMap.put("windowid", windowId);
+        paramMap.put("windowid", hcpReq.getWindowid());
 
         log.info("req url:{},body:{}", url, JSON.toJSONString(paramMap));
         String response = HttpUtil.post(url, paramMap);
@@ -283,4 +284,12 @@ public class CaptureThread implements Runnable {
         return buffer;
     }
 
+
+    public static void main(String[] args) {
+        String json="{  }  12";
+        boolean jsonBoolean = JSONValidator.from(json).validate();
+
+        System.out.println(jsonBoolean);
+    }
+
 }