1585346868/daydaytalk-fwutils
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复部分问题

Browse Source
This commit is contained in:
a158
2026-01-30 15:04:00 +08:00
parent 290dab81d4
commit 9b6ad33cf9
5 changed files with 28 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
target/aliyun/email.lua
View File

@@ -1,16 +1,15 @@
local M = {} local M = {}
require("app.app") require("app.app")
local http = require("fwutils.httpclient") require("redis.conn")
local http = require("httpclient")
M.get_token = function(app_id,app_secret) M.get_token = function(app_id,app_secret,rds)
local token = cache.get_json("aliyun_email_token") local token = rds:get("aliyun_email_token")
if token then if token then
if token.expires > os.time() + 60*60 then return true,token
return true,token.access_token
end
end end
local url = "https://alimail-cn.aliyuncs.com/oauth2/v2.0/token" local url = "https://alimail-cn.aliyuncs.com/oauth2/v2.0/token"
@@ -25,16 +24,12 @@ M.get_token = function(app_id,app_secret)
if data.error ~= nil and data.error ~= "" then if data.error ~= nil and data.error ~= "" then
return false,data.error_description return false,data.error_description
end end
rds:setex("aliyun_email_token",data.expires_in,data.access_token)
cache.set_json("aliyun_email_token",{
access_token = data.access_token,
expires = os.time() + data.expires_in
})
return true,data.access_token return true,data.access_token
end end
M.create_msg = function(from,from_name,to,to_name,title,content,app_id,app_secret) M.create_msg = function(from,from_name,to,to_name,title,content,app_id,app_secret,rds)
local ok,access_token = M.get_token(app_id,app_secret) local ok,access_token = M.get_token(app_id,app_secret,rds)
if not ok then if not ok then
return false,access_token return false,access_token
end end
@@ -74,12 +69,12 @@ M.create_msg = function(from,from_name,to,to_name,title,content,app_id,app_secre
end end
return true,data.message.id return true,data.message.id
end end
M.send = function(from,from_name,to,to_name,title,content,app_id,app_secret) M.send = function(from,from_name,to,to_name,title,content,app_id,app_secret,rds)
local ok,access_token = M.get_token(app_id,app_secret) local ok,access_token = M.get_token(app_id,app_secret,rds)
if not ok then if not ok then
return false,access_token return false,access_token
end end
local ok,msg_id = M.create_msg(from,from_name,to,to_name,title,content,app_id,app_secret) local ok,msg_id = M.create_msg(from,from_name,to,to_name,title,content,app_id,app_secret,rds)
if not ok then if not ok then
return false,msg_id return false,msg_id
end end
@@ -100,8 +95,8 @@ M.send = function(from,from_name,to,to_name,title,content,app_id,app_secret)
return false,"send error:"..err return false,"send error:"..err
--return true --return true
end end
M.create_user = function(email_name,password,nickname,jobtitle,app_id,app_secret) M.create_user = function(email_name,password,nickname,jobtitle,app_id,app_secret,rds)
local ok,access_token = M.get_token(app_id,app_secret) local ok,access_token = M.get_token(app_id,app_secret,rds)
if not ok then if not ok then
return false,access_token return false,access_token
end end
@@ -127,8 +122,8 @@ M.create_user = function(email_name,password,nickname,jobtitle,app_id,app_secret
end end
return false,"create user error:"..err return false,"create user error:"..err
end end
M.delete_user = function(email_name,app_id,app_secret) M.delete_user = function(email_name,app_id,app_secret,rds)
local ok,access_token = M.get_token(app_id,app_secret) local ok,access_token = M.get_token(app_id,app_secret,rds)
if not ok then if not ok then
return false,access_token return false,access_token
end end
@@ -142,8 +137,8 @@ M.delete_user = function(email_name,app_id,app_secret)
end end
return true return true
end end
M.getDepartment = function(id,app_id,app_secret) M.getDepartment = function(id,app_id,app_secret,rds)
local ok,access_token = M.get_token(app_id,app_secret) local ok,access_token = M.get_token(app_id,app_secret,rds)
if not ok then if not ok then
return false,access_token return false,access_token
end end
@@ -165,8 +160,8 @@ M.getDepartment = function(id,app_id,app_secret)
return true return true
end end
M.getDepartmentList = function(app_id,app_secret) M.getDepartmentList = function(app_id,app_secret,rds)
local ok,access_token = M.get_token(app_id,app_secret) local ok,access_token = M.get_token(app_id,app_secret,rds)
if not ok then if not ok then
return false,access_token return false,access_token
end end

2
target/fwutils/config.lua
View File

@@ -1,6 +1,6 @@
return { return {
-- 服务器ID，如果REDIS或MYSQL与其它服务公用必须更改此参数，要求唯一 -- 服务器ID，如果REDIS或MYSQL与其它服务公用必须更改此参数，要求唯一
server_id = "STUDENT_1", server_id = "EDU_1",
path = { path = {
-- 字节码路径 -- 字节码路径

28
target/fwutils/funs.lua
View File

@@ -143,34 +143,6 @@ M.menu_top = function()
</nav> </nav>
]] ]]
end end
M.teacher_photos = function()
require("app.app")
local conn = db_conn()
local edu_id = edu_id()
local edu_teacher = require("app.function.edu_teacher")
local edu_setting = require("app.function.edu_setting")
local teacher_info = edu_teacher.get_by_id(pint("id"),edu_id,conn)
if teacher_info == nil then
conn:close()
return ""
end
local domain_assets = edu_setting.get_assets_domain(edu_id,conn)
local photos = cjson.decode(teacher_info.photo)
local content = "<div><div class='home-img'><img src='"..domain_assets.."/".. teacher_info.avatar.."' class='img-fluid bg-img' alt=''></div></div>"
for i,v in ipairs(photos) do
if type(v) == "string" then
content = content..[[<div>
<div class="home-img">
<img src="]]..domain_assets.."/"..v..[[" class="img-fluid bg-img" alt="">
</div>
</div>
]]
end
end
conn:close()
return content
-- return "<h1>卧槽</h1>"
end
M.regist = function(env) M.regist = function(env)
for key, value in pairs(M) do for key, value in pairs(M) do
if type(value) == "function" and key ~= "functions" and key ~= "get_all_functions" then if type(value) == "function" and key ~= "functions" and key ~= "get_all_functions" then

12
target/tencent/wxofficial.lua
View File

@@ -39,6 +39,7 @@ M.get_access_token = function(appid, appsecret,rds)
local cache_data = rds:get("wxofficial_info_"..appid) local cache_data = rds:get("wxofficial_info_"..appid)
if cache_data then if cache_data then
-- print("cache_data:",cache_data)
cache_data = cjson.decode(cache_data) cache_data = cjson.decode(cache_data)
if cache_data.update_time and cache_data.access_token then if cache_data.update_time and cache_data.access_token then
-- 检查是否过期 -- 检查是否过期
@@ -51,17 +52,17 @@ M.get_access_token = function(appid, appsecret,rds)
local result, data = httpclient.get(M.url_get_access_token .. "&appid=" .. appid .. "&secret=" .. appsecret) local result, data = httpclient.get(M.url_get_access_token .. "&appid=" .. appid .. "&secret=" .. appsecret)
if not result then if not result then
return false, data return false, "get_access_token failed:"..data
end end
local body = cjson.decode(data) local body = cjson.decode(data)
if body.errcode ~= nil and body.errcode ~= 0 then if body.errcode ~= nil and body.errcode ~= 0 then
return false, body.errmsg return false, "get_access_token failed:"..body.errmsg
end end
-- 更新 -- 更新
rds:setex("wxofficial_info_"..appid,7200,cjson.encode({ local ok = rds:setex("wxofficial_info_"..appid,7200,cjson.encode({
update_time = os.time(), update_time = os.time(),
access_token = body.access_token access_token = body.access_token
})) }))
@@ -105,8 +106,8 @@ M.generate_auth_url = function(appid, redirect_uri)
end end
-- 发送模板消息 -- 发送模板消息
M.send_template_message = function(appid, appsecret, openid, template_id, jump_url, data) M.send_template_message = function(appid, appsecret, openid, template_id, jump_url, data,rds)
local ok, access_token = M.get_access_token(appid, appsecret) local ok, access_token = M.get_access_token(appid, appsecret,rds)
if not ok then if not ok then
return false, access_token return false, access_token
end end
@@ -126,6 +127,7 @@ M.send_template_message = function(appid, appsecret, openid, template_id, jump_u
if not result then if not result then
return false, response return false, response
end end
local res_json = cjson.decode(response) local res_json = cjson.decode(response)
if res_json.errcode ~= 0 then if res_json.errcode ~= 0 then
return false, res_json.errmsg return false, res_json.errmsg

2
target/tencent/wxpay.lua
View File

@@ -1,4 +1,4 @@
local http = require("fwutils.httpclient") local http = require("httpclient")
local M = {} local M = {}
-- 微信支付统一下单 -- 微信支付统一下单