Merge remote-tracking branch 'origin/master'

Author: xwintop

src/main/java/com/xwintop/xJavaFxTool/plugin/PluginManager.java

@@ -1,10 +1,12 @@
 package com.xwintop.xJavaFxTool.plugin;
 
+import cn.hutool.http.HttpStatus;
 import cn.hutool.http.HttpUtil;
 import com.alibaba.fastjson.JSON;
 import com.xwintop.xJavaFxTool.model.PluginJarInfo;
 import com.xwintop.xJavaFxTool.utils.Config;
 import com.xwintop.xJavaFxTool.utils.Config.Keys;
+import com.xwintop.xJavaFxTool.utils.UserAgentUtils;
 import com.xwintop.xJavaFxTool.utils.XJavaFxSystemUtil;
 import java.io.File;
 import java.io.FileOutputStream;
@@ -212,15 +214,20 @@ public File downloadPlugin(
         this.currentProgressListener =
             (bytesRead, contentLength, done) -> onProgressUpdate.accept(contentLength, bytesRead);
 
-        try (
-            Response response = pluginDownloader
-                .newCall(new Builder().url(pluginJarInfo.getDownloadUrl()).build())
-                .execute();
-            InputStream inputStream = response.body().byteStream();
-            FileOutputStream outputStream = new FileOutputStream(file)
-        ) {
-            IOUtils.copy(inputStream, outputStream);
+        // 插件下载
+        int retryTimes = UserAgentUtils.getUserAgentSize()-1;
+        Response response = null;
+        while (retryTimes > 0 && (response== null || response.code() != HttpStatus.HTTP_OK)){
+            response = pluginDownloader.newCall(new Builder().header("User-Agent", UserAgentUtils.getUserAgent(retryTimes)).url(pluginJarInfo.getDownloadUrl()).build()).execute();
+            retryTimes--;
         }
+        // 下载仍未成功，需要抛出异常，提示下载失败
+        if(response== null || response.code() != HttpStatus.HTTP_OK){
+            throw new IOException("插件下载失败 " + pluginJarInfo.getJarName());
+        }
+        InputStream inputStream = response.body().byteStream();
+        FileOutputStream outputStream = new FileOutputStream(file);
+        IOUtils.copy(inputStream, outputStream);
 
         plugin.setIsDownload(true);
         plugin.setIsEnable(true);

src/main/java/com/xwintop/xJavaFxTool/utils/UserAgentUtils.java

@@ -0,0 +1,41 @@
+package com.xwintop.xJavaFxTool.utils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Description 用于i伪造请求的UserAgent
+ * @Author LiFaXin
+ * @Date 2020/5/14 17:24
+ * @Version
+ **/
+public class UserAgentUtils {
+
+    private static List<String> userAgents = new ArrayList<>(3);
+    static{
+        // Firefox
+        userAgents.add("Mozilla/5.0 (Windows NT 6.1; rv:51.0) Gecko/20100101 Firefox/51.0");
+        // Chrome
+        userAgents.add("Mozilla/5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/48.0.2564.0 Safari/537.36");
+        // IE
+        userAgents.add("Mozilla/5.0 (Windows NT 10.0; WOW64; Trident/7.0; rv:11.0) like Gecko");
+    }
+
+    /**
+     * 获取UserAgent
+     * @param index
+     * @return
+     */
+    public static String getUserAgent(int index){
+        index = index > userAgents.size()-1 ? userAgents.size()-1 : index;
+        return userAgents.get(index);
+    }
+
+    /**
+     * 获取UserAgent配置数量
+     * @return
+     */
+    public static int getUserAgentSize(){
+        return userAgents.size();
+    }
+}