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 | 74 ++++++++++++++-----------------------
1 files changed, 28 insertions(+), 46 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 da6655d..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
@@ -7,7 +7,7 @@
include-stacktrace: ALWAYS
include-message: ALWAYS
servlet:
- context-path:
+ context-path: /jeecg-boot
compression:
enabled: true
min-response-size: 1024
@@ -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
@@ -135,22 +135,9 @@
database: 0
host: 127.0.0.1
port: 6379
- password: 123456
-# activiti:
-# #1.flase锛氶粯璁ゅ�笺�俛ctiviti鍦ㄥ惎鍔ㄦ椂锛屽姣旀暟鎹簱琛ㄤ腑淇濆瓨鐨勭増鏈紝濡傛灉娌℃湁琛ㄦ垨鑰呯増鏈笉鍖归厤锛屽皢鎶涘嚭寮傚父
-# #2.true锛� activiti浼氬鏁版嵁搴撲腑鎵�鏈夎〃杩涜鏇存柊鎿嶄綔銆傚鏋滆〃涓嶅瓨鍦紝鍒欒嚜鍔ㄥ垱寤�
-# #3.create_drop锛� 鍦╝ctiviti鍚姩鏃跺垱寤鸿〃锛屽湪鍏抽棴鏃跺垹闄よ〃锛堝繀椤绘墜鍔ㄥ叧闂紩鎿庯紝鎵嶈兘鍒犻櫎琛級
-# #4.drop-create锛� 鍦╝ctiviti鍚姩鏃跺垹闄ゅ師鏉ョ殑鏃ц〃锛岀劧鍚庡湪鍒涘缓鏂拌〃锛堜笉闇�瑕佹墜鍔ㄥ叧闂紩鎿庯級
-# database-schema-update: true
-# # 妫�娴嬪巻鍙蹭俊鎭〃鏄惁瀛樺湪锛宎ctiviti7榛樿涓嶇敓鎴愬巻鍙蹭俊鎭〃锛屽紑鍚巻鍙茶〃
-# db-history-used: true
-# # 鍘嗗彶璁板綍瀛樺偍绛夌骇
-# history-level: full
-# check-process-definitions: true
-# #鍦ㄦ祦绋嬪紩鎿庡惎鍔ㄥ氨婵�娲籄syncExecutor,寮傛 true false 鍏抽棴 锛堝垏璁板叧闂級
-# async-executor-activate: false
-# async-executor-enabled: true
+ password: '123456'
flowable:
+ enable: true
#鍏抽棴瀹氭椂浠诲姟JOB
async-executor-activate: false
database-schema-update: true
@@ -311,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}
@@ -349,3 +307,27 @@
ncSend:
addOrDelete: false #//鏄惁鍒犻櫎seed 涓殑涔嬪墠鏂囦欢
#staticAccessPath: /api/ffile/** # 褰撳墠椤圭洰鐨勯潤鎬佽祫婧愯闂厤缃湪nginx涓�
+#宸ユ帶缃�/娑夊瘑缃戦儴缃茬浉鍏抽厤缃�------------閫氳繃鍏夌洏鎽嗘浮
+deploy:
+ #宸ユ帶缃�/娑夊瘑缃戦儴缃� 0涓烘秹瀵嗙綉 1涓哄伐鎺х綉
+ deployType: 0
+ #娑夊瘑缃戜紶杈撳伐鎺х綉nc鏂囦欢澶�(鎸囨淳璁惧nc鏂囦欢) 宸ユ帶缃戜紶杈撴秹瀵嗙綉nc鏂囦欢澶�(瑙ｆ瀽鍥炰紶鍚庣殑nc鏂囦欢)
+ secretFolder: D:\\test\\a
+file:
+ monitor:
+ # 涓変釜鐩戞帶鐩綍閰嶇疆
+ paths:
+ - D:\\hy_test\\ncFile #宸ユ帶璐熻矗瑙ｆ瀽閲岄潰鐨勬枃浠�;娑夊瘑缃戣繘琛岃В鏋愬洖浼犵殑鎿嶄綔
+ - 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