From ec1bf4658e36a17f971a54007920a44c5378b7dc Mon Sep 17 00:00:00 2001
From: cuijian <cuijian@xalxzn.com>
Date: 星期一, 16 六月 2025 10:41:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-system/lxzn-system-start/src/main/resources/application-dev.yml | 47 ++++++++++++++++-------------------------------
1 files changed, 16 insertions(+), 31 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 2b4b48b..682766c 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
@@ -7,7 +7,7 @@
include-stacktrace: ALWAYS
include-message: ALWAYS
servlet:
- context-path:
+ context-path: /jeecg-boot
compression:
enabled: true
min-response-size: 1024
@@ -135,7 +135,7 @@
database: 0
host: 127.0.0.1
port: 6379
- password: 123456
+ password: '123456'
flowable:
enable: true
#鍏抽棴瀹氭椂浠诲姟JOB
@@ -298,35 +298,6 @@
namespace: http://service.server.webservice.example.com
statusMethod: equipmentStatus
rateMethod: equipmentRate
-securedoc: #鍥尯缃戜笌缃戦椄閫氳瀹㈡埛绔�
- whether: true #鏄惁鍚敤 true / false
- serverIp: 10.118.10.63 #鏁版嵁鏈嶅姟绔疘P
- serverPort: 8399 #鏁版嵁鏈嶅姟绔帴鍙�
- # serverIp: 127.0.0.1 #鏁版嵁鏈嶅姟绔疘P
- # serverPort: 8399 #鏁版嵁鏈嶅姟绔帴鍙�
- username: admin #瀹氫箟璐﹀彿
- pwd: 123 #瀹氫箟瀵嗙爜
- addressToken: /outer/appAuth #鏈嶅姟娈佃幏鍙杢oken鍦板潃
- addressUploadFile: /outer/fileUpload #鏈嶅姟娈典笂浼犲湴鍧�
- localFilePath: E:\\test\\a #鎺ユ敹鍦板潃
- servicePath: E:\\test\\b #鍙戦�佸湴鍧�
- copyFilePath: E:\\test\\bak_a #鏂囦欢澶囦唤鍦板潃
- # localFilePath: /jar/test/a/ #鎺ユ敹鍦板潃
- # servicePath: /jar/test/b/ #鍙戦�佸湴鍧�
- # copyFilePath: /jar/test/bak_a/ #鏂囦欢澶囦唤鍦板潃
- logIp: 127.0.0.1 #鏃ュ織绯荤粺鍦板潃
- logPort: 8888 #鏃ュ織绯荤粺绔彛
-serviceIntranet: #鍥尯缃戜笌缃戦椄閫氳鏈嶅姟娈�
- # filePath: E:\\test\\b #闆嗘垚瀹㈡埛绔繚瀛樺湴鍧�
- # newFilePath: E:/test/bak_sql/ #鏂囦欢澶囦唤鍦板潃
- filePath: /jar/test/b/ #闆嗘垚瀹㈡埛绔繚瀛樺湴鍧�
- newFilePath: /jar/test/bak_sql/ #鏂囦欢澶囦唤鍦板潃
- appIdCheck: admin #token 鐢ㄦ埛鍚�
- passwordCheck: 123 #token 瀵嗙爜
- logIp: 127.0.0.1
- logPort: 8888
- clientIp: 127.0.0.1 #瀹㈡埛绔疘P
-fileNumPath: D:/demo/fileNum.txt #椤哄簭鍙疯褰曞湴鍧�
#鏂囦欢涓婁紶鐩綍锛堟敞鎰廘inux鍜學indows涓婄殑鐩綍缁撴瀯涓嶅悓锛�
#file.uploadFolder=/root/uploadFiles/
#fileHomePath: ${UPLOAD_FOLDER:/jar/lxzn_storage}
@@ -336,3 +307,17 @@
ncSend:
addOrDelete: false #//鏄惁鍒犻櫎seed 涓殑涔嬪墠鏂囦欢
#staticAccessPath: /api/ffile/** # 褰撳墠椤圭洰鐨勯潤鎬佽祫婧愯闂厤缃湪nginx涓�
+#宸ユ帶缃�/娑夊瘑缃戦儴缃茬浉鍏抽厤缃�------------閫氳繃鍏夌洏鎽嗘浮
+deploy:
+ #娑夊瘑缃戜紶杈撳伐鎺х綉nc鏂囦欢澶�(鎸囨淳璁惧nc鏂囦欢)
+ secretFolder: D:\\test\\a
+file:
+ monitor:
+ # 涓変釜鐩戞帶鐩綍閰嶇疆
+ paths:
+ - D:\\hy_test\\ncFile #宸ユ帶璐熻矗瑙ｆ瀽閲岄潰鐨勬枃浠�;娑夊瘑缃戣繘琛岃В鏋愬洖浼犵殑鎿嶄綔
+ - D:\\hy_test\\b
+ - D:\\hy_test\\c
+ interval: 10000 # 鐩戞帶闂撮殧(ms)
+security:
+ encryption-key: 1234567890abcdef # 鍔犺В瀵嗙閽�
--
Gitblit v1.9.3