From 97e4f5c460d37ae3eb9c03396dd9dd6bb3f970cd Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期三, 22 十一月 2023 11:33:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/authorize/common/AuthorizeUtil.java | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/authorize/common/AuthorizeUtil.java b/ruoyi-system/src/main/java/com/ruoyi/authorize/common/AuthorizeUtil.java
index bbe2bd7..ba7446a 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/authorize/common/AuthorizeUtil.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/authorize/common/AuthorizeUtil.java
@@ -1,10 +1,8 @@
package com.ruoyi.authorize.common;
-import com.sun.org.apache.xerces.internal.impl.dv.util.HexBin;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.codec.binary.Hex;
import org.apache.commons.compress.utils.IOUtils;
-
import java.io.*;
import java.net.InetAddress;
import java.net.NetworkInterface;
@@ -13,7 +11,6 @@
import java.util.Date;
import java.util.GregorianCalendar;
import java.util.Scanner;
-
import javax.crypto.Cipher;
import javax.crypto.KeyGenerator;
import javax.crypto.SecretKey;
@@ -22,7 +19,7 @@
import javax.crypto.spec.SecretKeySpec;
import javax.xml.bind.DatatypeConverter;
-@Slf4j(topic="Authorize")
+@Slf4j(topic="authorize")
public class AuthorizeUtil {
public static String MachineCode="";
@@ -39,9 +36,9 @@
public static void main(String[] args) {
AuthorizeUtil ss = new AuthorizeUtil();
- System.out.println("sysStr " + ss.parsLicense());
- System.out.println("MachineCode " + ss.getMachineCode());
- System.out.println("CPUCode " + ss.getCPUCode());
+ log.debug("sysStr " + ss.parsLicense());
+ log.debug("MachineCode " + ss.getMachineCode());
+ log.debug("CPUCode " + ss.getCPUCode());
//String codeString=ss.parsLicense("b1db709f19d9769e536e2e29888e38b2");
//System.out.println(codeString);
//ss.makeTempLicense();
@@ -106,7 +103,9 @@
} catch (Exception e) {
log.error("鑾峰彇鏈哄櫒鐮佸紓甯革細"+e.getMessage());
}
- return Md5Utils.hash(sb.toString().toUpperCase());
+ String code = Md5Utils.hash(sb.toString().toUpperCase());
+ log.debug("鏈哄櫒鐮�:"+code);
+ return code;
}
public static String getCPUCode() {
--
Gitblit v1.9.3