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 | 38 ++++++++++++++++++++++++++++++++++----
1 files changed, 34 insertions(+), 4 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 ccfdfe0..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
@@ -126,7 +126,7 @@
connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
datasource:
master:
- url: jdbc:sqlserver://192.168.124.118:1433;databasename=LXZN_TEST_COMMON
+ url: jdbc:sqlserver://192.168.1.118:1433;databasename=LXZN_TEST_HANGYU;nullCatalogMeansCurrent=true
username: sa
password: 123
driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
@@ -135,7 +135,14 @@
database: 0
host: 127.0.0.1
port: 6379
- password: 123456
+ password: '123456'
+flowable:
+ enable: true
+ #鍏抽棴瀹氭椂浠诲姟JOB
+ async-executor-activate: false
+ database-schema-update: true
+#activiti:
+# enable: false # true 鍚敤瀹℃壒 false 涓嶅惎鐢ㄥ鎵�
#mybatis plus 璁剧疆
mybatis-plus:
mapper-locations: classpath*:org/jeecg/modules/**/xml/*Mapper.xml
@@ -290,4 +297,27 @@
url: http://localhost:8081/services/EquipmentService?wsdl
namespace: http://service.server.webservice.example.com
statusMethod: equipmentStatus
- rateMethod: equipmentRate
\ No newline at end of file
+ rateMethod: equipmentRate
+#鏂囦欢涓婁紶鐩綍锛堟敞鎰廘inux鍜學indows涓婄殑鐩綍缁撴瀯涓嶅悓锛�
+#file.uploadFolder=/root/uploadFiles/
+#fileHomePath: ${UPLOAD_FOLDER:/jar/lxzn_storage}
+#fileNCPath: ${NC_FOLDER:/jar/NC} # NC鏂囦欢浣嶇疆
+fileHomePath: ${UPLOAD_FOLDER:d://lxzn_storage}
+fileNCPath: ${NC_FOLDER:D://NC} # NC鏂囦欢浣嶇疆
+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