From 550a1a7dfdcb742dd5eb0c6292175ed47f181ad3 Mon Sep 17 00:00:00 2001
From: cuikaidong <ckd2942379034@163.com>
Date: 星期三, 20 八月 2025 09:27:23 +0800
Subject: [PATCH] 麒麟系统适配ftp，标准参数修改
---
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/iot/controller/ServeDeployController.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/iot/controller/ServeDeployController.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/iot/controller/ServeDeployController.java
index 892cec1..582cf4c 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/iot/controller/ServeDeployController.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/iot/controller/ServeDeployController.java
@@ -54,8 +54,8 @@
private IMqttDeployService mqttDeployService;
@Autowired
private MqttCustomerClient mqttCustomerClient;
- @Resource
- private RestTemplate restTemplate;
+ @Autowired
+ private FtpUtil ftpUtil;
@Autowired
private IEquipmentService equipmentService;
@Value("${ftp.address}")
@@ -138,10 +138,10 @@
topic[1] = "IOT\\" + serverDeploy.getServerCode() + "\\WriteMessage";
mqttCustomerClient.subscribe(topic);
// 鍒涘缓ftp鏂囦欢澶圭洰褰�
- FtpUtil.createFolder("/log", serverDeploy.getServerCode());
- FtpUtil.createFolder("/deploy", serverDeploy.getServerCode());
- FtpUtil.createFolder("/deploy/" + serverDeploy.getServerCode(), "software");
- FtpUtil.createFolder("/deploy/" + serverDeploy.getServerCode(), "deploy");
+ ftpUtil.createFolder("/log", serverDeploy.getServerCode());
+ ftpUtil.createFolder("/deploy", serverDeploy.getServerCode());
+ ftpUtil.createFolder("/deploy/" + serverDeploy.getServerCode(), "software");
+ ftpUtil.createFolder("/deploy/" + serverDeploy.getServerCode(), "deploy");
// 鐢熸垚鏈湴鏂囦欢澶�
boolean b = FileUtil.queryCatalogue(ftpAddress + serverDeploy.getServerCode());
if (b) {
@@ -277,16 +277,16 @@
return Result.error("璇蜂笂浼�.zip鏂囦欢!");
}
// 鏂板缓ftp鏂囦欢澶�
- FtpUtil.createFolder("/deploy/" + serverDeploy.getServerCode() + "/software/", serverDeploy.getLatestCollectVersion());
+ ftpUtil.createFolder("/deploy/" + serverDeploy.getServerCode() + "/software/", serverDeploy.getLatestCollectVersion());
// 澶嶅埗閲囬泦杞欢鍒癴tp
// 涓婁紶鍒癴tp
String newCollectAddress = serverDeploy.getNewCollectAddress();
String basePath = "/deploy/"; // FTP鏈嶅姟鍣ㄥ熀纭�鐩綍
- String filePath = serverDeploy.getServerCode() + "/software/" + serverDeploy.getLatestCollectVersion(); // FTP鏈嶅姟鍣ㄦ枃浠跺瓨鏀捐矾寰勩�備緥濡傚垎鏃ユ湡瀛樻斁锛�/2015/01/01銆傛枃浠剁殑璺緞涓篵asePath+filePath
+ String filePath = "/"+serverDeploy.getServerCode() + "/software/" + serverDeploy.getLatestCollectVersion(); // FTP鏈嶅姟鍣ㄦ枃浠跺瓨鏀捐矾寰勩�備緥濡傚垎鏃ユ湡瀛樻斁锛�/2015/01/01銆傛枃浠剁殑璺緞涓篵asePath+filePath
String filename = newCollectAddress.substring(14, newCollectAddress.length());// 涓婁紶鍒癋TP鏈嶅姟鍣ㄤ笂鐨勬枃浠跺悕
try {
FileInputStream fileInputStream = new FileInputStream(ftpAddress + newCollectAddress);
- FtpUtil.uploadFile(basePath, filePath, filename, fileInputStream);
+ ftpUtil.uploadFile(basePath, filePath, filename, fileInputStream);
} catch (FileNotFoundException e) {
e.printStackTrace();
--
Gitblit v1.9.3