版本号更新2.8.6

(cherry picked from commit 6c500b1ef7afdeb1a9a56e9e0c5134ee6b2e7b26)

README.md

@@ -45,19 +45,20 @@
 - #### <font face="幼圆" ><font face="幼圆"  color = "#86CA5E">**方式一**</font>：通过maven插件自动加密</font>
   ```xml
   <!--
-      class-winter插件
+      class-winter插件``
       注:自Maven3.0.3起, 绑定到同一phase的Maven插件将按照pom.xml中声明的顺序执行
       注:此插件最好放置在同一phase的最后执行。
+      注:此插件不具备打包功能，需要在此插件前有打包插件进行项目打包，否则加密不会生效。
   -->
   <plugin>
       <groupId>com.idea-aedi</groupId>
       <artifactId>class-winter-maven-plugin</artifactId>
-      <version>enhance-2.8.5</version>
+      <version>2.8.6</version>
       <!-- 相关配置 -->
       <configuration>
           <!-- <finalName></finalName>-->
           <includePrefix>加密范围</includePrefix>
-          <!-- <originJarOrWar></originJarOrWar>-->
+          <!-- <originJarOrWar>非必填（不填则自动获取）</originJarOrWar>-->
           <!-- <excludePrefix></excludePrefix>-->
           <!-- <includeXmlPrefix></includeXmlPrefix>-->
           <!-- <excludeXmlPrefix></excludeXmlPrefix>-->
@@ -83,19 +84,25 @@
   ```
   注：不必担心信息泄漏问题，使用此方式生成混淆的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-enhance-2.8.5.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-2.8.6.jar) 主动加密</font>
 
   ```bash
-  java -jar class-winter-core-enhance-2.8.5.jar originJarOrWar=${要加密的项目.jar或.war包} includePrefix=${加密范围} [k3=v3 k4=v4 ...]
+  java -jar class-winter-core-2.8.6.jar originJarOrWar=${要加密的项目.jar或.war包} includePrefix=${加密范围} [k3=v3 k4=v4 ...]
   # 对于复杂的参数值，可以使用引号引起来
   # linux
-  java -jar class-winter-core-enhance-2.8.5.jar k1='v1' k2='v2'
+  java -jar class-winter-core-2.8.6.jar k1='v1' k2='v2'
   # windows
-  java -jar class-winter-core-enhance-2.8.5.jar k1="v1" k2="v2"
+  java -jar class-winter-core-2.8.6.jar k1="v1" k2="v2"
   ```
 
 ## <font  face="幼圆" color = "#3399EA" >加密参数</font>
 
+> <font  face="幼圆" color = "#F53B45">**提示：**</font>慎用`cca（尤其）`、`cma`、`cfa`参数，如果要用，请做好充分测试。
+>
+> 原因说明：部分框架在获取某些元数据时，并不全都从已被premain处理后的类中读取，而是直接去对应位置读取资源文件本身（如：spring的`SimpleMetadataReader implements MetadataReader`直接去读取.class文件本身，以知道是否需要将类注册进容器等），因为class-winter会对该位置的资源进行加密（如：使用cca、cma、cfa时会擦除类、方法、字段上的注解信息），因此此时如果直接去.class文件本身获取元信息的话，可能会丢失部分信息（如：被class-winter擦除了的类的注解信息就读取不到）
+>
+> 解决办法：可以考虑对相关逻辑进行定制，使其不从已加密的.class中获取相关信息（如：spring框架可考虑定制MetadataReader）
+
 <table>
   <tr align="center">
     <td>参数</td>
@@ -124,19 +131,19 @@ includePrefix=com,org</td>
  <tr align="center">
     <td>cca（依托于includePrefix）</td>
     <td>否</td>
-    <td>作为includePrefix的附加设置，设置是否清空类上的注释（写法同url后面设置参数）</td>
+    <td>作为includePrefix的附加设置，设置是否清空类上的注解（写法同url后面设置参数）</td>
     <td>includePrefix=com?cca=true</td>
   </tr>
  <tr align="center">
     <td>cma（依托于includePrefix）</td>
     <td>否</td>
-    <td>作为includePrefix的附加设置，设置是否清空方法上的注释（写法同url后面设置参数）</td>
+    <td>作为includePrefix的附加设置，设置是否清空方法上的注解（写法同url后面设置参数）</td>
     <td>includePrefix=com?cca=true&cma=true</td>
   </tr>
  <tr align="center">
     <td>cfa（依托于includePrefix）</td>
     <td>否</td>
-    <td>作为includePrefix的附加设置，设置是否清空字段上的注释（写法同url后面设置参数）</td>
+    <td>作为includePrefix的附加设置，设置是否清空字段上的注解（写法同url后面设置参数）</td>
     <td>includePrefix=com?cca=true&cma=true&cfa=true</td>
   </tr>
     <tr align="center">
@@ -296,8 +303,8 @@ linux示例：tips='请不要直接使用混淆后的jar/war'</td>
   ```bash
   # 假设your-project-encrypted.jar是由class-winter加密后的包，那么你可以这么启动
   java -javaagent:/your-project-encrypted.jar -jar /your-project-encrypted.jar
-  # 也可以用class-winter-core-enhance-2.8.5.jar
-  # java -javaagent:/class-winter-core-enhance-2.8.5.jar -jar /your-project-encrypted.jar
+  # 也可以用class-winter-core-2.8.6.jar
+  # java -javaagent:/class-winter-core-2.8.6.jar -jar /your-project-encrypted.jar
   # 或者指定参数
   # java -javaagent:/your-project-encrypted.jar=debug=true,password=pwd12345 -jar /your-project-encrypted.jar
   # 参数可以引起来(linux)
@@ -313,9 +320,9 @@ linux示例：tips='请不要直接使用混淆后的jar/war'</td>
     编辑tomcat/bin/catalina.sh文件，在最上面加上
 
     ```bash
-    # 如果你有参数， 那么 -javaagent:/class-winter-core-enhance-2.8.5.jar=k1=v1,k2=v2
+    # 如果你有参数， 那么 -javaagent:/class-winter-core-2.8.6.jar=k1=v1,k2=v2
     # tomcat启动往往需要通过decryptProjectPathPrefix指定要解密的路径
-    CATALINA_OPTS="$CATALINA_OPTS -javaagent:/class-winter-core-enhance-2.8.5.jar=debug=true,decryptProjectPathPrefix=/usr/local/xxx/";
+    CATALINA_OPTS="$CATALINA_OPTS -javaagent:/class-winter-core-2.8.6.jar=debug=true,decryptProjectPathPrefix=/usr/local/xxx/";
     export CATALINA_OPTS;
     ```
   
@@ -324,9 +331,9 @@ linux示例：tips='请不要直接使用混淆后的jar/war'</td>
     在tomcat/bin目录下创建setenv.sh文件，并写上
   
     ```bash
-    # 如果你有参数， 那么 -javaagent:/class-winter-core-enhance-2.8.5.jar=k1=v1,k2=v2
+    # 如果你有参数， 那么 -javaagent:/class-winter-core-2.8.6.jar=k1=v1,k2=v2
     # tomcat启动往往需要通过decryptProjectPathPrefix指定要解密的路径
-    JAVA_OPTS="$JAVA_OPTS -javaagent:/class-winter-core-enhance-2.8.5.jar=debug=true,decryptProjectPathPrefix=/usr/local/xxx/";
+    JAVA_OPTS="$JAVA_OPTS -javaagent:/class-winter-core-2.8.6.jar=debug=true,decryptProjectPathPrefix=/usr/local/xxx/";
     export JAVA_OPTS;
     ```
 
@@ -335,9 +342,9 @@ linux示例：tips='请不要直接使用混淆后的jar/war'</td>
     编辑tomcat/bin/catalina.bat文件，在@echo off后加上catalina参数
   
     ```bash
-    rem 如果你有参数， 那么 -javaagent:D:/class-winter-core-enhance-2.8.5.jar=k1=v1,k2=v2
+    rem 如果你有参数， 那么 -javaagent:D:/class-winter-core-2.8.6.jar=k1=v1,k2=v2
     rem tomcat启动往往需要通过decryptProjectPathPrefix指定要解密的路径
-    set CATALINA_OPTS="-javaagent:D:/class-winter-core-enhance-2.8.5.jar=decryptProjectPathPrefix=/D:/tmp/"
+    set CATALINA_OPTS="-javaagent:D:/class-winter-core-2.8.6.jar=decryptProjectPathPrefix=/D:/tmp/"
     ```
   
   - windows方式二
@@ -345,9 +352,9 @@ linux示例：tips='请不要直接使用混淆后的jar/war'</td>
     在tomcat/bin目录下创建setenv.bat文件，并写上
   
     ```bash
-    rem 如果你有参数， 那么 -javaagent:D:/class-winter-core-enhance-2.8.5.jar=k1=v1,k2=v2
+    rem 如果你有参数， 那么 -javaagent:D:/class-winter-core-2.8.6.jar=k1=v1,k2=v2
     rem tomcat启动往往需要通过decryptProjectPathPrefix指定要解密的路径
-    set JAVA_OPTS="-javaagent:D:/class-winter-core-enhance-2.8.5.jar=decryptProjectPathPrefix=/D:/tmp/"
+    set JAVA_OPTS="-javaagent:D:/class-winter-core-2.8.6.jar=decryptProjectPathPrefix=/D:/tmp/"
     ```
   
 - #### <font  face="幼圆" color = "#86CA5E" >IDE解密(启动)</font>
@@ -419,7 +426,7 @@ linux示例：tips='请不要直接使用混淆后的jar/war'</td>
 
 - 背景说明：我们利用class-winter混淆项目时，项目是被混淆了，但是class-winter本身还是明文的，这就留下了一些安全隐患（即：那些不指定密码的混淆，可能会被反向破解）
 - 增强支持：我们可以对class-winter本身进行加密，你可以切换至`enhance-*`分支，在首页下载被混淆的class-winter进行测试，或者clone代码，install后进行测试
-- <font face="幼圆"  color = "#F53B45">**声明**</font>：因为在`enhance-*`分支里对class-winter本身进行加密时用到了名义上的收费工具allatori（实际上有破解版之类的），所以`enhance-*`分支的代码，本人并未发布至maven官方仓库
+- <font face="幼圆"  color = "#F53B45">**声明**</font>：因为在`enhance-*`分支里对class-winter本身进行加密时用到了收费工具allatori（实际上有供学习使用的破解版之类的），所以`enhance-*`分支的代码，本人并未发布至maven官方仓库
 
 
 ## <font  face="幼圆" color = "#3399EA" >将已加密的包提供给客户使用</font>
@@ -458,7 +465,7 @@ linux示例：tips='请不要直接使用混淆后的jar/war'</td>
       <parent>
           <groupId>org.springframework.boot</groupId>
           <artifactId>spring-boot-starter-parent</artifactId>
-          <version>enhance-2.8.5</version>
+          <version>2.8.6</version>
           <relativePath/> <!-- lookup parent from repository -->
       </parent>
       <groupId>com.example</groupId>

class-winter-core/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.idea-aedi</groupId>
         <artifactId>class-winter</artifactId>
-        <version>enhance-2.8.5</version>
+        <version>2.8.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -53,28 +53,6 @@
                     </execution>
                 </executions>
             </plugin>
-
-            <!-- 运行程序的插件 -->
-            <!-- 这里利用此插件，执行指令，对class-winter-core进行混淆 -->
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-                <version>3.1.0</version>
-                <executions>
-                    <execution>
-                        <id>obfuscation-class-winter-core</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>exec</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <executable>
-                        start cmd /k  ${basedir}/enhance/obfuscation-class-winter-core.bat
-                    </executable>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 </project>

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

@@ -77,7 +77,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-enhance-2.8.5.jar"
+        String startBat = "java -jar " + projectRootDir + "class-winter-core-2.8.6.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-enhance-2.8.5.jar"
+        String startBat = "java -jar " + projectRootDir + "class-winter-core-2.8.6.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-enhance-2.8.5.jar"
+        String startBat = "java -jar " + projectRootDir + "class-winter-core-2.8.6.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-enhance-2.8.5.jar"
+        String startBat = "java -jar " + projectRootDir + "class-winter-core-2.8.6.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-enhance-2.8.5.jar"
+        String startBat = "java -jar " + projectRootDir + "class-winter-core-2.8.6.jar"
                 + " originJarOrWar=" + originJarOrWar
                 + " includePrefix=" + includePrefix
                 + " debug=" + true

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

@@ -42,6 +42,9 @@ public class EncryptArgParam_Test {
         argMap.put(Constant.CLEAN_CLASS_ANNOTATION_PARAM_NAME, "true");  // 默认为false
         argMap.put(Constant.CLEAN_METHOD_ANNOTATION_PARAM_NAME, "false");  // 默认为false
         argMap.put(Constant.CLEAN_FIELD_ANNOTATION_PARAM_NAME, "true"); // 默认为false
+        // 这里仅作测试实际清除spring boot注解会有问题 ，spring ClassReader读的是本地classfile 所以清除的spring 注解读取不到了
+        argMap.put(Constant.TO_CLEAN_FIELD_ANNOTATION_PREFIX, "org.springframework.context.annotation.Configuration"); // 默认为''
+
         have(argMap);
     }
     
@@ -67,7 +70,7 @@ public class EncryptArgParam_Test {
             includePrefix= sb.toString();
         }
         
-        String startBat = "java -jar " + projectRootDir + "class-winter-core-enhance-2.8.5.jar"
+        String startBat = "java -jar " + projectRootDir + "class-winter-core-2.8.6.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-enhance-2.8.5.jar"
+        String startBat = "java -jar " + projectRootDir + "class-winter-core-2.8.6.jar"
                 + " originJarOrWar=" + originJarOrWar
                 + " includePrefix=" + includePrefix
                 + " debug=" + true
@@ -70,9 +70,9 @@ public class ExcludePrefix_Test {
         String projectRootDir = PathUtil.getProjectRootDir(AlreadyProtectedLibs_Test.class);
         String originJarOrWar = projectRootDir + "boot-jar.jar";
         String includePrefix = "com.aspire.ssm.util.AesEncryptDecryptUtil,com.aspire.ssm.util.DbSecurityBeanUtil";
-        String excludePrefix = "com.aspire.ssm.util.DbSecurityBeanUtil";
+        String excludePrefix = "com.aspire.*.DbSecurityBeanUtil";
     
-        String startBat = "java -jar " + projectRootDir + "class-winter-core-enhance-2.8.5.jar"
+        String startBat = "java -jar " + projectRootDir + "class-winter-core-2.8.6.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-enhance-2.8.5.jar"
+        String startBat = "java -jar " + projectRootDir + "class-winter-core-2.8.6.jar"
                 + " originJarOrWar=" + originJarOrWar
                 + " includePrefix=" + includePrefix
                 + " finalName=" + finalName

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

@@ -40,9 +40,9 @@ public class IncludeLibs_Test {
         String projectRootDir = PathUtil.getProjectRootDir(AlreadyProtectedLibs_Test.class);
         String originJarOrWar = projectRootDir + "boot-jar.jar";
         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 includeLibs = "spring-aop-.*.RELEASE.jar,guava-28.2-jre.jar";
     
-        String startBat = "java -jar " + projectRootDir + "class-winter-core-enhance-2.8.5.jar"
+        String startBat = "java -jar " + projectRootDir + "class-winter-core-2.8.6.jar"
                 + " originJarOrWar=" + originJarOrWar
                 + " includePrefix=" + includePrefix
                 + " includeLibs=" + includeLibs

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

@@ -37,9 +37,9 @@ public class IncludePrefix_Test {
         BashUtil.killProcessByPorts("8080");
         String projectRootDir = PathUtil.getProjectRootDir(AlreadyProtectedLibs_Test.class);
         String originJarOrWar = projectRootDir + "boot-jar.jar";
-        String includePrefix = "com.aspire.ssm.util";
+        String includePrefix = "com.aspire.*.util";
     
-        String startBat = "java -jar " + projectRootDir + "class-winter-core-enhance-2.8.5.jar"
+        String startBat = "java -jar " + projectRootDir + "class-winter-core-2.8.6.jar"
                 + " originJarOrWar=" + originJarOrWar
                 + " includePrefix=" + includePrefix
                 + " debug=" + true

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-enhance-2.8.5.jar"
+        String startBat = "java -jar " + projectRootDir + "class-winter-core-2.8.6.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-enhance-2.8.5.jar"
+        String startBat = "java -jar " + projectRootDir + "class-winter-core-2.8.6.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-enhance-2.8.5.jar"
+        String startBat = "java -jar " + projectRootDir + "class-winter-core-2.8.6.jar"
                 + " originJarOrWar=" + originJarOrWar
                 + " includePrefix=" + includePrefix
                 + " jvmArgCheck=" + jvmArg

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

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

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-enhance-2.8.5.jar"
+        String startBat = "java -jar " + projectRootDir + "class-winter-core-2.8.6.jar"
                 + " originJarOrWar=" + originJarOrWar
                 + " includePrefix=" + includePrefix
                 + " includeXmlPrefix=" + includeXmlPrefix

class-winter-maven-plugin/pom.xml

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

pom.xml

@@ -9,7 +9,7 @@
     </modules>
     <groupId>com.idea-aedi</groupId>
     <artifactId>class-winter</artifactId>
-    <version>enhance-2.8.5</version>
+    <version>2.8.6</version>
 
     <!-- 配置项目的基础信息 -->
     <name>class-winter</name>
@@ -27,20 +27,6 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     </properties>
 
-
-<!--        <distributionManagement>-->
-<!--            <repository>-->
-<!--                <id>aliyun-nexus-jd</id>-->
-<!--                <url>http://47.105.39.189:8081/repository/maven-releases/</url>-->
-<!--            </repository>-->
-
-<!--            <snapshotRepository>-->
-<!--                <id>aliyun-nexus-jd</id>-->
-<!--                <url>http://47.105.39.189:8081/repository/maven-snapshots/</url>-->
-<!--            </snapshotRepository>-->
-<!--        </distributionManagement>-->
-
-
     <build>
         <plugins>
             <!-- 打包源码 -->