diff --git a/scripts/wx_download.lua b/scripts/wx_download.lua index 8b7b3a7..cf73439 100644 --- a/scripts/wx_download.lua +++ b/scripts/wx_download.lua @@ -74,7 +74,7 @@ local function get_wx_media(media_id) ngx.exit(resp.status) end - local filename = ngx.re.match(resp.headers['Content-disposition'], [[filename="(.+\.([a-zA-Z0-9])+)"]], "jo")[1] + local filename = ngx.re.match(resp.headers['Content-disposition'], [[filename="(.+\.([a-zA-Z0-9]+))"]], "jo")[1] local file_dir = ngx.var.tmp_file_dir local saved_file = file_dir .. "/" .. filename; print('saved file...' .. saved_file); @@ -86,7 +86,7 @@ local function get_wx_media(media_id) file:close() end - return saved_file; + return saved_file, filename; end return get_wx_media; \ No newline at end of file diff --git a/scripts/wx_upload_to_combine.lua b/scripts/wx_upload_to_combine.lua index 4d087dc..33db8e7 100644 --- a/scripts/wx_upload_to_combine.lua +++ b/scripts/wx_upload_to_combine.lua @@ -21,7 +21,8 @@ local function read_wx_file() local files = {} for i = 1, #req_body["media_ids"] do print("media_id -> ", i, req_body["media_ids"][i]) - table.insert(files, get_wx_media(req_body["media_ids"][i])); + local _, filename = get_wx_media(req_body["media_ids"][i]) + table.insert(files, filename); end create_task(files, authHeader, sudoerToken)