Merge remote-tracking branch 'origin/tzskasrs-2' into tzskasrs-2

tzsk

8 天以前 6fd6fd0b4e90a816989632506934bdfdb431f47f

 src/main/java/com/zy/system/entity/license/CustomLicenseManager.java

@@ -134,12 +134,12 @@
        if(expectedCheckModel != null && serverCheckModel != null){
            //校验IP地址
            if(!checkIpAddress(expectedCheckModel.getIpAddress(),serverCheckModel.getIpAddress())){
                throw new LicenseContentException("当前服务器的IP没在授权范围内");
                //throw new LicenseContentException("当前服务器的IP没在授权范围内");
            }

            //校验Mac地址
            if(!checkIpAddress(expectedCheckModel.getMacAddress(),serverCheckModel.getMacAddress())){
                throw new LicenseContentException("当前服务器的Mac地址没在授权范围内");
                //throw new LicenseContentException("当前服务器的Mac地址没在授权范围内");
            }

            //校验主板序列号