From 8b930fed6099a4b21c4c16d6a41e305a2c9c7e40 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期二, 13 五月 2025 08:45:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/glccwcs' into glccwcs
---
src/main/resources/application.yml | 47 +++++++++++++++++++++++++++++++++++------------
1 files changed, 35 insertions(+), 12 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index e88b143..7e23d5b 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,9 +8,13 @@
name: @pom.build.finalName@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://localhost:1433;databasename=rywxasrs
- username: sa
- password: sa@123
+ url: jdbc:sqlserver://10.227.21.34:1433;databasename=cosmawcs_cc
+ username: cccwms
+ password: pass-8686
+
+# url: jdbc:sqlserver://127.0.0.1:1433;databasename=glccwcs
+# username: sa
+# password: sa@123
mvc:
static-path-pattern: /**
redis:
@@ -37,7 +41,7 @@
#License鐩稿叧閰嶇疆
license:
- subject: ryzhwcs
+ subject: glccwcs
publicAlias: publicCert
storePass: public_zhongyang_123456789
licensePath: license.lic
@@ -47,14 +51,33 @@
# 鏄惁寮�鍚笂鎶�
start: true
# WMS绯荤粺ip
- #url: 10.32.53.195:8080
- # WMS绯荤粺ip
- url: 10.32.53.195:8080
+ url: http://10.227.21.31:8060/fromwcs
# 鍏ュ簱浠诲姟鐢宠鎺ュ彛
- inboundTaskApplyPath: api/InterFace/get_InterFace_TestStorage
- # 浠诲姟鐘舵�佸弽棣堟帴鍙�
- taskStatusFeedbackPath: api/InterFace/get_InterFace_TestStorage
- # 璐т綅鐘舵�佹洿鏂版帴鍙�
- locationUpdatePath: api/InterFace/get_InterFace_TestStorage
+ inboundTaskApplyPath: /inboundTaskApply
+ # 浠诲姟寮�濮嬫椂锛學CS鍥炶皟WMS
+ taskStatusFeedbackPath: api/StereoscopicCallBack/TaskExecCallback
+ # 浠诲姟瀹屾垚缁撴潫鏃讹紝WCS鍥炶皟WMS
+ taskExecCallback: /taskStateReport
# 绉诲簱鐢宠鎺ュ彛
movePath: api/InterFace/get_InterFace_TestStorage
+ # 浠诲姟鎵ц鐘舵�佷笂鎶�
+ executionStatusReport: /executionStatusReport
+ # 娴嬭瘯鐜
+# url: http://127.0.0.1:8080/ghlnwms
+# taskStatusFeedbackPath: api/StereoscopicCallBack/TaskExecCallback
+# executionStatusReport: /open/asrs/executionStatusReport
+# taskExecCallback: /open/asrs/taskExecCallback
+# inboundTaskApplyPath: /open/asrs/testInLoc
+# movePath: api/InterFace/get_InterFace_TestStorage
+
+
+ code: code
+ successCode: 200
+ msg: msg
+ data: data
+loc-move:
+ enable: false
+ crn1: false
+ crn2: false
+ crn3: false
+ crn4: false
--
Gitblit v1.9.1