更新至2.43

修复插件更新的问题
修复百度云获取不到选择文件的问题
修复无法暂停的问题

common/pom.xml

@@ -5,7 +5,7 @@
  <parent>
  <artifactId>proxyee-down</artifactId>
  <groupId>lee.study</groupId>
- <version>2.42</version>
+ <version>2.43</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

core/pom.xml

@@ -5,7 +5,7 @@
  <parent>
  <artifactId>proxyee-down</artifactId>
  <groupId>lee.study</groupId>
- <version>2.42</version>
+ <version>2.43</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

core/src/main/java/lee/study/down/boot/AbstractHttpDownBootstrap.java

@@ -87,7 +87,6 @@ public void startDown() throws Exception {
  if (callback != null) {
  callback.onStart(httpDownInfo);
  }
- afterStart();
  }
 
  protected void startChunkDown(ChunkInfo chunkInfo, int updateStatus) throws Exception {
@@ -219,7 +218,6 @@ public void continueDown()
  taskInfo.setPauseTime(
  taskInfo.getPauseTime() + (curTime - taskInfo.getLastTime()));
  taskInfo.setLastTime(curTime);
- afterStart();
  for (ChunkInfo chunkInfo : taskInfo.getChunkInfoList()) {
  synchronized (chunkInfo) {
  if (chunkInfo.getStatus() == HttpDownStatus.PAUSE
@@ -238,13 +236,13 @@ public void continueDown()
  }
 
  public void close(ChunkInfo chunkInfo) {
- close(chunkInfo, false);
+ close(chunkInfo, -1);
  }
 
- public void close(ChunkInfo chunkInfo, boolean isDone) {
+ public void close(ChunkInfo chunkInfo, int status) {
  try {
- if (!isDone) {
- chunkInfo.setStatus(HttpDownStatus.WAIT);
+ if (status != -1) {
+ chunkInfo.setStatus(status);
  }
  if (!attr.containsKey(chunkInfo.getIndex())) {
  return;
@@ -263,29 +261,29 @@ public void close(ChunkInfo chunkInfo, boolean isDone) {
  }
  }
 
- public void close(boolean isDone) {
+ public void close(int status) {
  TaskInfo taskInfo = httpDownInfo.getTaskInfo();
  synchronized (taskInfo) {
- if (!isDone) {
- taskInfo.setStatus(HttpDownStatus.WAIT);
+ if (status != -1) {
+ taskInfo.setStatus(status);
  }
  for (ChunkInfo chunkInfo : httpDownInfo.getTaskInfo().getChunkInfoList()) {
  synchronized (chunkInfo) {
- close(chunkInfo, isDone);
+ close(chunkInfo, status);
  }
  }
  }
  }
 
  public void close() {
- close(false);
+ close(-1);
  }
 
  public void delete(boolean delFile) throws Exception {
  TaskInfo taskInfo = httpDownInfo.getTaskInfo();
  //删除任务进度记录文件
  synchronized (taskInfo) {
- close();
+ close(HttpDownStatus.WAIT);
  timeoutCheckTask.delBoot(httpDownInfo.getTaskInfo().getId());
  FileUtil.deleteIfExists(taskInfo.buildTaskRecordFilePath());
  FileUtil.deleteIfExists(taskInfo.buildTaskRecordBakFilePath());
@@ -324,9 +322,6 @@ public Channel getChannel(ChunkInfo chunkInfo) {
  return (Channel) getAttr(chunkInfo, ATTR_CHANNEL);
  }
 
- protected void afterStart() throws Exception {
- }
-
  public abstract int doFileWriter(ChunkInfo chunkInfo, ByteBuffer buffer)
  throws IOException;
 

core/src/main/java/lee/study/down/handle/HttpDownInitializer.java

@@ -90,7 +90,7 @@ public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception
  }
  if (isDone(chunkInfo.getDownSize(), httpContent)) {
  LOGGER.debug("分段下载完成：channelId[" + ctx.channel().id() + "]\t" + chunkInfo);
- bootstrap.close(chunkInfo, true);
+ bootstrap.close(chunkInfo);
  //分段下载完成回调
  chunkInfo.setStatus(HttpDownStatus.DONE);
  taskInfo.refresh(chunkInfo);
@@ -108,7 +108,7 @@ public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception
  //文件下载完成回调
  taskInfo.setStatus(HttpDownStatus.DONE);
  LOGGER.debug("下载完成：channelId[" + ctx.channel().id() + "]\t" + chunkInfo);
- bootstrap.close(true);
+ bootstrap.close();
  if (callback != null) {
  callback.onDone(bootstrap.getHttpDownInfo());
  }

pom.xml

@@ -4,7 +4,7 @@
  <modelVersion>4.0.0</modelVersion>
  <groupId>lee.study</groupId>
  <artifactId>proxyee-down</artifactId>
- <version>2.42</version>
+ <version>2.43</version>
  <packaging>pom</packaging>
 
  <modules>

sniff/pom.xml

@@ -5,7 +5,7 @@
  <parent>
  <artifactId>proxyee-down</artifactId>
  <groupId>lee.study</groupId>
- <version>2.42</version>
+ <version>2.43</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

sniff/src/main/resources/hookjs/bdyHook.js

@@ -1,4 +1,4 @@
-//1.2
+//1.3
 var initHookInterval = setInterval(function () {
  if (!window.$) {
  return;
@@ -66,6 +66,11 @@ var initHookInterval = setInterval(function () {
  };
  var wordMap = location.protocol == 'http:' ? wordMapHttp : wordMapHttps;
 
+ function getDefaultStyle(obj, attribute) {
+ return obj.currentStyle ? obj.currentStyle[attribute]
+ : document.defaultView.getComputedStyle(obj, false)[attribute];
+ }
+
  $(function () {
  switch (detectPage()) {
  case 'disk':
@@ -324,7 +329,8 @@ var initHookInterval = setInterval(function () {
  });
  } else {
  $('span.' + wordMap['checkbox']).parent().each(function () {
- if ($(this).hasClass('mixjMpAl')) {
+ if (getDefaultStyle($(this).find(">span>span").get(0), 'display')
+ == 'block') {
  var fileName = $(this).find('div.file-name div.text>a').text();
  $.each(fileList, function (i, file) {
  if (file.server_filename == fileName) {

ui/pom.xml

@@ -5,7 +5,7 @@
  <parent>
  <artifactId>proxyee-down</artifactId>
  <groupId>lee.study</groupId>
- <version>2.42</version>
+ <version>2.43</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

ui/src/main/java/lee/study/down/task/PluginUpdateCheckTask.java

@@ -27,6 +27,7 @@ public void run() {
  .eachText()) {
  URL url = new URL(HOST + name);
  URLConnection connection = url.openConnection();
+ connection.setUseCaches(false);
  PluginBean pluginBean = PluginUtil
  .checkAndUpdateLocalPlugin(name, connection.getInputStream());
  PluginBean current = PluginContent.get(name);

ui/src/main/resources/application.properties

@@ -1,4 +1,4 @@
-app.version=2.42
+app.version=2.43
 spring.profiles.active=prd
 view.server.port = 8999
 tomcat.server.port = 26339

update/pom.xml

@@ -7,7 +7,7 @@
  <groupId>lee.study</groupId>
  <artifactId>proxyee-down-update</artifactId>
  <packaging>jar</packaging>
- <version>2.42</version>
+ <version>2.43</version>
 
  <properties>
  <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>