From 9b6ad33cf965ceef7b8628fea398e87d57faf78f Mon Sep 17 00:00:00 2001
From: a158 <a158@DESKTOP-29MI1IT>
Date: Fri, 30 Jan 2026 15:04:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 target/aliyun/email.lua       | 43 ++++++++++++++++-------------------
 target/fwutils/config.lua     |  2 +-
 target/fwutils/funs.lua       | 28 -----------------------
 target/tencent/wxofficial.lua | 12 ++++++----
 target/tencent/wxpay.lua      |  2 +-
 5 files changed, 28 insertions(+), 59 deletions(-)

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()
         </nav>
     ]]
 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)
     for key, value in pairs(M) do
         if type(value) == "function" and key ~= "functions" and key ~= "get_all_functions" then
diff --git a/target/tencent/wxofficial.lua b/target/tencent/wxofficial.lua
index e953b52..cbd89fd 100644
--- a/target/tencent/wxofficial.lua
+++ b/target/tencent/wxofficial.lua
@@ -39,6 +39,7 @@ M.get_access_token = function(appid, appsecret,rds)
 
     local cache_data = rds:get("wxofficial_info_"..appid)
     if cache_data then
+        -- print("cache_data:",cache_data)
         cache_data = cjson.decode(cache_data)
         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)
     if not result then
-        return false, data
+        return false, "get_access_token failed:"..data
     end
 
     local body = cjson.decode(data)
     if body.errcode ~= nil and body.errcode ~= 0 then
-        return false, body.errmsg
+        return false, "get_access_token failed:"..body.errmsg
     end
 
  
     -- 更新
-    rds:setex("wxofficial_info_"..appid,7200,cjson.encode({
+    local ok = rds:setex("wxofficial_info_"..appid,7200,cjson.encode({
         update_time = os.time(),
         access_token = body.access_token
     }))
@@ -105,8 +106,8 @@ M.generate_auth_url = function(appid, redirect_uri)
 end
 
 -- 发送模板消息
-M.send_template_message = function(appid, appsecret, openid, template_id, jump_url, data)
-    local ok, access_token = M.get_access_token(appid, appsecret)
+M.send_template_message = function(appid, appsecret, openid, template_id, jump_url, data,rds)
+    local ok, access_token = M.get_access_token(appid, appsecret,rds)
     if not ok then
         return false, access_token
     end
@@ -126,6 +127,7 @@ M.send_template_message = function(appid, appsecret, openid, template_id, jump_u
     if not result then
         return false, response
     end
+    
     local res_json = cjson.decode(response)
     if res_json.errcode ~= 0 then
         return false, res_json.errmsg
diff --git a/target/tencent/wxpay.lua b/target/tencent/wxpay.lua
index 6a48d79..3827f5e 100644
--- a/target/tencent/wxpay.lua
+++ b/target/tencent/wxpay.lua
@@ -1,4 +1,4 @@
-local http = require("fwutils.httpclient")
+local http = require("httpclient")
 
 local M = {}
 -- 微信支付统一下单