From 41326b3129ae3e4ef7a45bc16dba64dc9dd27404 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期三, 04 九月 2024 09:58:14 +0800
Subject: [PATCH] Merge branch 'phyzasrs' of http://47.97.1.152:5880/r/zy-asrs into phyzasrs-erp
---
src/main/resources/application.yml | 45 ++++++++++++++++++++++++++++++++-------------
1 files changed, 32 insertions(+), 13 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 029db91..fc45b8b 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,5 +1,5 @@
server:
- port: 8081
+ port: 8083
servlet:
context-path: /@pom.build.finalName@
@@ -10,9 +10,8 @@
enabled: false
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://localhost:1433;databasename=tzskasrs
- #url: jdbc:sqlserver://192.168.4.15:1433;databasename=tzskasrs
- #url: jdbc:sqlserver://10.10.10.40:1433;databasename=tzskasrs
+ url: jdbc:sqlserver://127.0.0.1:1433;databasename=phyzasrs
+# url: jdbc:sqlserver://192.168.4.15:1433;databasename=phyzasrs
username: sa
password: sa@123
mvc:
@@ -21,7 +20,7 @@
host: 127.0.0.1
port: 6379
database: 0
-# password: xltys1995
+ # password: xltys1995
servlet:
multipart:
maxFileSize: 100MB
@@ -45,7 +44,7 @@
#License鐩稿叧閰嶇疆
license:
- subject: tzskasrs
+ subject: phyzasrs
publicAlias: publicCert
storePass: public_zhongyang_123456789
licensePath: license.lic
@@ -73,15 +72,35 @@
password: Wlzh44338
agv:
-# url: localhost:8080
-# taskCreatePath: /test/task/create
-# containerMoveInPath: /test/container/moveIn
- url: 10.10.10.182:9046
- taskCreatePath: /task/create
+ # url: localhost:8080
+ # taskCreatePath: /agv/task/create
+ # containerMoveInPath: /agv/container/moveIn
+ # containerMoveOutPath: /agv/container/moveOut
+ # containerArrivedPath: /agv/containerArrived
+ url: 192.168.103.12:8182
+ taskCreatePath: /rcms/services/rest/hikRpcService/genAgvSchedulingTask
+ taskCancelPath: /rcms/services/rest/hikRpcService/cancelTask
containerMoveInPath: /expand/api/moveIn/container
containerMoveOutPath: /expand/api/moveOut/container
containerArrivedPath: /conveyor/containerArrived
u8:
- url: http://192.168.1.55:8010
- orderReportPath: /api/RdAudit
+ url: http://192.168.9.3:8877
+ orderReportPath: /DBMS/U8/CM/add
+ERP:
+ url: http://39.184.149.30:8877
+ orderReportPath: /DBMS/U8/CM/add
+mes:
+ url: https://v3-ali.blacklake.cn/api/openapi/domain/web/v1/route
+ orderReportPath: /inventory/open/v2/transfer_order/ordinary/_execute
+ pakinReportPath: /inventory/open/v2/inbound_order/execute/_inbound
+ buyPakinReportPath: /schedule-for-yinzuo/open/yinzuo/inboundOrder
+ pakoutReportPath: /inventory/open/v2/outbound_order/_outbound_by_suggest
+ getTokenUrl: https://v3-ali.blacklake.cn
+ getTokenPath: /api/openapi/domain/api/v1/access_token/_get_access_token
+ appKey: cli_1712644281065780
+ appSecret: 6710d24e31e64adc963d4c213b2c9b8e
+
+agvBasDev:
+ maxWorkNum: 1
+
--
Gitblit v1.9.1