From 0cf13d9df73e8e9befa36236756ef02dd5f60e94 Mon Sep 17 00:00:00 2001
From: suerprisePlus <15810472099@163.com>
Date: 星期六, 14 九月 2024 09:55:38 +0800
Subject: [PATCH] 接口修改

---
 src/main/java/com/yb/util/EntityHttpUtil.java |   87 ++++++++++++++++++++++++++++++++-----------
 1 files changed, 64 insertions(+), 23 deletions(-)

diff --git a/src/main/java/com/yb/util/EntityHttpUtil.java b/src/main/java/com/yb/util/EntityHttpUtil.java
index 11cea99..cc65d33 100644
--- a/src/main/java/com/yb/util/EntityHttpUtil.java
+++ b/src/main/java/com/yb/util/EntityHttpUtil.java
@@ -1,7 +1,9 @@
 package com.yb.util;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.yb.config.XzConfig;
+import io.swagger.v3.core.util.Json;
 import okhttp3.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -10,9 +12,11 @@
 
 import org.springframework.web.bind.annotation.RestController;
 
+import java.io.File;
 import java.io.IOException;
 
 import java.util.HashMap;
+import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
 @Component
@@ -21,27 +25,27 @@
     @Autowired
     private XzConfig xzConfig;
 
-    public  String getMessage(String aurl){
-        try{
-            String axiosUrl = xzConfig.geographicalUrl +aurl;
+    public String getMessage(String aurl) {
+        try {
+            String axiosUrl = xzConfig.geographicalUrl + aurl;
             OkHttpClient client = new OkHttpClient.Builder().connectTimeout(5, TimeUnit.SECONDS)
                     .readTimeout(5, TimeUnit.SECONDS)
                     .writeTimeout(5, TimeUnit.SECONDS)
                     .build();
             Request request = new Request.Builder()
-                    .addHeader("Token",xzConfig.token)
+                    .addHeader("Token", xzConfig.token)
                     .url(axiosUrl)
                     .build();
             Response response = client.newCall(request).execute();
             return response.body().string();
-        }catch (IOException e){
+        } catch (IOException e) {
             System.out.println(e.getMessage());
         }
-        return  null;
+        return null;
     }
 
-    public  String getAgentMessage(String aurl){
-        try{
+    public String getAgentMessage(String aurl) {
+        try {
 
             OkHttpClient client = new OkHttpClient.Builder().connectTimeout(0, TimeUnit.SECONDS)
                     .readTimeout(0, TimeUnit.SECONDS)
@@ -52,34 +56,71 @@
                     .build();
             Response response = client.newCall(request).execute();
             return response.body().string();
-        }catch (IOException e){
+        } catch (IOException e) {
             System.out.println(e.getMessage());
         }
-        return  null;
+        return null;
     }
-    public String getPostMessage(String aurl, HashMap<String,String> parms){
-        try{
-            String axiosUrl = xzConfig.geographicalUrl+aurl;
-            FormBody.Builder builder= new FormBody.Builder();
-            for(String key:parms.keySet()){
-                builder.add(key,parms.get(key));
+
+
+
+    public String getPostMessage(String aurl, HashMap<String, String> parms) {
+        try {
+            String axiosUrl = xzConfig.geographicalUrl + aurl;
+            FormBody.Builder builder = new FormBody.Builder();
+            for (String key : parms.keySet()) {
+                builder.add(key, parms.get(key));
             }
-            RequestBody requestBody =  builder.build();
-            OkHttpClient client = new OkHttpClient.Builder().connectTimeout(5, TimeUnit.SECONDS)
-                    .readTimeout(5, TimeUnit.SECONDS)
-                    .writeTimeout(5, TimeUnit.SECONDS)
+            RequestBody requestBody = builder.build();
+            OkHttpClient client = new OkHttpClient.Builder().connectTimeout(0, TimeUnit.SECONDS)
+                    .readTimeout(0, TimeUnit.SECONDS)
+                    .writeTimeout(0, TimeUnit.SECONDS)
                     .build();
             Request request = new Request.Builder()
-                    .addHeader("Token",xzConfig.token)
+                    .addHeader("Token", xzConfig.token)
                     .url(axiosUrl)
                     .post(requestBody)
                     .build();
             Response response = client.newCall(request).execute();
             return response.body().string();
-        }catch (IOException e){
+        } catch (IOException e) {
             System.out.println(e.getMessage());
         }
-        return  null;
+        return null;
     }
 
+    public String postAgentMessage(String aurl, Map<String, String> parms) {
+        try {
+            String axiosUrl = xzConfig.agentUrl + aurl;
+            MediaType JSON = MediaType.parse("application/json; charset=utf-8");
+//            JSONObject jsonObject= JSONObject.parseObject(parms.toString());
+            HashMap<String,Object> itemMap = new HashMap<>();
+            for (String key : parms.keySet()) {
+                if(key=="history_msg"){
+                    itemMap.put(key,JSONObject.parseObject( parms.get(key)));
+                }else{
+                    itemMap.put(key, parms.get(key));
+                }
+                System.out.println("rec application/json:" + key);
+            }
+            RequestBody requestBody = RequestBody.create(JSON,JSONObject.toJSON(itemMap).toString());
+            OkHttpClient client = new OkHttpClient.Builder().connectTimeout(0, TimeUnit.SECONDS)
+                    .readTimeout(0, TimeUnit.SECONDS)
+                    .writeTimeout(0, TimeUnit.SECONDS)
+                    .build();
+            Request request = new Request.Builder()
+                    .url(axiosUrl)
+                    .post(requestBody)
+                    .build();
+            Response response = client.newCall(request).execute();
+            return response.body().string();
+        } catch (IOException e) {
+            System.out.println(e.getMessage());
+        }
+        return null;
+
+
+
+
+    }
 }

--
Gitblit v1.9.3