|
|
@@ -17,31 +17,22 @@ const dataFilePath = "static/data.json"
|
|
|
|
|
|
// LoadData 从文件中加载 Region 数据。
|
|
|
func LoadData() ([]dao.Region, error) {
|
|
|
- data, err := os.ReadFile(dataFilePath)
|
|
|
-
|
|
|
- datafb, err := os.ReadFile("static/data-fb.json")
|
|
|
- var regionsfb []dao.Region
|
|
|
- if err := json.Unmarshal(datafb, ®ionsfb); err != nil {
|
|
|
- // 提供更多的上下文信息来帮助调试
|
|
|
- return nil, fmt.Errorf("解析 JSON 失败: %v, 原始数据: %s", err, string(data))
|
|
|
- }
|
|
|
+ var regions []dao.Region
|
|
|
|
|
|
+ // 尝试从主数据文件读取数据
|
|
|
+ data, err := os.ReadFile(dataFilePath)
|
|
|
if err != nil {
|
|
|
- if os.IsNotExist(err) {
|
|
|
- return regionsfb, nil // 文件不存在时返回空数组
|
|
|
+ if !os.IsNotExist(err) {
|
|
|
+ return nil, fmt.Errorf("读取文件失败: %v", err)
|
|
|
+ }
|
|
|
+ // 如果主数据文件不存在，则尝试从备份文件读取
|
|
|
+ } else {
|
|
|
+ // 检查文件是否为空
|
|
|
+ if len(data) > 0 {
|
|
|
+ if err := json.Unmarshal(data, ®ions); err != nil {
|
|
|
+ return nil, fmt.Errorf("解析 JSON 失败 (主文件): %v, 原始数据: %s", err, string(data))
|
|
|
+ }
|
|
|
}
|
|
|
- return nil, fmt.Errorf("读取文件失败: %v", err)
|
|
|
- }
|
|
|
-
|
|
|
- // 检查文件是否为空
|
|
|
- if len(data) == 0 {
|
|
|
- return regionsfb, nil // 如果文件为空，返回空数组
|
|
|
- }
|
|
|
-
|
|
|
- var regions []dao.Region
|
|
|
- if err := json.Unmarshal(data, ®ions); err != nil {
|
|
|
- // 提供更多的上下文信息来帮助调试
|
|
|
- return nil, fmt.Errorf("解析 JSON 失败: %v, 原始数据: %s", err, string(data))
|
|
|
}
|
|
|
|
|
|
return regions, nil
|
|
|
@@ -103,23 +94,56 @@ func SaveRegionOnData(data dao.Region) ([]dao.Region, error) {
|
|
|
if err != nil {
|
|
|
return regions, err
|
|
|
}
|
|
|
+
|
|
|
for i, region := range regions {
|
|
|
if region.Name == data.Name {
|
|
|
regions[i] = data
|
|
|
+ break
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
return regions, nil
|
|
|
}
|
|
|
|
|
|
// SaveData 保存数据到文件
|
|
|
-func SaveData(path string, parameter interface{}) error {
|
|
|
- // 如果 parameter 是 nil 或者是空的结构体/切片，可以选择不写入文件或返回错误。
|
|
|
- if parameter == nil {
|
|
|
- return fmt.Errorf("无法保存 nil 数据")
|
|
|
+func SaveData(path string, newData []dao.Region) error {
|
|
|
+ // 加载当前数据
|
|
|
+ currentRegions, err := LoadData()
|
|
|
+ if err != nil {
|
|
|
+ return err
|
|
|
+ }
|
|
|
+
|
|
|
+ // 创建一个映射以便快速查找
|
|
|
+ regionMap := make(map[string]dao.Region)
|
|
|
+ for _, region := range currentRegions {
|
|
|
+ regionMap[region.Name] = region
|
|
|
+ }
|
|
|
+
|
|
|
+ // 遍历传入的新数据，进行版本控制检查
|
|
|
+ for _, newRegion := range newData {
|
|
|
+ existingRegion, exists := regionMap[newRegion.Name]
|
|
|
+ if exists {
|
|
|
+ if existingRegion.Version != newRegion.Version {
|
|
|
+ return fmt.Errorf("版本冲突: 区域 '%s' 的当前版本=%d, 提交版本=%d", newRegion.Name, existingRegion.Version, newRegion.Version)
|
|
|
+ }
|
|
|
+ // 更新版本号
|
|
|
+ newRegion.Version++
|
|
|
+ regionMap[newRegion.Name] = newRegion
|
|
|
+ } else {
|
|
|
+ // 如果区域不存在，则直接添加（假设这是新增的区域）
|
|
|
+ newRegion.Version = 1 // 新增区域的初始版本号设为1
|
|
|
+ regionMap[newRegion.Name] = newRegion
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ // 将 map 转换回 slice
|
|
|
+ updatedRegions := make([]dao.Region, 0, len(regionMap))
|
|
|
+ for _, region := range regionMap {
|
|
|
+ updatedRegions = append(updatedRegions, region)
|
|
|
}
|
|
|
|
|
|
// 序列化数据
|
|
|
- data, err := json.MarshalIndent(parameter, "", " ")
|
|
|
+ data, err := json.MarshalIndent(updatedRegions, "", " ")
|
|
|
if err != nil {
|
|
|
return fmt.Errorf("JSON 序列化失败: %v", err)
|
|
|
}
|
|
|
@@ -150,27 +174,7 @@ func SaveData(path string, parameter interface{}) error {
|
|
|
|
|
|
// 使用原子操作替换原始文件
|
|
|
if err := os.Rename(tempFile.Name(), path); err != nil {
|
|
|
- // 将结构体转换为JSON字节切片
|
|
|
- jsonBytes, err := json.Marshal(parameter)
|
|
|
- if err != nil {
|
|
|
- return fmt.Errorf("Error marshalling to JSON: %v\n", err)
|
|
|
- }
|
|
|
-
|
|
|
- // 将字节切片转换为字符串
|
|
|
- jsonString := string(jsonBytes)
|
|
|
- // 打开或创建文件，并设置标志以覆盖原有内容
|
|
|
- file, err := os.OpenFile("output.txt", os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0644)
|
|
|
- if err != nil {
|
|
|
- fmt.Printf("无法打开或创建文件: %v\n", err)
|
|
|
- }
|
|
|
- defer file.Close() // 确保在main函数结束时关闭文件
|
|
|
-
|
|
|
- // 写入数据到文件
|
|
|
- _, err = file.WriteString(string(jsonString))
|
|
|
- if err != nil {
|
|
|
- fmt.Printf("写入文件失败: %v\n", err)
|
|
|
- }
|
|
|
- //return fmt.Errorf("替换文件失败,直接写入: %v", err)
|
|
|
+ return fmt.Errorf("替换文件失败: %v", err)
|
|
|
}
|
|
|
|
|
|
return nil
|
|
|
@@ -178,25 +182,236 @@ func SaveData(path string, parameter interface{}) error {
|
|
|
|
|
|
const (
|
|
|
maxRetries = 3 // 最大重试次数
|
|
|
+ readTimeout = 5 * time.Second // 读取超时时间
|
|
|
writeTimeout = 5 * time.Second // 写入超时时间
|
|
|
reconnectWait = 2 * time.Second // 重连等待时间
|
|
|
)
|
|
|
|
|
|
-func WriteDevice(frame []byte, conn net.Conn) error {
|
|
|
+// checkConnection 检查连接是否仍然有效
|
|
|
+func checkConnection(conn net.Conn) error {
|
|
|
+ probe := []byte{}
|
|
|
+ _, err := conn.Write(probe)
|
|
|
+ return err
|
|
|
+}
|
|
|
+
|
|
|
+// checkAndReconnect 检查是否需要重连，并在必要时执行重连
|
|
|
+func checkAndReconnect(conn net.Conn) (net.Conn, error) {
|
|
|
+ remoteAddr := conn.RemoteAddr().String()
|
|
|
+
|
|
|
+ // 关闭旧连接
|
|
|
+ if err := conn.Close(); err != nil {
|
|
|
+ logger.Get().Errorf("Failed to close connection: %v", err)
|
|
|
+ return nil, err
|
|
|
+ }
|
|
|
+
|
|
|
+ // 解析原始连接的远程地址和网络接口
|
|
|
+ addr, networkInterface, err := parseRemoteAddr(remoteAddr)
|
|
|
+ if err != nil {
|
|
|
+ logger.Get().Errorf("Failed to parse remote address: %v", err)
|
|
|
+ return nil, err
|
|
|
+ }
|
|
|
+
|
|
|
+ // 尝试重新建立连接
|
|
|
+ newConn, err := net.Dial("tcp", fmt.Sprintf("%s%%%s", addr, networkInterface))
|
|
|
+ if err != nil {
|
|
|
+ logger.Get().Errorf("Reconnect failed: %v", err)
|
|
|
+ return nil, err
|
|
|
+ }
|
|
|
+
|
|
|
+ logger.Get().Warnf("Successfully reconnected to %s", remoteAddr)
|
|
|
+ return newConn, nil
|
|
|
+}
|
|
|
+
|
|
|
+// isConnectionClosedError 检查错误是否表明连接被对端强制关闭或已关闭
|
|
|
+func isConnectionClosedError(err error) bool {
|
|
|
+ if ne, ok := err.(*net.OpError); ok {
|
|
|
+ return strings.Contains(ne.Err.Error(), "forcibly closed") ||
|
|
|
+ strings.Contains(ne.Err.Error(), "broken pipe") ||
|
|
|
+ strings.Contains(ne.Err.Error(), "connection reset") ||
|
|
|
+ strings.Contains(ne.Err.Error(), "use of closed network connection")
|
|
|
+ }
|
|
|
+ return false
|
|
|
+}
|
|
|
+
|
|
|
+// setDeadlineWithRetry 使用重试机制设置读写截止时间
|
|
|
+func setDeadlineWithRetry(conn net.Conn, timeout time.Duration, operation string) error {
|
|
|
for attempts := 0; attempts < maxRetries; attempts++ {
|
|
|
+ var err error
|
|
|
+ switch operation {
|
|
|
+ case "read":
|
|
|
+ err = conn.SetReadDeadline(time.Now().Add(timeout))
|
|
|
+ case "write":
|
|
|
+ err = conn.SetWriteDeadline(time.Now().Add(timeout))
|
|
|
+ default:
|
|
|
+ return fmt.Errorf("invalid operation: %s", operation)
|
|
|
+ }
|
|
|
+
|
|
|
+ if err == nil {
|
|
|
+ return nil
|
|
|
+ }
|
|
|
+
|
|
|
+ if isConnectionClosedError(err) {
|
|
|
+ logger.Get().Warnf("Set %s deadline failed due to closed connection, retrying (%d/%d)", operation, attempts+1, maxRetries)
|
|
|
+
|
|
|
+ var newConn net.Conn
|
|
|
+ var reconnErr error
|
|
|
+
|
|
|
+ newConn, reconnErr = checkAndReconnect(conn)
|
|
|
+ if reconnErr != nil {
|
|
|
+ time.Sleep(reconnectWait) // 等待一段时间后重试
|
|
|
+ continue // 继续下一次重试
|
|
|
+ }
|
|
|
+
|
|
|
+ conn = newConn
|
|
|
+ continue // 重试设置截止时间
|
|
|
+ }
|
|
|
+
|
|
|
+ logger.Get().Errorf("Set %s deadline failed: %v", operation, err)
|
|
|
+ return fmt.Errorf("set %s deadline failed after %d retries: %v", operation, attempts+1, err)
|
|
|
+ }
|
|
|
+
|
|
|
+ return fmt.Errorf("failed to set %s deadline after %d retries", operation, maxRetries)
|
|
|
+}
|
|
|
+
|
|
|
+// readWithRetry 使用重试机制进行读取操作
|
|
|
+func readWithRetry(buffer []byte, conn net.Conn) (int, error) {
|
|
|
+ for attempts := 0; attempts < maxRetries; attempts++ {
|
|
|
+ if err := setDeadlineWithRetry(conn, readTimeout, "read"); err != nil {
|
|
|
+ return 0, err
|
|
|
+ }
|
|
|
+
|
|
|
+ // 检查连接是否仍然有效
|
|
|
+ if err := checkConnection(conn); err != nil {
|
|
|
+ if isConnectionClosedError(err) {
|
|
|
+ logger.Get().Warnf("Connection check failed due to closed connection, retrying (%d/%d)", attempts+1, maxRetries)
|
|
|
+
|
|
|
+ var newConn net.Conn
|
|
|
+ var reconnErr error
|
|
|
+
|
|
|
+ newConn, reconnErr = checkAndReconnect(conn)
|
|
|
+ if reconnErr != nil {
|
|
|
+ time.Sleep(reconnectWait) // 等待一段时间后重试
|
|
|
+ continue // 继续下一次重试
|
|
|
+ }
|
|
|
+
|
|
|
+ conn = newConn
|
|
|
+ continue // 重试读取
|
|
|
+ }
|
|
|
+
|
|
|
+ logger.Get().Errorf("Connection check failed: %v", err)
|
|
|
+ return 0, fmt.Errorf("connection check failed after %d retries: %v", attempts+1, err)
|
|
|
+ }
|
|
|
+
|
|
|
+ n, err := conn.Read(buffer)
|
|
|
+ if err == nil {
|
|
|
+ return n, nil
|
|
|
+ }
|
|
|
+
|
|
|
+ if isConnectionClosedError(err) {
|
|
|
+ logger.Get().Warnf("Read failed due to closed connection, retrying (%d/%d)", attempts+1, maxRetries)
|
|
|
+
|
|
|
+ var newConn net.Conn
|
|
|
+ var reconnErr error
|
|
|
+
|
|
|
+ newConn, reconnErr = checkAndReconnect(conn)
|
|
|
+ if reconnErr != nil {
|
|
|
+ time.Sleep(reconnectWait) // 等待一段时间后重试
|
|
|
+ continue // 继续下一次重试
|
|
|
+ }
|
|
|
+
|
|
|
+ conn = newConn
|
|
|
+ continue // 重试读取
|
|
|
+ }
|
|
|
+
|
|
|
+ logger.Get().Errorf("Read failed: %v", err)
|
|
|
+ return 0, fmt.Errorf("read failed after %d retries: %v", attempts+1, err)
|
|
|
+ }
|
|
|
+
|
|
|
+ return 0, fmt.Errorf("failed to read after %d retries", maxRetries)
|
|
|
+}
|
|
|
+
|
|
|
+// writeWithRetry 使用重试机制进行写入操作
|
|
|
+func writeWithRetry(frame []byte, conn net.Conn) error {
|
|
|
+ for attempts := 0; attempts < maxRetries; attempts++ {
|
|
|
+ if err := setDeadlineWithRetry(conn, writeTimeout, "write"); err != nil {
|
|
|
+ return err
|
|
|
+ }
|
|
|
+
|
|
|
+ // 检查连接是否仍然有效
|
|
|
+ if err := checkConnection(conn); err != nil {
|
|
|
+ if isConnectionClosedError(err) {
|
|
|
+ logger.Get().Warnf("Connection check failed due to closed connection, retrying (%d/%d)", attempts+1, maxRetries)
|
|
|
+
|
|
|
+ var newConn net.Conn
|
|
|
+ var reconnErr error
|
|
|
+
|
|
|
+ newConn, reconnErr = checkAndReconnect(conn)
|
|
|
+ if reconnErr != nil {
|
|
|
+ time.Sleep(reconnectWait) // 等待一段时间后重试
|
|
|
+ continue // 继续下一次重试
|
|
|
+ }
|
|
|
+
|
|
|
+ conn = newConn
|
|
|
+ continue // 重试写入
|
|
|
+ }
|
|
|
+
|
|
|
+ logger.Get().Errorf("Connection check failed: %v", err)
|
|
|
+ return fmt.Errorf("connection check failed after %d retries: %v", attempts+1, err)
|
|
|
+ }
|
|
|
+
|
|
|
_, err := conn.Write(frame)
|
|
|
if err == nil {
|
|
|
return nil
|
|
|
}
|
|
|
|
|
|
- // 检查是否是对端强制关闭连接、管道破裂、连接重置或使用了已关闭的网络连接的错误
|
|
|
- if ne, ok := err.(*net.OpError); ok &&
|
|
|
- (strings.Contains(ne.Err.Error(), "forcibly closed") ||
|
|
|
- strings.Contains(ne.Err.Error(), "broken pipe") ||
|
|
|
- strings.Contains(ne.Err.Error(), "connection reset") ||
|
|
|
- strings.Contains(strings.ToLower(ne.Err.Error()), "use of closed network connection")) {
|
|
|
+ if isConnectionClosedError(err) {
|
|
|
+ logger.Get().Warnf("Write failed due to closed connection, retrying (%d/%d)", attempts+1, maxRetries)
|
|
|
|
|
|
- logger.Get().Warnf("Connection issue detected, retrying (%d/%d): %v", attempts+1, maxRetries, err)
|
|
|
+ var newConn net.Conn
|
|
|
+ var reconnErr error
|
|
|
+
|
|
|
+ newConn, reconnErr = checkAndReconnect(conn)
|
|
|
+ if reconnErr != nil {
|
|
|
+ time.Sleep(reconnectWait) // 等待一段时间后重试
|
|
|
+ continue // 继续下一次重试
|
|
|
+ }
|
|
|
+
|
|
|
+ conn = newConn
|
|
|
+ continue // 重试写入
|
|
|
+ }
|
|
|
+
|
|
|
+ logger.Get().Errorf("Write failed: %v", err)
|
|
|
+ return fmt.Errorf("write failed after %d retries: %v", attempts+1, err)
|
|
|
+ }
|
|
|
+
|
|
|
+ return fmt.Errorf("failed to write after %d retries", maxRetries)
|
|
|
+}
|
|
|
+
|
|
|
+// ReadDevice 从设备读取数据
|
|
|
+func ReadDevice(buffer []byte, conn net.Conn) (int, error) {
|
|
|
+ return readWithRetry(buffer, conn)
|
|
|
+}
|
|
|
+
|
|
|
+// WriteDevice1 向设备写入数据
|
|
|
+func WriteDevice1(frame []byte, conn net.Conn) error {
|
|
|
+ return writeWithRetry(frame, conn)
|
|
|
+}
|
|
|
+
|
|
|
+func WriteDevice(frame []byte, conn net.Conn) error {
|
|
|
+ for attempts := 0; attempts < maxRetries; attempts++ {
|
|
|
+ if err := conn.SetWriteDeadline(time.Now().Add(writeTimeout)); err != nil {
|
|
|
+ logger.Get().Errorf("Set write deadline failed: %v", err)
|
|
|
+ return err
|
|
|
+ }
|
|
|
+
|
|
|
+ _, err := conn.Write(frame)
|
|
|
+ if err == nil {
|
|
|
+ return nil
|
|
|
+ }
|
|
|
+
|
|
|
+ // 检查是否是对端强制关闭连接的错误
|
|
|
+ if ne, ok := err.(*net.OpError); ok && (strings.Contains(ne.Err.Error(), "forcibly closed") || strings.Contains(ne.Err.Error(), "broken pipe") || strings.Contains(ne.Err.Error(), "connection reset")) {
|
|
|
+ logger.Get().Warnf("Connection forcibly closed by peer, retrying (%d/%d)", attempts+1, maxRetries)
|
|
|
|
|
|
// 关闭旧连接
|
|
|
if err := conn.Close(); err != nil {
|
|
|
@@ -224,11 +439,12 @@ func WriteDevice(frame []byte, conn net.Conn) error {
|
|
|
continue // 重试写入
|
|
|
}
|
|
|
|
|
|
- // 如果不是上述情况，则直接返回错误
|
|
|
+ // 如果不是对端强制关闭连接的错误，则直接返回错误
|
|
|
logger.Get().Errorf("Write failed: %v", err)
|
|
|
return fmt.Errorf("write failed after %d retries: %v", attempts+1, err)
|
|
|
}
|
|
|
- return fmt.Errorf("write failed after maximum number of retries")
|
|
|
+
|
|
|
+ return fmt.Errorf("failed to write after %d retries", maxRetries)
|
|
|
}
|
|
|
|
|
|
// 解析远程地址，提取 IP 地址和网络接口名称
|
