From 7ef3763a14d23de4ac85790abf32cbbee35410f9 Mon Sep 17 00:00:00 2001
From: "768863620@qq.com" <768863620@qq.com>
Date: Wed, 22 May 2024 17:13:58 +0800
Subject: [PATCH] no message

---
 .../modules/license/AGxServerInfos.java       |  2 -
 .../modules/license/LicenseValidate.java      | 47 ++-----------------
 .../modules/license/domain/LicenseCheck.java  | 23 +--------
 3 files changed, 6 insertions(+), 66 deletions(-)

diff --git a/youchain-system/src/main/java/com/youchain/modules/license/AGxServerInfos.java b/youchain-system/src/main/java/com/youchain/modules/license/AGxServerInfos.java
index 0349b74..940813a 100644
--- a/youchain-system/src/main/java/com/youchain/modules/license/AGxServerInfos.java
+++ b/youchain-system/src/main/java/com/youchain/modules/license/AGxServerInfos.java
@@ -21,8 +21,6 @@ public abstract class AGxServerInfos {
 
         LicenseCheck result = new LicenseCheck();
         try {
-            result.setIpAddress(this.getIpAddress());
-            result.setMacAddress(this.getMacAddress());
             result.setCpuSerial(this.getCPUSerial());
             result.setMainBoardSerial(this.getMainBoardSerial());
         }catch (Exception e){
diff --git a/youchain-system/src/main/java/com/youchain/modules/license/LicenseValidate.java b/youchain-system/src/main/java/com/youchain/modules/license/LicenseValidate.java
index 244a722..7a242b2 100644
--- a/youchain-system/src/main/java/com/youchain/modules/license/LicenseValidate.java
+++ b/youchain-system/src/main/java/com/youchain/modules/license/LicenseValidate.java
@@ -40,21 +40,9 @@ public class LicenseValidate {
         LicenseCheck key_price = JSONUtil.toBean(rsaResult, LicenseCheck.class);
         LicenseCheck system_price = getDeviceInfo();
 
-        boolean isEQ_ipAddress=Arrays.equals(key_price.getIpAddress().toArray(),system_price.getIpAddress().toArray());
-        if(isEQ_ipAddress){
-            log.error("IP匹配成功");
-        }else{
-            log.error("IP匹配失败");
-            throw new BadRequestException("IP匹配失败");
-        }
 
-        boolean isEQ_macAddress=Arrays.equals(key_price.getMacAddress().toArray(),system_price.getMacAddress().toArray());
-        if(isEQ_macAddress){
-            log.error("MAC匹配成功");
-        }else{
-            log.error("MAC匹配失败");
-            throw new BadRequestException("MAC匹配失败");
-        }
+
+
         if(key_price.getMainBoardSerial().equals(system_price.getMainBoardSerial())){
             log.error("主板匹配成功");
         }else{
@@ -103,21 +91,8 @@ public class LicenseValidate {
         LicenseCheck key_price = JSONUtil.toBean(rsaResult, LicenseCheck.class);
         LicenseCheck system_price = getDeviceInfo();
 
-        boolean isEQ_ipAddress=Arrays.equals(key_price.getIpAddress().toArray(),system_price.getIpAddress().toArray());
-        if(isEQ_ipAddress){
-            log.error("IP匹配成功");
-        }else{
-            log.error("IP匹配失败");
-            throw new BadRequestException("IP匹配失败");
-        }
 
-        boolean isEQ_macAddress=Arrays.equals(key_price.getMacAddress().toArray(),system_price.getMacAddress().toArray());
-        if(isEQ_macAddress){
-            log.error("MAC匹配成功");
-        }else{
-            log.error("MAC匹配失败");
-            throw new BadRequestException("MAC匹配失败");
-        }
+
         if(key_price.getMainBoardSerial().equals(system_price.getMainBoardSerial())){
             log.error("主板匹配成功");
         }else{
@@ -162,21 +137,9 @@ public class LicenseValidate {
         LicenseCheck key_price = JSONUtil.toBean(rsaResult, LicenseCheck.class);
         LicenseCheck system_price = getDeviceInfo();
 
-        boolean isEQ_ipAddress=Arrays.equals(key_price.getIpAddress().toArray(),system_price.getIpAddress().toArray());
-        if(isEQ_ipAddress){
-            log.error("IP匹配成功");
-        }else{
-            log.error("IP匹配失败");
-            throw new BadRequestException("IP匹配失败");
-        }
 
-        boolean isEQ_macAddress=Arrays.equals(key_price.getMacAddress().toArray(),system_price.getMacAddress().toArray());
-        if(isEQ_macAddress){
-            log.error("MAC匹配成功");
-        }else{
-            log.error("MAC匹配失败");
-            throw new BadRequestException("MAC匹配失败");
-        }
+
+
         if(key_price.getMainBoardSerial().equals(system_price.getMainBoardSerial())){
             log.error("主板匹配成功");
         }else{
diff --git a/youchain-system/src/main/java/com/youchain/modules/license/domain/LicenseCheck.java b/youchain-system/src/main/java/com/youchain/modules/license/domain/LicenseCheck.java
index 401d2a7..fbba75d 100644
--- a/youchain-system/src/main/java/com/youchain/modules/license/domain/LicenseCheck.java
+++ b/youchain-system/src/main/java/com/youchain/modules/license/domain/LicenseCheck.java
@@ -5,14 +5,7 @@ import java.util.List;
 
 public class LicenseCheck implements Serializable {
 
-    /**
-     * 可被允许的IP地址
-     */
-    private List<String> ipAddress;
-    /**
-     * 可被允许的mac地址
-     */
-    private List<String> macAddress;
+
 
     /**
      * 可被允许的CPU序列号
@@ -39,20 +32,6 @@ public class LicenseCheck implements Serializable {
 
     }
 
-    public List<String> getIpAddress() {
-        return ipAddress;
-    }
-    public void setIpAddress(List<String> ipAddress) {
-        this.ipAddress = ipAddress;
-    }
-
-    public List<String> getMacAddress() {
-        return macAddress;
-    }
-
-    public void setMacAddress(List<String> macAddress) {
-        this.macAddress = macAddress;
-    }
 
     public String getCpuSerial() {
         return cpuSerial;