From 73de789fbbc67873aab0e72eb0f469ea195c1cbe Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期二, 16 四月 2024 12:24:15 +0800
Subject: [PATCH] Merge branch 'phyzasrs' of http://47.97.1.152:5880/r/zy-asrs into phyzasrs
---
src/main/resources/application.yml | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 74c7ea8..c044050 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
@@ -78,8 +78,9 @@
# containerMoveInPath: /agv/container/moveIn
# containerMoveOutPath: /agv/container/moveOut
# containerArrivedPath: /agv/containerArrived
- url: 10.10.10.182:9046
- taskCreatePath: /task/create
+ 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
--
Gitblit v1.9.1