Ver Fonte

Merge branch 'master' into release-2.6.0

JustryDeng há 3 anos atrás
pai
commit
08984116a1
25 ficheiros alterados com 79 adições e 52 exclusões
  1. 2 2
      README.md
  2. 1 1
      class-winter-core/pom.xml
  3. 5 0
      class-winter-core/src/main/java/winter/com/ideaaedi/classwinter/Forward.java
  4. 16 6
      class-winter-core/src/main/java/winter/com/ideaaedi/classwinter/Reverses.java
  5. 0 5
      class-winter-core/src/main/java/winter/com/ideaaedi/classwinter/executor/EncryptExecutor.java
  6. 12 0
      class-winter-core/src/main/java/winter/com/ideaaedi/classwinter/util/Constant.java
  7. 3 2
      class-winter-core/src/main/java/winter/com/ideaaedi/classwinter/util/IOUtil.java
  8. 5 1
      class-winter-core/src/main/java/winter/com/ideaaedi/classwinter/util/JarUtil.java
  9. 3 3
      class-winter-core/src/test/java/winter/com/ideaaedi/classwinter/AllTest.java
  10. 2 2
      class-winter-core/src/test/java/winter/com/ideaaedi/classwinter/AlreadyProtectedLibs_Test.java
  11. 2 2
      class-winter-core/src/test/java/winter/com/ideaaedi/classwinter/Debug_Test.java
  12. 2 2
      class-winter-core/src/test/java/winter/com/ideaaedi/classwinter/ExcludePrefix_Test.java
  13. 1 1
      class-winter-core/src/test/java/winter/com/ideaaedi/classwinter/FinalName_Test.java
  14. 1 1
      class-winter-core/src/test/java/winter/com/ideaaedi/classwinter/IncludeLibs_Test.java
  15. 1 1
      class-winter-core/src/test/java/winter/com/ideaaedi/classwinter/IncludePrefix_Test.java
  16. 3 3
      class-winter-core/src/test/java/winter/com/ideaaedi/classwinter/JvmArgCheck_Test.java
  17. 2 2
      class-winter-core/src/test/java/winter/com/ideaaedi/classwinter/OriginJarOrWar_Test.java
  18. 3 3
      class-winter-core/src/test/java/winter/com/ideaaedi/classwinter/Password_Test.java
  19. 2 2
      class-winter-core/src/test/java/winter/com/ideaaedi/classwinter/SupportFile_Test.java
  20. 3 3
      class-winter-core/src/test/java/winter/com/ideaaedi/classwinter/Tips_Test.java
  21. 7 7
      class-winter-core/src/test/java/winter/com/ideaaedi/classwinter/War_Test.java
  22. 1 1
      class-winter-core/src/test/java/winter/com/ideaaedi/classwinter/Xml_Test.java
  23. BIN
      class-winter-core/src/test/resources/class-winter-core-2.6.0.jar
  24. 1 1
      class-winter-maven-plugin/pom.xml
  25. 1 1
      pom.xml

+ 2 - 2
README.md

@@ -12,7 +12,7 @@
 
 <font face="幼圆"  color = "#F53B45">**郑重声明**</font>
 
-&emsp;&emsp;[**class-winter**](https://gitee.com/JustryDeng/class-winter) 是本人在学习完 [**class-final(v1.1.9)**](https://gitee.com/roseboy/classfinal) 后,仿照class-final进行编写的,部分思路与class-final一致
+[**class-winter**](https://gitee.com/JustryDeng/class-winter) 是本人在学习完 [**class-final(v1.1.9)**](https://gitee.com/roseboy/classfinal) 后,仿照class-final进行编写的,部分思路与class-final一致
 
 ## <font  face="幼圆" color = "#3399EA" >功能与特性</font>
 
@@ -32,7 +32,7 @@
   <plugin>
       <groupId>com.idea-aedi</groupId>
       <artifactId>class-winter-maven-plugin</artifactId>
-      <version>2.5.0</version>
+      <version>2.6.0</version>
       <!-- 相关配置 -->
       <configuration>
           <!-- <finalName></finalName>-->

+ 1 - 1
class-winter-core/pom.xml

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

+ 5 - 0
class-winter-core/src/main/java/winter/com/ideaaedi/classwinter/Forward.java

@@ -22,6 +22,11 @@ public class Forward {
      * 那么args的内容形如["k1=v1", "k2=v2", "k3=v3"]
      */
     public static void main(String[] args) {
+        /// main test
+        ///args =new String[]{
+        ///        "originJarOrWar=C:/Users/Administrator/Desktop/test.war",
+        ///        "includePrefix=com.ideaaedi.test"
+        ///};
         // 解析参数
         String originJarOrWar = parseValueByPrefixFromTail("originJarOrWar=", args);
         String includePrefix = parseValueByPrefixFromTail("includePrefix=", args);

+ 16 - 6
class-winter-core/src/main/java/winter/com/ideaaedi/classwinter/Reverses.java

@@ -83,15 +83,25 @@ public class Reverses {
                     className = className.replace("/", ".").replace("\\", ".");
                     // 本项目的印章
                     if (Cache.sealCache == null) {
-                        byte[] sealByte = IOUtil.readFileFromWorkbenchRoot(new File(projectPath), Constant.SEAL_FILE);
-                        String sealContent = new String(sealByte, StandardCharsets.UTF_8);
-                        if (StrUtil.isBlank(sealContent)) {
+                        try {
+                            byte[] sealByte = IOUtil.readFileFromWorkbenchRoot(new File(projectPath), Constant.SEAL_FILE);
+                            String sealContent = new String(sealByte, StandardCharsets.UTF_8);
+                            if (StrUtil.isBlank(sealContent)) {
+                                Logger.error(Reverses.class, "Obtain project seal fail.");
+                                // 结束程序
+                                System.exit(-1);
+                            }
+                            Logger.debug(Reverses.class, "seal of the project is -> " + sealContent);
+                            Cache.sealCache = sealContent;
+                        } catch (Exception e) {
                             Logger.error(Reverses.class, "Obtain project seal fail.");
-                            // 结束程序
+                            Logger.error(Reverses.class, ExceptionUtil.getStackTraceMessage(e));
                             System.exit(-1);
+                            for (int i = 0; i < Constant.TEN; i++) {
+                                Logger.error(Reverses.class, "!!!!!!!!!!! class-winter Invalidation. !!!!!!!!!!!");
+                            }
+                            return null;
                         }
-                        Logger.debug(Reverses.class, "seal of the project is -> " + sealContent);
-                        Cache.sealCache = sealContent;
                     }
     
                     /// ============================================ 1.校验启动时是否输入了加密时指定的jvm参数   2.处理non-class文件

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

@@ -684,12 +684,7 @@ public class EncryptExecutor {
         } else {
             // 当class-winter打包成jar包时
             if (classWinterProjectRootDir.endsWith(Constant.JAR_SUFFIX)) {
-                if (this.originIsJar) {
                     JarUtil.unJarWar(classWinterProjectRootDir, targetRootDir, false, CLASS_WINTER_FILES);
-                } else {
-                    byte[] bytes = IOUtil.toBytes(classWinterProjectRootDirFile);
-                    IOUtil.toFile(bytes, new File(this.targetLibDir, classWinterProjectRootDirFile.getName()), true);
-                }
             } else {
                 throw new ClassWinterException("Execute method addClassWinterAgent() fail. Cannot parse classWinterProjectRootDir [" + classWinterProjectRootDir + "].");
             }

+ 12 - 0
class-winter-core/src/main/java/winter/com/ideaaedi/classwinter/util/Constant.java

@@ -103,6 +103,11 @@ public interface Constant {
      */
     String POM_XML_ROOT = "META-INF/maven";
     
+    /**
+     * war包下,存放class-winter代码的位置
+     */
+    String CLASS_WINTER_SOURCE_WAR_DIR = "WEB-INF/classes";
+    
     /**
      * 汇总记录项目中那些本身就已经被class-winter混淆了的lib的checklist
      */
@@ -138,6 +143,13 @@ public interface Constant {
      */
     String WEB_INF = "WEB-INF";
     
+    /**
+     * 为解压的war包,里面的类路径包含.war!/WEB-INF
+     * <br />
+     * 注:如spring-boot打可执行的war包
+     */
+    String DOT_WAR_WEB_INF = ".war!/WEB-INF";
+    
     /**
      * class文件后缀
      */

+ 3 - 2
class-winter-core/src/main/java/winter/com/ideaaedi/classwinter/util/IOUtil.java

@@ -416,7 +416,7 @@ public final class IOUtil {
      * 从jar文件或目录中读取文件字节
      *
      * @param workbenchRoot
-     *            jar文件或目录(如: /tmp/, /tmp/abc.jar等)
+     *            zip文件或目录(如: /tmp/, /tmp/abc.jar, /tmp/abc.war等)
      * @param relativeFilePath
      *            要读取的文件的相对路径(如:META-INF/winter/xyz.txt)
      * @return  文件字节数组
@@ -426,7 +426,8 @@ public final class IOUtil {
         // jar文件
         if (workbenchRoot.isFile()) {
             String workDirName = workbenchRoot.getName();
-            if (!workDirName.endsWith(Constant.JAR_SUFFIX)) {
+            // 可执行jar or 可执行war
+            if (!workDirName.endsWith(Constant.JAR_SUFFIX) && !workDirName.endsWith(Constant.WAR_SUFFIX)) {
                 throw new ClassWinterException("workDirName [" + workDirName + "] is not support.");
             }
             bytes = JarUtil.getFileFromZip(workbenchRoot, relativeFilePath);

+ 5 - 1
class-winter-core/src/main/java/winter/com/ideaaedi/classwinter/util/JarUtil.java

@@ -405,7 +405,11 @@ public final class JarUtil {
         // 没解压的war包
         if (projectPath.contains("*")) {
             return projectPath.substring(0, projectPath.indexOf("*"));
-        } 
+        }
+        // 没解压的war包(如:spring-boot使用org.springframework.boot.loader.WarLauncher加载器加载可执行war,直接java -jar xxx.war进行的启动)
+        else if (projectPath.contains(Constant.DOT_WAR_WEB_INF)) {
+            return projectPath.substring(0, projectPath.indexOf(Constant.DOT_WAR_WEB_INF) + Constant.WAR_SUFFIX.length());
+        }
         // war包解压后的WEB-INF目录
         else if (projectPath.contains(Constant.WEB_INF)) {
             return projectPath.substring(0, projectPath.indexOf(Constant.WEB_INF));

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

@@ -18,8 +18,8 @@ import winter.com.ideaaedi.classwinter.util.PathUtil;
 public class AllTest {
     
     public static void main(String[] args) {
-        xmlTest();
-//        otherTest();
+//        xmlTest();
+        otherTest();
     }
     
     /**
@@ -74,7 +74,7 @@ public class AllTest {
         String alreadyProtectedLibs = "encrypted-lib-have-pwd-1.0.0.jar:qwer123~";
         String jvmArgCheck = "-XX:+DisableAttachMechanism";
         String debug = "true";
-        String startBat = "java -jar " + projectRootDir + "class-winter-core-2.5.0.jar"
+        String startBat = "java -jar " + projectRootDir + "class-winter-core-2.6.0.jar"
                 + " originJarOrWar=" + originJarOrWar
                 + " includePrefix=" + includePrefix
                 + " excludePrefix=" + excludePrefix

+ 2 - 2
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-2.5.0.jar"
+        String startBat = "java -jar " + projectRootDir + "class-winter-core-2.6.0.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-2.5.0.jar"
+        String startBat = "java -jar " + projectRootDir + "class-winter-core-2.6.0.jar"
                 + " originJarOrWar=" + originJarOrWar
                 + " includePrefix=" + includePrefix
                 + " alreadyProtectedLibs=" + alreadyProtectedLibs

+ 2 - 2
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-2.5.0.jar"
+        String startBat = "java -jar " + projectRootDir + "class-winter-core-2.6.0.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-2.5.0.jar"
+        String startBat = "java -jar " + projectRootDir + "class-winter-core-2.6.0.jar"
                 + " originJarOrWar=" + originJarOrWar
                 + " includePrefix=" + includePrefix
                 + " debug=" + true

+ 2 - 2
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-2.5.0.jar"
+        String startBat = "java -jar " + projectRootDir + "class-winter-core-2.6.0.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-2.5.0.jar"
+        String startBat = "java -jar " + projectRootDir + "class-winter-core-2.6.0.jar"
                 + " originJarOrWar=" + originJarOrWar
                 + " includePrefix=" + includePrefix
                 + " excludePrefix=" + excludePrefix

+ 1 - 1
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-2.5.0.jar"
+        String startBat = "java -jar " + projectRootDir + "class-winter-core-2.6.0.jar"
                 + " originJarOrWar=" + originJarOrWar
                 + " includePrefix=" + includePrefix
                 + " finalName=" + finalName

+ 1 - 1
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-2.5.0.jar"
+        String startBat = "java -jar " + projectRootDir + "class-winter-core-2.6.0.jar"
                 + " originJarOrWar=" + originJarOrWar
                 + " includePrefix=" + includePrefix
                 + " includeLibs=" + includeLibs

+ 1 - 1
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-2.5.0.jar"
+        String startBat = "java -jar " + projectRootDir + "class-winter-core-2.6.0.jar"
                 + " originJarOrWar=" + originJarOrWar
                 + " includePrefix=" + includePrefix
                 + " debug=" + true

+ 3 - 3
class-winter-core/src/test/java/winter/com/ideaaedi/classwinter/JvmArgCheck_Test.java

@@ -33,7 +33,7 @@ public class JvmArgCheck_Test {
     
         String jvmArg = "-XX:+DisableAttachMechanism,-Xms1024M";
         
-        String startBat = "java -jar " + projectRootDir + "class-winter-core-2.5.0.jar"
+        String startBat = "java -jar " + projectRootDir + "class-winter-core-2.6.0.jar"
                 + " originJarOrWar=" + originJarOrWar
                 + " includePrefix=" + includePrefix
                 + " jvmArgCheck=" + jvmArg
@@ -65,7 +65,7 @@ public class JvmArgCheck_Test {
     
         String jvmArg = "-XX:+DisableAttachMechanism,-Xms1024M";
         
-        String startBat = "java -jar " + projectRootDir + "class-winter-core-2.5.0.jar"
+        String startBat = "java -jar " + projectRootDir + "class-winter-core-2.6.0.jar"
                 + " originJarOrWar=" + originJarOrWar
                 + " includePrefix=" + includePrefix
                 + " jvmArgCheck=" + jvmArg
@@ -97,7 +97,7 @@ public class JvmArgCheck_Test {
     
         String jvmArg = "-XX:+DisableAttachMechanism";
         
-        String startBat = "java -jar " + projectRootDir + "class-winter-core-2.5.0.jar"
+        String startBat = "java -jar " + projectRootDir + "class-winter-core-2.6.0.jar"
                 + " originJarOrWar=" + originJarOrWar
                 + " includePrefix=" + includePrefix
                 + " jvmArgCheck=" + jvmArg

+ 2 - 2
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-2.5.0.jar"
+        String startBat = "java -jar " + projectRootDir + "class-winter-core-2.6.0.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-2.5.0.jar"
+        String startBat = "java -jar " + projectRootDir + "class-winter-core-2.6.0.jar"
                 + " originJarOrWar=" + originJarOrWar
                 + " includePrefix=" + includePrefix
                 + " debug=" + true

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

@@ -34,7 +34,7 @@ public class Password_Test {
         String includePrefix = "com";
         String password = "pwd123";
     
-        String startBat = "java -jar " + projectRootDir + "class-winter-core-2.5.0.jar"
+        String startBat = "java -jar " + projectRootDir + "class-winter-core-2.6.0.jar"
                 + " originJarOrWar=" + originJarOrWar
                 + " includePrefix=" + includePrefix
                 + " password=" + password
@@ -65,7 +65,7 @@ public class Password_Test {
         String includePrefix = "com";
         String password = "pwd123";
     
-        String startBat = "java -jar " + projectRootDir + "class-winter-core-2.5.0.jar"
+        String startBat = "java -jar " + projectRootDir + "class-winter-core-2.6.0.jar"
                 + " originJarOrWar=" + originJarOrWar
                 + " includePrefix=" + includePrefix
                 + " password=" + password
@@ -97,7 +97,7 @@ public class Password_Test {
         String includePrefix = "com";
         String password = "pwd123";
     
-        String startBat = "java -jar " + projectRootDir + "class-winter-core-2.5.0.jar"
+        String startBat = "java -jar " + projectRootDir + "class-winter-core-2.6.0.jar"
                 + " originJarOrWar=" + originJarOrWar
                 + " includePrefix=" + includePrefix
                 + " password=" + password

+ 2 - 2
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-2.5.0.jar"
+        String startBat = "java -jar " + projectRootDir + "class-winter-core-2.6.0.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-2.5.0.jar"
+        String startBat = "java -jar " + projectRootDir + "class-winter-core-2.6.0.jar"
                 + " originJarOrWar=" + originJarOrWar
                 + " includePrefix=" + includePrefix
                 + " supportFile=" + supportFile

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

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

@@ -15,11 +15,11 @@ public class War_Test {
     public static void main(String[] args) {
         // 杀下进程(以保证端口没有被占用)
         BashUtil.killProcessByPorts("8080");
-//        test0();
+        test0();
 //        test1();
 //        test2();
 //        test3();
-        test4();
+//        test4();
     }
     
     /**
@@ -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-2.5.0.jar"
+        String startBat = "java -jar " + projectRootDir + "class-winter-core-2.6.0.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-2.5.0.jar"
+        String startBat = "java -jar " + projectRootDir + "class-winter-core-2.6.0.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-2.5.0.jar"
+        String startBat = "java -jar " + projectRootDir + "class-winter-core-2.6.0.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-2.5.0.jar"
+        String startBat = "java -jar " + projectRootDir + "class-winter-core-2.6.0.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-2.5.0.jar"
+        String startBat = "java -jar " + projectRootDir + "class-winter-core-2.6.0.jar"
                 + " originJarOrWar=" + originJarOrWar
                 + " includePrefix=" + includePrefix
                 + " excludePrefix=" + excludePrefix

+ 1 - 1
class-winter-core/src/test/java/winter/com/ideaaedi/classwinter/Xml_Test.java

@@ -31,7 +31,7 @@ public class Xml_Test {
         String toCleanXmlChildElementName = "select";
         
         
-        String startBat = "java -jar " + projectRootDir + "class-winter-core-2.5.0.jar"
+        String startBat = "java -jar " + projectRootDir + "class-winter-core-2.6.0.jar"
                 + " originJarOrWar=" + originJarOrWar
                 + " includePrefix=" + includePrefix
                 + " includeXmlPrefix=" + includeXmlPrefix

BIN
class-winter-core/src/test/resources/class-winter-core-2.6.0.jar


+ 1 - 1
class-winter-maven-plugin/pom.xml

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

+ 1 - 1
pom.xml

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