Merge branch 'dev20230707' of http://192.168.60.201/root/dsk-operate-sys into dev20230707

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

 package com.dsk.web.controller.dsk;
 
 import com.dsk.common.core.controller.BaseController;
-import com.dsk.common.core.domain.AjaxResult;
 import com.dsk.common.core.domain.R;
 import com.dsk.common.core.page.TableDataInfo;
 import com.dsk.system.domain.dsk.dto.JskCombineCertificateDto;
@@ -9,7 +8,8 @@ import com.dsk.system.domain.dsk.dto.JskCombineSearchDto;
 import com.dsk.system.dskService.JskCombineInfoService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -29,39 +29,39 @@ public class JskCombineInfoController extends BaseController {
     /**
      *  集团成员列表
      */
-    @GetMapping("/memberList")
-    public TableDataInfo memberList(JskCombineSearchDto dto) throws Exception {
+    @PostMapping("/memberList")
+    public TableDataInfo memberList(@RequestBody JskCombineSearchDto dto) throws Exception {
         return baseService.memberList(dto);
     }
 
     /**
      *  分组成员数量
      */
-    @GetMapping("/group/memberCount")
-    public R groupMemberCount(JskCombineSearchDto dto) {
+    @PostMapping("/group/memberCount")
+    public R groupMemberCount(@RequestBody JskCombineSearchDto dto) {
         return baseService.groupMemberCount(dto);
     }
 
     /**
      *  集团业绩列表
      */
-    @GetMapping("/businessList")
-    public TableDataInfo businessList(JskCombineSearchDto dto) throws Exception {
+    @PostMapping("/businessList")
+    public TableDataInfo businessList(@RequestBody JskCombineSearchDto dto) throws Exception {
         return baseService.businessList(dto);
     }
 
     /**
      *  集团资质列表
      */
-    @GetMapping("/certificateList")
-    public TableDataInfo certificateList(JskCombineSearchDto dto) throws Exception {
+    @PostMapping("/certificateList")
+    public TableDataInfo certificateList(@RequestBody JskCombineSearchDto dto) throws Exception {
         return baseService.certificateList(dto);
     }
     /**
      *  集团成员资质列表
      */
-    @GetMapping("/menber/certificateList")
-    public TableDataInfo menberCertificateList(JskCombineCertificateDto dto) throws Exception {
+    @PostMapping("/menber/certificateList")
+    public TableDataInfo menberCertificateList(@RequestBody JskCombineCertificateDto dto) throws Exception {
         return baseService.menberCertificateList(dto);
     }
 }

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

@@ -202,3 +202,7 @@ dsk:
 #    accessKeyId: aec7b3ff2y2q8x6t49a7e2c463ce21912
 #    accessKeySecret: ee8a53c7ea04eb3ac311406c8f56f95b
 #    protocol: https
+#    endPoint: localhost:8767
+#    accessKeyId: aec7b3ff2y2q8x6t49a7e2c463ce21912
+#    accessKeySecret: ee8a53c7ea04eb3ac311406c8f56f95b
+#    protocol: http