diff --git a/bgs-admin/src/main/resources/application-druid.yml b/bgs-admin/src/main/resources/application-druid.yml index 2ed9347..85c9ddf 100644 --- a/bgs-admin/src/main/resources/application-druid.yml +++ b/bgs-admin/src/main/resources/application-druid.yml @@ -6,9 +6,12 @@ spring: druid: # 主库数据源 master: - url: jdbc:mysql://175.27.215.92:3306/bgs_wms_2024?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 +# url: jdbc:mysql://175.27.215.92:3306/bgs_wms_2024?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 +# username: root +# password: haiwei@123 + url: jdbc:mysql://10.32.128.150:6606/bgs-rfid-track?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true username: root - password: haiwei@123 + password: Haiwei@123 #150 # 从库数据源 slave: # 从数据源开关/默认关闭 diff --git a/bgs-admin/src/main/resources/application.yml b/bgs-admin/src/main/resources/application.yml index de76d35..90dd87b 100644 --- a/bgs-admin/src/main/resources/application.yml +++ b/bgs-admin/src/main/resources/application.yml @@ -16,7 +16,7 @@ ruoyi: # 开发环境配置 server: # 服务器的HTTP端口,默认为80 - port: 80 + port: 90 servlet: # 应用的访问路径 context-path: / diff --git a/bgs-webapi/src/main/java/com/bgs/webapi/controller/ApiController.java b/bgs-webapi/src/main/java/com/bgs/webapi/controller/ApiController.java index b3f4898..026be80 100644 --- a/bgs-webapi/src/main/java/com/bgs/webapi/controller/ApiController.java +++ b/bgs-webapi/src/main/java/com/bgs/webapi/controller/ApiController.java @@ -78,7 +78,7 @@ public class ApiController { if (apkVersion==null){ apkVersion=new APKVersion(); apkVersion.setUpdateStatus(0); - + }else { apkVersion.setUpdateStatus(1); diff --git a/bgs-webapi/src/main/resources/mapper/ApiMapper.xml b/bgs-webapi/src/main/resources/mapper/ApiMapper.xml index b69d39f..9c07ed5 100644 --- a/bgs-webapi/src/main/resources/mapper/ApiMapper.xml +++ b/bgs-webapi/src/main/resources/mapper/ApiMapper.xml @@ -7,7 +7,7 @@ select cargo_frame_epc from ledger_instant_binding where waybill_number=#{code} limit 1 - INSERT INTO bgs_wms_2024.ledger_instant_binding (cargo_frame_epc, waybill_number) VALUES (#{param1}, #{param2}); + INSERT INTO ledger_instant_binding (cargo_frame_epc, waybill_number) VALUES (#{param1}, #{param2});