diff --git a/target/aliyun/email.lua b/target/aliyun/email.lua index b81e278..d2f573d 100644 --- a/target/aliyun/email.lua +++ b/target/aliyun/email.lua @@ -1,16 +1,15 @@ local M = {} require("app.app") -local http = require("fwutils.httpclient") +require("redis.conn") +local http = require("httpclient") -M.get_token = function(app_id,app_secret) - local token = cache.get_json("aliyun_email_token") +M.get_token = function(app_id,app_secret,rds) + local token = rds:get("aliyun_email_token") if token then - if token.expires > os.time() + 60*60 then - return true,token.access_token - end + return true,token end 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 return false,data.error_description end - - cache.set_json("aliyun_email_token",{ - access_token = data.access_token, - expires = os.time() + data.expires_in - }) + rds:setex("aliyun_email_token",data.expires_in,data.access_token) return true,data.access_token end -M.create_msg = function(from,from_name,to,to_name,title,content,app_id,app_secret) - local ok,access_token = M.get_token(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,rds) if not ok then return false,access_token end @@ -74,12 +69,12 @@ M.create_msg = function(from,from_name,to,to_name,title,content,app_id,app_secre end return true,data.message.id end -M.send = function(from,from_name,to,to_name,title,content,app_id,app_secret) - local ok,access_token = M.get_token(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,rds) if not ok then return false,access_token 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 return false,msg_id 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 true end -M.create_user = function(email_name,password,nickname,jobtitle,app_id,app_secret) - local ok,access_token = M.get_token(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,rds) if not ok then return false,access_token end @@ -127,8 +122,8 @@ M.create_user = function(email_name,password,nickname,jobtitle,app_id,app_secret end return false,"create user error:"..err end -M.delete_user = function(email_name,app_id,app_secret) - local ok,access_token = M.get_token(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,rds) if not ok then return false,access_token end @@ -142,8 +137,8 @@ M.delete_user = function(email_name,app_id,app_secret) end return true end -M.getDepartment = function(id,app_id,app_secret) - local ok,access_token = M.get_token(app_id,app_secret) +M.getDepartment = function(id,app_id,app_secret,rds) + local ok,access_token = M.get_token(app_id,app_secret,rds) if not ok then return false,access_token end @@ -165,8 +160,8 @@ M.getDepartment = function(id,app_id,app_secret) return true end -M.getDepartmentList = function(app_id,app_secret) - local ok,access_token = M.get_token(app_id,app_secret) +M.getDepartmentList = function(app_id,app_secret,rds) + local ok,access_token = M.get_token(app_id,app_secret,rds) if not ok then return false,access_token end diff --git a/target/fwutils/config.lua b/target/fwutils/config.lua index 6cc7b4e..a468654 100644 --- a/target/fwutils/config.lua +++ b/target/fwutils/config.lua @@ -1,6 +1,6 @@ return { -- 服务器ID,如果REDIS或MYSQL与其它服务公用必须更改此参数,要求唯一 - server_id = "STUDENT_1", + server_id = "EDU_1", path = { -- 字节码路径 diff --git a/target/fwutils/funs.lua b/target/fwutils/funs.lua index ccf8da7..816adc0 100644 --- a/target/fwutils/funs.lua +++ b/target/fwutils/funs.lua @@ -143,34 +143,6 @@ M.menu_top = function() ]] 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 = "