From 0871a25215fb468f121785600f796a14b54d8ebc Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期五, 06 六月 2025 15:47:00 +0800
Subject: [PATCH] 1.刀具添加字段 2.新增dnc传输日志表 3.导入NC文件默认产生nc文件对应数控程序加工确认表 4.拆分两网 修改yml配置
---
lxzn-module-system/lxzn-system-start/src/main/resources/application-dev.yml | 39 +++++++++------------------------------
1 files changed, 9 insertions(+), 30 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 2e398df..d79ea82 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
@@ -135,7 +135,7 @@
database: 0
host: 127.0.0.1
port: 6379
- password: ''
+ 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,11 @@
ncSend:
addOrDelete: false #//鏄惁鍒犻櫎seed 涓殑涔嬪墠鏂囦欢
#staticAccessPath: /api/ffile/** # 褰撳墠椤圭洰鐨勯潤鎬佽祫婧愯闂厤缃湪nginx涓�
+#宸ユ帶缃�/娑夊瘑缃戦儴缃茬浉鍏抽厤缃�------------閫氳繃鍏夌洏鎽嗘浮
+deploy:
+ #宸ユ帶缃�/娑夊瘑缃戦儴缃� 0涓烘秹瀵嗙綉 1涓哄伐鎺х綉
+ deployType: 0
+ #娑夊瘑缃戜紶杈搉c鏂囦欢澶�
+ secretFolder: D:\\hy_test\\a
+ #宸ユ帶缃戠洃鎺c鏂囦欢澶�
+ workFolder: D:\\hy_test\\b
--
Gitblit v1.9.3