Prechádzať zdrojové kódy

新增通用从远程服务器下载文件的函数那等

niujiuru 3 týždňov pred
rodič
commit
98c4b33c4b
3 zmenil súbory, kde vykonal 37 pridanie a 1 odobranie
  1. 11 0
      mqtt_reporter/config.go
  2. 1 1
      mqtt_reporter/photo.go
  3. 25 0
      utils/utils.go

+ 11 - 0
mqtt_reporter/config.go

@@ -300,6 +300,17 @@ func (c *ServerConfig) DelImagServer(name string) bool {
 	return false
 	return false
 }
 }
 
 
+func (c *ServerConfig) GetUpgradeURL(hwType, sfType string) string {
+	for _, server := range c.GetUpgrServers() {
+		if server.Enable &&
+			strings.EqualFold(server.HWType, hwType) &&
+			strings.EqualFold(server.SFType, sfType) {
+			return server.GetURL
+		}
+	}
+	return ""
+}
+
 func (c *ServerConfig) String() string {
 func (c *ServerConfig) String() string {
 	data, err := json.MarshalIndent(configFile{
 	data, err := json.MarshalIndent(configFile{
 		MQTTServers: c.GetMQTTServers(),
 		MQTTServers: c.GetMQTTServers(),

+ 1 - 1
mqtt_reporter/photo.go

@@ -93,7 +93,7 @@ func (r *MQTTReporter) uploadPhotoToImagServers(imgFile string, isBackfill /* 
 			_, err = ftpclient.UploadFileToFtp(r.ctx, imgFile,
 			_, err = ftpclient.UploadFileToFtp(r.ctx, imgFile,
 				serverInfo.Host, serverInfo.User, serverInfo.Pass, ftpclient.DefaultUploadTimeout)
 				serverInfo.Host, serverInfo.User, serverInfo.Pass, ftpclient.DefaultUploadTimeout)
 		default:
 		default:
-			baseapp.Logger.Errorf("[%s] %s %s -> %s 失败: 不支持的协议 %s!!",
+			baseapp.Logger.Errorf("[%s] %s %s -> %s 失败: 不支持的上传协议 %s!!",
 				MODULE_NAME, action, imgFile, server.Name, serverInfo.Scheme)
 				MODULE_NAME, action, imgFile, server.Name, serverInfo.Scheme)
 			continue
 			continue
 		}
 		}

+ 25 - 0
utils/utils.go

@@ -2,6 +2,7 @@ package utils
 
 
 import (
 import (
 	"bytes"
 	"bytes"
+	"context"
 	"encoding/json"
 	"encoding/json"
 	"errors"
 	"errors"
 	"fmt"
 	"fmt"
@@ -13,6 +14,7 @@ import (
 	"strings"
 	"strings"
 
 
 	"hnyfkj.com.cn/rtu/linux/baseapp"
 	"hnyfkj.com.cn/rtu/linux/baseapp"
+	"hnyfkj.com.cn/rtu/linux/utils/ftpclient"
 )
 )
 
 
 // 执行系统Shell脚本 (同步)
 // 执行系统Shell脚本 (同步)
@@ -238,3 +240,26 @@ func FormatCompactJSON(data []byte) string {
 	}
 	}
 	return buf.String()
 	return buf.String()
 }
 }
+
+// 下载 远程服务器 DOWNLOAD
+func DownloadFile(url, dst string) error {
+	info, err := ParseURL(url)
+	if err != nil {
+		return err
+	}
+
+	switch info.Scheme {
+	case "ftp":
+		src, err := ftpclient.DownloadFileFromFtp(
+			context.Background(),
+			info.Host, info.User, info.Pass, info.Path,
+			ftpclient.DefaultDownloadTimeout,
+		)
+		if err != nil {
+			return err
+		}
+		return os.Rename(src, dst)
+	default:
+		return fmt.Errorf("不支持的下载协议: %s", info.Scheme)
+	}
+}