From 91c623a67e67a0f2627d237fbf54bacbf678cbd2 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期四, 16 五月 2024 14:14:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/phyzasrs' into phyzasrs
---
src/main/resources/application.yml | 29 +++++++++++++++++++++--------
1 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 029db91..2fb9d31 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,8 +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://localhost:1433;databasename=phyzasrs
+# url: jdbc:sqlserver://192.168.4.15:1433;databasename=tzskasrs
#url: jdbc:sqlserver://10.10.10.40:1433;databasename=tzskasrs
username: sa
password: sa@123
@@ -45,7 +45,7 @@
#License鐩稿叧閰嶇疆
license:
- subject: tzskasrs
+ subject: phyzasrs
publicAlias: publicCert
storePass: public_zhongyang_123456789
licensePath: license.lic
@@ -74,10 +74,13 @@
agv:
# url: localhost:8080
-# taskCreatePath: /test/task/create
-# containerMoveInPath: /test/container/moveIn
- url: 10.10.10.182:9046
- taskCreatePath: /task/create
+# taskCreatePath: /agv/task/create
+# containerMoveInPath: /agv/container/moveIn
+# containerMoveOutPath: /agv/container/moveOut
+# containerArrivedPath: /agv/containerArrived
+ url: 192.168.103.32:8181
+ 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
@@ -85,3 +88,13 @@
u8:
url: http://192.168.1.55:8010
orderReportPath: /api/RdAudit
+ERP:
+ url: http://192.168.1.55:8010
+ orderReportPath: /api/RdAudit
+MES:
+ url: http://192.168.1.55:8010
+ orderReportPath: /api/RdAudit
+
+agvBasDev:
+ maxWorkNum: 1
+
--
Gitblit v1.9.1