0

src/api/common/commonController.js

@@ -8,7 +8,7 @@ import gm from 'gm';
 import axios from 'axios';
 import COS from 'cos-nodejs-sdk-v5';
 import { uploadSingle } from '../../middleware/upload.js';
-import { globalState } from '../../util/globalState.js';
+import { globalCache } from '../../util/GlobalCache.js';
 
 const imageMagick = gm.subClass({ imageMagick: true });
 
@@ -228,14 +228,14 @@ export async function GetBaiduToken (ctx) {
 
     let result = 0;
     if (resultLogin.errcode === 10000) {
-        result = globalState.getBufferMemory('BaiduToken');
+        result = globalCache.get('BaiduToken');
         if (result === 0) {
             const baiduUrl = 'https://openapi.baidu.com/oauth/2.0/token?grant_type=client_credentials&client_id=9r1Idx1mgMONvElxU3KGE5Gi&client_secret=f4f606f1a5c0b4eaf800e1e046802d81';
             result = await axios.get(baiduUrl)
                 .then(response => {
                     const json = response.data;
                     if (json.access_token) {
-                        globalState.SetBufferMemory('BaiduToken', json.access_token, config.BufferMemoryTimeHigh);
+                        globalCache.set('BaiduToken', json.access_token, config.BufferMemoryTimeHigh);
                         return json.access_token;
                     }
                     return 0;

src/api/phonics/phonicsController.js

@@ -4,10 +4,11 @@ import phonics from '../../model/phonics.js';
 import config from '../../config/index.js';
 import _ from 'lodash';
 import axios from 'axios';
-import { getBufferMemory, setBufferMemory } from '../../util/bufferMemory.js';
 import { Encrypt, Decrypt } from '../../util/crypto/index.js';
 import { stringUtils } from '../../util/stringClass.js';
 import WXBizDataCrypt from '../../util/WXBizDataCrypt.js';
+import { globalCache } from '../../util/GlobalCache.js';
+
 
 export async function PhonicsLogin(ctx) {
     let param = ctx.request.body;
@@ -296,7 +297,7 @@ export async function GetPhonicsAll(ctx) {
     const updateTime = moment(updateTimeList[4].UpdateTime).format('YYYY.MM.DD HH:mm:ss');
     //console.log(updateTime);
     if (param.UpdateTime != updateTime) {
-        let result = getBufferMemory("GetPhonicsAll");
+        let result = globalCache.get("GetPhonicsAll");
         if (result == 0) {
             //const arr = phonics.GetPhonicsAll();
             //for (let i = 0; i < arr.length; i++) {
@@ -307,7 +308,7 @@ export async function GetPhonicsAll(ctx) {
             const arrTemp = await phonics.GetPhonicsAllSql();
             const arr = [];
             let temp;
-            const cards = [];
+            let cards = [];
             for (let i = 0; i < arrTemp.length; i++) {
                 const item = arrTemp[i];
                 if (i > 0 && ((temp.Title + temp.Soundmark) != (item.Title + item.Soundmark) || i == arrTemp.length - 1)) {
@@ -328,7 +329,7 @@ export async function GetPhonicsAll(ctx) {
                         "Cards": cards,
                     }
                     arr.push(obj);
-                    cards.length = 0;
+                    cards = [];
                 }
                 cards.push(item.Word);
                 temp = item;
@@ -337,7 +338,7 @@ export async function GetPhonicsAll(ctx) {
             result = JSON.stringify(arr);
             result = Encrypt(result, config.urlSecrets.aes_key, config.urlSecrets.aes_iv);
 
-            setBufferMemory("GetPhonicsAll", result, config.BufferMemoryTimeHigh);
+            globalCache.set("GetPhonicsAll", result, config.BufferMemoryTimeHigh);
             console.log("缓存");
         }
 

src/app.js

@@ -8,10 +8,8 @@ import mpsRouter from './api/mps/routes.js';
 import phonicsRouter from './api/phonics/routes.js';
 import commonRouter from './api/common/routes.js';
 import { decryptUrlMiddle } from './util/crypto/index.js';
-import { globalState } from './util/globalState.js';
 import { stringUtils } from './util/stringClass.js';
 
-// 全局状态已移至globalState模块
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
 const app = new Koa();
@@ -33,16 +31,15 @@ app.use(async (ctx, next) => {
     }
 });
 
-// 注意：multer 中间件应该在具体的路由中使用，而不是全局使用
-// 例如：router.post('/upload', upload.single('file'), async (ctx) => { ... })
 
 app.use(decryptUrlMiddle());
 
 // 注册路由
-app.use(mpsRouter.routes());
-app.use(mpsRouter.allowedMethods());
+
 app.use(commonRouter.routes());
 app.use(commonRouter.allowedMethods());
+app.use(mpsRouter.routes());
+app.use(mpsRouter.allowedMethods());
 app.use(phonicsRouter.routes());
 app.use(phonicsRouter.allowedMethods());
 

src/util/GlobalCache.js

@@ -0,0 +1,122 @@
+import EventEmitter from 'events';
+
+/**
+ * 全局缓存类
+ * 使用单例模式实现的带过期时间的键值对存储
+ */
+class GlobalCache extends EventEmitter {
+    constructor() {
+        super();
+        if (GlobalCache.instance) {
+            return GlobalCache.instance;
+        }
+        
+        // 存储数据的 Map
+        this.cache = new Map();
+        // 存储定时器的 Map
+        this.timers = new Map();
+        
+        GlobalCache.instance = this;
+    }
+
+    /**
+     * 设置缓存值
+     * @param {string} key - 键
+     * @param {*} value - 值
+     * @param {number} [expireTime=0] - 过期时间（秒），0表示永不过期
+     * @returns {*} 设置的值
+     */
+    set(key, value, expireTime = 0) {
+        if (typeof key !== 'string') {
+            throw new Error('Key must be a string');
+        }
+
+        // 如果该key已存在，清除之前的定时器
+        if (this.timers.has(key)) {
+            clearTimeout(this.timers.get(key));
+            this.timers.delete(key);
+        }
+
+        // 存储值
+        this.cache.set(key, value);
+
+        // 如果设置了过期时间
+        if (expireTime > 0) {
+            const timer = setTimeout(() => {
+                this.delete(key);
+                this.emit('expired', key); // 触发过期事件
+            }, expireTime * 1000);
+
+            // 存储定时器
+            this.timers.set(key, timer);
+        }
+
+        return value;
+    }
+
+    /**
+     * 获取缓存值
+     * @param {string} key - 键
+     * @returns {*} 值，如果不存在或已过期返回null
+     */
+    get(key) {
+        if (typeof key !== 'string') {
+            throw new Error('Key must be a string');
+        }
+
+        return this.cache.has(key) ? this.cache.get(key) : 0;
+    }
+
+    /**
+     * 删除缓存值
+     * @param {string} key - 键
+     * @returns {boolean} 是否成功删除
+     */
+    delete(key) {
+        if (this.timers.has(key)) {
+            clearTimeout(this.timers.get(key));
+            this.timers.delete(key);
+        }
+        return this.cache.delete(key);
+    }
+
+    /**
+     * 清除所有缓存
+     */
+    clear() {
+        // 清除所有定时器
+        for (const timer of this.timers.values()) {
+            clearTimeout(timer);
+        }
+        this.timers.clear();
+        this.cache.clear();
+    }
+
+    /**
+     * 获取所有缓存的键
+     * @returns {string[]} 键数组
+     */
+    keys() {
+        return Array.from(this.cache.keys());
+    }
+
+    /**
+     * 获取缓存数量
+     * @returns {number} 缓存数量
+     */
+    size() {
+        return this.cache.size;
+    }
+
+    /**
+     * 检查键是否存在
+     * @param {string} key - 键
+     * @returns {boolean} 是否存在
+     */
+    has(key) {
+        return this.cache.has(key);
+    }
+}
+
+// 导出单例实例
+export const globalCache = new GlobalCache();

src/util/bufferMemory.js

@@ -1,32 +0,0 @@
-import moment from 'moment';
-import { globalState } from './globalState.js';
-
-export const getBufferMemory = (key) => {
-    //console.log("GetBufferMemory:"+key);
-    const value = globalState.getBufferMemory().getValue(key);
-
-    if (value) {
-        const a = moment(value.time);
-        const b = moment();
-        const interval = b.diff(a, 'seconds');
-        //console.log(key+":"+interval);
-        if (interval < value.duration) {
-            return value.value;
-        }
-        return 0;
-    }
-    return 0;
-};
-
-export const setBufferMemory = (key, value, duration = 5) => {
-    //console.log("SetBufferMemory:"+key);
-    const obj = {
-        time: new Date(),
-        value,
-        duration,
-    };
-
-    globalState.getBufferMemory().add(key, obj);
-
-    return value;
-}

src/util/globalState.js

@@ -1,26 +0,0 @@
-import { stringUtils } from './stringClass.js';
-
-// 使用单例模式创建一个全局状态管理器
-class GlobalState {
-    constructor() {
-        this.htBufferMemory = new stringUtils.HashTable();
-    }
-
-    // 获取指定key的值
-    getBufferMemory(key) {
-        return this.htBufferMemory.getValue(key) || 0;
-    }
-
-    // 设置指定key的值，可选过期时间
-    SetBufferMemory(key, value, expireTime = null) {
-        this.htBufferMemory.add(key, value);
-        if (expireTime) {
-            setTimeout(() => {
-                this.htBufferMemory.remove(key);
-            }, expireTime);
-        }
-    }
-}
-
-// 导出单例实例
-export const globalState = new GlobalState();