🐛 fix upload get wrong content-type

.gitignore

@@ -25,4 +25,5 @@ bin/*
 *.json
 public/index.html
 public/assets/
+public/public/
 data/

README.md

@@ -29,6 +29,10 @@ English | [中文](./README_cn.md)
   - [x] [Alist](https://github.com/Xhofe/alist)
   - [x] FTP
   - [x] [PikPak](https://www.mypikpak.com/)
+  - [x] [ShandianPan](https://shandianpan.com/)
+  - [x] [S3](https://aws.amazon.com/s3/)
+  - [x] WebDav
+- [x] Easy to deploy and out-of-the-box
 - [x] File preview (PDF, markdown, code, plain text, ...)
 - [x] Image preview in gallery mode
 - [x] Video and audio preview (mp4, mp3, ...)
@@ -38,9 +42,12 @@ English | [中文](./README_cn.md)
 - [x] Dark mode
 - [x] I18n
 - [x] Protected routes (password protection and authentication) 
-- [x] WebDav (readonly)
+- [x] WebDav (A small part readonly, see https://alist-doc.nn.ci/en/docs/intro for details)
 - [x] [Docker Deploy](https://hub.docker.com/r/xhofe/alist)
 - [x] Cloudflare workers proxy
+- [x] File/Folder package download
+- [x] Support video list playback and subtitles(ass,srt,vtt)
+- [x] Web upload(Can allow visitors to upload)
 
 ## Discussion
 

README_cn.md

@@ -28,6 +28,10 @@
   - [x] [Alist](https://github.com/Xhofe/alist)
   - [x] FTP
   - [x] [PikPak](https://www.mypikpak.com/)
+  - [x] [闪电盘](https://shandianpan.com/)
+  - [x] [S3](https://aws.amazon.com/cn/s3/)
+  - [x] WebDav
+- [x] 部署方便，开箱即用
 - [x] 文件预览（PDF、markdown、代码、纯文本……）
 - [x] 画廊模式下的图像预览
 - [x] 视频和音频预览（mp4、mp3 等）
@@ -37,9 +41,12 @@
 - [x] 黑暗模式
 - [x] 国际化
 - [x] 受保护的路由（密码保护和身份验证）
-- [x] WebDav（只读）
+- [x] WebDav（少部分只读，具体见https://alist-doc.nn.ci/docs/intro ）
 - [x] [Docker 部署](https://hub.docker.com/r/xhofe/alist)
 - [x] Cloudflare workers 中转
+- [x] 文件/文件夹打包下载
+- [x] 支持视频列表播放和字幕(ass,srt,vtt)
+- [x] 网页上传(可以允许访客上传)
 
 ## 讨论
 

alist-proxy.js

@@ -1,22 +1,36 @@
 const HOST = "YOUR_HOST";
 const TOKEN = "YOUR_TOKEN";
 
+addEventListener("fetch", (event) => {
+    const request = event.request;
+    const url = new URL(request.url);
+    const sign = url.searchParams.get("sign");
+    if (request.method === "OPTIONS") {
+        // Handle CORS preflight requests
+        event.respondWith(handleOptions(request));
+    } else if (sign && sign.length === 16) {
+        // Handle requests to the Down server
+        event.respondWith(handleDownload(request));
+    } else {
+        // Handle requests to the API server
+        event.respondWith(handleRequest(event));
+    }
+});
+
 const corsHeaders = {
     "Access-Control-Allow-Origin": "*",
     "Access-Control-Allow-Methods": "GET,HEAD,POST,OPTIONS",
     "Access-Control-Max-Age": "86400",
 };
 
-!function(a){"use strict";function b(a,b){var c=(65535&a)+(65535&b),d=(a>>16)+(b>>16)+(c>>16);return d<<16|65535&c}function c(a,b){return a<<b|a>>>32-b}function d(a,d,e,f,g,h){return b(c(b(b(d,a),b(f,h)),g),e)}function e(a,b,c,e,f,g,h){return d(b&c|~b&e,a,b,f,g,h)}function f(a,b,c,e,f,g,h){return d(b&e|c&~e,a,b,f,g,h)}function g(a,b,c,e,f,g,h){return d(b^c^e,a,b,f,g,h)}function h(a,b,c,e,f,g,h){return d(c^(b|~e),a,b,f,g,h)}function i(a,c){a[c>>5]|=128<<c%32,a[(c+64>>>9<<4)+14]=c;var d,i,j,k,l,m=1732584193,n=-271733879,o=-1732584194,p=271733878;for(d=0;d<a.length;d+=16)i=m,j=n,k=o,l=p,m=e(m,n,o,p,a[d],7,-680876936),p=e(p,m,n,o,a[d+1],12,-389564586),o=e(o,p,m,n,a[d+2],17,606105819),n=e(n,o,p,m,a[d+3],22,-1044525330),m=e(m,n,o,p,a[d+4],7,-176418897),p=e(p,m,n,o,a[d+5],12,1200080426),o=e(o,p,m,n,a[d+6],17,-1473231341),n=e(n,o,p,m,a[d+7],22,-45705983),m=e(m,n,o,p,a[d+8],7,1770035416),p=e(p,m,n,o,a[d+9],12,-1958414417),o=e(o,p,m,n,a[d+10],17,-42063),n=e(n,o,p,m,a[d+11],22,-1990404162),m=e(m,n,o,p,a[d+12],7,1804603682),p=e(p,m,n,o,a[d+13],12,-40341101),o=e(o,p,m,n,a[d+14],17,-1502002290),n=e(n,o,p,m,a[d+15],22,1236535329),m=f(m,n,o,p,a[d+1],5,-165796510),p=f(p,m,n,o,a[d+6],9,-1069501632),o=f(o,p,m,n,a[d+11],14,643717713),n=f(n,o,p,m,a[d],20,-373897302),m=f(m,n,o,p,a[d+5],5,-701558691),p=f(p,m,n,o,a[d+10],9,38016083),o=f(o,p,m,n,a[d+15],14,-660478335),n=f(n,o,p,m,a[d+4],20,-405537848),m=f(m,n,o,p,a[d+9],5,568446438),p=f(p,m,n,o,a[d+14],9,-1019803690),o=f(o,p,m,n,a[d+3],14,-187363961),n=f(n,o,p,m,a[d+8],20,1163531501),m=f(m,n,o,p,a[d+13],5,-1444681467),p=f(p,m,n,o,a[d+2],9,-51403784),o=f(o,p,m,n,a[d+7],14,1735328473),n=f(n,o,p,m,a[d+12],20,-1926607734),m=g(m,n,o,p,a[d+5],4,-378558),p=g(p,m,n,o,a[d+8],11,-2022574463),o=g(o,p,m,n,a[d+11],16,1839030562),n=g(n,o,p,m,a[d+14],23,-35309556),m=g(m,n,o,p,a[d+1],4,-1530992060),p=g(p,m,n,o,a[d+4],11,1272893353),o=g(o,p,m,n,a[d+7],16,-155497632),n=g(n,o,p,m,a[d+10],23,-1094730640),m=g(m,n,o,p,a[d+13],4,681279174),p=g(p,m,n,o,a[d],11,-358537222),o=g(o,p,m,n,a[d+3],16,-722521979),n=g(n,o,p,m,a[d+6],23,76029189),m=g(m,n,o,p,a[d+9],4,-640364487),p=g(p,m,n,o,a[d+12],11,-421815835),o=g(o,p,m,n,a[d+15],16,530742520),n=g(n,o,p,m,a[d+2],23,-995338651),m=h(m,n,o,p,a[d],6,-198630844),p=h(p,m,n,o,a[d+7],10,1126891415),o=h(o,p,m,n,a[d+14],15,-1416354905),n=h(n,o,p,m,a[d+5],21,-57434055),m=h(m,n,o,p,a[d+12],6,1700485571),p=h(p,m,n,o,a[d+3],10,-1894986606),o=h(o,p,m,n,a[d+10],15,-1051523),n=h(n,o,p,m,a[d+1],21,-2054922799),m=h(m,n,o,p,a[d+8],6,1873313359),p=h(p,m,n,o,a[d+15],10,-30611744),o=h(o,p,m,n,a[d+6],15,-1560198380),n=h(n,o,p,m,a[d+13],21,1309151649),m=h(m,n,o,p,a[d+4],6,-145523070),p=h(p,m,n,o,a[d+11],10,-1120210379),o=h(o,p,m,n,a[d+2],15,718787259),n=h(n,o,p,m,a[d+9],21,-343485551),m=b(m,i),n=b(n,j),o=b(o,k),p=b(p,l);return[m,n,o,p]}function j(a){var b,c="";for(b=0;b<32*a.length;b+=8)c+=String.fromCharCode(a[b>>5]>>>b%32&255);return c}function k(a){var b,c=[];for(c[(a.length>>2)-1]=void 0,b=0;b<c.length;b+=1)c[b]=0;for(b=0;b<8*a.length;b+=8)c[b>>5]|=(255&a.charCodeAt(b/8))<<b%32;return c}function l(a){return j(i(k(a),8*a.length))}function m(a,b){var c,d,e=k(a),f=[],g=[];for(f[15]=g[15]=void 0,e.length>16&&(e=i(e,8*a.length)),c=0;16>c;c+=1)f[c]=909522486^e[c],g[c]=1549556828^e[c];return d=i(f.concat(k(b)),512+8*b.length),j(i(g.concat(d),640))}function n(a){var b,c,d="0123456789abcdef",e="";for(c=0;c<a.length;c+=1)b=a.charCodeAt(c),e+=d.charAt(b>>>4&15)+d.charAt(15&b);return e}function o(a){return unescape(encodeURIComponent(a))}function p(a){return l(o(a))}function q(a){return n(p(a))}function r(a,b){return m(o(a),o(b))}function s(a,b){return n(r(a,b))}function t(a,b,c){return b?c?r(b,a):s(b,a):c?p(a):q(a)}"function"==typeof define&&define.amd?define(function(){return t}):a.md5=t}(this);
-
-async function handleRequest(request) {
+async function handleDownload(request) {
     const origin = request.headers.get("origin");
     const url = new URL(request.url);
     const path = decodeURI(url.pathname);
     const sign = url.searchParams.get("sign");
     const name = path.split("/").pop();
     const right = md5(`alist-${TOKEN}-${name}`).slice(8, 24);
-    if (sign !== right){
+    if (sign !== right) {
         const resp = new Response(
             JSON.stringify({
                 code: 401,
@@ -48,7 +62,7 @@ async function handleRequest(request) {
     }
     request = new Request(res.data.url, request);
     if (res.data.headers) {
-        for(const header of res.data.headers){
+        for (const header of res.data.headers) {
             request.headers.set(header.name, header.value);
         }
     }
@@ -66,6 +80,143 @@ async function handleRequest(request) {
     return response;
 }
 
+/**
+ * Respond to the request
+ * @param {Request} request
+ */
+async function handleRequest(event) {
+    const { request } = event;
+
+    //请求头部、返回对象
+    let reqHeaders = new Headers(request.headers),
+        outBody,
+        outStatus = 200,
+        outStatusText = "OK",
+        outCt = null,
+        outHeaders = new Headers({
+            "Access-Control-Allow-Origin": reqHeaders.get("Origin"),
+            "Access-Control-Allow-Methods": "GET, POST, PUT, PATCH, DELETE, OPTIONS",
+            "Access-Control-Allow-Headers":
+                reqHeaders.get("Access-Control-Allow-Headers") ||
+                "Accept, Authorization, Cache-Control, Content-Type, DNT, If-Modified-Since, Keep-Alive, Origin, User-Agent, X-Requested-With, Token, x-access-token, Notion-Version",
+        });
+
+    try {
+        //取域名第一个斜杠后的所有信息为代理链接
+        let url = request.url.substr(8);
+        url = decodeURIComponent(url.substr(url.indexOf("/") + 1));
+
+        //需要忽略的代理
+        if (
+            request.method == "OPTIONS" &&
+            reqHeaders.has("access-control-request-headers")
+        ) {
+            //输出提示
+            return new Response(null, PREFLIGHT_INIT);
+        } else if (
+            url.length < 3 ||
+            url.indexOf(".") == -1 ||
+            url == "favicon.ico" ||
+            url == "robots.txt"
+        ) {
+            return Response.redirect("https://baidu.com", 301);
+        }
+        //阻断
+        else if (blocker.check(url)) {
+            return Response.redirect("https://baidu.com", 301);
+        } else {
+            //补上前缀 http://
+            url = url
+                .replace(/https:(\/)*/, "https://")
+                .replace(/http:(\/)*/, "http://");
+            if (url.indexOf("://") == -1) {
+                url = "http://" + url;
+            }
+            //构建 fetch 参数
+            let fp = {
+                method: request.method,
+                headers: {},
+            };
+
+            //保留头部其它信息
+            let he = reqHeaders.entries();
+            for (let h of he) {
+                if (!["content-length"].includes(h[0])) {
+                    fp.headers[h[0]] = h[1];
+                }
+            }
+            // 是否带 body
+            if (["POST", "PUT", "PATCH", "DELETE"].indexOf(request.method) >= 0) {
+                const ct = (reqHeaders.get("content-type") || "").toLowerCase();
+                if (ct.includes("application/json")) {
+                    let requestJSON = await request.json();
+                    console.log(typeof requestJSON);
+                    fp.body = JSON.stringify(requestJSON);
+                } else if (
+                    ct.includes("application/text") ||
+                    ct.includes("text/html")
+                ) {
+                    fp.body = await request.text();
+                } else if (ct.includes("form")) {
+                    // fp.body = await request.formData();
+                    fp.body = await request.text();
+                } else {
+                    fp.body = await request.blob();
+                }
+            }
+            // 发起 fetch
+            let fr = await fetch(url, fp);
+            outCt = fr.headers.get("content-type");
+            if (outCt.includes("application/text") || outCt.includes("text/html")) {
+                try {
+                    // 添加base
+                    let newFr = new HTMLRewriter()
+                        .on("head", {
+                            element(element) {
+                                element.prepend(`<base href="${url}" />`, {
+                                    html: true,
+                                });
+                            },
+                        })
+                        .transform(fr);
+                    fr = newFr;
+                } catch (e) {}
+            }
+            outStatus = fr.status;
+            outStatusText = fr.statusText;
+            outBody = fr.body;
+        }
+    } catch (err) {
+        outCt = "application/json";
+        outBody = JSON.stringify({
+            code: -1,
+            msg: JSON.stringify(err.stack) || err,
+        });
+    }
+
+    //设置类型
+    if (outCt && outCt != "") {
+        outHeaders.set("content-type", outCt);
+    }
+
+    let response = new Response(outBody, {
+        status: outStatus,
+        statusText: outStatusText,
+        headers: outHeaders,
+    });
+
+    return response;
+}
+
+const blocker = {
+    keys: [],
+    check: function (url) {
+        url = url.toLowerCase();
+        let len = blocker.keys.filter((x) => url.includes(x)).length;
+        return len != 0;
+    },
+};
+
 function handleOptions(request) {
     // Make sure the necessary headers are present
     // for this to be a valid pre-flight request
@@ -101,25 +252,179 @@ function handleOptions(request) {
     }
 }
 
-addEventListener("fetch", (event) => {
-    const request = event.request;
-    // const url = new URL(request.url)
-    if (request.method === "OPTIONS") {
-        // Handle CORS preflight requests
-        event.respondWith(handleOptions(request));
-    } else if (
-        request.method === "GET" ||
-        request.method === "HEAD" ||
-        request.method === "POST"
-    ) {
-        // Handle requests to the API server
-        event.respondWith(handleRequest(request));
-    } else {
-        event.respondWith(
-            new Response(null, {
-                status: 405,
-                statusText: "Method Not Allowed",
-            })
-        );
+!(function (a) {
+    "use strict";
+    function b(a, b) {
+        var c = (65535 & a) + (65535 & b),
+            d = (a >> 16) + (b >> 16) + (c >> 16);
+        return (d << 16) | (65535 & c);
     }
-});
+    function c(a, b) {
+        return (a << b) | (a >>> (32 - b));
+    }
+    function d(a, d, e, f, g, h) {
+        return b(c(b(b(d, a), b(f, h)), g), e);
+    }
+    function e(a, b, c, e, f, g, h) {
+        return d((b & c) | (~b & e), a, b, f, g, h);
+    }
+    function f(a, b, c, e, f, g, h) {
+        return d((b & e) | (c & ~e), a, b, f, g, h);
+    }
+    function g(a, b, c, e, f, g, h) {
+        return d(b ^ c ^ e, a, b, f, g, h);
+    }
+    function h(a, b, c, e, f, g, h) {
+        return d(c ^ (b | ~e), a, b, f, g, h);
+    }
+    function i(a, c) {
+        (a[c >> 5] |= 128 << c % 32), (a[(((c + 64) >>> 9) << 4) + 14] = c);
+        var d,
+            i,
+            j,
+            k,
+            l,
+            m = 1732584193,
+            n = -271733879,
+            o = -1732584194,
+            p = 271733878;
+        for (d = 0; d < a.length; d += 16)
+            (i = m),
+                (j = n),
+                (k = o),
+                (l = p),
+                (m = e(m, n, o, p, a[d], 7, -680876936)),
+                (p = e(p, m, n, o, a[d + 1], 12, -389564586)),
+                (o = e(o, p, m, n, a[d + 2], 17, 606105819)),
+                (n = e(n, o, p, m, a[d + 3], 22, -1044525330)),
+                (m = e(m, n, o, p, a[d + 4], 7, -176418897)),
+                (p = e(p, m, n, o, a[d + 5], 12, 1200080426)),
+                (o = e(o, p, m, n, a[d + 6], 17, -1473231341)),
+                (n = e(n, o, p, m, a[d + 7], 22, -45705983)),
+                (m = e(m, n, o, p, a[d + 8], 7, 1770035416)),
+                (p = e(p, m, n, o, a[d + 9], 12, -1958414417)),
+                (o = e(o, p, m, n, a[d + 10], 17, -42063)),
+                (n = e(n, o, p, m, a[d + 11], 22, -1990404162)),
+                (m = e(m, n, o, p, a[d + 12], 7, 1804603682)),
+                (p = e(p, m, n, o, a[d + 13], 12, -40341101)),
+                (o = e(o, p, m, n, a[d + 14], 17, -1502002290)),
+                (n = e(n, o, p, m, a[d + 15], 22, 1236535329)),
+                (m = f(m, n, o, p, a[d + 1], 5, -165796510)),
+                (p = f(p, m, n, o, a[d + 6], 9, -1069501632)),
+                (o = f(o, p, m, n, a[d + 11], 14, 643717713)),
+                (n = f(n, o, p, m, a[d], 20, -373897302)),
+                (m = f(m, n, o, p, a[d + 5], 5, -701558691)),
+                (p = f(p, m, n, o, a[d + 10], 9, 38016083)),
+                (o = f(o, p, m, n, a[d + 15], 14, -660478335)),
+                (n = f(n, o, p, m, a[d + 4], 20, -405537848)),
+                (m = f(m, n, o, p, a[d + 9], 5, 568446438)),
+                (p = f(p, m, n, o, a[d + 14], 9, -1019803690)),
+                (o = f(o, p, m, n, a[d + 3], 14, -187363961)),
+                (n = f(n, o, p, m, a[d + 8], 20, 1163531501)),
+                (m = f(m, n, o, p, a[d + 13], 5, -1444681467)),
+                (p = f(p, m, n, o, a[d + 2], 9, -51403784)),
+                (o = f(o, p, m, n, a[d + 7], 14, 1735328473)),
+                (n = f(n, o, p, m, a[d + 12], 20, -1926607734)),
+                (m = g(m, n, o, p, a[d + 5], 4, -378558)),
+                (p = g(p, m, n, o, a[d + 8], 11, -2022574463)),
+                (o = g(o, p, m, n, a[d + 11], 16, 1839030562)),
+                (n = g(n, o, p, m, a[d + 14], 23, -35309556)),
+                (m = g(m, n, o, p, a[d + 1], 4, -1530992060)),
+                (p = g(p, m, n, o, a[d + 4], 11, 1272893353)),
+                (o = g(o, p, m, n, a[d + 7], 16, -155497632)),
+                (n = g(n, o, p, m, a[d + 10], 23, -1094730640)),
+                (m = g(m, n, o, p, a[d + 13], 4, 681279174)),
+                (p = g(p, m, n, o, a[d], 11, -358537222)),
+                (o = g(o, p, m, n, a[d + 3], 16, -722521979)),
+                (n = g(n, o, p, m, a[d + 6], 23, 76029189)),
+                (m = g(m, n, o, p, a[d + 9], 4, -640364487)),
+                (p = g(p, m, n, o, a[d + 12], 11, -421815835)),
+                (o = g(o, p, m, n, a[d + 15], 16, 530742520)),
+                (n = g(n, o, p, m, a[d + 2], 23, -995338651)),
+                (m = h(m, n, o, p, a[d], 6, -198630844)),
+                (p = h(p, m, n, o, a[d + 7], 10, 1126891415)),
+                (o = h(o, p, m, n, a[d + 14], 15, -1416354905)),
+                (n = h(n, o, p, m, a[d + 5], 21, -57434055)),
+                (m = h(m, n, o, p, a[d + 12], 6, 1700485571)),
+                (p = h(p, m, n, o, a[d + 3], 10, -1894986606)),
+                (o = h(o, p, m, n, a[d + 10], 15, -1051523)),
+                (n = h(n, o, p, m, a[d + 1], 21, -2054922799)),
+                (m = h(m, n, o, p, a[d + 8], 6, 1873313359)),
+                (p = h(p, m, n, o, a[d + 15], 10, -30611744)),
+                (o = h(o, p, m, n, a[d + 6], 15, -1560198380)),
+                (n = h(n, o, p, m, a[d + 13], 21, 1309151649)),
+                (m = h(m, n, o, p, a[d + 4], 6, -145523070)),
+                (p = h(p, m, n, o, a[d + 11], 10, -1120210379)),
+                (o = h(o, p, m, n, a[d + 2], 15, 718787259)),
+                (n = h(n, o, p, m, a[d + 9], 21, -343485551)),
+                (m = b(m, i)),
+                (n = b(n, j)),
+                (o = b(o, k)),
+                (p = b(p, l));
+        return [m, n, o, p];
+    }
+    function j(a) {
+        var b,
+            c = "";
+        for (b = 0; b < 32 * a.length; b += 8)
+            c += String.fromCharCode((a[b >> 5] >>> b % 32) & 255);
+        return c;
+    }
+    function k(a) {
+        var b,
+            c = [];
+        for (c[(a.length >> 2) - 1] = void 0, b = 0; b < c.length; b += 1) c[b] = 0;
+        for (b = 0; b < 8 * a.length; b += 8)
+            c[b >> 5] |= (255 & a.charCodeAt(b / 8)) << b % 32;
+        return c;
+    }
+    function l(a) {
+        return j(i(k(a), 8 * a.length));
+    }
+    function m(a, b) {
+        var c,
+            d,
+            e = k(a),
+            f = [],
+            g = [];
+        for (
+            f[15] = g[15] = void 0, e.length > 16 && (e = i(e, 8 * a.length)), c = 0;
+            16 > c;
+            c += 1
+        )
+            (f[c] = 909522486 ^ e[c]), (g[c] = 1549556828 ^ e[c]);
+        return (d = i(f.concat(k(b)), 512 + 8 * b.length)), j(i(g.concat(d), 640));
+    }
+    function n(a) {
+        var b,
+            c,
+            d = "0123456789abcdef",
+            e = "";
+        for (c = 0; c < a.length; c += 1)
+            (b = a.charCodeAt(c)), (e += d.charAt((b >>> 4) & 15) + d.charAt(15 & b));
+        return e;
+    }
+    function o(a) {
+        return unescape(encodeURIComponent(a));
+    }
+    function p(a) {
+        return l(o(a));
+    }
+    function q(a) {
+        return n(p(a));
+    }
+    function r(a, b) {
+        return m(o(a), o(b));
+    }
+    function s(a, b) {
+        return n(r(a, b));
+    }
+    function t(a, b, c) {
+        return b ? (c ? r(b, a) : s(b, a)) : c ? p(a) : q(a);
+    }
+    "function" == typeof define && define.amd
+        ? define(function () {
+            return t;
+        })
+        : (a.md5 = t);
+})(this);

alist.go

@@ -25,6 +25,7 @@ func Init() bool {
 		log.Infof("current password: %s", pass.Value)
 		return false
 	}
+	server.InitIndex()
 	bootstrap.InitSettings()
 	bootstrap.InitAccounts()
 	bootstrap.InitCache()
@@ -47,8 +48,8 @@ func main() {
 	base := fmt.Sprintf("%s:%d", conf.Conf.Address, conf.Conf.Port)
 	log.Infof("start server @ %s", base)
 	var err error
-	if conf.Conf.Https {
-		err = r.RunTLS(base, conf.Conf.CertFile, conf.Conf.KeyFile)
+	if conf.Conf.Scheme.Https {
+		err = r.RunTLS(base, conf.Conf.Scheme.CertFile, conf.Conf.Scheme.KeyFile)
 	} else {
 		err = r.Run(base)
 	}

bootstrap/cache.go

@@ -12,7 +12,11 @@ import (
 // InitCache init cache
 func InitCache() {
 	log.Infof("init cache...")
-	goCacheClient := goCache.New(60*time.Minute, 120*time.Minute)
+	c := conf.Conf.Cache
+	if c.Expiration == 0 {
+		c.Expiration, c.CleanupInterval = 60, 120
+	}
+	goCacheClient := goCache.New(time.Duration(c.Expiration)*time.Minute, time.Duration(c.CleanupInterval)*time.Minute)
 	goCacheStore := store.NewGoCache(goCacheClient, nil)
 	conf.Cache = cache.New(goCacheStore)
 }

bootstrap/setting.go

@@ -5,20 +5,13 @@ import (
 	"github.com/Xhofe/alist/model"
 	log "github.com/sirupsen/logrus"
 	"gorm.io/gorm"
+	"strings"
 )
 
 func InitSettings() {
 	log.Infof("init settings...")
-	version := model.SettingItem{
-		Key:         "version",
-		Value:       conf.GitTag,
-		Description: "version",
-		Type:        "string",
-		Group:       model.CONST,
-		Version:     conf.GitTag,
-	}
 
-	err := model.SaveSetting(version)
+	err := model.SaveSetting(model.Version)
 	if err != nil {
 		log.Fatalf("failed write setting: %s", err.Error())
 	}
@@ -29,152 +22,186 @@ func InitSettings() {
 			Value:       "Alist",
 			Description: "title",
 			Type:        "string",
-			Group:       model.PUBLIC,
+			Access:      model.PUBLIC,
+			Group:       model.FRONT,
 		},
 		{
 			Key:         "password",
 			Value:       "alist",
 			Description: "password",
 			Type:        "string",
-			Group:       model.PRIVATE,
+			Access:      model.PRIVATE,
+			Group:       model.BACK,
 		},
 		{
 			Key:         "logo",
 			Value:       "https://store.heytapimage.com/cdo-portal/feedback/202112/05/1542f45f86b8609495b69c5380753135.png",
 			Description: "logo",
 			Type:        "string",
-			Group:       model.PUBLIC,
+			Access:      model.PUBLIC,
+			Group:       model.FRONT,
 		},
 		{
 			Key:         "favicon",
 			Value:       "https://store.heytapimage.com/cdo-portal/feedback/202112/05/1542f45f86b8609495b69c5380753135.png",
 			Description: "favicon",
 			Type:        "string",
-			Group:       model.PUBLIC,
+			Access:      model.PUBLIC,
+			Group:       model.FRONT,
 		},
 		{
 			Key:         "icon color",
-			Value:       "teal.300",
+			Value:       "#1890ff",
 			Description: "icon's color",
 			Type:        "string",
-			Group:       model.PUBLIC,
+			Access:      model.PUBLIC,
+			Group:       model.FRONT,
 		},
 		{
 			Key:         "text types",
-			Value:       "txt,htm,html,xml,java,properties,sql,js,md,json,conf,ini,vue,php,py,bat,gitignore,yml,go,sh,c,cpp,h,hpp,tsx",
+			Value:       strings.Join(conf.TextTypes, ","),
 			Type:        "string",
 			Description: "text type extensions",
+			Group:       model.FRONT,
 		},
 		{
 			Key:         "hide readme file",
 			Value:       "true",
 			Type:        "bool",
 			Description: "hide readme file? ",
+			Group:       model.FRONT,
 		},
 		{
 			Key:         "music cover",
 			Value:       "https://store.heytapimage.com/cdo-portal/feedback/202110/30/d43c41c5d257c9bc36366e310374fb19.png",
 			Description: "music cover image",
 			Type:        "string",
-			Group:       model.PUBLIC,
+			Access:      model.PUBLIC,
+			Group:       model.FRONT,
 		},
 		{
 			Key:         "site beian",
 			Description: "chinese beian info",
 			Type:        "string",
-			Group:       model.PUBLIC,
+			Access:      model.PUBLIC,
+			Group:       model.FRONT,
 		},
 		{
 			Key:         "home readme url",
 			Description: "when have multiple, the readme file to show",
 			Type:        "string",
-			Group:       model.PUBLIC,
+			Access:      model.PUBLIC,
+			Group:       model.FRONT,
 		},
 		{
-			Key:         "markdown theme",
-			Value:       "vuepress",
-			Description: "default | github | vuepress",
-			Group:       model.PUBLIC,
-			Type:        "select",
-			Values:      "default,github,vuepress",
+			Key:    "autoplay video",
+			Value:  "false",
+			Type:   "bool",
+			Access: model.PUBLIC,
+			Group:  model.FRONT,
 		},
 		{
-			Key:   "autoplay video",
-			Value: "false",
-			Type:  "bool",
-			Group: model.PUBLIC,
-		},
-		{
-			Key:   "autoplay audio",
-			Value: "false",
-			Type:  "bool",
-			Group: model.PUBLIC,
+			Key:    "autoplay audio",
+			Value:  "false",
+			Type:   "bool",
+			Access: model.PUBLIC,
+			Group:  model.FRONT,
 		},
 		{
 			Key:         "check parent folder",
 			Value:       "false",
 			Type:        "bool",
 			Description: "check parent folder password",
-			Group:       model.PRIVATE,
+			Access:      model.PRIVATE,
+			Group:       model.BACK,
 		},
 		{
-			Key: "customize head",
-			Value: `<style>
-.chakra-ui-light{
-  background-image: linear-gradient(120deg,#e0c3fc 0%,#8ec5fc 100%) !important;
-  background-attachment: fixed;
-}
-.main-box {
-  border-radius: 15px !important;
-}
-.chakra-ui-light .main-box {
-  background-color: white !important;
-}
-.chakra-ui-light .readme-box {
-  background-color: white !important;
-}
-.readme-box {
-  border-radius: 15px !important;
-}
-</style>`,
+			Key:         "customize head",
+			Value:       "",
 			Type:        "text",
 			Description: "Customize head, placed at the beginning of the head",
-			Group:       model.PRIVATE,
+			Access:      model.PRIVATE,
+			Group:       model.FRONT,
 		},
 		{
 			Key:         "customize body",
 			Value:       "",
 			Type:        "text",
 			Description: "Customize script, placed at the end of the body",
-			Group:       model.PRIVATE,
+			Access:      model.PRIVATE,
+			Group:       model.FRONT,
+		},
+		{
+			Key:         "home emoji",
+			Value:       "🏠",
+			Type:        "text",
+			Description: "emoji in front of home in nav",
+			Access:      model.PUBLIC,
+			Group:       model.FRONT,
 		},
 		{
 			Key:         "animation",
 			Value:       "true",
 			Type:        "bool",
 			Description: "when there are a lot of files, the animation will freeze when opening",
-			Group:       model.PUBLIC,
+			Access:      model.PUBLIC,
+			Group:       model.FRONT,
 		},
 		{
 			Key:         "check down link",
 			Value:       "false",
 			Type:        "bool",
 			Description: "check down link password, your link will be 'https://alist.com/d/filename?pw=xxx'",
-			Group:       model.PUBLIC,
+			Access:      model.PUBLIC,
+			Group:       model.BACK,
 		},
 		{
 			Key:         "WebDAV username",
-			Value:       "alist",
+			Value:       "alist_admin",
 			Description: "WebDAV username",
 			Type:        "string",
-			Group:       model.PRIVATE,
+			Access:      model.PRIVATE,
+			Group:       model.BACK,
 		},
 		{
 			Key:         "WebDAV password",
-			Value:       "alist",
+			Value:       "alist_admin",
 			Description: "WebDAV password",
 			Type:        "string",
-			Group:       model.PRIVATE,
+			Access:      model.PRIVATE,
+			Group:       model.BACK,
+		},
+		{
+			Key:         "artplayer whitelist",
+			Value:       "*",
+			Description: "refer to https://artplayer.org/document/options#whitelist",
+			Type:        "string",
+			Access:      model.PUBLIC,
+			Group:       model.FRONT,
+		},
+		{
+			Key:         "artplayer autoSize",
+			Value:       "true",
+			Description: "refer to https://artplayer.org/document/options#autosize",
+			Type:        "bool",
+			Access:      model.PUBLIC,
+			Group:       model.FRONT,
+		},
+		{
+			Key:         "Visitor WebDAV username",
+			Value:       "alist_visitor",
+			Description: "Visitor WebDAV username",
+			Type:        "string",
+			Access:      model.PRIVATE,
+			Group:       model.BACK,
+		},
+		{
+			Key:         "Visitor WebDAV password",
+			Value:       "alist_visitor",
+			Description: "Visitor WebDAV password",
+			Type:        "string",
+			Access:      model.PRIVATE,
+			Group:       model.BACK,
 		},
 	}
 	for i, _ := range settings {
@@ -191,8 +218,10 @@ func InitSettings() {
 				log.Fatal("can't get setting: %s", err.Error())
 			}
 		} else {
-			o.Version = conf.GitTag
-			err = model.SaveSetting(*o)
+			//o.Version = conf.GitTag
+			//err = model.SaveSetting(*o)
+			v.Value = o.Value
+			err = model.SaveSetting(v)
 			if err != nil {
 				log.Fatalf("failed write setting: %s", err.Error())
 			}

build.sh

@@ -37,8 +37,14 @@ yarn
 if [ "$1" == "release" ]; then
   yarn build --base="https://cdn.jsdelivr.net/gh/Xhofe/alist-web@cdn/v2/$webCommit"
   mv dist/assets ..
+  mv dist/index.html ../alist/public
+  #  构建local
+  yarn build
+  mv dist/index.html dist/local.html
+  mv dist/* ../alist/public
 else
   yarn build
+  mv dist/* ../alist/public
 fi
 cd ..
 
@@ -61,8 +67,6 @@ ldflags="\
 -X 'github.com/Xhofe/alist/conf.GitTag=$gitTag' \
 "
 
-cp -R ../alist-web/dist/* public
-
 if [ "$1" == "release" ]; then
   xgo -out alist -ldflags="$ldflags" .
 else

conf/config.go

@@ -10,13 +10,25 @@ type Database struct {
 	TablePrefix string `json:"table_prefix"`
 	DBFile      string `json:"db_file"`
 }
+
+type Scheme struct {
+	Https    bool   `json:"https"`
+	CertFile string `json:"cert_file"`
+	KeyFile  string `json:"key_file"`
+}
+
+type CacheConfig struct {
+	Expiration      int64 `json:"expiration"`
+	CleanupInterval int64 `json:"cleanup_interval"`
+}
+
 type Config struct {
-	Address  string   `json:"address"`
-	Port     int      `json:"port"`
-	Database Database `json:"database"`
-	Https    bool     `json:"https"`
-	CertFile string   `json:"cert_file"`
-	KeyFile  string   `json:"key_file"`
+	Address  string      `json:"address"`
+	Port     int         `json:"port"`
+	Local    bool        `json:"local"`
+	Database Database    `json:"database"`
+	Scheme   Scheme      `json:"scheme"`
+	Cache    CacheConfig `json:"cache"`
 }
 
 func DefaultConfig() *Config {
@@ -29,5 +41,9 @@ func DefaultConfig() *Config {
 			TablePrefix: "x_",
 			DBFile:      "data/data.db",
 		},
+		Cache: CacheConfig{
+			Expiration:      60,
+			CleanupInterval: 120,
+		},
 	}
 }

conf/var.go

@@ -29,11 +29,13 @@ var (
 )
 
 var (
-	TextTypes   = []string{"txt", "go", "md"}
+	TextTypes = []string{"txt", "htm", "html", "xml", "java", "properties", "sql",
+		"js", "md", "json", "conf", "ini", "vue", "php", "py", "bat", "gitignore", "yml",
+		"go", "sh", "c", "cpp", "h", "hpp", "tsx", "vtt", "srt", "ass"}
 	OfficeTypes = []string{"doc", "docx", "xls", "xlsx", "ppt", "pptx", "pdf"}
 	VideoTypes  = []string{"mp4", "mkv", "avi", "mov", "rmvb", "webm"}
-	AudioTypes  = []string{"mp3", "flac", "ogg", "m4a"}
-	ImageTypes  = []string{"jpg", "tiff", "jpeg", "png", "gif", "bmp", "svg"}
+	AudioTypes  = []string{"mp3", "flac", "ogg", "m4a", "wav"}
+	ImageTypes  = []string{"jpg", "tiff", "jpeg", "png", "gif", "bmp", "svg", "ico"}
 )
 
 // settings
@@ -43,7 +45,9 @@ var (
 	CheckParent  bool
 	CheckDown    bool
 
-	Token       string
-	DavUsername string
-	DavPassword string
+	Token              string
+	DavUsername        string
+	DavPassword        string
+	VisitorDavUsername string
+	VisitorDavPassword string
 )

drivers/123/123.go

@@ -11,20 +11,23 @@ import (
 	"github.com/Xhofe/alist/utils"
 	"github.com/go-resty/resty/v2"
 	jsoniter "github.com/json-iterator/go"
+	log "github.com/sirupsen/logrus"
 	"math/rand"
 	"path/filepath"
 	"strconv"
 	"time"
 )
 
-var pan123Client = resty.New()
+type BaseResp struct {
+	Code    int    `json:"code"`
+	Message string `json:"message"`
+}
 
 type Pan123TokenResp struct {
-	Code int `json:"code"`
+	BaseResp
 	Data struct {
 		Token string `json:"token"`
 	} `json:"data"`
-	Message string `json:"message"`
 }
 
 type Pan123File struct {
@@ -38,30 +41,32 @@ type Pan123File struct {
 }
 
 type Pan123Files struct {
-	Code    int    `json:"code"`
-	Message string `json:"message"`
-	Data    struct {
+	BaseResp
+	Data struct {
 		InfoList []Pan123File `json:"InfoList"`
 		Next     string       `json:"Next"`
 	} `json:"data"`
 }
 
 type Pan123DownResp struct {
-	Code    int    `json:"code"`
-	Message string `json:"message"`
-	Data    struct {
+	BaseResp
+	Data struct {
 		DownloadUrl string `json:"DownloadUrl"`
 	} `json:"data"`
 }
 
 func (driver Pan123) Login(account *model.Account) error {
+	url := "https://www.123pan.com/api/user/sign_in"
+	if account.APIProxyUrl != "" {
+		url = fmt.Sprintf("%s/%s", account.APIProxyUrl, url)
+	}
 	var resp Pan123TokenResp
-	_, err := pan123Client.R().
+	_, err := base.RestyClient.R().
 		SetResult(&resp).
 		SetBody(base.Json{
 			"passport": account.Username,
 			"password": account.Password,
-		}).Post("https://www.123pan.com/api/user/sign_in")
+		}).Post(url)
 	if err != nil {
 		return err
 	}
@@ -97,50 +102,88 @@ func (driver Pan123) GetFiles(parentId string, account *model.Account) ([]Pan123
 	res := make([]Pan123File, 0)
 	for next != "-1" {
 		var resp Pan123Files
-		_, err := pan123Client.R().SetResult(&resp).
-			SetHeader("authorization", "Bearer "+account.AccessToken).
-			SetQueryParams(map[string]string{
-				"driveId":        "0",
-				"limit":          "100",
-				"next":           next,
-				"orderBy":        account.OrderBy,
-				"orderDirection": account.OrderDirection,
-				"parentFileId":   parentId,
-				"trashed":        "false",
-			}).Get("https://www.123pan.com/api/file/list")
+		query := map[string]string{
+			"driveId":        "0",
+			"limit":          "100",
+			"next":           next,
+			"orderBy":        account.OrderBy,
+			"orderDirection": account.OrderDirection,
+			"parentFileId":   parentId,
+			"trashed":        "false",
+		}
+		_, err := driver.Request("https://www.123pan.com/api/file/list",
+			base.Get, nil, query, nil, &resp, false, account)
 		if err != nil {
 			return nil, err
 		}
-		if resp.Code != 0 {
-			if resp.Code == 401 {
-				err := driver.Login(account)
-				if err != nil {
-					return nil, err
-				}
-				return driver.GetFiles(parentId, account)
-			}
-			return nil, fmt.Errorf(resp.Message)
-		}
 		next = resp.Data.Next
 		res = append(res, resp.Data.InfoList...)
 	}
 	return res, nil
 }
 
-func (driver Pan123) Post(url string, data base.Json, account *model.Account) ([]byte, error) {
-	res, err := pan123Client.R().
-		SetHeader("authorization", "Bearer "+account.AccessToken).
-		SetBody(data).Post(url)
+func (driver Pan123) Request(url string, method int, headers, query map[string]string, data *base.Json, resp interface{}, proxy bool, account *model.Account) ([]byte, error) {
+	rawUrl := url
+	if account.APIProxyUrl != "" && proxy {
+		url = fmt.Sprintf("%s/%s", account.APIProxyUrl, url)
+	}
+	req := base.RestyClient.R()
+	req.SetHeader("Authorization", "Bearer "+account.AccessToken)
+	if headers != nil {
+		req.SetHeaders(headers)
+	}
+	if query != nil {
+		req.SetQueryParams(query)
+	}
+	if data != nil {
+		req.SetBody(data)
+	}
+	if resp != nil {
+		req.SetResult(resp)
+	}
+	var res *resty.Response
+	var err error
+	switch method {
+	case base.Get:
+		res, err = req.Get(url)
+	case base.Post:
+		res, err = req.Post(url)
+	default:
+		return nil, base.ErrNotSupport
+	}
 	if err != nil {
 		return nil, err
 	}
+	log.Debug(res.String())
 	body := res.Body()
-	if jsoniter.Get(body, "code").ToInt() != 0 {
+	code := jsoniter.Get(body, "code").ToInt()
+	if code != 0 {
+		if code == 401 {
+			err := driver.Login(account)
+			if err != nil {
+				return nil, err
+			}
+			return driver.Request(rawUrl, method, headers, query, data, resp, proxy, account)
+		}
 		return nil, errors.New(jsoniter.Get(body, "message").ToString())
 	}
 	return body, nil
 }
 
+//func (driver Pan123) Post(url string, data base.Json, account *model.Account) ([]byte, error) {
+//	res, err := pan123Client.R().
+//		SetHeader("authorization", "Bearer "+account.AccessToken).
+//		SetBody(data).Post(url)
+//	if err != nil {
+//		return nil, err
+//	}
+//	body := res.Body()
+//	if jsoniter.Get(body, "code").ToInt() != 0 {
+//		return nil, errors.New(jsoniter.Get(body, "message").ToString())
+//	}
+//	return body, nil
+//}
+
 func (driver Pan123) GetFile(path string, account *model.Account) (*Pan123File, error) {
 	dir, name := filepath.Split(path)
 	dir = utils.ParsePath(dir)
@@ -166,7 +209,7 @@ func RandStr(length int) string {
 	str := "123456789abcdefghijklmnopqrstuvwxyz"
 	bytes := []byte(str)
 	var result []byte
-	rand.Seed(time.Now().UnixNano()+ int64(rand.Intn(100)))
+	rand.Seed(time.Now().UnixNano() + int64(rand.Intn(100)))
 	for i := 0; i < length; i++ {
 		result = append(result, bytes[rand.Intn(len(bytes))])
 	}
@@ -186,5 +229,4 @@ func HMAC(message string, secret string) string {
 
 func init() {
 	base.RegisterDriver(&Pan123{})
-	pan123Client.SetRetryCount(3)
 }

drivers/123/driver.go

@@ -11,7 +11,7 @@ import (
 	"github.com/gin-gonic/gin"
 	jsoniter "github.com/json-iterator/go"
 	log "github.com/sirupsen/logrus"
-	url "net/url"
+	"net/url"
 	"path/filepath"
 	"strconv"
 	"strings"
@@ -22,8 +22,7 @@ type Pan123 struct{}
 
 func (driver Pan123) Config() base.DriverConfig {
 	return base.DriverConfig{
-		Name:      "123Pan",
-		OnlyProxy: false,
+		Name: "123Pan",
 	}
 }
 
@@ -125,35 +124,36 @@ func (driver Pan123) Files(path string, account *model.Account) ([]model.File, e
 	return files, nil
 }
 
-func (driver Pan123) Link(path string, account *model.Account) (*base.Link, error) {
-	file, err := driver.GetFile(utils.ParsePath(path), account)
+func (driver Pan123) Link(args base.Args, account *model.Account) (*base.Link, error) {
+	log.Debugf("%+v", args)
+	file, err := driver.GetFile(utils.ParsePath(args.Path), account)
 	if err != nil {
 		return nil, err
 	}
 	var resp Pan123DownResp
-	_, err = pan123Client.R().SetResult(&resp).SetHeader("authorization", "Bearer "+account.AccessToken).
-		SetBody(base.Json{
-			"driveId":   0,
-			"etag":      file.Etag,
-			"fileId":    file.FileId,
-			"fileName":  file.FileName,
-			"s3keyFlag": file.S3KeyFlag,
-			"size":      file.Size,
-			"type":      file.Type,
-		}).Post("https://www.123pan.com/api/file/download_info")
+	var headers map[string]string
+	if args.IP != "" && args.IP != "::1" {
+		headers = map[string]string{
+			//"X-Real-IP":       "1.1.1.1",
+			"X-Forwarded-For": args.IP,
+		}
+	}
+	data := base.Json{
+		"driveId":   0,
+		"etag":      file.Etag,
+		"fileId":    file.FileId,
+		"fileName":  file.FileName,
+		"s3keyFlag": file.S3KeyFlag,
+		"size":      file.Size,
+		"type":      file.Type,
+	}
+	_, err = driver.Request("https://www.123pan.com/api/file/download_info",
+		base.Post, headers, nil, &data, &resp, false, account)
+	//_, err = pan123Client.R().SetResult(&resp).SetHeader("authorization", "Bearer "+account.AccessToken).
+	//	SetBody().Post("https://www.123pan.com/api/file/download_info")
 	if err != nil {
 		return nil, err
 	}
-	if resp.Code != 0 {
-		if resp.Code == 401 {
-			err := driver.Login(account)
-			if err != nil {
-				return nil, err
-			}
-			return driver.Link(path, account)
-		}
-		return nil, fmt.Errorf(resp.Message)
-	}
 	u, err := url.Parse(resp.Data.DownloadUrl)
 	if err != nil {
 		return nil, err
@@ -164,11 +164,11 @@ func (driver Pan123) Link(path string, account *model.Account) (*base.Link, erro
 		return nil, err
 	}
 	log.Debug(res.String())
-	link := base.Link{}
+	link := base.Link{
+		Url: resp.Data.DownloadUrl,
+	}
 	if res.StatusCode() == 302 {
 		link.Url = res.Header().Get("location")
-	} else {
-		link.Url = resp.Data.DownloadUrl
 	}
 	return &link, nil
 }
@@ -181,11 +181,6 @@ func (driver Pan123) Path(path string, account *model.Account) (*model.File, []m
 		return nil, nil, err
 	}
 	if !file.IsDir() {
-		link, err := driver.Link(path, account)
-		if err != nil {
-			return nil, nil, err
-		}
-		file.Url = link.Url
 		return file, nil, nil
 	}
 	files, err := driver.Files(path, account)
@@ -221,7 +216,9 @@ func (driver Pan123) MakeDir(path string, account *model.Account) error {
 		"size":         0,
 		"type":         1,
 	}
-	_, err = driver.Post("https://www.123pan.com/api/file/upload_request", data, account)
+	_, err = driver.Request("https://www.123pan.com/api/file/upload_request",
+		base.Post, nil, nil, &data, nil, false, account)
+	//_, err = driver.Post("https://www.123pan.com/api/file/upload_request", data, account)
 	if err == nil {
 		_ = base.DeleteCache(dir, account)
 	}
@@ -243,7 +240,9 @@ func (driver Pan123) Move(src string, dst string, account *model.Account) error
 			"fileId":   fileId,
 			"fileName": dstName,
 		}
-		_, err = driver.Post("https://www.123pan.com/api/file/rename", data, account)
+		_, err = driver.Request("https://www.123pan.com/api/file/rename",
+			base.Post, nil, nil, &data, nil, false, account)
+		//_, err = driver.Post("https://www.123pan.com/api/file/rename", data, account)
 	} else {
 		// move
 		dstDirFile, err := driver.File(dstDir, account)
@@ -255,7 +254,9 @@ func (driver Pan123) Move(src string, dst string, account *model.Account) error
 			"fileId":       fileId,
 			"parentFileId": parentFileId,
 		}
-		_, err = driver.Post("https://www.123pan.com/api/file/mod_pid", data, account)
+		_, err = driver.Request("https://www.123pan.com/api/file/mod_pid",
+			base.Post, nil, nil, &data, nil, false, account)
+		//_, err = driver.Post("https://www.123pan.com/api/file/mod_pid", data, account)
 	}
 	if err != nil {
 		_ = base.DeleteCache(srcDir, account)
@@ -278,7 +279,9 @@ func (driver Pan123) Delete(path string, account *model.Account) error {
 		"operation":         true,
 		"fileTrashInfoList": file,
 	}
-	_, err = driver.Post("https://www.123pan.com/api/file/trash", data, account)
+	_, err = driver.Request("https://www.123pan.com/api/file/trash",
+		base.Post, nil, nil, &data, nil, false, account)
+	//_, err = driver.Post("https://www.123pan.com/api/file/trash", data, account)
 	if err == nil {
 		_ = base.DeleteCache(utils.Dir(path), account)
 	}
@@ -294,6 +297,7 @@ type UploadResp struct {
 
 // TODO unfinished
 func (driver Pan123) Upload(file *model.FileStream, account *model.Account) error {
+	return base.ErrNotImplement
 	parentFile, err := driver.File(file.ParentPath, account)
 	if err != nil {
 		return err
@@ -311,7 +315,9 @@ func (driver Pan123) Upload(file *model.FileStream, account *model.Account) erro
 		"size":         file.GetSize(),
 		"type":         0,
 	}
-	res, err := driver.Post("https://www.123pan.com/api/file/upload_request", data, account)
+	res, err := driver.Request("https://www.123pan.com/api/file/upload_request",
+		base.Post, nil, nil, &data, nil, false, account)
+	//res, err := driver.Post("https://www.123pan.com/api/file/upload_request", data, account)
 	if err != nil {
 		return err
 	}
@@ -319,19 +325,19 @@ func (driver Pan123) Upload(file *model.FileStream, account *model.Account) erro
 	var resp UploadResp
 	kSecret := jsoniter.Get(res, "data.SecretAccessKey").ToString()
 	nowTimeStr := time.Now().String()
-	Date := strings.ReplaceAll(strings.Split(nowTimeStr, "T")[0],"-","")
+	Date := strings.ReplaceAll(strings.Split(nowTimeStr, "T")[0], "-", "")
 
 	StringToSign := fmt.Sprintf("%s\n%s\n%s\n%s",
 		"AWS4-HMAC-SHA256",
 		nowTimeStr,
 		fmt.Sprintf("%s/us-east-1/s3/aws4_request", Date),
-		)
+	)
 
 	kDate := HMAC("AWS4"+kSecret, Date)
 	kRegion := HMAC(kDate, "us-east-1")
 	kService := HMAC(kRegion, "s3")
 	kSigning := HMAC(kService, "aws4_request")
-	_, err = pan123Client.R().SetResult(&resp).SetHeaders(map[string]string{
+	_, err = base.RestyClient.R().SetResult(&resp).SetHeaders(map[string]string{
 		"Authorization": fmt.Sprintf("AWS4-HMAC-SHA256 Credential=%s/%s/us-east-1/s3/aws4_request, SignedHeaders=host;x-amz-content-sha256;x-amz-date;x-amz-security-token;x-amz-user-agent, Signature=%s",
 			jsoniter.Get(res, "data.AccessKeyId"),
 			Date,

drivers/189/189.go

@@ -248,7 +248,6 @@ func (driver Cloud189) GetFiles(fileId string, account *model.Account) ([]Cloud1
 		if resp.FileListAO.Count == 0 {
 			break
 		}
-		res = append(res, resp.FileListAO.FileList...)
 		for _, folder := range resp.FileListAO.FolderList {
 			res = append(res, Cloud189File{
 				Id:         folder.Id,
@@ -257,6 +256,7 @@ func (driver Cloud189) GetFiles(fileId string, account *model.Account) ([]Cloud1
 				Size:       -1,
 			})
 		}
+		res = append(res, resp.FileListAO.FileList...)
 		pageNum++
 	}
 	return res, nil
@@ -300,8 +300,8 @@ func (driver Cloud189) Request(url string, method string, form map[string]string
 		}
 	}
 	//log.Debug(res, jsoniter.Get(res.Body(),"res_code").ToInt())
-	if jsoniter.Get(res.Body(),"res_code").ToInt() != 0 {
-		err = errors.New(jsoniter.Get(res.Body(),"res_message").ToString())
+	if jsoniter.Get(res.Body(), "res_code").ToInt() != 0 {
+		err = errors.New(jsoniter.Get(res.Body(), "res_message").ToString())
 	}
 	return res.Body(), err
 }

drivers/189/driver.go

@@ -26,8 +26,7 @@ type Cloud189 struct{}
 
 func (driver Cloud189) Config() base.DriverConfig {
 	return base.DriverConfig{
-		Name:      "189Cloud",
-		OnlyProxy: false,
+		Name: "189Cloud",
 	}
 }
 
@@ -138,8 +137,8 @@ func (driver Cloud189) Files(path string, account *model.Account) ([]model.File,
 	return files, nil
 }
 
-func (driver Cloud189) Link(path string, account *model.Account) (*base.Link, error) {
-	file, err := driver.File(utils.ParsePath(path), account)
+func (driver Cloud189) Link(args base.Args, account *model.Account) (*base.Link, error) {
+	file, err := driver.File(utils.ParsePath(args.Path), account)
 	if err != nil {
 		return nil, err
 	}
@@ -167,7 +166,7 @@ func (driver Cloud189) Link(path string, account *model.Account) (*base.Link, er
 			if err != nil {
 				return nil, err
 			}
-			return driver.Link(path, account)
+			return driver.Link(args, account)
 		}
 	}
 	if resp.ResCode != 0 {
@@ -194,11 +193,6 @@ func (driver Cloud189) Path(path string, account *model.Account) (*model.File, [
 		return nil, nil, err
 	}
 	if !file.IsDir() {
-		link, err := driver.Link(path, account)
-		if err != nil {
-			return nil, nil, err
-		}
-		file.Url = link.Url
 		return file, nil, nil
 	}
 	files, err := driver.Files(path, account)
@@ -229,7 +223,7 @@ func (driver Cloud189) MakeDir(path string, account *model.Account) error {
 		"parentFolderId": parent.Id,
 		"folderName":     name,
 	}
-	_, err = driver.Request("https://cloud.189.cn/api/open/file/createFolder.action", "POST", form,nil, account)
+	_, err = driver.Request("https://cloud.189.cn/api/open/file/createFolder.action", "POST", form, nil, account)
 	if err == nil {
 		_ = base.DeleteCache(dir, account)
 	}
@@ -257,7 +251,7 @@ func (driver Cloud189) Move(src string, dst string, account *model.Account) erro
 			idKey:   srcFile.Id,
 			nameKey: dstName,
 		}
-		_, err = driver.Request(url, "POST", form,nil, account)
+		_, err = driver.Request(url, "POST", form, nil, account)
 	} else {
 		// move
 		dstDirFile, err := driver.File(dstDir, account)
@@ -284,7 +278,7 @@ func (driver Cloud189) Move(src string, dst string, account *model.Account) erro
 			"targetFolderId": dstDirFile.Id,
 			"taskInfos":      string(taskInfosBytes),
 		}
-		_, err = driver.Request("https://cloud.189.cn/api/open/batch/createBatchTask.action", "POST", form,nil, account)
+		_, err = driver.Request("https://cloud.189.cn/api/open/batch/createBatchTask.action", "POST", form, nil, account)
 	}
 	if err == nil {
 		_ = base.DeleteCache(srcDir, account)
@@ -323,7 +317,7 @@ func (driver Cloud189) Copy(src string, dst string, account *model.Account) erro
 		"targetFolderId": dstDirFile.Id,
 		"taskInfos":      string(taskInfosBytes),
 	}
-	_, err = driver.Request("https://cloud.189.cn/api/open/batch/createBatchTask.action", "POST", form,nil, account)
+	_, err = driver.Request("https://cloud.189.cn/api/open/batch/createBatchTask.action", "POST", form, nil, account)
 	if err == nil {
 		_ = base.DeleteCache(dstDir, account)
 	}
@@ -356,7 +350,7 @@ func (driver Cloud189) Delete(path string, account *model.Account) error {
 		"targetFolderId": "",
 		"taskInfos":      string(taskInfosBytes),
 	}
-	_, err = driver.Request("https://cloud.189.cn/api/open/batch/createBatchTask.action", "POST", form,nil, account)
+	_, err = driver.Request("https://cloud.189.cn/api/open/batch/createBatchTask.action", "POST", form, nil, account)
 	if err == nil {
 		_ = base.DeleteCache(utils.Dir(path), account)
 	}
@@ -365,6 +359,7 @@ func (driver Cloud189) Delete(path string, account *model.Account) error {
 
 // Upload Error: decrypt encryptionText failed
 func (driver Cloud189) Upload(file *model.FileStream, account *model.Account) error {
+	return base.ErrNotImplement
 	const DEFAULT uint64 = 10485760
 	var count = int64(math.Ceil(float64(file.GetSize()) / float64(DEFAULT)))
 	var finish uint64 = 0
@@ -377,11 +372,11 @@ func (driver Cloud189) Upload(file *model.FileStream, account *model.Account) er
 	}
 	res, err := driver.UploadRequest("/person/initMultiUpload", map[string]string{
 		"parentFolderId": parentFile.Id,
-		"fileName": file.Name,
-		"fileSize": strconv.FormatInt(int64(file.Size),10),
-		"sliceSize": strconv.FormatInt(int64(DEFAULT),10),
-		"lazyCheck": "1",
-	},account)
+		"fileName":       file.Name,
+		"fileSize":       strconv.FormatInt(int64(file.Size), 10),
+		"sliceSize":      strconv.FormatInt(int64(DEFAULT), 10),
+		"lazyCheck":      "1",
+	}, account)
 	if err != nil {
 		return err
 	}
@@ -409,21 +404,21 @@ func (driver Cloud189) Upload(file *model.FileStream, account *model.Account) er
 		md5s = append(md5s, md5Str)
 		md5Sum.Write(byteData)
 		res, err = driver.UploadRequest("/person/getMultiUploadUrls", map[string]string{
-			"partInfo": fmt.Sprintf("%s-%s",strconv.FormatInt(i,10),md5Base64),
+			"partInfo":     fmt.Sprintf("%s-%s", strconv.FormatInt(i, 10), md5Base64),
 			"uploadFileId": uploadFileId,
-		},account)
+		}, account)
 		if err != nil {
 			return err
 		}
-		uploadData := jsoniter.Get(res,"uploadUrls.partNumber_"+strconv.FormatInt(i,10))
-		headers := strings.Split(uploadData.Get("requestHeader").ToString(),"&")
+		uploadData := jsoniter.Get(res, "uploadUrls.partNumber_"+strconv.FormatInt(i, 10))
+		headers := strings.Split(uploadData.Get("requestHeader").ToString(), "&")
 		req, err := http.NewRequest("PUT", uploadData.Get("requestURL").ToString(), bytes.NewBuffer(byteData))
 		if err != nil {
 			return err
 		}
-		for _,header := range headers{
+		for _, header := range headers {
 			kv := strings.Split(header, "=")
-			req.Header.Set(kv[0],strings.Join(kv[1:],"="))
+			req.Header.Set(kv[0], strings.Join(kv[1:], "="))
 		}
 		res, err := base.HttpClient.Do(req)
 		if err != nil {
@@ -432,12 +427,12 @@ func (driver Cloud189) Upload(file *model.FileStream, account *model.Account) er
 		log.Debugf("%+v", res)
 	}
 	id := md5Sum.Sum(nil)
-	res,err = driver.UploadRequest("/person/commitMultiUploadFile", map[string]string{
+	res, err = driver.UploadRequest("/person/commitMultiUploadFile", map[string]string{
 		"uploadFileId": uploadFileId,
-		"fileMd5": hex.EncodeToString(id),
-		"sliceMd5": utils.GetMD5Encode(strings.Join(md5s,"\n")),
-		"lazyCheck":"1",
-	},account)
+		"fileMd5":      hex.EncodeToString(id),
+		"sliceMd5":     utils.GetMD5Encode(strings.Join(md5s, "\n")),
+		"lazyCheck":    "1",
+	}, account)
 	if err == nil {
 		_ = base.DeleteCache(file.ParentPath, account)
 	}

drivers/alidrive/driver.go

@@ -21,13 +21,24 @@ type AliDrive struct{}
 
 func (driver AliDrive) Config() base.DriverConfig {
 	return base.DriverConfig{
-		Name:      "AliDrive",
-		OnlyProxy: false,
+		Name: "AliDrive",
 	}
 }
 
 func (driver AliDrive) Items() []base.Item {
 	return []base.Item{
+		{
+			Name:     "refresh_token",
+			Label:    "refresh token",
+			Type:     base.TypeString,
+			Required: true,
+		},
+		{
+			Name:     "root_folder",
+			Label:    "root folder file_id",
+			Type:     base.TypeString,
+			Required: false,
+		},
 		{
 			Name:     "order_by",
 			Label:    "order_by",
@@ -42,18 +53,6 @@ func (driver AliDrive) Items() []base.Item {
 			Values:   "ASC,DESC",
 			Required: false,
 		},
-		{
-			Name:     "refresh_token",
-			Label:    "refresh token",
-			Type:     base.TypeString,
-			Required: true,
-		},
-		{
-			Name:     "root_folder",
-			Label:    "root folder file_id",
-			Type:     base.TypeString,
-			Required: false,
-		},
 		{
 			Name:        "limit",
 			Label:       "limit",
@@ -158,8 +157,8 @@ func (driver AliDrive) Files(path string, account *model.Account) ([]model.File,
 	return files, nil
 }
 
-func (driver AliDrive) Link(path string, account *model.Account) (*base.Link, error) {
-	file, err := driver.File(path, account)
+func (driver AliDrive) Link(args base.Args, account *model.Account) (*base.Link, error) {
+	file, err := driver.File(args.Path, account)
 	if err != nil {
 		return nil, err
 	}
@@ -183,7 +182,7 @@ func (driver AliDrive) Link(path string, account *model.Account) (*base.Link, er
 				return nil, err
 			} else {
 				_ = model.SaveAccount(account)
-				return driver.Link(path, account)
+				return driver.Link(args, account)
 			}
 		}
 		return nil, fmt.Errorf("%s", e.Message)
@@ -201,11 +200,6 @@ func (driver AliDrive) Path(path string, account *model.Account) (*model.File, [
 		return nil, nil, err
 	}
 	if !file.IsDir() {
-		link, err := driver.Link(path, account)
-		if err != nil {
-			return nil, nil, err
-		}
-		file.Url = link.Url
 		return file, nil, nil
 	}
 	files, err := driver.Files(path, account)
@@ -370,6 +364,9 @@ type UploadResp struct {
 }
 
 func (driver AliDrive) Upload(file *model.FileStream, account *model.Account) error {
+	if file == nil {
+		return base.ErrEmptyFile
+	}
 	const DEFAULT uint64 = 10485760
 	var count = int64(math.Ceil(float64(file.GetSize()) / float64(DEFAULT)))
 	var finish uint64 = 0

drivers/alist/alist.go

@@ -13,7 +13,11 @@ type BaseResp struct {
 
 type PathResp struct {
 	BaseResp
-	Data []model.File `json:"data"`
+	Data struct {
+		Type string `json:"type"`
+		//Meta  Meta         `json:"meta"`
+		Files []model.File `json:"files"`
+	} `json:"data"`
 }
 
 type PreviewResp struct {
@@ -25,7 +29,7 @@ func (driver *Alist) Login(account *model.Account) error {
 	var resp BaseResp
 	_, err := base.RestyClient.R().SetResult(&resp).
 		SetHeader("Authorization", account.AccessToken).
-		Get(account.SiteUrl+"/api/admin/login")
+		Get(account.SiteUrl + "/api/admin/login")
 	if err != nil {
 		return err
 	}

drivers/alist/driver.go

@@ -17,8 +17,9 @@ type Alist struct{}
 
 func (driver Alist) Config() base.DriverConfig {
 	return base.DriverConfig{
-		Name:      "Alist",
-		OnlyProxy: false,
+		Name:          "Alist",
+		NoNeedSetLink: true,
+		NoCors:        true,
 	}
 }
 
@@ -101,7 +102,8 @@ func (driver Alist) Files(path string, account *model.Account) ([]model.File, er
 	return files, nil
 }
 
-func (driver Alist) Link(path string, account *model.Account) (*base.Link, error) {
+func (driver Alist) Link(args base.Args, account *model.Account) (*base.Link, error) {
+	path := args.Path
 	path = utils.ParsePath(path)
 	name := utils.Base(path)
 	flag := "d"
@@ -134,13 +136,13 @@ func (driver Alist) Path(path string, account *model.Account) (*model.File, []mo
 	if resp.Code != 200 {
 		return nil, nil, errors.New(resp.Message)
 	}
-	if resp.Message == "file" {
-		return &resp.Data[0], nil, nil
+	if resp.Data.Type == "file" {
+		return &resp.Data.Files[0], nil, nil
 	}
-	if len(resp.Data) > 0 {
-		_ = base.SetCache(path, resp.Data, account)
+	if len(resp.Data.Files) > 0 {
+		_ = base.SetCache(path, resp.Data.Files, account)
 	}
-	return nil, resp.Data, nil
+	return nil, resp.Data.Files, nil
 }
 
 func (driver Alist) Proxy(c *gin.Context, account *model.Account) {}

drivers/all.go

@@ -5,10 +5,37 @@ import (
 	_ "github.com/Xhofe/alist/drivers/189"
 	_ "github.com/Xhofe/alist/drivers/alidrive"
 	_ "github.com/Xhofe/alist/drivers/alist"
+	"github.com/Xhofe/alist/drivers/base"
 	_ "github.com/Xhofe/alist/drivers/ftp"
 	_ "github.com/Xhofe/alist/drivers/google"
 	_ "github.com/Xhofe/alist/drivers/lanzou"
 	_ "github.com/Xhofe/alist/drivers/native"
 	_ "github.com/Xhofe/alist/drivers/onedrive"
 	_ "github.com/Xhofe/alist/drivers/pikpak"
+	_ "github.com/Xhofe/alist/drivers/s3"
+	_ "github.com/Xhofe/alist/drivers/shandian"
+	_ "github.com/Xhofe/alist/drivers/webdav"
+	log "github.com/sirupsen/logrus"
+	"strings"
 )
+
+var NoCors string
+var NoUpload string
+
+func GetConfig() {
+	for k, v := range base.GetDriversMap() {
+		if v.Config().NoCors {
+			NoCors += k + ","
+		}
+		if v.Upload(nil, nil) != base.ErrEmptyFile {
+			NoUpload += k + ","
+		}
+	}
+	NoCors = strings.Trim(NoCors, ",")
+	NoUpload += "root"
+}
+
+func init() {
+	log.Debug("all init")
+	GetConfig()
+}

drivers/base/driver.go

@@ -9,28 +9,51 @@ import (
 )
 
 type DriverConfig struct {
-	Name      string
-	OnlyProxy bool
-	NoLink    bool // 必须本机返回的
+	Name          string
+	OnlyProxy     bool // 必须使用代理（本机或者其他机器）
+	OnlyLocal     bool // 必须本机返回的
+	ApiProxy      bool // 使用API中转的
+	NoNeedSetLink bool // 不需要设置链接的
+	NoCors        bool // 不可以跨域
+	LocalSort     bool // 本地排序
+}
+
+type Args struct {
+	Path string
+	IP   string
 }
 
 type Driver interface {
+	// Config 配置
 	Config() DriverConfig
+	// Items 账号所需参数
 	Items() []Item
+	// Save 保存时处理
 	Save(account *model.Account, old *model.Account) error
+	// File 取文件
 	File(path string, account *model.Account) (*model.File, error)
+	// Files 取文件夹
 	Files(path string, account *model.Account) ([]model.File, error)
-	Link(path string, account *model.Account) (*Link, error)
+	// Link 取链接
+	Link(args Args, account *model.Account) (*Link, error)
+	// Path 取路径（文件或文件夹）
 	Path(path string, account *model.Account) (*model.File, []model.File, error)
+	// Proxy 代理处理
 	Proxy(c *gin.Context, account *model.Account)
+	// Preview 预览
 	Preview(path string, account *model.Account) (interface{}, error)
+	// MakeDir 创建文件夹
+	MakeDir(path string, account *model.Account) error
+	// Move 移动/改名
+	Move(src string, dst string, account *model.Account) error
+	// Copy 拷贝
+	Copy(src string, dst string, account *model.Account) error
+	// Delete 删除
+	Delete(path string, account *model.Account) error
+	// Upload 上传
+	Upload(file *model.FileStream, account *model.Account) error
 	// TODO
 	//Search(path string, keyword string, account *model.Account) ([]*model.File, error)
-	MakeDir(path string, account *model.Account) error
-	Move(src string, dst string, account *model.Account) error
-	Copy(src string, dst string, account *model.Account) error
-	Delete(path string, account *model.Account) error
-	Upload(file *model.FileStream, account *model.Account) error
 }
 
 type Item struct {
@@ -54,6 +77,10 @@ func GetDriver(name string) (driver Driver, ok bool) {
 	return
 }
 
+func GetDriversMap() map[string]Driver {
+	return driversMap
+}
+
 func GetDrivers() map[string][]Item {
 	res := make(map[string][]Item, 0)
 	for k, v := range driversMap {
@@ -84,13 +111,40 @@ func GetDrivers() map[string][]Item {
 				},
 			}, v.Items()...)
 		}
-		res[k] = append(res[k], Item{
-			Name:        "proxy_url",
-			Label:       "proxy_url",
-			Type:        TypeString,
-			Required:    false,
-			Description: "proxy url",
-		})
+		res[k] = append([]Item{
+			{
+				Name:  "down_proxy_url",
+				Label: "down_proxy_url",
+				Type:  TypeString,
+			},
+		}, res[k]...)
+		if v.Config().ApiProxy {
+			res[k] = append([]Item{
+				{
+					Name:  "api_proxy_url",
+					Label: "api_proxy_url",
+					Type:  TypeString,
+				},
+			}, res[k]...)
+		}
+		if v.Config().LocalSort {
+			res[k] = append(res[k], []Item{
+				{
+					Name:     "order_by",
+					Label:    "order_by",
+					Type:     TypeSelect,
+					Values:   "name,size,updated_at",
+					Required: false,
+				},
+				{
+					Name:     "order_direction",
+					Label:    "order_direction",
+					Type:     TypeSelect,
+					Values:   "ASC,DESC",
+					Required: false,
+				},
+			}...)
+		}
 	}
 	return res
 }
@@ -105,6 +159,8 @@ func init() {
 			return http.ErrUseLastResponse
 		}),
 	)
-	NoRedirectClient.SetHeader("user-agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36")
-	RestyClient.SetHeader("user-agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36")
+	userAgent := "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36"
+	NoRedirectClient.SetHeader("user-agent", userAgent)
+	RestyClient.SetHeader("user-agent", userAgent)
+	RestyClient.SetRetryCount(3)
 }

drivers/base/types.go

@@ -2,6 +2,7 @@ package base
 
 import (
 	"errors"
+	"io"
 )
 
 var (
@@ -10,6 +11,7 @@ var (
 	ErrNotImplement = errors.New("not implement")
 	ErrNotSupport   = errors.New("not support")
 	ErrNotFolder    = errors.New("not a folder")
+	ErrEmptyFile    = errors.New("empty file")
 )
 
 const (
@@ -34,13 +36,13 @@ type TokenResp struct {
 	RefreshToken string `json:"refresh_token"`
 }
 
-type Header struct{
-	Name string `json:"name"`
+type Header struct {
+	Name  string `json:"name"`
 	Value string `json:"value"`
 }
 
 type Link struct {
-	Url string `json:"url"`
+	Url     string   `json:"url"`
 	Headers []Header `json:"headers"`
-	Data []byte
-}
+	Data    io.ReadCloser
+}

drivers/ftp/driver.go

@@ -8,7 +8,6 @@ import (
 	"github.com/gin-gonic/gin"
 	"github.com/jlaffaye/ftp"
 	log "github.com/sirupsen/logrus"
-	"io/ioutil"
 	"path/filepath"
 )
 
@@ -16,9 +15,11 @@ type FTP struct{}
 
 func (driver FTP) Config() base.DriverConfig {
 	return base.DriverConfig{
-		Name:      "FTP",
-		OnlyProxy: true,
-		NoLink:    true,
+		Name:          "FTP",
+		OnlyProxy:     true,
+		OnlyLocal:     true,
+		NoNeedSetLink: true,
+		LocalSort:     true,
 	}
 }
 
@@ -48,20 +49,6 @@ func (driver FTP) Items() []base.Item {
 			Type:     base.TypeString,
 			Required: false,
 		},
-		{
-			Name:     "order_by",
-			Label:    "order_by",
-			Type:     base.TypeSelect,
-			Values:   "name,size,updated_at",
-			Required: false,
-		},
-		{
-			Name:     "order_direction",
-			Label:    "order_direction",
-			Type:     base.TypeSelect,
-			Values:   "ASC,DESC",
-			Required: false,
-		},
 	}
 }
 
@@ -127,6 +114,9 @@ func (driver FTP) Files(path string, account *model.Account) ([]model.File, erro
 	res := make([]model.File, 0)
 	for i, _ := range entries {
 		entry := entries[i]
+		if entry.Name == "." || entry.Name == ".." {
+			continue
+		}
 		f := model.File{
 			Name:      entry.Name,
 			Size:      int64(entry.Size),
@@ -146,7 +136,8 @@ func (driver FTP) Files(path string, account *model.Account) ([]model.File, erro
 	return res, nil
 }
 
-func (driver FTP) Link(path string, account *model.Account) (*base.Link, error) {
+func (driver FTP) Link(args base.Args, account *model.Account) (*base.Link, error) {
+	path := args.Path
 	path = utils.ParsePath(path)
 	realPath := utils.Join(account.RootFolder, path)
 	conn, err := driver.Login(account)
@@ -158,13 +149,13 @@ func (driver FTP) Link(path string, account *model.Account) (*base.Link, error)
 	if err != nil {
 		return nil, err
 	}
-	defer func() { _ = resp.Close() }()
-	data, err := ioutil.ReadAll(resp)
-	if err != nil {
-		return nil, err
-	}
+	//defer func() { _ = resp.Close() }()
+	//data, err := ioutil.ReadAll(resp)
+	//if err != nil {
+	//	return nil, err
+	//}
 	return &base.Link{
-		Data: data,
+		Data: resp,
 	}, nil
 }
 
@@ -182,7 +173,6 @@ func (driver FTP) Path(path string, account *model.Account) (*model.File, []mode
 	if err != nil {
 		return nil, nil, err
 	}
-	model.SortFiles(files, account)
 	return nil, files, nil
 }
 
@@ -223,7 +213,9 @@ func (driver FTP) Move(src string, dst string, account *model.Account) error {
 	err = conn.Rename(realSrc, realDst)
 	if err != nil {
 		_ = base.DeleteCache(utils.Dir(src), account)
-		_ = base.DeleteCache(utils.Dir(dst), account)
+		if utils.Dir(src) != utils.Dir(dst) {
+			_ = base.DeleteCache(utils.Dir(dst), account)
+		}
 	}
 	return err
 }
@@ -248,6 +240,9 @@ func (driver FTP) Delete(path string, account *model.Account) error {
 }
 
 func (driver FTP) Upload(file *model.FileStream, account *model.Account) error {
+	if file == nil {
+		return base.ErrEmptyFile
+	}
 	realPath := utils.Join(account.RootFolder, file.ParentPath, file.Name)
 	conn, err := driver.Login(account)
 	if err != nil {

drivers/google/driver.go

@@ -8,6 +8,7 @@ import (
 	"github.com/Xhofe/alist/utils"
 	"github.com/gin-gonic/gin"
 	log "github.com/sirupsen/logrus"
+	"io/ioutil"
 	"path/filepath"
 )
 
@@ -15,8 +16,10 @@ type GoogleDrive struct{}
 
 func (driver GoogleDrive) Config() base.DriverConfig {
 	return base.DriverConfig{
-		Name:       "GoogleDrive",
-		OnlyProxy:  true,
+		Name:          "GoogleDrive",
+		OnlyProxy:     true,
+		ApiProxy:      true,
+		NoNeedSetLink: true,
 	}
 }
 
@@ -46,6 +49,20 @@ func (driver GoogleDrive) Items() []base.Item {
 			Type:     base.TypeString,
 			Required: false,
 		},
+		{
+			Name:        "order_by",
+			Label:       "order_by",
+			Type:        base.TypeString,
+			Required:    false,
+			Description: "such as: folder,name,modifiedTime",
+		},
+		{
+			Name:     "order_direction",
+			Label:    "order_direction",
+			Type:     base.TypeSelect,
+			Values:   "asc,desc",
+			Required: false,
+		},
 	}
 }
 
@@ -92,10 +109,10 @@ func (driver GoogleDrive) File(path string, account *model.Account) (*model.File
 
 func (driver GoogleDrive) Files(path string, account *model.Account) ([]model.File, error) {
 	path = utils.ParsePath(path)
-	var rawFiles []GoogleFile
+	var rawFiles []File
 	cache, err := base.GetCache(path, account)
 	if err == nil {
-		rawFiles, _ = cache.([]GoogleFile)
+		rawFiles, _ = cache.([]File)
 	} else {
 		file, err := driver.File(path, account)
 		if err != nil {
@@ -111,13 +128,13 @@ func (driver GoogleDrive) Files(path string, account *model.Account) ([]model.Fi
 	}
 	files := make([]model.File, 0)
 	for _, file := range rawFiles {
-		files = append(files, *driver.FormatFile(&file))
+		files = append(files, *driver.FormatFile(&file, account))
 	}
 	return files, nil
 }
 
-func (driver GoogleDrive) Link(path string, account *model.Account) (*base.Link, error) {
-	file, err := driver.File(path, account)
+func (driver GoogleDrive) Link(args base.Args, account *model.Account) (*base.Link, error) {
+	file, err := driver.File(args.Path, account)
 	if err != nil {
 		return nil, err
 	}
@@ -125,26 +142,15 @@ func (driver GoogleDrive) Link(path string, account *model.Account) (*base.Link,
 		return nil, base.ErrNotFile
 	}
 	url := fmt.Sprintf("https://www.googleapis.com/drive/v3/files/%s?includeItemsFromAllDrives=true&supportsAllDrives=true", file.Id)
-	var e GoogleError
-	_, _ = googleClient.R().SetError(&e).
-		SetHeader("Authorization", "Bearer "+account.AccessToken).
-		Get(url)
-	if e.Error.Code != 0 {
-		if e.Error.Code == 401 {
-			err = driver.RefreshToken(account)
-			if err != nil {
-				_ = model.SaveAccount(account)
-				return nil, err
-			}
-			return driver.Link(path, account)
-		}
-		return nil, fmt.Errorf("%s: %v", e.Error.Message, e.Error.Errors)
+	_, err = driver.Request(url, base.Get, nil, nil, nil, nil, nil, account)
+	if err != nil {
+		return nil, err
 	}
 	link := base.Link{
 		Url: url + "&alt=media",
 		Headers: []base.Header{
 			{
-				Name: "Authorization",
+				Name:  "Authorization",
 				Value: "Bearer " + account.AccessToken,
 			},
 		},
@@ -159,8 +165,7 @@ func (driver GoogleDrive) Path(path string, account *model.Account) (*model.File
 	if err != nil {
 		return nil, nil, err
 	}
-	if file.Type != conf.FOLDER {
-		//file.Url, _ = driver.Link(path, account)
+	if !file.IsDir() {
 		return file, nil, nil
 	}
 	files, err := driver.Files(path, account)
@@ -179,23 +184,112 @@ func (driver GoogleDrive) Preview(path string, account *model.Account) (interfac
 }
 
 func (driver GoogleDrive) MakeDir(path string, account *model.Account) error {
-	return base.ErrNotImplement
+	parentFile, err := driver.File(utils.Dir(path), account)
+	if err != nil {
+		return err
+	}
+	data := base.Json{
+		"name":     utils.Base(path),
+		"parents":  []string{parentFile.Id},
+		"mimeType": "application/vnd.google-apps.folder",
+	}
+	_, err = driver.Request("https://www.googleapis.com/drive/v3/files", base.Post, nil, nil, nil, &data, nil, account)
+	if err == nil {
+		_ = base.DeleteCache(utils.Dir(path), account)
+	}
+	return err
 }
 
 func (driver GoogleDrive) Move(src string, dst string, account *model.Account) error {
-	return base.ErrNotImplement
+	srcFile, err := driver.File(src, account)
+	url := "https://www.googleapis.com/drive/v3/files/" + srcFile.Id
+	if err != nil {
+		return err
+	}
+	if utils.Dir(src) == utils.Dir(dst) {
+		// rename
+		data := base.Json{
+			"name": utils.Base(dst),
+		}
+		_, err = driver.Request(url, base.Patch, nil, nil, nil, &data, nil, account)
+	} else {
+		dstParentFile, err := driver.File(utils.Dir(dst), account)
+		if err != nil {
+			return err
+		}
+		query := map[string]string{
+			"addParents":    dstParentFile.Id,
+			"removeParents": "root",
+		}
+		_, err = driver.Request(url, base.Patch, nil, query, nil, nil, nil, account)
+	}
+	if err == nil {
+		_ = base.DeleteCache(utils.Dir(src), account)
+		if utils.Dir(src) != utils.Dir(dst) {
+			_ = base.DeleteCache(utils.Dir(dst), account)
+		}
+	}
+	return err
 }
 
 func (driver GoogleDrive) Copy(src string, dst string, account *model.Account) error {
-	return base.ErrNotImplement
+	return base.ErrNotSupport
 }
 
 func (driver GoogleDrive) Delete(path string, account *model.Account) error {
-	return base.ErrNotImplement
+	file, err := driver.File(path, account)
+	url := "https://www.googleapis.com/drive/v3/files/" + file.Id
+	if err != nil {
+		return err
+	}
+	_, err = driver.Request(url, base.Delete, nil, nil, nil, nil, nil, account)
+	if err == nil {
+		_ = base.DeleteCache(utils.Dir(path), account)
+	}
+	return err
 }
 
 func (driver GoogleDrive) Upload(file *model.FileStream, account *model.Account) error {
-	return base.ErrNotImplement
+	if file == nil {
+		return base.ErrEmptyFile
+	}
+	parentFile, err := driver.File(file.ParentPath, account)
+	if err != nil {
+		return err
+	}
+	data := base.Json{
+		"name":    file.Name,
+		"parents": []string{parentFile.Id},
+	}
+	var e Error
+	url := "https://www.googleapis.com/upload/drive/v3/files?uploadType=resumable&supportsAllDrives=true"
+	if account.APIProxyUrl != "" {
+		url = fmt.Sprintf("%s/%s", account.APIProxyUrl, url)
+	}
+	res, err := base.NoRedirectClient.R().SetHeader("Authorization", "Bearer "+account.AccessToken).
+		SetError(&e).SetBody(data).
+		Post(url)
+	if err != nil {
+		return err
+	}
+	if e.Error.Code != 0 {
+		if e.Error.Code == 401 {
+			err = driver.RefreshToken(account)
+			if err != nil {
+				_ = model.SaveAccount(account)
+				return err
+			}
+			return driver.Upload(file, account)
+		}
+		return fmt.Errorf("%s: %v", e.Error.Message, e.Error.Errors)
+	}
+	putUrl := res.Header().Get("location")
+	byteData, _ := ioutil.ReadAll(file)
+	_, err = driver.Request(putUrl, base.Put, nil, nil, nil, byteData, nil, account)
+	if err == nil {
+		_ = base.DeleteCache(file.ParentPath, account)
+	}
+	return err
 }
 
-var _ base.Driver = (*GoogleDrive)(nil)
+var _ base.Driver = (*GoogleDrive)(nil)

drivers/google/googledrive.go

@@ -7,23 +7,25 @@ import (
 	"github.com/Xhofe/alist/model"
 	"github.com/Xhofe/alist/utils"
 	"github.com/go-resty/resty/v2"
+	log "github.com/sirupsen/logrus"
 	"path/filepath"
 	"strconv"
 	"time"
 )
 
-var googleClient = resty.New()
-
-type GoogleTokenError struct {
+type TokenError struct {
 	Error            string `json:"error"`
 	ErrorDescription string `json:"error_description"`
 }
 
 func (driver GoogleDrive) RefreshToken(account *model.Account) error {
 	url := "https://www.googleapis.com/oauth2/v4/token"
+	if account.APIProxyUrl != "" {
+		url = fmt.Sprintf("%s/%s", account.APIProxyUrl, url)
+	}
 	var resp base.TokenResp
-	var e GoogleTokenError
-	_, err := googleClient.R().SetResult(&resp).SetError(&e).
+	var e TokenError
+	res, err := base.RestyClient.R().SetResult(&resp).SetError(&e).
 		SetFormData(map[string]string{
 			"client_id":     account.ClientId,
 			"client_secret": account.ClientSecret,
@@ -33,6 +35,7 @@ func (driver GoogleDrive) RefreshToken(account *model.Account) error {
 	if err != nil {
 		return err
 	}
+	log.Debug(res.String())
 	if e.Error != "" {
 		return fmt.Errorf(e.Error)
 	}
@@ -41,25 +44,25 @@ func (driver GoogleDrive) RefreshToken(account *model.Account) error {
 	return nil
 }
 
-type GoogleFile struct {
-	Id           string     `json:"id"`
-	Name         string     `json:"name"`
-	MimeType     string     `json:"mimeType"`
-	ModifiedTime *time.Time `json:"modifiedTime"`
-	Size         string     `json:"size"`
+type File struct {
+	Id            string     `json:"id"`
+	Name          string     `json:"name"`
+	MimeType      string     `json:"mimeType"`
+	ModifiedTime  *time.Time `json:"modifiedTime"`
+	Size          string     `json:"size"`
+	ThumbnailLink string     `json:"thumbnailLink"`
 }
 
 func (driver GoogleDrive) IsDir(mimeType string) bool {
 	return mimeType == "application/vnd.google-apps.folder" || mimeType == "application/vnd.google-apps.shortcut"
 }
 
-func (driver GoogleDrive) FormatFile(file *GoogleFile) *model.File {
+func (driver GoogleDrive) FormatFile(file *File, account *model.Account) *model.File {
 	f := &model.File{
 		Id:        file.Id,
 		Name:      file.Name,
 		Driver:    driver.Config().Name,
 		UpdatedAt: file.ModifiedTime,
-		Thumbnail: "",
 		Url:       "",
 	}
 	if driver.IsDir(file.MimeType) {
@@ -69,15 +72,22 @@ func (driver GoogleDrive) FormatFile(file *GoogleFile) *model.File {
 		f.Size = size
 		f.Type = utils.GetFileType(filepath.Ext(file.Name))
 	}
+	if file.ThumbnailLink != "" {
+		if account.DownProxyUrl != "" {
+			f.Thumbnail = fmt.Sprintf("%s/%s", account.DownProxyUrl, file.ThumbnailLink)
+		} else {
+			f.Thumbnail = file.ThumbnailLink
+		}
+	}
 	return f
 }
 
-type GoogleFiles struct {
-	NextPageToken string       `json:"nextPageToken"`
-	Files         []GoogleFile `json:"files"`
+type Files struct {
+	NextPageToken string `json:"nextPageToken"`
+	Files         []File `json:"files"`
 }
 
-type GoogleError struct {
+type Error struct {
 	Error struct {
 		Errors []struct {
 			Domain       string `json:"domain"`
@@ -91,68 +101,98 @@ type GoogleError struct {
 	} `json:"error"`
 }
 
-func (driver GoogleDrive) GetFiles(id string, account *model.Account) ([]GoogleFile, error) {
+func (driver GoogleDrive) GetFiles(id string, account *model.Account) ([]File, error) {
 	pageToken := "first"
-	res := make([]GoogleFile, 0)
+	res := make([]File, 0)
 	for pageToken != "" {
 		if pageToken == "first" {
 			pageToken = ""
 		}
-		var resp GoogleFiles
-		var e GoogleError
-		_, err := googleClient.R().SetResult(&resp).SetError(&e).
-			SetHeader("Authorization", "Bearer "+account.AccessToken).
-			SetQueryParams(map[string]string{
-				"orderBy":                   "folder,name,modifiedTime desc",
-				"fields":                    "files(id,name,mimeType,size,modifiedTime),nextPageToken",
-				"pageSize":                  "1000",
-				"q":                         fmt.Sprintf("'%s' in parents and trashed = false", id),
-				"includeItemsFromAllDrives": "true",
-				"supportsAllDrives":         "true",
-				"pageToken":                 pageToken,
-			}).Get("https://www.googleapis.com/drive/v3/files")
+		var resp Files
+		orderBy := "folder,name,modifiedTime desc"
+		if account.OrderBy != "" {
+			orderBy = account.OrderBy + " " + account.OrderDirection
+		}
+		query := map[string]string{
+			"orderBy":  orderBy,
+			"fields":   "files(id,name,mimeType,size,modifiedTime,thumbnailLink),nextPageToken",
+			"pageSize": "1000",
+			"q":        fmt.Sprintf("'%s' in parents and trashed = false", id),
+			//"includeItemsFromAllDrives": "true",
+			//"supportsAllDrives":         "true",
+			"pageToken": pageToken,
+		}
+		_, err := driver.Request("https://www.googleapis.com/drive/v3/files",
+			base.Get, nil, query, nil, nil, &resp, account)
 		if err != nil {
 			return nil, err
 		}
-		if e.Error.Code != 0 {
-			if e.Error.Code == 401 {
-				err = driver.RefreshToken(account)
-				if err != nil {
-					_ = model.SaveAccount(account)
-					return nil, err
-				}
-				return driver.GetFiles(id, account)
-			}
-			return nil, fmt.Errorf("%s: %v", e.Error.Message, e.Error.Errors)
-		}
 		pageToken = resp.NextPageToken
 		res = append(res, resp.Files...)
 	}
 	return res, nil
 }
 
-//func (driver GoogleDrive) GetFile(path string, account *model.Account) (*GoogleFile, error) {
-//	dir, name := filepath.Split(path)
-//	dir = utils.ParsePath(dir)
-//	_, _, err := driver.ParentPath(dir, account)
-//	if err != nil {
-//		return nil, err
-//	}
-//	parentFiles_, _ := conf.Cache.Get(conf.Ctx, fmt.Sprintf("%s%s", account.Name, dir))
-//	parentFiles, _ := parentFiles_.([]GoogleFile)
-//	for _, file := range parentFiles {
-//		if file.Name == name {
-//			if !driver.IsDir(file.MimeType) {
-//				return &file, err
-//			} else {
-//				return nil, drivers.ErrNotFile
-//			}
-//		}
-//	}
-//	return nil, drivers.ErrPathNotFound
-//}
+func (driver GoogleDrive) Request(url string, method int, headers, query, form map[string]string, data interface{}, resp interface{}, account *model.Account) ([]byte, error) {
+	rawUrl := url
+	if account.APIProxyUrl != "" {
+		url = fmt.Sprintf("%s/%s", account.APIProxyUrl, url)
+	}
+	req := base.RestyClient.R()
+	req.SetHeader("Authorization", "Bearer "+account.AccessToken)
+	req.SetQueryParam("includeItemsFromAllDrives", "true")
+	req.SetQueryParam("supportsAllDrives", "true")
+	if headers != nil {
+		req.SetHeaders(headers)
+	}
+	if query != nil {
+		req.SetQueryParams(query)
+	}
+	if form != nil {
+		req.SetFormData(form)
+	}
+	if data != nil {
+		req.SetBody(data)
+	}
+	if resp != nil {
+		req.SetResult(resp)
+	}
+	var res *resty.Response
+	var err error
+	var e Error
+	req.SetError(&e)
+	switch method {
+	case base.Get:
+		res, err = req.Get(url)
+	case base.Post:
+		res, err = req.Post(url)
+	case base.Delete:
+		res, err = req.Delete(url)
+	case base.Patch:
+		res, err = req.Patch(url)
+	case base.Put:
+		res, err = req.Put(url)
+	default:
+		return nil, base.ErrNotSupport
+	}
+	if err != nil {
+		return nil, err
+	}
+	log.Debug(res.String())
+	if e.Error.Code != 0 {
+		if e.Error.Code == 401 {
+			err = driver.RefreshToken(account)
+			if err != nil {
+				_ = model.SaveAccount(account)
+				return nil, err
+			}
+			return driver.Request(rawUrl, method, headers, query, form, data, resp, account)
+		}
+		return nil, fmt.Errorf("%s: %v", e.Error.Message, e.Error.Errors)
+	}
+	return res.Body(), nil
+}
 
 func init() {
 	base.RegisterDriver(&GoogleDrive{})
-	googleClient.SetRetryCount(3)
 }

drivers/lanzou/driver.go

@@ -14,8 +14,8 @@ type Lanzou struct{}
 
 func (driver Lanzou) Config() base.DriverConfig {
 	return base.DriverConfig{
-		Name:      "Lanzou",
-		OnlyProxy: false,
+		Name:   "Lanzou",
+		NoCors: true,
 	}
 }
 
@@ -114,8 +114,8 @@ func (driver Lanzou) Files(path string, account *model.Account) ([]model.File, e
 	return files, nil
 }
 
-func (driver Lanzou) Link(path string, account *model.Account) (*base.Link, error) {
-	file, err := driver.File(path, account)
+func (driver Lanzou) Link(args base.Args, account *model.Account) (*base.Link, error) {
+	file, err := driver.File(args.Path, account)
 	if err != nil {
 		return nil, err
 	}
@@ -145,11 +145,6 @@ func (driver Lanzou) Path(path string, account *model.Account) (*model.File, []m
 		return nil, nil, err
 	}
 	if !file.IsDir() {
-		link, err := driver.Link(path, account)
-		if err != nil {
-			return nil, nil, err
-		}
-		file.Url = link.Url
 		return file, nil, nil
 	}
 	files, err := driver.Files(path, account)

drivers/native/driver.go

@@ -19,9 +19,11 @@ type Native struct{}
 
 func (driver Native) Config() base.DriverConfig {
 	return base.DriverConfig{
-		Name:      "Native",
-		OnlyProxy: true,
-		NoLink:    true,
+		Name:          "Native",
+		OnlyProxy:     true,
+		OnlyLocal:     true,
+		NoNeedSetLink: true,
+		LocalSort:     true,
 	}
 }
 
@@ -33,20 +35,6 @@ func (driver Native) Items() []base.Item {
 			Type:     base.TypeString,
 			Required: true,
 		},
-		{
-			Name:     "order_by",
-			Label:    "order_by",
-			Type:     base.TypeSelect,
-			Values:   "name,size,updated_at",
-			Required: false,
-		},
-		{
-			Name:     "order_direction",
-			Label:    "order_direction",
-			Type:     base.TypeSelect,
-			Values:   "ASC,DESC",
-			Required: false,
-		},
 	}
 }
 
@@ -123,8 +111,8 @@ func (driver Native) Files(path string, account *model.Account) ([]model.File, e
 	return files, nil
 }
 
-func (driver Native) Link(path string, account *model.Account) (*base.Link, error) {
-	fullPath := filepath.Join(account.RootFolder, path)
+func (driver Native) Link(args base.Args, account *model.Account) (*base.Link, error) {
+	fullPath := filepath.Join(account.RootFolder, args.Path)
 	s, err := os.Stat(fullPath)
 	if err != nil {
 		return nil, err
@@ -152,7 +140,7 @@ func (driver Native) Path(path string, account *model.Account) (*model.File, []m
 	if err != nil {
 		return nil, nil, err
 	}
-	model.SortFiles(files, account)
+	//model.SortFiles(files, account)
 	return nil, files, nil
 }
 
@@ -208,6 +196,9 @@ func (driver Native) Delete(path string, account *model.Account) error {
 }
 
 func (driver Native) Upload(file *model.FileStream, account *model.Account) error {
+	if file == nil {
+		return base.ErrEmptyFile
+	}
 	fullPath := filepath.Join(account.RootFolder, file.ParentPath, file.Name)
 	_, err := driver.File(filepath.Join(file.ParentPath, file.Name), account)
 	if err == nil {

drivers/onedrive/driver.go

@@ -14,11 +14,10 @@ import (
 
 type Onedrive struct{}
 
-
 func (driver Onedrive) Config() base.DriverConfig {
 	return base.DriverConfig{
-		Name: "Onedrive",
-		OnlyProxy: false,
+		Name:          "Onedrive",
+		NoNeedSetLink: true,
 	}
 }
 
@@ -173,8 +172,8 @@ func (driver Onedrive) Files(path string, account *model.Account) ([]model.File,
 	return files, nil
 }
 
-func (driver Onedrive) Link(path string, account *model.Account) (*base.Link, error) {
-	file, err := driver.GetFile(account, path)
+func (driver Onedrive) Link(args base.Args, account *model.Account) (*base.Link, error) {
+	file, err := driver.GetFile(account, args.Path)
 	if err != nil {
 		return nil, err
 	}
@@ -194,7 +193,6 @@ func (driver Onedrive) Path(path string, account *model.Account) (*model.File, [
 		return nil, nil, err
 	}
 	if !file.IsDir() {
-		//file.Url, _ = driver.Link(path, account)
 		return file, nil, nil
 	}
 	files, err := driver.Files(path, account)
@@ -213,23 +211,88 @@ func (driver Onedrive) Preview(path string, account *model.Account) (interface{}
 }
 
 func (driver Onedrive) MakeDir(path string, account *model.Account) error {
-	return base.ErrNotImplement
+	url := driver.GetMetaUrl(account, false, utils.Dir(path)) + "/children"
+	data := base.Json{
+		"name":                              utils.Base(path),
+		"folder":                            base.Json{},
+		"@microsoft.graph.conflictBehavior": "rename",
+	}
+	_, err := driver.Request(url, base.Post, nil, nil, nil, &data, nil, account)
+	if err == nil {
+		_ = base.DeleteCache(utils.Dir(path), account)
+	}
+	return err
 }
 
 func (driver Onedrive) Move(src string, dst string, account *model.Account) error {
-	return base.ErrNotImplement
+	log.Debugf("onedrive move")
+	dstParentFile, err := driver.GetFile(account, utils.Dir(dst))
+	if err != nil {
+		return err
+	}
+	data := base.Json{
+		"parentReference": base.Json{
+			"id": dstParentFile.Id,
+		},
+		"name": utils.Base(dst),
+	}
+	url := driver.GetMetaUrl(account, false, src)
+	_, err = driver.Request(url, base.Patch, nil, nil, nil, &data, nil, account)
+	if err == nil {
+		_ = base.DeleteCache(utils.Dir(src), account)
+		if utils.Dir(src) != utils.Dir(dst) {
+			_ = base.DeleteCache(utils.Dir(dst), account)
+		}
+	}
+	return err
 }
 
 func (driver Onedrive) Copy(src string, dst string, account *model.Account) error {
-	return base.ErrNotImplement
+	dstParentFile, err := driver.GetFile(account, utils.Dir(dst))
+	if err != nil {
+		return err
+	}
+	data := base.Json{
+		"parentReference": base.Json{
+			"driveId": dstParentFile.ParentReference.DriveId,
+			"id":      dstParentFile.Id,
+		},
+		"name": utils.Base(dst),
+	}
+	url := driver.GetMetaUrl(account, false, src) + "/copy"
+	_, err = driver.Request(url, base.Post, nil, nil, nil, &data, nil, account)
+	if err == nil {
+		_ = base.DeleteCache(utils.Dir(src), account)
+		if utils.Dir(src) != utils.Dir(dst) {
+			_ = base.DeleteCache(utils.Dir(dst), account)
+		}
+	}
+	return err
 }
 
 func (driver Onedrive) Delete(path string, account *model.Account) error {
-	return base.ErrNotImplement
+	url := driver.GetMetaUrl(account, false, path)
+	_, err := driver.Request(url, base.Delete, nil, nil, nil, nil, nil, account)
+	if err == nil {
+		_ = base.DeleteCache(utils.Dir(path), account)
+	}
+	return err
 }
 
 func (driver Onedrive) Upload(file *model.FileStream, account *model.Account) error {
-	return base.ErrNotImplement
+	if file == nil {
+		return base.ErrEmptyFile
+	}
+	var err error
+	if file.GetSize() <= 4*1024*1024 {
+		err = driver.UploadSmall(file, account)
+	} else {
+		err = driver.UploadBig(file, account)
+	}
+	if err == nil {
+		_ = base.DeleteCache(utils.Dir(file.ParentPath), account)
+	}
+	return err
 }
 
-var _ base.Driver = (*Onedrive)(nil)
+var _ base.Driver = (*Onedrive)(nil)

drivers/onedrive/onedrive.go

@@ -1,6 +1,7 @@
 package onedrive
 
 import (
+	"bytes"
 	"errors"
 	"fmt"
 	"github.com/Xhofe/alist/conf"
@@ -8,8 +9,13 @@ import (
 	"github.com/Xhofe/alist/model"
 	"github.com/Xhofe/alist/utils"
 	"github.com/go-resty/resty/v2"
+	jsoniter "github.com/json-iterator/go"
 	log "github.com/sirupsen/logrus"
+	"io"
+	"io/ioutil"
+	"net/http"
 	"path/filepath"
+	"strconv"
 	"time"
 )
 
@@ -111,6 +117,7 @@ func (driver Onedrive) refreshToken(account *model.Account) error {
 }
 
 type OneFile struct {
+	Id                   string     `json:"id"`
 	Name                 string     `json:"name"`
 	Size                 int64      `json:"size"`
 	LastModifiedDateTime *time.Time `json:"lastModifiedDateTime"`
@@ -118,11 +125,14 @@ type OneFile struct {
 	File                 struct {
 		MimeType string `json:"mimeType"`
 	} `json:"file"`
-	Thumbnails []struct{
-		Medium struct{
+	Thumbnails []struct {
+		Medium struct {
 			Url string `json:"url"`
 		} `json:"medium"`
 	} `json:"thumbnails"`
+	ParentReference struct {
+		DriveId string `json:"driveId"`
+	} `json:"parentReference"`
 }
 
 type OneFiles struct {
@@ -144,6 +154,7 @@ func (driver Onedrive) FormatFile(file *OneFile) *model.File {
 		UpdatedAt: file.LastModifiedDateTime,
 		Driver:    driver.Config().Name,
 		Url:       file.Url,
+		Id:        file.Id,
 	}
 	if len(file.Thumbnails) > 0 {
 		f.Thumbnail = file.Thumbnails[0].Medium.Url
@@ -198,7 +209,110 @@ func (driver Onedrive) GetFile(account *model.Account, path string) (*OneFile, e
 	return &file, nil
 }
 
+func (driver Onedrive) Request(url string, method int, headers, query, form map[string]string, data interface{}, resp interface{}, account *model.Account) ([]byte, error) {
+	rawUrl := url
+	if account.APIProxyUrl != "" {
+		url = fmt.Sprintf("%s/%s", account.APIProxyUrl, url)
+	}
+	req := base.RestyClient.R()
+	req.SetHeader("Authorization", "Bearer "+account.AccessToken)
+	if headers != nil {
+		req.SetHeaders(headers)
+	}
+	if query != nil {
+		req.SetQueryParams(query)
+	}
+	if form != nil {
+		req.SetFormData(form)
+	}
+	if data != nil {
+		req.SetBody(data)
+	}
+	if resp != nil {
+		req.SetResult(resp)
+	}
+	var res *resty.Response
+	var err error
+	var e OneRespErr
+	req.SetError(&e)
+	switch method {
+	case base.Get:
+		res, err = req.Get(url)
+	case base.Post:
+		res, err = req.Post(url)
+	case base.Patch:
+		res, err = req.Patch(url)
+	case base.Delete:
+		res, err = req.Delete(url)
+	case base.Put:
+		res, err = req.Put(url)
+	default:
+		return nil, base.ErrNotSupport
+	}
+	if err != nil {
+		return nil, err
+	}
+	log.Debug(res.String())
+	if e.Error.Code != "" {
+		if e.Error.Code == "InvalidAuthenticationToken" {
+			err = driver.RefreshToken(account)
+			if err != nil {
+				_ = model.SaveAccount(account)
+				return nil, err
+			}
+			return driver.Request(rawUrl, method, headers, query, form, data, resp, account)
+		}
+		return nil, errors.New(e.Error.Message)
+	}
+	return res.Body(), nil
+}
+
+func (driver Onedrive) UploadSmall(file *model.FileStream, account *model.Account) error {
+	url := driver.GetMetaUrl(account, false, utils.Join(file.ParentPath, file.Name)) + "/content"
+	data, err := ioutil.ReadAll(file)
+	if err != nil {
+		return err
+	}
+	_, err = driver.Request(url, base.Put, nil, nil, nil, data, nil, account)
+	return err
+}
+
+func (driver Onedrive) UploadBig(file *model.FileStream, account *model.Account) error {
+	url := driver.GetMetaUrl(account, false, utils.Join(file.ParentPath, file.Name)) + "/createUploadSession"
+	res, err := driver.Request(url, base.Post, nil, nil, nil, nil, nil, account)
+	if err != nil {
+		return err
+	}
+	uploadUrl := jsoniter.Get(res, "uploadUrl").ToString()
+	var finish uint64 = 0
+	const DEFAULT = 4 * 1024 * 1024
+	for finish < file.GetSize() {
+		log.Debugf("upload: %d", finish)
+		var byteSize uint64 = DEFAULT
+		left := file.GetSize() - finish
+		if left < DEFAULT {
+			byteSize = left
+		}
+		byteData := make([]byte, byteSize)
+		n, err := io.ReadFull(file, byteData)
+		log.Debug(err, n)
+		if err != nil {
+			return err
+		}
+		req, err := http.NewRequest("PUT", uploadUrl, bytes.NewBuffer(byteData))
+		req.Header.Set("Content-Length", strconv.Itoa(int(byteSize)))
+		req.Header.Set("Content-Range", fmt.Sprintf("bytes %d-%d/%d", finish, finish+byteSize-1, file.Size))
+		finish += byteSize
+		res, err := base.HttpClient.Do(req)
+		if res.StatusCode != 201 && res.StatusCode != 202 {
+			data, _ := ioutil.ReadAll(res.Body)
+			return errors.New(string(data))
+		}
+	}
+	return nil
+}
+
 func init() {
 	base.RegisterDriver(&Onedrive{})
 	oneClient.SetRetryCount(3)
-}
+}

drivers/pikpak/driver.go

@@ -6,16 +6,21 @@ import (
 	"github.com/Xhofe/alist/drivers/base"
 	"github.com/Xhofe/alist/model"
 	"github.com/Xhofe/alist/utils"
+	"github.com/aliyun/aliyun-oss-go-sdk/oss"
 	"github.com/gin-gonic/gin"
+	jsoniter "github.com/json-iterator/go"
 	log "github.com/sirupsen/logrus"
 	"path/filepath"
+	"strings"
 )
 
 type PikPak struct{}
 
 func (driver PikPak) Config() base.DriverConfig {
 	return base.DriverConfig{
-		Name: "PikPak",
+		Name:      "PikPak",
+		ApiProxy:  true,
+		LocalSort: true,
 	}
 }
 
@@ -44,7 +49,6 @@ func (driver PikPak) Items() []base.Item {
 
 func (driver PikPak) Save(account *model.Account, old *model.Account) error {
 	err := driver.Login(account)
-	_ = model.SaveAccount(account)
 	return err
 }
 
@@ -99,8 +103,8 @@ func (driver PikPak) Files(path string, account *model.Account) ([]model.File, e
 	return files, nil
 }
 
-func (driver PikPak) Link(path string, account *model.Account) (*base.Link, error) {
-	file, err := driver.File(path, account)
+func (driver PikPak) Link(args base.Args, account *model.Account) (*base.Link, error) {
+	file, err := driver.File(args.Path, account)
 	if err != nil {
 		return nil, err
 	}
@@ -123,11 +127,6 @@ func (driver PikPak) Path(path string, account *model.Account) (*model.File, []m
 		return nil, nil, err
 	}
 	if !file.IsDir() {
-		link, err := driver.Link(path, account)
-		if err != nil {
-			return nil, nil, err
-		}
-		file.Url = link.Url
 		return file, nil, nil
 	}
 	files, err := driver.Files(path, account)
@@ -234,7 +233,51 @@ func (driver PikPak) Delete(path string, account *model.Account) error {
 }
 
 func (driver PikPak) Upload(file *model.FileStream, account *model.Account) error {
-	return base.ErrNotImplement
+	if file == nil {
+		return base.ErrEmptyFile
+	}
+	parentFile, err := driver.File(file.ParentPath, account)
+	if err != nil {
+		return err
+	}
+	data := base.Json{
+		"kind":        "drive#file",
+		"name":        file.GetFileName(),
+		"size":        file.GetSize(),
+		"hash":        "1CF254FBC456E1B012CD45C546636AA62CF8350E",
+		"upload_type": "UPLOAD_TYPE_RESUMABLE",
+		"objProvider": base.Json{"provider": "UPLOAD_TYPE_UNKNOWN"},
+		"parent_id":   parentFile.Id,
+	}
+	res, err := driver.Request("https://api-drive.mypikpak.com/drive/v1/files", base.Post, nil, &data, nil, account)
+	if err != nil {
+		return err
+	}
+	params := jsoniter.Get(res, "resumable").Get("params")
+	endpoint := params.Get("endpoint").ToString()
+	endpointS := strings.Split(endpoint, ".")
+	endpoint = strings.Join(endpointS[1:], ".")
+	accessKeyId := params.Get("access_key_id").ToString()
+	accessKeySecret := params.Get("access_key_secret").ToString()
+	securityToken := params.Get("security_token").ToString()
+	client, err := oss.New("https://"+endpoint, accessKeyId,
+		accessKeySecret, oss.SecurityToken(securityToken))
+	if err != nil {
+		return err
+	}
+	bucket, err := client.Bucket(params.Get("bucket").ToString())
+	if err != nil {
+		return err
+	}
+	signedURL, err := bucket.SignURL(params.Get("key").ToString(), oss.HTTPPut, 60)
+	if err != nil {
+		return err
+	}
+	err = bucket.PutObjectWithURL(signedURL, file)
+	if err == nil {
+		_ = base.DeleteCache(file.ParentPath, account)
+	}
+	return err
 }
 
 var _ base.Driver = (*PikPak)(nil)

drivers/pikpak/pikpak.go

@@ -2,6 +2,7 @@ package pikpak
 
 import (
 	"errors"
+	"fmt"
 	"github.com/Xhofe/alist/conf"
 	"github.com/Xhofe/alist/drivers/base"
 	"github.com/Xhofe/alist/model"
@@ -20,6 +21,10 @@ type RespErr struct {
 }
 
 func (driver PikPak) Login(account *model.Account) error {
+	url := "https://user.mypikpak.com/v1/auth/signin"
+	if account.APIProxyUrl != "" {
+		url = fmt.Sprintf("%s/%s", account.APIProxyUrl, url)
+	}
 	var e RespErr
 	res, err := base.RestyClient.R().SetError(&e).SetBody(base.Json{
 		"captcha_token": "",
@@ -27,30 +32,39 @@ func (driver PikPak) Login(account *model.Account) error {
 		"client_secret": "dbw2OtmVEeuUvIptb1Coyg",
 		"username":      account.Username,
 		"password":      account.Password,
-	}).Post("https://user.mypikpak.com/v1/auth/signin")
+	}).Post(url)
 	if err != nil {
 		account.Status = err.Error()
+		_ = model.SaveAccount(account)
 		return err
 	}
+	log.Debug(res.String())
 	if e.ErrorCode != 0 {
 		account.Status = e.Error
-		return errors.New(e.Error)
+		err = errors.New(e.Error)
+	} else {
+		data := res.Body()
+		account.Status = "work"
+		account.RefreshToken = jsoniter.Get(data, "refresh_token").ToString()
+		account.AccessToken = jsoniter.Get(data, "access_token").ToString()
 	}
-	data := res.Body()
-	account.Status = "work"
-	account.RefreshToken = jsoniter.Get(data, "refresh_token").ToString()
-	account.AccessToken = jsoniter.Get(data, "access_token").ToString()
+	_ = model.SaveAccount(account)
 	return nil
 }
 
 func (driver PikPak) RefreshToken(account *model.Account) error {
+	url := "https://user.mypikpak.com/v1/auth/token"
+	if account.APIProxyUrl != "" {
+		url = fmt.Sprintf("%s/%s", account.APIProxyUrl, url)
+	}
 	var e RespErr
-	res, err := base.RestyClient.R().SetError(&e).SetBody(base.Json{
+	res, err := base.RestyClient.R().SetError(&e).
+		SetHeader("user-agent", "").SetBody(base.Json{
 		"client_id":     "YNxT9w7GMdWvEOKa",
 		"client_secret": "dbw2OtmVEeuUvIptb1Coyg",
 		"grant_type":    "refresh_token",
 		"refresh_token": account.RefreshToken,
-	}).Post("https://user.mypikpak.com/v1/auth/token")
+	}).Post(url)
 	if err != nil {
 		account.Status = err.Error()
 		return err
@@ -60,15 +74,24 @@ func (driver PikPak) RefreshToken(account *model.Account) error {
 			// refresh_token 失效，重新登陆
 			return driver.Login(account)
 		}
+		account.Status = e.Error
+		_ = model.SaveAccount(account)
+		return errors.New(e.Error)
 	}
 	data := res.Body()
 	account.Status = "work"
 	account.RefreshToken = jsoniter.Get(data, "refresh_token").ToString()
 	account.AccessToken = jsoniter.Get(data, "access_token").ToString()
+	log.Debugf("%s\n %+v", res.String(), account)
+	_ = model.SaveAccount(account)
 	return nil
 }
 
 func (driver PikPak) Request(url string, method int, query map[string]string, data *base.Json, resp interface{}, account *model.Account) ([]byte, error) {
+	rawUrl := url
+	if account.APIProxyUrl != "" {
+		url = fmt.Sprintf("%s/%s", account.APIProxyUrl, url)
+	}
 	req := base.RestyClient.R()
 	req.SetHeader("Authorization", "Bearer "+account.AccessToken)
 	if query != nil {
@@ -97,6 +120,7 @@ func (driver PikPak) Request(url string, method int, query map[string]string, da
 	if err != nil {
 		return nil, err
 	}
+	log.Debug(res.String())
 	if e.ErrorCode != 0 {
 		if e.ErrorCode == 16 {
 			// login / refresh token
@@ -104,8 +128,7 @@ func (driver PikPak) Request(url string, method int, query map[string]string, da
 			if err != nil {
 				return nil, err
 			}
-			_ = model.SaveAccount(account)
-			return driver.Request(url, method, query, data, resp, account)
+			return driver.Request(rawUrl, method, query, data, resp, account)
 		} else {
 			return nil, errors.New(e.Error)
 		}

drivers/s3/driver.go

@@ -0,0 +1,262 @@
+package s3
+
+import (
+	"fmt"
+	"github.com/Xhofe/alist/conf"
+	"github.com/Xhofe/alist/drivers/base"
+	"github.com/Xhofe/alist/model"
+	"github.com/Xhofe/alist/utils"
+	"github.com/aws/aws-sdk-go/service/s3"
+	"github.com/aws/aws-sdk-go/service/s3/s3manager"
+	"github.com/gin-gonic/gin"
+	log "github.com/sirupsen/logrus"
+	"net/url"
+	"path/filepath"
+	"strings"
+	"time"
+)
+
+type S3 struct {
+}
+
+func (driver S3) Config() base.DriverConfig {
+	return base.DriverConfig{
+		Name:      "S3",
+		LocalSort: true,
+	}
+}
+
+func (driver S3) Items() []base.Item {
+	return []base.Item{
+		{
+			Name:     "bucket",
+			Label:    "Bucket",
+			Type:     base.TypeString,
+			Required: true,
+		},
+		{
+			Name:     "endpoint",
+			Label:    "Endpoint",
+			Type:     base.TypeString,
+			Required: true,
+		},
+		{
+			Name:     "region",
+			Label:    "Region",
+			Type:     base.TypeString,
+			Required: true,
+		},
+		{
+			Name:     "access_key",
+			Label:    "Access Key",
+			Type:     base.TypeString,
+			Required: true,
+		},
+		{
+			Name:     "access_secret",
+			Label:    "Access Secret",
+			Type:     base.TypeString,
+			Required: true,
+		},
+		{
+			Name:     "root_folder",
+			Label:    "root folder path",
+			Type:     base.TypeString,
+			Required: false,
+		},
+		{
+			Name:  "custom_host",
+			Label: "Custom Host",
+			Type:  base.TypeString,
+		},
+		{
+			Name:        "limit",
+			Label:       "url expire time(hours)",
+			Type:        base.TypeNumber,
+			Description: "default 4 hours",
+		},
+	}
+}
+
+func (driver S3) Save(account *model.Account, old *model.Account) error {
+	if account.Limit == 0 {
+		account.Limit = 4
+	}
+	client, err := driver.NewSession(account)
+	if err != nil {
+		account.Status = err.Error()
+	} else {
+		sessionsMap[account.Name] = client
+		account.Status = "work"
+	}
+	_ = model.SaveAccount(account)
+	return err
+}
+
+func (driver S3) File(path string, account *model.Account) (*model.File, error) {
+	path = utils.ParsePath(path)
+	if path == "/" {
+		return &model.File{
+			Id:        account.RootFolder,
+			Name:      account.Name,
+			Size:      0,
+			Type:      conf.FOLDER,
+			Driver:    driver.Config().Name,
+			UpdatedAt: account.UpdatedAt,
+		}, nil
+	}
+	dir, name := filepath.Split(path)
+	files, err := driver.Files(dir, account)
+	if err != nil {
+		return nil, err
+	}
+	for _, file := range files {
+		if file.Name == name {
+			return &file, nil
+		}
+	}
+	return nil, base.ErrPathNotFound
+}
+
+func (driver S3) Files(path string, account *model.Account) ([]model.File, error) {
+	path = utils.ParsePath(path)
+	var files []model.File
+	cache, err := base.GetCache(path, account)
+	if err == nil {
+		files, _ = cache.([]model.File)
+	} else {
+		files, err = driver.List(path, account)
+		if err == nil && len(files) > 0 {
+			_ = base.SetCache(path, files, account)
+		}
+	}
+	return files, err
+}
+
+func (driver S3) Link(args base.Args, account *model.Account) (*base.Link, error) {
+	client, err := driver.GetClient(account)
+	if err != nil {
+		return nil, err
+	}
+	path := strings.TrimPrefix(args.Path, "/")
+	disposition := fmt.Sprintf(`attachment;filename="%s"`, url.QueryEscape(utils.Base(path)))
+	input := &s3.GetObjectInput{
+		Bucket:                     &account.Bucket,
+		Key:                        &path,
+		ResponseContentDisposition: &disposition,
+	}
+	req, _ := client.GetObjectRequest(input)
+	link, err := req.Presign(time.Hour * time.Duration(account.Limit))
+	if err != nil {
+		return nil, err
+	}
+	return &base.Link{
+		Url: link,
+	}, nil
+}
+
+func (driver S3) Path(path string, account *model.Account) (*model.File, []model.File, error) {
+	path = utils.ParsePath(path)
+	log.Debugf("s3 path: %s", path)
+	file, err := driver.File(path, account)
+	if err != nil {
+		return nil, nil, err
+	}
+	if !file.IsDir() {
+		return file, nil, nil
+	}
+	files, err := driver.Files(path, account)
+	if err != nil {
+		return nil, nil, err
+	}
+	return nil, files, nil
+}
+
+func (driver S3) Proxy(c *gin.Context, account *model.Account) {
+
+}
+
+func (driver S3) Preview(path string, account *model.Account) (interface{}, error) {
+	return nil, base.ErrNotSupport
+}
+
+func (driver S3) MakeDir(path string, account *model.Account) error {
+	// not support, default as success
+	return nil
+}
+
+func (driver S3) Move(src string, dst string, account *model.Account) error {
+	err := driver.Copy(src, dst, account)
+	if err != nil {
+		return err
+	}
+	return driver.Delete(src, account)
+}
+
+func (driver S3) Copy(src string, dst string, account *model.Account) error {
+	client, err := driver.GetClient(account)
+	if err != nil {
+		return err
+	}
+	srcFile, err := driver.File(src, account)
+	if err != nil {
+		return err
+	}
+	srcKey := driver.GetKey(src, account, srcFile.IsDir())
+	dstKey := driver.GetKey(dst, account, srcFile.IsDir())
+	input := &s3.CopyObjectInput{
+		Bucket:     &account.Bucket,
+		CopySource: &srcKey,
+		Key:        &dstKey,
+	}
+	_, err = client.CopyObject(input)
+	if err == nil {
+		_ = base.DeleteCache(dst, account)
+	}
+	return err
+}
+
+func (driver S3) Delete(path string, account *model.Account) error {
+	client, err := driver.GetClient(account)
+	if err != nil {
+		return err
+	}
+	file, err := driver.File(path, account)
+	if err != nil {
+		return err
+	}
+	key := driver.GetKey(path, account, file.IsDir())
+	input := &s3.DeleteObjectInput{
+		Bucket: &account.Bucket,
+		Key:    &key,
+	}
+	_, err = client.DeleteObject(input)
+	if err == nil {
+		_ = base.DeleteCache(utils.Dir(path), account)
+	}
+	return err
+}
+
+func (driver S3) Upload(file *model.FileStream, account *model.Account) error {
+	if file == nil {
+		return base.ErrEmptyFile
+	}
+	s, ok := sessionsMap[account.Name]
+	if !ok {
+		return fmt.Errorf("can't find [%s] session", account.Name)
+	}
+	uploader := s3manager.NewUploader(s)
+	key := driver.GetKey(utils.Join(file.ParentPath, file.GetFileName()), account, false)
+	input := &s3manager.UploadInput{
+		Bucket: &account.Bucket,
+		Key:    &key,
+		Body:   file,
+	}
+	_, err := uploader.Upload(input)
+	if err == nil {
+		_ = base.DeleteCache(file.ParentPath, account)
+	}
+	return err
+}
+
+var _ base.Driver = (*S3)(nil)

drivers/s3/s3.go

@@ -0,0 +1,118 @@
+package s3
+
+import (
+	"fmt"
+	"github.com/Xhofe/alist/conf"
+	"github.com/Xhofe/alist/drivers/base"
+	"github.com/Xhofe/alist/model"
+	"github.com/Xhofe/alist/utils"
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws/credentials"
+	"github.com/aws/aws-sdk-go/aws/request"
+	"github.com/aws/aws-sdk-go/aws/session"
+	"github.com/aws/aws-sdk-go/service/s3"
+	log "github.com/sirupsen/logrus"
+	"net/http"
+	"net/url"
+	"path"
+	"strings"
+)
+
+var sessionsMap map[string]*session.Session
+
+func (driver S3) NewSession(account *model.Account) (*session.Session, error) {
+	cfg := &aws.Config{
+		Credentials: credentials.NewStaticCredentials(account.AccessKey, account.AccessSecret, ""),
+		Region:      &account.Region,
+		Endpoint:    &account.Endpoint,
+	}
+	return session.NewSession(cfg)
+}
+
+func (driver S3) GetClient(account *model.Account) (*s3.S3, error) {
+	s, ok := sessionsMap[account.Name]
+	if !ok {
+		return nil, fmt.Errorf("can't find [%s] session", account.Name)
+	}
+	client := s3.New(s)
+	if account.CustomHost != "" {
+		cURL, err := url.Parse(account.CustomHost)
+		if err != nil {
+			return nil, err
+		}
+		client.Handlers.Build.PushBack(func(r *request.Request) {
+			if r.HTTPRequest.Method != http.MethodGet {
+				return
+			}
+			r.HTTPRequest.URL.Scheme = cURL.Scheme
+			r.HTTPRequest.URL.Host = cURL.Host
+		})
+	}
+	return client, nil
+}
+
+func (driver S3) List(prefix string, account *model.Account) ([]model.File, error) {
+	prefix = driver.GetKey(prefix, account, true)
+	log.Debugf("list: %s", prefix)
+	client, err := driver.GetClient(account)
+	if err != nil {
+		return nil, err
+	}
+	files := make([]model.File, 0)
+	marker := ""
+	for {
+		input := &s3.ListObjectsInput{
+			Bucket:    &account.Bucket,
+			Marker:    &marker,
+			Prefix:    &prefix,
+			Delimiter: aws.String("/"),
+		}
+		listObjectsResult, err := client.ListObjects(input)
+
+		if err != nil {
+			return nil, err
+		}
+		for _, object := range listObjectsResult.CommonPrefixes {
+			file := model.File{
+				//Id:        *object.Key,
+				Name:      utils.Base(strings.Trim(*object.Prefix, "/")),
+				Driver:    driver.Config().Name,
+				UpdatedAt: account.UpdatedAt,
+				TimeStr:   "-",
+				Type:      conf.FOLDER,
+			}
+			files = append(files, file)
+		}
+		for _, object := range listObjectsResult.Contents {
+			file := model.File{
+				//Id:        *object.Key,
+				Name:      utils.Base(*object.Key),
+				Size:      *object.Size,
+				Driver:    driver.Config().Name,
+				UpdatedAt: object.LastModified,
+				Type:      utils.GetFileType(path.Ext(*object.Key)),
+			}
+			files = append(files, file)
+		}
+		if *listObjectsResult.IsTruncated {
+			marker = *listObjectsResult.NextMarker
+		} else {
+			break
+		}
+	}
+	return files, nil
+}
+
+func (driver S3) GetKey(path string, account *model.Account, dir bool) string {
+	path = utils.Join(account.RootFolder, path)
+	path = strings.TrimPrefix(path, "/")
+	if path != "" && dir {
+		path += "/"
+	}
+	return path
+}
+
+func init() {
+	sessionsMap = make(map[string]*session.Session, 0)
+	base.RegisterDriver(&S3{})
+}

drivers/shandian/driver.go

@@ -0,0 +1,281 @@
+package shandian
+
+import (
+	"errors"
+	"github.com/Xhofe/alist/conf"
+	"github.com/Xhofe/alist/drivers/base"
+	"github.com/Xhofe/alist/model"
+	"github.com/Xhofe/alist/utils"
+	"github.com/gin-gonic/gin"
+	log "github.com/sirupsen/logrus"
+	"path/filepath"
+	"strconv"
+)
+
+type Shandian struct{}
+
+func (driver Shandian) Config() base.DriverConfig {
+	return base.DriverConfig{
+		Name:          "ShandianPan",
+		NoNeedSetLink: true,
+		LocalSort:     true,
+	}
+}
+
+func (driver Shandian) Items() []base.Item {
+	return []base.Item{
+		{
+			Name:        "username",
+			Label:       "username",
+			Type:        base.TypeString,
+			Required:    true,
+			Description: "account username/phone number",
+		},
+		{
+			Name:        "password",
+			Label:       "password",
+			Type:        base.TypeString,
+			Required:    true,
+			Description: "account password",
+		},
+		{
+			Name:     "root_folder",
+			Label:    "root folder file_id",
+			Type:     base.TypeString,
+			Required: false,
+		},
+	}
+}
+
+func (driver Shandian) Save(account *model.Account, old *model.Account) error {
+	if account.RootFolder == "" {
+		account.RootFolder = "0"
+	}
+	return driver.Login(account)
+}
+
+func (driver Shandian) File(path string, account *model.Account) (*model.File, error) {
+	path = utils.ParsePath(path)
+	if path == "/" {
+		return &model.File{
+			Id:        account.RootFolder,
+			Name:      account.Name,
+			Size:      0,
+			Type:      conf.FOLDER,
+			Driver:    driver.Config().Name,
+			UpdatedAt: account.UpdatedAt,
+		}, nil
+	}
+	dir, name := filepath.Split(path)
+	files, err := driver.Files(dir, account)
+	if err != nil {
+		return nil, err
+	}
+	for _, file := range files {
+		if file.Name == name {
+			return &file, nil
+		}
+	}
+	return nil, base.ErrPathNotFound
+}
+
+func (driver Shandian) Files(path string, account *model.Account) ([]model.File, error) {
+	path = utils.ParsePath(path)
+	var files []model.File
+	cache, err := base.GetCache(path, account)
+	if err == nil {
+		files, _ = cache.([]model.File)
+	} else {
+		file, err := driver.File(path, account)
+		if err != nil {
+			return nil, err
+		}
+		rawFiles, err := driver.GetFiles(file.Id, account)
+		if err != nil {
+			return nil, err
+		}
+		files = make([]model.File, 0)
+		for _, file := range rawFiles {
+			files = append(files, *driver.FormatFile(&file))
+		}
+		if len(files) > 0 {
+			_ = base.SetCache(path, files, account)
+		}
+	}
+	return files, nil
+}
+
+func (driver Shandian) Link(args base.Args, account *model.Account) (*base.Link, error) {
+	log.Debugf("shandian link")
+	file, err := driver.File(args.Path, account)
+	if err != nil {
+		return nil, err
+	}
+	var e Resp
+	res, err := base.NoRedirectClient.R().SetError(&e).SetHeader("Accept", "application/json").SetQueryParams(map[string]string{
+		"id":    file.Id,
+		"token": account.AccessToken,
+	}).Get("https://shandianpan.com/api/pan/file-download")
+	if err != nil {
+		return nil, err
+	}
+	if e.Code != 0 {
+		if e.Code == 10 {
+			err = driver.Login(account)
+			if err != nil {
+				return nil, err
+			}
+			return driver.Link(args, account)
+		}
+		return nil, errors.New(e.Msg)
+	}
+	return &base.Link{
+		Url: res.Header().Get("location"),
+	}, nil
+}
+
+func (driver Shandian) Path(path string, account *model.Account) (*model.File, []model.File, error) {
+	path = utils.ParsePath(path)
+	log.Debugf("shandian path: %s", path)
+	file, err := driver.File(path, account)
+	if err != nil {
+		return nil, nil, err
+	}
+	if !file.IsDir() {
+		return file, nil, nil
+	}
+	files, err := driver.Files(path, account)
+	if err != nil {
+		return nil, nil, err
+	}
+	return nil, files, nil
+}
+
+func (driver Shandian) Proxy(c *gin.Context, account *model.Account) {
+
+}
+
+func (driver Shandian) Preview(path string, account *model.Account) (interface{}, error) {
+	return nil, base.ErrNotSupport
+}
+
+func (driver Shandian) MakeDir(path string, account *model.Account) error {
+	parentFile, err := driver.File(utils.Dir(path), account)
+	if err != nil {
+		return err
+	}
+	data := map[string]interface{}{
+		"id":   parentFile.Id,
+		"name": utils.Base(path),
+	}
+	_, err = driver.Post("https://shandianpan.com/api/pan/mkdir", data, nil, account)
+	if err == nil {
+		_ = base.DeleteCache(utils.Dir(path), account)
+	}
+	return err
+}
+
+func (driver Shandian) Move(src string, dst string, account *model.Account) error {
+	srcFile, err := driver.File(src, account)
+	if err != nil {
+		return err
+	}
+	if utils.Dir(src) == utils.Dir(dst) {
+		// rename
+		data := map[string]interface{}{
+			"id":   srcFile.Id,
+			"name": utils.Base(dst),
+		}
+		_, err = driver.Post("https://shandianpan.com/api/pan/change", data, nil, account)
+	} else {
+		dstParentFile, err := driver.File(utils.Dir(dst), account)
+		if err != nil {
+			return err
+		}
+		data := map[string]interface{}{
+			"id":    srcFile.Id,
+			"to_id": dstParentFile.Id,
+		}
+		_, err = driver.Post("https://shandianpan.com/api/pan/move", data, nil, account)
+	}
+	if err == nil {
+		_ = base.DeleteCache(utils.Dir(src), account)
+		if utils.Dir(src) != utils.Dir(dst) {
+			_ = base.DeleteCache(utils.Dir(dst), account)
+		}
+	}
+	return err
+}
+
+func (driver Shandian) Copy(src string, dst string, account *model.Account) error {
+	return base.ErrNotSupport
+}
+
+func (driver Shandian) Delete(path string, account *model.Account) error {
+	file, err := driver.File(path, account)
+	if err != nil {
+		return err
+	}
+	data := map[string]interface{}{
+		"id": file.Id,
+	}
+	_, err = driver.Post("https://shandianpan.com/api/pan/recycle-in", data, nil, account)
+	if err == nil {
+		_ = base.DeleteCache(utils.Dir(path), account)
+	}
+	return err
+}
+
+func (driver Shandian) Upload(file *model.FileStream, account *model.Account) error {
+	if file == nil {
+		return base.ErrEmptyFile
+	}
+	parentFile, err := driver.File(file.ParentPath, account)
+	if err != nil {
+		return err
+	}
+	var resp UploadResp
+	parentId, err := strconv.Atoi(parentFile.Id)
+	if err != nil {
+		return err
+	}
+	data := map[string]interface{}{
+		"id":   parentId,
+		"name": file.GetFileName(),
+	}
+	_, err = driver.Post("https://shandianpan.com/api/pan/upload", data, &resp, account)
+	if err != nil {
+		return err
+	}
+	if resp.Code != 0 {
+		if resp.Code == 10 {
+			err = driver.Login(account)
+			if err != nil {
+				return err
+			}
+			return driver.Upload(file, account)
+		}
+		return errors.New(resp.Msg)
+	}
+	var r Resp
+	_, err = base.RestyClient.R().SetMultipartFormData(map[string]string{
+		"token":          account.AccessToken,
+		"id":             "0",
+		"key":            resp.Data.Key,
+		"ossAccessKeyId": resp.Data.Accessid,
+		"policy":         resp.Data.Policy,
+		"signature":      resp.Data.Signature,
+		"callback":       resp.Data.Callback,
+	}).SetMultipartField("file", file.GetFileName(), file.GetMIMEType(), file).
+		SetResult(&r).SetError(&r).Post("https:" + resp.Data.Host + "/")
+	if err != nil {
+		return err
+	}
+	if r.Code == 0 {
+		_ = base.DeleteCache(file.ParentPath, account)
+		return nil
+	}
+	return errors.New(r.Msg)
+}
+
+var _ base.Driver = (*Shandian)(nil)

drivers/shandian/shandian.go

@@ -0,0 +1,150 @@
+package shandian
+
+import (
+	"errors"
+	"github.com/Xhofe/alist/conf"
+	"github.com/Xhofe/alist/drivers/base"
+	"github.com/Xhofe/alist/model"
+	"github.com/Xhofe/alist/utils"
+	log "github.com/sirupsen/logrus"
+	"strconv"
+	"time"
+)
+
+type Resp struct {
+	Code int    `json:"code"`
+	Msg  string `json:"msg"`
+}
+
+type LoginResp struct {
+	Resp
+	Data struct {
+		Token string `json:"token"`
+	} `json:"data"`
+}
+
+func (driver Shandian) Login(account *model.Account) error {
+	var resp LoginResp
+	_, err := base.RestyClient.R().SetResult(&resp).SetHeader("Accept", "application/json").SetBody(base.Json{
+		"mobile":   account.Username,
+		"password": account.Password,
+		"smscode":  "",
+	}).Post("https://shandianpan.com/api/login")
+	if err != nil {
+		return err
+	}
+	if resp.Code != 0 {
+		account.Status = resp.Msg
+		err = errors.New(resp.Msg)
+	} else {
+		account.Status = "work"
+		account.AccessToken = resp.Data.Token
+	}
+	_ = model.SaveAccount(account)
+	return err
+}
+
+type File struct {
+	Id         int64  `json:"id"`
+	Type       int    `json:"type"`
+	Name       string `json:"name"`
+	UpdateTime int64  `json:"update_time"`
+	Size       int64  `json:"size"`
+	Ext        string `json:"ext"`
+}
+
+func (driver Shandian) FormatFile(file *File) *model.File {
+	t := time.Unix(file.UpdateTime, 0)
+	f := &model.File{
+		Id:        strconv.FormatInt(file.Id, 10),
+		Name:      file.Name,
+		Size:      file.Size,
+		Driver:    driver.Config().Name,
+		UpdatedAt: &t,
+	}
+	if file.Type == 1 {
+		f.Type = conf.FOLDER
+	} else {
+		f.Type = utils.GetFileType(file.Ext)
+		if file.Ext != "" {
+			f.Name += "." + file.Ext
+		}
+	}
+	return f
+}
+
+func (driver Shandian) Post(url string, data map[string]interface{}, resp interface{}, account *model.Account) ([]byte, error) {
+	req := base.RestyClient.R()
+	req.SetHeader("Accept", "application/json")
+	data["token"] = account.AccessToken
+	req.SetBody(data)
+	var e Resp
+	if resp != nil {
+		req.SetResult(resp)
+	} else {
+		req.SetResult(&e)
+	}
+	req.SetError(&e)
+	res, err := req.Post(url)
+	if err != nil {
+		return nil, err
+	}
+	log.Debug(res.String())
+	if e.Code != 0 {
+		if e.Code == 10 {
+			err = driver.Login(account)
+			if err != nil {
+				return nil, err
+			}
+			return driver.Post(url, data, resp, account)
+		}
+		return nil, errors.New(e.Msg)
+	}
+	return res.Body(), nil
+}
+
+type FilesResp struct {
+	Resp
+	Data []File `json:"data"`
+}
+
+func (driver Shandian) GetFiles(id string, account *model.Account) ([]File, error) {
+	// TODO page not wok
+	//res := make([]File, 0)
+	page := 1
+	//for {
+	data := map[string]interface{}{
+		"id":        id,
+		"page":      page,
+		"page_size": 100,
+	}
+	var resp FilesResp
+	_, err := driver.Post("https://shandianpan.com/api/pan", data, &resp, account)
+	if err != nil {
+		return nil, err
+	}
+	//res = append(res, resp.Data...)
+	//	if len(resp.Data) == 0 {
+	//		break
+	//	}
+	//}
+	//return res, nil
+	return resp.Data, nil
+}
+
+type UploadResp struct {
+	Resp
+	Data struct {
+		Accessid  string `json:"accessid"`
+		Policy    string `json:"policy"`
+		Expire    int    `json:"expire"`
+		Callback  string `json:"callback"`
+		Key       string `json:"key"`
+		Host      string `json:"host"`
+		Signature string `json:"signature"`
+	} `json:"data"`
+}
+
+func init() {
+	base.RegisterDriver(&Shandian{})
+}

drivers/webdav/driver.go

@@ -0,0 +1,197 @@
+package webdav
+
+import (
+	"github.com/Xhofe/alist/conf"
+	"github.com/Xhofe/alist/drivers/base"
+	"github.com/Xhofe/alist/model"
+	"github.com/Xhofe/alist/utils"
+	"github.com/gin-gonic/gin"
+	"path/filepath"
+)
+
+type WebDav struct{}
+
+func (driver WebDav) Config() base.DriverConfig {
+	return base.DriverConfig{
+		Name:          "WebDav",
+		OnlyProxy:     true,
+		OnlyLocal:     true,
+		NoNeedSetLink: true,
+		LocalSort:     true,
+	}
+}
+
+func (driver WebDav) Items() []base.Item {
+	return []base.Item{
+		{
+			Name:     "site_url",
+			Label:    "webdav root url",
+			Type:     base.TypeString,
+			Required: true,
+		},
+		{
+			Name:     "username",
+			Label:    "username",
+			Type:     base.TypeString,
+			Required: true,
+		},
+		{
+			Name:     "password",
+			Label:    "password",
+			Type:     base.TypeString,
+			Required: true,
+		},
+	}
+}
+
+func (driver WebDav) Save(account *model.Account, old *model.Account) error {
+	account.Status = "work"
+	_ = model.SaveAccount(account)
+	return nil
+}
+
+func (driver WebDav) File(path string, account *model.Account) (*model.File, error) {
+	if path == "/" {
+		return &model.File{
+			Id:        "/",
+			Name:      account.Name,
+			Size:      0,
+			Type:      conf.FOLDER,
+			Driver:    driver.Config().Name,
+			UpdatedAt: account.UpdatedAt,
+		}, nil
+	}
+	dir, name := filepath.Split(path)
+	files, err := driver.Files(dir, account)
+	if err != nil {
+		return nil, err
+	}
+	for _, file := range files {
+		if file.Name == name {
+			return &file, nil
+		}
+	}
+	return nil, base.ErrPathNotFound
+}
+
+func (driver WebDav) Files(path string, account *model.Account) ([]model.File, error) {
+	path = utils.ParsePath(path)
+	cache, err := base.GetCache(path, account)
+	if err == nil {
+		files, _ := cache.([]model.File)
+		return files, nil
+	}
+	c := driver.NewClient(account)
+	rawFiles, err := c.ReadDir(driver.WebDavPath(path))
+	if err != nil {
+		return nil, err
+	}
+	files := make([]model.File, 0)
+	if len(rawFiles) == 0 {
+		return files, nil
+	}
+	for _, f := range rawFiles {
+		t := f.ModTime()
+		file := model.File{
+			Name:      f.Name(),
+			Size:      f.Size(),
+			Driver:    driver.Config().Name,
+			UpdatedAt: &t,
+		}
+		if f.IsDir() {
+			file.Type = conf.FOLDER
+		} else {
+			file.Type = utils.GetFileType(filepath.Ext(f.Name()))
+		}
+		files = append(files, file)
+	}
+	_ = base.SetCache(path, files, account)
+	return files, nil
+}
+
+func (driver WebDav) Link(args base.Args, account *model.Account) (*base.Link, error) {
+	path := args.Path
+	c := driver.NewClient(account)
+	reader, err := c.ReadStream(driver.WebDavPath(path))
+	if err != nil {
+		return nil, err
+	}
+	return &base.Link{Data: reader}, nil
+}
+
+func (driver WebDav) Path(path string, account *model.Account) (*model.File, []model.File, error) {
+	file, err := driver.File(path, account)
+	if err != nil {
+		return nil, nil, err
+	}
+	if !file.IsDir() {
+		return file, nil, nil
+	}
+	files, err := driver.Files(path, account)
+	if err != nil {
+		return nil, nil, err
+	}
+	return nil, files, nil
+}
+
+func (driver WebDav) Proxy(c *gin.Context, account *model.Account) {
+
+}
+
+func (driver WebDav) Preview(path string, account *model.Account) (interface{}, error) {
+	return nil, base.ErrNotSupport
+}
+
+func (driver WebDav) MakeDir(path string, account *model.Account) error {
+	c := driver.NewClient(account)
+	err := c.MkdirAll(driver.WebDavPath(path), 0644)
+	if err == nil {
+		_ = base.DeleteCache(utils.Dir(path), account)
+	}
+	return err
+}
+
+func (driver WebDav) Move(src string, dst string, account *model.Account) error {
+	c := driver.NewClient(account)
+	err := c.Rename(driver.WebDavPath(src), driver.WebDavPath(dst), true)
+	if err == nil {
+		_ = base.DeleteCache(utils.Dir(src), account)
+		if utils.Dir(src) != utils.Dir(dst) {
+			_ = base.DeleteCache(utils.Dir(dst), account)
+		}
+	}
+	return err
+}
+
+func (driver WebDav) Copy(src string, dst string, account *model.Account) error {
+	c := driver.NewClient(account)
+	err := c.Copy(driver.WebDavPath(src), driver.WebDavPath(dst), true)
+	if err == nil {
+		_ = base.DeleteCache(utils.Dir(dst), account)
+	}
+	return err
+}
+
+func (driver WebDav) Delete(path string, account *model.Account) error {
+	c := driver.NewClient(account)
+	err := c.RemoveAll(driver.WebDavPath(path))
+	if err == nil {
+		_ = base.DeleteCache(utils.Dir(path), account)
+	}
+	return err
+}
+
+func (driver WebDav) Upload(file *model.FileStream, account *model.Account) error {
+	if file == nil {
+		return base.ErrEmptyFile
+	}
+	c := driver.NewClient(account)
+	path := utils.Join(file.ParentPath, file.Name)
+	err := c.WriteStream(driver.WebDavPath(path), file, 0644)
+	if err == nil {
+		_ = base.DeleteCache(utils.Dir(file.ParentPath), account)
+	}
+	return err
+}
+
+var _ base.Driver = (*WebDav)(nil)

drivers/webdav/webdav.go

@@ -0,0 +1,23 @@
+package webdav
+
+import (
+	"github.com/Xhofe/alist/drivers/base"
+	"github.com/Xhofe/alist/model"
+	"github.com/Xhofe/alist/utils"
+	"github.com/studio-b12/gowebdav"
+	"strings"
+)
+
+func (driver WebDav) NewClient(account *model.Account) *gowebdav.Client {
+	return gowebdav.NewClient(account.SiteUrl, account.Username, account.Password)
+}
+
+func (driver WebDav) WebDavPath(path string) string {
+	path = utils.ParsePath(path)
+	path = strings.TrimPrefix(path, "/")
+	return path
+}
+
+func init() {
+	base.RegisterDriver(&WebDav{})
+}

go.mod

@@ -3,13 +3,17 @@ module github.com/Xhofe/alist
 go 1.17
 
 require (
+	github.com/aws/aws-sdk-go v1.27.0
 	github.com/eko/gocache/v2 v2.1.0
+	github.com/gin-contrib/cors v1.3.1
 	github.com/gin-gonic/gin v1.7.4
-	github.com/go-playground/validator/v10 v10.9.0
 	github.com/go-resty/resty/v2 v2.6.0
+	github.com/jlaffaye/ftp v0.0.0-20211117213618-11820403398b
+	github.com/json-iterator/go v1.1.12
 	github.com/patrickmn/go-cache v2.1.0+incompatible
 	github.com/robfig/cron/v3 v3.0.0
 	github.com/sirupsen/logrus v1.8.1
+	golang.org/x/text v0.3.7
 	gorm.io/driver/mysql v1.1.2
 	gorm.io/driver/postgres v1.1.2
 	gorm.io/driver/sqlite v1.1.6
@@ -18,15 +22,16 @@ require (
 
 require (
 	github.com/XiaoMi/pegasus-go-client v0.0.0-20210427083443-f3b6b08bc4c2 // indirect
+	github.com/aliyun/aliyun-oss-go-sdk v2.2.0+incompatible // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b // indirect
 	github.com/cenkalti/backoff/v4 v4.1.0 // indirect
 	github.com/cespare/xxhash/v2 v2.1.1 // indirect
 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
-	github.com/gin-contrib/cors v1.3.1 // indirect
 	github.com/gin-contrib/sse v0.1.0 // indirect
 	github.com/go-playground/locales v0.14.0 // indirect
 	github.com/go-playground/universal-translator v0.18.0 // indirect
+	github.com/go-playground/validator/v10 v10.9.0 // indirect
 	github.com/go-redis/redis/v8 v8.9.0 // indirect
 	github.com/go-sql-driver/mysql v1.6.0 // indirect
 	github.com/golang/protobuf v1.5.2 // indirect
@@ -40,8 +45,7 @@ require (
 	github.com/jackc/pgx/v4 v4.13.0 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/jinzhu/now v1.1.2 // indirect
-	github.com/jlaffaye/ftp v0.0.0-20211117213618-11820403398b // indirect
-	github.com/json-iterator/go v1.1.12 // indirect
+	github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af // indirect
 	github.com/leodido/go-urn v1.2.1 // indirect
 	github.com/mattn/go-isatty v0.0.14 // indirect
 	github.com/mattn/go-sqlite3 v1.14.9 // indirect
@@ -54,14 +58,15 @@ require (
 	github.com/prometheus/common v0.18.0 // indirect
 	github.com/prometheus/procfs v0.6.0 // indirect
 	github.com/spf13/cast v1.3.1 // indirect
+	github.com/studio-b12/gowebdav v0.0.0-20211109083228-3f8721cd4b6f // indirect
 	github.com/ugorji/go/codec v1.2.6 // indirect
 	go.opentelemetry.io/otel v0.20.0 // indirect
 	go.opentelemetry.io/otel/metric v0.20.0 // indirect
 	go.opentelemetry.io/otel/trace v0.20.0 // indirect
 	golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 // indirect
-	golang.org/x/net v0.0.0-20210510120150-4163338589ed // indirect
+	golang.org/x/net v0.0.0-20211209124913-491a49abca63 // indirect
 	golang.org/x/sys v0.0.0-20211023085530-d6a326fbbf70 // indirect
-	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/time v0.0.0-20191024005414-555d28b269f0 // indirect
 	google.golang.org/protobuf v1.27.1 // indirect
 	gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
 	gopkg.in/tomb.v2 v2.0.0-20161208151619-d5d1b5820637 // indirect

go.sum

@@ -20,6 +20,8 @@ github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuy
 github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
 github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
 github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho=
+github.com/aliyun/aliyun-oss-go-sdk v2.2.0+incompatible h1:ht2+VfbXtNLGhCsnTMc6/N26nSTBK6qdhktjYyjJQkk=
+github.com/aliyun/aliyun-oss-go-sdk v2.2.0+incompatible/go.mod h1:T/Aws4fEfogEE9v+HPhhw+CntffsBHJ8nXQCwKr0/g8=
 github.com/allegro/bigcache/v2 v2.2.5 h1:mRc8r6GQjuJsmSKQNPsR5jQVXc8IJ1xsW5YXUYMLfqI=
 github.com/allegro/bigcache/v2 v2.2.5/go.mod h1:FppZsIO+IZk7gCuj5FiIDHGygD9xvWQcqg1uIPMb6tY=
 github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
@@ -29,6 +31,7 @@ github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmV
 github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
 github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod h1:DAHtR1m6lCRdSC2Tm3DSWRPvIPr6xNKyeHdqDQSQT+A=
 github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQwij/eHl5CU=
+github.com/aws/aws-sdk-go v1.27.0 h1:0xphMHGMLBrPMfxR2AmVjZKcMEESEgWF8Kru94BNByk=
 github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
 github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
@@ -268,6 +271,7 @@ github.com/jinzhu/now v1.1.2 h1:eVKgfIdy9b6zbWBMgFpfDPoAMifwSZagU9HmEU6zgiI=
 github.com/jinzhu/now v1.1.2/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
 github.com/jlaffaye/ftp v0.0.0-20211117213618-11820403398b h1:Ur6QAxsHCK99Quj9PaWafoV4unb0DO/HWiKExD+TN5g=
 github.com/jlaffaye/ftp v0.0.0-20211117213618-11820403398b/go.mod h1:2lmrmq866uF2tnje75wQHzmPXhmSWUt7Gyx2vgK1RCU=
+github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af h1:pmfjZENx5imkbgOkpRUYLnmbU7UEFbjtDA2hxJ1ichM=
 github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
 github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
 github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4=
@@ -484,6 +488,8 @@ github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/studio-b12/gowebdav v0.0.0-20211109083228-3f8721cd4b6f h1:L2NE7BXnSlSLoNYZ0lCwZDjdnYjCNYC71k9ClZUTFTs=
+github.com/studio-b12/gowebdav v0.0.0-20211109083228-3f8721cd4b6f/go.mod h1:bHA7t77X/QFExdeAnDzK6vKM34kEZAcE1OX4MfiwjkE=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
 github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw=
 github.com/ugorji/go v1.2.6 h1:tGiWC9HENWE2tqYycIqFTNorMmFRVhNwCpDOpWqnk8E=
@@ -569,8 +575,8 @@ golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwY
 golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
-golang.org/x/net v0.0.0-20210510120150-4163338589ed h1:p9UgmWI9wKpfYmgaV/IZKGdXc5qEK45tDwwwDyjS26I=
-golang.org/x/net v0.0.0-20210510120150-4163338589ed/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20211209124913-491a49abca63 h1:iocB37TsdFuN6IBRZ+ry36wrkoV51/tl5vOWqkcPGvY=
+golang.org/x/net v0.0.0-20211209124913-491a49abca63/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -634,6 +640,7 @@ golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.0.0-20191024005414-555d28b269f0 h1:/5xXl8Y5W96D+TtHSlonuFqGHIWVuyCkGJLwGh9JJFs=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=

model/account.go

@@ -31,10 +31,18 @@ type Account struct {
 	SiteUrl        string     `json:"site_url"`
 	SiteId         string     `json:"site_id"`
 	InternalType   string     `json:"internal_type"`
-	WebdavProxy    bool       `json:"webdav_proxy"`
-	Proxy          bool       `json:"proxy"`       // 是否中转
+	WebdavProxy    bool       `json:"webdav_proxy"` // 开启之后只会webdav走中转
+	Proxy          bool       `json:"proxy"`        // 是否中转,开启之后web和webdav都会走中转
 	//AllowProxy     bool       `json:"allow_proxy"` // 是否允许中转下载
-	ProxyUrl       string     `json:"proxy_url"`   // 用于中转下载服务的URL
+	DownProxyUrl string `json:"down_proxy_url"` // 用于中转下载服务的URL 两处 1. path请求中返回的链接 2. down下载时进行302
+	APIProxyUrl  string `json:"api_proxy_url"`  // 用于中转api的地址
+	// for s3
+	Bucket       string `json:"bucket"`
+	Endpoint     string `json:"endpoint"`
+	Region       string `json:"region"`
+	AccessKey    string `json:"access_key"`
+	AccessSecret string `json:"access_secret"`
+	CustomHost   string `json:"custom_host"`
 }
 
 var accountsMap = map[string]Account{}
@@ -112,6 +120,7 @@ func GetAccountFiles() ([]File, error) {
 		files = append(files, File{
 			Name:      v.Name,
 			Size:      0,
+			Driver:    v.Type,
 			Type:      conf.FOLDER,
 			UpdatedAt: v.UpdatedAt,
 		})

model/meta.go

@@ -10,6 +10,7 @@ type Meta struct {
 	Path     string `json:"path" gorm:"unique" binding:"required"`
 	Password string `json:"password"`
 	Hide     string `json:"hide"`
+	Upload   bool   `json:"upload"`
 }
 
 func GetMetaByPath(path string) (*Meta, error) {

model/setting.go

@@ -13,16 +13,33 @@ const (
 	CONST
 )
 
+const (
+	FRONT = iota
+	BACK
+	OTHER
+)
+
 type SettingItem struct {
 	Key         string `json:"key" gorm:"primaryKey" binding:"required"`
 	Value       string `json:"value"`
 	Description string `json:"description"`
 	Type        string `json:"type"`
 	Group       int    `json:"group"`
+	Access      int    `json:"access"`
 	Values      string `json:"values"`
 	Version     string `json:"version"`
 }
 
+var Version = SettingItem{
+	Key:         "version",
+	Value:       conf.GitTag,
+	Description: "version",
+	Type:        "string",
+	Access:      CONST,
+	Version:     conf.GitTag,
+	Group:       OTHER,
+}
+
 func SaveSettings(items []SettingItem) error {
 	return conf.DB.Save(items).Error
 }
@@ -31,20 +48,29 @@ func SaveSetting(item SettingItem) error {
 	return conf.DB.Save(item).Error
 }
 
-func GetSettingsPublic() (*[]SettingItem, error) {
+func GetSettingsPublic() ([]SettingItem, error) {
 	var items []SettingItem
-	if err := conf.DB.Where("`group` <> ?", 1).Find(&items).Error; err != nil {
+	if err := conf.DB.Where("`access` <> ?", 1).Find(&items).Error; err != nil {
 		return nil, err
 	}
-	return &items, nil
+	return items, nil
 }
 
-func GetSettings() (*[]SettingItem, error) {
+func GetSettingsByGroup(group int) ([]SettingItem, error) {
+	var items []SettingItem
+	if err := conf.DB.Where("`group` = ?", group).Find(&items).Error; err != nil {
+		return nil, err
+	}
+	items = append([]SettingItem{Version}, items...)
+	return items, nil
+}
+
+func GetSettings() ([]SettingItem, error) {
 	var items []SettingItem
 	if err := conf.DB.Find(&items).Error; err != nil {
 		return nil, err
 	}
-	return &items, nil
+	return items, nil
 }
 
 func DeleteSetting(key string) error {
@@ -106,4 +132,12 @@ func LoadSettings() {
 	if err == nil {
 		conf.DavPassword = davPassword.Value
 	}
+	visitorDavUsername, err := GetSettingByKey("Visitor WebDAV username")
+	if err == nil {
+		conf.VisitorDavUsername = visitorDavUsername.Value
+	}
+	visitorDavPassword, err := GetSettingByKey("Visitor WebDAV password")
+	if err == nil {
+		conf.VisitorDavPassword = visitorDavPassword.Value
+	}
 }

server/common/common.go

@@ -1,6 +1,7 @@
 package common
 
 import (
+	"errors"
 	"fmt"
 	"github.com/Xhofe/alist/drivers/base"
 	"github.com/Xhofe/alist/model"
@@ -29,6 +30,9 @@ func ParsePath(rawPath string) (*model.Account, string, base.Driver, error) {
 		path = rawPath
 		break
 	default:
+		if path == "/" {
+			return nil, "", nil, errors.New("can't operate root of multiple accounts")
+		}
 		paths := strings.Split(rawPath, "/")
 		path = "/" + strings.Join(paths[2:], "/")
 		name = paths[1]

server/controllers/down.go

@@ -9,6 +9,7 @@ import (
 	"github.com/gin-gonic/gin"
 	"github.com/go-resty/resty/v2"
 	log "github.com/sirupsen/logrus"
+	"io"
 	"net/http"
 	"net/http/httputil"
 	"net/url"
@@ -30,7 +31,7 @@ func Down(c *gin.Context) {
 		Proxy(c)
 		return
 	}
-	link, err := driver.Link(path, account)
+	link, err := driver.Link(base.Args{Path: path, IP: c.ClientIP()}, account)
 	if err != nil {
 		common.ErrorResp(c, err, 500)
 		return
@@ -48,29 +49,48 @@ func Proxy(c *gin.Context) {
 		common.ErrorResp(c, err, 500)
 		return
 	}
-	// 只有三种情况允许中转：
+	// 只有以下几种情况允许中转：
 	// 1. 账号开启中转
 	// 2. driver只能中转
 	// 3. 是文本类型文件
+	// 4. 开启webdav中转（需要验证sign）
 	if !account.Proxy && !driver.Config().OnlyProxy && utils.GetFileType(filepath.Ext(rawPath)) != conf.TEXT {
-		common.ErrorResp(c, fmt.Errorf("[%s] not allowed proxy", account.Name), 403)
-		return
+		// 只开启了webdav中转，验证sign
+		ok := false
+		if account.WebdavProxy {
+			_, ok = c.Get("sign")
+		}
+		if !ok {
+			common.ErrorResp(c, fmt.Errorf("[%s] not allowed proxy", account.Name), 403)
+			return
+		}
 	}
 	// 中转时有中转机器使用中转机器，若携带标志位则表明不能再走中转机器了
-	if account.ProxyUrl != "" && c.Param("d") != "1" {
+	if account.DownProxyUrl != "" && c.Param("d") != "1" {
 		name := utils.Base(rawPath)
-		link := fmt.Sprintf("%s%s?sign=%s", account.ProxyUrl, rawPath, utils.SignWithToken(name, conf.Token))
+		link := fmt.Sprintf("%s%s?sign=%s", account.DownProxyUrl, rawPath, utils.SignWithToken(name, conf.Token))
 		c.Redirect(302, link)
 		return
 	}
-	link, err := driver.Link(path, account)
+	// 对于中转，不需要重设IP
+	link, err := driver.Link(base.Args{Path: path}, account)
 	if err != nil {
 		common.ErrorResp(c, err, 500)
 		return
 	}
 	// 本机读取数据
-	if account.Type == "FTP" {
-		c.Data(http.StatusOK, "application/octet-stream", link.Data)
+	if link.Data != nil {
+		//c.Data(http.StatusOK, "application/octet-stream", link.Data)
+		defer func() {
+			_ = link.Data.Close()
+		}()
+		c.Status(http.StatusOK)
+		c.Header("content", "application/octet-stream")
+		_, err = io.Copy(c.Writer, link.Data)
+		if err != nil {
+			_, _ = c.Writer.WriteString(err.Error())
+		}
+		return
 	}
 	// 本机文件直接返回文件
 	if account.Type == "Native" {

server/controllers/file.go

@@ -0,0 +1,57 @@
+package controllers
+
+import (
+	"errors"
+	"github.com/Xhofe/alist/conf"
+	"github.com/Xhofe/alist/model"
+	"github.com/Xhofe/alist/server/common"
+	"github.com/Xhofe/alist/utils"
+	"github.com/gin-gonic/gin"
+)
+
+func UploadFile(c *gin.Context) {
+	path := c.PostForm("path")
+	path = utils.ParsePath(path)
+	token := c.GetHeader("Authorization")
+	if token != conf.Token {
+		password := c.PostForm("password")
+		meta, _ := model.GetMetaByPath(path)
+		if meta == nil || !meta.Upload {
+			common.ErrorResp(c, errors.New("not allow upload"), 403)
+			return
+		}
+		if meta.Password != "" && meta.Password != password {
+			common.ErrorResp(c, errors.New("wrong password"), 403)
+			return
+		}
+	}
+	file, err := c.FormFile("file")
+	if err != nil {
+		common.ErrorResp(c, err, 400)
+	}
+	open, err := file.Open()
+	defer func() {
+		_ = open.Close()
+	}()
+	if err != nil {
+		return
+	}
+	account, path_, driver, err := common.ParsePath(path)
+	if err != nil {
+		common.ErrorResp(c, err, 500)
+		return
+	}
+	fileStream := model.FileStream{
+		File:       open,
+		Size:       uint64(file.Size),
+		ParentPath: path_,
+		Name:       file.Filename,
+		MIMEType:   file.Header.Get("Content-Type"),
+	}
+	err = driver.Upload(&fileStream, account)
+	if err != nil {
+		common.ErrorResp(c, err, 500)
+		return
+	}
+	common.SuccessResp(c)
+}

server/controllers/path.go

@@ -12,19 +12,57 @@ import (
 	"strings"
 )
 
+func Hide(meta *model.Meta, files []model.File, path string) []model.File {
+	//meta, _ := model.GetMetaByPath(path)
+	if meta != nil && meta.Hide != "" {
+		tmpFiles := make([]model.File, 0)
+		hideFiles := strings.Split(meta.Hide, ",")
+		for _, item := range files {
+			if !utils.IsContain(hideFiles, item.Name) {
+				tmpFiles = append(tmpFiles, item)
+			}
+		}
+		files = tmpFiles
+	}
+	return files
+}
+
+type Meta struct {
+	Driver string `json:"driver"`
+	Upload bool   `json:"upload"`
+}
+
+type PathResp struct {
+	Type  string       `json:"type"`
+	Meta  Meta         `json:"meta"`
+	Files []model.File `json:"files"`
+}
+
 func Path(c *gin.Context) {
 	reqV, _ := c.Get("req")
 	req := reqV.(common.PathReq)
+	meta, _ := model.GetMetaByPath(req.Path)
+	upload := false
+	if meta != nil && meta.Upload {
+		upload = true
+	}
 	if model.AccountsCount() > 1 && req.Path == "/" {
 		files, err := model.GetAccountFiles()
 		if err != nil {
 			common.ErrorResp(c, err, 500)
 			return
 		}
+		files = Hide(meta, files, req.Path)
 		c.JSON(200, common.Resp{
 			Code:    200,
-			Message: "folder",
-			Data:    files,
+			Message: "success",
+			Data: PathResp{
+				Type: "folder",
+				Meta: Meta{
+					Driver: "root",
+				},
+				Files: files,
+			},
 		})
 		return
 	}
@@ -41,38 +79,51 @@ func Path(c *gin.Context) {
 	if file != nil {
 		// 对于中转文件或只能中转,将链接修改为中转链接
 		if driver.Config().OnlyProxy || account.Proxy {
-			if account.ProxyUrl != "" {
-				file.Url = fmt.Sprintf("%s%s?sign=%s", account.ProxyUrl, req.Path, utils.SignWithToken(file.Name, conf.Token))
+			if account.DownProxyUrl != "" {
+				file.Url = fmt.Sprintf("%s%s?sign=%s", account.DownProxyUrl, req.Path, utils.SignWithToken(file.Name, conf.Token))
 			} else {
-				file.Url = fmt.Sprintf("//%s/d%s", c.Request.Host, req.Path)
+				file.Url = fmt.Sprintf("//%s/p%s?sign=%s", c.Request.Host, req.Path, utils.SignWithToken(file.Name, conf.Token))
 			}
+		} else if !driver.Config().NoNeedSetLink {
+			link, err := driver.Link(base.Args{Path: path, IP: c.ClientIP()}, account)
+			if err != nil {
+				common.ErrorResp(c, err, 500)
+				return
+			}
+			file.Url = link.Url
 		}
 		c.JSON(200, common.Resp{
 			Code:    200,
-			Message: "file",
-			Data:    []*model.File{file},
+			Message: "success",
+			Data: PathResp{
+				Type: "file",
+				Meta: Meta{
+					Driver: driver.Config().Name,
+				},
+				Files: []model.File{*file},
+			},
 		})
 	} else {
-		meta, _ := model.GetMetaByPath(req.Path)
-		if meta != nil && meta.Hide != "" {
-			tmpFiles := make([]model.File, 0)
-			hideFiles := strings.Split(meta.Hide, ",")
-			for _, item := range files {
-				if !utils.IsContain(hideFiles, item.Name) {
-					tmpFiles = append(tmpFiles, item)
-				}
-			}
-			files = tmpFiles
+		files = Hide(meta, files, req.Path)
+		if driver.Config().LocalSort {
+			model.SortFiles(files, account)
 		}
 		c.JSON(200, common.Resp{
 			Code:    200,
-			Message: "folder",
-			Data:    files,
+			Message: "success",
+			Data: PathResp{
+				Type: "folder",
+				Meta: Meta{
+					Driver: driver.Config().Name,
+					Upload: upload,
+				},
+				Files: files,
+			},
 		})
 	}
 }
 
-// 返回真实的链接，且携带头,只提供给中转程序使用
+// Link 返回真实的链接，且携带头,只提供给中转程序使用
 func Link(c *gin.Context) {
 	var req common.PathReq
 	if err := c.ShouldBind(&req); err != nil {
@@ -88,20 +139,19 @@ func Link(c *gin.Context) {
 		common.ErrorResp(c, err, 500)
 		return
 	}
-	if driver.Config().NoLink {
+	if driver.Config().OnlyLocal {
 		common.SuccessResp(c, base.Link{
-			Url: fmt.Sprintf("//%s/d%s?d=1&sign=%s", c.Request.Host, req.Path, utils.SignWithToken(utils.Base(rawPath), conf.Token)),
+			Url: fmt.Sprintf("//%s/p%s?d=1&sign=%s", c.Request.Host, req.Path, utils.SignWithToken(utils.Base(rawPath), conf.Token)),
 		})
 		return
 	}
-	link, err := driver.Link(path, account)
+	link, err := driver.Link(base.Args{Path: path, IP: c.ClientIP()}, account)
 	if err != nil {
 		common.ErrorResp(c, err, 500)
 		return
 	}
 	common.SuccessResp(c, link)
 	return
-
 }
 
 func Preview(c *gin.Context) {

server/controllers/setting.go

@@ -1,9 +1,11 @@
 package controllers
 
 import (
+	"github.com/Xhofe/alist/drivers"
 	"github.com/Xhofe/alist/model"
 	"github.com/Xhofe/alist/server/common"
 	"github.com/gin-gonic/gin"
+	"strconv"
 )
 
 func SaveSettings(c *gin.Context) {
@@ -21,7 +23,17 @@ func SaveSettings(c *gin.Context) {
 }
 
 func GetSettings(c *gin.Context) {
-	settings, err := model.GetSettings()
+	groupStr := c.Query("group")
+	var settings []model.SettingItem
+	var err error
+	if groupStr == "" {
+		settings, err = model.GetSettings()
+	} else {
+		group, err := strconv.Atoi(groupStr)
+		if err == nil {
+			settings, err = model.GetSettingsByGroup(group)
+		}
+	}
 	if err != nil {
 		common.ErrorResp(c, err, 400)
 		return
@@ -35,6 +47,17 @@ func GetSettingsPublic(c *gin.Context) {
 		common.ErrorResp(c, err, 400)
 		return
 	}
+	settings = append(settings, []model.SettingItem{{
+		Key:         "no cors",
+		Value:       drivers.NoCors,
+		Description: "",
+		Type:        "string",
+	}, {
+		Key:         "no upload",
+		Value:       drivers.NoUpload,
+		Description: "",
+		Type:        "string",
+	}}...)
 	common.SuccessResp(c, settings)
 }
 

server/middlewares/down.go

@@ -14,6 +14,7 @@ func DownCheck(c *gin.Context) {
 	rawPath = utils.ParsePath(rawPath)
 	name := utils.Base(rawPath)
 	if sign == utils.SignWithToken(name, conf.Token) {
+		c.Set("sign", true)
 		c.Next()
 		return
 	}
@@ -24,4 +25,4 @@ func DownCheck(c *gin.Context) {
 		return
 	}
 	c.Next()
-}
+}

server/router.go

@@ -23,6 +23,7 @@ func InitApiRouter(r *gin.Engine) {
 		path.POST("/preview", controllers.Preview)
 
 		//path.POST("/link",middlewares.Auth, controllers.Link)
+		public.POST("/upload", controllers.UploadFile)
 
 		public.GET("/settings", controllers.GetSettingsPublic)
 	}
@@ -49,8 +50,8 @@ func InitApiRouter(r *gin.Engine) {
 
 		admin.POST("/link", controllers.Link)
 	}
-	Static(r)
 	WebDav(r)
+	Static(r)
 }
 
 func Cors(r *gin.Engine) {

server/static.go

@@ -10,11 +10,16 @@ import (
 	"net/http"
 )
 
-
-func init() {
-	index, err := public.Public.Open("index.html")
+func InitIndex() {
+	var index fs.File
+	var err error
+	if conf.Conf.Local {
+		index, err = public.Public.Open("local.html")
+	} else {
+		index, err = public.Public.Open("index.html")
+	}
 	if err != nil {
-		log.Errorf(err.Error())
+		//log.Fatalf(err.Error())
 		return
 	}
 	data, _ := ioutil.ReadAll(index)
@@ -22,11 +27,17 @@ func init() {
 }
 
 func Static(r *gin.Engine) {
+	//InitIndex()
 	assets, err := fs.Sub(public.Public, "assets")
 	if err != nil {
 		log.Fatalf("can't find assets folder")
 	}
+	pub, err := fs.Sub(public.Public, "public")
+	if err != nil {
+		log.Fatalf("can't find public folder")
+	}
 	r.StaticFS("/assets/", http.FS(assets))
+	r.StaticFS("/public/", http.FS(pub))
 	r.NoRoute(func(c *gin.Context) {
 		c.Status(200)
 		c.Header("Content-Type", "text/html")

server/webdav.go

@@ -3,6 +3,7 @@ package server
 import (
 	"github.com/Xhofe/alist/conf"
 	"github.com/Xhofe/alist/server/webdav"
+	"github.com/Xhofe/alist/utils"
 	"github.com/gin-gonic/gin"
 	"net/http"
 )
@@ -33,7 +34,7 @@ func WebDav(r *gin.Engine) {
 
 func ServeWebDAV(c *gin.Context) {
 	fs := webdav.FileSystem{}
-	handler.ServeHTTP(c.Writer,c.Request,&fs)
+	handler.ServeHTTP(c.Writer, c.Request, &fs)
 }
 
 func WebDAVAuth(c *gin.Context) {
@@ -48,13 +49,16 @@ func WebDAVAuth(c *gin.Context) {
 		c.Abort()
 		return
 	}
-	if conf.DavUsername != "" && conf.DavUsername != username {
-		c.Status(http.StatusUnauthorized)
-		c.Abort()
+	if conf.DavUsername == username && conf.DavPassword == password {
+		c.Next()
+		return
 	}
-	if conf.DavPassword != "" && conf.DavPassword != password {
-		c.Status(http.StatusUnauthorized)
-		c.Abort()
+	if (conf.VisitorDavUsername == username && conf.VisitorDavPassword == password) || (conf.VisitorDavUsername == "" && conf.VisitorDavPassword == "") {
+		if !utils.IsContain([]string{"PUT", "DELETE", "PROPPATCH", "MKCOL", "COPY", "MOVE"}, c.Request.Method) {
+			c.Next()
+			return
+		}
 	}
-	c.Next()
-}
+	c.Status(http.StatusUnauthorized)
+	c.Abort()
+}

server/webdav/file.go

@@ -12,6 +12,7 @@ import (
 	"github.com/Xhofe/alist/model"
 	"github.com/Xhofe/alist/utils"
 	log "github.com/sirupsen/logrus"
+	"net"
 	"net/http"
 	"path"
 	"path/filepath"
@@ -101,6 +102,25 @@ func (fs *FileSystem) Files(rawPath string) ([]model.File, error) {
 //	}
 //}
 
+func ClientIP(r *http.Request) string {
+	xForwardedFor := r.Header.Get("X-Forwarded-For")
+	ip := strings.TrimSpace(strings.Split(xForwardedFor, ",")[0])
+	if ip != "" {
+		return ip
+	}
+
+	ip = strings.TrimSpace(r.Header.Get("X-Real-Ip"))
+	if ip != "" {
+		return ip
+	}
+
+	if ip, _, err := net.SplitHostPort(strings.TrimSpace(r.RemoteAddr)); err == nil {
+		return ip
+	}
+
+	return ""
+}
+
 func (fs *FileSystem) Link(r *http.Request, rawPath string) (string, error) {
 	rawPath = utils.ParsePath(rawPath)
 	log.Debugf("get link path: %s", rawPath)
@@ -123,7 +143,7 @@ func (fs *FileSystem) Link(r *http.Request, rawPath string) (string, error) {
 			link += "?sign" + sign
 		}
 	} else {
-		link_, err := driver.Link(path_, account)
+		link_, err := driver.Link(base.Args{Path: path_, IP: ClientIP(r)}, account)
 		if err != nil {
 			return "", err
 		}
@@ -145,7 +165,8 @@ func (fs *FileSystem) CreateDirectory(ctx context.Context, rawPath string) error
 	if err != nil {
 		return err
 	}
-	return driver.MakeDir(path_,account)
+	log.Debugf("mkdir: %s", path_)
+	return driver.MakeDir(path_, account)
 }
 
 func (fs *FileSystem) Upload(ctx context.Context, r *http.Request, rawPath string) error {
@@ -218,7 +239,7 @@ func moveFiles(ctx context.Context, fs *FileSystem, src string, dst string, over
 	if srcAccount.Name != dstAccount.Name {
 		return http.StatusMethodNotAllowed, errInvalidDestination
 	}
-	err = driver.Move(srcPath,dstPath,srcAccount)
+	err = driver.Move(srcPath, dstPath, srcAccount)
 	if err != nil {
 		log.Debug(err)
 		return http.StatusInternalServerError, err
@@ -248,7 +269,7 @@ func copyFiles(ctx context.Context, fs *FileSystem, src string, dst string, over
 		// TODO 跨账号复制
 		return http.StatusMethodNotAllowed, errInvalidDestination
 	}
-	err = driver.Copy(srcPath,dstPath,srcAccount)
+	err = driver.Copy(srcPath, dstPath, srcAccount)
 	if err != nil {
 		return http.StatusInternalServerError, err
 	}

server/webdav/webdav.go

@@ -86,7 +86,7 @@ func (h *Handler) ServeHTTP(w http.ResponseWriter, r *http.Request, fs *FileSyst
 	if status != 0 {
 		w.WriteHeader(status)
 		if status != http.StatusNoContent {
-			w.Write([]byte(StatusText(status)))
+			_, _ = w.Write([]byte(StatusText(status)))
 		}
 	}
 	if h.Logger != nil {
@@ -222,7 +222,10 @@ func (h *Handler) handleGetHeadPost(w http.ResponseWriter, r *http.Request, fs *
 	}
 
 	ctx := r.Context()
-
+	if reqPath == "/" {
+		_, err = w.Write([]byte("Please connect using software that supports WebDAV instead of a browser.\n"))
+		return http.StatusMethodNotAllowed, err
+	}
 	exist, file := isPathExist(ctx, fs, reqPath)
 	if !exist {
 		return http.StatusNotFound, nil

utils/file.go

@@ -6,6 +6,7 @@ import (
 	log "github.com/sirupsen/logrus"
 	"io/ioutil"
 	"os"
+	"path"
 	"path/filepath"
 	"strings"
 )
@@ -34,7 +35,7 @@ func GetFileType(ext string) int {
 	if ext == "" {
 		return conf.UNKNOWN
 	}
-	ext = strings.ToLower(strings.TrimLeft(ext,"."))
+	ext = strings.ToLower(strings.TrimLeft(ext, "."))
 	if IsContain(conf.OfficeTypes, ext) {
 		return conf.OFFICE
 	}
@@ -116,9 +117,9 @@ func Base(path string) string {
 }
 
 func Join(elem ...string) string {
-	res := filepath.Join(elem...)
+	res := path.Join(elem...)
 	if res == "\\" {
 		res = "/"
 	}
 	return res
-}
+}