1

.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_6.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.httpcomponents:httpclient:4.5.6">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpclient/4.5.6/httpclient-4.5.6.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpclient/4.5.6/httpclient-4.5.6-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpclient/4.5.6/httpclient-4.5.6-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_10.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.httpcomponents:httpcore:4.4.10">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpcore/4.4.10/httpcore-4.4.10.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpcore/4.4.10/httpcore-4.4.10-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpcore/4.4.10/httpcore-4.4.10-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

sooka-auth/target/surefire-reports/com.sooka.AuthApplicationTests.txt

@@ -1,4 +1,4 @@
 -------------------------------------------------------------------------------
 Test set: com.sooka.AuthApplicationTests
 -------------------------------------------------------------------------------
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 14.24 s - in com.sooka.AuthApplicationTests
+Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 9.854 s - in com.sooka.AuthApplicationTests

sooka-common/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Fri Sep 17 08:49:57 CST 2021
+#Tue Oct 19 14:53:42 CST 2021
 version=0.0.1-SNAPSHOT
 groupId=com.sooka
 artifactId=sooka-common

sooka-gateway/target/surefire-reports/com.sooka.gateway.GatewayApplicationTests.txt

@@ -1,4 +1,4 @@
 -------------------------------------------------------------------------------
 Test set: com.sooka.gateway.GatewayApplicationTests
 -------------------------------------------------------------------------------
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 17.586 s - in com.sooka.gateway.GatewayApplicationTests
+Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 11.281 s - in com.sooka.gateway.GatewayApplicationTests

sooka-jersey/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Fri Sep 17 08:50:25 CST 2021
+#Tue Oct 19 14:54:07 CST 2021
 version=0.0.1-SNAPSHOT
 groupId=com.sooka.jersey
 artifactId=sooka-jersey

test-api/pom.xml

@@ -64,6 +64,21 @@
         </dependency>
 
 
+        <!-- https://mvnrepository.com/artifact/org.apache.httpcomponents/httpcore -->
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpcore</artifactId>
+            <version>4.4.10</version>
+        </dependency>
+
+        <!-- https://mvnrepository.com/artifact/org.apache.httpcomponents/httpclient -->
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>4.5.6</version>
+        </dependency>
+
+
 
 
     </dependencies>

test-api/src/main/java/com/sooka/api/Guiji_Housingconstruction.java

@@ -1,5 +1,8 @@
 package com.sooka.api;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.google.gson.JsonObject;
 import com.sooka.base.BaseApi;
 import com.sooka.model.ResultModel;
 import com.sooka.model.bo.Guiji_library_baseinfo_Bean;
@@ -7,14 +10,23 @@ import com.sooka.service.Guiji_Housingconstruction_Service;
 import com.sooka.utils.HttpUtil;
 import com.sooka.utils.HttpUtil2;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.Scheduled;
 
 import javax.ws.rs.Consumes;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
 
 @Path("/")
+@Configuration      //1.主要用于标记配置类，兼备Component的效果。
+@EnableScheduling
 public class Guiji_Housingconstruction extends BaseApi {
 
     @Autowired
@@ -31,12 +43,12 @@ public class Guiji_Housingconstruction extends BaseApi {
         System.out.println("yhjbxx:" + str);
         ResultModel r = new ResultModel();
         try {
-            HttpUtil.doPost(forward_url + "/api/guiji_housingconstruction_yhjbxx_forward", str);
+            HttpUtil.doPost(forward_url + "/api/guiji_housingconstruction_yhjbxx_forward", str, null);
             r.setCode(0);
             r.setMessage("成功");
         } catch (Exception e) {
             r.setCode(99999);
-            r.setMessage("失败"+e.getMessage());
+            r.setMessage("失败" + e.getMessage());
         }
         return r;
     }
@@ -63,13 +75,13 @@ public class Guiji_Housingconstruction extends BaseApi {
     public ResultModel ysljc(String str) {
         System.out.println("ysljc:" + str);
         ResultModel r = new ResultModel();
-        try{
-            HttpUtil.doPost(forward_url + "/api/guiji_housingconstruction_ysljc_forward", str);
+        try {
+            HttpUtil.doPost(forward_url + "/api/guiji_housingconstruction_ysljc_forward", str, null);
             r.setCode(0);
             r.setMessage("成功");
         } catch (Exception e) {
             r.setCode(99999);
-            r.setMessage("失败"+e.getMessage());
+            r.setMessage("失败" + e.getMessage());
         }
         return r;
     }
@@ -96,13 +108,13 @@ public class Guiji_Housingconstruction extends BaseApi {
     public ResultModel zlskfrx(String str) {
         System.out.println("zlskfrx:" + str);
         ResultModel r = new ResultModel();
-        try{
-            HttpUtil.doPost(forward_url + "/api/guiji_housingconstruction_zlskfrx_forward", str);
+        try {
+            HttpUtil.doPost(forward_url + "/api/guiji_housingconstruction_zlskfrx_forward", str, null);
             r.setCode(00000);
             r.setMessage("成功");
-        }catch(Exception e){
+        } catch (Exception e) {
             r.setCode(99999);
-            r.setMessage("失败"+e.getMessage());
+            r.setMessage("失败" + e.getMessage());
         }
 
 
@@ -176,4 +188,107 @@ public class Guiji_Housingconstruction extends BaseApi {
         return r;
     }
 
+    //住建热力-主动请求-----------------------------------------------------
+    String heat_token;
+    //token使用时间8小时
+    Date heat_token_time;
+    Map head = new HashMap();
+
+
+    public String getHeatToken() {
+        if (heat_token == null || heat_token_time == null || new Date().getTime() - heat_token_time.getTime() >= 1000 * 60 * 60 * 8) {
+            //token过期重新获得
+            String params = "{\"username\":\"apiuser\",\"password\":\"thhtrl_psd*2021\"}";
+            String result = HttpUtil.doPost("http://222.160.143.205:28080/api/auth/login", params, null);
+            JSONObject jsonObject = JSON.parseObject(result);
+            if (jsonObject.getString("status").equals("1")) {
+                JSONObject data = jsonObject.getJSONObject("data");
+                heat_token = data.getString("token");
+                head.put("Authorization", heat_token);
+                System.out.println("heat_token:" + heat_token);
+            }
+        }
+        return heat_token;
+    }
+
+    //获取换热站最新数据接口
+    @Value("${project.setting.env}")
+    private String env;
+
+    final String scheduTime = "0 0 0-23 * * ?";
+
+    @Scheduled(cron = scheduTime)
+    public ResultModel guiji_housingconstruction_hqhrzzxsjjk() {
+        getHeatToken();
+        String str = HttpUtil.doGet("http://222.160.143.205:28080/api/realtime/data", null, head);
+        System.out.println("guiji_housingconstruction_hqrzzxsjjk:" + str);
+        ResultModel r = new ResultModel();
+        if (env != null && env.equals("internate")) {
+            try {
+                HttpUtil.doPost(forward_url + "/api/guiji_housingconstruction_hqhrzzxsjjk_forward", str, null);
+                r.setCode(00000);
+                r.setMessage("成功");
+            } catch (Exception e) {
+                e.printStackTrace();
+                r.setCode(99999);
+                r.setMessage("失败" + e.getMessage());
+            }
+            r.setCode(00000);
+            r.setMessage("成功");
+        }
+        return r;
+
+    }
+
+    @POST
+    @Path("/guiji_housingconstruction_hqhrzzxsjjk_forward")
+    // 指定请求与返回的相应体为JSON
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    public ResultModel guiji_housingconstruction_hqhrzzxsjjk_forward(String str) {
+        ResultModel r = guiji_housingconstruction_service.add_guiji_housingconstruction_hqrlsj(str, "1");
+        return r;
+    }
+
+
+    //获取热源最新数据接口
+    @Scheduled(cron = scheduTime)
+    public ResultModel guiji_housingconstruction_hqryzxsjjk() {
+        getHeatToken();
+        String str = HttpUtil.doGet("http://222.160.143.205:28080/api/realtime/source", null, head);
+        System.out.println("guiji_housingconstruction_hqryzxsjjk:" + str);
+        ResultModel r = new ResultModel();
+        if (env != null && env.equals("internate")) {
+            try {
+                HttpUtil.doPost(forward_url + "/api/guiji_housingconstruction_hqryzxsjjk_forward", str, null);
+                r.setCode(00000);
+                r.setMessage("成功");
+            } catch (Exception e) {
+                e.printStackTrace();
+                r.setCode(99999);
+                r.setMessage("失败" + e.getMessage());
+            }
+            r.setCode(00000);
+            r.setMessage("成功");
+        }
+        return r;
+    }
+
+    @POST
+    @Path("/guiji_housingconstruction_hqryzxsjjk_forward")
+    // 指定请求与返回的相应体为JSON
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    public ResultModel guiji_housingconstruction_hqryzxsjjk_forward(String str) {
+        ResultModel r = guiji_housingconstruction_service.add_guiji_housingconstruction_hqrlsj(str, "2");
+        return r;
+    }
+
+//    public static void main(String[] args) {
+//        Guiji_Housingconstruction guiji_housingconstruction = new Guiji_Housingconstruction();
+//        guiji_housingconstruction.guiji_housingconstruction_hqrzzxsjjk();
+//        guiji_housingconstruction.guiji_housingconstruction_hqryzxsjjk();
+//    }
+
+
 }

test-api/src/main/java/com/sooka/api/Guiji_civiladministration.java

@@ -29,7 +29,7 @@ public class Guiji_civiladministration extends BaseApi {
         System.out.println("szxxsj:" + str);
         ResultModel r = new ResultModel();
         try{
-            HttpUtil.doPost(forward_url + "/api/guiji_civiladministration_szxxsj_forward", str);
+            HttpUtil.doPost(forward_url + "/api/guiji_civiladministration_szxxsj_forward", str,null);
             r.setCode(0);
             r.setMessage("成功");
         }catch (Exception e){

test-api/src/main/java/com/sooka/api/Guiji_healthcommission.java

@@ -39,7 +39,7 @@ public class Guiji_healthcommission extends BaseApi {
         System.out.println("guiji_healthcommission_xx:" + str);
         ResultModel r = new ResultModel();
         try{
-            HttpUtil.doPost(forward_url + "/api/guiji_healthcommission_xx_forward", str);
+            HttpUtil.doPost(forward_url + "/api/guiji_healthcommission_xx_forward", str,null);
             r.setCode(0);
             r.setMessage("成功");
         }catch (Exception e){
@@ -70,7 +70,7 @@ public class Guiji_healthcommission extends BaseApi {
         System.out.println("guiji_healthcommission_yyryxx:" + str);
         ResultModel r = new ResultModel();
         try{
-            HttpUtil.doPost(forward_url + "/api/guiji_healthcommission_yyryxx_forward", str);
+            HttpUtil.doPost(forward_url + "/api/guiji_healthcommission_yyryxx_forward", str,null);
             r.setCode(0);
             r.setMessage("成功");
         }catch (Exception e){
@@ -102,7 +102,7 @@ public class Guiji_healthcommission extends BaseApi {
         System.out.println("guiji_healthcommission_tjxx:" + str);
         ResultModel r = new ResultModel();
         try{
-            HttpUtil.doPost(forward_url + "/api/guiji_healthcommission_tjxx_forward", str);
+            HttpUtil.doPost(forward_url + "/api/guiji_healthcommission_tjxx_forward", str,null);
             r.setCode(0);
             r.setMessage("成功");
         }catch (Exception e){

test-api/src/main/java/com/sooka/api_pagefile/application-dev-172.17.5.4.yml

@@ -195,3 +195,6 @@ server:
 xd:
   # 基础地址
   base_url: http://syggzy.jlsy.gov.cn/EpointWebService/rest/projectinformation
+project:
+  setting:
+    env: local

test-api/src/main/java/com/sooka/api_pagefile/application-dev-internet.yml

@@ -107,3 +107,6 @@ server:
 xd:
   # 基础地址
   base_url: http://syggzy.jlsy.gov.cn/EpointWebService/rest/projectinformation
+project:
+  setting:
+    env: internate

test-api/src/main/java/com/sooka/base/BaseService.java

@@ -3,10 +3,22 @@ package com.sooka.base;
 import com.alibaba.fastjson.JSON;
 
 import com.alibaba.fastjson.JSONObject;
+
 import com.sooka.model.ResultModel;
 import com.sooka.model.bo.BaseBean_Guiji;
 import com.sooka.model.bo.Guiji_library_baseinfo_Bean;
+import com.sooka.model.bo.TUInterfaceinfo;
+import com.sooka.model.bo.TULog;
+import com.sooka.network.http.HttpRequest;
+import com.sooka.utils.HttpUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.UUID;
 
+@Service
 public class BaseService {
 
 
@@ -39,4 +51,36 @@ public class BaseService {
         return bean;
     }
 
+//    @Autowired
+//    TUInterfaceinfoMapper tuInterfaceinfoMapper;
+//    @Autowired
+//    TULogMapper logMapper;
+//
+//    //调用次数记录-记录日志
+//    public void recordLog(String interface_id,HttpServletRequest request,int succ_or_fail){
+//        String osAndBrowser[] = HttpUtil.getOsAndBrowserInfo(request).split("---");
+//        String os = osAndBrowser[0];
+//        String browser = osAndBrowser[1];
+//        String ipaddress = HttpUtil.getIPAddress(request);
+//        //记录日志
+//        TULog tuLog = new TULog();
+//        tuLog.setId(UUID.randomUUID().toString());
+//        tuLog.setBrowser(browser);
+//        tuLog.setOs(os);
+//        tuLog.setInterfaceinfoId(interface_id);
+//        tuLog.setIpaddress(ipaddress);
+//        logMapper.insertTULog(tuLog);
+//        //接口调用次数+1
+//        TUInterfaceinfo tuInterfaceinfo =tuInterfaceinfoMapper.selectTUInterfaceinfoById(interface_id);
+//        TUInterfaceinfo u = new TUInterfaceinfo();
+//        u.setId(tuInterfaceinfo.getId());
+//        if(succ_or_fail == 0){
+//            u.setCallsuccnum(tuInterfaceinfo.getCallsuccnum()+1);
+//        }else{
+//            u.setCallfailnum(tuInterfaceinfo.getCallfailnum()+1);
+//        }
+//        tuInterfaceinfoMapper.updateTUInterfaceinfo(u);
+//
+//    }
+
 }

test-api/src/main/java/com/sooka/mapper/Guiji_Housingconstruction_Mapper.java

@@ -1,5 +1,6 @@
 package com.sooka.mapper;
 
+import com.sooka.model.bo.Guiji_housingconstruction_hqrlsj_Bean;
 import com.sooka.model.bo.Guiji_housingconstruction_yhjjxx_Bean;
 import com.sooka.model.bo.Guiji_housingconstruction_ysljc_Bean;
 import com.sooka.model.bo.Guiji_housingconstruction_zlskfrx_Bean;
@@ -25,4 +26,8 @@ public interface Guiji_Housingconstruction_Mapper {
     public void add_guiji_housingconstruction_ysxt(Guiji_housingconstruction_ysljc_Bean bean);
     public void update_guiji_housingconstruction_ysxt(Guiji_housingconstruction_ysljc_Bean bean);
 
+    //热力
+    public void add_guiji_housingconstruction_hqrlsj(Guiji_housingconstruction_hqrlsj_Bean bean);
+    public void add_guiji_housingconstruction_hqrlsj_detail(Guiji_housingconstruction_hqrlsj_Bean bean);
+
 }

test-api/src/main/java/com/sooka/model/bo/Guiji_housingconstruction_hqrlsj_Bean.java

@@ -0,0 +1,16 @@
+package com.sooka.model.bo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class Guiji_housingconstruction_hqrlsj_Bean extends BaseBean_Guiji {
+
+    String name;
+    String time;
+    String value;
+    String hqrlsj_id;
+    String type;
+
+}

test-api/src/main/java/com/sooka/model/bo/TUInterfaceinfo.java

@@ -0,0 +1,231 @@
+package com.sooka.model.bo;
+
+import com.sooka.base.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+
+/**
+ * 【请填写功能名称】对象 t_u_interfaceinfo
+ *
+ * @author lei
+ * @date 2021-07-01
+ */
+public class TUInterfaceinfo extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键ID */
+    private String id;
+
+    /** 状态 */
+    private String code;
+
+    /** 状态 */
+    private String status;
+
+    /** 删除时间 */
+    private String delFlag;
+
+    /** 接口名称 */
+    private String interfaceName;
+
+    /** 信息项 */
+    private String infoItem;
+
+    /** 使用场景描述 */
+    private String usageScenarios;
+
+    /** 共享方式 */
+    private String shareType;
+
+    /** 请求方式 */
+    private String interfaceType;
+
+    /** 环境 */
+    private String env;
+
+    /** 签名服务地址 */
+    private String signServeraddress;
+
+    /** 接口地址 */
+    private String interfaceAddress;
+
+    /** IAM方式 */
+    private String typeIam;
+
+    /** AK/SK方式 */
+    private String typeAksk;
+
+    /**调用成功次数*/
+    private Long callsuccnum;
+    /**调用失败次数*/
+    private Long callfailnum;
+
+    public Long getCallsuccnum() {
+        return callsuccnum;
+    }
+
+    public void setCallsuccnum(Long callsuccnum) {
+        this.callsuccnum = callsuccnum;
+    }
+
+    public Long getCallfailnum() {
+        return callfailnum;
+    }
+
+    public void setCallfailnum(Long callfailnum) {
+        this.callfailnum = callfailnum;
+    }
+
+    public void setId(String id)
+    {
+        this.id = id;
+    }
+
+    public String getId()
+    {
+        return id;
+    }
+    public void setStatus(String status)
+    {
+        this.status = status;
+    }
+
+    public String getStatus()
+    {
+        return status;
+    }
+    public void setDelFlag(String delFlag)
+    {
+        this.delFlag = delFlag;
+    }
+
+    public String getDelFlag()
+    {
+        return delFlag;
+    }
+    public void setInterfaceName(String interfaceName)
+    {
+        this.interfaceName = interfaceName;
+    }
+
+    public String getInterfaceName()
+    {
+        return interfaceName;
+    }
+    public void setInfoItem(String infoItem)
+    {
+        this.infoItem = infoItem;
+    }
+
+    public String getInfoItem()
+    {
+        return infoItem;
+    }
+    public void setUsageScenarios(String usageScenarios)
+    {
+        this.usageScenarios = usageScenarios;
+    }
+
+    public String getUsageScenarios()
+    {
+        return usageScenarios;
+    }
+    public void setShareType(String shareType)
+    {
+        this.shareType = shareType;
+    }
+
+    public String getShareType()
+    {
+        return shareType;
+    }
+    public void setInterfaceType(String interfaceType)
+    {
+        this.interfaceType = interfaceType;
+    }
+
+    public String getInterfaceType()
+    {
+        return interfaceType;
+    }
+    public void setEnv(String env)
+    {
+        this.env = env;
+    }
+
+    public String getEnv()
+    {
+        return env;
+    }
+    public void setSignServeraddress(String signServeraddress)
+    {
+        this.signServeraddress = signServeraddress;
+    }
+
+    public String getSignServeraddress()
+    {
+        return signServeraddress;
+    }
+    public void setInterfaceAddress(String interfaceAddress)
+    {
+        this.interfaceAddress = interfaceAddress;
+    }
+
+    public String getInterfaceAddress()
+    {
+        return interfaceAddress;
+    }
+    public void setTypeIam(String typeIam)
+    {
+        this.typeIam = typeIam;
+    }
+
+    public String getTypeIam()
+    {
+        return typeIam;
+    }
+    public void setTypeAksk(String typeAksk)
+    {
+        this.typeAksk = typeAksk;
+    }
+
+    public String getTypeAksk()
+    {
+        return typeAksk;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("status", getStatus())
+            .append("remark", getRemark())
+            .append("delFlag", getDelFlag())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("interfaceName", getInterfaceName())
+            .append("infoItem", getInfoItem())
+            .append("usageScenarios", getUsageScenarios())
+            .append("shareType", getShareType())
+            .append("interfaceType", getInterfaceType())
+            .append("env", getEnv())
+            .append("signServeraddress", getSignServeraddress())
+            .append("interfaceAddress", getInterfaceAddress())
+            .append("typeIam", getTypeIam())
+            .append("typeAksk", getTypeAksk())
+                .append("code", getCode())
+            .toString();
+    }
+}

test-api/src/main/java/com/sooka/model/bo/TULog.java

@@ -0,0 +1,237 @@
+package com.sooka.model.bo;
+
+import com.sooka.base.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+
+/**
+ * 接口调用日志对象 t_u_log
+ *
+ * @author lei
+ * @date 2021-07-06
+ */
+public class TULog extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键ID */
+    private String id;
+
+    /** 状态 */
+    private String status;
+
+    /** 删除时间 */
+    private String delFlag;
+
+    /** 登录人 */
+    private Long loginUser;
+
+    /** 登录名 */
+    private String loginName;
+
+    /** 调用接口id */
+    private String interfaceinfoId;
+
+    /** 调用接口名 */
+    private String interfaceinfoName;
+
+    /** ip地址 */
+    private String ipaddress;
+
+    /** 操作系统 */
+    private String os;
+
+    /** 平台接口类型 */
+    private String platformInterfacetype;
+
+    /** 访问浏览器 */
+    private String browser;
+
+    /** 参数条件 */
+    private String param;
+
+    /** 返回结果 */
+    private String results;
+
+    /** 操作数量 */
+    private Long operationQuantity;
+
+    /** 操作状态 */
+    private Long operationStatus;
+
+    /** 异常记录 */
+    private String exceptionLog;
+
+    public void setId(String id)
+    {
+        this.id = id;
+    }
+
+    public String getId()
+    {
+        return id;
+    }
+    public void setStatus(String status)
+    {
+        this.status = status;
+    }
+
+    public String getStatus()
+    {
+        return status;
+    }
+    public void setDelFlag(String delFlag)
+    {
+        this.delFlag = delFlag;
+    }
+
+    public String getDelFlag()
+    {
+        return delFlag;
+    }
+    public void setLoginUser(Long loginUser)
+    {
+        this.loginUser = loginUser;
+    }
+
+    public Long getLoginUser()
+    {
+        return loginUser;
+    }
+    public void setLoginName(String loginName)
+    {
+        this.loginName = loginName;
+    }
+
+    public String getLoginName()
+    {
+        return loginName;
+    }
+    public void setInterfaceinfoId(String interfaceinfoId)
+    {
+        this.interfaceinfoId = interfaceinfoId;
+    }
+
+    public String getInterfaceinfoId()
+    {
+        return interfaceinfoId;
+    }
+    public void setInterfaceinfoName(String interfaceinfoName)
+    {
+        this.interfaceinfoName = interfaceinfoName;
+    }
+
+    public String getInterfaceinfoName()
+    {
+        return interfaceinfoName;
+    }
+    public void setIpaddress(String ipaddress)
+    {
+        this.ipaddress = ipaddress;
+    }
+
+    public String getIpaddress()
+    {
+        return ipaddress;
+    }
+    public void setOs(String os)
+    {
+        this.os = os;
+    }
+
+    public String getOs()
+    {
+        return os;
+    }
+    public void setPlatformInterfacetype(String platformInterfacetype)
+    {
+        this.platformInterfacetype = platformInterfacetype;
+    }
+
+    public String getPlatformInterfacetype()
+    {
+        return platformInterfacetype;
+    }
+    public void setBrowser(String browser)
+    {
+        this.browser = browser;
+    }
+
+    public String getBrowser()
+    {
+        return browser;
+    }
+    public void setParam(String params)
+    {
+        this.param = params;
+    }
+
+    public String getParam()
+    {
+        return param;
+    }
+    public void setResults(String results)
+    {
+        this.results = results;
+    }
+
+    public String getResults()
+    {
+        return results;
+    }
+    public void setOperationQuantity(Long operationQuantity)
+    {
+        this.operationQuantity = operationQuantity;
+    }
+
+    public Long getOperationQuantity()
+    {
+        return operationQuantity;
+    }
+    public void setOperationStatus(Long operationStatus)
+    {
+        this.operationStatus = operationStatus;
+    }
+
+    public Long getOperationStatus()
+    {
+        return operationStatus;
+    }
+    public void setExceptionLog(String exceptionLog)
+    {
+        this.exceptionLog = exceptionLog;
+    }
+
+    public String getExceptionLog()
+    {
+        return exceptionLog;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("status", getStatus())
+            .append("remark", getRemark())
+            .append("delFlag", getDelFlag())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("loginUser", getLoginUser())
+            .append("loginName", getLoginName())
+            .append("interfaceinfoId", getInterfaceinfoId())
+            .append("interfaceinfoName", getInterfaceinfoName())
+            .append("ipaddress", getIpaddress())
+            .append("os", getOs())
+            .append("platformInterfacetype", getPlatformInterfacetype())
+            .append("browser", getBrowser())
+            .append("param", getParam())
+            .append("results", getResults())
+            .append("operationQuantity", getOperationQuantity())
+            .append("operationStatus", getOperationStatus())
+            .append("exceptionLog", getExceptionLog())
+            .toString();
+    }
+}

test-api/src/main/java/com/sooka/service/Guiji_Housingconstruction_Service.java

@@ -15,4 +15,7 @@ public interface Guiji_Housingconstruction_Service {
 
     //营收
     public ResultModel add_guiji_housingconstruction_ysxt(String str);
+
+    //热力-获取热力数据，（包括换热站1，热源2）
+    public ResultModel add_guiji_housingconstruction_hqrlsj(String str,String type);
 }

test-api/src/main/java/com/sooka/service/impl/Guiji_Housingconstruction_ServiceImpl.java

@@ -1,20 +1,20 @@
 package com.sooka.service.impl;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.google.gson.annotations.Expose;
 import com.sooka.base.BaseService;
 import com.sooka.mapper.Guiji_Housingconstruction_Mapper;
 import com.sooka.mapper.Guiji_Housingconstruction_Mapper2;
 import com.sooka.model.ResultModel;
-import com.sooka.model.bo.Guiji_housingconstruction_yhjjxx_Bean;
-import com.sooka.model.bo.Guiji_housingconstruction_ysljc_Bean;
-import com.sooka.model.bo.Guiji_housingconstruction_ysxt_Bean;
-import com.sooka.model.bo.Guiji_housingconstruction_zlskfrx_Bean;
+import com.sooka.model.bo.*;
 import com.sooka.service.Guiji_Housingconstruction_Service;
 import com.sooka.utils.UnicodeUtil;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.UUID;
 
 @Service
 public class Guiji_Housingconstruction_ServiceImpl extends BaseService implements Guiji_Housingconstruction_Service {
@@ -28,9 +28,9 @@ public class Guiji_Housingconstruction_ServiceImpl extends BaseService implement
     @Override
     public ResultModel add_guiji_housingconstruction_yhjbxx(String str) {
         ResultModel r = new ResultModel();
-        try{
+        try {
             Guiji_housingconstruction_yhjjxx_Bean bean = new Guiji_housingconstruction_yhjjxx_Bean();
-            initBaseGuijiBean(str,bean);
+            initBaseGuijiBean(str, bean);
 
             JSONObject Data = bean.getData();
             bean.setYHBH(Data.getString("YHBH"));
@@ -50,7 +50,7 @@ public class Guiji_Housingconstruction_ServiceImpl extends BaseService implement
             }
             r.setCode(0);
             r.setMessage("成功");
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             r.setCode(99999);
             r.setMessage("失败");
@@ -65,9 +65,9 @@ public class Guiji_Housingconstruction_ServiceImpl extends BaseService implement
     @Override
     public ResultModel add_guiji_housingconstruction_ysljc(String str) {
         ResultModel r = new ResultModel();
-        try{
+        try {
             Guiji_housingconstruction_ysljc_Bean bean = new Guiji_housingconstruction_ysljc_Bean();
-            initBaseGuijiBean(str,bean);
+            initBaseGuijiBean(str, bean);
 
             JSONObject Data = bean.getData();
             bean.setSsid(UnicodeUtil.decode(Data.getString("ssid")));
@@ -88,7 +88,7 @@ public class Guiji_Housingconstruction_ServiceImpl extends BaseService implement
 
             r.setCode(0);
             r.setMessage("成功");
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             r.setCode(99999);
             r.setMessage("失败");
@@ -100,9 +100,9 @@ public class Guiji_Housingconstruction_ServiceImpl extends BaseService implement
     @Override
     public ResultModel add_guiji_housingconstruction_zlskfrx(String str) {
         ResultModel r = new ResultModel();
-        try{
+        try {
             Guiji_housingconstruction_zlskfrx_Bean bean = new Guiji_housingconstruction_zlskfrx_Bean();
-            initBaseGuijiBean(str,bean);
+            initBaseGuijiBean(str, bean);
             JSONObject Data = bean.getData();
 
             bean.setId(Data.getString("CaseId"));
@@ -122,7 +122,7 @@ public class Guiji_Housingconstruction_ServiceImpl extends BaseService implement
             }
             r.setCode(0);
             r.setMessage("成功");
-        }catch (Exception e){
+        } catch (Exception e) {
             r.setCode(99999);
             r.setMessage("失败");
             e.printStackTrace();
@@ -133,9 +133,9 @@ public class Guiji_Housingconstruction_ServiceImpl extends BaseService implement
     @Override
     public ResultModel add_guiji_housingconstruction_ysxt(String str) {
         ResultModel r = new ResultModel();
-        try{
-            Guiji_housingconstruction_ysxt_Bean bean =new Guiji_housingconstruction_ysxt_Bean();
-            initBaseGuijiBean(str,bean);
+        try {
+            Guiji_housingconstruction_ysxt_Bean bean = new Guiji_housingconstruction_ysxt_Bean();
+            initBaseGuijiBean(str, bean);
             JSONObject Data = bean.getData();
             bean.setYHBH(Data.getString("YHBH"));
             bean.setYHMC(Data.getString("YHMC"));
@@ -146,11 +146,60 @@ public class Guiji_Housingconstruction_ServiceImpl extends BaseService implement
             bean.setJFSJ(Data.getString("JFSJ"));
             r.setCode(0);
             r.setMessage("成功");
-        }catch (Exception e){
+        } catch (Exception e) {
             r.setCode(99999);
             r.setMessage("失败");
             e.printStackTrace();
         }
         return r;
     }
+
+    @Override
+    public ResultModel add_guiji_housingconstruction_hqrlsj(String str, String type) {
+        ResultModel r = new ResultModel();
+        try {
+            JSONObject jsonObject = JSON.parseObject(str);
+            if (jsonObject.getString("status").equals("1")) {
+                JSONArray data = jsonObject.getJSONArray("data");
+                for (int i = 0; i < data.size(); i++) {
+                    JSONObject obj = data.getJSONObject(i);
+                    String id = UUID.randomUUID().toString();
+                    String name = obj.getString("name");
+                    String time = obj.getString("time");
+                    JSONArray params = obj.getJSONArray("params");
+                    Guiji_housingconstruction_hqrlsj_Bean bean = new Guiji_housingconstruction_hqrlsj_Bean();
+                    bean.setId(id);
+                    bean.setName(name);
+                    bean.setType(type);
+                    guiji_housingconstruction_mapper.add_guiji_housingconstruction_hqrlsj(bean);
+                    for (int j = 0; j < params.size(); j++) {
+                        String param_id = UUID.randomUUID().toString();
+                        JSONObject p = params.getJSONObject(j);
+                        String p_name = p.getString("name");
+                        String p_value = p.getString("value");
+                        String hqrlsj_id = id;
+                        Guiji_housingconstruction_hqrlsj_Bean bean_detail = new Guiji_housingconstruction_hqrlsj_Bean();
+                        bean_detail.setId(param_id);
+                        bean_detail.setName(p_name);
+                        bean_detail.setValue(p_value);
+                        bean_detail.setHqrlsj_id(id);
+                        guiji_housingconstruction_mapper.add_guiji_housingconstruction_hqrlsj_detail(bean_detail);
+                    }
+                }
+
+
+            }
+
+
+            r.setCode(0);
+            r.setMessage("成功");
+        } catch (Exception e) {
+            r.setCode(99999);
+            r.setMessage("失败");
+            e.printStackTrace();
+        }
+
+
+        return r;
+    }
 }

test-api/src/main/java/com/sooka/service/impl/Guiji_civiladministration_ServiceImpl.java

@@ -7,6 +7,7 @@ import com.sooka.mapper.Guiji_civiladministration_Mapper2;
 import com.sooka.model.ResultModel;
 import com.sooka.model.bo.Guiji_civiladministration_szxxsj_Bean;
 import com.sooka.model.bo.Guiji_healthcommission_tjxx_Bean;
+import com.sooka.network.http.HttpRequest;
 import com.sooka.service.Guiji_civiladministration_Service;
 import org.bouncycastle.util.encoders.Base64;
 import org.springframework.stereotype.Service;
@@ -71,4 +72,8 @@ public class Guiji_civiladministration_ServiceImpl extends BaseService implement
         }
         return r;
     }
+
+    public void recodeLog(String interface_id, HttpRequest request){
+
+    }
 }

test-api/src/main/java/com/sooka/utils/HttpUtil.java

@@ -1,6 +1,12 @@
 package com.sooka.utils;
 
 import com.alibaba.fastjson.JSONObject;
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.http.util.EntityUtils;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -10,14 +16,16 @@ import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLConnection;
 import java.net.URLEncoder;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 import javax.servlet.http.HttpServletRequest;
 
 public class HttpUtil {
 
-    public static String doGet(String geturl, String params) {
+    public static String doGet(String geturl, String params,Map headerparam) {
         String realUrl = geturl + "?" + params;
         System.out.println(realUrl);
 
@@ -38,9 +46,23 @@ public class HttpUtil {
             conn.setRequestProperty("connection", "Keep-Alive");
 
             conn.setRequestProperty("contentType", "UTF-8");
+            conn.setRequestProperty("content-Type", "application/json;charset=UTF-8");
             // 3.使用 connect 方法建立到远程对象的实际连接�?
-            conn.connect();
 
+
+            if(headerparam != null){
+                Set<String> keys =headerparam.keySet();
+                Iterator<String> iterator = keys.iterator();
+                while(iterator.hasNext()){
+                    String key =iterator.next().toString();
+                    System.out.println("=======key======="+key);
+                    Object value = headerparam.get(key);
+                    System.out.println("=======value======="+value);
+                    String v = value.toString();
+                    conn.setRequestProperty(key,v);
+                }
+            }
+            conn.connect();
             // 4.远程对象变为可用。远程对象的头字段和内容变为可访问�??
             // 4.1获取响应的头字段
             Map<String, List<String>> headers = conn.getHeaderFields();
@@ -71,7 +93,7 @@ public class HttpUtil {
 
     }
 
-    public static String doPost(String url, String param) {
+    public static String doPost(String url, String param,Map headerparam) {
         PrintWriter out = null;
         BufferedReader in = null;
         String result = "";
@@ -86,6 +108,18 @@ public class HttpUtil {
             conn.setRequestProperty("content-Type", "application/json;charset=UTF-8");
 
             //
+            if(headerparam != null){
+                Set<String> keys =headerparam.keySet();
+                Iterator<String> iterator = keys.iterator();
+                while(iterator.hasNext()){
+                    String key =iterator.next().toString();
+                    System.out.println("=======key======="+key);
+                    Object value = headerparam.get(key);
+                    System.out.println("=======value======="+value);
+                    String v = value.toString();
+                    conn.setRequestProperty(key,v);
+                }
+            }
 //
 
 
@@ -114,7 +148,7 @@ public class HttpUtil {
             in = new BufferedReader(new InputStreamReader(conn.getInputStream(), "UTF-8"));
             String line;
             while ((line = in.readLine()) != null) {
-                result += "/n" + line;
+                result += "" + line;
             }
             System.out.println("result========"+result);
         } catch (Exception e) {
@@ -204,6 +238,44 @@ public class HttpUtil {
         return os + " --- " + browser;
     }
 
+    public static String getIPAddress(HttpServletRequest request) {
+        String ip = null;
+
+        //X-Forwarded-For：Squid 服务代理
+        String ipAddresses = request.getHeader("X-Forwarded-For");
+
+        if (ipAddresses == null || ipAddresses.length() == 0 || "unknown".equalsIgnoreCase(ipAddresses)) {
+            //Proxy-Client-IP：apache 服务代理
+            ipAddresses = request.getHeader("Proxy-Client-IP");
+        }
+
+        if (ipAddresses == null || ipAddresses.length() == 0 || "unknown".equalsIgnoreCase(ipAddresses)) {
+            //WL-Proxy-Client-IP：weblogic 服务代理
+            ipAddresses = request.getHeader("WL-Proxy-Client-IP");
+        }
+
+        if (ipAddresses == null || ipAddresses.length() == 0 || "unknown".equalsIgnoreCase(ipAddresses)) {
+            //HTTP_CLIENT_IP：有些代理服务器
+            ipAddresses = request.getHeader("HTTP_CLIENT_IP");
+        }
+
+        if (ipAddresses == null || ipAddresses.length() == 0 || "unknown".equalsIgnoreCase(ipAddresses)) {
+            //X-Real-IP：nginx服务代理
+            ipAddresses = request.getHeader("X-Real-IP");
+        }
+
+        //有些网络通过多层代理，那么获取到的ip就会有多个，一般都是通过逗号（,）分割开来，并且第一个ip为客户端的真实IP
+        if (ipAddresses != null && ipAddresses.length() != 0) {
+            ip = ipAddresses.split(",")[0];
+        }
+
+        //还是不能获取到，最后再通过request.getRemoteAddr();获取
+        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ipAddresses)) {
+            ip = request.getRemoteAddr();
+        }
+        return ip;
+    }
+
     public static void main(String[] args) {
         String s = "云南";
         s = URLEncoder.encode(s);
@@ -214,7 +286,37 @@ public class HttpUtil {
 
         HttpUtil httpUtil = new HttpUtil();
         // String str ="http://www.sohu.com";
-        httpUtil.doGet(str, parm);
+        httpUtil.doGet(str, parm,null);
+    }
+
+
+    public String doPost(String url, String map, String charset,Map headerParams) {
+        org.apache.http.client.HttpClient httpClient = null;
+        HttpPost httpPost = null;
+        String result = null;
+        try {
+            httpClient = new DefaultHttpClient();
+            httpPost = new HttpPost(url);
+            // 设置参数
+            httpPost.addHeader("Accept", "application/json");
+            httpPost.addHeader("Content-Type", "application/json;charset=UTF-8");
+            StringEntity stringEntity = new StringEntity(map);
+            stringEntity.setContentEncoding("UTF-8");
+            stringEntity.setContentType("application/json");
+
+
+            httpPost.setEntity(stringEntity);
+            HttpResponse response = httpClient.execute(httpPost);
+            if (response != null) {
+                HttpEntity resEntity = response.getEntity();
+                if (resEntity != null) {
+                    result = EntityUtils.toString(resEntity, charset);
+                }
+            }
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }
+        return result;
     }
 
 }

test-api/src/main/java/com/sooka/utils/Test.java

@@ -17,7 +17,7 @@ public class Test {
 
 
         String str = "{\"Data\":{\"name\":\"孙一石\",\"cardno\":\"008091\",\"idCardNo\":\"\",\"sex\":\"F\",\"birthday\":\"\",\"address\":\"\",\"endDate\":\"20150128\"},\"id\":\""+"0"+"\",\"cd_time\":\"2021-08-31 17:03:42\",\"cd_batch\":\"202108314033\",\"cd_operation\":\"D\",\"cd_source\":\"503033\"}\n";
-        HttpUtil.doPost(url,str);
+        HttpUtil.doPost(url,str,null);
 
 
     }

test-api/src/main/resources/application-dev.yml

@@ -6,149 +6,61 @@ spring:
   #
   ############################################################
   # jdbc_config   datasource
-  datasource:
-    dynamic:
-      primary: db1
-      datasource:
-        db1:
-          url: jdbc:mysql://172.18.128.8:3306/thsjzt?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
-#          url: jdbc:mysql://172.17.5.7:3306/thsjzt?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
-
-          username: thsjzt
-          password: thsjzt
-            # Hikari will use the above plus the following to setup connection pooling
-          type: com.zaxxer.hikari.HikariDataSource
-          hikari:
-        # 等待连接池分配连接的最大时长（毫秒），超过这个时长还没有的连接则发生SQLException，默认：30秒
-            connection-timeout: 30000
-              # 最小连接数
-            minimum-idle: 5
-        # 最大连接数
-            maximum-pool-size: 15
-        # 自动提交
-            auto-commit: true
-        # 一个连接idle状态的最大时长（毫秒），超时则被释放（retired），默认：10分钟
-            idle-timeout: 600000
-        # 连接池的名字
-            pool-name: DatebookHikariCP
-        # 一个连接的生命时长（毫秒），超时而且没被使用则被释放（retired），默认：30分钟1800000ms
-            max-lifetime: 28740000
-            connection-test-query: SELECT 1
-        db2:
-          url: jdbc:mysql://59.198.246.77:32368/jl503033?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
-          username: jl503033
-          password: Bx82TIg0
-                  # Hikari will use the above plus the following to setup connection pooling
-          type: com.zaxxer.hikari.HikariDataSource
-          hikari:
-              # 等待连接池分配连接的最大时长（毫秒），超过这个时长还没有的连接则发生SQLException，默认：30秒
-            connection-timeout: 30000
-                    # 最小连接数
-            minimum-idle: 5
-              # 最大连接数
-            maximum-pool-size: 15
-              # 自动提交
-            auto-commit: true
-              # 一个连接idle状态的最大时长（毫秒），超时则被释放（retired），默认：10分钟
-            idle-timeout: 600000
-              # 连接池的名字
-            pool-name: DatebookHikariCP
-              # 一个连接的生命时长（毫秒），超时而且没被使用则被释放（retired），默认：30分钟1800000ms
-            max-lifetime: 28740000
-            connection-test-query: SELECT 1
-        db3:
-          url: jdbc:mysql://59.198.246.77:32368/jl503029?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
-          username: jl503029
-          password: Lp18NUg8
-                  # Hikari will use the above plus the following to setup connection pooling
-          type: com.zaxxer.hikari.HikariDataSource
-          hikari:
-              # 等待连接池分配连接的最大时长（毫秒），超过这个时长还没有的连接则发生SQLException，默认：30秒
-            connection-timeout: 30000
-                    # 最小连接数
-            minimum-idle: 5
-              # 最大连接数
-            maximum-pool-size: 15
-              # 自动提交
-            auto-commit: true
-              # 一个连接idle状态的最大时长（毫秒），超时则被释放（retired），默认：10分钟
-            idle-timeout: 600000
-              # 连接池的名字
-            pool-name: DatebookHikariCP
-              # 一个连接的生命时长（毫秒），超时而且没被使用则被释放（retired），默认：30分钟1800000ms
-            max-lifetime: 28740000
-            connection-test-query: SELECT 1
-        db4:
-          url: jdbc:mysql://59.198.246.77:32368/jl503011?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
-          username: jl503011
-          password: Oq82TSa8
-                  # Hikari will use the above plus the following to setup connection pooling
-          type: com.zaxxer.hikari.HikariDataSource
-          hikari:
-              # 等待连接池分配连接的最大时长（毫秒），超过这个时长还没有的连接则发生SQLException，默认：30秒
-            connection-timeout: 30000
-                    # 最小连接数
-            minimum-idle: 5
-              # 最大连接数
-            maximum-pool-size: 15
-              # 自动提交
-            auto-commit: true
-              # 一个连接idle状态的最大时长（毫秒），超时则被释放（retired），默认：10分钟
-            idle-timeout: 600000
-              # 连接池的名字
-            pool-name: DatebookHikariCP
-              # 一个连接的生命时长（毫秒），超时而且没被使用则被释放（retired），默认：30分钟1800000ms
-            max-lifetime: 28740000
-            connection-test-query: SELECT 1
-        db5:
-          url: jdbc:mysql://59.198.246.77:32368/jl503026?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
-          username: jl503026
-          password: Sw80ABr2
-                  # Hikari will use the above plus the following to setup connection pooling
-          type: com.zaxxer.hikari.HikariDataSource
-          hikari:
-              # 等待连接池分配连接的最大时长（毫秒），超过这个时长还没有的连接则发生SQLException，默认：30秒
-            connection-timeout: 30000
-                    # 最小连接数
-            minimum-idle: 5
-              # 最大连接数
-            maximum-pool-size: 15
-              # 自动提交
-            auto-commit: true
-              # 一个连接idle状态的最大时长（毫秒），超时则被释放（retired），默认：10分钟
-            idle-timeout: 600000
-              # 连接池的名字
-            pool-name: DatebookHikariCP
-              # 一个连接的生命时长（毫秒），超时而且没被使用则被释放（retired），默认：30分钟1800000ms
-            max-lifetime: 28740000
-            connection-test-query: SELECT 1
-        db6:
-          url: jdbc:mysql://59.198.246.77:32368/jl503008?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
-          username: jl503008
-          password: Jl10PEr0
-                  # Hikari will use the above plus the following to setup connection pooling
-          type: com.zaxxer.hikari.HikariDataSource
-          hikari:
-              # 等待连接池分配连接的最大时长（毫秒），超过这个时长还没有的连接则发生SQLException，默认：30秒
-            connection-timeout: 30000
-                    # 最小连接数
-            minimum-idle: 5
-              # 最大连接数
-            maximum-pool-size: 15
-              # 自动提交
-            auto-commit: true
-              # 一个连接idle状态的最大时长（毫秒），超时则被释放（retired），默认：10分钟
-            idle-timeout: 600000
-              # 连接池的名字
-            pool-name: DatebookHikariCP
-              # 一个连接的生命时长（毫秒），超时而且没被使用则被释放（retired），默认：30分钟1800000ms
-            max-lifetime: 28740000
-            connection-test-query: SELECT 1
-
-
-
-
-
+#  datasource:
+#    dynamic:
+#      primary: db1
+#      datasource:
+#        db1:
+#          url: jdbc:mysql://172.18.128.8:3306/thsjzt?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
+##          url: jdbc:mysql://172.17.5.7:3306/thsjzt?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
+#
+#          username: thsjzt
+#          password: thsjzt
+#            # Hikari will use the above plus the following to setup connection pooling
+#          type: com.zaxxer.hikari.HikariDataSource
+#          hikari:
+#        # 等待连接池分配连接的最大时长（毫秒），超过这个时长还没有的连接则发生SQLException，默认：30秒
+#            connection-timeout: 30000
+#              # 最小连接数
+#            minimum-idle: 5
+#        # 最大连接数
+#            maximum-pool-size: 15
+#        # 自动提交
+#            auto-commit: true
+#        # 一个连接idle状态的最大时长（毫秒），超时则被释放（retired），默认：10分钟
+#            idle-timeout: 600000
+#        # 连接池的名字
+#            pool-name: DatebookHikariCP
+#        # 一个连接的生命时长（毫秒），超时而且没被使用则被释放（retired），默认：30分钟1800000ms
+#            max-lifetime: 28740000
+#            connection-test-query: SELECT 1
+#
+#        db2:
+##          url: jdbc:mysql://172.17.5.7:3306/thsjzt?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
+##          username: thsjzt
+##          password: thsjzt
+#
+#          url: jdbc:mysql://59.198.246.77:32368/jl503033?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
+#          username: jl503033
+#          password: Bx82TIg0
+#                  # Hikari will use the above plus the following to setup connection pooling
+#          type: com.zaxxer.hikari.HikariDataSource
+#          hikari:
+#              # 等待连接池分配连接的最大时长（毫秒），超过这个时长还没有的连接则发生SQLException，默认：30秒
+#            connection-timeout: 30000
+#                    # 最小连接数
+#            minimum-idle: 5
+#              # 最大连接数
+#            maximum-pool-size: 15
+#              # 自动提交
+#            auto-commit: true
+#              # 一个连接idle状态的最大时长（毫秒），超时则被释放（retired），默认：10分钟
+#            idle-timeout: 600000
+#              # 连接池的名字
+#            pool-name: DatebookHikariCP
+#              # 一个连接的生命时长（毫秒），超时而且没被使用则被释放（retired），默认：30分钟1800000ms
+#            max-lifetime: 28740000
+#            connection-test-query: SELECT 1
 
 #    driver-class-name: com.mysql.cj.jdbc.Driver
 #        url: jdbc:mysql://59.198.246.77:32368/jl503034?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
@@ -195,3 +107,6 @@ server:
 xd:
   # 基础地址
   base_url: http://syggzy.jlsy.gov.cn/EpointWebService/rest/projectinformation
+project:
+  setting:
+    env: internate

test-api/src/main/resources/application.yml

@@ -9,6 +9,8 @@ spring:
 #vpn
 #        server-addr: 172.17.5.4:8848
 #内网
-        server-addr: 172.18.128.78
+#        server-addr: 172.18.128.78
 #互联网
-#        server-addr: 10.0.51.4:8848
+        server-addr: 10.0.51.4:8848
+
+

test-api/src/main/resources/mapper/Guiji_Housingconstruction_Mapper.xml

@@ -164,4 +164,16 @@
         where YHBH = #{YHBH}
     </update>
 
+
+    <parameterMap id="pm_hqrlsj" type="com.sooka.model.bo.Guiji_housingconstruction_hqrlsj_Bean"></parameterMap>
+    <insert id="add_guiji_housingconstruction_hqrlsj" parameterMap="pm_hqrlsj">
+        insert into t_guiji_housingconstruction_hqrlsj
+        (id,name,time,type) values (#{id},#{name},now(),#{type})
+    </insert>
+
+    <insert id="add_guiji_housingconstruction_hqrlsj_detail" parameterMap="pm_hqrlsj">
+      insert into t_guiji_housingconstruction_hqrlsj_detail
+        (id,name,value,hqrlsj_id) values (#{id},#{name},#{value},#{hqrlsj_id})
+    </insert>
+
 </mapper>

test-api/target/classes/application-dev.yml

@@ -6,149 +6,61 @@ spring:
   #
   ############################################################
   # jdbc_config   datasource
-  datasource:
-    dynamic:
-      primary: db1
-      datasource:
-        db1:
-          url: jdbc:mysql://172.18.128.8:3306/thsjzt?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
-#          url: jdbc:mysql://172.17.5.7:3306/thsjzt?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
-
-          username: thsjzt
-          password: thsjzt
-            # Hikari will use the above plus the following to setup connection pooling
-          type: com.zaxxer.hikari.HikariDataSource
-          hikari:
-        # 等待连接池分配连接的最大时长（毫秒），超过这个时长还没有的连接则发生SQLException，默认：30秒
-            connection-timeout: 30000
-              # 最小连接数
-            minimum-idle: 5
-        # 最大连接数
-            maximum-pool-size: 15
-        # 自动提交
-            auto-commit: true
-        # 一个连接idle状态的最大时长（毫秒），超时则被释放（retired），默认：10分钟
-            idle-timeout: 600000
-        # 连接池的名字
-            pool-name: DatebookHikariCP
-        # 一个连接的生命时长（毫秒），超时而且没被使用则被释放（retired），默认：30分钟1800000ms
-            max-lifetime: 28740000
-            connection-test-query: SELECT 1
-        db2:
-          url: jdbc:mysql://59.198.246.77:32368/jl503033?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
-          username: jl503033
-          password: Bx82TIg0
-                  # Hikari will use the above plus the following to setup connection pooling
-          type: com.zaxxer.hikari.HikariDataSource
-          hikari:
-              # 等待连接池分配连接的最大时长（毫秒），超过这个时长还没有的连接则发生SQLException，默认：30秒
-            connection-timeout: 30000
-                    # 最小连接数
-            minimum-idle: 5
-              # 最大连接数
-            maximum-pool-size: 15
-              # 自动提交
-            auto-commit: true
-              # 一个连接idle状态的最大时长（毫秒），超时则被释放（retired），默认：10分钟
-            idle-timeout: 600000
-              # 连接池的名字
-            pool-name: DatebookHikariCP
-              # 一个连接的生命时长（毫秒），超时而且没被使用则被释放（retired），默认：30分钟1800000ms
-            max-lifetime: 28740000
-            connection-test-query: SELECT 1
-        db3:
-          url: jdbc:mysql://59.198.246.77:32368/jl503029?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
-          username: jl503029
-          password: Lp18NUg8
-                  # Hikari will use the above plus the following to setup connection pooling
-          type: com.zaxxer.hikari.HikariDataSource
-          hikari:
-              # 等待连接池分配连接的最大时长（毫秒），超过这个时长还没有的连接则发生SQLException，默认：30秒
-            connection-timeout: 30000
-                    # 最小连接数
-            minimum-idle: 5
-              # 最大连接数
-            maximum-pool-size: 15
-              # 自动提交
-            auto-commit: true
-              # 一个连接idle状态的最大时长（毫秒），超时则被释放（retired），默认：10分钟
-            idle-timeout: 600000
-              # 连接池的名字
-            pool-name: DatebookHikariCP
-              # 一个连接的生命时长（毫秒），超时而且没被使用则被释放（retired），默认：30分钟1800000ms
-            max-lifetime: 28740000
-            connection-test-query: SELECT 1
-        db4:
-          url: jdbc:mysql://59.198.246.77:32368/jl503011?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
-          username: jl503011
-          password: Oq82TSa8
-                  # Hikari will use the above plus the following to setup connection pooling
-          type: com.zaxxer.hikari.HikariDataSource
-          hikari:
-              # 等待连接池分配连接的最大时长（毫秒），超过这个时长还没有的连接则发生SQLException，默认：30秒
-            connection-timeout: 30000
-                    # 最小连接数
-            minimum-idle: 5
-              # 最大连接数
-            maximum-pool-size: 15
-              # 自动提交
-            auto-commit: true
-              # 一个连接idle状态的最大时长（毫秒），超时则被释放（retired），默认：10分钟
-            idle-timeout: 600000
-              # 连接池的名字
-            pool-name: DatebookHikariCP
-              # 一个连接的生命时长（毫秒），超时而且没被使用则被释放（retired），默认：30分钟1800000ms
-            max-lifetime: 28740000
-            connection-test-query: SELECT 1
-        db5:
-          url: jdbc:mysql://59.198.246.77:32368/jl503026?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
-          username: jl503026
-          password: Sw80ABr2
-                  # Hikari will use the above plus the following to setup connection pooling
-          type: com.zaxxer.hikari.HikariDataSource
-          hikari:
-              # 等待连接池分配连接的最大时长（毫秒），超过这个时长还没有的连接则发生SQLException，默认：30秒
-            connection-timeout: 30000
-                    # 最小连接数
-            minimum-idle: 5
-              # 最大连接数
-            maximum-pool-size: 15
-              # 自动提交
-            auto-commit: true
-              # 一个连接idle状态的最大时长（毫秒），超时则被释放（retired），默认：10分钟
-            idle-timeout: 600000
-              # 连接池的名字
-            pool-name: DatebookHikariCP
-              # 一个连接的生命时长（毫秒），超时而且没被使用则被释放（retired），默认：30分钟1800000ms
-            max-lifetime: 28740000
-            connection-test-query: SELECT 1
-        db6:
-          url: jdbc:mysql://59.198.246.77:32368/jl503008?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
-          username: jl503008
-          password: Jl10PEr0
-                  # Hikari will use the above plus the following to setup connection pooling
-          type: com.zaxxer.hikari.HikariDataSource
-          hikari:
-              # 等待连接池分配连接的最大时长（毫秒），超过这个时长还没有的连接则发生SQLException，默认：30秒
-            connection-timeout: 30000
-                    # 最小连接数
-            minimum-idle: 5
-              # 最大连接数
-            maximum-pool-size: 15
-              # 自动提交
-            auto-commit: true
-              # 一个连接idle状态的最大时长（毫秒），超时则被释放（retired），默认：10分钟
-            idle-timeout: 600000
-              # 连接池的名字
-            pool-name: DatebookHikariCP
-              # 一个连接的生命时长（毫秒），超时而且没被使用则被释放（retired），默认：30分钟1800000ms
-            max-lifetime: 28740000
-            connection-test-query: SELECT 1
-
-
-
-
-
+#  datasource:
+#    dynamic:
+#      primary: db1
+#      datasource:
+#        db1:
+#          url: jdbc:mysql://172.18.128.8:3306/thsjzt?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
+##          url: jdbc:mysql://172.17.5.7:3306/thsjzt?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
+#
+#          username: thsjzt
+#          password: thsjzt
+#            # Hikari will use the above plus the following to setup connection pooling
+#          type: com.zaxxer.hikari.HikariDataSource
+#          hikari:
+#        # 等待连接池分配连接的最大时长（毫秒），超过这个时长还没有的连接则发生SQLException，默认：30秒
+#            connection-timeout: 30000
+#              # 最小连接数
+#            minimum-idle: 5
+#        # 最大连接数
+#            maximum-pool-size: 15
+#        # 自动提交
+#            auto-commit: true
+#        # 一个连接idle状态的最大时长（毫秒），超时则被释放（retired），默认：10分钟
+#            idle-timeout: 600000
+#        # 连接池的名字
+#            pool-name: DatebookHikariCP
+#        # 一个连接的生命时长（毫秒），超时而且没被使用则被释放（retired），默认：30分钟1800000ms
+#            max-lifetime: 28740000
+#            connection-test-query: SELECT 1
+#
+#        db2:
+##          url: jdbc:mysql://172.17.5.7:3306/thsjzt?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
+##          username: thsjzt
+##          password: thsjzt
+#
+#          url: jdbc:mysql://59.198.246.77:32368/jl503033?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
+#          username: jl503033
+#          password: Bx82TIg0
+#                  # Hikari will use the above plus the following to setup connection pooling
+#          type: com.zaxxer.hikari.HikariDataSource
+#          hikari:
+#              # 等待连接池分配连接的最大时长（毫秒），超过这个时长还没有的连接则发生SQLException，默认：30秒
+#            connection-timeout: 30000
+#                    # 最小连接数
+#            minimum-idle: 5
+#              # 最大连接数
+#            maximum-pool-size: 15
+#              # 自动提交
+#            auto-commit: true
+#              # 一个连接idle状态的最大时长（毫秒），超时则被释放（retired），默认：10分钟
+#            idle-timeout: 600000
+#              # 连接池的名字
+#            pool-name: DatebookHikariCP
+#              # 一个连接的生命时长（毫秒），超时而且没被使用则被释放（retired），默认：30分钟1800000ms
+#            max-lifetime: 28740000
+#            connection-test-query: SELECT 1
 
 #    driver-class-name: com.mysql.cj.jdbc.Driver
 #        url: jdbc:mysql://59.198.246.77:32368/jl503034?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
@@ -195,3 +107,6 @@ server:
 xd:
   # 基础地址
   base_url: http://syggzy.jlsy.gov.cn/EpointWebService/rest/projectinformation
+project:
+  setting:
+    env: internate

test-api/target/classes/application.yml

@@ -9,6 +9,8 @@ spring:
 #vpn
 #        server-addr: 172.17.5.4:8848
 #内网
-        server-addr: 172.18.128.78
+#        server-addr: 172.18.128.78
 #互联网
-#        server-addr: 10.0.51.4:8848
+        server-addr: 10.0.51.4:8848
+
+

test-api/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -186,6 +186,7 @@ com\sooka\service\impl\GetQsWszInfo_ServiceImpl.class
 com\sooka\model\vo\Gatlicsecurityservicepermitlistquery_VO.class
 com\sooka\service\Immovablesinfolistquery_Service.class
 com\sooka\model\vo\GetLaborContractCancelRecordInfoListQuery_VO.class
+com\sooka\model\bo\TUInterfaceinfo.class
 com\sooka\model\bo\Guiji_housingconstruction_zlskfrx_Bean.class
 com\sooka\mapper\Guiji_Housingconstruction_Mapper2.class
 com\sooka\service\impl\GetEnterprisePopularFeelings_ServiceImpl.class
@@ -248,6 +249,7 @@ com\sooka\mapper\Guiji_Library_Mapper.class
 com\sooka\service\GetSsjksSwsxzyInfo_Service.class
 com\sooka\service\GetSwzsxx3_Service.class
 com\sooka\service\impl\Portraitandbrief_ServiceImpl.class
+com\sooka\utils\UnicodeUtil.class
 com\sooka\model\vo\GetEnterprisePopularFeelings_VO.class
 com\sooka\service\Gatlicblastingoperationunitpermitlistquery_Service.class
 com\sooka\service\Gatlicdriverbasicinfolistquery_Service.class
@@ -268,6 +270,7 @@ com\sooka\api\GetQyDjInfo_Api.class
 com\sooka\service\impl\GetEmploymentEntrepreneurshipCardListQuery_ServiceImpl.class
 com\sooka\service\impl\Guiji_healthcommission_ServiceImpl.class
 com\sooka\model\vo\QueryAoOpaDetails_VO.class
+com\sooka\model\bo\TULog.class
 com\sooka\service\GetLaborContractNewRecordInfoListQuery_Service.class
 com\sooka\service\GetSocialSecurityCardPersonBaseInfoListQuery_Service.class
 com\sooka\model\vo\GetUnemploymentRegisterInfoListQuery_VO.class
@@ -284,6 +287,7 @@ com\sooka\model\vo\GetJptsstaQsxx_VO.class
 com\sooka\model\vo\GetNcpSuspectedDiagnosis_VO.class
 com\sooka\service\Gatlicsecuritytrainingpermitlistquery_Service.class
 com\sooka\model\vo\Dqjglistquery_VO.class
+com\sooka\model\bo\Guiji_housingconstruction_hqrlsj_Bean.class
 com\sooka\service\impl\Gatlicblastingoperationunitpermitlistquery_ServiceImpl.class
 com\sooka\model\vo\Gatlicaccounttransfercertlistquery_VO.class
 com\sooka\model\bo\Guiji_healthcommission_yyryxx_Bean.class
@@ -378,6 +382,7 @@ com\sooka\mapper\Guiji_Healthcommission_Mapper2.class
 com\sooka\api\GetSwzsxx2_Api.class
 com\sooka\base\util\StrFormatter.class
 com\sooka\model\bo\Guiji_healthcommission_tjxx_Bean.class
+com\sooka\api_pagefile\Test.class
 com\sooka\service\impl\Gatliccitizenpassportcertlistquery_ServiceImpl.class
 com\sooka\api\Guiji_Housingconstruction.class
 com\sooka\model\vo\Gatlicblastingoperationunitpermitlistquery_VO.class

test-api/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -45,6 +45,7 @@ E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\Get
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\GetLaborContractCancelRecordBookListQuery_Service.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\Gatlicresidencepermitlistquery_ServiceImpl.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\Gatlicbackandforthhongkongandmacaolistquery_Service.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\bo\Guiji_housingconstruction_hqrlsj_Bean.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\GetCegnirEnterpriseCerditRating_Service.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\Gatlicaccounttransfercertlistquery_VO.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\GetEmploymentRegisterInfoListQuery_VO.java
@@ -330,8 +331,10 @@ E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\Fam
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\Esb2xy_getNhcNcpAreaClassification_Service.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\License_qrcode_get_Service.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\GetEnterpriseCoordinate_VO.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\bo\TUInterfaceinfo.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\Gatlicautopilotcertlistquery_ServiceImpl.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\service\impl\Gatlicpasstohongkongandmacaolistquery_ServiceImpl.java
+E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\bo\TULog.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\TestVO.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\bo\Guiji_housingconstruction_ysljc_Bean.java
 E:\首佳工作目录\thsjzt_cloud\test-api\src\main\java\com\sooka\model\vo\Esb2xy_getNcpInterantionalMsg_VO.java

test-api/test-api.iml

@@ -58,7 +58,6 @@
     <orderEntry type="library" name="Maven: commons-io:commons-io:2.2" level="project" />
     <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.8.1" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-api:1.1.1" level="project" />
-    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.11" level="project" />
     <orderEntry type="library" name="Maven: io.prometheus:simpleclient:0.5.0" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-commons:2.1.2.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.security:spring-security-crypto:5.1.6.RELEASE" level="project" />
@@ -83,8 +82,6 @@
     <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
     <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon-httpclient:2.3.0" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.httpcomponents:httpclient:4.5.9" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.httpcomponents:httpcore:4.4.11" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.jersey:jersey-client:1.19.1" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.jersey:jersey-core:1.19.1" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.jersey.contribs:jersey-apache-client4:1.19.1" level="project" />
@@ -196,5 +193,8 @@
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.1.7.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.4" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet:javax.servlet-api:4.0.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.10" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.6" level="project" />
+    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.11" level="project" />
   </component>
 </module>