From 7b6329313ca3a5e6ff96246eeaf96f839df7760b Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期三, 22 十月 2025 11:51:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jshdasrs' into jshdasrs
---
src/main/resources/application.yml | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 2bcff08..a710b73 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -11,7 +11,7 @@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
# url: jdbc:sqlserver://127.0.0.1:49847;databasename=jshdasrs
- url: jdbc:sqlserver://10.10.10.235:1433;databasename=jshdasrs
+ url: jdbc:sqlserver://127.0.0.1:1433;databasename=jshdasrs
# url: jdbc:sqlserver://192.168.4.191:50948;databasename=jshdasrs
username: sa
password: sa@123
@@ -77,15 +77,15 @@
arm:
# 鍦板潃
address:
- URL: http://58.210.10.90:28090
+ URL: http://10.10.10.171:7002
#鏍规嵁鍙傛暟鑾峰彇鐮佸灈鏁伴噺
- QuantityOfPalletizing: api
+ QuantityOfPalletizing: adaptor/api/wcs/getPalletizingNumber
#鍒嗘嫞绾垮鎺�
line:
# 鍦板潃
address:
- URL: http://58.210.10.90:28090
- PATH: API
+ URL: http://10.10.10.244:8080
+ PATH: orderPakInAll
#erp瀵规帴
erp:
--
Gitblit v1.9.1