Kaynağa Gözat

优化代码

niujiuru 1 ay önce
ebeveyn
işleme
7f8a63ffda
3 değiştirilmiş dosya ile 31 ekleme ve 29 silme
  1. 3 29
      mqtt_reporter/config.go
  2. 2 0
      mqtt_reporter/reporter.go
  3. 26 0
      utils/utils.go

+ 3 - 29
mqtt_reporter/config.go

@@ -4,11 +4,11 @@ import (
 	"encoding/json"
 	"errors"
 	"os"
-	"path/filepath"
 	"strings"
 	"sync"
 
 	"hnyfkj.com.cn/rtu/linux/baseapp"
+	"hnyfkj.com.cn/rtu/linux/rtu/cbd/utils"
 )
 
 type ServerConfig struct {
@@ -96,32 +96,6 @@ const defaultConfig = `{
   ]
 }`
 
-func writeFileAtomic(path string, data []byte) error {
-	tmp, err := os.CreateTemp(filepath.Dir(path), "."+filepath.Base(path)+".tmp-*")
-	if err != nil {
-		return err
-	}
-
-	tmpPath := tmp.Name()
-	defer os.Remove(tmpPath)
-
-	if _, err := tmp.Write(data); err != nil {
-		tmp.Close()
-		return err
-	}
-
-	if err := tmp.Sync(); err != nil {
-		tmp.Close()
-		return err
-	}
-
-	if err := tmp.Close(); err != nil {
-		return err
-	}
-
-	return os.Rename(tmpPath, path)
-}
-
 func LoadServerConfig(path, id string) (*ServerConfig, error) {
 	if strings.TrimSpace(id) == "" {
 		return nil, errors.New("device id is empty")
@@ -143,7 +117,7 @@ func LoadServerConfig(path, id string) (*ServerConfig, error) {
 
 	if useDefault {
 		data = []byte(defaultConfig)
-		if err := writeFileAtomic(path, append(data, '\n')); err != nil {
+		if err := utils.WriteFileAtomic(path, append(data, '\n')); err != nil {
 			baseapp.Logger.Warnf("[%s] 保存默认配置文件失败: %v!", MODULE_NAME, err)
 		}
 	}
@@ -188,7 +162,7 @@ func (c *ServerConfig) Save(path string) error {
 		return err
 	}
 
-	return writeFileAtomic(path, append(data, '\n'))
+	return utils.WriteFileAtomic(path, append(data, '\n'))
 }
 
 func (c *ServerConfig) GetMQTSServers() []MQTTServer {

+ 2 - 0
mqtt_reporter/reporter.go

@@ -1 +1,3 @@
 package mqttreporter
+
+const MODULE_NAME = "Reporter"

+ 26 - 0
utils/utils.go

@@ -52,3 +52,29 @@ func PlayWelcomeAudio() {
 	path := filepath.Join(baseapp.EXEC_DIR, "voices/welcome.wav")
 	PlayAudioAsync(path)
 }
+
+func WriteFileAtomic(path string, data []byte) error {
+	tmp, err := os.CreateTemp(filepath.Dir(path), "."+filepath.Base(path)+".tmp-*")
+	if err != nil {
+		return err
+	}
+
+	tmpPath := tmp.Name()
+	defer os.Remove(tmpPath)
+
+	if _, err := tmp.Write(data); err != nil {
+		tmp.Close()
+		return err
+	}
+
+	if err := tmp.Sync(); err != nil {
+		tmp.Close()
+		return err
+	}
+
+	if err := tmp.Close(); err != nil {
+		return err
+	}
+
+	return os.Rename(tmpPath, path)
+}