Merge branch 'main' of http://git.hivekion.com:3000/liyudong/simulation-backend

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> &lt;!&ndash; 建议使用最新稳定版本 &ndash;&gt;
+        </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>

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;
     }
 

src/main/resources/application-prod.properties

@@ -8,16 +8,9 @@ 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.pool.max-active=8
-spring.redis.lettuce.pool.max-idle=8
-spring.redis.lettuce.pool.min-idle=0
-spring.redis.lettuce.pool.timeout=5000ms  # 命令执行超时
-spring.redis.lettuce.pool.connect-timeout=10000ms  # 连接建立超时
 
 server.port=8099