企业调用相关，调用配置修改

dsk-admin/src/main/java/com/dsk/web/controller/search/controller/CompanySearchController.java

@@ -3,9 +3,7 @@ package com.dsk.web.controller.search.controller;
 import com.dsk.common.core.domain.AjaxResult;
 import com.dsk.common.dtos.ComposeQueryDto;
 import com.dsk.web.controller.search.service.BusinessOpportunityRadarService;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 
@@ -34,8 +32,8 @@ public class CompanySearchController {
     /*
      * 完全匹配企业名称
      */
-    @RequestMapping("/findByName")
-    public AjaxResult findByName(@RequestBody ComposeQueryDto compose) {
-        return opportunityRadarService.enterpriseByName(compose);
+    @GetMapping("/findByName/{keyword}")
+    public AjaxResult findByName(@PathVariable String keyword) {
+        return opportunityRadarService.enterpriseByName(keyword);
     }
 }

dsk-admin/src/main/java/com/dsk/web/controller/search/service/BusinessOpportunityRadarService.java

@@ -20,5 +20,5 @@ public interface BusinessOpportunityRadarService {
 
     AjaxResult enterprisePage(ComposeQueryDto compose);
 
-    AjaxResult enterpriseByName(ComposeQueryDto compose);
+    AjaxResult enterpriseByName(String keyword);
 }

dsk-admin/src/main/java/com/dsk/web/controller/search/service/impl/BusinessOpportunityRadarServiceImpl.java

@@ -10,6 +10,7 @@ import com.dsk.web.controller.search.service.MarketAnalysisService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
 import java.util.Map;
 
 /**
@@ -51,14 +52,15 @@ public class BusinessOpportunityRadarServiceImpl implements BusinessOpportunityR
 
     @Override
     public AjaxResult enterprisePage(ComposeQueryDto compose) {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/api/nationzj/enterprice/index", BeanUtil.beanToMap(compose, false, false));
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/enterprice/index", BeanUtil.beanToMap(compose, false, false));
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 
     @Override
-    public AjaxResult enterpriseByName(ComposeQueryDto compose){
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/api/nationzj/enterprice/findByName", BeanUtil.beanToMap(compose, false, false));
-//        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/enterprice/findByName", BeanUtil.beanToMap(compose, false, false));
+    public AjaxResult enterpriseByName(String keyword){
+        Map<String,Object> params = new HashMap<>();
+        params.put("keyword",keyword);
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/enterprice/findByName", params);
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 }

dsk-admin/src/main/resources/application-dev.yml

@@ -193,6 +193,11 @@ xss:
 
 dsk:
   open:
-    endPoint: sandbox.openapi.jiansheku.com
-    accessKeyId: aec7b3ff2e8b48e79a7e2c463ce21912
+#    endPoint: sandbox.openapi.jiansheku.com
+#    accessKeyId: aec7b3ff2e8b48e79a7e2c463ce21912
+#    accessKeySecret: ee8a53c7ea04eb3ac311406c8f56f95b
+#    protocol: https
+    endPoint: 120.27.13.145:8865
+    accessKeyId: aec7b3ff2y2q8x6t49a7e2c463ce21912
     accessKeySecret: ee8a53c7ea04eb3ac311406c8f56f95b
+    protocol: http

dsk-common/src/main/java/com/dsk/common/config/DskOpenApiConfig.java

@@ -15,6 +15,7 @@ public class DskOpenApiConfig {
     public String accessKeyId;
     public String accessKeySecret;
     public String endPoint;
+    public String protocol;
 
     public String getAccessKeyId() {
         return accessKeyId;
@@ -39,4 +40,12 @@ public class DskOpenApiConfig {
     public void setEndPoint(String endPoint) {
         this.endPoint = endPoint;
     }
+
+    public String getProtocol() {
+        return protocol;
+    }
+
+    public void setProtocol(String protocol) {
+        this.protocol = protocol;
+    }
 }

dsk-common/src/main/java/com/dsk/common/utils/DskOpenApiUtil.java

@@ -59,7 +59,7 @@ public class DskOpenApiUtil {
 	public Map<String,Object> request(String path, Map<String, Object> bodyMap, String reqBodyType){
 		try {
 			AccClient.init(new Config(dskOpenApiConfig.accessKeyId, dskOpenApiConfig.accessKeySecret)
-					.setEndpoint(dskOpenApiConfig.endPoint));
+					.setEndpoint(dskOpenApiConfig.endPoint).setProtocol(dskOpenApiConfig.protocol));
 			Map<String, ?> res = AccClient.request(reqBodyType, path, bodyMap);
 			if(!res.containsKey("headers") || !res.containsKey("body")) {
 				throw new RuntimeException(String.format("请求无返回:path=%s",path));