From eda31fcffde19802d5da9e388fda1692ecfc8194 Mon Sep 17 00:00:00 2001 From: zc Date: Mon, 13 Apr 2026 11:52:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/admin/controller/weighManage/ah/AHDZCConnect.java | 5 ++++- wms-webapi/src/main/resources/config/application-dev.yml | 7 ++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/wms-webapi/src/main/java/top/wms/admin/controller/weighManage/ah/AHDZCConnect.java b/wms-webapi/src/main/java/top/wms/admin/controller/weighManage/ah/AHDZCConnect.java index 93894f0..fac987d 100644 --- a/wms-webapi/src/main/java/top/wms/admin/controller/weighManage/ah/AHDZCConnect.java +++ b/wms-webapi/src/main/java/top/wms/admin/controller/weighManage/ah/AHDZCConnect.java @@ -27,7 +27,10 @@ import java.util.regex.Pattern; @Slf4j public class AHDZCConnect { - private static final String PORT_NAME = "COM12"; + //老设备（只能跑jar包的） + // private static final String PORT_NAME = "COM12"; + //新设备（环境齐全的） + private static final String PORT_NAME = "COM13"; private static final int BAUD_RATE = 9600; private static final int DATA_BITS = 8; private static final int STOP_BITS = 1; diff --git a/wms-webapi/src/main/resources/config/application-dev.yml b/wms-webapi/src/main/resources/config/application-dev.yml index dee5ce3..8a8acd4 100644 --- a/wms-webapi/src/main/resources/config/application-dev.yml +++ b/wms-webapi/src/main/resources/config/application-dev.yml @@ -20,7 +20,8 @@ spring.datasource: # 请务必提前创建好名为 wms_admin 的数据库，如果使用其他数据库名请注意同步修改 DB_NAME 配置 url: jdbc:p6spy:mysql://127.0.0.1:3306/wms?serverTimezone=Asia/Shanghai&useSSL=false&useUnicode=true&characterEncoding=utf8&rewriteBatchedStatements=true&autoReconnect=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true username: root - password: root +# password: root + password: test123$ # PostgreSQL 配置 # url: jdbc:p6spy:mysql://192.168.2.30:${DB_PORT:3306}/continew?serverTimezone=Asia/Shanghai&useSSL=true&useUnicode=true&characterEncoding=utf8&rewriteBatchedStatements=true&autoReconnect=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # username: ${DB_USER:root} @@ -265,9 +266,9 @@ spring.servlet: multipart: enabled: true # 单文件上传大小限制 - max-file-size: 10MB + max-file-size: 5120MB # 单次总上传文件大小限制 - max-request-size: 20MB + max-request-size: 5120MB ## 头像配置 avatar: # 存储路径