From d963027f0f4ff55c4cb43c08f5a1fdcab34bb050 Mon Sep 17 00:00:00 2001
From: wangwenhua <12345678>
Date: Fri, 19 Sep 2025 11:37:49 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E6=88=98=E6=96=97=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E6=B6=88=E8=80=97=E8=B5=84=E6=BA=90=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                        | 18 +++++++++++++++++-
 src/main/resources/application-prod.properties |  4 ++--
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5de3ef9..12b9faa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,7 +51,18 @@
             <artifactId>mysql-connector-java</artifactId>
             <version>5.1.47</version>
         </dependency>
-<!--        <dependency>-->
+        <dependency>
+            <groupId>io.lettuce</groupId>
+            <artifactId>lettuce-core</artifactId>
+            <version>6.2.4.RELEASE</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-pool2</artifactId>
+            <version>2.12.0</version> <!-- 建议使用最新稳定版本 -->
+        </dependency>
+
+        <!--        <dependency>-->
 <!--            <groupId>mysql</groupId>-->
 <!--            <artifactId>mysql-connector-java</artifactId>-->
 <!--            <version>8.0.33</version>-->
@@ -179,6 +190,11 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-redis</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.lettuce</groupId>
+            <artifactId>lettuce-core</artifactId>
+            <version>6.2.4.RELEASE</version>
+        </dependency>
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
diff --git a/src/main/resources/application-prod.properties b/src/main/resources/application-prod.properties
index aa755f9..3b749cf 100644
--- a/src/main/resources/application-prod.properties
+++ b/src/main/resources/application-prod.properties
@@ -8,14 +8,14 @@ spring.datasource.dynamic.datasource.dm.password=Simulation001
 spring.redis.database=0
 spring.redis.host=192.168.0.53
 spring.redis.port=6379
-spring.redis.jedis.pool.max-idle=10
 #spring.redis.password=123
 spring.redis.timeout=5000
 spring.redis.lettuce.shutdown-timeout=5000
-spring.redis.lettuce.timeout=5000
+#spring.redis.lettuce.timeout=5000
 spring.redis.lettuce.pool.max-active=8
 spring.redis.lettuce.pool.max-idle=8
 spring.redis.lettuce.pool.min-idle=0
+spring.redis.lettuce.pool.max-wait=2000ms
 spring.redis.lettuce.pool.timeout=5000ms  # ÃüÁîÖ´Ðг¬Ê±
 spring.redis.lettuce.pool.connect-timeout=10000ms  # Á¬½Ó½¨Á¢³¬Ê±
 

From 3e69bf59bd82ff8a493baa0ad70da8ecd859ee34 Mon Sep 17 00:00:00 2001
From: wangwenhua <12345678>
Date: Fri, 19 Sep 2025 11:51:35 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E6=88=98=E6=96=97=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E6=B6=88=E8=80=97=E8=B5=84=E6=BA=90=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/hivekion/supplier/entity/SupplierRequest.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/hivekion/supplier/entity/SupplierRequest.java b/src/main/java/com/hivekion/supplier/entity/SupplierRequest.java
index 82f66da..7b90516 100644
--- a/src/main/java/com/hivekion/supplier/entity/SupplierRequest.java
+++ b/src/main/java/com/hivekion/supplier/entity/SupplierRequest.java
@@ -33,7 +33,8 @@ public class SupplierRequest implements Serializable {
     @TableField(value="SUPPLIER_TYPE")
     private String supplierType;
     @TableField(value="SUPPLIER_NUM")
-    private Double supplierNum;
+    private String supplierNum;
+
     @TableField(value="LAT")
     private String lat;
     @TableField(value="LNG")
@@ -71,11 +72,11 @@ public class SupplierRequest implements Serializable {
         this.supplierType = supplierType;
     }
 
-    public Double getSupplierNum() {
+    public String getSupplierNum() {
         return supplierNum;
     }
 
-    public void setSupplierNum(Double supplierNum) {
+    public void setSupplierNum(String supplierNum) {
         this.supplierNum = supplierNum;
     }
 

From 1e78632634847ca37a783f0059c5ae1185092018 Mon Sep 17 00:00:00 2001
From: wangwenhua <12345678>
Date: Fri, 19 Sep 2025 11:56:48 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E6=88=98=E6=96=97=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E6=B6=88=E8=80=97=E8=B5=84=E6=BA=90=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 12b9faa..1b6ab2f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,11 +51,11 @@
             <artifactId>mysql-connector-java</artifactId>
             <version>5.1.47</version>
         </dependency>
-        <dependency>
+   <!--     <dependency>
             <groupId>io.lettuce</groupId>
             <artifactId>lettuce-core</artifactId>
             <version>6.2.4.RELEASE</version>
-        </dependency>
+        </dependency>-->
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-pool2</artifactId>

From 4a2f80b66628cb2a2eaf429271563c39bc750647 Mon Sep 17 00:00:00 2001
From: wangwenhua <12345678>
Date: Fri, 19 Sep 2025 11:59:50 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E6=88=98=E6=96=97=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E6=B6=88=E8=80=97=E8=B5=84=E6=BA=90=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/application-prod.properties | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/resources/application-prod.properties b/src/main/resources/application-prod.properties
index 3b749cf..3743dc9 100644
--- a/src/main/resources/application-prod.properties
+++ b/src/main/resources/application-prod.properties
@@ -10,14 +10,14 @@ spring.redis.host=192.168.0.53
 spring.redis.port=6379
 #spring.redis.password=123
 spring.redis.timeout=5000
-spring.redis.lettuce.shutdown-timeout=5000
-#spring.redis.lettuce.timeout=5000
-spring.redis.lettuce.pool.max-active=8
-spring.redis.lettuce.pool.max-idle=8
-spring.redis.lettuce.pool.min-idle=0
-spring.redis.lettuce.pool.max-wait=2000ms
-spring.redis.lettuce.pool.timeout=5000ms  # ÃüÁîÖ´Ðг¬Ê±
-spring.redis.lettuce.pool.connect-timeout=10000ms  # Á¬½Ó½¨Á¢³¬Ê±
+#spring.redis.lettuce.shutdown-timeout=5000
+##spring.redis.lettuce.timeout=5000
+#spring.redis.lettuce.pool.max-active=8
+#spring.redis.lettuce.pool.max-idle=8
+#spring.redis.lettuce.pool.min-idle=0
+#spring.redis.lettuce.pool.max-wait=2000ms
+#spring.redis.lettuce.pool.timeout=5000ms  # ÃüÁîÖ´Ðг¬Ê±
+#spring.redis.lettuce.pool.connect-timeout=10000ms  # Á¬½Ó½¨Á¢³¬Ê±
 
 server.port=8099
 

From 9c8c10f3c0b461380f2053ab2953326a7a6fb1a4 Mon Sep 17 00:00:00 2001
From: wangwenhua <12345678>
Date: Fri, 19 Sep 2025 12:04:41 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E6=88=98=E6=96=97=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E6=B6=88=E8=80=97=E8=B5=84=E6=BA=90=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                        | 6 +++---
 src/main/resources/application-prod.properties | 9 +--------
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1b6ab2f..1cb39b1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,11 +56,11 @@
             <artifactId>lettuce-core</artifactId>
             <version>6.2.4.RELEASE</version>
         </dependency>-->
-        <dependency>
+     <!--   <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-pool2</artifactId>
-            <version>2.12.0</version> <!-- 建议使用最新稳定版本 -->
-        </dependency>
+            <version>2.12.0</version> &lt;!&ndash; 建议使用最新稳定版本 &ndash;&gt;
+        </dependency>-->
 
         <!--        <dependency>-->
 <!--            <groupId>mysql</groupId>-->
diff --git a/src/main/resources/application-prod.properties b/src/main/resources/application-prod.properties
index 3743dc9..cae530e 100644
--- a/src/main/resources/application-prod.properties
+++ b/src/main/resources/application-prod.properties
@@ -10,14 +10,7 @@ spring.redis.host=192.168.0.53
 spring.redis.port=6379
 #spring.redis.password=123
 spring.redis.timeout=5000
-#spring.redis.lettuce.shutdown-timeout=5000
-##spring.redis.lettuce.timeout=5000
-#spring.redis.lettuce.pool.max-active=8
-#spring.redis.lettuce.pool.max-idle=8
-#spring.redis.lettuce.pool.min-idle=0
-#spring.redis.lettuce.pool.max-wait=2000ms
-#spring.redis.lettuce.pool.timeout=5000ms  # ÃüÁîÖ´Ðг¬Ê±
-#spring.redis.lettuce.pool.connect-timeout=10000ms  # Á¬½Ó½¨Á¢³¬Ê±
+
 
 server.port=8099