From c3e2d8af44b84310ffb98f34e98eadd3f377a50d Mon Sep 17 00:00:00 2001 From: judy <278197488@qq.com> Date: Mon, 19 Feb 2024 12:13:20 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=99=A8=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-pro.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/shkj-admin/src/main/resources/application-pro.yml b/shkj-admin/src/main/resources/application-pro.yml index 4b9e826..11b323b 100644 --- a/shkj-admin/src/main/resources/application-pro.yml +++ b/shkj-admin/src/main/resources/application-pro.yml @@ -13,10 +13,10 @@ spring: # 主库数据源 master: url: jdbc:mysql://127.0.0.1:3306/po1_wms_wcs?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 -# url: jdbc:mysql://127.0.0.1:3306/po1testsh?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + # url: jdbc:mysql://127.0.0.1:3306/po1testsh?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: root password: AMRrobot@13579 -# password: CTlTwKgIrRVTsEHqxxx + # password: CTlTwKgIrRVTsEHqxxx # 从库数据源 slave: # 从数据源开关/默认关闭 @@ -73,7 +73,7 @@ spring: database: 1 # 密码 password: -# password: 123456 + # password: 123456 # 连接超时时间 timeout: 10s lettuce: @@ -97,11 +97,11 @@ third: queryAckByTaskUrl: http://169.254.61.3:8095/rest/common/queryAck deleteShelfUrl: http://169.254.61.3:8095/rest/common/deleteShelf updateTaskUrl: http://169.254.61.3:8095/rest/common/updateTask -# agvCreateTaskUrl: http://169.254.61.4:8095/rest/common/createTask -# agvStatesUrl: http://169.254.61.4:8095/rest/robots/states -# agvCancelTaskUrl: http://169.254.61.4:8095/rest/common/cancelTask -# queryAckByTaskUrl: http://169.254.61.4:8095/rest/common/queryAck -# deleteShelfUrl: http://169.254.61.4:8095/rest/common/deleteShelf + # agvCreateTaskUrl: http://169.254.61.4:8095/rest/common/createTask + # agvStatesUrl: http://169.254.61.4:8095/rest/robots/states + # agvCancelTaskUrl: http://169.254.61.4:8095/rest/common/cancelTask + # queryAckByTaskUrl: http://169.254.61.4:8095/rest/common/queryAck + # deleteShelfUrl: http://169.254.61.4:8095/rest/common/deleteShelf # ess接口 essTaskDistributionUrl: http://210.21.218.14:60354/task/create essTaskCancelUrl: http://210.21.218.14:60354/task/cancel