reorg modules

scripts/check_file.lua

@@ -1,5 +1,3 @@
-package.path = package.path .. ';<SCRIPT_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")

scripts/combine.lua

@@ -4,7 +4,6 @@ package.path = package.path .. ';<SCRIPT_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

scripts/convert_audio.lua

@@ -5,8 +5,8 @@ package.path = package.path .. ';<SCRIPT_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()
 

scripts/form_upload_to_combine.lua

@@ -5,8 +5,8 @@ package.path = package.path .. ';<SCRIPT_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

scripts/test_upyun_upload.lua

@@ -2,7 +2,7 @@
 --package.path = package.path .. ';/usr/local/opt/openresty/nginx/scripts/?.lua';
 package.path = package.path .. ';<SCRIPT_PATH>/?.lua';
 
-local yun = require("upyun")
+local yun = require("lib.upyun")
 local cjson = require "cjson"
 
 local function upyun_upload_file()

scripts/upload_audio.lua

@@ -1,7 +1,7 @@
 package.path = package.path .. ';<SCRIPT_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"

scripts/upload_combined_image.lua

@@ -1,6 +1,6 @@
 package.path = package.path .. ';<SCRIPT_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, ".*/(.*)")

scripts/wx_upload_single.lua

@@ -4,10 +4,9 @@ package.path = package.path .. ';<SCRIPT_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()
 

scripts/wx_upload_to_combine.lua

@@ -5,8 +5,8 @@ package.path = package.path .. ';<SCRIPT_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()