From 65f8bb313b93eefcc048941bad1498a74e91d9f5 Mon Sep 17 00:00:00 2001
From: weidong <weidong@im-droid.com>
Date: Thu, 1 Feb 2024 13:41:56 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=91=E9=A9=AC=E6=8E=A8=E9=80=81URL?=
 =?UTF-8?q?=E6=9C=89=E9=9D=9E=E6=B3=95=E5=AD=97=E7=AC=A6=EF=BC=8C=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../beidou_fwd/task/KingMaForwarder.java      | 27 ++++++++-----------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/KingMaForwarder.java b/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/KingMaForwarder.java
index a7ac763d..f0bce464 100644
--- a/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/KingMaForwarder.java
+++ b/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/KingMaForwarder.java
@@ -15,7 +15,6 @@ import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.PostConstruct;
-import java.net.URLEncoder;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -50,7 +49,7 @@ public class KingMaForwarder extends Forwarder{
     /**
      * 每半小时转发GNSS解算结果
      */
-    @Scheduled(cron = "0 0/35 * * * ?") // 每30分钟执行一次
+    @Scheduled(cron = "0 0/10 * * * ?") // 每30分钟执行一次
     private void forwardGnss() {
         logger.info("kingma forwardGnss");
         forwardCurrentGnss(FORWARDER_NAME);
@@ -65,7 +64,8 @@ public class KingMaForwarder extends Forwarder{
     boolean updateToken() throws Exception{
         String jsonLogin = "{\"username\":\""+login_user+"\"," +
                 "\"password\":\""+login_pwd+"\"}";
-        String result = HttpUtils.postJson(URLEncoder.encode(login_host,"UTF-8"), jsonLogin);
+
+        String result = HttpUtils.postJson(login_host, jsonLogin);
         if(result == null) return false;
 
         String token = null;
@@ -117,19 +117,14 @@ public class KingMaForwarder extends Forwarder{
             sendNum++;
         }
         String json = GsonUtil.toJson(dataList);
-        try {
-            String result = HttpUtils.postJson(URLEncoder.encode(data_host, "UTF-8"), header, json);
-            logger.info("project " + projectId + ": push calculation result to Kingma");
-            logger.info(json);
-            logger.info("result: " + result);
-            JSONObject obj = (JSONObject) JSONObject.parse(result);
-            String msg = obj.getString("message");
-            if (msg.equals("Success")) return sendNum;
-        }
-        catch (Exception e){
-            logger.error(e.toString());
-        }
-        return 0;
+        String result = HttpUtils.postJson(data_host,header,json);
+        logger.info("project " + projectId + ": push calculation result to Kingma");
+        logger.info(json);
+        logger.info("result: "+result);
+        JSONObject obj = (JSONObject) JSONObject.parse(result);
+        String msg = obj.getString("message");
+        if(msg.equals("Success")) return sendNum;
+        else return 0;
     }
 
 }