diff --git a/conf/local_macos/admin.conf b/conf/local_macos/admin.conf index 4f6e2cb..f5884dc 100644 --- a/conf/local_macos/admin.conf +++ b/conf/local_macos/admin.conf @@ -41,6 +41,14 @@ server { return 200; } + + location /api/ngx/image/check { + content_by_lua_file $resty_loc/nginx/scripts/check_file.lua; + } + + location /api/ngx/image/upload_combined { + content_by_lua_file $resty_loc/nginx/scripts/upload_combined_image.lua; + } #Upload image files location /api/ngx/image/upload { content_by_lua_file $resty_loc/nginx/scripts/old_upload.lua; @@ -57,21 +65,10 @@ server { location /api/ngx/image/wx_upload_to_combine { content_by_lua_file $resty_loc/nginx/scripts/wx_upload_to_combine.lua; } - #Combine image files location /api/ngx/image/combine { content_by_lua_file $resty_loc/nginx/scripts/combine.lua; } - - - location /api/ngx/image/check { - content_by_lua_file $resty_loc/nginx/scripts/check_file.lua; - } - - location /api/ngx/image/upload_combined { - content_by_lua_file $resty_loc/nginx/scripts/upload_combined_image.lua; - } - #Audio file download location /api/ngx/audio/upload { content_by_lua_file $resty_loc/nginx/scripts/upload_audio.lua; diff --git a/scripts/check_file.lua b/scripts/check_file.lua index ff2ba91..4962bf8 100644 --- a/scripts/check_file.lua +++ b/scripts/check_file.lua @@ -1,4 +1,17 @@ +-- 本地测试命令 +-- 没有verify需要的header curl -v 'http://admin.localhost:8088/api/ngx/image/check/fd7a7ee5-afbe-4b1b-92c1-f7009e85437297 +-- 带有verify需要的header -- https://stackoverflow.com/questions/4990990/check-if-a-file-exists-with-lua + +local http = require "resty.http" +local verify = require('lib.jwt_verify') + +local httpc = http:new() +local authHeader = ngx.req.get_headers().Authorization +local sudoerToken = ngx.req.get_headers().HtySudoerToken + +verify(httpc, authHeader, sudoerToken) + local function file_exists(name) local f = io.open(name,"r") if f~=nil then io.close(f) return true else return false end diff --git a/scripts/lib/upyun_upload.lua b/scripts/lib/upyun_upload.lua index 405f31b..2c93b33 100644 --- a/scripts/lib/upyun_upload.lua +++ b/scripts/lib/upyun_upload.lua @@ -35,7 +35,7 @@ function upyun_upload.upload(filepath, filename) return else ngx.status = 200 - local fullpath = ngx.var.$upyun_domain .. "/" .. directory .. "/" .. filename + local fullpath = ngx.var.upyun_domain .. "/" .. directory .. "/" .. filename ngx.log(ngx.INFO, "UPYUN URL -> ", fullpath) ngx.say(fullpath) end diff --git a/scripts/upload_combined_image.lua b/scripts/upload_combined_image.lua index b6a248f..7579f40 100644 --- a/scripts/upload_combined_image.lua +++ b/scripts/upload_combined_image.lua @@ -1,4 +1,14 @@ package.path = package.path .. ';/?.lua'; + +local http = require "resty.http" +local verify = require('lib.jwt_verify') + +local httpc = http:new() +local authHeader = ngx.req.get_headers().Authorization +local sudoerToken = ngx.req.get_headers().HtySudoerToken + +verify(httpc, authHeader, sudoerToken) + ngx.log(ngx.INFO, 'UPLOAD COMBINED IMAGE -> start') local upyun_upload = require("lib.upyun_upload") ngx.log(ngx.INFO, 'UPLOAD COMBINED IMAGE -> upyun_upload loaded')