From f3a7d211a4a616d8ed2a08b103d8d162f06d389e Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期四, 07 八月 2025 17:23:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-system/lxzn-system-start/src/main/resources/application-dev.yml | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/lxzn-module-system/lxzn-system-start/src/main/resources/application-dev.yml b/lxzn-module-system/lxzn-system-start/src/main/resources/application-dev.yml
index 5b27cd5..dc52783 100644
--- a/lxzn-module-system/lxzn-system-start/src/main/resources/application-dev.yml
+++ b/lxzn-module-system/lxzn-system-start/src/main/resources/application-dev.yml
@@ -126,7 +126,7 @@
connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
datasource:
master:
- url: jdbc:sqlserver://192.168.1.118:1433;databasename=LXZN_TEST_HANGYU;nullCatalogMeansCurrent=true
+ url: jdbc:sqlserver://192.168.1.118:1433;databasename=LXZN_TEST_HANGYU_GK;nullCatalogMeansCurrent=true
username: sa
password: 123
driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
@@ -321,3 +321,13 @@
- D:\\hy_test\\b
- D:\\hy_test\\c
interval: 10000 # 鐩戞帶闂撮殧(ms)
+ferry:
+ file:
+ path: /data/ferry
+ max-file-size: 10MB
+
+security:
+ encryption-key: 1234567890abcdef
+#mdc鏂囦欢璺緞閰嶇疆
+fileService:
+ localFilePath: D:/data/sql/ #鏈湴鏂囦欢璺緞
--
Gitblit v1.9.3