Merge branch 'test'

pom.xml

@@ -57,10 +57,10 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
-        <dependency>
+       <!-- <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-security</artifactId>
-        </dependency>
+        </dependency>-->
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-tx</artifactId>

src/main/java/com/uas/credit/SSOConfiguration.java

@@ -16,7 +16,7 @@ public class SSOConfiguration extends WebMvcConfigurerAdapter {
     @Autowired
     private AccessSignatureInterceptor accessSignatureInterceptor;
 
-    public void addInterceptors(InterceptorRegistry registry) {
+   /* public void addInterceptors(InterceptorRegistry registry) {
         registry.addInterceptor(accessSignatureInterceptor).addPathPatterns("/**");
-    }
+    }*/
 }

src/main/java/com/uas/credit/controller/ErpQueryController.java

@@ -1,17 +1,13 @@
 package com.uas.credit.controller;
 
 import com.alibaba.fastjson.JSON;
-import com.fasterxml.jackson.databind.annotation.JsonAppend;
 import com.uas.credit.model.EnterpriseQuery;
-import com.uas.credit.model.ErpQuery;
 import com.uas.credit.model.PersonQuery;
 import com.uas.credit.service.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.*;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
@@ -45,14 +41,15 @@ public class ErpQueryController {
     /**
      * ERP对企业进行查询
      */
-    @RequestMapping(value = "/queryEn",method = RequestMethod.GET)
-    public ModelMap queryEn(String json) {
+    @RequestMapping(value = "/queryEn",method = RequestMethod.POST)
+    public ModelMap queryEn(@RequestBody String json) {
         ModelMap modelMap = new ModelMap();
         EnterpriseQuery erpQuery = new EnterpriseQuery();
         try {
             String query = URLDecoder.decode(json, "utf-8");
             erpQuery = JSON.parseObject(query, EnterpriseQuery.class);
         } catch (UnsupportedEncodingException e) {
+
             e.printStackTrace();
         }
         if (erpQuery != null) {
@@ -75,8 +72,8 @@ public class ErpQueryController {
     /**
      * erp对个人进行查询
      */
-    @RequestMapping(value = "/queryPe",method = RequestMethod.GET)
-    public ModelMap queryPerson(String json) {
+    @RequestMapping(value = "/queryPe",method = RequestMethod.POST)
+    public ModelMap queryPerson(@RequestBody String json) {
         ModelMap modelMap = new ModelMap();
         PersonQuery erpQuery = new PersonQuery();
         try {

src/main/java/com/uas/credit/controller/PyConfig.java

@@ -1,12 +1,12 @@
 package com.uas.credit.controller;
 
 /**
- *
+ * 鹏元配置信息
  */
 public class PyConfig {
 
     // API域名
-    public final static String HOST = "https://test.pycredit.com:6443"; // 测试环境
+    public final static String HOST = "http://test.pycredit.com:6001"; // 测试环境
 //    public final static String HOST = "https://www.pycredit.com:6443"; // 生产环境
 
     // 返回报文压缩的URL

src/main/java/com/uas/credit/model/personal/PoliceCheckInfo.java

@@ -1,7 +1,5 @@
 package com.uas.credit.model.personal;
 
-import com.uas.credit.model.Item;
-
 import javax.persistence.*;
 import java.io.Serializable;
 

src/main/java/com/uas/credit/service/impl/EnRiskInfoServiceImpl.java

@@ -9,7 +9,6 @@ import com.uas.credit.model.QueryCondition;
 import com.uas.credit.model.QueryConditions;
 import com.uas.credit.model.corpriskinfo.EnRiskInfoReport;
 import com.uas.credit.service.EnRiskInfoService;
-import com.uas.credit.service.EnterpriseQueryService;
 import com.uas.credit.service.ErpQueryService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

src/main/java/com/uas/credit/util/PyConfig.java

@@ -5,7 +5,7 @@ package com.uas.credit.util;
  **/
 public class PyConfig {
     // API域名
-    public final static String HOST = "https://test.pycredit.com:6443"; // 测试环境
+    public final static String HOST = "http://test.pycredit.com:6001"; // 测试环境
 //    public final static String HOST = "https://www.pycredit.com:6443"; // 生产环境
 
     // 返回报文压缩的URL