From 6f7a815b2d6e4f30e7ccf901b24d5103aaa72078 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期一, 25 十二月 2023 10:23:08 +0800
Subject: [PATCH] Merge branch 'tzskasrs-1' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs-1
---
src/main/resources/application.yml | 42 +++++++++++++++++++++++++++++++++++-------
1 files changed, 35 insertions(+), 7 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index e4fa61e..74c7ea8 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -10,15 +10,15 @@
enabled: false
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-# url: jdbc:sqlserver://47.97.1.152:51433;databasename=ynasrs
- url: jdbc:sqlserver://192.168.4.15:1433;databasename=szfzasrs
+ 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
username: sa
-# password: Zoneyung@zy56$
password: sa@123
mvc:
static-path-pattern: /**
redis:
- host: localhost
+ host: 127.0.0.1
port: 6379
database: 0
# password: xltys1995
@@ -43,6 +43,14 @@
swagger:
enable: false
+#License鐩稿叧閰嶇疆
+license:
+ subject: tzskasrs
+ publicAlias: publicCert
+ storePass: public_zhongyang_123456789
+ licensePath: license.lic
+ publicKeysStorePath: publicCerts.keystore
+
# 涓嬩綅鏈洪厤缃�
wcs-slave:
# 鍙屾繁
@@ -51,6 +59,7 @@
doubleLocs: 32
# 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
groupCount: 2
+ url: http://127.0.0.1:9090/tzskwcs
#鍏ュ簱鏆傚瓨鏁�
store:
@@ -59,7 +68,26 @@
erp:
db:
driver_class_name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- ur: jdbc:sqlserver://10.20.46.23:1433;databasename=POY_ASRS
- username: poy-asrs
- password: Poy@2022
+ ur: jdbc:sqlserver://192.168.1.55:1433;databasename=ufdata_998_2022
+ username: WMS
+ password: Wlzh44338
+
+agv:
+# url: localhost:8080
+# taskCreatePath: /agv/task/create
+# containerMoveInPath: /agv/container/moveIn
+# containerMoveOutPath: /agv/container/moveOut
+# containerArrivedPath: /agv/containerArrived
+ url: 10.10.10.182:9046
+ taskCreatePath: /task/create
+ containerMoveInPath: /expand/api/moveIn/container
+ containerMoveOutPath: /expand/api/moveOut/container
+ containerArrivedPath: /conveyor/containerArrived
+
+u8:
+ url: http://192.168.1.55:8010
+ orderReportPath: /api/RdAudit
+
+agvBasDev:
+ maxWorkNum: 1
--
Gitblit v1.9.1