diff --git a/scripts/combine.lua b/scripts/combine.lua index 5746294..8f5f636 100644 --- a/scripts/combine.lua +++ b/scripts/combine.lua @@ -49,7 +49,7 @@ ngx.say(combined_uuid) -- -- ngx.log(ngx.INFO, "Upload combined image " .. combined .. " to upyun .") -- --- upyun_upload.upload(combined) +-- upyun_upload.upload(combined, nil) -- else -- ngx.status = 500 -- ngx.log(ngx.ERR, "IMAGE COMBINE *FAILED*") diff --git a/scripts/convert_audio.lua b/scripts/convert_audio.lua index 954004f..8098ec0 100644 --- a/scripts/convert_audio.lua +++ b/scripts/convert_audio.lua @@ -27,7 +27,7 @@ local function convert() local result, _, code = os.execute(cmd) if result and code == 0 then ngx.log(ngx.INFO, "result -> ", result); - upyun_upload.upload(converted_audio_file) + upyun_upload.upload(converted_audio_file, nil); else ngx.status = 500 ngx.log(ngx.ERR, "AUDIO CONVERT *FAILED*") diff --git a/scripts/upload_combined_image.lua b/scripts/upload_combined_image.lua index 635f3ca..0b7c2f6 100644 --- a/scripts/upload_combined_image.lua +++ b/scripts/upload_combined_image.lua @@ -11,4 +11,4 @@ local fullpath = file_dir .. "/" .. file_to_upload .. ".jpeg"; ngx.log(ngx.INFO, 'UPLOAD COMBINED IMAGE -> fullpath -> ', fullpath) -upyun_upload.upload(fullpath) \ No newline at end of file +upyun_upload.upload(fullpath, nil) \ No newline at end of file diff --git a/scripts/upyun_upload.lua b/scripts/upyun_upload.lua index 7255074..3ded055 100644 --- a/scripts/upyun_upload.lua +++ b/scripts/upyun_upload.lua @@ -7,7 +7,7 @@ local upyun_upload = {} local strip_path = require("strip_path") local Upyun = require('upyun') -function upyun_upload.upload(filepath) +function upyun_upload.upload(filepath, filename) local upyun, err = Upyun:new({ user = ngx.var.upyun_operator, passwd = ngx.var.upyun_password, @@ -22,7 +22,9 @@ function upyun_upload.upload(filepath) local bucket = ngx.var.upyun_bucket local directory = ngx.var.upyun_directory - local filename = strip_path.strip_path(filepath) + if not filename then + filename = strip_path.strip_path(filepath) + end local savePath = bucket .. "/" .. directory .. "/" .. filename diff --git a/scripts/wx_download.lua b/scripts/wx_download.lua index 733394b..c71b1fe 100644 --- a/scripts/wx_download.lua +++ b/scripts/wx_download.lua @@ -1,7 +1,6 @@ local cjson = require "cjson" local http = require "resty.http" local pl = require "pl.pretty" - local httpc = http.new() local sudoerToken = ngx.req.get_headers().HtySudoerToken local htyhostHeader = ngx.req.get_headers().HtyHost @@ -75,7 +74,7 @@ local function get_wx_media(media_id) ngx.exit(res.status) end - local filename = ngx.re.match(res.headers['Content-disposition'], [[filename="(.+\.([a-zA-Z0-9)+)"]], "jo")[1] + local filename = ngx.re.match(res.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); diff --git a/scripts/wx_upload_single.lua b/scripts/wx_upload_single.lua index c051f8b..8a5ae3e 100644 --- a/scripts/wx_upload_single.lua +++ b/scripts/wx_upload_single.lua @@ -3,6 +3,7 @@ package.path = package.path .. ';/?.lua'; local cjson = require "cjson" +local uuid = require "resty.jit-uuid" local upyun_upload = require("upyun_upload") local get_wx_media = require("wx_download") @@ -20,7 +21,7 @@ local function run() local downloaded_file = get_wx_media(req_body["media_id"]); - upyun_upload.upload(downloaded_file) + upyun_upload.upload(downloaded_file, uuid.generate_v4() .. ".jpg") end run();