调整包结构

class-winter-core/pom.xml

@@ -3,8 +3,8 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>class-winter</artifactId>
         <groupId>com.idea-aedi</groupId>
+        <artifactId>class-winter</artifactId>
         <version>1.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -37,8 +37,8 @@
                                 <transformer
                                         implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                                     <manifestEntries>
-                                        <Main-Class>net.jd.classwinter.Forward</Main-Class>
-                                        <Premain-Class>net.jd.classwinter.Reverses</Premain-Class>
+                                        <Main-Class>winter.com.ideaaedi.classwinter.Forward</Main-Class>
+                                        <Premain-Class>winter.com.ideaaedi.classwinter.Reverses</Premain-Class>
                                     </manifestEntries>
                                 </transformer>
                             </transformers>

class-winter-core/src/main/java/net/jd/classwinter/Forward.java → class-winter-core/src/main/java/winter/com/ideaaedi/classwinter/Forward.java

@@ -1,9 +1,9 @@
-package net.jd.classwinter;
+package winter.com.ideaaedi.classwinter;
 
-import net.jd.classwinter.author.JustryDeng;
-import net.jd.classwinter.executor.EncryptExecutor;
-import net.jd.classwinter.util.Logger;
-import net.jd.classwinter.util.StrUtil;
+import winter.com.ideaaedi.classwinter.author.JustryDeng;
+import winter.com.ideaaedi.classwinter.executor.EncryptExecutor;
+import winter.com.ideaaedi.classwinter.util.Logger;
+import winter.com.ideaaedi.classwinter.util.StrUtil;
 
 import java.util.Objects;
 

class-winter-core/src/main/java/net/jd/classwinter/Reverses.java → class-winter-core/src/main/java/winter/com/ideaaedi/classwinter/Reverses.java

@@ -1,15 +1,15 @@
-package net.jd.classwinter;
+package winter.com.ideaaedi.classwinter;
 
-import net.jd.classwinter.author.JustryDeng;
-import net.jd.classwinter.executor.DecryptExecutor;
-import net.jd.classwinter.util.Cache;
-import net.jd.classwinter.util.Constant;
-import net.jd.classwinter.util.ExceptionUtil;
-import net.jd.classwinter.util.IOUtil;
-import net.jd.classwinter.util.JarUtil;
-import net.jd.classwinter.util.JavaagentCmdArgs;
-import net.jd.classwinter.util.Logger;
-import net.jd.classwinter.util.StrUtil;
+import winter.com.ideaaedi.classwinter.author.JustryDeng;
+import winter.com.ideaaedi.classwinter.executor.DecryptExecutor;
+import winter.com.ideaaedi.classwinter.util.Cache;
+import winter.com.ideaaedi.classwinter.util.Constant;
+import winter.com.ideaaedi.classwinter.util.ExceptionUtil;
+import winter.com.ideaaedi.classwinter.util.IOUtil;
+import winter.com.ideaaedi.classwinter.util.JarUtil;
+import winter.com.ideaaedi.classwinter.util.JavaagentCmdArgs;
+import winter.com.ideaaedi.classwinter.util.Logger;
+import winter.com.ideaaedi.classwinter.util.StrUtil;
 
 import java.io.File;
 import java.lang.instrument.ClassFileTransformer;

class-winter-core/src/main/java/net/jd/classwinter/author/JustryDeng.java → class-winter-core/src/main/java/winter/com/ideaaedi/classwinter/author/JustryDeng.java

@@ -1,4 +1,4 @@
-package net.jd.classwinter.author;
+package winter.com.ideaaedi.classwinter.author;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

class-winter-core/src/main/java/net/jd/classwinter/exception/ClassWinterException.java → class-winter-core/src/main/java/winter/com/ideaaedi/classwinter/exception/ClassWinterException.java

@@ -1,6 +1,6 @@
-package net.jd.classwinter.exception;
+package winter.com.ideaaedi.classwinter.exception;
 
-import net.jd.classwinter.author.JustryDeng;
+import winter.com.ideaaedi.classwinter.author.JustryDeng;
 
 /**
  * 代码混淆异常

class-winter-core/src/main/java/net/jd/classwinter/executor/DecryptExecutor.java → class-winter-core/src/main/java/winter/com/ideaaedi/classwinter/executor/DecryptExecutor.java

@@ -1,13 +1,13 @@
-package net.jd.classwinter.executor;
+package winter.com.ideaaedi.classwinter.executor;
 
-import net.jd.classwinter.author.JustryDeng;
-import net.jd.classwinter.exception.ClassWinterException;
-import net.jd.classwinter.util.Cache;
-import net.jd.classwinter.util.Constant;
-import net.jd.classwinter.util.EncryptUtil;
-import net.jd.classwinter.util.IOUtil;
-import net.jd.classwinter.util.Logger;
-import net.jd.classwinter.util.StrUtil;
+import winter.com.ideaaedi.classwinter.author.JustryDeng;
+import winter.com.ideaaedi.classwinter.exception.ClassWinterException;
+import winter.com.ideaaedi.classwinter.util.Cache;
+import winter.com.ideaaedi.classwinter.util.Constant;
+import winter.com.ideaaedi.classwinter.util.EncryptUtil;
+import winter.com.ideaaedi.classwinter.util.IOUtil;
+import winter.com.ideaaedi.classwinter.util.Logger;
+import winter.com.ideaaedi.classwinter.util.StrUtil;
 
 import java.io.File;
 import java.nio.charset.StandardCharsets;

class-winter-core/src/main/java/net/jd/classwinter/executor/EncryptExecutor.java → class-winter-core/src/main/java/winter/com/ideaaedi/classwinter/executor/EncryptExecutor.java

@@ -1,28 +1,27 @@
-package net.jd.classwinter.executor;
+package winter.com.ideaaedi.classwinter.executor;
 
 import javassist.CannotCompileException;
 import javassist.ClassPool;
 import javassist.NotFoundException;
-import net.jd.classwinter.Reverses;
-import net.jd.classwinter.author.JustryDeng;
-import net.jd.classwinter.exception.ClassWinterException;
-import net.jd.classwinter.util.Cache;
-import net.jd.classwinter.util.Constant;
-import net.jd.classwinter.util.EncryptUtil;
-import net.jd.classwinter.util.IOUtil;
-import net.jd.classwinter.util.JarUtil;
-import net.jd.classwinter.util.JavassistUtil;
-import net.jd.classwinter.util.Logger;
-import net.jd.classwinter.util.Pair;
-import net.jd.classwinter.util.PathUtil;
-import net.jd.classwinter.util.StrUtil;
+import winter.com.ideaaedi.classwinter.Reverses;
+import winter.com.ideaaedi.classwinter.author.JustryDeng;
+import winter.com.ideaaedi.classwinter.exception.ClassWinterException;
+import winter.com.ideaaedi.classwinter.util.Cache;
+import winter.com.ideaaedi.classwinter.util.Constant;
+import winter.com.ideaaedi.classwinter.util.EncryptUtil;
+import winter.com.ideaaedi.classwinter.util.IOUtil;
+import winter.com.ideaaedi.classwinter.util.JarUtil;
+import winter.com.ideaaedi.classwinter.util.JavassistUtil;
+import winter.com.ideaaedi.classwinter.util.Logger;
+import winter.com.ideaaedi.classwinter.util.Pair;
+import winter.com.ideaaedi.classwinter.util.PathUtil;
+import winter.com.ideaaedi.classwinter.util.StrUtil;
 
 import java.io.File;
 import java.nio.charset.StandardCharsets;
 import java.security.SecureRandom;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Base64;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -139,8 +138,8 @@ public class EncryptExecutor {
      * <p>
      * 示例说明:
      * 假设加密时日志报warn说
-     *    2021-06-11 20:24:31 [ WARN] net.jd.classwinter.executor.EncryptExecutor: Ignore clear-method-body for  className [com.aspire.ssm.handler.impl.DefaultAesPreHandlerImpl], Cannot find 'org.apache.ibatis.executor.parameter.ParameterHandler'
-     *    2021-06-11 20:24:31 [ WARN] net.jd.classwinter.executor.EncryptExecutor: Ignore clear-method-body for className [com.aspire.ssm.interceptor.CustomizeMybatisPlugin], Cannot find 'org.apache.ibatis.plugin.Invocation'
+     *    2021-06-11 20:24:31 [ WARN] winter.com.ideaaedi.classwinter.executor.EncryptExecutor: Ignore clear-method-body for  className [com.aspire.ssm.handler.impl.DefaultAesPreHandlerImpl], Cannot find 'org.apache.ibatis.executor.parameter.ParameterHandler'
+     *    2021-06-11 20:24:31 [ WARN] winter.com.ideaaedi.classwinter.executor.EncryptExecutor: Ignore clear-method-body for className [com.aspire.ssm.interceptor.CustomizeMybatisPlugin], Cannot find 'org.apache.ibatis.plugin.Invocation'
      *  这说明了
      *      DefaultAesPreHandlerImpl类中使用到了org.apache.ibatis.executor.parameter.ParameterHandler类，
      *      DCustomizeMybatisPlugin类中使用到了org.apache.ibatis.plugin.Invocation类，

class-winter-core/src/main/java/net/jd/classwinter/pakage-info.java → class-winter-core/src/main/java/winter/com/ideaaedi/classwinter/pakage-info.java

@@ -1,4 +1,4 @@
-package net.jd.classwinter;
+package winter.com.ideaaedi.classwinter;
 /*
  * 对class-final进行整理、改造、优化、定制
  */

class-winter-core/src/main/java/net/jd/classwinter/util/BashUtil.java → class-winter-core/src/main/java/winter/com/ideaaedi/classwinter/util/BashUtil.java

@@ -1,7 +1,7 @@
-package net.jd.classwinter.util;
+package winter.com.ideaaedi.classwinter.util;
 
-import net.jd.classwinter.author.JustryDeng;
-import net.jd.classwinter.exception.ClassWinterException;
+import winter.com.ideaaedi.classwinter.author.JustryDeng;
+import winter.com.ideaaedi.classwinter.exception.ClassWinterException;
 
 import java.io.BufferedReader;
 import java.io.File;

class-winter-core/src/main/java/net/jd/classwinter/util/Cache.java → class-winter-core/src/main/java/winter/com/ideaaedi/classwinter/util/Cache.java

@@ -1,6 +1,6 @@
-package net.jd.classwinter.util;
+package winter.com.ideaaedi.classwinter.util;
 
-import net.jd.classwinter.author.JustryDeng;
+import winter.com.ideaaedi.classwinter.author.JustryDeng;
 
 import java.util.Map;
 

class-winter-core/src/main/java/net/jd/classwinter/util/Constant.java → class-winter-core/src/main/java/winter/com/ideaaedi/classwinter/util/Constant.java

@@ -1,6 +1,6 @@
-package net.jd.classwinter.util;
+package winter.com.ideaaedi.classwinter.util;
 
-import net.jd.classwinter.author.JustryDeng;
+import winter.com.ideaaedi.classwinter.author.JustryDeng;
 
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;

class-winter-core/src/main/java/net/jd/classwinter/util/EncryptUtil.java → class-winter-core/src/main/java/winter/com/ideaaedi/classwinter/util/EncryptUtil.java

@@ -1,7 +1,7 @@
-package net.jd.classwinter.util;
+package winter.com.ideaaedi.classwinter.util;
 
-import net.jd.classwinter.author.JustryDeng;
-import net.jd.classwinter.exception.ClassWinterException;
+import winter.com.ideaaedi.classwinter.author.JustryDeng;
+import winter.com.ideaaedi.classwinter.exception.ClassWinterException;
 
 import javax.crypto.BadPaddingException;
 import javax.crypto.Cipher;

class-winter-core/src/main/java/net/jd/classwinter/util/ExceptionUtil.java → class-winter-core/src/main/java/winter/com/ideaaedi/classwinter/util/ExceptionUtil.java

@@ -1,7 +1,7 @@
-package net.jd.classwinter.util;
+package winter.com.ideaaedi.classwinter.util;
 
-import net.jd.classwinter.author.JustryDeng;
-import net.jd.classwinter.exception.ClassWinterException;
+import winter.com.ideaaedi.classwinter.author.JustryDeng;
+import winter.com.ideaaedi.classwinter.exception.ClassWinterException;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;

class-winter-core/src/main/java/net/jd/classwinter/util/IOUtil.java → class-winter-core/src/main/java/winter/com/ideaaedi/classwinter/util/IOUtil.java

@@ -1,7 +1,7 @@
-package net.jd.classwinter.util;
+package winter.com.ideaaedi.classwinter.util;
 
-import net.jd.classwinter.author.JustryDeng;
-import net.jd.classwinter.exception.ClassWinterException;
+import winter.com.ideaaedi.classwinter.author.JustryDeng;
+import winter.com.ideaaedi.classwinter.exception.ClassWinterException;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;

class-winter-core/src/main/java/net/jd/classwinter/util/JarUtil.java → class-winter-core/src/main/java/winter/com/ideaaedi/classwinter/util/JarUtil.java

@@ -1,7 +1,7 @@
-package net.jd.classwinter.util;
+package winter.com.ideaaedi.classwinter.util;
 
-import net.jd.classwinter.author.JustryDeng;
-import net.jd.classwinter.exception.ClassWinterException;
+import winter.com.ideaaedi.classwinter.author.JustryDeng;
+import winter.com.ideaaedi.classwinter.exception.ClassWinterException;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -16,7 +16,6 @@ import java.util.Collection;
 import java.util.Enumeration;
 import java.util.List;
 import java.util.Objects;
-import java.util.concurrent.TimeUnit;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 import java.util.zip.ZipOutputStream;

class-winter-core/src/main/java/net/jd/classwinter/util/JavaagentCmdArgs.java → class-winter-core/src/main/java/winter/com/ideaaedi/classwinter/util/JavaagentCmdArgs.java

@@ -1,7 +1,7 @@
-package net.jd.classwinter.util;
+package winter.com.ideaaedi.classwinter.util;
 
-import net.jd.classwinter.author.JustryDeng;
-import net.jd.classwinter.exception.ClassWinterException;
+import winter.com.ideaaedi.classwinter.author.JustryDeng;
+import winter.com.ideaaedi.classwinter.exception.ClassWinterException;
 
 /**
  * 在使用class-winter进行解密时，如果不需要输入参数，那么可以直接java -javaagent:xxx.jar -jar xxx.jar

class-winter-core/src/main/java/net/jd/classwinter/util/JavassistUtil.java → class-winter-core/src/main/java/winter/com/ideaaedi/classwinter/util/JavassistUtil.java

@@ -1,4 +1,4 @@
-package net.jd.classwinter.util;
+package winter.com.ideaaedi.classwinter.util;
 
 import javassist.CannotCompileException;
 import javassist.ClassPool;
@@ -14,8 +14,8 @@ import javassist.bytecode.Descriptor;
 import javassist.bytecode.ExceptionTable;
 import javassist.compiler.CompileError;
 import javassist.compiler.Javac;
-import net.jd.classwinter.author.JustryDeng;
-import net.jd.classwinter.exception.ClassWinterException;
+import winter.com.ideaaedi.classwinter.author.JustryDeng;
+import winter.com.ideaaedi.classwinter.exception.ClassWinterException;
 
 import java.io.File;
 import java.io.IOException;

class-winter-core/src/main/java/net/jd/classwinter/util/Logger.java → class-winter-core/src/main/java/winter/com/ideaaedi/classwinter/util/Logger.java

@@ -1,6 +1,6 @@
-package net.jd.classwinter.util;
+package winter.com.ideaaedi.classwinter.util;
 
-import net.jd.classwinter.author.JustryDeng;
+import winter.com.ideaaedi.classwinter.author.JustryDeng;
 
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;

class-winter-core/src/main/java/net/jd/classwinter/util/Pair.java → class-winter-core/src/main/java/winter/com/ideaaedi/classwinter/util/Pair.java

@@ -1,6 +1,6 @@
-package net.jd.classwinter.util;
+package winter.com.ideaaedi.classwinter.util;
 
-import net.jd.classwinter.author.JustryDeng;
+import winter.com.ideaaedi.classwinter.author.JustryDeng;
 
 import java.util.Objects;
 

class-winter-core/src/main/java/net/jd/classwinter/util/PathUtil.java → class-winter-core/src/main/java/winter/com/ideaaedi/classwinter/util/PathUtil.java

@@ -1,7 +1,7 @@
-package net.jd.classwinter.util;
+package winter.com.ideaaedi.classwinter.util;
 
-import net.jd.classwinter.author.JustryDeng;
-import net.jd.classwinter.exception.ClassWinterException;
+import winter.com.ideaaedi.classwinter.author.JustryDeng;
+import winter.com.ideaaedi.classwinter.exception.ClassWinterException;
 
 import java.io.File;
 import java.io.UnsupportedEncodingException;

class-winter-core/src/main/java/net/jd/classwinter/util/RsaUtil.java → class-winter-core/src/main/java/winter/com/ideaaedi/classwinter/util/RsaUtil.java

@@ -1,7 +1,7 @@
-package net.jd.classwinter.util;
+package winter.com.ideaaedi.classwinter.util;
 
-import net.jd.classwinter.author.JustryDeng;
-import net.jd.classwinter.exception.ClassWinterException;
+import winter.com.ideaaedi.classwinter.author.JustryDeng;
+import winter.com.ideaaedi.classwinter.exception.ClassWinterException;
 
 import javax.crypto.Cipher;
 import java.nio.charset.StandardCharsets;

class-winter-core/src/main/java/net/jd/classwinter/util/StrUtil.java → class-winter-core/src/main/java/winter/com/ideaaedi/classwinter/util/StrUtil.java

@@ -1,6 +1,6 @@
-package net.jd.classwinter.util;
+package winter.com.ideaaedi.classwinter.util;
 
-import net.jd.classwinter.author.JustryDeng;
+import winter.com.ideaaedi.classwinter.author.JustryDeng;
 
 import java.nio.ByteBuffer;
 import java.nio.CharBuffer;

class-winter-core/src/test/java/com/jd/classwinter/ForwardTest.java → class-winter-core/src/test/java/winter/com/ideaaedi/classwinter/ForwardTest.java

@@ -1,11 +1,9 @@
-package com.jd.classwinter;
+package winter.com.ideaaedi.classwinter;
 
-import jdk.nashorn.internal.ir.annotations.Ignore;
-import net.jd.classwinter.author.JustryDeng;
-import net.jd.classwinter.executor.EncryptExecutor;
-import net.jd.classwinter.util.Constant;
-import net.jd.classwinter.util.Logger;
-import net.jd.classwinter.util.PathUtil;
+import winter.com.ideaaedi.classwinter.author.JustryDeng;
+import winter.com.ideaaedi.classwinter.executor.EncryptExecutor;
+import winter.com.ideaaedi.classwinter.util.Logger;
+import winter.com.ideaaedi.classwinter.util.PathUtil;
 
 /**
  * 正向加密
@@ -72,8 +70,8 @@ public class ForwardTest {
                 // <p>
                 // 示例说明:
                 // 假设加密时日志报warn说
-                //     2021-06-11 20:24:31 [ WARN] net.jd.classwinter.executor.EncryptExecutor: Ignore clear-method-body for  className [com.aspire.ssm.handler.impl.DefaultAesPreHandlerImpl], Cannot find 'org.apache.ibatis.executor.parameter.ParameterHandler'
-                //     2021-06-11 20:24:31 [ WARN] net.jd.classwinter.executor.EncryptExecutor: Ignore clear-method-body for className [com.aspire.ssm.interceptor.CustomizeMybatisPlugin], Cannot find 'org.apache.ibatis.plugin.Invocation'
+                //     2021-06-11 20:24:31 [ WARN] winter.com.ideaaedi.classwinter.executor.EncryptExecutor: Ignore clear-method-body for  className [com.aspire.ssm.handler.impl.DefaultAesPreHandlerImpl], Cannot find 'org.apache.ibatis.executor.parameter.ParameterHandler'
+                //     2021-06-11 20:24:31 [ WARN] winter.com.ideaaedi.classwinter.executor.EncryptExecutor: Ignore clear-method-body for className [com.aspire.ssm.interceptor.CustomizeMybatisPlugin], Cannot find 'org.apache.ibatis.plugin.Invocation'
                 // 这说明了
                 //     DefaultAesPreHandlerImpl类中使用到了org.apache.ibatis.executor.parameter.ParameterHandler类，
                 //     DCustomizeMybatisPlugin类中使用到了org.apache.ibatis.plugin.Invocation类，

class-winter-core/src/test/java/com/jd/classwinter/ProtectedLibTest.java → class-winter-core/src/test/java/winter/com/ideaaedi/classwinter/ProtectedLibTest.java

@@ -1,12 +1,9 @@
-package com.jd.classwinter;
+package winter.com.ideaaedi.classwinter;
 
-import net.jd.classwinter.author.JustryDeng;
-import net.jd.classwinter.executor.EncryptExecutor;
-import net.jd.classwinter.util.BashUtil;
-import net.jd.classwinter.util.Constant;
-import net.jd.classwinter.util.PathUtil;
-
-import java.util.concurrent.TimeUnit;
+import winter.com.ideaaedi.classwinter.author.JustryDeng;
+import winter.com.ideaaedi.classwinter.executor.EncryptExecutor;
+import winter.com.ideaaedi.classwinter.util.Constant;
+import winter.com.ideaaedi.classwinter.util.PathUtil;
 
 /**
  * (non-javadoc)

class-winter-core/src/test/java/com/jd/classwinter/ReversesTest.java → class-winter-core/src/test/java/winter/com/ideaaedi/classwinter/ReversesTest.java

@@ -1,7 +1,7 @@
-package com.jd.classwinter;
+package winter.com.ideaaedi.classwinter;
 
-import net.jd.classwinter.author.JustryDeng;
-import net.jd.classwinter.util.BashUtil;
+import winter.com.ideaaedi.classwinter.author.JustryDeng;
+import winter.com.ideaaedi.classwinter.util.BashUtil;
 
 import java.io.File;
 import java.util.concurrent.TimeUnit;

class-winter-maven-plugin/pom.xml

@@ -3,8 +3,8 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>class-winter</artifactId>
         <groupId>com.idea-aedi</groupId>
+        <artifactId>class-winter</artifactId>
         <version>1.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -38,6 +38,7 @@
             <version>2.2.1</version>
         </dependency>
     </dependencies>
+
     <build>
         <plugins>
             <plugin>

class-winter-maven-plugin/src/main/java/net/jd/classwinter/plugin/ClassWinterPlugin.java → class-winter-maven-plugin/src/main/java/winter/com/ideaaedi/classwinter/plugin/ClassWinterPlugin.java

@@ -1,4 +1,4 @@
-package net.jd.classwinter.plugin;
+package winter.com.ideaaedi.classwinter.plugin;
 
 import net.jd.classwinter.Forward;
 import net.jd.classwinter.executor.EncryptExecutor;