|
|
@@ -127,7 +127,7 @@ func LoadServerConfig(filePath, deviceID string) (*ServerConfig, error) {
|
|
|
if useDefault {
|
|
|
data = []byte(defaultConfig)
|
|
|
if err := utils.WriteFileAtomic(filePath, append(data, '\n')); err != nil {
|
|
|
- baseapp.Logger.Warnf("[%s] 保存默认配置文件失败: %v!", MODULE_NAME, err)
|
|
|
+ baseapp.Logger.Warnf("[%s] 生成默认配置文件失败: %v!", MODULE_NAME, err)
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -135,8 +135,18 @@ func LoadServerConfig(filePath, deviceID string) (*ServerConfig, error) {
|
|
|
return nil, err
|
|
|
}
|
|
|
|
|
|
+ mqttNames := make(map[string]struct{})
|
|
|
dataBackfillSet := make(map[string]string)
|
|
|
for _, server := range cfg.MQTTServers {
|
|
|
+ if strings.TrimSpace(server.Name) == "" {
|
|
|
+ return nil, fmt.Errorf("MQTT服务器名称不能为空且需唯一: %q", server.Name)
|
|
|
+ }
|
|
|
+
|
|
|
+ if _, ok := mqttNames[server.Name]; ok {
|
|
|
+ return nil, fmt.Errorf("MQTT服务器名称不能重复且需唯一: %q", server.Name)
|
|
|
+ }
|
|
|
+ mqttNames[server.Name] = struct{}{}
|
|
|
+
|
|
|
if !server.DataBackfill {
|
|
|
continue
|
|
|
}
|
|
|
@@ -147,13 +157,23 @@ func LoadServerConfig(filePath, deviceID string) (*ServerConfig, error) {
|
|
|
dataBackfillSet[server.Protocol] = server.Name
|
|
|
}
|
|
|
|
|
|
+ imagNames := make(map[string]struct{})
|
|
|
imagBackfillSet := ""
|
|
|
for _, server := range cfg.ImagServers {
|
|
|
+ if strings.TrimSpace(server.Name) == "" {
|
|
|
+ return nil, fmt.Errorf("IMAG服务器名称不能为空且需唯一: %q", server.Name)
|
|
|
+ }
|
|
|
+
|
|
|
+ if _, ok := imagNames[server.Name]; ok {
|
|
|
+ return nil, fmt.Errorf("IMAG服务器名称不能重复且需唯一: %q", server.Name)
|
|
|
+ }
|
|
|
+ imagNames[server.Name] = struct{}{}
|
|
|
+
|
|
|
if !server.ImagBackfill {
|
|
|
continue
|
|
|
}
|
|
|
if imagBackfillSet != "" {
|
|
|
- return nil, fmt.Errorf("图片服务器只能有一个启用图片上传补录功能: %q, %q",
|
|
|
+ return nil, fmt.Errorf("IMAG服务器只能有一个启用图片上传补录功能: %q, %q",
|
|
|
imagBackfillSet, server.Name)
|
|
|
}
|
|
|
imagBackfillSet = server.Name
|
|
|
@@ -220,8 +240,12 @@ func (c *ServerConfig) AddMQTTServer(server MQTTServer) {
|
|
|
c.mu.Lock()
|
|
|
defer c.mu.Unlock()
|
|
|
|
|
|
+ if strings.TrimSpace(server.Name) == "" {
|
|
|
+ return
|
|
|
+ }
|
|
|
+
|
|
|
for i, s := range c.mqttServers {
|
|
|
- if s.Name == server.Name {
|
|
|
+ if s.Name == server.Name { // 由于MQTT服务器名唯一,覆盖
|
|
|
c.mqttServers[i] = server
|
|
|
return
|
|
|
}
|
|
|
@@ -230,24 +254,30 @@ func (c *ServerConfig) AddMQTTServer(server MQTTServer) {
|
|
|
c.mqttServers = append(c.mqttServers, server)
|
|
|
}
|
|
|
|
|
|
-func (c *ServerConfig) DelMQTTServer(index int) bool {
|
|
|
+func (c *ServerConfig) DelMQTTServer(name string) bool {
|
|
|
c.mu.Lock()
|
|
|
defer c.mu.Unlock()
|
|
|
|
|
|
- if index < 0 || index >= len(c.mqttServers) {
|
|
|
- return false
|
|
|
+ for i, server := range c.mqttServers {
|
|
|
+ if server.Name == name {
|
|
|
+ c.mqttServers = append(c.mqttServers[:i], c.mqttServers[i+1:]...)
|
|
|
+ return true
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
- c.mqttServers = append(c.mqttServers[:index], c.mqttServers[index+1:]...)
|
|
|
- return true
|
|
|
+ return false
|
|
|
}
|
|
|
|
|
|
func (c *ServerConfig) AddImagServer(server ImagServer) {
|
|
|
c.mu.Lock()
|
|
|
defer c.mu.Unlock()
|
|
|
|
|
|
+ if strings.TrimSpace(server.Name) == "" {
|
|
|
+ return
|
|
|
+ }
|
|
|
+
|
|
|
for i, s := range c.imagServers {
|
|
|
- if s.Name == server.Name {
|
|
|
+ if s.Name == server.Name { // 由于IMAG服务器名唯一,覆盖
|
|
|
c.imagServers[i] = server
|
|
|
return
|
|
|
}
|
|
|
@@ -256,32 +286,16 @@ func (c *ServerConfig) AddImagServer(server ImagServer) {
|
|
|
c.imagServers = append(c.imagServers, server)
|
|
|
}
|
|
|
|
|
|
-func (c *ServerConfig) DelImagServer(index int) bool {
|
|
|
+func (c *ServerConfig) DelImagServer(name string) bool {
|
|
|
c.mu.Lock()
|
|
|
defer c.mu.Unlock()
|
|
|
|
|
|
- if index < 0 || index >= len(c.imagServers) {
|
|
|
- return false
|
|
|
- }
|
|
|
-
|
|
|
- c.imagServers = append(c.imagServers[:index], c.imagServers[index+1:]...)
|
|
|
- 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
|
|
|
+ for i, server := range c.imagServers {
|
|
|
+ if server.Name == name {
|
|
|
+ c.imagServers = append(c.imagServers[:i], c.imagServers[i+1:]...)
|
|
|
+ return true
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
- c.upgrServers = append(c.upgrServers[:index], c.upgrServers[index+1:]...)
|
|
|
- return true
|
|
|
+ return false
|
|
|
}
|