update to 2.52

修复使用代理时百度云登录超时的bug 任务列表UI调整，把删除按钮统一放右边 linux教程调整
goulin · Apr 27, 2018 · 26105d9 · 26105d9
1 parent 09cb9d9
commit 26105d9
Show file tree

Hide file tree

Showing 14 changed files with 35 additions and 19 deletions.
diff --git a/.guide/common/ca/linux/read.md b/.guide/common/ca/linux/read.md
@@ -1,6 +1,7 @@
 ### linux安装证书
 本教程以chrome浏览器为例，firefox的可以参考[火狐浏览器安装证书](https://github.com/monkeyWie/proxyee-down/blob/master/.guide/common/ca/firefox/read.md)
-1. 右击软件托盘，点证书目录会跳转到对应目录
+1. 右击软件托盘，点证书目录会跳转到对应目录，若没显示托盘可以在**软件安装目录/main/ssl**中找到证书。
+
 2. 打开chrome，进入设置->高级->管理证书，选择授权中心然后点击导入，然后选择第一步证书目录中的ca.crt文件。在弹出的信任证书框中把三个复选框都勾上，点击确定即可。
 ![](https://github.com/monkeyWie/proxyee-down/raw/master/.guide/common/ca/linux/imgs/2-1.png)  
 

diff --git a/.guide/common/ca/read.md b/.guide/common/ca/read.md
@@ -3,4 +3,5 @@
 
 - [windows安装证书](https://github.com/monkeyWie/proxyee-down/blob/master/.guide/common/ca/windows/read.md)
 - [mac安装证书](https://github.com/monkeyWie/proxyee-down/blob/master/.guide/common/ca/mac/read.md)
+- [linux安装证书](https://github.com/monkeyWie/proxyee-down/blob/master/.guide/common/ca/linux/read.md)
 - [火狐浏览器安装证书](https://github.com/monkeyWie/proxyee-down/blob/master/.guide/common/ca/firefox/read.md)
diff --git a/.guide/linux/read.md b/.guide/linux/read.md
@@ -17,10 +17,9 @@ xxx/bin/java -jar -Dfile.encoding=GBK -Xms256m -Xmx512m ./proxyee-down.jar
 ![10](https://github.com/monkeyWie/proxyee-down/raw/master/.guide/linux/imgs/10.png)
 
 ## 证书安装
-- [查看](https://github.com/monkeyWie/proxyee-down/blob/master/.guide/common/ca/linux/read.md)
+[查看](https://github.com/monkeyWie/proxyee-down/blob/master/.guide/common/ca/linux/read.md)
 
 ## SwitchyOmega插件安装与设置
-
 [查看](https://github.com/monkeyWie/proxyee-down/blob/master/.guide/common/switchy/read.md)
 
 ## 完成

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.51</version>
+    <version>2.52</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

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.51</version>
+    <version>2.52</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.51</version>
+  <version>2.52</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.51</version>
+    <version>2.52</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/sniff/src/main/java/lee/study/down/intercept/BdyIntercept.java b/sniff/src/main/java/lee/study/down/intercept/BdyIntercept.java
@@ -13,7 +13,7 @@ public class BdyIntercept extends ResponseTextIntercept {
 
   @Override
   public boolean match(HttpResponse httpResponse, HttpProxyInterceptPipeline pipeline) {
-    return HttpUtil.checkUrl(pipeline.getHttpRequest(), "^(pan|yun).baidu.com.*$")
+    return HttpUtil.checkUrl(pipeline.getHttpRequest(), "^(pan|yun).baidu.com/(disk/home|s/|share/link).*$")
         && isHtml(httpResponse, pipeline);
   }
 

diff --git a/sniff/src/main/java/lee/study/down/intercept/common/ResponseTextIntercept.java b/sniff/src/main/java/lee/study/down/intercept/common/ResponseTextIntercept.java
@@ -41,10 +41,8 @@ public void afterResponse(Channel clientChannel, Channel proxyChannel, HttpRespo
         }
         contentBuf = PooledByteBufAllocator.DEFAULT.buffer();
       }
-      httpResponse.headers().set(HttpHeaderNames.CONTENT_TYPE,"text/html;charset=utf-8");
-      //直接调用默认拦截器，跳过下载拦截器
-      pipeline.getDefault()
-          .afterResponse(clientChannel, proxyChannel, httpResponse, pipeline);
+      httpResponse.headers().set(HttpHeaderNames.CONTENT_TYPE, "text/html;charset=utf-8");
+      httpResponse.headers().remove(HttpHeaderNames.TRANSFER_ENCODING);
     } else {
       isMatch = false;
       pipeline.afterResponse(clientChannel, proxyChannel, httpResponse);
@@ -68,8 +66,17 @@ public void afterResponse(Channel clientChannel, Channel proxyChannel, HttpConte
             GZIPOutputStream outputStream = new GZIPOutputStream(baos);
             outputStream.write(temp);
             outputStream.finish();
-            hookHttpContent.content().writeBytes(baos.toByteArray());
+            byte[] bts = baos.toByteArray();
+            //修改响应头Content-length
+            pipeline.getHttpResponse().headers().set(HttpHeaderNames.CONTENT_LENGTH, bts.length);
+            pipeline.getDefault()
+                .afterResponse(clientChannel, proxyChannel, pipeline.getHttpResponse(), pipeline);
+            hookHttpContent.content().writeBytes(bts);
           } else {
+            //修改响应头Content-length
+            pipeline.getHttpResponse().headers().set(HttpHeaderNames.CONTENT_LENGTH, contentBuf.readableBytes());
+            pipeline.getDefault()
+                .afterResponse(clientChannel, proxyChannel, pipeline.getHttpResponse(), pipeline);
             hookHttpContent.content().writeBytes(contentBuf);
           }
           ReferenceCountUtil.release(contentBuf);

diff --git a/sniff/src/main/resources/hookjs/bdyHook.js b/sniff/src/main/resources/hookjs/bdyHook.js
@@ -360,6 +360,10 @@ var initHookInterval = setInterval(function () {
         } else if (selectFileList.length > 1) {
           downloadType = 'batch';
         }
+        if (selectFileList.length >= 1000) {
+          alert("由于百度云的限制，批量下载选中的文件数量不能超过1000，请分批下载");
+          return;
+        }
         if (!checkFileName(selectFileList)) {
           alert("文件夹名称不能包含+号，请修改名称后再下载");
           return;
@@ -932,6 +936,10 @@ var initHookInterval = setInterval(function () {
           alert('获取选中文件失败，请刷新重试');
           return;
         }
+        if (selectFileList.length >= 1000) {
+          alert("由于百度云的限制，批量下载选中的文件数量不能超过1000，请分批下载");
+          return;
+        }
         if (!checkFileName(selectFileList)) {
           alert("文件夹名称不能包含+号，请修改名称后再下载");
           return;
@@ -1522,4 +1530,4 @@ var initHookInterval = setInterval(function () {
     }());
 
   })();
-}, 200);
+}, 200);
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.51</version>
+    <version>2.52</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.51
+app.version=2.52
 spring.profiles.active=prd
 view.server.port = 8999
 tomcat.server.port = 26339

diff --git a/ui/view/src/components/TaskList.vue b/ui/view/src/components/TaskList.vue
@@ -165,12 +165,12 @@
         </el-col>
         <el-col :span="3">
           <div class="task-list-icon">
+            <i v-if="task.status==7" class="el-icon-task-folder"
+               @click="openTaskDir(task)"></i>
             <i v-if="task.status!=7"
                :class="iconClass(task)"
                @click="controlTask(task)"></i>
             <i class="el-icon-task-delete" @click="deleteTask(task)"></i>
-            <i v-if="task.status==7" class="el-icon-task-folder"
-               @click="openTaskDir(task)"></i>
           </div>
         </el-col>
       </el-row>

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.51</version>
+  <version>2.52</version>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>