From ecd5c8086bc9e79fbd51a182aade4510bea4b49f Mon Sep 17 00:00:00 2001 From: cheney Date: Wed, 13 May 2026 17:37:36 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E5=8C=85=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- device-fingerprint-tool/pom.xml | 4 ++-- .../sunyard/cisd/{ => device/tool}/DeviceFingerprint.java | 2 +- .../cisd/{ => device/tool}/DeviceFingerprintService.java | 2 +- .../main/java/com/sunyard/cisd/{ => device/tool}/Main.java | 2 +- .../java/com/sunyard/cisd/{ => device/tool}/SM2Util.java | 2 +- .../java/com/sunyard/cisd/{ => device/tool}/SM3Util.java | 2 +- .../com/sunyard/cisd/{ => device/tool}/SdfDeviceInfo.java | 5 +---- .../com/sunyard/cisd/{ => device/tool}/SdfNativeLibrary.java | 2 +- .../src/test/java/com/sunyard/cisd/SM2UtilTest.java | 1 + 9 files changed, 10 insertions(+), 12 deletions(-) rename device-fingerprint-tool/src/main/java/com/sunyard/cisd/{ => device/tool}/DeviceFingerprint.java (98%) rename device-fingerprint-tool/src/main/java/com/sunyard/cisd/{ => device/tool}/DeviceFingerprintService.java (99%) rename device-fingerprint-tool/src/main/java/com/sunyard/cisd/{ => device/tool}/Main.java (99%) rename device-fingerprint-tool/src/main/java/com/sunyard/cisd/{ => device/tool}/SM2Util.java (99%) rename device-fingerprint-tool/src/main/java/com/sunyard/cisd/{ => device/tool}/SM3Util.java (99%) rename device-fingerprint-tool/src/main/java/com/sunyard/cisd/{ => device/tool}/SdfDeviceInfo.java (90%) rename device-fingerprint-tool/src/main/java/com/sunyard/cisd/{ => device/tool}/SdfNativeLibrary.java (92%) diff --git a/device-fingerprint-tool/pom.xml b/device-fingerprint-tool/pom.xml index debeff0..76be577 100644 --- a/device-fingerprint-tool/pom.xml +++ b/device-fingerprint-tool/pom.xml @@ -80,7 +80,7 @@ true - com.sunyard.cisd.Main + com.sunyard.cisd.device.tool.Main @@ -95,7 +95,7 @@ - com.sunyard.cisd.Main + com.sunyard.cisd.device.tool.Main diff --git a/device-fingerprint-tool/src/main/java/com/sunyard/cisd/DeviceFingerprint.java b/device-fingerprint-tool/src/main/java/com/sunyard/cisd/device/tool/DeviceFingerprint.java similarity index 98% rename from device-fingerprint-tool/src/main/java/com/sunyard/cisd/DeviceFingerprint.java rename to device-fingerprint-tool/src/main/java/com/sunyard/cisd/device/tool/DeviceFingerprint.java index 0075555..9917afc 100644 --- a/device-fingerprint-tool/src/main/java/com/sunyard/cisd/DeviceFingerprint.java +++ b/device-fingerprint-tool/src/main/java/com/sunyard/cisd/device/tool/DeviceFingerprint.java @@ -1,4 +1,4 @@ -package com.sunyard.cisd; +package com.sunyard.cisd.device.tool; public class DeviceFingerprint { private String motherboardSerialNumber; diff --git a/device-fingerprint-tool/src/main/java/com/sunyard/cisd/DeviceFingerprintService.java b/device-fingerprint-tool/src/main/java/com/sunyard/cisd/device/tool/DeviceFingerprintService.java similarity index 99% rename from device-fingerprint-tool/src/main/java/com/sunyard/cisd/DeviceFingerprintService.java rename to device-fingerprint-tool/src/main/java/com/sunyard/cisd/device/tool/DeviceFingerprintService.java index 1afa471..e290dfd 100644 --- a/device-fingerprint-tool/src/main/java/com/sunyard/cisd/DeviceFingerprintService.java +++ b/device-fingerprint-tool/src/main/java/com/sunyard/cisd/device/tool/DeviceFingerprintService.java @@ -1,4 +1,4 @@ -package com.sunyard.cisd; +package com.sunyard.cisd.device.tool; import com.sun.jna.Native; import com.sun.jna.Pointer; diff --git a/device-fingerprint-tool/src/main/java/com/sunyard/cisd/Main.java b/device-fingerprint-tool/src/main/java/com/sunyard/cisd/device/tool/Main.java similarity index 99% rename from device-fingerprint-tool/src/main/java/com/sunyard/cisd/Main.java rename to device-fingerprint-tool/src/main/java/com/sunyard/cisd/device/tool/Main.java index 241dfde..fcb5b40 100644 --- a/device-fingerprint-tool/src/main/java/com/sunyard/cisd/Main.java +++ b/device-fingerprint-tool/src/main/java/com/sunyard/cisd/device/tool/Main.java @@ -1,4 +1,4 @@ -package com.sunyard.cisd; +package com.sunyard.cisd.device.tool; import java.nio.charset.StandardCharsets; import java.security.PublicKey; diff --git a/device-fingerprint-tool/src/main/java/com/sunyard/cisd/SM2Util.java b/device-fingerprint-tool/src/main/java/com/sunyard/cisd/device/tool/SM2Util.java similarity index 99% rename from device-fingerprint-tool/src/main/java/com/sunyard/cisd/SM2Util.java rename to device-fingerprint-tool/src/main/java/com/sunyard/cisd/device/tool/SM2Util.java index 6870135..0bc7755 100644 --- a/device-fingerprint-tool/src/main/java/com/sunyard/cisd/SM2Util.java +++ b/device-fingerprint-tool/src/main/java/com/sunyard/cisd/device/tool/SM2Util.java @@ -1,4 +1,4 @@ -package com.sunyard.cisd; +package com.sunyard.cisd.device.tool; import org.bouncycastle.jce.ECNamedCurveTable; import org.bouncycastle.jce.provider.BouncyCastleProvider; diff --git a/device-fingerprint-tool/src/main/java/com/sunyard/cisd/SM3Util.java b/device-fingerprint-tool/src/main/java/com/sunyard/cisd/device/tool/SM3Util.java similarity index 99% rename from device-fingerprint-tool/src/main/java/com/sunyard/cisd/SM3Util.java rename to device-fingerprint-tool/src/main/java/com/sunyard/cisd/device/tool/SM3Util.java index 6628d22..100a630 100644 --- a/device-fingerprint-tool/src/main/java/com/sunyard/cisd/SM3Util.java +++ b/device-fingerprint-tool/src/main/java/com/sunyard/cisd/device/tool/SM3Util.java @@ -1,4 +1,4 @@ -package com.sunyard.cisd; +package com.sunyard.cisd.device.tool; import org.bouncycastle.crypto.digests.SM3Digest; import org.bouncycastle.util.encoders.Hex; diff --git a/device-fingerprint-tool/src/main/java/com/sunyard/cisd/SdfDeviceInfo.java b/device-fingerprint-tool/src/main/java/com/sunyard/cisd/device/tool/SdfDeviceInfo.java similarity index 90% rename from device-fingerprint-tool/src/main/java/com/sunyard/cisd/SdfDeviceInfo.java rename to device-fingerprint-tool/src/main/java/com/sunyard/cisd/device/tool/SdfDeviceInfo.java index e28d5a9..b22e12b 100644 --- a/device-fingerprint-tool/src/main/java/com/sunyard/cisd/SdfDeviceInfo.java +++ b/device-fingerprint-tool/src/main/java/com/sunyard/cisd/device/tool/SdfDeviceInfo.java @@ -1,11 +1,8 @@ -package com.sunyard.cisd; +package com.sunyard.cisd.device.tool; import com.sun.jna.Structure; import lombok.Data; -import java.util.Arrays; -import java.util.List; - @Data @Structure.FieldOrder({ "issuerName", diff --git a/device-fingerprint-tool/src/main/java/com/sunyard/cisd/SdfNativeLibrary.java b/device-fingerprint-tool/src/main/java/com/sunyard/cisd/device/tool/SdfNativeLibrary.java similarity index 92% rename from device-fingerprint-tool/src/main/java/com/sunyard/cisd/SdfNativeLibrary.java rename to device-fingerprint-tool/src/main/java/com/sunyard/cisd/device/tool/SdfNativeLibrary.java index 2848f9a..ef3d559 100644 --- a/device-fingerprint-tool/src/main/java/com/sunyard/cisd/SdfNativeLibrary.java +++ b/device-fingerprint-tool/src/main/java/com/sunyard/cisd/device/tool/SdfNativeLibrary.java @@ -1,4 +1,4 @@ -package com.sunyard.cisd; +package com.sunyard.cisd.device.tool; import com.sun.jna.Library; import com.sun.jna.Pointer; diff --git a/device-fingerprint-tool/src/test/java/com/sunyard/cisd/SM2UtilTest.java b/device-fingerprint-tool/src/test/java/com/sunyard/cisd/SM2UtilTest.java index 4b8e664..d0bf792 100644 --- a/device-fingerprint-tool/src/test/java/com/sunyard/cisd/SM2UtilTest.java +++ b/device-fingerprint-tool/src/test/java/com/sunyard/cisd/SM2UtilTest.java @@ -1,5 +1,6 @@ package com.sunyard.cisd; +import com.sunyard.cisd.device.tool.SM2Util; import org.junit.Test; import java.io.File;