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

---
 ...hub_openfeign_feign_httpclient_10_2_3.xml} |  8 ++++----
 ...apache_httpcomponents_httpclient_4_5_9.xml | 13 +++++++++++++
 emis-oms-biz-web/emis-oms-biz-web.iml         |  8 ++++----
 emis-oms-biz/emis-oms-biz.iml                 |  8 ++++----
 emis-oms-biz/pom.xml                          | 19 ++++++++++++++++---
 5 files changed, 41 insertions(+), 15 deletions(-)
 rename .idea/libraries/{Maven__io_github_openfeign_feign_httpclient_10_1_0.xml => Maven__io_github_openfeign_feign_httpclient_10_2_3.xml} (65%)
 create mode 100644 .idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_9.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_2_3.xml
similarity index 65%
rename from .idea/libraries/Maven__io_github_openfeign_feign_httpclient_10_1_0.xml
rename to .idea/libraries/Maven__io_github_openfeign_feign_httpclient_10_2_3.xml
index c52f866..bdceb07 100644
--- a/.idea/libraries/Maven__io_github_openfeign_feign_httpclient_10_1_0.xml
+++ b/.idea/libraries/Maven__io_github_openfeign_feign_httpclient_10_2_3.xml
@@ -1,13 +1,13 @@
 <component name="libraryTable">
-  <library name="Maven: io.github.openfeign:feign-httpclient:10.1.0">
+  <library name="Maven: io.github.openfeign:feign-httpclient:10.2.3">
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/io/github/openfeign/feign-httpclient/10.1.0/feign-httpclient-10.1.0.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/io/github/openfeign/feign-httpclient/10.2.3/feign-httpclient-10.2.3.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/io/github/openfeign/feign-httpclient/10.1.0/feign-httpclient-10.1.0-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/io/github/openfeign/feign-httpclient/10.2.3/feign-httpclient-10.2.3-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/io/github/openfeign/feign-httpclient/10.1.0/feign-httpclient-10.1.0-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/io/github/openfeign/feign-httpclient/10.2.3/feign-httpclient-10.2.3-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_9.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_9.xml
new file mode 100644
index 0000000..c76dc2d
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_9.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.httpcomponents:httpclient:4.5.9">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpclient/4.5.9/httpclient-4.5.9.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpclient/4.5.9/httpclient-4.5.9-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpclient/4.5.9/httpclient-4.5.9-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 47d2bd1..e47a75c 100644
--- a/emis-oms-biz-web/emis-oms-biz-web.iml
+++ b/emis-oms-biz-web/emis-oms-biz-web.iml
@@ -84,7 +84,6 @@
     <orderEntry type="library" name="Maven: xmlpull:xmlpull:1.1.3.1" level="project" />
     <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.5.13" level="project" />
     <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.36" level="project" />
-    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.15" level="project" />
     <orderEntry type="library" name="Maven: com.google.guava:guava:30.0-jre" level="project" />
     <orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" />
     <orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" />
@@ -179,8 +178,6 @@
     <orderEntry type="library" name="Maven: junit:junit:4.13.2" level="project" />
     <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:2.2" level="project" />
     <orderEntry type="library" name="Maven: org.hamcrest:hamcrest:2.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.13" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.15" level="project" />
     <orderEntry type="library" name="Maven: com.aliyun.oss:aliyun-sdk-oss:3.10.2" level="project" />
     <orderEntry type="library" name="Maven: org.jdom:jdom2:2.0.6.1" level="project" />
     <orderEntry type="library" name="Maven: org.codehaus.jettison:jettison:1.1" level="project" />
@@ -271,6 +268,9 @@
     <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: org.apache.httpcomponents:httpclient:4.5.13" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.15" level="project" />
+    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.15" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign:feign-httpclient:10.2.3" 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 d5ce80c..c19bd4d 100644
--- a/emis-oms-biz/emis-oms-biz.iml
+++ b/emis-oms-biz/emis-oms-biz.iml
@@ -114,9 +114,6 @@
     <orderEntry type="library" name="Maven: junit:junit:4.13.2" level="project" />
     <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:2.2" level="project" />
     <orderEntry type="library" name="Maven: org.hamcrest:hamcrest:2.2" level="project" />
-    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.15" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.13" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.15" level="project" />
     <orderEntry type="library" name="Maven: com.aliyun.oss:aliyun-sdk-oss:3.10.2" level="project" />
     <orderEntry type="library" name="Maven: org.jdom:jdom2:2.0.6.1" level="project" />
     <orderEntry type="library" name="Maven: org.codehaus.jettison:jettison:1.1" level="project" />
@@ -220,7 +217,10 @@
     <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: org.apache.httpcomponents:httpclient:4.5.9" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.15" level="project" />
+    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.15" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign:feign-httpclient:10.2.3" 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 40c5429..cf1c755 100644
--- a/emis-oms-biz/pom.xml
+++ b/emis-oms-biz/pom.xml
@@ -76,20 +76,33 @@
             <version>0.4.11</version>
         </dependency>
 
+
+
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-openfeign</artifactId>
             <version>3.1.7</version>
         </dependency>
 
-
-        <!-- 使用 openfeign 自家的 feign httpclient 代替 Apache httpclient 发送请求 -->
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>4.5.9</version>
+        </dependency>
         <dependency>
             <groupId>io.github.openfeign</groupId>
             <artifactId>feign-httpclient</artifactId>
-            <version>10.1.0</version>
+            <version>10.2.3</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>