|
@@ -4,11 +4,14 @@ import (
|
|
|
"encoding/json"
|
|
"encoding/json"
|
|
|
"errors"
|
|
"errors"
|
|
|
"os"
|
|
"os"
|
|
|
|
|
+ "path/filepath"
|
|
|
"strings"
|
|
"strings"
|
|
|
"sync"
|
|
"sync"
|
|
|
|
|
+
|
|
|
|
|
+ "hnyfkj.com.cn/rtu/linux/baseapp"
|
|
|
)
|
|
)
|
|
|
|
|
|
|
|
-type Config struct {
|
|
|
|
|
|
|
+type ServerConfig struct {
|
|
|
mu sync.RWMutex
|
|
mu sync.RWMutex
|
|
|
mqttServers []MQTTServer
|
|
mqttServers []MQTTServer
|
|
|
imagServers []ImagServer
|
|
imagServers []ImagServer
|
|
@@ -38,7 +41,8 @@ type ImagServer struct {
|
|
|
|
|
|
|
|
type UpgrServer struct {
|
|
type UpgrServer struct {
|
|
|
Enable bool `json:"enable"`
|
|
Enable bool `json:"enable"`
|
|
|
- Target string `json:"target"`
|
|
|
|
|
|
|
+ HWType string `json:"hwtype"`
|
|
|
|
|
+ SFType string `json:"sftype"`
|
|
|
GetURL string `json:"getUrl"`
|
|
GetURL string `json:"getUrl"`
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -74,56 +78,86 @@ const defaultConfig = `{
|
|
|
{
|
|
{
|
|
|
"enable": true,
|
|
"enable": true,
|
|
|
"hwtype": "mcu",
|
|
"hwtype": "mcu",
|
|
|
- "sftype": "cbd",
|
|
|
|
|
|
|
+ "sftype": "cbd",
|
|
|
"getUrl": "ftp://cbd_user:YFkj%406O2O@8.136.98.49:21/_UPDATE_FILE/MCU/cbd/rtthread.rbl"
|
|
"getUrl": "ftp://cbd_user:YFkj%406O2O@8.136.98.49:21/_UPDATE_FILE/MCU/cbd/rtthread.rbl"
|
|
|
},
|
|
},
|
|
|
{
|
|
{
|
|
|
"enable": true,
|
|
"enable": true,
|
|
|
"hwtype": "hmi",
|
|
"hwtype": "hmi",
|
|
|
- "sftype": "cbd",
|
|
|
|
|
|
|
+ "sftype": "cbd",
|
|
|
"getUrl": "ftp://cbd_user:YFkj%406O2O@8.136.98.49:21/_UPDATE_FILE/HMI/cbd_hmi.zip"
|
|
"getUrl": "ftp://cbd_user:YFkj%406O2O@8.136.98.49:21/_UPDATE_FILE/HMI/cbd_hmi.zip"
|
|
|
},
|
|
},
|
|
|
{
|
|
{
|
|
|
"enable": false,
|
|
"enable": false,
|
|
|
"hwtype": "rtu",
|
|
"hwtype": "rtu",
|
|
|
- "sftype": "cbd",
|
|
|
|
|
|
|
+ "sftype": "cbd",
|
|
|
"getUrl": ""
|
|
"getUrl": ""
|
|
|
}
|
|
}
|
|
|
]
|
|
]
|
|
|
}`
|
|
}`
|
|
|
|
|
|
|
|
-func LoadConfig(path, id string) (*Config, error) {
|
|
|
|
|
|
|
+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) == "" {
|
|
if strings.TrimSpace(id) == "" {
|
|
|
return nil, errors.New("device id is empty")
|
|
return nil, errors.New("device id is empty")
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
data, err := os.ReadFile(path)
|
|
data, err := os.ReadFile(path)
|
|
|
- isDefault := os.IsNotExist(err)
|
|
|
|
|
- if err != nil {
|
|
|
|
|
- if !isDefault {
|
|
|
|
|
- return nil, err
|
|
|
|
|
- }
|
|
|
|
|
- data = []byte(defaultConfig)
|
|
|
|
|
|
|
+ useDefault := os.IsNotExist(err)
|
|
|
|
|
+ if err != nil && !useDefault {
|
|
|
|
|
+ return nil, err
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
var cfg configFile
|
|
var cfg configFile
|
|
|
- if err := json.Unmarshal(data, &cfg); err != nil {
|
|
|
|
|
- return nil, err
|
|
|
|
|
|
|
+ if !useDefault {
|
|
|
|
|
+ if err := json.Unmarshal(data, &cfg); err != nil {
|
|
|
|
|
+ baseapp.Logger.Warnf("[%s] 解析配置文件 %s 失败,使用默认配置: %v!", MODULE_NAME, path, err)
|
|
|
|
|
+ useDefault = true
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- if isDefault {
|
|
|
|
|
- if err := os.WriteFile(path, append(data, '\n'), 0644); err != nil {
|
|
|
|
|
- return nil, err
|
|
|
|
|
|
|
+ if useDefault {
|
|
|
|
|
+ data = []byte(defaultConfig)
|
|
|
|
|
+ if err := writeFileAtomic(path, append(data, '\n')); err != nil {
|
|
|
|
|
+ baseapp.Logger.Warnf("[%s] 保存默认配置文件失败: %v!", MODULE_NAME, err)
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ if err := json.Unmarshal(data, &cfg); err != nil {
|
|
|
|
|
+ return nil, err
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
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.Pub = r.Replace(t.Pub)
|
|
|
|
|
- t.Sub = r.Replace(t.Sub)
|
|
|
|
|
- t.Offline = r.Replace(t.Offline)
|
|
|
|
|
|
|
+ cfg.MQTTServers[i].Topics.Pub = r.Replace(cfg.MQTTServers[i].Topics.Pub)
|
|
|
|
|
+ cfg.MQTTServers[i].Topics.Sub = r.Replace(cfg.MQTTServers[i].Topics.Sub)
|
|
|
|
|
+ cfg.MQTTServers[i].Topics.Offline = r.Replace(cfg.MQTTServers[i].Topics.Offline)
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
for i := range cfg.ImagServers {
|
|
for i := range cfg.ImagServers {
|
|
@@ -134,55 +168,54 @@ func LoadConfig(path, id string) (*Config, error) {
|
|
|
cfg.UpgrServers[i].GetURL = r.Replace(cfg.UpgrServers[i].GetURL)
|
|
cfg.UpgrServers[i].GetURL = r.Replace(cfg.UpgrServers[i].GetURL)
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- return &Config{
|
|
|
|
|
|
|
+ return &ServerConfig{
|
|
|
mqttServers: cfg.MQTTServers,
|
|
mqttServers: cfg.MQTTServers,
|
|
|
imagServers: cfg.ImagServers,
|
|
imagServers: cfg.ImagServers,
|
|
|
upgrServers: cfg.UpgrServers,
|
|
upgrServers: cfg.UpgrServers,
|
|
|
}, nil
|
|
}, nil
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-func (c *Config) Save(path string) error {
|
|
|
|
|
|
|
+func (c *ServerConfig) Save(path string) error {
|
|
|
c.mu.RLock()
|
|
c.mu.RLock()
|
|
|
- cfg := configFile{
|
|
|
|
|
- MQTTServers: append([]MQTTServer(nil), c.mqttServers...),
|
|
|
|
|
- ImagServers: append([]ImagServer(nil), c.imagServers...),
|
|
|
|
|
- UpgrServers: append([]UpgrServer(nil), c.upgrServers...),
|
|
|
|
|
- }
|
|
|
|
|
- c.mu.RUnlock()
|
|
|
|
|
|
|
+ defer c.mu.RUnlock()
|
|
|
|
|
|
|
|
- data, err := json.MarshalIndent(cfg, "", " ")
|
|
|
|
|
|
|
+ data, err := json.MarshalIndent(configFile{
|
|
|
|
|
+ MQTTServers: c.mqttServers,
|
|
|
|
|
+ ImagServers: c.imagServers,
|
|
|
|
|
+ UpgrServers: c.upgrServers,
|
|
|
|
|
+ }, "", " ")
|
|
|
if err != nil {
|
|
if err != nil {
|
|
|
return err
|
|
return err
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- return os.WriteFile(path, append(data, '\n'), 0644)
|
|
|
|
|
|
|
+ return writeFileAtomic(path, append(data, '\n'))
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-func (c *Config) GetMQTSServers() []MQTTServer {
|
|
|
|
|
|
|
+func (c *ServerConfig) GetMQTSServers() []MQTTServer {
|
|
|
c.mu.RLock()
|
|
c.mu.RLock()
|
|
|
defer c.mu.RUnlock()
|
|
defer c.mu.RUnlock()
|
|
|
return append([]MQTTServer(nil), c.mqttServers...)
|
|
return append([]MQTTServer(nil), c.mqttServers...)
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-func (c *Config) GetImagServers() []ImagServer {
|
|
|
|
|
|
|
+func (c *ServerConfig) GetImagServers() []ImagServer {
|
|
|
c.mu.RLock()
|
|
c.mu.RLock()
|
|
|
defer c.mu.RUnlock()
|
|
defer c.mu.RUnlock()
|
|
|
return append([]ImagServer(nil), c.imagServers...)
|
|
return append([]ImagServer(nil), c.imagServers...)
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-func (c *Config) GetUpgrServers() []UpgrServer {
|
|
|
|
|
|
|
+func (c *ServerConfig) GetUpgrServers() []UpgrServer {
|
|
|
c.mu.RLock()
|
|
c.mu.RLock()
|
|
|
defer c.mu.RUnlock()
|
|
defer c.mu.RUnlock()
|
|
|
return append([]UpgrServer(nil), c.upgrServers...)
|
|
return append([]UpgrServer(nil), c.upgrServers...)
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-func (c *Config) AddMQTTServer(server MQTTServer) {
|
|
|
|
|
|
|
+func (c *ServerConfig) AddMQTTServer(server MQTTServer) {
|
|
|
c.mu.Lock()
|
|
c.mu.Lock()
|
|
|
defer c.mu.Unlock()
|
|
defer c.mu.Unlock()
|
|
|
c.mqttServers = append(c.mqttServers, server)
|
|
c.mqttServers = append(c.mqttServers, server)
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-func (c *Config) DelMQTTServer(index int) bool {
|
|
|
|
|
|
|
+func (c *ServerConfig) DelMQTTServer(index int) bool {
|
|
|
c.mu.Lock()
|
|
c.mu.Lock()
|
|
|
defer c.mu.Unlock()
|
|
defer c.mu.Unlock()
|
|
|
|
|
|
|
@@ -194,13 +227,13 @@ func (c *Config) DelMQTTServer(index int) bool {
|
|
|
return true
|
|
return true
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-func (c *Config) AddImagServer(server ImagServer) {
|
|
|
|
|
|
|
+func (c *ServerConfig) AddImagServer(server ImagServer) {
|
|
|
c.mu.Lock()
|
|
c.mu.Lock()
|
|
|
defer c.mu.Unlock()
|
|
defer c.mu.Unlock()
|
|
|
c.imagServers = append(c.imagServers, server)
|
|
c.imagServers = append(c.imagServers, server)
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-func (c *Config) DelImagServer(index int) bool {
|
|
|
|
|
|
|
+func (c *ServerConfig) DelImagServer(index int) bool {
|
|
|
c.mu.Lock()
|
|
c.mu.Lock()
|
|
|
defer c.mu.Unlock()
|
|
defer c.mu.Unlock()
|
|
|
|
|
|
|
@@ -211,3 +244,21 @@ func (c *Config) DelImagServer(index int) bool {
|
|
|
c.imagServers = append(c.imagServers[:index], c.imagServers[index+1:]...)
|
|
c.imagServers = append(c.imagServers[:index], c.imagServers[index+1:]...)
|
|
|
return true
|
|
return true
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
|
|
+func (c *ServerConfig) AddUpgrServer(server UpgrServer) {
|
|
|
|
|
+ c.mu.Lock()
|
|
|
|
|
+ defer c.mu.Unlock()
|
|
|
|
|
+ c.upgrServers = append(c.upgrServers, server)
|
|
|
|
|
+}
|
|
|
|
|
+
|
|
|
|
|
+func (c *ServerConfig) DelUpgrServer(index int) bool {
|
|
|
|
|
+ c.mu.Lock()
|
|
|
|
|
+ defer c.mu.Unlock()
|
|
|
|
|
+
|
|
|
|
|
+ if index < 0 || index >= len(c.upgrServers) {
|
|
|
|
|
+ return false
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ c.upgrServers = append(c.upgrServers[:index], c.upgrServers[index+1:]...)
|
|
|
|
|
+ return true
|
|
|
|
|
+}
|