填加混淆过程日志

README.en.md

@@ -42,7 +42,7 @@
   ```
   注：不必担心信息泄漏问题，使用此方式生成混淆的jar包时，会擦除pom.xml中关于class-winter-plugin的信息。
 
-- #### <font face="幼圆" ><font face="幼圆"  color = "#86CA5E">**方式二**</font>：通过[**class-winter-core.jar**](https://gitee.com/JustryDeng/class-winter/raw/master/class-winter-core/src/test/resources/class-winter-core-1.2.1.jar)主动加密。</font>
+- #### <font face="幼圆" ><font face="幼圆"  color = "#86CA5E">**方式二**</font>：通过[**class-winter-core.jar**](https://gitee.com/JustryDeng/class-winter/raw/master/class-winter-core/src/test/resources/class-winter-core-1.2.2.jar)主动加密。</font>
 
   ```bash
   java -jar class-winter-core-${version}.jar originJarOrWar=${要加密的项目.jar或.war包} includePrefix=${加密范围} [k3=v3 k4=v4 ...]

README.md

@@ -42,7 +42,7 @@
   ```
   注：不必担心信息泄漏问题，使用此方式生成混淆的jar包时，会擦除pom.xml中关于class-winter-plugin的信息。
 
-- #### <font face="幼圆" ><font face="幼圆"  color = "#86CA5E">**方式二**</font>：通过[**class-winter-core.jar**](https://gitee.com/JustryDeng/class-winter/raw/master/class-winter-core/src/test/resources/class-winter-core-1.2.1.jar)主动加密。</font>
+- #### <font face="幼圆" ><font face="幼圆"  color = "#86CA5E">**方式二**</font>：通过[**class-winter-core.jar**](https://gitee.com/JustryDeng/class-winter/raw/master/class-winter-core/src/test/resources/class-winter-core-1.2.2.jar)主动加密。</font>
 
   ```bash
   java -jar class-winter-core-${version}.jar originJarOrWar=${要加密的项目.jar或.war包} includePrefix=${加密范围} [k3=v3 k4=v4 ...]

class-winter-core/dependency-reduced-pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <artifactId>class-winter</artifactId>
     <groupId>com.idea-aedi</groupId>
-    <version>1.2.1</version>
+    <version>1.2.2</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>class-winter-core</artifactId>

class-winter-core/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.idea-aedi</groupId>
         <artifactId>class-winter</artifactId>
-        <version>1.2.1</version>
+        <version>1.2.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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

@@ -196,48 +196,78 @@ public class EncryptExecutor {
         
         // step0. 解压jar到jarRootDir下
         JarUtil.unJarWar(originJarOrWar, targetRootDir);
+        showProcess("step00", "step11", "un-jar-war");
         
         // step1. jar中的某些lib可能也需要加密，这里先(将那些需要加密的lib)进行解压，（解压到对应的临时目录，以便后面进行加密处理）
         unLibJar();
+        showProcess("step01", "step11", "un-lib-jar");
         
         // step2. 找到需要加密混淆的class文件
         File targetRootDirFile = new File(targetRootDir);
         List<File> allFiles = IOUtil.listSubFile(targetRootDirFile, 1);
         List<File> allNeedEncryptedClassFileList = filterClasses(allFiles);
+        showProcess("step02", "step11", "filter-classes");
         
         // step3.1. 根据原.class文件,生成加密后的.class文件,并存至Constant.ENCRYPTED_CLASSES_SAVE_DIR
         List<String> allAlreadyEncryptedClassFileList = encryptClasses(allNeedEncryptedClassFileList, new File(targetRootDir,
                 Constant.DEFAULT_ENCRYPTED_CLASSES_SAVE_DIR));
         // step3.2. 生成记录已加密class的全类名的清单文件
         generateChecklistFile(allAlreadyEncryptedClassFileList);
+        showProcess("step03", "step11", "un-jar-war");
         
         // step4. 记录印章(在解密时，可通过 checklist + 印章 判断一个class是否是被class-winter加密过)
         generateSealFile();
+        showProcess("step04", "step11", "encrypt-classes");
 
         // step5. 混淆原.class文件(即:清空方法体)
         clearClassMethod(allNeedEncryptedClassFileList);
+        showProcess("step05", "step11", "clear-class-method");
     
         // step6. 清除META-INF/maven下pom.xml中关于class-winter-plugin的相关信息
         clearWinterPluginInfo();
+        showProcess("step06", "step11", "clear-winter-plugin-info");
         
         // step7. 添加class-winter的用于javaagent解密的代码
         addClassWinterAgent();
+        showProcess("step07", "step11", "add-class-winter-agent");
         
         // step8. 汇总那些在本次加密前本身就已经是被class-winter混淆的lib的相关信息到当前项目中
         collectAlreadyProtectedLibInfo();
+        showProcess("step08", "step11", "collect-already-protected-lib-info");
         
         // step9. 与step1项对应，将临时目录还原为原来的lib(此时得到的lib是加密后的)
         doLibJar();
+        showProcess("step09", "step11", "do-lib-jar");
         
         // step10. 压缩targetRootDir目录为绝对文件路径名为generatedJarWar的jar(or war)包
         String generatedJarWar = generateJarWarPath(this.originIsJar);
         JarUtil.doJarWar(targetRootDir, generatedJarWar);
+        showProcess("step10", "step11", "generate-jar-war-path");
         
         // step11. 删除临时目录
         IOUtil.delete(targetRootDirFile);
+        showProcess("step11", "step11", "delete-tmp-dir");
         return generatedJarWar;
     }
     
+    /**
+     * showProcess
+     *
+     * @param completedStep
+     *            已完成步骤
+     * @param lastStep
+     *            最后步骤
+     * @param stepDesc
+     *            步骤描述
+     */
+    private void showProcess(String completedStep, String lastStep, String stepDesc) {
+        if (EncryptExecutor.invokerIsPlugin) {
+            Logger.simpleInfo(completedStep + "/" + lastStep + "\t" + stepDesc  + " completed.");
+        } else {
+            Logger.info(completedStep + "/" + lastStep + "\t" + stepDesc  + " completed.");
+        }
+    }
+    
     /**
      * 清除META-INF/maven下pom.xml中关于class-winter-plugin的相关信息
      *

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

@@ -50,6 +50,16 @@ public final class Logger {
         }
     }
     
+    /**
+     * 输出信息
+     *
+     * @param msg
+     *            信息
+     */
+    public static void simpleInfo(String msg) {
+        System.out.println("[INFO] " + msg);
+    }
+    
     /**
      * 输出信息
      *

class-winter-core/src/test/java/winter/com/ideaaedi/classwinter/AllTest.java

@@ -32,7 +32,7 @@ public class AllTest {
         String tips = "方法已经被class-winter加密保护了，请不要直接使用java -jar xxx.jar启动项目，请使用java -javaagent:xxx.jar -jar xxx.jar启动项目.";
         String alreadyProtectedLibs = "encrypted-lib-have-pwd-1.0.0.jar:qwer123~";
         String debug = "true";
-        String startBat = "java -jar " + projectRootDir + "class-winter-core-1.2.1.jar"
+        String startBat = "java -jar " + projectRootDir + "class-winter-core-1.2.2.jar"
                 + " originJarOrWar=" + originJarOrWar
                 + " includePrefix=" + includePrefix
                 + " excludePrefix=" + excludePrefix

class-winter-core/src/test/java/winter/com/ideaaedi/classwinter/AlreadyProtectedLibs_Test.java

@@ -67,7 +67,7 @@ public class AlreadyProtectedLibs_Test {
         String originJarOrWar = projectRootDir + Constant.LINUX_FILE_SEPARATOR + "my-project-with-encrypted-lib-no-pwd.jar";
         String includePrefix = "non-exist";
         String alreadyProtectedLibs = "encrypted-lib-no-pwd-1.0.0.jar";
-        String startBat = "java -jar " + projectRootDir + "class-winter-core-1.2.1.jar"
+        String startBat = "java -jar " + projectRootDir + "class-winter-core-1.2.2.jar"
                 + " originJarOrWar=" + originJarOrWar
                 + " includePrefix=" + includePrefix
                 + " alreadyProtectedLibs=" + alreadyProtectedLibs
@@ -110,7 +110,7 @@ public class AlreadyProtectedLibs_Test {
         String includePrefix = "non-exist";
         String alreadyProtectedLibs = "encrypted-lib-have-pwd-1.0.0.jar:qwer123~";
     
-        String startBat = "java -jar " + projectRootDir + "class-winter-core-1.2.1.jar"
+        String startBat = "java -jar " + projectRootDir + "class-winter-core-1.2.2.jar"
                 + " originJarOrWar=" + originJarOrWar
                 + " includePrefix=" + includePrefix
                 + " alreadyProtectedLibs=" + alreadyProtectedLibs

class-winter-core/src/test/java/winter/com/ideaaedi/classwinter/Debug_Test.java

@@ -36,7 +36,7 @@ public class Debug_Test {
         String originJarOrWar = projectRootDir + "boot-jar.jar";
         String includePrefix = "com";
         
-        String startBat = "java -jar " + projectRootDir + "class-winter-core-1.2.1.jar"
+        String startBat = "java -jar " + projectRootDir + "class-winter-core-1.2.2.jar"
                 + " originJarOrWar=" + originJarOrWar
                 + " includePrefix=" + includePrefix
                 ;
@@ -64,7 +64,7 @@ public class Debug_Test {
         String originJarOrWar = projectRootDir + "boot-jar.jar";
         String includePrefix = "com";
     
-        String startBat = "java -jar " + projectRootDir + "class-winter-core-1.2.1.jar"
+        String startBat = "java -jar " + projectRootDir + "class-winter-core-1.2.2.jar"
                 + " originJarOrWar=" + originJarOrWar
                 + " includePrefix=" + includePrefix
                 + " debug=" + true

class-winter-core/src/test/java/winter/com/ideaaedi/classwinter/ExcludePrefix_Test.java

@@ -38,7 +38,7 @@ public class ExcludePrefix_Test {
         String originJarOrWar = projectRootDir + "boot-jar.jar";
         String includePrefix = "com.aspire.ssm.util.AesEncryptDecryptUtil,com.aspire.ssm.util.DbSecurityBeanUtil";
         
-        String startBat = "java -jar " + projectRootDir + "class-winter-core-1.2.1.jar"
+        String startBat = "java -jar " + projectRootDir + "class-winter-core-1.2.2.jar"
                 + " originJarOrWar=" + originJarOrWar
                 + " includePrefix=" + includePrefix
                 + " debug=" + true
@@ -72,7 +72,7 @@ public class ExcludePrefix_Test {
         String includePrefix = "com.aspire.ssm.util.AesEncryptDecryptUtil,com.aspire.ssm.util.DbSecurityBeanUtil";
         String excludePrefix = "com.aspire.ssm.util.DbSecurityBeanUtil";
     
-        String startBat = "java -jar " + projectRootDir + "class-winter-core-1.2.1.jar"
+        String startBat = "java -jar " + projectRootDir + "class-winter-core-1.2.2.jar"
                 + " originJarOrWar=" + originJarOrWar
                 + " includePrefix=" + includePrefix
                 + " excludePrefix=" + excludePrefix

class-winter-core/src/test/java/winter/com/ideaaedi/classwinter/FinalName_Test.java

@@ -23,7 +23,7 @@ public class FinalName_Test {
         String includePrefix = "com";
         String finalName = "YiYaKaKa";
     
-        String startBat = "java -jar " + projectRootDir + "class-winter-core-1.2.1.jar"
+        String startBat = "java -jar " + projectRootDir + "class-winter-core-1.2.2.jar"
                 + " originJarOrWar=" + originJarOrWar
                 + " includePrefix=" + includePrefix
                 + " finalName=" + finalName

class-winter-core/src/test/java/winter/com/ideaaedi/classwinter/IncludeLibs_Test.java

@@ -42,7 +42,7 @@ public class IncludeLibs_Test {
         String includePrefix = "org.springframework.aop.target.dynamic,com.google.common.xml";
         String includeLibs = "spring-aop-5.1.8.RELEASE.jar,guava-28.2-jre.jar";
     
-        String startBat = "java -jar " + projectRootDir + "class-winter-core-1.2.1.jar"
+        String startBat = "java -jar " + projectRootDir + "class-winter-core-1.2.2.jar"
                 + " originJarOrWar=" + originJarOrWar
                 + " includePrefix=" + includePrefix
                 + " includeLibs=" + includeLibs

class-winter-core/src/test/java/winter/com/ideaaedi/classwinter/IncludePrefix_Test.java

@@ -39,7 +39,7 @@ public class IncludePrefix_Test {
         String originJarOrWar = projectRootDir + "boot-jar.jar";
         String includePrefix = "com.aspire.ssm.util";
     
-        String startBat = "java -jar " + projectRootDir + "class-winter-core-1.2.1.jar"
+        String startBat = "java -jar " + projectRootDir + "class-winter-core-1.2.2.jar"
                 + " originJarOrWar=" + originJarOrWar
                 + " includePrefix=" + includePrefix
                 + " debug=" + true

class-winter-core/src/test/java/winter/com/ideaaedi/classwinter/OriginJarOrWar_Test.java

@@ -32,7 +32,7 @@ public class OriginJarOrWar_Test {
         String originJarOrWar = projectRootDir + "non-exist.jar";
         String includePrefix = "com.aspire.ssm.util";
     
-        String startBat = "java -jar " + projectRootDir + "class-winter-core-1.2.1.jar"
+        String startBat = "java -jar " + projectRootDir + "class-winter-core-1.2.2.jar"
                 + " originJarOrWar=" + originJarOrWar
                 + " includePrefix=" + includePrefix
                 + " debug=" + true
@@ -58,7 +58,7 @@ public class OriginJarOrWar_Test {
         String originJarOrWar = projectRootDir + "boot-jar.jar";
         String includePrefix = "com.aspire.ssm.util";
     
-        String startBat = "java -jar " + projectRootDir + "class-winter-core-1.2.1.jar"
+        String startBat = "java -jar " + projectRootDir + "class-winter-core-1.2.2.jar"
                 + " originJarOrWar=" + originJarOrWar
                 + " includePrefix=" + includePrefix
                 + " debug=" + true

class-winter-core/src/test/java/winter/com/ideaaedi/classwinter/Password_Test.java

@@ -23,7 +23,7 @@ public class Password_Test {
         String includePrefix = "com";
         String password = "pwd123";
     
-        String startBat = "java -jar " + projectRootDir + "class-winter-core-1.2.1.jar"
+        String startBat = "java -jar " + projectRootDir + "class-winter-core-1.2.2.jar"
                 + " originJarOrWar=" + originJarOrWar
                 + " includePrefix=" + includePrefix
                 + " password=" + password

class-winter-core/src/test/java/winter/com/ideaaedi/classwinter/SupportFile_Test.java

@@ -42,7 +42,7 @@ public class SupportFile_Test {
         String originJarOrWar = projectRootDir + "normal-jar.jar";
         String includePrefix = "com";
         
-        String startBat = "java -jar " + projectRootDir + "class-winter-core-1.2.1.jar"
+        String startBat = "java -jar " + projectRootDir + "class-winter-core-1.2.2.jar"
                 + " originJarOrWar=" + originJarOrWar
                 + " includePrefix=" + includePrefix
                 ;
@@ -62,7 +62,7 @@ public class SupportFile_Test {
         String includePrefix = "com";
         String supportFile = projectRootDir + "help";
         
-        String startBat = "java -jar " + projectRootDir + "class-winter-core-1.2.1.jar"
+        String startBat = "java -jar " + projectRootDir + "class-winter-core-1.2.2.jar"
                 + " originJarOrWar=" + originJarOrWar
                 + " includePrefix=" + includePrefix
                 + " supportFile=" + supportFile

class-winter-core/src/test/java/winter/com/ideaaedi/classwinter/Tips_Test.java

@@ -32,7 +32,7 @@ public class Tips_Test {
         String originJarOrWar = projectRootDir + "boot-jar.jar";
         String includePrefix = "com";
     
-        String startBat = "java -jar " + projectRootDir + "class-winter-core-1.2.1.jar"
+        String startBat = "java -jar " + projectRootDir + "class-winter-core-1.2.2.jar"
                 + " originJarOrWar=" + originJarOrWar
                 + " includePrefix=" + includePrefix
                 ;
@@ -55,8 +55,8 @@ public class Tips_Test {
         String tips = "[潘嘎之交] 潘: 你别怪潘叔说话比较直白, 网络上的东西都是虚拟的, 你把握不住, 孩子! 因为这里的水很深...";
     
         // 如果tips值由一些特殊字符(如空格等)的话，可以用windows双引号(linux单引号)引起来。
-        // java -jar class-winter-core-1.2.1.jar originJarOrWar=/boot-jar.jar includePrefix=com tips="[潘嘎之交] 潘: 你别怪潘叔说话比较直白, 网络上的东西都是虚拟的, 你把握不住, 孩子! 因为这里的水很深..."
-        String startBat = "java -jar " + projectRootDir + "class-winter-core-1.2.1.jar"
+        // java -jar class-winter-core-1.2.2.jar originJarOrWar=/boot-jar.jar includePrefix=com tips="[潘嘎之交] 潘: 你别怪潘叔说话比较直白, 网络上的东西都是虚拟的, 你把握不住, 孩子! 因为这里的水很深..."
+        String startBat = "java -jar " + projectRootDir + "class-winter-core-1.2.2.jar"
                 + " originJarOrWar=" + originJarOrWar
                 + " includePrefix=" + includePrefix
                 + " tips=" + (BashUtil.IS_WINDOWS ? "\"".concat(tips).concat("\"") : "'".concat(tips).concat("'"));

class-winter-core/src/test/java/winter/com/ideaaedi/classwinter/War_Test.java

@@ -34,7 +34,7 @@ public class War_Test {
         String originJarOrWar = projectRootDir + "war-project.war";
         String includePrefix = "com";
     
-        String startBat = "java -jar " + projectRootDir + "class-winter-core-1.2.1.jar"
+        String startBat = "java -jar " + projectRootDir + "class-winter-core-1.2.2.jar"
                 + " originJarOrWar=" + originJarOrWar
                 + " includePrefix=" + includePrefix
                 ;
@@ -62,7 +62,7 @@ public class War_Test {
         String includePrefix = "com";
         String password = "123456";
     
-        String startBat = "java -jar " + projectRootDir + "class-winter-core-1.2.1.jar"
+        String startBat = "java -jar " + projectRootDir + "class-winter-core-1.2.2.jar"
                 + " originJarOrWar=" + originJarOrWar
                 + " includePrefix=" + includePrefix
                 + " password=" + password
@@ -93,7 +93,7 @@ public class War_Test {
         String alreadyProtectedLibs = "encrypted-lib-no-pwd.jar";
         String password = "oop857857";
     
-        String startBat = "java -jar " + projectRootDir + "class-winter-core-1.2.1.jar"
+        String startBat = "java -jar " + projectRootDir + "class-winter-core-1.2.2.jar"
                 + " originJarOrWar=" + originJarOrWar
                 + " includePrefix=" + includePrefix
                 + " alreadyProtectedLibs=" + alreadyProtectedLibs
@@ -124,7 +124,7 @@ public class War_Test {
         String alreadyProtectedLibs = "encrypted-lib-have-pwd.jar:qwer123~";
         String password = "yiyakaka";
         
-        String startBat = "java -jar " + projectRootDir + "class-winter-core-1.2.1.jar"
+        String startBat = "java -jar " + projectRootDir + "class-winter-core-1.2.2.jar"
                 + " originJarOrWar=" + originJarOrWar
                 + " includePrefix=" + includePrefix
                 + " alreadyProtectedLibs=" + alreadyProtectedLibs
@@ -160,7 +160,7 @@ public class War_Test {
         String alreadyProtectedLibs = "encrypted-lib-have-pwd.jar:qwer123~";
         String debug = "true";
     
-        String startBat = "java -jar " + projectRootDir + "class-winter-core-1.2.1.jar"
+        String startBat = "java -jar " + projectRootDir + "class-winter-core-1.2.2.jar"
                 + " originJarOrWar=" + originJarOrWar
                 + " includePrefix=" + includePrefix
                 + " excludePrefix=" + excludePrefix

class-winter-maven-plugin/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.idea-aedi</groupId>
         <artifactId>class-winter</artifactId>
-        <version>1.2.1</version>
+        <version>1.2.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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

@@ -59,7 +59,7 @@ public class ClassWinterPlugin extends AbstractMojo {
     @Override
     @SuppressWarnings("RedundantThrows")
     public void execute() throws MojoExecutionException, MojoFailureException {
-        Logger.info("-----------------< class-winter-plugin start >-----------------");
+        Logger.simpleInfo("-----------------< class-winter-plugin start >-----------------");
         
         Logger.ENABLE_DEBUG.set(debug != null && debug);
         Logger.debug("You config arg originJarOrWar -> " + originJarOrWar);
@@ -94,12 +94,12 @@ public class ClassWinterPlugin extends AbstractMojo {
         try {
             EncryptExecutor.invokerIsPlugin = true;
             encryptedJarOrWar = encryptExecutor.process();
-            Logger.info("The absolute path of the obfuscated jar is [" + encryptedJarOrWar + "]");
+            Logger.simpleInfo("The absolute path of the obfuscated jar is [" + encryptedJarOrWar + "]");
         } catch (Exception e) {
             Logger.error(ClassWinterPlugin.class, ExceptionUtil.getStackTraceMessage(e));
             throw e;
         }
-        Logger.info("-----------------< class-winter-plugin  end  >-----------------");
+        Logger.simpleInfo("-----------------< class-winter-plugin  end  >-----------------");
     }
 
 }

pom.xml

@@ -9,7 +9,7 @@
     </modules>
     <groupId>com.idea-aedi</groupId>
     <artifactId>class-winter</artifactId>
-    <version>1.2.1</version>
+    <version>1.2.2</version>
 
     <!-- 配置项目的基础信息 -->
     <name>class-winter</name>