From 66942458f7753fe4ddee7c5ed3386d61cff28b24 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期二, 01 四月 2025 13:55:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jxjdzwcs' into jxjdzwcs
---
src/main/resources/application.yml | 35 +++++++++++++++++++++++++++++++----
1 files changed, 31 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 42d6275..c149282 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,5 +1,5 @@
server:
- port: 9090
+ port: 8080
servlet:
context-path: /@pom.build.finalName@
@@ -8,9 +8,9 @@
name: @pom.build.finalName@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://localhost:1433;databasename=wcs_dev
+ url: jdbc:sqlserver://10.10.10.220:1433;databasename=rywxasrs
username: sa
- password: sa
+ password: sa@123
mvc:
static-path-pattern: /**
redis:
@@ -35,5 +35,32 @@
swagger:
enable: false
+#License鐩稿叧閰嶇疆
+license:
+ subject: jdzwcs
+ publicAlias: publicCert
+ storePass: public_zhongyang_123456789
+ licensePath: license.lic
+ publicKeysStorePath: publicCerts.keystore
+
wms:
- url: localhost:8081/htwms3
+ #杈撻�佺嚎鏆傚瓨鏁�
+ count: 8
+ maxCirle: 3
+ # 鏄惁寮�鍚笂鎶�
+ start: true
+ # WMS绯荤粺ip
+ #url: 10.32.53.195:8080
+ # WMS绯荤粺ip
+ # url: 10.210.157.109:8090
+ url: 10.10.10.222:2410
+ # 鍏ュ簱浠诲姟鐢宠鎺ュ彛
+ #inboundTaskApplyPath: api/InterFace/inboundTaskApply
+ inboundTaskApplyPath: api/StereoscopicCallBack/AcceptTaskStatus
+ # inboundTaskApplyPath: open/asrs/inboundTaskApply
+ # 浠诲姟寮�濮嬫椂锛學CS鍥炶皟WMS
+ taskStatusFeedbackPath: api/StereoscopicCallBack/TaskExecCallback
+ # 浠诲姟瀹屾垚缁撴潫鏃讹紝WCS鍥炶皟WMS
+ TaskExecCallback: api/StereoscopicCallBack/TaskExecFinishedCallback
+ # 绉诲簱鐢宠鎺ュ彛
+ movePath: api/InterFace/get_InterFace_TestStorage
--
Gitblit v1.9.1