update

dsk-admin/src/main/java/com/dsk/web/controller/customer/CustomerController.java

@@ -104,7 +104,7 @@ public class CustomerController extends BaseController {
     //@PreAuthorize("@ss.hasPermi('customer:importData')")
     @PostMapping("/importData")
     public AjaxResult importData(@RequestPart("file") MultipartFile file) throws Exception {
-       List<Customer> customerList = new ExcelUtil<>(Customer.class).importExcel(file.getInputStream(), 2);
+        List<Customer> customerList = new ExcelUtil<>(Customer.class).importExcel(file.getInputStream(), 2);
         List<String> resultList = new ArrayList<>();
         for (Customer customer : customerList) {
             if (ObjectUtils.isEmpty(customer.getCompanyName())) {
@@ -112,19 +112,19 @@ public class CustomerController extends BaseController {
             }
             try {
                 Map<String, Object> map = opportunityRadarService.enterpriseByName(customer.getCompanyName());
-                if(ObjectUtils.isEmpty(map)){
+                if (ObjectUtils.isEmpty(map)) {
                     throw new HttpException("远程调用匹配接口失败！");
                 }
                 Map<String, Object> obj = BeanUtil.beanToMap(map.get("data"));
-                if(!ObjectUtils.isEmpty(obj)){
-                    customer.setCompanyId(MapUtil.getInt(obj,"jskEid"));
-                    customer.setLegalPerson(MapUtil.getStr(obj,"legalPerson"));
-                    customer.setRegisterCapital(MapUtil.getStr(obj,"registeredCapital"));
-                    customer.setProvinceId(MapUtil.getInt(obj,"provinceId"));
-                    customer.setCityId(MapUtil.getInt(obj,"cityId"));
-                    customer.setDistrictId(MapUtil.getInt(obj,"districtId"));
-                    customer.setRegisterAddress(MapUtil.getStr(obj,"domicile"));
-                    customer.setCreditCode(MapUtil.getStr(obj,"creditCode"));
+                if (!ObjectUtils.isEmpty(obj)) {
+                    customer.setCompanyId(MapUtil.getInt(obj, "jskEid"));
+                    customer.setLegalPerson(MapUtil.getStr(obj, "legalPerson"));
+                    customer.setRegisterCapital(MapUtil.getStr(obj, "registeredCapital"));
+                    customer.setProvinceId(MapUtil.getInt(obj, "provinceId"));
+                    customer.setCityId(MapUtil.getInt(obj, "cityId"));
+                    customer.setDistrictId(MapUtil.getInt(obj, "countyId"));
+                    customer.setRegisterAddress(MapUtil.getStr(obj, "domicile"));
+                    customer.setCreditCode(MapUtil.getStr(obj, "creditCode"));
                 }
                 baseService.add(customer);
             } catch (Exception e) {

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

@@ -193,9 +193,11 @@ xss:
 
 dsk:
   open:
+    #    endPoint: sandbox.openapi.jiansheku.com
+    #    accessKeyId: aec7b3ff2e8b48e79a7e2c463ce21912
+    #    accessKeySecret: ee8a53c7ea04eb3ac311406c8f56f95b
+    #    protocol: https
     endPoint: 120.27.13.145:8865
     accessKeyId: aec7b3ff2y2q8x6t49a7e2c463ce21912
     accessKeySecret: ee8a53c7ea04eb3ac311406c8f56f95b
-#    endPoint: sandbox.openapi.jiansheku.com
-#    accessKeyId: aec7b3ff2e8b48e79a7e2c463ce21912
-#    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;
     }
-}
\ No newline at end of file
+
+    public String getProtocol() {
+        return protocol;
+    }
+
+    public void setProtocol(String protocol) {
+        this.protocol = protocol;
+    }
+}

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

@@ -48,7 +48,7 @@ public class DskOpenApiUtil {
 	public Map<String,Object> requestForm(String path, Map<String, Object> bodyMap){
 		return request(path, bodyMap, "form");
 	}
-	
+
 	/**
 	 * <b>开放平台统一请求</b>
 	 * @param path 请求路径
@@ -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));
@@ -109,4 +109,4 @@ public class DskOpenApiUtil {
 		return new TableDataInfo((List<?>) list, count);
 	}
 
-}
\ No newline at end of file
+}

dsk-system/src/main/java/com/dsk/system/service/impl/CustomerServiceImpl.java

@@ -2,10 +2,8 @@ package com.dsk.system.service.impl;
 
 import cn.hutool.core.bean.BeanException;
 import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.map.MapUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.dsk.common.exception.ServiceException;
-import com.dsk.common.utils.DskOpenApiUtil;
 import com.dsk.common.utils.SecurityUtils;
 import com.dsk.system.domain.customer.Customer;
 import com.dsk.system.domain.customer.CustomerUser;
@@ -19,14 +17,12 @@ import com.dsk.system.mapper.CustomerUserMapper;
 import com.dsk.system.service.IBusinessInfoService;
 import com.dsk.system.service.ICustomerService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections4.MapUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
 import java.util.List;
 
 /**