use system uuid

This commit is contained in:
2023-11-06 01:22:29 +08:00
parent 0642bedbf3
commit 8708d0e2f7
6 changed files with 23 additions and 8 deletions
+2 -2
View File
@@ -3,7 +3,7 @@
package.path = package.path .. ';<SCRIPT_PATH>/?.lua';
-- Requires
local uuid = require "resty.jit-uuid"
local uuid = require "lib.my_uuid"
local cjson = require "cjson"
local pl = require "pl.pretty"
local http = require "resty.http"
@@ -57,7 +57,7 @@ if image_origin == "WX" then
end
-- Prepare combined file name and path
local combined_uuid = uuid.generate_v4()
local combined_uuid = uuid.uuid()
local output_filename = combined_uuid .. ".jpeg";
local output_filepath = file_dir .. "/" .. output_filename
+2 -2
View File
@@ -5,7 +5,7 @@ package.path = package.path .. ';<SCRIPT_PATH>/?.lua';
local cjson = require "cjson"
local pl = require "pl.pretty"
local http = require 'resty.http'
local uuid = require "resty.jit-uuid"
local uuid = require "lib.my_uuid"
local upyun_upload = require("lib.upyun_upload")
local get_wx_media = require("lib.wx_download")
@@ -26,7 +26,7 @@ local function convert()
ngx.log(ngx.INFO, 'convert_audio -> REQ_BODY -> ', ngx.req.get_body_data())
local input_audio_file = get_wx_media(httpc, req_body["payload"]["media_id"], cjson, pl);
local converted_audio_file = file_dir .. "/" .. uuid.generate_v4() .. ".mp3";
local converted_audio_file = file_dir .. "/" .. uuid.uuid() .. ".mp3";
ngx.log(ngx.INFO, "convert_audio -> input audio file -> ", input_audio_file);
ngx.log(ngx.INFO, "convert_audio -> converted audio filename -> ", converted_audio_file);
+1 -1
View File
@@ -3,7 +3,7 @@
package.path = package.path .. ';<SCRIPT_PATH>/?.lua';
local upload = require "resty.upload"
local uuid = require "resty.jit-uuid"
local uuid = require "lib.my_uuid"
local http = require "resty.http"
local cjson = require "cjson"
local verify = require('lib.jwt_verify')
+1 -1
View File
@@ -3,7 +3,7 @@
package.path = package.path .. ';<SCRIPT_PATH>/?.lua';
local upload = require "resty.upload"
local uuid = require "resty.jit-uuid"
local uuid = require "lib.my_uuid"
local http = require "resty.http"
local pl = require "pl.pretty"
local verify = require('lib.jwt_verify')
+15
View File
@@ -0,0 +1,15 @@
local function uuid()
local uuid_cmd = "/usr/bin/uuid"
local result, _, code = os.execute(uuid_cmd)
if result and code == 0 then
ngx.say(result)
else
ngx.status = 500
ngx.log(ngx.ERR, "UUID GENERATION *FAILED*")
ngx.exit()
end
end
return uuid
+2 -2
View File
@@ -4,7 +4,7 @@ package.path = package.path .. ';<SCRIPT_PATH>/?.lua';
local http = require "resty.http"
local cjson = require "cjson"
local pl = require "pl.pretty"
local uuid = require "resty.jit-uuid"
local uuid = require "lib.my_uuid"
local upyun_upload = require("lib.upyun_upload")
local get_wx_media = require("lib.wx_download")
local verify = require('lib.jwt_verify')
@@ -23,7 +23,7 @@ local function run()
local downloaded_file = get_wx_media(httpc, req_body["media_id"], cjson, pl);
upyun_upload.upload(downloaded_file, uuid.generate_v4() .. ".jpg")
upyun_upload.upload(downloaded_file, uuid.uuid() .. ".jpg")
end
run();