Merge remote-tracking branch 'origin/master'

dsk-admin/src/main/java/com/dsk/DskOperateSysApplication.java

 package com.dsk;
 
+import com.dsk.common.config.DskOpenApiConfig;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.context.ConfigurableApplicationContext;
 
 /**
  * 启动程序
@@ -13,7 +15,9 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 public class DskOperateSysApplication {
     public static void main(String[] args) {
         // System.setProperty("spring.devtools.restart.enabled", "false");
-        SpringApplication.run(DskOperateSysApplication.class, args);
+        ConfigurableApplicationContext run = SpringApplication.run(DskOperateSysApplication.class, args);
+        run.getBean(DskOpenApiConfig.class);
         System.out.println("(♥◠‿◠)ﾉﾞ  项目启动成功   ლ(´ڡ`ლ)ﾞ ");
     }
+
 }

dsk-admin/src/main/java/com/dsk/web/controller/dsk/EnterpriseController.java

+package com.dsk.web.controller.dsk;
+
+import com.dsk.common.core.domain.R;
+import com.dsk.common.core.domain.model.EnterpriseBody;
+import com.dsk.system.dskService.EnterpriseService;
+import io.swagger.annotations.Api;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+
+
+/**
+ * @ClassName EnterpriseController
+ * @Description TODO
+ * @Author zhangyi
+ * @Date 2023/5/15 12:01
+ * @Version 1.0
+ */
+@Api("企业数据相关")
+@RestController
+@RequestMapping("/enterprise")
+public class EnterpriseController {
+
+    @Autowired
+    private EnterpriseService enterpriseService;
+
+    @PostMapping("/infoHeader")
+    public R infoHeader(@RequestBody @Valid EnterpriseBody body) throws Exception
+    {
+      return enterpriseService.infoHeader(body);
+    }
+}

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

@@ -9,7 +9,7 @@ ruoyi:
   # 实例演示开关
   demoEnabled: true
   # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
-  profile: D:/ruoyi/uploadPath
+  profile: D:/dsk-operate-sys/uploadPath
   # 获取ip地址开关
   addressEnabled: false
   # 验证码类型 math 数组计算 char 字符验证
@@ -178,7 +178,7 @@ swagger:
   # 是否开启swagger
   enabled: true
   # 请求前缀
-  pathMapping: /dev-api
+  pathMapping: /
 
 # 防止XSS攻击
 xss:
@@ -189,7 +189,8 @@ xss:
   # 匹配链接
   urlPatterns: /system/*,/monitor/*,/tool/*
 
-dsk-acc:
+dsk:
   open:
-    accessKeyId: 5dat74XI0CMWgoskYW32VkpVCD0MXsC0
-    accessSecret: 1a5G4svf71KQHCg13FU3NyoJUrTp8cES
+    endPoint: sandbox.openapi.jiansheku.com
+    accessKeyId: aec7b3ff2e8b48e79a7e2c463ce21912
+    accessKeySecret: ee8a53c7ea04eb3ac311406c8f56f95b

dsk-common/pom.xml

@@ -17,17 +17,6 @@
 
     <dependencies>
 
-        <dependency>
-            <groupId>com.gitee.dasikong</groupId>
-            <artifactId>dsk-acc-open-sdk-java</artifactId>
-            <version>1.0.4</version>
-        </dependency>
-        <dependency>
-            <groupId>cn.hutool</groupId>
-            <artifactId>hutool-all</artifactId>
-            <version>5.7.13</version>
-        </dependency>
-
         <!-- Spring框架基本的核心工具 -->
         <dependency>
             <groupId>org.springframework</groupId>
@@ -124,6 +113,12 @@
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-pool2</artifactId>
         </dependency>
+        <!-- hutool工具类 -->
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>${hutool-all.version}</version>
+        </dependency>
 
         <!-- 解析客户端操作系统、浏览器等 -->
         <dependency>
@@ -141,6 +136,11 @@
             <artifactId>lombok</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.gitee.dasikong</groupId>
+            <artifactId>dsk-acc-open-sdk-java</artifactId>
+            <version>${dsk-openapi-sdk.version}</version>
+        </dependency>
     </dependencies>
 
 </project>

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

+package com.dsk.common.config;
+
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+/**
+*@Description: 读取开放平台配置信息
+*@Author: zhangyi
+*@date: 2023/5/15 15:31
+*/
+@Component
+@ConfigurationProperties(prefix = "dsk.open")
+public class DskOpenApiConfig {
+    public String accessKeyId;
+    public String accessKeySecret;
+    public String endPoint;
+
+    public String getAccessKeyId() {
+        return accessKeyId;
+    }
+
+    public void setAccessKeyId(String accessKeyId) {
+        this.accessKeyId = accessKeyId;
+    }
+
+    public String getAccessKeySecret() {
+        return accessKeySecret;
+    }
+
+    public void setAccessKeySecret(String accessKeySecret) {
+        this.accessKeySecret = accessKeySecret;
+    }
+
+    public String getEndPoint() {
+        return endPoint;
+    }
+
+    public void setEndPoint(String endPoint) {
+        this.endPoint = endPoint;
+    }
+}
\ No newline at end of file

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseBody.java

+package com.dsk.common.core.domain.model;
+
+import javax.validation.constraints.NotNull;
+
+public class EnterpriseBody
+{
+    /**
+     * 企业id
+     */
+    @NotNull(message = "企业id不能为空")
+    private Integer companyId;
+
+    public Integer getCompanyId() {
+        return companyId;
+    }
+
+    public void setCompanyId(Integer companyId) {
+        this.companyId = companyId;
+    }
+
+    @Override
+    public String toString() {
+        final StringBuffer sb = new StringBuffer("com.dsk.common.core.domain.model.EnterpriseBody{");
+        sb.append("companyId='").append(companyId).append('\'');
+        sb.append('}');
+        return sb.toString();
+    }
+}

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

+package com.dsk.common.utils;
+
+import com.dsk.acc.openapi.api.AccClient;
+import com.dsk.acc.openapi.client.Config;
+import com.dsk.acc.openapi.client.util.CommonUtils;
+import com.dsk.common.config.DskOpenApiConfig;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+@Component
+public class DskOpenApiUtil {
+	@Autowired
+	private DskOpenApiConfig dskOpenApiConfig;
+
+	/**
+	 * <b>application/json请求</b>
+	 * @param path 请求路径
+	 * @param bodyMap 参数体
+	 * @return
+	 */
+	public Map<String,Object> requestBody(String path, Map<String, Object> bodyMap){
+		return request(path, bodyMap, "json");
+	}
+	
+	/**
+	 * <b>application/x-www-form-urlencoded请求</b>
+	 * @param path 请求路径
+	 * @param bodyMap 参数体
+	 * @return
+	 */
+	public Map<String,Object> requestForm(String path, Map<String, Object> bodyMap){
+		return request(path, bodyMap, "form");
+	}
+	
+	/**
+	 * <b>开放平台统一请求</b>
+	 * @param path 请求路径
+	 * @param bodyMap 参数体
+	 * @param reqBodyType 请求格式
+	 * @return
+	 */
+	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));
+			Map<String, ?> res = AccClient.request(reqBodyType, path, bodyMap);
+			if(!res.containsKey("headers") || !res.containsKey("body")) {
+				throw new RuntimeException(String.format("请求无返回:path=%s",path));
+			}
+			Object resBody = res.get("body");
+			if(resBody == null) {
+				return null;
+			}
+			return CommonUtils.assertAsMap(resBody);
+		} catch (Exception e) {
+			throw new RuntimeException(String.format("请求异常:path=%s,err=%s",path,e.getMessage()));
+		}
+	}
+
+}
\ No newline at end of file

dsk-common/src/main/java/com/dsk/common/utils/http/DskAccClientUtil.java

-package com.dsk.common.utils.http;
-
-
-import com.dsk.acc.openapi.api.AccClient;
-import com.dsk.acc.openapi.client.Config;
-import com.dsk.acc.openapi.client.util.CommonUtils;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * @author lc
- * @date 2022/2/18 11:41
- */
-@Slf4j
-@Component
-public class DskAccClientUtil {
-
-    private static String accessKeyId;
-    private static String accessSecret;
-
-
-    /**
-     * <b>application/json请求</b>
-     * @param path 请求路径
-     * @param bodyMap 参数体
-     * @return
-     * */
-    public static Map<String,Object> requestBody(String path, Map<String, Object> bodyMap){
-        return request(path, bodyMap, "json");
-    }
-
-    /**
-     * <b>application/x-www-form-urlencoded请求</b>
-     * @param path 请求路径
-     * @param bodyMap 参数体
-     * @return
-     */
-    public static Map<String,Object> requestForm(String path, Map<String, Object> bodyMap){
-        return request(path, bodyMap, "form");
-    }
-
-    /**
-     * <b>开放平台统一请求</b>
-     * @param path 请求路径
-     * @param bodyMap 参数体
-     * @param reqBodyType 请求格式
-     * @return
-     */
-    public static Map<String,Object> request(String path, Map<String, Object> bodyMap, String reqBodyType){
-//        try {
-            //测试沙盒版本
-//            AccClient.init(new Config(accessKeyId, accessSecret).setEndpoint("sandbox.openapi.jiansheku.com"));
-            //后期线上版本
-            AccClient.init(new Config(accessKeyId, accessSecret));
-            Map<String, ?> res = AccClient.request(reqBodyType, path, bodyMap);
-            if(!res.containsKey("headers") || !res.containsKey("body")) {
-                throw new RuntimeException(String.format("请求无返回:path=%s",path));
-            }
-            Object resBody = res.get("body");
-            if(resBody == null) {
-                return null;
-            }
-            return CommonUtils.assertAsMap(resBody);
-//        } catch (Exception e) {
-//            log.error("大司空开放平台请求异常 request() ",e);
-//            throw new RuntimeException(String.format("请求异常:path=%s,err=%s",path,e.getMessage()));
-//        }
-    }
-
-    public String getAccessKeyId() {
-        return accessKeyId;
-    }
-
-    @Value("${dsk-acc.open.accessKeyId}")
-    public void setAccessKeyId(String accessKeyId) {
-        DskAccClientUtil.accessKeyId = accessKeyId;
-    }
-
-    public String getAccessSecret() {
-        return accessSecret;
-    }
-
-    @Value("${dsk-acc.open.accessSecret}")
-    public void setAccessSecret(String accessSecret) {
-        DskAccClientUtil.accessSecret = accessSecret;
-    }
-
-
-    public static void main(String[] args) {
-
-        DskAccClientUtil.accessKeyId="kUN0ZtZg2H4b1e6z6smXlzo7Enta0bKt";
-        DskAccClientUtil.accessSecret="LXmIIEZ9vVkRAqAKFDlYCavtkfveIDPi";
-//        Map<String, Object> map =new HashMap<>();
-//        map.put("companyId",339447);
-
-        Map<String, Object> jsonParam = new HashMap<String, Object>();
-        jsonParam.put("companyName", "重庆大司空信息科技有限公司");
-        jsonParam.put("creditCode", "91350203MA2YG0RP5A");
-       // Map<String,Object> res = DskAccClientUtil.requestBody(DskAccClientUtil.HTTPURLMAP.get("涉金融领域非法集资企业"), jsonParam);
-//        Map<String, Object> result = requestForm("/zh/jsk/enterprise/ownership", map);
-   //     System.out.println(JSONUtil.toJsonStr(res));
-//        List<CompanyInfo> list = multiCriteriaQuery("浙江恒欣设计集团股份有限公司");
-//        System.out.println(list);
-
-
-
-    }
-}
-

dsk-system/src/main/java/com/dsk/system/dskService/EnterpriseService.java

+package com.dsk.system.dskService;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.dsk.common.core.domain.R;
+import com.dsk.common.core.domain.model.EnterpriseBody;
+import com.dsk.common.utils.DskOpenApiUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+/**
+ * @ClassName enterpriseService
+ * @Description TODO
+ * @Author zhangyi
+ * @Date 2023/5/15 12:00
+ * @Version 1.0
+ */
+@Service
+public class EnterpriseService {
+
+    private static final Logger log = LoggerFactory.getLogger(EnterpriseService.class);
+
+    @Autowired
+    private DskOpenApiUtil dskOpenApiUtil;
+
+    public R infoHeader(EnterpriseBody body) throws Exception {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/api/jsk/enterprise/infoHeader", BeanUtil.beanToMap(body, false, false));
+        return BeanUtil.toBean(map, R.class);
+    }
+}

pom.xml

@@ -30,6 +30,8 @@
         <jwt.version>0.9.1</jwt.version>
         <mybatis-plus.version>3.4.2</mybatis-plus.version>
         <lombok.version>1.16.20</lombok.version>
+        <hutool-all.version>5.8.0</hutool-all.version>
+        <dsk-openapi-sdk.version>2.1.0</dsk-openapi-sdk.version>
     </properties>
 
     <!-- 依赖声明 -->