From f06c818f4ab7a88acb8f87c34b27994b1051e65b Mon Sep 17 00:00:00 2001 From: moicen Date: Tue, 28 Jun 2022 22:47:38 +0800 Subject: [PATCH] reorg modules --- scripts/check_file.lua | 2 -- scripts/combine.lua | 14 -------------- scripts/convert_audio.lua | 4 ++-- scripts/form_upload_to_combine.lua | 4 ++-- scripts/{ => lib}/create_task.lua | 0 scripts/{ => lib}/jwt_verify.lua | 0 scripts/{ => lib}/strip_path.lua | 0 scripts/{ => lib}/upyun.lua | 0 scripts/{ => lib}/upyun_token.lua | 0 scripts/{ => lib}/upyun_upload.lua | 0 scripts/{ => lib}/wx_download.lua | 0 scripts/test_upyun_upload.lua | 2 +- scripts/upload_audio.lua | 2 +- scripts/upload_combined_image.lua | 2 +- scripts/wx_upload_single.lua | 7 +++---- scripts/wx_upload_to_combine.lua | 4 ++-- 16 files changed, 12 insertions(+), 29 deletions(-) rename scripts/{ => lib}/create_task.lua (100%) rename scripts/{ => lib}/jwt_verify.lua (100%) rename scripts/{ => lib}/strip_path.lua (100%) rename scripts/{ => lib}/upyun.lua (100%) rename scripts/{ => lib}/upyun_token.lua (100%) rename scripts/{ => lib}/upyun_upload.lua (100%) rename scripts/{ => lib}/wx_download.lua (100%) diff --git a/scripts/check_file.lua b/scripts/check_file.lua index 5082b53..1d15041 100644 --- a/scripts/check_file.lua +++ b/scripts/check_file.lua @@ -1,5 +1,3 @@ -package.path = package.path .. ';/?.lua'; - -- https://stackoverflow.com/questions/4990990/check-if-a-file-exists-with-lua local function file_exists(name) local f = io.open(name,"r") diff --git a/scripts/combine.lua b/scripts/combine.lua index 8f5f636..c2f2b1b 100644 --- a/scripts/combine.lua +++ b/scripts/combine.lua @@ -4,7 +4,6 @@ package.path = package.path .. ';/?.lua'; local uuid = require "resty.jit-uuid" local cjson = require "cjson" -local upyun_upload = require("upyun_upload") uuid.seed() local file_dir = ngx.var.tmp_file_dir @@ -41,16 +40,3 @@ ngx.log(ngx.INFO, 'CMD -> ', cmd) io.popen(cmd) ngx.say(combined_uuid) - --- local result, _, code = os.execute(cmd) --- --- if result and code == 0 then --- ngx.log(ngx.INFO, "IMAGE COMBINED -> ", combined) --- --- ngx.log(ngx.INFO, "Upload combined image " .. combined .. " to upyun .") --- --- upyun_upload.upload(combined, nil) --- else --- ngx.status = 500 --- ngx.log(ngx.ERR, "IMAGE COMBINE *FAILED*") --- end diff --git a/scripts/convert_audio.lua b/scripts/convert_audio.lua index d500d79..b0301d2 100644 --- a/scripts/convert_audio.lua +++ b/scripts/convert_audio.lua @@ -5,8 +5,8 @@ package.path = package.path .. ';/?.lua'; local cjson = require "cjson" local http = require 'resty.http' local uuid = require "resty.jit-uuid" -local upyun_upload = require("upyun_upload") -local get_wx_media = require("wx_download") +local upyun_upload = require("lib.upyun_upload") +local get_wx_media = require("lib.wx_download") local httpc = http:new() diff --git a/scripts/form_upload_to_combine.lua b/scripts/form_upload_to_combine.lua index 059279d..3e45124 100644 --- a/scripts/form_upload_to_combine.lua +++ b/scripts/form_upload_to_combine.lua @@ -5,8 +5,8 @@ package.path = package.path .. ';/?.lua'; local upload = require "resty.upload" local uuid = require "resty.jit-uuid" local http = require "resty.http" -local verify = require('jwt_verify') -local create_task = require("create_task") +local verify = require('lib.jwt_verify') +local create_task = require("lib.create_task") local httpc = http:new() local authHeader = ngx.req.get_headers().Authorization local sudoerToken = ngx.req.get_headers().HtySudoerToken diff --git a/scripts/create_task.lua b/scripts/lib/create_task.lua similarity index 100% rename from scripts/create_task.lua rename to scripts/lib/create_task.lua diff --git a/scripts/jwt_verify.lua b/scripts/lib/jwt_verify.lua similarity index 100% rename from scripts/jwt_verify.lua rename to scripts/lib/jwt_verify.lua diff --git a/scripts/strip_path.lua b/scripts/lib/strip_path.lua similarity index 100% rename from scripts/strip_path.lua rename to scripts/lib/strip_path.lua diff --git a/scripts/upyun.lua b/scripts/lib/upyun.lua similarity index 100% rename from scripts/upyun.lua rename to scripts/lib/upyun.lua diff --git a/scripts/upyun_token.lua b/scripts/lib/upyun_token.lua similarity index 100% rename from scripts/upyun_token.lua rename to scripts/lib/upyun_token.lua diff --git a/scripts/upyun_upload.lua b/scripts/lib/upyun_upload.lua similarity index 100% rename from scripts/upyun_upload.lua rename to scripts/lib/upyun_upload.lua diff --git a/scripts/wx_download.lua b/scripts/lib/wx_download.lua similarity index 100% rename from scripts/wx_download.lua rename to scripts/lib/wx_download.lua diff --git a/scripts/test_upyun_upload.lua b/scripts/test_upyun_upload.lua index 22e13ef..e4fa166 100644 --- a/scripts/test_upyun_upload.lua +++ b/scripts/test_upyun_upload.lua @@ -2,7 +2,7 @@ --package.path = package.path .. ';/usr/local/opt/openresty/nginx/scripts/?.lua'; package.path = package.path .. ';/?.lua'; -local yun = require("upyun") +local yun = require("lib.upyun") local cjson = require "cjson" local function upyun_upload_file() diff --git a/scripts/upload_audio.lua b/scripts/upload_audio.lua index cf4f66b..11c48ce 100644 --- a/scripts/upload_audio.lua +++ b/scripts/upload_audio.lua @@ -1,7 +1,7 @@ package.path = package.path .. ';/?.lua'; local cjson = require "cjson" local http = require "resty.http" -local create_task = require "create_task" +local create_task = require "lib.create_task" local TaskTypes = { NOOP = 'NOOP', CONVERT_AUDIO_FILE = "CONVERT_AUDIO_FILE" diff --git a/scripts/upload_combined_image.lua b/scripts/upload_combined_image.lua index 0b7c2f6..fbf5efe 100644 --- a/scripts/upload_combined_image.lua +++ b/scripts/upload_combined_image.lua @@ -1,6 +1,6 @@ package.path = package.path .. ';/?.lua'; ngx.log(ngx.INFO, 'UPLOAD COMBINED IMAGE -> start') -local upyun_upload = require("upyun_upload") +local upyun_upload = require("lib.upyun_upload") ngx.log(ngx.INFO, 'UPLOAD COMBINED IMAGE -> upyun_upload loaded') local file_to_upload = string.match(ngx.var.request_uri, ".*/(.*)") diff --git a/scripts/wx_upload_single.lua b/scripts/wx_upload_single.lua index 7ef070f..0012bde 100644 --- a/scripts/wx_upload_single.lua +++ b/scripts/wx_upload_single.lua @@ -4,10 +4,9 @@ package.path = package.path .. ';/?.lua'; local http = require "resty.http" local cjson = require "cjson" local uuid = require "resty.jit-uuid" -local upyun_upload = require("upyun_upload") -local get_wx_media = require("wx_download") - -local verify = require('jwt_verify') +local upyun_upload = require("lib.upyun_upload") +local get_wx_media = require("lib.wx_download") +local verify = require('lib.jwt_verify') local httpc = http:new() diff --git a/scripts/wx_upload_to_combine.lua b/scripts/wx_upload_to_combine.lua index 7994b4f..17b6bfb 100644 --- a/scripts/wx_upload_to_combine.lua +++ b/scripts/wx_upload_to_combine.lua @@ -5,8 +5,8 @@ package.path = package.path .. ';/?.lua'; local cjson = require "cjson" local http = require 'resty.http' local get_wx_media = require("wx_download") -local create_task = require("create_task") -local verify = require('jwt_verify') +local create_task = require("lib.create_task") +local verify = require('lib.jwt_verify') local httpc = http:new()