06051000

package.json

@@ -35,7 +35,6 @@
     "moment": "^2.30.1",
     "multer": "^1.4.5-lts.1",
     "mysql2": "^3.14.1",
-    "request": "^2.88.2",
     "request-promise": "^4.2.6"
   },
   "devDependencies": {

src/api/mps/mpsSchoolController.js

@@ -34,7 +34,7 @@ export async function GetMPSSchool(ctx) {
         const cacheKey = `GetMPSSchool?SchoolType1=${param.SchoolType1}&DistrictID=${param.DistrictID}&SelectType=${param.SelectType}&Key=${param.Key}&RowCount=${param.RowCount}&Usage=${param.Usage}`;
 
         // 尝试从缓存获取
-        let cachedData = await BufferMemoryClass.get({ KeyName: cacheKey });
+        let cachedData = await BufferMemoryClass.get(cacheKey);
         let result;
 
         if (!cachedData || cachedData.length === 0) {
@@ -167,7 +167,7 @@ export async function GetMPSSchoolInfo (ctx) {
 
     let info={};
 
-    let list = await BufferMemoryClass.get({KeyName:url});
+    let list = await BufferMemoryClass.get(url);
 
     if (process.env.NODE_ENV == 'development')
         list=[];

src/api/mps/mpsScoreController.js

@@ -69,7 +69,7 @@ export async function GetMPSDistrictPersonNum(ctx) {
 
     const url = "GetMPSDistrictPersonNum?DistrictID=" + param.DistrictID;
 
-    let info = await BufferMemoryClass.get({ KeyName: url });
+    let info = await BufferMemoryClass.get(url);
 
     if (process.env.NODE_ENV == 'development')
         info = [];
@@ -126,10 +126,10 @@ export async function GetMPSCityPersonNum(ctx) {
 
     const url = "GetMPSCityPersonNum";
 
-    let info = await BufferMemoryClass.get({ KeyName: url });
+    let info = await BufferMemoryClass.get(url);
 
-    if (process.env.NODE_ENV == 'development')
-        info = [];
+    // if (process.env.NODE_ENV == 'development')
+    //     info = [];
 
     if (!info || info.length == 0) {
         const year2 = Number(param.Year) - 1;
@@ -184,7 +184,7 @@ export async function GetMPSScore(ctx) {
 
     var url="GetMPSScore?ScoreYear="+param.ScoreYear+"&ScoreType="+param.ScoreType+"&DistrictID="+param.DistrictID;
 
-    var list = await BufferMemoryClass.get({KeyName:url});
+    var list = await BufferMemoryClass.get(url);
 
     if (process.env.NODE_ENV == 'development')
         list=[];

src/api/mps/routes.js

@@ -9,6 +9,7 @@ const router = new Router();
 // 页面路由
 router.get('/api/Ping',mpsCommonController.Ping);
 router.get('/',mpsCommonController.MPSDefault);
+router.get('/mgfsx',mpsCommonController.MPSDefault);
 router.get('/mps',mpsCommonController.WebMPSHtml);
 router.get('/mpserror',mpsCommonController.WebMPSErrorHtml);
 router.get('/mpsschool',mpsCommonController.WebMPSSchoolHtml);

src/api/phonics/phonicsController.js

@@ -0,0 +1,437 @@
+import moment from 'moment';
+import dataUpdateStatus from '../../model/dataUpdateStatus.js';
+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';
+
+export async function PhonicsLogin(ctx) {
+    let param = ctx.request.body;
+    if (param.param) {
+        const paramStr = Decrypt(param.param, config.urlSecrets.aes_key, config.urlSecrets.aes_iv);
+        //console.log("paramStr:"+paramStr);
+        param = JSON.parse(paramStr);
+    }
+    const code = param.Code;
+    //console.log("code:"+code);
+    const url = `https://api.weixin.qq.com/sns/jscode2session?appid=${config.wx.phonics_appid}&secret=${config.wx.phonics_appsecret}&js_code=${code}&grant_type=authorization_code`;
+
+    let result = await axios.get(url)
+        .then(res => {
+            const json = res.data;
+            //console.log("json:"+json);
+            if (json && json.openid) {
+                param.OpenID = json.openid;
+                param.sessionKey = json.session_key;
+                if (json.unionid)
+                    param.UnionID = json.unionid;
+                return {errcode: 10000};
+            }
+            else {
+                return json;
+            }
+        })
+        .catch(err => {
+            return {errcode: 101, errStr: err};
+        });
+
+    if (result.errcode == 10000) {
+        delete param.Code;
+        if (param.sessionKey && param.iv && param.encryptedData){
+            //console.log("param.sessionKey:"+param.sessionKey);
+            const pc = new WXBizDataCrypt(config.wx.phonics_appid, param.sessionKey);
+            const dataUnionID = pc.decryptData(param.encryptedData , param.iv);
+            //console.log(dataUnionID);
+            param.UnionID = dataUnionID.unionId;
+        }
+
+        delete param.sessionKey;
+        delete param.iv;
+        delete param.encryptedData;
+
+        //todo
+        //param.OpenID="o4UHq4gaNlHfdTWxgl3fTgC1mFsI";
+
+        let userList = await phonics.GetUsersInfo(param);
+        if (userList.length > 0) {
+            param.LastLoginTime = new Date();
+            const time1 = moment(userList[0].ProductServiceTime).format('YYYY-MM-DD HH:mm:ss');
+            const time3 = moment().format('YYYY-MM-DD HH:mm:ss');
+            if (time1 < time3)
+                param.IsMember = 0;
+
+            delete param.Introducer;
+            delete param.UserSource;
+            delete param.SourceID;
+            //console.log(param.NickName);
+            if (param.NickName == "陌生用户") {
+                delete param.NickName;
+                delete param.AvatarUrl;
+                delete param.Language;
+                delete param.Gender;
+                delete param.City;
+                delete param.Province;
+                delete param.Country;
+            }
+
+            await phonics.UpdateUsers(param);
+            userList = await phonics.GetUsersInfo(param);
+        }
+        else {
+            param.NickName = "陌生用户";
+            param.AvatarUrl = "../images/userface_default.png";
+            param.CreateTime = new Date();
+            param.LastLoginTime = param.CreateTime;
+            param.ProductServiceTime = param.CreateTime;
+            const inseredID = await phonics.AddUsers(param);
+            userList = await phonics.GetUsersInfo(param);
+        }
+
+        delete userList[0].OpenID;
+        delete userList[0].UnionID;
+
+        result = {errcode: 10000, result: userList[0]};
+    }
+
+    ctx.body = result;
+}
+
+//新增自然拼读记录
+export async function AddPhonicsRecord(ctx) {
+    const param = ctx.request.body;
+    const inseredID = await phonics.AddPhonicsRecord(param);
+
+    ctx.body = {errcode: 10000, result: inseredID};
+}
+
+//更新自然拼读记录
+export async function UpdatePhonicsRecord(ctx) {
+    const param = ctx.request.body;
+    if (param.Content) {
+        param.Content = param.Content.replace(",undefined", "");
+    }
+    await phonics.UpdatePhonicsRecord(param);
+    ctx.body = {errcode: 10000};
+}
+
+//得到用户记录
+export async function GetPhonicsRecordData(ctx) {
+    const param = {
+        UserID: ctx.query.UserID || 0,
+        Version: ctx.query.Version || "1.0.0",
+    };
+    if (param.UserID === "undefined")
+        param.UserID = 0;
+
+    const result = await phonics.GetPhonicsRecordData(param);
+
+    if (param.UserID > 0 && result && result.length > 0) {
+        const userList = await phonics.GetUsersInfoByUserID(param);
+
+        //是否是首日
+        const timeCreateTime = moment(userList[0].CreateTime).format('YYYYMMDD');
+        const timeToday = moment().format('YYYYMMDD');
+        result[0].IsFirstDay = timeCreateTime === timeToday;
+
+        //得到分享新增用户数
+        let productServiceTime = moment(userList[0].ProductServiceTime).format('YYYYMMDD');
+        if (productServiceTime === "20991231") {
+            result[0].NewUserNumber = 999999;
+        } else {
+            const newUserNumber = await phonics.GetNewUserByUserID(param);
+            if (newUserNumber) {
+                result[0].NewUserNumber = newUserNumber.length;
+                //console.log("userList[0].ActivityTime:"+userList[0].ActivityTime);
+
+                productServiceTime = moment(userList[0].ProductServiceTime).format('YYYYMMDD');
+                const currentTime = moment().format('YYYYMMDD');
+
+                //如果推荐用户数超过6个，就改为增加3个月
+                if (newUserNumber.length >= 6 && !userList[0].ActivityTime && productServiceTime >= currentTime) {
+                    const obj = {
+                        ActivityTime: moment().format('YYYY-MM-DD HH:mm:ss'),
+                        ProductServiceTime: moment(userList[0].ProductServiceTime).add(1, 'months').format('YYYY-MM-DD HH:mm:ss'),
+                        OpenID: userList[0].OpenID,
+                    };
+                    await phonics.UpdateUsers(obj);
+                    result[0].NewUserNumber = 999999;
+                }
+            }
+        }
+
+        result[0].IsMember = userList[0].IsMember;
+
+        if (productServiceTime < timeToday)
+            result[0].IsMember = 0;
+
+        const result2 = await phonics.GetPhonicsFinishedDataCount(param);
+
+        if (result2)
+            result[0].FinishedCount = result2[0].count;
+
+        const list2 = await phonics.GetPhonicsReviewList(param);
+        if (list2)
+            result[0].ReviewList = list2;
+
+        result[0].TestScoreMax = 0;
+        const list3 = await phonics.GetPhonicsTestScoreMax(param);
+        if (list3 && list3.length > 0)
+            result[0].TestScoreMax = list3[0].Score;
+
+        const param2 = {
+            ProgramID: 99,
+            Version: param.Version,
+        };
+        const result3 = await dataUpdateStatus.GetProductVersionList(param2);
+        if (result3) {
+            if ((param.Version === result3[0].Version && result3[0].IsShowPay <= 0)
+                || param.Version > result3[0].Version) {
+                result[0].IsShow = result3[0].IsShowPay;
+            } else {
+                result[0].IsShow = 1;
+            }
+
+            //针对iphone测试用户，永远是无支付状态
+            if (userList[0].Brand === 'iPhone' && userList[0].WXLanguage === 'en-US'
+                && userList[0].UserSource === '1001' && userList[0].IsPay === 0) {
+                result[0].IsShow = 0;
+            }
+        }
+
+        ctx.body = {"errcode": 10000, result: result[0]};
+    } else
+        ctx.body = {"errcode": 10000};
+}
+
+//得到文章列表
+export async function GetArticles(ctx) {
+    const param = {
+        IsAll: ctx.query.IsAll || 0,
+    };
+    const result = await phonics.GetArticles(param);
+    if (result && result.length > 0) {
+        for (let i = 0; i < result.length; i++) {
+            result[i].IsLocked = false;
+            if (i > 2)
+                result[i].IsLocked = true;
+        }
+        ctx.body = {"errcode": 10000, result: result};
+    }
+    else
+        ctx.body = {"errcode": 10000};
+}
+
+//得到文章信息
+export async function GetArticleInfo(ctx) {
+    const param = {
+        ID: ctx.query.ID || 0,
+        UserID: ctx.query.UserID || 0,
+    };
+    if (param.UserID === "undefined")
+        param.UserID = 0;
+
+    const result = await phonics.GetArticles(param);
+    if (result && result.length > 0) {
+        const info = result[0];
+        info.Content = stringUtils.ReplaceAllString(info.Content, "\r", " ");
+        info.Content = stringUtils.ReplaceAllString(info.Content, "\n", " ");
+        //info.Content = stringUtils.ReplaceAllString(info.Content,".\"",".\" ");
+        ctx.body = {"errcode": 10000, result: info};
+    }
+    else
+        ctx.body = {"errcode": 10000};
+}
+
+//新增或删除自然拼读完成结果
+export async function UpdatePhonicsFinished(ctx) {
+    const param = ctx.request.body;
+    if (param.Style === "undefined")
+        param.Style = "";
+    if (param.IsFinished) {
+        delete param.IsFinished;
+        if (param.UserID && param.Title) {
+            if (param.Category === "basic" || param.Category === "intermediate")
+                param.Category = "all";
+            await phonics.AddPhonicsFinished(param);
+        }
+    }
+    else {
+        delete param.IsFinished;
+        if (param.UserID) {
+            await phonics.DeletePhonicsFinished(param);
+        }
+    }
+    ctx.body = {errcode: 10000};
+}
+
+//得到用户完成记录
+export async function GetPhonicsFinishedData(ctx) {
+    const param = {
+        UserID: ctx.query.UserID || 0,
+        Category: ctx.query.Category || 0,
+    };
+    if (param.UserID === "undefined")
+        param.UserID = 0;
+
+    if (param.Category === "basic" || param.Category === "intermediate")
+        param.Category = "all";
+    const result = await phonics.GetPhonicsFinishedData(param);
+    if (result && result.length > 0)
+        ctx.body = {"errcode": 10000, result: result};
+    else
+        ctx.body = {"errcode": 10000};
+}
+
+//得到全部自然拼读数据
+export async function GetPhonicsAll(ctx) {
+    const param = {
+        UpdateTime: ctx.query.UpdateTime,
+    };
+
+    const updateTimeList = await dataUpdateStatus.GetDataUpdateStatus();
+    const updateTime = moment(updateTimeList[4].UpdateTime).format('YYYY.MM.DD HH:mm:ss');
+    //console.log(updateTime);
+    if (param.UpdateTime != updateTime) {
+        let result = getBufferMemory("GetPhonicsAll");
+        if (result == 0) {
+            //const arr = phonics.GetPhonicsAll();
+            //for (let i = 0; i < arr.length; i++) {
+            //    const item = arr[i];
+            //    item.Style=item.Soundmark;
+            //}
+
+            const arrTemp = await phonics.GetPhonicsAllSql();
+            const arr = [];
+            let temp;
+            const 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)) {
+                    const islocked = temp.IsLocked == 1;
+
+                    if (i == arrTemp.length - 1)
+                        cards.push(item.Word);
+
+                    const obj = {
+                        "Title": temp.Title,
+                        "Category": temp.Category,
+                        "Category2": temp.Category2,
+                        "Soundmark": temp.Soundmark,
+                        "Style": temp.Soundmark,
+                        "Example": temp.Example,
+                        "IsLocked": islocked,
+                        "Level": temp.Level,
+                        "Cards": cards,
+                    }
+                    arr.push(obj);
+                    cards.length = 0;
+                }
+                cards.push(item.Word);
+                temp = item;
+            }
+
+            result = JSON.stringify(arr);
+            result = Encrypt(result, config.urlSecrets.aes_key, config.urlSecrets.aes_iv);
+
+            setBufferMemory("GetPhonicsAll", result, config.BufferMemoryTimeHigh);
+            console.log("缓存");
+        }
+
+        const obj = {
+            List: result,
+            UpdateTime: updateTime
+        }
+
+        ctx.body = {"errcode": 10000, result: obj};
+    }
+    else {
+        ctx.body = {"errcode": 10000};
+    }
+}
+
+//新增自然拼读复习记录
+export async function UpdatePhonicsReview(ctx) {
+    const param = ctx.request.body;
+    if (param.Status === "add") {
+        delete param.Status;
+        if (param.UserID && param.Word) {
+            await phonics.AddPhonicsReview(param);
+        }
+    }
+    else if (param.Status === "delete") {
+        delete param.Status;
+        if (param.UserID && param.Word) {
+            await phonics.DeletePhonicsReview(param);
+        }
+    }
+
+    ctx.body = {errcode: 10000};
+}
+
+//得到用户完成记录
+export async function GetPhonicsReviewList(ctx) {
+    const param = {
+        UserID: ctx.query.UserID || 0,
+    };
+    if (param.UserID === "undefined")
+        param.UserID = 0;
+
+    const result = await phonics.GetPhonicsReviewList(param);
+    if (result && result.length > 0)
+        ctx.body = {"errcode": 10000, result: result};
+    else
+        ctx.body = {"errcode": 10000, result: []};
+}
+
+//新增自然拼读测试得分记录
+export async function AddPhonicsTestScore(ctx) {
+    const param = {
+        UserID: ctx.query.UserID || 0,
+        Score: ctx.query.Score,
+    };
+    if (param.UserID === "undefined")
+        param.UserID = 0;
+
+    let result = {
+        MaxScore: param.Score,
+        IsRecord: 1,
+    };
+
+    const inseredID = await phonics.AddPhonicsTestScore(param);
+    let param2;
+
+    const list = await phonics.GetPhonicsTestScoreMax(param);
+    if (list && list.length > 0) {
+        if (list[0].Score < Number(param.Score)) {
+            param2 = {
+                ID: list[0].ID,
+                IsMax: 0,
+            };
+            await phonics.UpdatePhonicsTestScore(param2);
+            param2 = {
+                ID: inseredID.insertId,
+                IsMax: 1,
+            }
+            await phonics.UpdatePhonicsTestScore(param2);
+        }
+        else {
+            result = {
+                MaxScore: list[0].Score,
+                IsRecord: 0,
+            }
+        }
+    }
+    else {
+        param2 = {
+            ID: inseredID.insertId,
+            IsMax: 1,
+        }
+        await phonics.UpdatePhonicsTestScore(param2);
+    }
+
+    ctx.body = {errcode: 10000, result: result};
+}

src/api/phonics/routes.js

@@ -0,0 +1,20 @@
+import Router from 'koa-router';
+import * as phonics from './phonicsController.js';
+
+
+const router = new Router();
+//自然拼读
+router.post('/api/PhonicsLogin',phonics.PhonicsLogin);
+router.post('/api/AddPhonicsRecord',phonics.AddPhonicsRecord);
+router.post('/api/UpdatePhonicsRecord',phonics.UpdatePhonicsRecord);
+router.get('/api/GetPhonicsRecordData',phonics.GetPhonicsRecordData);
+router.get('/api/GetArticles',phonics.GetArticles);
+router.get('/api/GetArticleInfo',phonics.GetArticleInfo);
+router.post('/api/UpdatePhonicsFinished',phonics.UpdatePhonicsFinished);
+router.get('/api/GetPhonicsFinishedData',phonics.GetPhonicsFinishedData);
+router.get('/api/GetPhonicsAll',phonics.GetPhonicsAll);
+router.post('/api/UpdatePhonicsReview',phonics.UpdatePhonicsReview);
+router.get('/api/GetPhonicsReviewList',phonics.GetPhonicsReviewList);
+router.get('/api/AddPhonicsTestScore',phonics.AddPhonicsTestScore);
+
+export default router;

src/app.js

@@ -5,10 +5,13 @@ import path from 'path';
 import { fileURLToPath } from 'url';
 import config from './config/index.js';
 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();
@@ -40,6 +43,8 @@ app.use(mpsRouter.routes());
 app.use(mpsRouter.allowedMethods());
 app.use(commonRouter.routes());
 app.use(commonRouter.allowedMethods());
+app.use(phonicsRouter.routes());
+app.use(phonicsRouter.allowedMethods());
 
 // 启动服务器
 app.listen(config.port, () => {

src/config/prod.js

@@ -12,7 +12,6 @@ export default {
         aes_key: 'kylx365_chengjie',
         aes_iv: 'kylx365hongliren'
     },
-    port: process.env.PORT || 3030,
     fontsPathPingFang:"/usr/share/fonts/chinese/PingFang.ttc",
     fontsPathKaiti:"/usr/share/fonts/chinese/Kaiti.ttc",
     fontsPathSFUIDisplayBlack:"/usr/share/fonts/chinese/SF-UI-Display-Black.otf",

src/model/BufferMemoryClass.js

@@ -56,10 +56,10 @@ class BufferMemoryClass {
      * @returns {Promise} 包含查询结果的Promise
      */
     static async get(keyName) {
-        const sql = "SELECT * FROM BufferMemory WHERE KeyName = ? ORDER BY ID DESC LIMIT 1";
+        const sql = "SELECT * FROM BufferMemory WHERE KeyName = ? ORDER BY ID DESC LIMIT 1;";
         try {
             const result = await query(sql, [keyName]);
-            return result[0]; // 返回单个记录而不是数组
+            return result; // 返回单个记录而不是数组
         } catch (error) {
             console.error('Get operation failed:', error);
             throw error;

src/util/WXBizDataCrypt.js

@@ -0,0 +1,41 @@
+/**
+ * 微信小程序用户数据解密工具
+ */
+
+import crypto from 'crypto';
+
+class WXBizDataCrypt {
+  constructor(appId, sessionKey) {
+    this.appId = appId;
+    this.sessionKey = sessionKey;
+  }
+
+  decryptData(encryptedData, iv) {
+    // base64 decode
+    const sessionKey = Buffer.from(this.sessionKey, 'base64');
+    encryptedData = Buffer.from(encryptedData, 'base64');
+    iv = Buffer.from(iv, 'base64');
+
+    try {
+      // 解密
+      const decipher = crypto.createDecipheriv('aes-128-cbc', sessionKey, iv);
+      // 设置自动 padding 为 true，删除填充补位
+      decipher.setAutoPadding(true);
+      let decoded = decipher.update(encryptedData, 'binary', 'utf8');
+      decoded += decipher.final('utf8');
+      
+      decoded = JSON.parse(decoded);
+
+    } catch (err) {
+      throw new Error('Illegal Buffer');
+    }
+
+    if (decoded.watermark.appid !== this.appId) {
+      throw new Error('Illegal Buffer');
+    }
+
+    return decoded;
+  }
+}
+
+export default WXBizDataCrypt;

src/util/bufferMemory.js

@@ -1,8 +1,9 @@
 import moment from 'moment';
+import { globalState } from './globalState.js';
 
 export const getBufferMemory = (key) => {
     //console.log("GetBufferMemory:"+key);
-    const value = htBufferMemory.getValue(key);
+    const value = globalState.getBufferMemory().getValue(key);
 
     if (value) {
         const a = moment(value.time);
@@ -25,7 +26,7 @@ export const setBufferMemory = (key, value, duration = 5) => {
         duration,
     };
 
-    htBufferMemory.add(key, obj);
+    globalState.getBufferMemory().add(key, obj);
 
     return value;
 }

src/util/globalState.js

@@ -0,0 +1,16 @@
+import { stringUtils } from './stringClass.js';
+
+// 使用单例模式创建一个全局状态管理器
+class GlobalState {
+    constructor() {
+        this.htBufferMemory = new stringUtils.HashTable();
+    }
+
+    // 获取HashTable实例
+    getBufferMemory() {
+        return this.htBufferMemory;
+    }
+}
+
+// 导出单例实例
+export const globalState = new GlobalState();

src/util/stringClass.js

@@ -310,78 +310,80 @@ export const stringUtils = {
         }
     },
     //哈希表的类
-    HashTable() {
-        let size = 0;
-        let entry = {};
+    HashTable: class HashTable {
+        constructor() {
+            this.size = 0;
+            this.entry = {};
+        }
 
-        this.add = (key, value) => {
+        add(key, value) {
             if (!this.containsKey(key)) {
-                size++;
+                this.size++;
             }
-            entry[key] = value;
-        };
+            this.entry[key] = value;
+        }
 
-        this.update = (key, value) => {
+        update(key, value) {
             if (this.containsKey(key)) {
-                entry[key] = value;
+                this.entry[key] = value;
             }
-        };
+        }
 
-        this.getValue = (key) => {
-            return this.containsKey(key) ? entry[key] : null;
-        };
+        getValue(key) {
+            return this.containsKey(key) ? this.entry[key] : null;
+        }
 
-        this.remove = (key) => {
-            if (this.containsKey(key) && (delete entry[key])) {
-                size--;
+        remove(key) {
+            if (this.containsKey(key) && (delete this.entry[key])) {
+                this.size--;
             }
-        };
+        }
 
-        this.containsKey = (key) => {
-            return (key in entry);
-        };
+        containsKey(key) {
+            return (key in this.entry);
+        }
 
-        this.containsValue = (value) => {
-            for (const prop in entry) {
-                if (entry[prop] == value) {
+        containsValue(value) {
+            for (const prop in this.entry) {
+                if (this.entry[prop] == value) {
                     return true;
                 }
             }
             return false;
-        };
+        }
 
-        this.getValues = () => {
+        getValues() {
             const values = [];
-            for (const prop in entry) {
-                values.push(entry[prop]);
+            for (const prop in this.entry) {
+                values.push(this.entry[prop]);
             }
             return values;
-        };
+        }
 
-        this.getKeys = () => {
+        getKeys() {
             const keys = [];
-            for (const prop in entry) {
+            for (const prop in this.entry) {
                 keys.push(prop);
             }
             return keys;
-        };
+        }
 
-        this.getKeysAndValues = () => {
+        getKeysAndValues() {
             const keysValues = [];
-            for (const prop in entry) {
-                keysValues.push(prop + "###" + entry[prop]);
+            for (const prop in this.entry) {
+                keysValues.push(prop + "###" + this.entry[prop]);
             }
             return keysValues;
-        };
+        }
 
-        this.getSize = () => {
-            return size;
-        };
+        getSize() {
+            return this.size;
+        }
 
-        this.clear = () => {
-            size = 0;
-            entry = {};
-        };
+        clear() {
+            this.size = 0;
+            this.entry = {};
+        }
     },
     //将金额转换为格式化字符串(保留两位小数)
     FormatMoney: (money) => {