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 | 48 ++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 42 insertions(+), 6 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index f763cfe..74c7ea8 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -10,14 +10,15 @@
enabled: false
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://47.97.1.152:51433;databasename=bfasrs
-# url: jdbc:sqlserver://localhost:1433;databasename=ynasrs
+ 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
@@ -42,16 +43,51 @@
swagger:
enable: false
+#License鐩稿叧閰嶇疆
+license:
+ subject: tzskasrs
+ publicAlias: publicCert
+ storePass: public_zhongyang_123456789
+ licensePath: license.lic
+ publicKeysStorePath: publicCerts.keystore
+
# 涓嬩綅鏈洪厤缃�
wcs-slave:
# 鍙屾繁
doubleDeep: true
# 鍙屾繁搴撲綅鎺掑彿
- doubleLocs: 1,4,5,8,9,12,13,16,17,20,21,24,25,28,29,32,33,36,37,40,41,44,45,48
+ doubleLocs: 32
# 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
- groupCount: 4
+ groupCount: 2
+ url: http://127.0.0.1:9090/tzskwcs
#鍏ュ簱鏆傚瓨鏁�
store:
bufferCount: 2
+erp:
+ db:
+ driver_class_name: com.microsoft.sqlserver.jdbc.SQLServerDriver
+ 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