From 064c341ea9fb22621bb77a2c6210ad223465e4cf Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Sun, 1 Dec 2024 11:31:22 +0800
Subject: [PATCH] md

---
 ..._github_openfeign_feign_httpclient_10_1_0.xml | 13 +++++++++++++
 emis-oms-biz-web/emis-oms-biz-web.iml            |  1 +
 emis-oms-biz/emis-oms-biz.iml                    |  1 +
 emis-oms-biz/pom.xml                             |  8 ++++++++
 .../erp/oms/service/svc/IRpcSettleBillSvc.java   | 16 ++++++++++++++--
 5 files changed, 37 insertions(+), 2 deletions(-)
 create mode 100644 .idea/libraries/Maven__io_github_openfeign_feign_httpclient_10_1_0.xml

diff --git a/.idea/libraries/Maven__io_github_openfeign_feign_httpclient_10_1_0.xml b/.idea/libraries/Maven__io_github_openfeign_feign_httpclient_10_1_0.xml
new file mode 100644
index 0000000..c52f866
--- /dev/null
+++ b/.idea/libraries/Maven__io_github_openfeign_feign_httpclient_10_1_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: io.github.openfeign:feign-httpclient:10.1.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/github/openfeign/feign-httpclient/10.1.0/feign-httpclient-10.1.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/io/github/openfeign/feign-httpclient/10.1.0/feign-httpclient-10.1.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/github/openfeign/feign-httpclient/10.1.0/feign-httpclient-10.1.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/emis-oms-biz-web/emis-oms-biz-web.iml b/emis-oms-biz-web/emis-oms-biz-web.iml
index 04c9be4..47d2bd1 100644
--- a/emis-oms-biz-web/emis-oms-biz-web.iml
+++ b/emis-oms-biz-web/emis-oms-biz-web.iml
@@ -271,5 +271,6 @@
     <orderEntry type="library" name="Maven: org.springframework.security:spring-security-crypto:5.5.5" level="project" />
     <orderEntry type="library" name="Maven: io.github.openfeign:feign-core:11.10" level="project" />
     <orderEntry type="library" name="Maven: io.github.openfeign:feign-slf4j:11.10" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign:feign-httpclient:10.1.0" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/emis-oms-biz/emis-oms-biz.iml b/emis-oms-biz/emis-oms-biz.iml
index c8c03ba..d5ce80c 100644
--- a/emis-oms-biz/emis-oms-biz.iml
+++ b/emis-oms-biz/emis-oms-biz.iml
@@ -220,6 +220,7 @@
     <orderEntry type="library" name="Maven: org.springframework.security:spring-security-crypto:5.5.5" level="project" />
     <orderEntry type="library" name="Maven: io.github.openfeign:feign-core:11.10" level="project" />
     <orderEntry type="library" name="Maven: io.github.openfeign:feign-slf4j:11.10" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign:feign-httpclient:10.1.0" level="project" />
     <orderEntry type="library" name="Maven: com.github.binarywang:weixin-java-miniapp:4.3.0" level="project" />
     <orderEntry type="library" name="Maven: com.github.binarywang:weixin-java-common:4.3.0" level="project" />
     <orderEntry type="library" name="Maven: com.thoughtworks.xstream:xstream:1.4.19" level="project" />
diff --git a/emis-oms-biz/pom.xml b/emis-oms-biz/pom.xml
index c21c0ab..40c5429 100644
--- a/emis-oms-biz/pom.xml
+++ b/emis-oms-biz/pom.xml
@@ -82,6 +82,14 @@
             <version>3.1.7</version>
         </dependency>
 
+
+        <!-- 使用 openfeign 自家的 feign httpclient 代替 Apache httpclient 发送请求 -->
+        <dependency>
+            <groupId>io.github.openfeign</groupId>
+            <artifactId>feign-httpclient</artifactId>
+            <version>10.1.0</version>
+        </dependency>
+
         <dependency>
             <groupId>com.github.binarywang</groupId>
             <artifactId>weixin-java-miniapp</artifactId>
diff --git a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/svc/IRpcSettleBillSvc.java b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/svc/IRpcSettleBillSvc.java
index 5571861..361248f 100644
--- a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/svc/IRpcSettleBillSvc.java
+++ b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/svc/IRpcSettleBillSvc.java
@@ -5,6 +5,7 @@ import com.xdadan.erp.oms.common.core.domain.AjaxResult;
 import com.xdadan.erp.oms.domain.EmisSettleBill;
 import com.xdadan.erp.oms.domain.EmisWarehouseIn;
 import com.xdadan.erp.oms.domain.vo.WaybillOrder;
+import feign.QueryMap;
 import feign.Response;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.cloud.openfeign.SpringQueryMap;
@@ -22,15 +23,26 @@ import java.util.Map;
 public interface IRpcSettleBillSvc {
 
 
+//    @GetMapping("/apiweb/emisSettleBill/listSimple")
+//    public AjaxResult listSimple(
+//            @RequestParam("customerCode") String customerCode,
+//            @RequestParam("params") Map<String, Object> params,
+//            @RequestParam("searchValue") String searchValue,
+//            @RequestParam("pageNum") Integer pageNum,
+//            @RequestParam("pageSize") Integer pageSize);
+
+
     @GetMapping("/apiweb/emisSettleBill/listSimple")
     public AjaxResult listSimple(
             @RequestParam("customerCode") String customerCode,
-            @RequestParam("params") Map<String, Object> params,
-            @RequestParam("searchValue") String searchValue,
+            @QueryMap Map queryMap,
             @RequestParam("pageNum") Integer pageNum,
             @RequestParam("pageSize") Integer pageSize);
 
 
+
+
+
     @GetMapping("/apiweb/emisSettleBill/getInfoBySettleBillNo")
     public AjaxResult getInfoBySettleBillNo(@RequestParam("customerCode") String customerCode, @RequestParam("settleBillNo") String settleBillNo);