From bbfb4d9d66d230e4ae55d51bf2df1a747dc1a25a Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期二, 24 六月 2025 11:16:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/application-dev.yml | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index a0ce195..51d32d3 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -1,5 +1,5 @@
锘縮erver:
- port: 9999
+ port: 9989
tomcat:
max-swallow-size: -1
error:
@@ -126,9 +126,9 @@
connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
datasource:
master:
- url: jdbc:sqlserver://127.0.0.1:1433;databasename=LXZN_TEST_HANGYU;nullCatalogMeansCurrent=true
+ url: jdbc:sqlserver://192.168.1.118:1433;databasename=LXZN_TEST_XHJ;nullCatalogMeansCurrent=true
username: sa
- password: sa123
+ password: 123
driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
#redis 閰嶇疆
redis:
@@ -312,6 +312,18 @@
#宸ユ帶缃�/娑夊瘑缃戦儴缃� 0涓烘秹瀵嗙綉 1涓哄伐鎺х綉
deployType: 0
#娑夊瘑缃戜紶杈搉c鏂囦欢澶�
- secretFolder: D:\\hy_test\\a
+ secretFolder: D:\\opt
#宸ユ帶缃戠洃鎺c鏂囦欢澶�
- workFolder: D:\\hy_test\\b
+ workFolder: D:\\opt
+sap:
+ rfc:
+ destination: SAP_RFC_DEST # 鑷畾涔夌殑鐩爣鍦板潃 RFC 鐩爣鍚嶇О
+ ashost: 10.101.0.188 # SAP 涓绘満鍦板潃
+ sysnr: '00' # 绯荤粺缂栧彿
+ client: 800 # 瀹㈡埛绔紪鍙�
+ user: SLSAP_JK # 鐢ㄦ埛鍚�
+ passwd: 112233 # 瀵嗙爜
+ lang: ZH # 璇█
+ poolSize: 5 # 绾跨▼姹犳暟閲�
+ expirationTime: 10000 # 杩囨湡鏃堕棿
+ peekLimit: 10 # 宄板��
--
Gitblit v1.9.3