From a7ad8c17aa069e723aa0a813cf198d07e67b5fb5 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期五, 14 三月 2025 14:19:08 +0800
Subject: [PATCH] 新增刀具、设备类信息管理，新增结构树优化，优化权限分配，新增双控设备结构书 修改flow模块 删除部分废弃yml配置
---
lxzn-module-system/lxzn-system-start/src/main/resources/application-dev.yml | 49 +++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 47 insertions(+), 2 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..2b4b48b 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.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
@@ -136,6 +136,13 @@
host: 127.0.0.1
port: 6379
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,42 @@
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
+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}
+#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涓�
--
Gitblit v1.9.3