From 992b2dad3bd3291a564a6a8b4ac644a9275a7823 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期四, 26 三月 2026 10:02:13 +0800
Subject: [PATCH] 操作日志记录操作人
---
src/main/java/com/zy/system/entity/license/CustomLicenseManager.java | 43 +++++++++++++++++++++++--------------------
1 files changed, 23 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/zy/system/entity/license/CustomLicenseManager.java b/src/main/java/com/zy/system/entity/license/CustomLicenseManager.java
index 36d042f..1ce68a7 100644
--- a/src/main/java/com/zy/system/entity/license/CustomLicenseManager.java
+++ b/src/main/java/com/zy/system/entity/license/CustomLicenseManager.java
@@ -1,5 +1,6 @@
package com.zy.system.entity.license;
+import com.alibaba.fastjson.JSON;
import com.core.common.Cools;
import de.schlichtherle.license.*;
import de.schlichtherle.xml.GenericCertificate;
@@ -122,30 +123,32 @@
//2. 鐒跺悗鏍￠獙鑷畾涔夌殑License鍙傛暟
//License涓彲琚厑璁哥殑鍙傛暟淇℃伅
- LicenseCheck expectedCheckModel = (LicenseCheck) content.getExtra();
+ Object extra = content.getExtra();
+ String text = ((String) extra).trim();
+ LicenseCheck expectedCheckModel = JSON.parseObject(text, LicenseCheck.class);
//褰撳墠鏈嶅姟鍣ㄧ湡瀹炵殑鍙傛暟淇℃伅
LicenseCheck serverCheckModel = getServerInfos();
if (expectedCheckModel != null && serverCheckModel != null) {
- //鏍￠獙IP鍦板潃
- if (!checkIpAddress(expectedCheckModel.getIpAddress(), serverCheckModel.getIpAddress())) {
- throw new LicenseContentException("褰撳墠鏈嶅姟鍣ㄧ殑IP娌″湪鎺堟潈鑼冨洿鍐�");
- }
-
- //鏍￠獙Mac鍦板潃
- if (!checkIpAddress(expectedCheckModel.getMacAddress(), serverCheckModel.getMacAddress())) {
- throw new LicenseContentException("褰撳墠鏈嶅姟鍣ㄧ殑Mac鍦板潃娌″湪鎺堟潈鑼冨洿鍐�");
- }
-
- //鏍￠獙涓绘澘搴忓垪鍙�
- if (!checkSerial(expectedCheckModel.getMainBoardSerial(), serverCheckModel.getMainBoardSerial())) {
- throw new LicenseContentException("褰撳墠鏈嶅姟鍣ㄧ殑涓绘澘搴忓垪鍙锋病鍦ㄦ巿鏉冭寖鍥村唴");
- }
-
- //鏍￠獙CPU搴忓垪鍙�
- if (!checkSerial(expectedCheckModel.getCpuSerial(), serverCheckModel.getCpuSerial())) {
- throw new LicenseContentException("褰撳墠鏈嶅姟鍣ㄧ殑CPU搴忓垪鍙锋病鍦ㄦ巿鏉冭寖鍥村唴");
- }
+// //鏍￠獙IP鍦板潃
+// if (!checkIpAddress(expectedCheckModel.getIpAddress(), serverCheckModel.getIpAddress())) {
+// throw new LicenseContentException("褰撳墠鏈嶅姟鍣ㄧ殑IP娌″湪鎺堟潈鑼冨洿鍐�");
+// }
+//
+// //鏍￠獙Mac鍦板潃
+// if (!checkIpAddress(expectedCheckModel.getMacAddress(), serverCheckModel.getMacAddress())) {
+// throw new LicenseContentException("褰撳墠鏈嶅姟鍣ㄧ殑Mac鍦板潃娌″湪鎺堟潈鑼冨洿鍐�");
+// }
+//
+// //鏍￠獙涓绘澘搴忓垪鍙�
+// if (!checkSerial(expectedCheckModel.getMainBoardSerial(), serverCheckModel.getMainBoardSerial())) {
+// throw new LicenseContentException("褰撳墠鏈嶅姟鍣ㄧ殑涓绘澘搴忓垪鍙锋病鍦ㄦ巿鏉冭寖鍥村唴");
+// }
+//
+// //鏍￠獙CPU搴忓垪鍙�
+// if (!checkSerial(expectedCheckModel.getCpuSerial(), serverCheckModel.getCpuSerial())) {
+// throw new LicenseContentException("褰撳墠鏈嶅姟鍣ㄧ殑CPU搴忓垪鍙锋病鍦ㄦ巿鏉冭寖鍥村唴");
+// }
} else {
throw new LicenseContentException("涓嶈兘鑾峰彇鏈嶅姟鍣ㄧ‖浠朵俊鎭�");
}
--
Gitblit v1.9.1