Merge branch 'master' into enhance-2.7.7

# Conflicts:
#	README.md
#	class-winter-core/pom.xml
#	class-winter-core/src/test/java/winter/com/ideaaedi/classwinter/AllTest.java
#	class-winter-core/src/test/java/winter/com/ideaaedi/classwinter/AlreadyProtectedLibs_Test.java
#	class-winter-core/src/test/java/winter/com/ideaaedi/classwinter/Debug_Test.java
#	class-winter-core/src/test/java/winter/com/ideaaedi/classwinter/ExcludePrefix_Test.java
#	class-winter-core/src/test/java/winter/com/ideaaedi/classwinter/FinalName_Test.java
#	class-winter-core/src/test/java/winter/com/ideaaedi/classwinter/IncludeLibs_Test.java
#	class-winter-core/src/test/java/winter/com/ideaaedi/classwinter/IncludePrefix_Test.java
#	class-winter-core/src/test/java/winter/com/ideaaedi/classwinter/JvmArgCheck_Test.java
#	class-winter-core/src/test/java/winter/com/ideaaedi/classwinter/OriginJarOrWar_Test.java
#	class-winter-core/src/test/java/winter/com/ideaaedi/classwinter/Password_Test.java
#	class-winter-core/src/test/java/winter/com/ideaaedi/classwinter/SupportFile_Test.java
#	class-winter-core/src/test/java/winter/com/ideaaedi/classwinter/Tips_Test.java
#	class-winter-core/src/test/java/winter/com/ideaaedi/classwinter/War_Test.java
#	class-winter-core/src/test/java/winter/com/ideaaedi/classwinter/Xml_Test.java
#	class-winter-maven-plugin/pom.xml
#	pom.xml

README.md

@@ -11,6 +11,7 @@
   - [将已加密的包提供给客户使用](#将已加密的包提供给客户使用)
     - [方案](#方案)
     - [示例](#示例)
+  - [QQ群](#QQ群)
 
 ---
 
@@ -51,7 +52,7 @@
   <plugin>
       <groupId>com.idea-aedi</groupId>
       <artifactId>class-winter-maven-plugin</artifactId>
-      <version>enhance-2.7.7</version>
+      <version>2.7.8</version>
       <!-- 相关配置 -->
       <configuration>
           <!-- <finalName></finalName>-->
@@ -82,15 +83,15 @@
   ```
   注：不必担心信息泄漏问题，使用此方式生成混淆的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.7.7.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.7.8.jar) 主动加密</font>
 
   ```bash
-  java -jar class-winter-core-enhance-2.7.7.jar originJarOrWar=${要加密的项目.jar或.war包} includePrefix=${加密范围} [k3=v3 k4=v4 ...]
+  java -jar class-winter-core-2.7.8.jar originJarOrWar=${要加密的项目.jar或.war包} includePrefix=${加密范围} [k3=v3 k4=v4 ...]
   # 对于复杂的参数值，可以使用引号引起来
   # linux
-  java -jar class-winter-core-enhance-2.7.7.jar k1='v1' k2='v2'
+  java -jar class-winter-core-2.7.8.jar k1='v1' k2='v2'
   # windows
-  java -jar class-winter-core-enhance-2.7.7.jar k1="v1" k2="v2"
+  java -jar class-winter-core-2.7.8.jar k1="v1" k2="v2"
   ```
 
 ## <font  face="幼圆" color = "#3399EA" >加密参数</font>
@@ -215,11 +216,11 @@ excludeXmlPrefix=BOOT-INF/classes/com/demo/mapper/,BOOT-INF/classes/com/demo/dao
 注：若lib需要密码，那么需要在指定lib的同时通过冒号接上密码。
 <br/>
 注：如果lib有密码，那么密码不能包含逗号。</td>
-    <td>alreadyProtectedLibs=a.jar,b.jar
+    <td>alreadyProtectedLibs=a.jar,b-1.0.0.jar
     <br/>
-alreadyProtectedLibs=a.jar,b.jar:pwd123
+alreadyProtectedLibs=a.jar,b-1.0.0.jar:pwd123
 <br/>
-alreadyProtectedLibs=a.jar:pwd1,b.jar:pwd2</td>
+alreadyProtectedLibs=a.jar:pwd1,b-1.0.0.jar:pwd2</td>
   </tr>
     <tr align="center">
     <td>supportFile</td>
@@ -268,6 +269,7 @@ linux示例：tips='请不要直接使用混淆后的jar/war'</td>
 
 
 
+
 ## <font  face="幼圆" color = "#3399EA" >解密(启动)</font>
 
 通过-javaagent指定代理进行解密启动。
@@ -275,8 +277,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.7.7.jar
-  # java -javaagent:/class-winter-core-enhance-2.7.7.jar -jar /your-project-encrypted.jar
+  # 也可以用class-winter-core-2.7.8.jar
+  # java -javaagent:/class-winter-core-2.7.8.jar -jar /your-project-encrypted.jar
   # 或者指定参数
   # java -javaagent:/your-project-encrypted.jar=debug=true,password=pwd12345 -jar /your-project-encrypted.jar
   # 参数可以引起来(linux)
@@ -292,8 +294,8 @@ linux示例：tips='请不要直接使用混淆后的jar/war'</td>
     编辑tomcat/bin/catalina.sh文件，在最上面加上
 
     ```bash
-    # 如果你有参数， 那么 -javaagent:/class-winter-core-enhance-2.7.7.jar=k1=v1,k2=v2
-    CATALINA_OPTS="$CATALINA_OPTS -javaagent:/class-winter-core-enhance-2.7.7.jar=debug=true";
+    # 如果你有参数， 那么 -javaagent:/class-winter-core-2.7.8.jar=k1=v1,k2=v2
+    CATALINA_OPTS="$CATALINA_OPTS -javaagent:/class-winter-core-2.7.8.jar=debug=true";
     export CATALINA_OPTS;
     ```
 
@@ -302,8 +304,8 @@ linux示例：tips='请不要直接使用混淆后的jar/war'</td>
     在tomcat/bin目录下创建setenv.sh文件，并写上
 
     ```bash
-    # 如果你有参数， 那么 -javaagent:/class-winter-core-enhance-2.7.7.jar=k1=v1,k2=v2
-    JAVA_OPTS="$JAVA_OPTS -javaagent:/class-winter-core-enhance-2.7.7.jar=debug=true";
+    # 如果你有参数， 那么 -javaagent:/class-winter-core-2.7.8.jar=k1=v1,k2=v2
+    JAVA_OPTS="$JAVA_OPTS -javaagent:/class-winter-core-2.7.8.jar=debug=true";
     export JAVA_OPTS;
     ```
 
@@ -312,8 +314,8 @@ linux示例：tips='请不要直接使用混淆后的jar/war'</td>
     编辑tomcat/bin/catalina.bat文件，在@echo off后加上catalina参数
 
     ```bash
-    rem 如果你有参数， 那么 -javaagent:D:/class-winter-core-enhance-2.7.7.jar=k1=v1,k2=v2
-    set CATALINA_OPTS="-javaagent:D:/class-winter-core-enhance-2.7.7.jar"
+    rem 如果你有参数， 那么 -javaagent:D:/class-winter-core-2.7.8.jar=k1=v1,k2=v2
+    set CATALINA_OPTS="-javaagent:D:/class-winter-core-2.7.8.jar"
     ```
 
   - windows方式二
@@ -321,8 +323,8 @@ linux示例：tips='请不要直接使用混淆后的jar/war'</td>
     在tomcat/bin目录下创建setenv.bat文件，并写上
 
     ```bash
-    rem 如果你有参数， 那么 -javaagent:D:/class-winter-core-enhance-2.7.7.jar=k1=v1,k2=v2
-    set JAVA_OPTS="-javaagent:D:/class-winter-core-enhance-2.7.7.jar"
+    rem 如果你有参数， 那么 -javaagent:D:/class-winter-core-2.7.8.jar=k1=v1,k2=v2
+    set JAVA_OPTS="-javaagent:D:/class-winter-core-2.7.8.jar"
     ```
 
 - #### <font  face="幼圆" color = "#86CA5E" >IDE解密(启动)</font>
@@ -363,7 +365,7 @@ linux示例：tips='请不要直接使用混淆后的jar/war'</td>
     <tr align="center">
     <td>skipProjectPathPrefix</td>
     <td>否</td>
-    <td>是否跳过指定前缀的项目路径（当class-winter解密逻辑试图解析那些进入premain但是非class-winter加密项目时，会因为获取印章失败Obtain project seal fail而停止，此时如果确认这个项目没有加密文件的话，可以使用此参数跳过）<br/>注：此参数由2.6.4版本开始支持</td>
+    <td>是否跳过指定前缀的项目路径（当class-winter解密逻辑试图解析那些进入premain但是非class-winter加密项目时，会因为获取印章失败Obtain project seal fail而停止，此时如果确认这个项目没有加密文件的话，可以使用此参数跳过）<br/>注：不知道此值怎么填的，可以把debug代开， 观察日志 Exist projectPath -> xxx 或输出所有的projectPath <br/>注：此参数由2.6.4版本开始支持</td>
     <td>
         skipProjectPathPrefix=/D:/apache-tomcat-9.0.71/bin/
         <br/>
@@ -373,7 +375,7 @@ linux示例：tips='请不要直接使用混淆后的jar/war'</td>
     <tr align="center">
     <td>decryptProjectPathPrefix</td>
     <td>否</td>
-    <td>是否仅解密指定前缀的项目路径（优先级低于skipProjectPathPrefix）<br/>注：此参数由2.6.6版本开始支持</td>
+    <td>是否仅解密指定前缀的项目路径（优先级低于skipProjectPathPrefix）<br/>注：不知道此值怎么填的，可以把debug代开， 观察日志 Exist projectPath -> xxx 或输出所有的projectPath <br/>注：此参数由2.6.6版本开始支持</td>
     <td>
         decryptProjectPathPrefix=/D:/apache-tomcat-9.0.71/bin/
         <br/>
@@ -401,11 +403,13 @@ linux示例：tips='请不要直接使用混淆后的jar/war'</td>
 
 ### <font  face="幼圆" color = "#86CA5E" >方案</font>
 
-- 方案一（适用于A依赖于encrypted-B.jar，启动A的情况）
+- 方案一（适用于encrypted-A依赖于encrypted-B.jar，启动encrypted-A的情况）
+
+  >  提示：此方式也适用于不加密A的情况，在A里的class-winter配置你只需要指定一个不存在的includePrefix即可
 
   class-winter加密时，使用`alreadyProtectedLibs`参数，但是要求客户的项目也需要使用class-winter加密（，哪怕客户的项目什么也不需要加密，也要求客户有使用class-winter这个动作）
 
-- 方案二（适用于encrypted-A依赖于encrypted-B.jar，启动A的情况
+- 方案二（适用于A依赖于encrypted-B.jar，启动A的情况）
 
   利用`-Dloader.path`或其它方案，将encrypted-B.jar外置，并通过`decryptProjectPathPrefix`或`skipProjectPathPrefix`来定位encrypted-B.jar
 
@@ -431,7 +435,7 @@ linux示例：tips='请不要直接使用混淆后的jar/war'</td>
       <parent>
           <groupId>org.springframework.boot</groupId>
           <artifactId>spring-boot-starter-parent</artifactId>
-          <version>enhance-2.7.7</version>
+          <version>2.7.8</version>
           <relativePath/> <!-- lookup parent from repository -->
       </parent>
       <groupId>com.example</groupId>
@@ -535,3 +539,10 @@ linux示例：tips='请不要直接使用混淆后的jar/war'</td>
 
   ![使用loader.path引入依赖](./file/3.png)
 
+
+
+## QQ群
+
+> 群号：727930548
+
+![qq群](./file/5.png)

class-winter-core/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.idea-aedi</groupId>
         <artifactId>class-winter</artifactId>
-        <version>enhance-2.7.7</version>
+        <version>2.7.8</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/main/java/winter/com/ideaaedi/classwinter/Reverses.java

@@ -154,11 +154,34 @@ public class Reverses {
                     // 本项目的印章
                     if (Cache.sealCache == null) {
                         try {
-                            byte[] sealByte = IOUtil.readFileFromWorkbenchRoot(new File(projectPath),
-                                    Constant.SEAL_FILE);
+                            byte[] sealByte = IOUtil.readFileFromWorkbenchRoot(new File(projectPath), Constant.SEAL_FILE);
+                            if (sealByte == null) {
+                                try {
+                                    // 试着修正projectPath
+                                    String correctionProjectPath = JarUtil.getRootPath(projectPath);
+                                    sealByte = IOUtil.readFileFromWorkbenchRoot(new File(correctionProjectPath),
+                                            Constant.SEAL_FILE);
+                                    if (sealByte != null) {
+                                        Logger.debug(Reverses.class, "Fix projectPath from '" + projectPath
+                                                + "' to '" + correctionProjectPath + "'.");
+                                        projectPath = correctionProjectPath;
+                                        if (!projectPathSet.contains(projectPath)) {
+                                            Logger.debug(Reverses.class, "Exist projectPath -> " +  projectPath);
+                                            projectPathSet.add(projectPath);
+                                        }
+                                    }
+                                } catch (Exception e) {
+                                    // ignore
+                                }
+                            }
+                            if (sealByte == null) {
+                                Logger.error(Reverses.class, "Obtain project seal fail. projectPath -> " + projectPath);
+                                // 结束程序
+                                exit(projectPath);
+                            }
                             String sealContent = new String(sealByte, StandardCharsets.UTF_8);
                             if (StrUtil.isBlank(sealContent)) {
-                                Logger.error(Reverses.class, "Obtain project seal fail.");
+                                Logger.error(Reverses.class, "Obtain project seal fail. projectPath -> " + projectPath);
                                 // 结束程序
                                 exit(projectPath);
                             }

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.7.7.jar"
+        String startBat = "java -jar " + projectRootDir + "class-winter-core-2.7.8.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.7.7.jar"
+        String startBat = "java -jar " + projectRootDir + "class-winter-core-2.7.8.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.7.7.jar"
+        String startBat = "java -jar " + projectRootDir + "class-winter-core-2.7.8.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.7.7.jar"
+        String startBat = "java -jar " + projectRootDir + "class-winter-core-2.7.8.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.7.7.jar"
+        String startBat = "java -jar " + projectRootDir + "class-winter-core-2.7.8.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.7.7.jar"
+        String startBat = "java -jar " + projectRootDir + "class-winter-core-2.7.8.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-enhance-2.7.7.jar"
+        String startBat = "java -jar " + projectRootDir + "class-winter-core-2.7.8.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.7.7.jar"
+        String startBat = "java -jar " + projectRootDir + "class-winter-core-2.7.8.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-enhance-2.7.7.jar"
+        String startBat = "java -jar " + projectRootDir + "class-winter-core-2.7.8.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-enhance-2.7.7.jar"
+        String startBat = "java -jar " + projectRootDir + "class-winter-core-2.7.8.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.7.7.jar"
+        String startBat = "java -jar " + projectRootDir + "class-winter-core-2.7.8.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.7.7.jar"
+        String startBat = "java -jar " + projectRootDir + "class-winter-core-2.7.8.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.7.7.jar"
+        String startBat = "java -jar " + projectRootDir + "class-winter-core-2.7.8.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.7.7.jar"
+        String startBat = "java -jar " + projectRootDir + "class-winter-core-2.7.8.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.7.7.jar"
+        String startBat = "java -jar " + projectRootDir + "class-winter-core-2.7.8.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.7.7.jar"
+        String startBat = "java -jar " + projectRootDir + "class-winter-core-2.7.8.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.7.7.jar"
+        String startBat = "java -jar " + projectRootDir + "class-winter-core-2.7.8.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.7.7.jar"
+        String startBat = "java -jar " + projectRootDir + "class-winter-core-2.7.8.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.7.7.jar"
+        String startBat = "java -jar " + projectRootDir + "class-winter-core-2.7.8.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.7.7.jar"
+        String startBat = "java -jar " + projectRootDir + "class-winter-core-2.7.8.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.7.7.jar"
+        String startBat = "java -jar " + projectRootDir + "class-winter-core-2.7.8.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.7.7.jar originJarOrWar=/boot-jar.jar includePrefix=com tips="[潘嘎之交] 潘: 你别怪潘叔说话比较直白, 网络上的东西都是虚拟的, 你把握不住, 孩子! 因为这里的水很深..."
-        String startBat = "java -jar " + projectRootDir + "class-winter-core-enhance-2.7.7.jar"
+        // java -jar class-winter-core-2.7.8.jar originJarOrWar=/boot-jar.jar includePrefix=com tips="[潘嘎之交] 潘: 你别怪潘叔说话比较直白, 网络上的东西都是虚拟的, 你把握不住, 孩子! 因为这里的水很深..."
+        String startBat = "java -jar " + projectRootDir + "class-winter-core-2.7.8.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.7.7.jar"
+        String startBat = "java -jar " + projectRootDir + "class-winter-core-2.7.8.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.7.7.jar"
+        String startBat = "java -jar " + projectRootDir + "class-winter-core-2.7.8.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.7.7.jar"
+        String startBat = "java -jar " + projectRootDir + "class-winter-core-2.7.8.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.7.7.jar"
+        String startBat = "java -jar " + projectRootDir + "class-winter-core-2.7.8.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.7.7.jar"
+        String startBat = "java -jar " + projectRootDir + "class-winter-core-2.7.8.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.7.7.jar"
+        String startBat = "java -jar " + projectRootDir + "class-winter-core-2.7.8.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.7.7</version>
+        <version>2.7.8</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.7.7</version>
+    <version>2.7.8</version>
 
     <!-- 配置项目的基础信息 -->
     <name>class-winter</name>
@@ -27,18 +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>
             <!-- 打包源码 -->