0

src/api/mps/mpsSchoolController.js

@@ -31,130 +31,137 @@ export async function GetMPSSchool(ctx) {
             RowCount: ctx.query.RowCount || 4,
         };
 
-        // 生成缓存键
-        const cacheKey = `GetMPSSchool?SchoolType1=${param.SchoolType1}&DistrictID=${param.DistrictID}&SelectType=${param.SelectType}&Key=${param.Key}&RowCount=${param.RowCount}&Usage=${param.Usage}`;
+        if (param.Key && !stringUtils.IsValidChineseNumberParentheses(param.Key)){
+            ctx.body = { errcode: 500, message: "获取学校列表失败" };
+        }
+        else{
 
-        // 尝试从缓存获取
-        let cachedData = await BufferMemoryClass.get(cacheKey);
-        let result;
+            // 生成缓存键
+            const cacheKey = `GetMPSSchool?SchoolType1=${param.SchoolType1}&DistrictID=${param.DistrictID}&SelectType=${param.SelectType}&Key=${param.Key}&RowCount=${param.RowCount}&Usage=${param.Usage}`;
 
-        if (!cachedData || cachedData.length === 0) {
-            param.District = getDistrict(Number(param.DistrictID));
-            
-            let sql="SELECT ID,SchoolFullName,SchoolShortName,SchoolOtherName,SchoolNumber,SchoolType1,SchoolType2," +
-            "SchoolType2Short,PublicOrPrivate,District,Address,Accommodation,Fees,ImageLogo,Pinyin,Coordinates " +
-            "FROM kylx365_db.MPS_School where Flag=0";
-            if (param.SchoolType1)
-                sql+=" and SchoolType1='"+param.SchoolType1+"' ";
-
-            if (param.Key) {
-                if (stringUtils.IsNumber(param.Key)){
-                    sql+=" and ID="+param.Key+";";
+            // 尝试从缓存获取
+            let cachedData = await BufferMemoryClass.get(cacheKey);
+            let result;
+
+            if (!cachedData || cachedData.length === 0) {
+                param.District = getDistrict(Number(param.DistrictID));
+                
+                let sql="SELECT ID,SchoolFullName,SchoolShortName,SchoolOtherName,SchoolNumber,SchoolType1,SchoolType2," +
+                "SchoolType2Short,PublicOrPrivate,District,Address,Accommodation,Fees,ImageLogo,Pinyin,Coordinates " +
+                "FROM kylx365_db.MPS_School where Flag=0";
+                if (param.SchoolType1)
+                    sql+=" and SchoolType1='"+param.SchoolType1+"' ";
+
+                if (param.Key) {
+                    if (stringUtils.IsNumber(param.Key)){
+                        sql+=" and ID="+param.Key+";";
+                    }
+                    else{
+                        sql += " and (SchoolFullName like '%" + param.Key + "%' or SchoolShortName like '%" + param.Key + "%' or SchoolOtherName like '%" + param.Key + "%' or SchoolNumber = '" + param.Key + "')"
+                        if (Number(param.RowCount)>0)
+                            sql+=" order by SchoolType1 desc,OrderID limit "+param.RowCount+";";
+                        else
+                            sql+=" order by SchoolType1 desc,OrderID;";
+                    }
+                    
                 }
                 else{
-                    sql += " and (SchoolFullName like '%" + param.Key + "%' or SchoolShortName like '%" + param.Key + "%' or SchoolOtherName like '%" + param.Key + "%' or SchoolNumber = '" + param.Key + "')"
-                    if (Number(param.RowCount)>0)
-                        sql+=" order by SchoolType1 desc,OrderID limit "+param.RowCount+";";
-                    else
-                        sql+=" order by SchoolType1 desc,OrderID;";
-                }
-                
-            }
-            else{
-                if (param.District)
-                    sql+=" and (District='"+param.District+"' or District='上海市')";
+                    if (param.District)
+                        sql+=" and (District='"+param.District+"' or District='上海市')";
 
-                if (param.SchoolType1=="高中")
-                    if (param.SchoolType2Short=="市重点")
-                        sql+=" order by ID;";
+                    if (param.SchoolType1=="高中")
+                        if (param.SchoolType2Short=="市重点")
+                            sql+=" order by ID;";
+                        else
+                            sql+=" order by CONVERT(SchoolFullName USING gbk);";
+                    else if (param.Usage=="web")
+                        sql+=" order by DistrictID,SchoolType2ShortID,ID;";
                     else
                         sql+=" order by CONVERT(SchoolFullName USING gbk);";
-                else if (param.Usage=="web")
-                    sql+=" order by DistrictID,SchoolType2ShortID,ID;";
-                else
-                    sql+=" order by CONVERT(SchoolFullName USING gbk);";
-            }
+                }
 
-            //console.log(sql);
-            
-            let list = await commonModel.RunSql({}, sql);
-
-            if (param.SelectType === "structure") {
-                let item=[];
-                item.push({Name:"市重点",List:[]});
-                item.push({Name:"区重点",List:[]});
-                item.push({Name:"一般高中",List:[]});
-                item.push({Name:"初中",List:[]});
-
-                for(let i=0;i<list.length;i++){
-                    if (list[i].SchoolType1=="初中"){
-                        item[3].List.push(list[i]);
-                    }
-                    else if (list[i].SchoolType2Short=="市重点"){
-                        if (list[i].District=="上海市") {
-                            if (list[i].SchoolShortName=="上海中学" && param.DistrictID=="2")
-                                item[0].List.push(list[i]);
-                            else if (list[i].SchoolShortName=="交大附中" && param.DistrictID=="7")
-                                item[0].List.push(list[i]);
-                            else if (list[i].SchoolShortName=="复旦附中" && param.DistrictID=="7")
-                                item[0].List.push(list[i]);
-                            else if (list[i].SchoolShortName=="华师二附" && param.DistrictID=="11")
-                                item[0].List.push(list[i]);
-                            else if (list[i].SchoolShortName=="上师附中" && param.DistrictID=="11")
-                                item[0].List.push(list[i]);
-                            else if (list[i].SchoolShortName=="上海实验" && param.DistrictID=="11")
-                                item[0].List.push(list[i]);
-                            else if (list[i].SchoolShortName=="上外附中" && param.DistrictID=="11")
-                                item[0].List.push(list[i]);
+                //console.log(sql);
+                
+                let list = await commonModel.RunSql({}, sql);
+
+                if (param.SelectType === "structure") {
+                    let item=[];
+                    item.push({Name:"市重点",List:[]});
+                    item.push({Name:"区重点",List:[]});
+                    item.push({Name:"一般高中",List:[]});
+                    item.push({Name:"初中",List:[]});
+
+                    for(let i=0;i<list.length;i++){
+                        if (list[i].SchoolType1=="初中"){
+                            item[3].List.push(list[i]);
+                        }
+                        else if (list[i].SchoolType2Short=="市重点"){
+                            if (list[i].District=="上海市") {
+                                if (list[i].SchoolShortName=="上海中学" && param.DistrictID=="2")
+                                    item[0].List.push(list[i]);
+                                else if (list[i].SchoolShortName=="交大附中" && param.DistrictID=="7")
+                                    item[0].List.push(list[i]);
+                                else if (list[i].SchoolShortName=="复旦附中" && param.DistrictID=="7")
+                                    item[0].List.push(list[i]);
+                                else if (list[i].SchoolShortName=="华师二附" && param.DistrictID=="11")
+                                    item[0].List.push(list[i]);
+                                else if (list[i].SchoolShortName=="上师附中" && param.DistrictID=="11")
+                                    item[0].List.push(list[i]);
+                                else if (list[i].SchoolShortName=="上海实验" && param.DistrictID=="11")
+                                    item[0].List.push(list[i]);
+                                else if (list[i].SchoolShortName=="上外附中" && param.DistrictID=="11")
+                                    item[0].List.push(list[i]);
 
+                            }
+                            else
+                                item[0].List.push(list[i]);
                         }
-                        else
-                            item[0].List.push(list[i]);
-                    }
-                    else if (list[i].SchoolType2Short=="一般高中"){
-                        if (list[i].District=="上海市") {
-                            if (list[i].SchoolShortName=="上科大附校" && param.DistrictID=="11")
+                        else if (list[i].SchoolType2Short=="一般高中"){
+                            if (list[i].District=="上海市") {
+                                if (list[i].SchoolShortName=="上科大附校" && param.DistrictID=="11")
+                                    item[2].List.push(list[i]);
+                            }
+                            else
                                 item[2].List.push(list[i]);
                         }
-                        else
-                            item[2].List.push(list[i]);
-                    }
-                    else {
-                        item[1].List.push(list[i]);
+                        else {
+                            item[1].List.push(list[i]);
+                        }
                     }
-                }
-                for (let j=0;j<4;j++) {
+                    for (let j=0;j<4;j++) {
 
-                    item[j].List=_.orderBy(item[j].List, ['Pinyin','SchoolFullName'], ['asc','asc']);
+                        item[j].List=_.orderBy(item[j].List, ['Pinyin','SchoolFullName'], ['asc','asc']);
 
-                    for (let i = 0; i < item[j].List.length; i++) {
-                        if (i > 0)
-                            item[j].List[i].Pinyin2 = item[j].List[i - 1].Pinyin;
-                        else
-                            item[j].List[i].Pinyin2 = "";
+                        for (let i = 0; i < item[j].List.length; i++) {
+                            if (i > 0)
+                                item[j].List[i].Pinyin2 = item[j].List[i - 1].Pinyin;
+                            else
+                                item[j].List[i].Pinyin2 = "";
+                        }
                     }
+                    result=item;
+
+                } else {
+                    result = list;
                 }
-                result=item;
 
+                // 缓存结果
+                await BufferMemoryClass.add({
+                    KeyName: cacheKey,
+                    ValueString: JSON.stringify(result)
+                });
+                //console.log("数据已缓存");
             } else {
-                result = list;
+                result = JSON.parse(cachedData[0].ValueString);
             }
 
-            // 缓存结果
-            await BufferMemoryClass.add({
-                KeyName: cacheKey,
-                ValueString: JSON.stringify(result)
-            });
-            //console.log("数据已缓存");
-        } else {
-            result = JSON.parse(cachedData[0].ValueString);
+            ctx.body = { errcode: 10000, result };
         }
-
-        ctx.body = { errcode: 10000, result };
     } catch (error) {
         console.error("获取学校列表失败:", error);
         ctx.body = { errcode: 500, message: "获取学校列表失败" };
     }
+    
 }
 
 

src/util/stringClass.js

@@ -539,6 +539,19 @@ export const stringUtils = {
         const ipv6Regex = /^([0-9a-fA-F]{1,4}:){7}[0-9a-fA-F]{1,4}$/;
         return ipv6Regex.test(ip);
     },
+    // 判断字符串是否只包含汉字、数字、大小写字母和全/半角小括号
+    IsValidChineseNumberParentheses: (str) => {
+        if (!str) return true; // 空字符串视为有效
+        // 匹配规则：
+        // [\u4e00-\u9fa5]: 匹配汉字
+        // 0-9: 匹配数字
+        // a-zA-Z: 匹配大小写字母
+        // (): 匹配半角小括号
+        // （）: 匹配全角小括号
+        const regex = /^[\u4e00-\u9fa5\da-zA-Z()（）]+$/;
+        return regex.test(str);
+    },
+
     // 获取客户端真实IP地址的通用函数
     GetClientIP: (ctx) => {
         // 检查所有可能的代理头

test-string-validation.js

@@ -0,0 +1,38 @@
+'use strict';
+import { stringUtils } from './src/util/stringClass.js';
+
+// 测试用例
+const testCases = [
+    { input: '你好123', expected: true, desc: '汉字和数字' },
+    { input: '测试(123)', expected: true, desc: '汉字、数字和半角括号' },
+    { input: '测试（456）', expected: true, desc: '汉字、数字和全角括号' },
+    { input: '测试(123)（456）', expected: true, desc: '混合使用全角和半角括号' },
+    { input: '', expected: true, desc: '空字符串' },
+    { input: '测试abc', expected: true, desc: '包含小写英文字母' },
+    { input: '测试ABC', expected: true, desc: '包含大写英文字母' },
+    { input: '测试aBC123', expected: true, desc: '混合大小写字母和数字' },
+    { input: 'Hello世界123', expected: true, desc: '混合英文、汉字和数字' },
+    { input: '测试123!', expected: false, desc: '包含特殊字符' },
+    { input: '测试[123]', expected: false, desc: '包含方括号' },
+    { input: '测试{123}', expected: false, desc: '包含花括号' },
+    { input: 'Test@123', expected: false, desc: '包含@符号' }
+];
+
+// 运行测试
+console.log('开始测试 IsValidChineseNumberParentheses 函数...');
+console.log('----------------------------------------');
+
+let passCount = 0;
+for (const test of testCases) {
+    const result = stringUtils.IsValidChineseNumberParentheses(test.input);
+    const passed = result === test.expected;
+    
+    console.log(`测试: ${test.desc}`);
+    console.log(`输入: "${test.input}"`);
+    console.log(`期望: ${test.expected}, 实际: ${result}, 结果: ${passed ? '通过' : '失败'}`);
+    console.log('----------------------------------------');
+    
+    if (passed) passCount++;
+}
+
+console.log(`测试完成: ${passCount}/${testCases.length} 通过`);