0

src/api/mathcalculate/mathController.js

@@ -12,6 +12,7 @@ import constantClass from '../../util/constant/index.js';
 import fs from 'fs';
 import { promises as fsPromises } from 'fs';
 import COS from 'cos-nodejs-sdk-v5';
+import { computeMath } from '../questionTypes/questionTypesController.js';
 
 export async function MathLogin(ctx) {
     let param = ctx.request.body;
@@ -671,7 +672,7 @@ function getQuestionTypeInfo(item) {
     }
     //得到随机数
     function getNumber(arr) {
-        let rnd = common.random(0, arr.length - 1);
+        let rnd = stringUtils.Random(0, arr.length - 1);
         return arr[rnd];
     }
 
@@ -713,4 +714,4 @@ function getQuestionTypeInfo(item) {
 
         return result;
     }
-}
+}

src/api/mps/mpsCommonController.js

@@ -9,6 +9,7 @@ import _ from 'lodash';
 import axios from 'axios';
 import { stringUtils } from '../../util/stringClass.js';
 import { Encrypt, Decrypt } from '../../util/crypto/index.js';
+import WXBizDataCrypt from '../../util/WXBizDataCrypt.js';
 
 /**
  * 分数线网页首页
@@ -1598,4 +1599,4 @@ function buildWish(item, wishType) {
 
 export async function Ping(ctx) {
     ctx.body = { errcode: 10000 };
-}
+}

src/api/pinyin/pinyinController.js

@@ -8,6 +8,7 @@ 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';
+import constantClass from '../../util/constant/index.js';
 
 export async function PinyinLogin(ctx) {
     let param = ctx.request.body;
@@ -481,4 +482,4 @@ export async function GetPinyinUnitWords(ctx) {
     }
 
     ctx.body = {"errcode": 10000, result: result};
-}
+}

src/api/questionTypes/questionTypesController.js

@@ -606,7 +606,7 @@ export async function MakeQuestionTypeWXACode(ctx) {
     ctx.body = { errcode: 10000, result: 0 };
 }
 
-function computeMath(questionType) {
+export function computeMath(questionType) {
     var result;
     switch (questionType.OperateAB) {
         case "+":

src/api/score/scoreController.js

@@ -392,7 +392,7 @@ export async function AddScore2(ctx) {
         }
     }
     if (!RankList) RankList = [];
-    ctx.body = { errcode: 10000, result: { Points: points, CurrentRank, HistoryRank: historyRank, MinDuration, PracticeNumber: practiceNumber, IsScoreRecord, IsTimeRecord, MakeProgress: makeProgress, RankList, ScoreID: scoreInfo.insertId } };
+    ctx.body = { errcode: 10000, result: { Points: points, CurrentRank, HistoryRank: historyRank, MinDuration, PracticeNumber: practiceNumber, IsScoreRecord: isScoreRecord, IsTimeRecord: isTimeRecord, MakeProgress: makeProgress, RankList, ScoreID: scoreInfo.insertId } };
 }
 
 export async function AddScore2Intensify(ctx) {
@@ -591,7 +591,7 @@ export async function AddScore3(ctx) {
     }
     if (!RankList) RankList = [];
     if (MinDuration == 999999) MinDuration = param.Duration;
-    ctx.body = { errcode: 10000, result: { Points: points, CurrentRank, MinDuration, PracticeNumber: practiceNumber, IsScoreRecord, IsTimeRecord, RankList, PersonNumber24Hours, CurrentRankRate, GoldCoinAll, MaxPoints, PointTotal, SpeedLevel, IsPointLevel, IsSpeedLevel, ScoreID: scoreResult.insertId } };
+    ctx.body = { errcode: 10000, result: { Points: points, CurrentRank, MinDuration, PracticeNumber: practiceNumber, IsScoreRecord: isScoreRecord, IsTimeRecord: isTimeRecord, RankList, PersonNumber24Hours, CurrentRankRate, GoldCoinAll, MaxPoints, PointTotal, SpeedLevel, IsPointLevel: isPointLevel, IsSpeedLevel: isSpeedLevel, ScoreID: scoreResult.insertId } };
 }
 
 export async function AddScore3Intensify(ctx) {

src/api/users/userAllController.js

@@ -269,8 +269,9 @@ export async function SendRemind(ctx) {
   }
 
   let result;
+  let token;
   try {
-    const token = await getWxAccessToken(appid, appsecret);
+    token = await getWxAccessToken(appid, appsecret);
     result = { errcode: 10000 };
   } catch (err) {
     result = { errcode: 101, errStr: err.message };

src/model/yjbdc.js

@@ -120,7 +120,7 @@ class YJBDC {
             const sql = "INSERT INTO YJBDC_OCRs SET ?";
             return await query(sql, [obj]);
         } catch (error) {
-            onsole.error('添加OCR失败:', error);
+            console.error('添加OCR失败:', error);
             throw error;
         }
     }
@@ -203,4 +203,4 @@ class YJBDC {
 
 }
 
-export default YJBDC;
+export default YJBDC;

src/util/WXBizDataCrypt.js

@@ -16,12 +16,13 @@ class WXBizDataCrypt {
     encryptedData = Buffer.from(encryptedData, 'base64');
     iv = Buffer.from(iv, 'base64');
 
+    let decoded;
     try {
       // 解密
       const decipher = crypto.createDecipheriv('aes-128-cbc', sessionKey, iv);
       // 设置自动 padding 为 true，删除填充补位
       decipher.setAutoPadding(true);
-      let decoded = decipher.update(encryptedData, 'binary', 'utf8');
+      decoded = decipher.update(encryptedData, 'binary', 'utf8');
       decoded += decipher.final('utf8');
       
       decoded = JSON.parse(decoded);
@@ -38,4 +39,4 @@ class WXBizDataCrypt {
   }
 }
 
-export default WXBizDataCrypt;
+export default WXBizDataCrypt;

src/util/constant/index.js

@@ -3644,6 +3644,7 @@ export default {
         return List;
     },
     getEnglishLetter: function (letter) {
+        const word = String(letter || "").toUpperCase();
         switch (letter) {
             case "A":
             case "a":