邮政接口优化

zwww-service/pom.xml

@@ -1,5 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>cn.com.taiji</groupId>
@@ -8,6 +9,11 @@
     </parent>
     <artifactId>zwww-service</artifactId>
     <name>zwww-service</name>
+    <version>1.0</version>
+    <description>DataService project for Spring Boot</description>
+    <properties>
+        <java.version>1.8</java.version>
+    </properties>
 
     <dependencies>
         <dependency>
@@ -27,6 +33,22 @@
             <optional>true</optional>
             <version>1.18.20</version>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.kafka</groupId>
+            <artifactId>spring-kafka</artifactId>
+            <version>2.2.4.RELEASE</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-redis</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>cn.com.taiji</groupId>
+            <artifactId>apione-http-client</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+            <scope>system</scope>
+            <systemPath>${basedir}/lib/apione-http-client-1.0.0-SNAPSHOT.jar</systemPath>
+        </dependency>
 
         <dependency>
             <groupId>com.alibaba</groupId>
@@ -41,19 +63,60 @@
         </dependency>
 
         <dependency>
-            <groupId>cn.com.taiji</groupId>
-            <artifactId>apione-http-client</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
-            <scope>system</scope>
-            <systemPath>${basedir}/src/main/resources/lib/apione-http-client-1.0.0-SNAPSHOT.jar</systemPath>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-amqp</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>2.11.0</version>
         </dependency>
     </dependencies>
+
     <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                    <encoding>utf-8</encoding>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <!--fork:设置True，否则可能devtools不会起作用-->
+                    <fork>true</fork>
+                    <!-- 指定该Main Class为全局的唯一入口 -->
+                    <mainClass>cn.com.taiji.dataService.DataServiceApplication</mainClass>
+                    <layout>ZIP</layout>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
         <resources>
             <resource>
+                <directory>lib</directory>
+                <targetPath>BOOT-INF/lib/</targetPath>
+                <includes>
+                    <include>**/*.jar</include>
+                </includes>
+            </resource>
+            <resource>
                 <directory>src/main/resources</directory>
                 <filtering>true</filtering>
             </resource>
         </resources>
     </build>
+
 </project>

zwww-service/src/main/java/cn/com/taiji/dataService/service/IProviewFetchingService.java

@@ -1,4 +1,4 @@
-// package cn.com.taiji.dataService.service;
+package cn.com.taiji.dataService.service;// package cn.com.taiji.dataService.service;
 //
 //
 // import cn.com.taiji.dataService.model.ProviewFetchingVO;

zwww-service/src/main/java/cn/com/taiji/dataService/service/impl/PerviewFetchingServiceImpl.java

@@ -1,4 +1,4 @@
-// package cn.com.taiji.dataService.service.impl;
+package cn.com.taiji.dataService.service.impl;// package cn.com.taiji.dataService.service.impl;
 //
 //
 // import cn.com.taiji.dataService.model.ProviewFetchingVO;

zwww-service/src/main/java/cn/com/taiji/dataService/task/ScheduleTJjk.java

@@ -31,6 +31,7 @@ public class ScheduleTJjk {
     @Resource
     private StringProducer producer;
 
+
     @Scheduled(cron = "0 20 3 * * ?")
     //@Scheduled(initialDelay = 5000,fixedDelay = 5*60*1000)
     public void task(){
@@ -79,7 +80,6 @@ public class ScheduleTJjk {
                 param.put("date",DateUtil.format(DateUtil.parse(object.getString("JDJK_STATISTICS.DATE_TIME")),"YYYY-MM-dd"));
                 param.put("top",object.getString("JDJK_STATISTICS.TOP"));
                 param.put("tjType",object.getString("JDJK_STATISTICS.TJTYPE"));
-                //国家邮政局_内件品名热门统计接口
                 String call = ApioneUtils.call(param.toJSONString(),ak, sk, api, region, requestUrl, mediaType, "", headerParamsMap, queryParamsMap);
 
                 NJPMRMTJDataResult njpmrmtjDataResult = JSON.parseObject(call, NJPMRMTJDataResult.class);
@@ -104,8 +104,8 @@ public class ScheduleTJjk {
 
                 com.alibaba.fastjson.JSONObject object = JSON.parseObject(obj.toString());
                 com.alibaba.fastjson.JSONObject param = new com.alibaba.fastjson.JSONObject();
+
                 param.put("date",DateUtil.format(DateUtil.parse(object.getString("JDJK_STATISTICS.DATE_TIME")),"YYYY-MM-dd"));
-                //国家邮政局_市县业务量统计接口
                 String call = ApioneUtils.call(param.toJSONString(),ak1, sk1, api1, region, requestUrl, mediaType, "", headerParamsMap, queryParamsMap);
 
                 SXYWLTJDataResult sxywltjDataResult = JSON.parseObject(call, SXYWLTJDataResult.class);
@@ -130,7 +130,6 @@ public class ScheduleTJjk {
 
                 param.put("date",DateUtil.format(DateUtil.parse(object.getString("JDJK_STATISTICS.DATE_TIME")),"YYYY-MM-dd"));
                 param.put("top",object.getString("JDJK_STATISTICS.TOP"));
-                //国家邮政局_收寄件热门城市接口
                 String call = ApioneUtils.call(param.toJSONString(),ak2, sk2, api2, region, requestUrl, mediaType, "", headerParamsMap, queryParamsMap);
 
                 SJJRMCSDataResult sjjrmcsDataResult = JSON.parseObject(call, SJJRMCSDataResult.class);

zwww-service/src/main/java/cn/com/taiji/dataService/task/ScheduleTask.java

@@ -87,24 +87,34 @@ public class ScheduleTask {
         Set<String> keys = stringRedisTemplate.keys("ZWWW_" + "*");
         for (String key : keys) {
             String value = stringRedisTemplate.opsForValue().get(key);
-            HttpReturn bReturn = connect(value, ak3, sk3, api3);
+            HttpReturn bReturn;
+            String kafkaTopic;
+            if (key.contains("JJ")) {
+                bReturn = connect(value, ak3, sk3, api3);
+                kafkaTopic = topic;
+            } else if (key.contains("SJ")) {
+                //收件接口结果查询
+                bReturn = connect(value, ak5, sk5, api5);
+                kafkaTopic = "gjyzj_kdsjcxjgjk";
+            } else {
+                continue;
+            }
             JSONObject subObject = JSON.parseObject(bReturn.getResponse());
-            JSONObject subObject1= JSON.parseObject(subObject.getString("data"));
+            JSONObject subObject1 = JSON.parseObject(subObject.getString("data"));
             if(500==subObject1.getInteger("status")){
                 stringRedisTemplate.opsForValue().set(key,value,25, TimeUnit.HOURS);
             }else {
                 JSONArray data = JSON.parseArray(subObject1.getString("data"));
                 data.stream().forEach(d->{
                     //结果推送kafka
-                    producer.sendMessage(topic,d.toString());
+                    producer.sendMessage(kafkaTopic,d.toString());
                 });
             }
         }
+
         String date = DateUtil.format(DateUtil.yesterday(), "YYYYMMdd");
-        //打私办入参数据
         String contentJson = "<soapenv:Envelope xmlns:soapenv=\"http://schemas.xmlsoap.org/soap/envelope/\" xmlns:ser=\"http://server.unimas.com/\"> <soapenv:Header/> <soapenv:Body> <ser:query> <in>&lt;?xml version=\"1.0\" encoding=\"UTF-8\"?&gt; &lt;search&gt; &lt;appname&gt;query193&lt;/appname&gt; &lt;limited&gt;100&lt;/limited&gt; &lt;conditions&gt; &lt;s1f1c1&gt;"+
                 date+"&lt;/s1f1c1&gt; &lt;/conditions&gt; &lt;/search&gt;</in> </ser:query> </soapenv:Body>";
-        //调用打私办接口，获取返回数据
         HttpReturn connect = connect(contentJson, ak1, sk1,api1);
         String response = connect.getResponse();
         JSONArray handle = ResultHandle.handle(response);
@@ -114,11 +124,10 @@ public class ScheduleTask {
             return;
         }
 
-        //获取打私办返回数据，组装邮政接口入参参数
         handle.stream().forEach(array->{
 
-            com.alibaba.fastjson.JSONObject object = JSON.parseObject(array.toString());
-            com.alibaba.fastjson.JSONObject param = new com.alibaba.fastjson.JSONObject();
+            JSONObject object = JSON.parseObject(array.toString());
+            JSONObject param = new JSONObject();
             param.put("data",object.getString("JDJK_SEND.DATA"));
             param.put("dataType",object.getString("JDJK_SEND.DATETYPE"));
             param.put("type",object.getString("JDJK_SEND.TYPE"));
@@ -127,7 +136,7 @@ public class ScheduleTask {
             param.put("photoName",object.getString("JDJK_SEND.PHOTONAME"));
             param.put("photo",object.getString("JDJK_SEND.PHOTO"));
 
-            //快递寄件接口
+            //寄件接口
             HttpReturn httpReturn = connect(param.toJSONString(), ak2, sk2, api2);
             System.out.println(httpReturn.getResponse());
             QueryData queryData = JSON.parseObject(httpReturn.getResponse(), QueryData.class);
@@ -136,9 +145,8 @@ public class ScheduleTask {
                 return;
             }
             int queryNo = queryData.getData().getData().getQueryNo();
-            com.alibaba.fastjson.JSONObject param3 = new com.alibaba.fastjson.JSONObject();
+            JSONObject param3 = new JSONObject();
             param3.put("queryNo",queryNo);
-            //寄件结果查询接口
             HttpReturn aReturn = connect(param3.toJSONString(), ak3, sk3, api3);
             String response1 = aReturn.getResponse();
 
@@ -155,7 +163,7 @@ public class ScheduleTask {
                 });
             }
 
-            //快递收件接口协查函
+            //收件接口协查函
             HttpReturn httpReturn4 = connect(param.toJSONString(), ak4, sk4, api4);
             System.out.println(httpReturn4.getResponse());
             QueryData queryData4 = JSON.parseObject(httpReturn4.getResponse(), QueryData.class);
@@ -164,7 +172,7 @@ public class ScheduleTask {
                 return;
             }
             int queryNo4 = queryData4.getData().getData().getQueryNo();
-            com.alibaba.fastjson.JSONObject param4 = new com.alibaba.fastjson.JSONObject();
+            JSONObject param4 = new JSONObject();
             param4.put("queryNo",queryNo4);
             //收件接口结果查询
             HttpReturn aReturn4 = connect(param4.toJSONString(), ak5, sk5, api5);

zwww-service/src/main/java/cn/com/taiji/dataService/task/ScheduleXchJgxz.java

@@ -120,22 +120,20 @@ public class ScheduleXchJgxz {
             param.put("photoName",object.getString("JDJK_SEND.PHOTONAME"));
             param.put("photo",object.getString("JDJK_SEND.PHOTO"));
 
-            //疑似涉私寄件快递信息_协查函
             String call1 = ApioneUtils.call(param.toJSONString(),ak_jj_xch, sk_jj_xch, apiName, region, requestUrl, mediaType, "", headerParamsMap, queryParamsMap);
 
-            //疑似涉私收件快递信息_协查函
+
             String call2 = ApioneUtils.call(param.toJSONString(),ak_sj_xch, sk_sj_xch, apiName1, region, requestUrl, mediaType, "", headerParamsMap, queryParamsMap);
 
-            //异常寄件地点快递信息_协查函
+
             String call3 = ApioneUtils.call(param.toJSONString(),ak_ycjj_xch, sk_ycjj_xch, apiName3, region, requestUrl, mediaType, "", headerParamsMap, queryParamsMap);
 
-            //异常寄件人行为分析信息_协查函
+
             String call4 = ApioneUtils.call(param.toJSONString(),ak_ycjjr_xch, sk_ycjjr_xch, apiName4, region, requestUrl, mediaType, "", headerParamsMap, queryParamsMap);
 
-            //异常收件地点快递信息_协查函
+
             String call5 = ApioneUtils.call(param.toJSONString(),ak_ycsj_xch, sk_ycsj_xch, apiName5, region, requestUrl, mediaType, "", headerParamsMap, queryParamsMap);
 
-            //异常收件人行为分析信息_协查函
             String call6 = ApioneUtils.call(param.toJSONString(),ak_ycsjr_xch, sk_ycsjr_xch, apiName6, region, requestUrl, mediaType, "", headerParamsMap, queryParamsMap);
 
 

zwww-service/src/main/java/cn/com/taiji/dataService/task/TjTest0823.java

@@ -0,0 +1,175 @@
+package cn.com.taiji.dataService.task;
+
+import cn.com.digitalhainan.apione.sdk.ContentBody;
+import cn.com.digitalhainan.apione.sdk.HttpCaller;
+import cn.com.digitalhainan.apione.sdk.HttpParameters;
+import cn.com.digitalhainan.apione.sdk.HttpReturn;
+
+import cn.com.taiji.dataService.task.NJPMRMTJDataResult;
+import cn.com.taiji.dataService.utils.ApioneUtils;
+import cn.com.taiji.dataService.utils.ResultHandle;
+import cn.com.taiji.dataService.utils.StringProducer;
+import cn.hutool.core.date.DateUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import lombok.extern.slf4j.Slf4j;
+
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 测试代码。可删除
+ */
+@Slf4j
+public class TjTest0823 {
+
+    public static void main(String[] args) {
+
+        String region = "INTRA";
+        String requestUrl = "https://api-one.digitalhainan.com.cn/apione";
+        String mediaType="application/json";
+
+        String ak_dsb = "AK50976835f38d41bc94349a7bce75fcc8";
+        String sk_dsb = "SKc08527f892ac475f81e2f5ba440b283b";
+        String api_dsb = "DZZW_DSB_JDJK_TJLQQCS_DSJJ";
+
+
+        //国家邮政局_内件品名热门统计接口
+        String ak = "AKefa11a3e59f1448a8e3da49af4c260d5";
+        String sk = "SK6b6285acbcff49ee922fb3c27e90163f";
+        String api = "gjyzj_njpmrmtjjk";
+
+        //国家邮政局_市县业务量统计接口
+        String ak1 = "AK06e53764285a45a7abe2493b5daf1604";
+        String sk1 = "SK63a1a49fac9f4a969c049770be2d97db";
+        String api1 = "gjyzj_sxywltjjk";
+
+        //国家邮政局_收寄件热门城市接口
+        String ak2 = "AK0bc6087e0e9a4ad597ed26d434c51ec4";
+        String sk2 = "SKba3f5cf136e04073ae2fcd0f5da9d27f";
+        String api2 = "gjyzj_sjjrmcsjk";
+
+        Map<String, String> headerParamsMap=new HashMap<>();
+        headerParamsMap.put("Authorization","Bearer 7bee4ad2-1d1f-36e0-b9ab-625a7e495de2");
+        Map<String, String> queryParamsMap=new HashMap<>();
+
+        String date = DateUtil.format(DateUtil.yesterday(), "YYYYMMdd");
+        String response = DSBJK(ak_dsb, sk_dsb, api_dsb, "query207", "gjyzj_njpmrmtjjk", "20230823");
+        String response1 = DSBJK(ak_dsb, sk_dsb, api_dsb, "query207", "gjyzj_sxywltjjk", "20230823");
+        String response2 = DSBJK(ak_dsb, sk_dsb, api_dsb, "query207", "gjyzj_sjjrmcsjk", "20230823");
+
+        JSONArray handle = ResultHandle.handle(response);
+        if(handle!=null){
+            handle.stream().forEach(obj->{
+
+                com.alibaba.fastjson.JSONObject object = JSON.parseObject(obj.toString());
+                com.alibaba.fastjson.JSONObject param = new com.alibaba.fastjson.JSONObject();
+
+                param.put("date",DateUtil.format(DateUtil.parse(object.getString("JDJK_STATISTICS.DATE_TIME")),"YYYY-MM-dd"));
+                param.put("top",object.getString("JDJK_STATISTICS.TOP"));
+                param.put("tjType",object.getString("JDJK_STATISTICS.TJTYPE"));
+                String call = ApioneUtils.call(param.toJSONString(),ak, sk, api, region, requestUrl, mediaType, "", headerParamsMap, queryParamsMap);
+
+                NJPMRMTJDataResult njpmrmtjDataResult = JSON.parseObject(call, NJPMRMTJDataResult.class);
+                if(njpmrmtjDataResult.getCode()==0){
+                    RecSen1 data = njpmrmtjDataResult.getData().getData();
+                    List<Rec1> rec = data.getRec();
+                    for(Rec1 r:rec){
+                        System.out.println(r);
+                    }
+                    List<Rec1> sen = data.getSen();
+                    for(Rec1 r:sen){
+                        System.out.println(r);
+                    }
+                }
+            });
+        }
+
+
+        JSONArray handle1 = ResultHandle.handle(response1);
+        if(handle1!=null){
+            handle1.stream().forEach(obj->{
+
+                com.alibaba.fastjson.JSONObject object = JSON.parseObject(obj.toString());
+                com.alibaba.fastjson.JSONObject param = new com.alibaba.fastjson.JSONObject();
+
+                param.put("date",DateUtil.format(DateUtil.parse(object.getString("JDJK_STATISTICS.DATE_TIME")),"YYYY-MM-dd"));
+                String call = ApioneUtils.call(param.toJSONString(),ak1, sk1, api1, region, requestUrl, mediaType, "", headerParamsMap, queryParamsMap);
+                log.info("call1--{}",call);
+            });
+        }
+
+        JSONArray handle2 = ResultHandle.handle(response2);
+        if(handle2!=null){
+            handle2.stream().forEach(obj->{
+
+                com.alibaba.fastjson.JSONObject object = JSON.parseObject(obj.toString());
+                com.alibaba.fastjson.JSONObject param = new com.alibaba.fastjson.JSONObject();
+
+                param.put("date",DateUtil.format(DateUtil.parse(object.getString("JDJK_STATISTICS.DATE_TIME")),"YYYY-MM-dd"));
+                param.put("top",object.getString("JDJK_STATISTICS.TOP"));
+                String call = ApioneUtils.call(param.toJSONString(),ak2, sk2, api2, region, requestUrl, mediaType, "", headerParamsMap, queryParamsMap);
+                log.info("call1--{}",call);
+            });
+        }
+
+
+
+    }
+
+    /**
+     * 打私办请求接口
+     * @param ak
+     * @param sk
+     * @param api
+     * @param queryID
+     * @param tableName
+     * @param date
+     * @return 接口返回值
+     */
+    public static String DSBJK(String ak,String sk,String api,String queryID,String tableName,String date){
+        String region = "INTRA";
+        String requestUrl = "https://api-one.digitalhainan.com.cn/apione";
+
+        String contentJson = "<soapenv:Envelope xmlns:soapenv=\"http://schemas.xmlsoap.org/soap/envelope/\" xmlns:ser=\"http://server.unimas.com/\">\n" +
+                "   <soapenv:Header/>\n" +
+                "   <soapenv:Body>\n" +
+                "      <ser:query>\n" +
+                "         <in>&lt;?xml version=\"1.0\" encoding=\"UTF-8\"?&gt;\n" +
+                "               &lt;search&gt;\n" +
+                "               &lt;appname&gt;"+queryID+"&lt;/appname&gt;\n" +
+                "               &lt;limited&gt;100&lt;/limited&gt;\n" +
+                "               &lt;conditions&gt;\n" +
+                "                  &lt;s1f1c2&gt;"+tableName+"&lt;/s1f1c2&gt;\n" +
+                "                  &lt;s1f1c1&gt;"+date+"&lt;/s1f1c1&gt;\n" +
+                "               &lt;/conditions&gt;\n" +
+                "               &lt;/search&gt;</in>\n" +
+                "      </ser:query>\n" +
+                "   </soapenv:Body>";
+
+        ContentBody contentBody = new ContentBody(contentJson);
+
+
+        //拼装业务信息
+        HttpParameters parameters = HttpParameters.builder()
+                .api(api)
+                .region(region)
+                // 如果有query参数需要设置
+                //.queryParamsMap(query)
+                // 如果有path参数需要设置
+                //.path(path)
+                .accessKey(ak)
+                .secretKey(sk)
+                .contentBody(contentBody)
+                .requestUrl(requestUrl)
+                .build();
+
+        // 请求服务接口，获取response
+        HttpReturn call = HttpCaller.getInstance().call(parameters);
+        String response = call.getResponse();
+        System.out.println(response);
+        return response;
+    }
+}

zwww-service/src/main/java/cn/com/taiji/dataService/utils/MyHttpCaller.java

@@ -50,8 +50,8 @@ public class MyHttpCaller {
             this.client = builder.build();
         }
 
-        public static cn.com.taiji.dataService.utils.MyHttpCaller getInstance() {
-            return cn.com.taiji.dataService.utils.MyHttpCaller.OkHttpHolder.INSTANCE;
+        public static MyHttpCaller getInstance() {
+            return OkHttpHolder.INSTANCE;
         }
 
         public HttpReturn call(HttpParameters httpParameters) {

zwww-service/src/main/java/cn/com/taiji/dataService/utils/ResultHandle.java

@@ -1,5 +1,9 @@
 package cn.com.taiji.dataService.utils;
 
+import cn.com.digitalhainan.apione.sdk.ContentBody;
+import cn.com.digitalhainan.apione.sdk.HttpCaller;
+import cn.com.digitalhainan.apione.sdk.HttpParameters;
+import cn.com.digitalhainan.apione.sdk.HttpReturn;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.XML;
 import com.alibaba.fastjson.JSON;
@@ -43,6 +47,45 @@ public class ResultHandle {
         return  null;
     }
 
+    public static JSONObject handleJSONObject(String response){
+        try {
+            SOAPMessage msg = formatSoapString(response);
+            SOAPBody body = msg.getSOAPBody();
+            Iterator<SOAPElement> iterator = body.getChildElements();
+            JSONObject jsonObject = PrintBody(iterator, null);
+            return jsonObject;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return  null;
+    }
+
+    public static HttpReturn connect(String contentJson, String ak, String sk, String api){
+        //String region = "接口请求区域 INTRA(政务外网),INTER(政务互联网),PUBLIC(公网)";
+        String region = "INTRA";
+        String requestUrl = "https://api-one.digitalhainan.com.cn/apione";
+        ContentBody contentBody = new ContentBody(contentJson);
+
+        //拼装业务信息
+        HttpParameters parameters = HttpParameters.builder()
+                .api(api)
+                .region(region)
+                // 如果有query参数需要设置
+                //.queryParamsMap(query)
+                // 如果有path参数需要设置
+                //.path(path)
+                .accessKey(ak)
+                .secretKey(sk)
+                .contentBody(contentBody)
+                .requestUrl(requestUrl)
+                .build();
+
+        // 请求服务接口，获取response
+        HttpReturn call = HttpCaller.getInstance().call(parameters);
+
+        return call;
+    }
+
 
 
     /**

zwww-service/src/main/java/cn/com/taiji/dataService/utils/TomcatConfig.java

@@ -0,0 +1,25 @@
+package cn.com.taiji.dataService.utils;
+
+import org.apache.catalina.connector.Connector;
+import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @Description tomcat配置
+ * @author chen mh
+ * @date 2023/7/7 8:51
+ */
+@Configuration
+public class TomcatConfig {
+
+    @Bean
+    public TomcatServletWebServerFactory webServerFactory() {
+        TomcatServletWebServerFactory factory = new TomcatServletWebServerFactory();
+        factory.addConnectorCustomizers((Connector connector) -> {
+            connector.setProperty("relaxedPathChars", "\"<>[\\]^`{|}");
+            connector.setProperty("relaxedQueryChars", "\"<>[\\]^`{|}");
+        });
+        return factory;
+    }
+}

zwww-service/src/main/resources/application-zwww.yml

@@ -1,5 +1,5 @@
 server:
-  port: 9998
+  port: 9995
 
 spring:
   kafka:
@@ -57,4 +57,16 @@ taiji:
   api4: gjyzj_kdsjcxjk
   ak5: AK1a2073a397034645a830cacd395549bc #国家邮政局_快递收件查询结果接口(结果反馈)
   sk5: SKd1aebd2feb2b407dbd86afc711e80db5
-  api5: gjyzj_kdsjcxjgjk
+  api5: gjyzj_kdsjcxjgjk
+
+  island:
+    person:
+      ak: AKf28efa2a520349c9b4fd4395fabdd5bd
+      sk: SK7db59facce1c4cf8af767d1e93c83881
+      api: DZZW_JCDRYTJXX_SGPT
+      appname: query200
+    flight:
+      ak: AK0cc95b0affe443d79d32b9c0a96dd301
+      sk: SKc5dbd890c3df448f90f7b79dfed6d4c1
+      api: DZZW_RKJJCDHBTJXX_SGPT
+      appname: query201