update to v2.51

kensla · Apr 22, 2018 · 421242e · 421242e
1 parent e1e5d70
commit 421242e
Show file tree

Hide file tree

Showing 11 changed files with 48 additions and 26 deletions.
diff --git a/.guide/FAQ.md b/.guide/FAQ.md
@@ -15,7 +15,7 @@
   **新建任务时调高分段数，若还是下载慢可能单文件下载被百度云限速了，请尝试批量下载(选中文件夹或多个文件一起下载)。**
 </details>
 <details>
-  <summary>百度云下载卡在99%？</summary>
+  <summary>百度云下载一直没有速度？</summary>
 
   **参考[#246](https://github.com/monkeyWie/proxyee-down/issues/246#issuecomment-378516262)**
 </details>

diff --git a/.guide/common/refresh/read.md b/.guide/common/refresh/read.md
@@ -4,5 +4,8 @@
 1. **任务不要删除**，再去下载此任务相同的资源，当弹出下载框时会有相应的提示。  
 ![](https://github.com/monkeyWie/proxyee-down/raw/master/.guide/common/refresh/imgs/1-1.png)  
 2. 点击确定，在下拉框中选中之前失败任务并创建任务即可。  
-![](https://github.com/monkeyWie/proxyee-down/raw/master/.guide/common/refresh/imgs/1-2.png)  
+![](https://github.com/monkeyWie/proxyee-down/raw/master/.guide/common/refresh/imgs/1-2.png)
+### 相关
+1. 链接失效的[解决办法](https://github.com/monkeyWie/proxyee-down#%E5%88%B7%E6%96%B0%E4%BB%BB%E5%8A%A1%E4%B8%8B%E8%BD%BD%E9%93%BE%E6%8E%A5)
+2. 百度云下载一直没速度的[解决办法](https://github.com/monkeyWie/proxyee-down/issues/246#issuecomment-378516262)  
 
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.5</version>
+    <version>2.51</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.5</version>
+    <version>2.51</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.5</version>
+  <version>2.51</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.5</version>
+    <version>2.51</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.5</version>
+    <version>2.51</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.5
+app.version=2.51
 spring.profiles.active=prd
 view.server.port = 8999
 tomcat.server.port = 26339

diff --git a/ui/view/src/components/NewTask.vue b/ui/view/src/components/NewTask.vue
@@ -40,7 +40,7 @@
       <el-switch
         v-model="form.unzip">
       </el-switch>
-      <el-tooltip class="item" content="百度云批量下载完成后自动解压" placement="right">
+      <el-tooltip class="item" content="当检测到任务为百度云批量下载打包的zip文件时，会在完成后会自动解压" placement="right">
         <i class="el-icon-question"></i>
       </el-tooltip>
     </el-form-item>

diff --git a/ui/view/src/components/TaskList.vue b/ui/view/src/components/TaskList.vue
@@ -87,11 +87,15 @@
             width="400"
             trigger="click">
             <div class="file-detail">
-              <el-tooltip :content="task.url" popper-class="file-detail-popper">
-                <p style="white-space: nowrap;text-overflow: ellipsis;overflow: hidden;">
+              <el-popover
+                popper-class="file-detail-popper"
+                :content="task.url"
+                trigger="click">
+                <p style="white-space: nowrap;text-overflow: ellipsis;overflow: hidden;"
+                   slot="reference">
                   {{task.url}}
                 </p>
-              </el-tooltip>
+              </el-popover>
               <p>
                 <span>名称：</span>
                 <b>{{task.fileName}}</b>
@@ -115,30 +119,20 @@
               <p>
                 <span>状态：</span>
                 <b>{{leftTime(task)}}</b>
-                <el-tooltip v-show="task.status==6" class="item"
-                            placement="right">
-                  <div slot="content">下载链接失效，可尝试
-                    <native-a
-                      href="https://github.com/monkeyWie/proxyee-down/blob/master/.guide/common/refresh/read.md"
-                      target="_blank" style="color: #3a8ee6">刷新下载链接
-                    </native-a>
-                  </div>
-                  <i class="el-icon-question"></i>
-                </el-tooltip>
               </p>
             </div>
             <ul
               :class="{'task-detail-list':true,'task-detail-list-scroll':task.chunkInfoList.length>=16}">
               <li v-for="chunk in task.chunkInfoList" :key="chunk.index">
                 <task-progress :text-inside="true" :stroke-width="18"
-                               :percentage="task.totalProgress||progress(chunk)"
+                               :percentage="progress(chunk)"
                                :status="status(chunk)"></task-progress>
                 <span>{{sizeFmt(speedChunk(chunk), '0B')}}/s</span>
               </li>
             </ul>
             <task-progress :text-inside="true"
                            :stroke-width="30"
-                           :percentage="task.totalProgress||progress(task)"
+                           :percentage="progress(task)"
                            :status="status(task)"
                            slot="reference"></task-progress>
           </el-popover>
@@ -148,6 +142,26 @@
         </el-col>
         <el-col :span="3">
           <el-tag :type="statusType(task)">{{leftTime(task)}}</el-tag>
+          <el-tooltip v-show="task.status==6" class="item"
+                      placement="right">
+            <div slot="content">下载链接失效，可尝试
+              <native-a
+                href="https://github.com/monkeyWie/proxyee-down/blob/master/.guide/common/refresh/read.md"
+                target="_blank" style="color: #3a8ee6">刷新下载链接
+              </native-a>
+            </div>
+            <i class="el-icon-question"></i>
+          </el-tooltip>
+          <el-tooltip v-show="task.status==4&&progress(task)>0&&speedTask(task)==0" class="item"
+                      placement="right">
+            <div slot="content">若长时间下载速度为0，可尝试
+              <native-a
+                href="https://github.com/monkeyWie/proxyee-down/blob/master/.guide/common/refresh/read.md"
+                target="_blank" style="color: #3a8ee6">刷新下载链接
+              </native-a>
+            </div>
+            <i class="el-icon-question"></i>
+          </el-tooltip>
         </el-col>
         <el-col :span="3">
           <div class="task-list-icon">
@@ -187,6 +201,7 @@
         checkTasks: [],
         checkAll: false,
         checkSome: false,
+        urlShow: {},
       }
     },
     computed: {
@@ -315,12 +330,12 @@
           case 7:
             return 'success';
           case 6:
+          case 8:
             return 'exception';
           case 5:
             return 'pause';
           case 1:
           case 2:
-          case 8:
             return 'ready';
           default:
             return null;
@@ -551,7 +566,11 @@
   }
 
   .file-detail-popper {
+    padding: 10px;
     width: 60%;
     word-break: break-all;
+    color: #ffffff;
+    font-size: 12px;
+    background: #303133;
   }
 </style>
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.5</version>
+  <version>2.51</version>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>