授权改造

framework-common/src/main/java/com/mrxu/framework/common/util/HttpUtil.java

@@ -336,15 +336,19 @@ public class HttpUtil {
         }
     }
 
-    public static File readFile(int connectTimeout, int readTimeout, String url) {
-        return readFile(connectTimeout, readTimeout, url, null, null);
+    public static File readFile( String url,String fileName) {
+        return readFile(GLOBAL_CONNECT_TIMEOUT , GLOBAL_READ_TIMEOUT, url, fileName, null);
     }
 
-    public static File readFile(int connectTimeout, int readTimeout, String url, Map<String, String> queryParas) {
-        return readFile(connectTimeout, readTimeout, url, queryParas, null);
+    public static File readFile(int connectTimeout, int readTimeout, String url,String fileName) {
+        return readFile(connectTimeout, readTimeout, url, fileName, null);
     }
 
-    public static File readFile(int connectTimeout, int readTimeout, String url, Map<String, String> queryParas,
+    public static File readFile(int connectTimeout, int readTimeout, String url,String fileName, Map<String, String> queryParas) {
+        return readFile(connectTimeout, readTimeout, url,fileName, queryParas, null);
+    }
+
+    public static File readFile(int connectTimeout, int readTimeout, String url,String fileName, Map<String, String> queryParas,
             Map<String, String> headers) {
         HttpURLConnection conn = null;
         try {
@@ -354,7 +358,7 @@ public class HttpUtil {
             String cd = conn.getHeaderField("Content-disposition");
             System.out.println(cd);
 
-            return readResponseFile(conn, "");
+            return readResponseFile(conn, fileName);
         } catch (Exception e) {
             throw new RuntimeException(e);
         } finally {
@@ -365,7 +369,7 @@ public class HttpUtil {
     }
 
     public static void main(String[] args) {
-        readFile(1000, 5000, "http://midplat-img.b0.upaiyun.com/material/2015/06/11/weixin/testl0YVNs3bq6!wjl");
+        readFile(1000, 5000, "http://midplat-img.b0.upaiyun.com/material/2015/06/11/weixin/testl0YVNs3bq6!wjl","test");
     }
 
     public static String getRealIp(HttpServletRequest request) {

framework-common/src/main/java/com/mrxu/framework/common/weixin/api/ComponentDeployApi.java

@@ -1,6 +1,7 @@
 package com.mrxu.framework.common.weixin.api;
 
 import com.alibaba.fastjson.JSONObject;
+import com.mrxu.framework.common.util.StrFunc;
 import com.mrxu.framework.common.weixin.base.WxHttp;
 import com.mrxu.framework.common.weixin.base.WxResult;
 import com.mrxu.framework.common.weixin.bean.CommitPage;
@@ -74,7 +75,11 @@ public class ComponentDeployApi {
 
     // https://developers.weixin.qq.com/doc/oplatform/Third-party_Platforms/2.0/api/code/get_qrcode.html
     public static String getQrcode(String accessToken,String path) {
-        return get_qrcode+accessToken+"&path="+path;
+        String url = get_qrcode+accessToken;
+        if(StrFunc.isNotEmpty(path)) {
+            url += "&path="+path;
+        }
+        return url;
     }