Merge branch 'xinnan-tech:main' into feature/doubao-tts

main/manager-api/src/main/java/xiaozhi/common/constant/Constant.java

@@ -177,5 +177,5 @@ public interface Constant {
     /**
      * 版本号
      */
-    public static final String VERSION = "0.3.12";
+    public static final String VERSION = "0.3.13";
 }

main/manager-api/src/main/java/xiaozhi/modules/device/controller/OTAController.java

@@ -28,7 +28,6 @@ import xiaozhi.modules.device.dto.DeviceReportReqDTO;
 import xiaozhi.modules.device.dto.DeviceReportRespDTO;
 import xiaozhi.modules.device.entity.DeviceEntity;
 import xiaozhi.modules.device.service.DeviceService;
-import xiaozhi.modules.device.utils.NetworkUtil;
 import xiaozhi.modules.sys.service.SysParamsService;
 
 @Tag(name = "设备管理", description = "OTA 相关接口")
@@ -53,7 +52,7 @@ public class OTAController {
             clientId = deviceId;
         }
         String macAddress = deviceReportReqDTO.getMacAddress();
-        boolean macAddressValid = NetworkUtil.isMacAddressValid(macAddress);
+        boolean macAddressValid = isMacAddressValid(macAddress);
         // 设备Id和Mac地址应是一致的, 并且必须需要application字段
         if (!deviceId.equals(macAddress) || !macAddressValid || deviceReportReqDTO.getApplication() == null) {
             return createResponse(DeviceReportRespDTO.createError("Invalid OTA request"));
@@ -102,4 +101,19 @@ public class OTAController {
                 .contentLength(jsonBytes.length)
                 .body(json);
     }
+
+    /**
+     * 简单判断mac地址是否有效（非严格）
+     * 
+     * @param macAddress
+     * @return
+     */
+    private boolean isMacAddressValid(String macAddress) {
+        if (StringUtils.isBlank(macAddress)) {
+            return false;
+        }
+        // MAC地址通常为12位十六进制数字，可以包含冒号或连字符分隔符
+        String macPattern = "^([0-9A-Za-z]{2}[:-]){5}([0-9A-Za-z]{2})$";
+        return macAddress.matches(macPattern);
+    }
 }

main/manager-api/src/main/java/xiaozhi/modules/device/utils/NetworkUtil.java

@@ -1,34 +0,0 @@
-package xiaozhi.modules.device.utils;
-
-import java.util.regex.Pattern;
-
-import org.apache.commons.lang3.StringUtils;
-
-/**
- * 网络工具类
- */
-public class NetworkUtil {
-    /**
-     * MAC地址正则表达式
-     */
-    private static final Pattern macPattern = Pattern.compile("^([0-9A-Fa-f]{2}[:-]){5}([0-9A-Fa-f]{2})$");
-
-    /**
-     * 判断MAC地址是否合法
-     */
-    public static boolean isMacAddressValid(String mac) {
-        if (StringUtils.isBlank(mac)) {
-            return false;
-        }
-        // 正则校验格式
-        if (!macPattern.matcher(mac).matches()) {
-            return false;
-        }
-        // 校验MAC地址是否为单播地址
-        String normalized = mac.toLowerCase();
-        String[] parts = normalized.split("[:-]");
-        int firstByte = Integer.parseInt(parts[0], 16);
-        return (firstByte & 1) == 0; // 最低位为0表示单播地址，合法
-    }
-
-}