修复加密过滤问题

core-lib · Jul 26, 2019 · 5611c06 · 5611c06
1 parent 5f1be8c
commit 5611c06
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>io.xjar</groupId>
     <artifactId>xjar</artifactId>
-    <version>v3.0.0-demo-build-2</version>
+    <version>v3.0.0-demo-build-3</version>
 
     <name>xjar</name>
 

diff --git a/src/main/java/io/xjar/boot/XBootDecryptor.java b/src/main/java/io/xjar/boot/XBootDecryptor.java
@@ -39,7 +39,11 @@ public void decrypt(XKey key, InputStream in, OutputStream out) throws IOExcepti
             zos.setLevel(level);
             XUnclosedInputStream nis = new XUnclosedInputStream(zis);
             XUnclosedOutputStream nos = new XUnclosedOutputStream(zos);
-            XJarDecryptor xJarDecryptor = new XJarDecryptor(xDecryptor, filter, level);
+            XJarDecryptor xJarDecryptor = XJarDecryptor.builder()
+                    .decryptor(xDecryptor)
+                    .filter(filter)
+                    .level(level)
+                    .build();
             JarArchiveEntry entry;
             while ((entry = zis.getNextJarEntry()) != null) {
                 if (entry.getName().startsWith(XJAR_SRC_DIR)

diff --git a/src/main/java/io/xjar/boot/XBootEncryptor.java b/src/main/java/io/xjar/boot/XBootEncryptor.java
@@ -66,7 +66,14 @@ public void encrypt(XKey key, InputStream in, OutputStream out) throws IOExcepti
             zos.setLevel(level);
             XUnclosedInputStream nis = new XUnclosedInputStream(zis);
             XUnclosedOutputStream nos = new XUnclosedOutputStream(zos);
-            XJarEncryptor xJarEncryptor = XJarEncryptor.builder().build();
+            XJarEncryptor xJarEncryptor = XJarEncryptor.builder()
+                    .encryptor(xEncryptor)
+                    .filter(filter)
+                    .level(level)
+                    .digestFactory(digestFactory)
+                    .digestAlgorithm(digestAlgorithm)
+                    .compiler(compiler)
+                    .build();
             JarArchiveEntry entry;
             Manifest manifest = null;
             while ((entry = zis.getNextJarEntry()) != null) {