diff --git a/scripts/lib/upyun.lua b/scripts/lib/upyun.lua index 6a08e3f..2bd60da 100644 --- a/scripts/lib/upyun.lua +++ b/scripts/lib/upyun.lua @@ -411,6 +411,7 @@ local function _parse_upyun_option(option, extra, content) if omd5 == "true" then extra["Content-MD5"] = md5(content) + --extra["Content-MD5"] = "cca354111e1980bec172a68718976c8" end if type(secret) == "string" then @@ -420,6 +421,8 @@ local function _parse_upyun_option(option, extra, content) if type(otype) == "string" then extra["Content-Type"] = otype end + + --print('options...', extra["Content-MD5"]) end local function _parse_upyun_headers(headers, regex) diff --git a/scripts/lib/upyun_upload.lua b/scripts/lib/upyun_upload.lua index 08ee482..3ea047a 100644 --- a/scripts/lib/upyun_upload.lua +++ b/scripts/lib/upyun_upload.lua @@ -1,5 +1,6 @@ -- 指定模块引用目录,否则无法加载同目录下的其他文件 --package.path = package.path .. ';/usr/local/opt/openresty/nginx/scripts/?.lua'; +--package.path = package.path .. ';/Users/liyong/Code/AlchemyStudio/resty_functions/scripts/?.lua'; package.path = package.path .. ';/?.lua'; local upyun_upload = {} @@ -11,6 +12,8 @@ function upyun_upload.upload(filepath, filename) local upyun, err = Upyun:new({ user = ngx.var.upyun_operator, passwd = ngx.var.upyun_password, + --user = "moicen", + --passwd = "NyJ51zRwFApY9Wo9EHJMrb8GI9YtvpVN", localFilePath = filepath }) @@ -22,6 +25,8 @@ function upyun_upload.upload(filepath, filename) local bucket = ngx.var.upyun_bucket local directory = ngx.var.upyun_directory + --local bucket = "huiwing" + --local directory = "music-room" if not filename then filename = strip_path.strip_path(filepath) end @@ -32,15 +37,21 @@ function upyun_upload.upload(filepath, filename) local savePath = bucket .. "/" .. directory .. "/" .. filename ngx.log(ngx.INFO, " savePath " , savePath) - local info, err = upyun:upload_file(savePath, nil, nil) + local options = { + md5 = true + } + + local info, err = upyun:upload_file(savePath, nil, options) if not info then - ngx.status = 502 + ngx.status = 400 ngx.log(ngx.ERR, "failed to upload file : " .. err) return else ngx.status = 200 local fullpath = ngx.var.upyun_domain .. "/" .. directory .. "/" .. filename + --local fullpath = "https://upyun.huiwings.cn" .. "/" .. directory .. "/" .. filename ngx.log(ngx.INFO, "SUCCESS UPLOAD -> UPYUN URL -> ", fullpath) + --ngx.say("SUCCESS UPLOAD -> UPYUN URL -> ", fullpath) ngx.say(fullpath) end end diff --git a/test_scripts/upyun_op.lua b/test_scripts/upyun_op.lua new file mode 100644 index 0000000..6dce441 --- /dev/null +++ b/test_scripts/upyun_op.lua @@ -0,0 +1,13 @@ +--package.path = package.path .. ';/?.lua'; +package.path = package.path .. ';/Users/liyong/Code/AlchemyStudio/resty_functions/scripts/?.lua'; + +ngx.say('UPLOAD COMBINED IMAGE -> start') +local upyun_upload = require("lib.upyun_upload") +ngx.say('UPLOAD COMBINED IMAGE -> upyun_upload loaded') + +--local fullpath = "/Users/liyong/Code/AlchemyStudio/resty_functions/test_files_dir/r2d2.jpeg"; +local fullpath = "/Users/liyong/Code/AlchemyStudio/resty_functions/test_files_dir/e4938956-954f-4918-be7f-7b10278a9ca4.jpeg"; + +ngx.say('UPLOAD COMBINED IMAGE -> fullpath -> ', fullpath) + +upyun_upload.upload(fullpath, nil) \ No newline at end of file