clean up
This commit is contained in:
@@ -411,7 +411,6 @@ local function _parse_upyun_option(option, extra, content)
|
|||||||
|
|
||||||
if omd5 == "true" then
|
if omd5 == "true" then
|
||||||
extra["Content-MD5"] = md5(content)
|
extra["Content-MD5"] = md5(content)
|
||||||
--extra["Content-MD5"] = "cca354111e1980bec172a68718976c8"
|
|
||||||
end
|
end
|
||||||
|
|
||||||
if type(secret) == "string" then
|
if type(secret) == "string" then
|
||||||
@@ -422,7 +421,6 @@ local function _parse_upyun_option(option, extra, content)
|
|||||||
extra["Content-Type"] = otype
|
extra["Content-Type"] = otype
|
||||||
end
|
end
|
||||||
|
|
||||||
--print('options...', extra["Content-MD5"])
|
|
||||||
end
|
end
|
||||||
|
|
||||||
local function _parse_upyun_headers(headers, regex)
|
local function _parse_upyun_headers(headers, regex)
|
||||||
|
|||||||
@@ -12,8 +12,6 @@ function upyun_upload.upload(filepath, filename)
|
|||||||
local upyun, err = Upyun:new({
|
local upyun, err = Upyun:new({
|
||||||
user = ngx.var.upyun_operator,
|
user = ngx.var.upyun_operator,
|
||||||
passwd = ngx.var.upyun_password,
|
passwd = ngx.var.upyun_password,
|
||||||
--user = "moicen",
|
|
||||||
--passwd = "NyJ51zRwFApY9Wo9EHJMrb8GI9YtvpVN",
|
|
||||||
localFilePath = filepath
|
localFilePath = filepath
|
||||||
})
|
})
|
||||||
|
|
||||||
@@ -25,8 +23,6 @@ function upyun_upload.upload(filepath, filename)
|
|||||||
|
|
||||||
local bucket = ngx.var.upyun_bucket
|
local bucket = ngx.var.upyun_bucket
|
||||||
local directory = ngx.var.upyun_directory
|
local directory = ngx.var.upyun_directory
|
||||||
--local bucket = "huiwing"
|
|
||||||
--local directory = "music-room"
|
|
||||||
if not filename then
|
if not filename then
|
||||||
filename = strip_path.strip_path(filepath)
|
filename = strip_path.strip_path(filepath)
|
||||||
end
|
end
|
||||||
@@ -49,9 +45,7 @@ function upyun_upload.upload(filepath, filename)
|
|||||||
else
|
else
|
||||||
ngx.status = 200
|
ngx.status = 200
|
||||||
local fullpath = ngx.var.upyun_domain .. "/" .. directory .. "/" .. filename
|
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.log(ngx.INFO, "SUCCESS UPLOAD -> UPYUN URL -> ", fullpath)
|
||||||
--ngx.say("SUCCESS UPLOAD -> UPYUN URL -> ", fullpath)
|
|
||||||
ngx.say(fullpath)
|
ngx.say(fullpath)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -1,13 +0,0 @@
|
|||||||
--package.path = package.path .. ';<SCRIPT_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)
|
|
||||||
Reference in New Issue
Block a user