From 58432b86d7d8f79750243995f5277ce874532cb2 Mon Sep 17 00:00:00 2001
From: "HUOJIN\\92525" <925258474@qq.com>
Date: Thu, 4 Jul 2024 13:22:37 +0800
Subject: [PATCH] no message

---
 .../main/resources/config/application-dev.yml |  2 +-
 .../resources/config/application-prod.yml     |  2 +-
 .../src/main/resources/config/application.yml |  3 +-
 .../EladminSystemApplicationTests.java        | 36 +++++++------------
 4 files changed, 15 insertions(+), 28 deletions(-)

diff --git a/youchain-system/src/main/resources/config/application-dev.yml b/youchain-system/src/main/resources/config/application-dev.yml
index 7243582..e74326e 100644
--- a/youchain-system/src/main/resources/config/application-dev.yml
+++ b/youchain-system/src/main/resources/config/application-dev.yml
@@ -4,7 +4,7 @@ spring:
     druid:
       db-type: com.alibaba.druid.pool.DruidDataSource
       driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
-      url: jdbc:log4jdbc:mysql://${DB_HOST:47.100.54.81}:${DB_PORT:53306}/${DB_NAME:byd_dg}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false
+      url: jdbc:log4jdbc:mysql://${DB_HOST:47.100.54.81}:${DB_PORT:53306}/${DB_NAME:byd_wms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false
       username: ${DB_USER:root}
       password: ${DB_PWD:Youchain@56}
       # 初始连接数
diff --git a/youchain-system/src/main/resources/config/application-prod.yml b/youchain-system/src/main/resources/config/application-prod.yml
index d0f7015..3e50d1a 100644
--- a/youchain-system/src/main/resources/config/application-prod.yml
+++ b/youchain-system/src/main/resources/config/application-prod.yml
@@ -4,7 +4,7 @@ spring:
     druid:
       db-type: com.alibaba.druid.pool.DruidDataSource
       driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
-      url: jdbc:log4jdbc:mysql://${DB_HOST:115.159.67.99}:${DB_PORT:53306}/${DB_NAME:jingzhou_xks}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false
+      url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.100.102}:${DB_PORT:3306}/${DB_NAME:byd_wms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false
       username: ${DB_USER:root}
       password: ${DB_PWD:Youchain@56}
       # 初始连接数
diff --git a/youchain-system/src/main/resources/config/application.yml b/youchain-system/src/main/resources/config/application.yml
index 52c9fe6..743a9e0 100644
--- a/youchain-system/src/main/resources/config/application.yml
+++ b/youchain-system/src/main/resources/config/application.yml
@@ -31,9 +31,8 @@ spring:
   redis:
     #数据库索引
     database: ${REDIS_DB:2}
-    #host: ${REDIS_HOST:115.159.67.99}
+    #host: ${REDIS_HOST:192.168.100.102}
     #password: ${REDIS_PWD:123456}
-    #port: ${REDIS_PORT:6380}
 
     host: ${REDIS_HOST:localhost}
     password: ${REDIS_PWD:}
diff --git a/youchain-system/src/test/java/com/youchain/EladminSystemApplicationTests.java b/youchain-system/src/test/java/com/youchain/EladminSystemApplicationTests.java
index a9f2c42..8df6fae 100644
--- a/youchain-system/src/test/java/com/youchain/EladminSystemApplicationTests.java
+++ b/youchain-system/src/test/java/com/youchain/EladminSystemApplicationTests.java
@@ -24,30 +24,6 @@ public class EladminSystemApplicationTests {
     }
 
     public static void main(String[] args) {
-        List<BarCodeVo> barCodeVos = new ArrayList<>();
-
-        BarCodeVo barCodeVo = new BarCodeVo();
-        barCodeVo.setBoxNumber("123");
-        barCodeVos.add(barCodeVo);
-
-        BarCodeVo barCodeVo2 = new BarCodeVo();
-        barCodeVo2.setBoxNumber("456");
-        barCodeVos.add(barCodeVo2);
-
-        BarCodeVo barCodeVo3 = new BarCodeVo();
-        barCodeVo3.setBoxNumber("123");
-        barCodeVos.add(barCodeVo3);
-
-
-    }
-
-    private static final int MAX_TASK_COUNT = 4;
-    private static final long TIMEOUT_MS = 600000; // 10分钟，以毫秒为单位
-    private long lastTaskTime = System.currentTimeMillis();
-    private List<Integer> taskQueue = new ArrayList<>(MAX_TASK_COUNT);
-
-    void aa() {
-
         CompletableFuture<Void> asnDetailFuture = CompletableFuture.runAsync(() -> {
             System.out.println("新增asnDetail");
         });
@@ -61,6 +37,18 @@ public class EladminSystemApplicationTests {
         });
         taskFuture.join();
 
+
+    }
+
+    private static final int MAX_TASK_COUNT = 4;
+    private static final long TIMEOUT_MS = 600000; // 10分钟，以毫秒为单位
+    private long lastTaskTime = System.currentTimeMillis();
+    private List<Integer> taskQueue = new ArrayList<>(MAX_TASK_COUNT);
+
+    void aa() {
+
+
+
         Set<BarCodeVo> barCodeVos = new HashSet<>();
 
         BarCodeVo barCodeVo = new BarCodeVo();