更新至2.33

1.百度云解压修复算法修复，并把递归改成循环避免栈溢出 2.启动证书安装检查bug修复 3.火狐浏览器不支持根证书的bug修复
vcdog · Mar 6, 2018 · 827a4d4 · 827a4d4
1 parent 85747f9
commit 827a4d4
Show file tree

Hide file tree

Showing 9 changed files with 46 additions and 26 deletions.
diff --git a/common/pom.xml b/common/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>proxyee-down</artifactId>
     <groupId>lee.study</groupId>
-    <version>2.32</version>
+    <version>2.33</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/common/src/main/java/lee/study/down/io/BdyZip.java b/common/src/main/java/lee/study/down/io/BdyZip.java
@@ -154,16 +154,41 @@ private static long fixedEntrySize(FileChannel fileChannel, BdyZipEntry zipEntry
             ZIP_ENTRY_FILE_HEARD, ZIP_ENTRY_DIR_HEARD);
     BdyZipEntry nextEntry = getNextBdyZipEntry(fileChannel,
         zipEntry.getFileStartPosition() + fixedSize);
-    //修复长度后下个文件目录没对上
-    if (!Arrays.equals(nextEntry.getHeader(), Arrays.copyOfRange(ZIP_ENTRY_DIR_HEARD, 0, 4))
-        && !isRight(dirList, nextEntry)) {
-      return fixedEntrySize(fileChannel, zipEntry, fixedSize + ZIP_ENTRY_FILE_HEARD.length,
-          dirList, callback);
+    //修复长度后下个文件没对上
+    if (!isRight(dirList, nextEntry)) {
+      while (fixedSize != -1) {
+        long nextSize = fixedSize + ZIP_ENTRY_FILE_HEARD.length;
+        if (callback != null) {
+          callback.onFix(fileChannel.size(), zipEntry.getFileStartPosition() + nextSize);
+        }
+        fixedSize = ByteUtil
+            .getNextTokenSize(fileChannel, zipEntry.getFileStartPosition(),
+                zipEntry.getFileStartPosition() + nextSize,
+                ZIP_ENTRY_FILE_HEARD, ZIP_ENTRY_DIR_HEARD);
+        nextEntry = getNextBdyZipEntry(fileChannel,
+            zipEntry.getFileStartPosition() + fixedSize);
+        if (isRight(dirList, nextEntry)) {
+          break;
+        }
+      }
+      return fixedSize;
     } else {
       return fixedSize;
     }
   }
 
+  private static boolean isRight(List<String> dirList, BdyZipEntry nextEntry) {
+    if (Arrays.equals(nextEntry.getHeader(), Arrays.copyOfRange(ZIP_ENTRY_DIR_HEARD, 0, 4))) {
+      return true;
+    } else {
+      if (nextEntry.isDir()) {
+        return inDirList(dirList, nextEntry.getFileName());
+      } else {
+        return nextEntry.getFileName().matches("^" + dirList.get(dirList.size() - 1) + "[^/]*$");
+      }
+    }
+  }
+
   public static List<BdyZipEntry> getFixedEntryList(FileChannel fileChannel,
       BdyUnzipCallback callback) throws IOException {
     List<BdyZipEntry> list = new ArrayList<>();
@@ -198,14 +223,6 @@ private static boolean inDirList(List<String> dirList, String dir) {
     return false;
   }
 
-  private static boolean isRight(List<String> dirList, BdyZipEntry nextEntry) {
-    if (nextEntry.isDir()) {
-      return inDirList(dirList, nextEntry.getFileName());
-    } else {
-      return nextEntry.getFileName().matches("^" + dirList.get(dirList.size() - 1) + "[^/]*$");
-    }
-  }
-
   public static void unzip(String path, String toPath, BdyUnzipCallback callback)
       throws IOException {
     try {
@@ -268,7 +285,7 @@ public static void unzip(String path, String toPath)
   }
 
   public static void main(String[] args) throws IOException {
-    unzip("f:/down/test2测试.zip", "f:/down/test2测试", new TestUnzipCallback());
+    unzip("f:/down/win7pack.zip", "f:/down/win7pack", new TestUnzipCallback());
   }
 
   /**
@@ -342,7 +359,7 @@ public void onEntryWrite(long totalSize, long writeSize) {
 
     @Override
     public void onDone() {
-
+      System.out.println("onDone");
     }
 
     @Override

diff --git a/common/src/main/java/lee/study/down/util/OsUtil.java b/common/src/main/java/lee/study/down/util/OsUtil.java
@@ -233,16 +233,19 @@ public static String getRemoteInterfaceName() throws IOException {
    */
   public static boolean existsCert(String name, String sha1) throws IOException {
     if (OsUtil.isWindows()) {
-      if (findCertList(name, true).toUpperCase().indexOf(": " + sha1.toUpperCase()) != -1) {
+      if (findCertList(name, true).toUpperCase().replaceAll("\\s", "")
+          .indexOf(":" + sha1.toUpperCase()) != -1) {
         return true;
       } else {
-        if (findCertList(name, false).toUpperCase().indexOf(": " + sha1.toUpperCase()) != -1) {
+        if (findCertList(name, false).toUpperCase().replaceAll("\\s", "")
+            .indexOf(":" + sha1.toUpperCase()) != -1) {
           return true;
         }
       }
       return false;
     } else if (OsUtil.isMac()) {
-      if (findCertList(name).toUpperCase().indexOf(": " + sha1.toUpperCase()) != -1) {
+      if (findCertList(name).toUpperCase().replaceAll("\\s", "").indexOf(":" + sha1.toUpperCase())
+          != -1) {
         return true;
       } else {
         return false;
@@ -313,7 +316,7 @@ public static void uninstallCert(String name) throws IOException {
       String certList = findCertList(name, false);
       Matcher matcher = pattern.matcher(certList);
       while (matcher.find()) {
-        String hash = matcher.group(1);
+        String hash = matcher.group(1).replaceAll("\\s", "");
         Runtime.getRuntime().exec("certutil "
             + "-delstore "
             + "-user "

diff --git a/core/pom.xml b/core/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>proxyee-down</artifactId>
     <groupId>lee.study</groupId>
-    <version>2.32</version>
+    <version>2.33</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>lee.study</groupId>
   <artifactId>proxyee-down</artifactId>
-  <version>2.32</version>
+  <version>2.33</version>
   <packaging>pom</packaging>
 
   <modules>

diff --git a/sniff/pom.xml b/sniff/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>proxyee-down</artifactId>
     <groupId>lee.study</groupId>
-    <version>2.32</version>
+    <version>2.33</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/ui/pom.xml b/ui/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>proxyee-down</artifactId>
     <groupId>lee.study</groupId>
-    <version>2.32</version>
+    <version>2.33</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/ui/src/main/resources/application.properties b/ui/src/main/resources/application.properties
@@ -1,4 +1,4 @@
-app.version=2.32
+app.version=2.33
 spring.profiles.active=prd
 view.server.port = 8999
 tomcat.server.port = 26339

diff --git a/update/pom.xml b/update/pom.xml
@@ -7,7 +7,7 @@
   <groupId>lee.study</groupId>
   <artifactId>proxyee-down-update</artifactId>
   <packaging>jar</packaging>
-  <version>2.32</version>
+  <version>2.33</version>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>