Pārlūkot izejas kodu

完成后端服务器配置管理设计和代码编写

niujiuru 1 mēnesi atpakaļ
vecāks
revīzija
9f870289d3
1 mainītis faili ar 61 papildinājumiem un 32 dzēšanām
  1. 61 32
      mqtt_reporter/config.go

+ 61 - 32
mqtt_reporter/config.go

@@ -9,10 +9,10 @@ import (
 )
 )
 
 
 type Config struct {
 type Config struct {
-	mu             sync.RWMutex
-	mqttServers    []MQTTServer
-	imageServers   []ImageServer
-	upgradeServers []UpgradeServer
+	mu          sync.RWMutex
+	mqttServers []MQTTServer
+	imagServers []ImagServer
+	upgrServers []UpgrServer
 }
 }
 
 
 type MQTTServer struct {
 type MQTTServer struct {
@@ -31,21 +31,21 @@ type Topics struct {
 	Offline string `json:"offline"`
 	Offline string `json:"offline"`
 }
 }
 
 
-type ImageServer struct {
+type ImagServer struct {
 	Enable bool   `json:"enable"`
 	Enable bool   `json:"enable"`
-	URL    string `json:"url"`
+	PutURL string `json:"putUrl"`
 }
 }
 
 
-type UpgradeServer struct {
+type UpgrServer struct {
 	Enable bool   `json:"enable"`
 	Enable bool   `json:"enable"`
 	Target string `json:"target"`
 	Target string `json:"target"`
-	URL    string `json:"url"`
+	GetURL string `json:"getUrl"`
 }
 }
 
 
 type configFile struct {
 type configFile struct {
-	MQTTServers    []MQTTServer    `json:"mqttServers"`
-	ImageServers   []ImageServer   `json:"imageServers"`
-	UpgradeServers []UpgradeServer `json:"upgradeServers"`
+	MQTTServers []MQTTServer `json:"mqttServers"`
+	ImagServers []ImagServer `json:"imagServers"`
+	UpgrServers []UpgrServer `json:"upgrServers"`
 }
 }
 
 
 const defaultConfig = `{
 const defaultConfig = `{
@@ -64,27 +64,27 @@ const defaultConfig = `{
       }
       }
     }
     }
   ],
   ],
-  "imageServers": [
+  "imagServers": [
     {
     {
       "enable": true,
       "enable": true,
-      "url": "ftp://cbd_user:YFkj%406O2O@8.136.98.49:21"
+      "putUrl": "ftp://cbd_user:YFkj%406O2O@8.136.98.49:21/${id}/"
     }
     }
   ],
   ],
-  "upgradeServers": [
+  "upgrServers": [
     {
     {
-      "enable": false,
+      "enable": true,
       "target": "mcu",
       "target": "mcu",
-      "url": ""
+      "getUrl": "ftp://cbd_user:YFkj%406O2O@8.136.98.49:21/_UPDATE_FILE/MCU/cbd/rtthread.rbl"
     },
     },
     {
     {
-      "enable": false,
+      "enable": true,
       "target": "hmi",
       "target": "hmi",
-      "url": ""
+      "getUrl": "ftp://cbd_user:YFkj%406O2O@8.136.98.49:21/_UPDATE_FILE/HMI/cbd_hmi.zip"
     },
     },
     {
     {
       "enable": false,
       "enable": false,
       "target": "rtu",
       "target": "rtu",
-      "url": ""
+      "getUrl": ""
     }
     }
   ]
   ]
 }`
 }`
@@ -115,6 +115,7 @@ func LoadConfig(path, id string) (*Config, error) {
 	}
 	}
 
 
 	r := strings.NewReplacer("${id}", id)
 	r := strings.NewReplacer("${id}", id)
+
 	for i := range cfg.MQTTServers {
 	for i := range cfg.MQTTServers {
 		t := &cfg.MQTTServers[i].Topics
 		t := &cfg.MQTTServers[i].Topics
 		t.Pub = r.Replace(t.Pub)
 		t.Pub = r.Replace(t.Pub)
@@ -122,21 +123,31 @@ func LoadConfig(path, id string) (*Config, error) {
 		t.Offline = r.Replace(t.Offline)
 		t.Offline = r.Replace(t.Offline)
 	}
 	}
 
 
+	for i := range cfg.ImagServers {
+		cfg.ImagServers[i].PutURL = r.Replace(cfg.ImagServers[i].PutURL)
+	}
+
+	for i := range cfg.UpgrServers {
+		cfg.UpgrServers[i].GetURL = r.Replace(cfg.UpgrServers[i].GetURL)
+	}
+
 	return &Config{
 	return &Config{
-		mqttServers:    cfg.MQTTServers,
-		imageServers:   cfg.ImageServers,
-		upgradeServers: cfg.UpgradeServers,
+		mqttServers: cfg.MQTTServers,
+		imagServers: cfg.ImagServers,
+		upgrServers: cfg.UpgrServers,
 	}, nil
 	}, nil
 }
 }
 
 
 func (c *Config) Save(path string) error {
 func (c *Config) Save(path string) error {
 	c.mu.RLock()
 	c.mu.RLock()
-	data, err := json.MarshalIndent(configFile{
-		MQTTServers:    c.mqttServers,
-		ImageServers:   c.imageServers,
-		UpgradeServers: c.upgradeServers,
-	}, "", "  ")
+	cfg := configFile{
+		MQTTServers: append([]MQTTServer(nil), c.mqttServers...),
+		ImagServers: append([]ImagServer(nil), c.imagServers...),
+		UpgrServers: append([]UpgrServer(nil), c.upgrServers...),
+	}
 	c.mu.RUnlock()
 	c.mu.RUnlock()
+
+	data, err := json.MarshalIndent(cfg, "", "  ")
 	if err != nil {
 	if err != nil {
 		return err
 		return err
 	}
 	}
@@ -144,6 +155,24 @@ func (c *Config) Save(path string) error {
 	return os.WriteFile(path, append(data, '\n'), 0644)
 	return os.WriteFile(path, append(data, '\n'), 0644)
 }
 }
 
 
+func (c *Config) GetMQTSServers() []MQTTServer {
+	c.mu.RLock()
+	defer c.mu.RUnlock()
+	return append([]MQTTServer(nil), c.mqttServers...)
+}
+
+func (c *Config) GetImagServers() []ImagServer {
+	c.mu.RLock()
+	defer c.mu.RUnlock()
+	return append([]ImagServer(nil), c.imagServers...)
+}
+
+func (c *Config) GetUpgrServers() []UpgrServer {
+	c.mu.RLock()
+	defer c.mu.RUnlock()
+	return append([]UpgrServer(nil), c.upgrServers...)
+}
+
 func (c *Config) AddMQTTServer(server MQTTServer) {
 func (c *Config) AddMQTTServer(server MQTTServer) {
 	c.mu.Lock()
 	c.mu.Lock()
 	defer c.mu.Unlock()
 	defer c.mu.Unlock()
@@ -162,20 +191,20 @@ func (c *Config) DelMQTTServer(index int) bool {
 	return true
 	return true
 }
 }
 
 
-func (c *Config) AddImageServer(server ImageServer) {
+func (c *Config) AddImagServer(server ImagServer) {
 	c.mu.Lock()
 	c.mu.Lock()
 	defer c.mu.Unlock()
 	defer c.mu.Unlock()
-	c.imageServers = append(c.imageServers, server)
+	c.imagServers = append(c.imagServers, server)
 }
 }
 
 
-func (c *Config) DelImageServer(index int) bool {
+func (c *Config) DelImagServer(index int) bool {
 	c.mu.Lock()
 	c.mu.Lock()
 	defer c.mu.Unlock()
 	defer c.mu.Unlock()
 
 
-	if index < 0 || index >= len(c.imageServers) {
+	if index < 0 || index >= len(c.imagServers) {
 		return false
 		return false
 	}
 	}
 
 
-	c.imageServers = append(c.imageServers[:index], c.imageServers[index+1:]...)
+	c.imagServers = append(c.imagServers[:index], c.imagServers[index+1:]...)
 	return true
 	return true
 }
 }