diff --git a/conf/admin.conf b/conf/admin.conf index 8e508b6..97782b8 100644 --- a/conf/admin.conf +++ b/conf/admin.conf @@ -14,6 +14,10 @@ server { set $htyuc "http://127.0.0.1:3000"; #htyuc host set $resty_loc "/usr/local/openresty"; set $convert "/usr/bin/convert"; + set $upyun_operator "moicen"; + set $upyun_password "NyJ51zRwFApY9Wo9EHJMrb8GI9YtvpVN"; + set $upyun_bucket "huiwing"; + set $upyun_directory "music-room"; set $upyun_cdn "https://upyun.alchemy-studio.cn/"; location / { diff --git a/conf/music-room.conf b/conf/music-room.conf index 7c855e5..01a7262 100644 --- a/conf/music-room.conf +++ b/conf/music-room.conf @@ -9,18 +9,6 @@ server { ssl_certificate /etc/letsencrypt/live/moicen.com/fullchain.pem; # managed by Certbot ssl_certificate_key /etc/letsencrypt/live/moicen.com/privkey.pem; # managed by Certbot - set $tmp_file_dir "/file_upload/"; # 文件存储路径 - set $task_server "http://127.0.0.1:8080"; # task server host - set $htyuc "http://127.0.0.1:3000"; #htyuc host - set $resty_loc "/usr/local/openresty"; - set $convert "/usr/bin/convert"; - - set $upyun_operator "moicen"; - set $upyun_password "NyJ51zRwFApY9Wo9EHJMrb8GI9YtvpVN"; - set $upyun_bucket "huiwing"; - set $upyun_directory "music-room"; - set $upyun_cdn "https://upyun.alchemy-studio.cn/"; - location / { try_files $uri $uri/ /index.html; proxy_set_header Host "music-room.moicen.com"; diff --git a/scripts/convert_audio.lua b/scripts/convert_audio.lua index 1338e4c..bfa09ef 100644 --- a/scripts/convert_audio.lua +++ b/scripts/convert_audio.lua @@ -97,7 +97,7 @@ end local function upload(filepath) local upyun, err = Upyun:new({ user = ngx.var.upyun_operator, - password = ngx.var.upyun_password, + passwd = ngx.var.upyun_password, localFilePath = filepath }) @@ -116,7 +116,7 @@ local function upload(filepath) local info, err = upyun:upload_file(savePath, nil, nil) if not info then ngx.status = 502 - ngx.log(ngx.ERR, "failed to upload image file : " .. err) + ngx.log(ngx.ERR, "failed to upload file : " .. err) return else ngx.status = 200