0

src/api/miaoguo/literacyController.js

@@ -0,0 +1,167 @@
+import moment from 'moment';
+import fs from 'fs';
+import { promises as fsPromises } from 'fs';
+import commonModel from '../../model/commonModel.js';
+import config from '../../config/index.js';
+import _ from 'lodash';
+import axios from 'axios';
+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';
+import aiController from '../../api/yjbdc/aiController.js';
+import miaoguo from '../../model/miaoguo.js';
+
+
+//获得加资料数据
+export async function GetMiaoguoAISearch(ctx) {
+    let param = {
+        UserID: ctx.query.UserID || "",
+        Word: ctx.query.Word || "",
+        Author: ctx.query.Author || "",
+        SearchType: ctx.query.SearchType || "",
+        ShiciUrl: ctx.query.ShiciUrl || "",
+    };
+
+    let isNew=false;
+    if (param.SearchType=="zici" && param.Word.indexOf(" [ ")>0 && param.Word.indexOf(" ] ")>0){
+        param.Word=param.Word.substring(0,param.Word.indexOf(" [ ")-1);
+    }
+
+    // 使用单词作为缓存键，为每个单词单独缓存结果
+    const cacheKey = `GetMiaoguoAISearch_${param.Word}_${param.SearchType}_${param.Author}_${param.ShiciUrl}`;
+    let result = globalCache.get(cacheKey);
+
+    if (!result) {
+        // 缓存未命中，从数据库获取
+        let literacyItem=await miaoguo.GetLiteracyItem(param);
+        if (literacyItem && literacyItem.length>0){
+            //console.log("Old Word");
+            //console.log("2:"+moment().format("mm:ss"));
+            for(let i=0;i<literacyItem.length;i++){
+                if (literacyItem[i].SearchType=="list"){
+                    literacyItem[0]=literacyItem[i];
+                    param.SearchType="list";
+                    break;
+                }
+            }
+            if (param.SearchType!="list" && literacyItem.length>0){
+                result=[];
+                param.SearchType="list";
+                for(let i=0;i<literacyItem.length;i++){
+                    let obj={};
+                    if (literacyItem[i].SearchType=="zici"){
+                        obj.Type="zici";
+                        obj.Key=param.Word;
+                        obj.TypeName="字词";
+                    }
+                    else if (literacyItem[i].SearchType=="eng"){
+                        obj.Type="eng";
+                        obj.Key=param.Word;
+                        obj.TypeName="翻译";
+                    }
+                    result.push(obj);
+                }
+            }
+
+            if (param.SearchType!="list"){
+                //console.log(literacyItem[0].JSONString);
+                literacyItem[0].JSONString=stringUtils.ReplaceAllString(literacyItem[0].JSONString,"&#x27;","ˈ");
+                
+                result=JSON.parse(literacyItem[0].JSONString);
+                //console.log("3:"+moment().format("mm:ss"));
+                //查找英语词频
+                if (!stringUtils.IsChineseSentence(param.Word)){
+                    param.Word=stringUtils.ReplaceAllString(param.Word,"'","ˈ");
+                    let sql ="select FinallyNum from WordFrequency where Word='"+param.Word+"';";
+                    //console.log(sql);
+                    let list=await commonModel.RunSql({},sql);
+                    let id=0;
+                    if (list && list.length>0)
+                        id=list[0].FinallyNum;
+                    if (id>0){
+                        result.ENG.WordFrequency=getWordFrequency(id);
+                    }
+
+                    let sql2 ="Select m.ID,m.Category,m.LibraryName1,m.LibraryName2,w.LessonID from Words w inner join MiaoguoBook m on w.BookID=m.BookIDOld where w.BookID in (191,192,193,194,195,196,197,198,205,206,207,208,209,210,211) and w.Word='"+param.Word+"';";
+                    //console.log(sql);
+                    let list2=await commonModel.RunSql({},sql2);
+                    let arrTemp=[];
+                    for(let i=0;i<list2.length;i++){
+                        let str ="知识包 英语 \\ "+ list2[i].LibraryName1+list2[i].LibraryName2+" \\ 单元词汇 \\ Unit "+list2[i].LessonID;
+                        
+                        arrTemp.push(str);
+                        //console.log(str);
+                    }
+                    if (result.ENG)
+                        result.ENG.Book=arrTemp;
+                }
+                //单个汉字，查找是否在人教版中
+                if (stringUtils.IsChineseSentence(param.Word) && param.Word.length==1){
+                    let sql = "select b.Name,u.Name as 'Name2' from HanziUnit u inner join HanziBook b on u.HanziBookID=b.ID where ((b.ID>=13 and b.ID<=24) or (b.ID>=61 and b.ID<=72)) and u.Example like '%"+param.Word+"%' order by b.Name;";
+                    //console.log(sql);
+                    let list=await commonModel.RunSql({},sql);
+                    if (list && list.length>0) {
+
+                        let arrTemp=[];
+                        for(let i=0;i<list.length;i++){
+                            let str = list[i].Name;
+                            let str2="写字";
+                            if (str.indexOf("识字")>0)
+                                str2="识字";
+                            str = str.replace("写字能力","");
+                            str = str.replace("识字能力","");
+                            let str3 ="知识包 语文 \\ "+ str+"学期 \\ "+str2+" \\ "+list[i].Name2;
+                            arrTemp.push(str3);
+                            //console.log(str);
+                        }
+                        if (result.CHN)
+                            result.CHN.Book=arrTemp;
+                    }
+                }
+            }
+            //console.log("4:"+moment().format("mm:ss"));
+            result={"errcode": 10000, result: result}
+        }
+        else{
+            console.log("New Word");
+            isNew=true;
+            //如果是英文单词
+            if ((stringUtils.IsEnglish(param.Word)) || param.SearchType!="eng"){
+            
+            }
+            //整句中是否有中文
+            else if ((stringUtils.IsChineseSentence(param.Word)) && param.SearchType!="eng") {
+            
+            }
+        }
+    }
+
+    
+
+    ctx.body = result;
+}
+
+function getWordFrequency(id){
+    var result={};
+    if (id==0){
+        result={Min:0,Max:0};
+    }
+    else if (id>0 && id<=220){
+        result={Min:1,Max:220};
+    }
+    else if (id<=2000){
+        var num=Math.floor(id/100)*100;
+        result={Min:num,Max:Number(num+100)};
+    }
+    else if (id<=10000){
+        var num=Math.floor(id/500)*500;
+        result={Min:num,Max:Number(num+500)};
+    }
+    else{
+        var num=Math.floor(id/1000)*1000;
+        result={Min:num,Max:Number(num+1000)};
+    }
+    return result;
+}

src/api/miaoguo/routes.js

@@ -0,0 +1,8 @@
+import Router from 'koa-router';
+import * as literacyController from './literacyController.js';
+
+const router = new Router();
+
+router.get('/api/GetMiaoguoAISearch',literacyController.GetMiaoguoAISearch);
+
+export default router;

src/api/yjbdc/aiController.js

@@ -494,8 +494,8 @@ class AIProviderFactory {
             case 'doubao-kimi-k2-250711':
                 return new VolcesAIProvider("kimi-k2-250711");
 
-            case 'ali-qwen-plus-2025-07-28':
-                return new AliyunAIProvider("qwen-plus-2025-07-28");
+            case 'ali-qwen-plus-2025-07-14':
+                return new AliyunAIProvider("qwen-plus-2025-07-14");
             case 'ali-qwen-max':
                 return new AliyunAIProvider("qwen-max");
             case 'llama-4-scout-17b-16e-instruct':

src/app.js

@@ -15,6 +15,7 @@ import yjbdcRouter from './api/yjbdc/routes.js';
 import phonicsRouter from './api/phonics/routes.js';
 import pinyinRouter from './api/pinyin/routes.js';
 import hanziRouter from './api/hanzi/routes.js';
+import miaoguoRouter from './api/miaoguo/routes.js';
 import mathcalculateRouter from './api/mathcalculate/routes.js';
 import webRouter from './api/web/routes.js';
 
@@ -84,6 +85,8 @@ app.use(webRouter.routes());
 app.use(webRouter.allowedMethods());
 app.use(yjbdcRouter.routes());
 app.use(yjbdcRouter.allowedMethods());
+app.use(miaoguoRouter.routes());
+app.use(miaoguoRouter.allowedMethods());
 
 
 // 启动服务器

src/model/miaoguo.js

@@ -0,0 +1,33 @@
+import { query } from '../util/db.js';
+import { stringUtils } from '../util/stringClass.js';
+
+/**
+ * Miaoguo 模型
+ */
+class Miaoguo {
+    
+    static async GetLiteracyItem(obj) {
+        try {
+            if (obj.ShiciUrl) {
+                sql="select * from MiaoguoLiteracy where Word=? and SearchType=? and Author=? and ShiciUrl=? order by ID;";
+                let param=[obj.Word,obj.SearchType,obj.Author,obj.ShiciUrl];
+                return await query(sql, param);
+            }
+            else {
+                let sql = "select * from MiaoguoLiteracy where Word='"+stringUtils.ReplaceAllString(obj.Word,"'","ˈ")+"'";
+                if (obj.SearchType)
+                    sql+=" and SearchType='"+stringUtils.ReplaceAllString(obj.SearchType,"'","''")+"'";
+                if (obj.Author)
+                    sql+=" and Author='"+stringUtils.ReplaceAllString(obj.Author,"'","''")+"'";
+                sql+=" order by ID;";
+                //console.log(sql);
+                return await query(sql, null);
+            }
+        } catch (error) {
+            console.error('获取列表失败:', error);
+            throw error;
+        }
+    }
+}
+
+export default Miaoguo;

src/test/build.test.js

@@ -1,3 +1,4 @@
+//通过AI生成英语单词释义或例句
 import commonModel from '../model/commonModel.js';
 import fs from 'fs';
 import { stringUtils } from '../util/stringClass.js';
@@ -16,7 +17,7 @@ async function runScript(){
 
         // 添加延时函数，确保每分钟只发送9次请求（约每6.67秒一次请求）
         const delay = (ms) => new Promise(resolve => setTimeout(resolve, ms));
-        const requestDelay = 100;
+        const requestDelay = 2000;
         
         for(let i=start;i<count;i++){
             let item=list[i];
@@ -48,8 +49,8 @@ async function runScript(){
 
             let aiProvider="llama-4-maverick-17b-128e-instruct";
 
-            //aiProvider="ali-qwen-plus";
-            aiProvider="ali-deepseek-v3";
+            aiProvider="ali-qwen-plus-2025-07-28";
+            //aiProvider="ali-deepseek-v3";
 
             //生成例句
             let result = await aiController.generateArticle(content, aiProvider);

src/test/build.test2.js

@@ -26,10 +26,10 @@ async function runScript(){
             let EnglishExplanation=item.EnglishExplanation;
             if (EnglishExplanation){
                 try{
-                    EnglishExplanation=JSON.parse(EnglishExplanation);
-                    // let sql2="update Words set EnglishExplanation=? where BookID<>110 and BookID not in (141,142,143,144,145,146,161,162,163,164,165,166,167,168) and Word='"+word+"';";
+                    //EnglishExplanation=JSON.parse(EnglishExplanation);
+                    let sql2="update Words set EnglishExplanation=? where BookID<>110 and BookID not in (141,142,143,144,145,146,161,162,163,164,165,166,167,168) and Word='"+word+"';";
                     // //console.log(sql2);
-                    // await commonModel.RunSql(item.ExampleSentence,sql2);
+                    await commonModel.RunSql(item.ExampleSentence,sql2);
                 }
                 catch(e){
                     let sql2="update Words set EnglishExplanation='' where ID="+id+";";
@@ -43,7 +43,7 @@ async function runScript(){
                 console.log( word +" 空");
                 process.exit(1);
             }
-            //console.log( i +"/"+ list.length);
+            console.log( i +"/"+ list.length);
             
             // 在每次请求后添加延时，除非是最后一个请求
             // if (i < count - 1) {

src/test/build.test3.js

@@ -7,13 +7,13 @@ async function runScript(){
     let id,word;
     try {
         
-        const sql="select * from Words where BookID=110 and ExampleSentence is not null order by ID;"
+        const sql="select * from Words where BookID=110 and ExampleSentence<>'' order by ID;"
         let list = await commonModel.RunSql(null,sql);
         let count=list.length;
 
         const start=0;
         //const start=0;
-        //count=1;
+        //count=10;
 
         // 添加延时函数，确保每分钟只发送9次请求（约每6.67秒一次请求）
         // const delay = (ms ) => new Promise(resolve => setTimeout(resolve, ms));
@@ -25,10 +25,10 @@ async function runScript(){
             id=item.ID;
             //获得单词
             word=item.Word;
-            let exampleSentence=item.ExampleSentence;
-            if (exampleSentence){
+            let EnglishExplanation=item.EnglishExplanation;
+            if (EnglishExplanation){
                 try{
-                    exampleSentence=JSON.parse(exampleSentence);
+                    EnglishExplanation=JSON.parse(EnglishExplanation);
                     //console.log(exampleSentence);
                     let sql2="select * from MiaoguoLiteracy where Word='"+word+"';";
                     let list2= await commonModel.RunSql(null,sql2);
@@ -40,53 +40,78 @@ async function runScript(){
 
                         //console.log(json);
                         if (json.ENG 
-                            && json.ENG.ExamplesSentences 
-                            && json.ENG.ExamplesSentences.length>0 
-                            && json.ENG.ExamplesSentences[0][0].indexOf("[线]")<0 
+                            && (!json.ENG.ParaphraseEng 
+                            || json.ENG.ParaphraseEng.length==0)
                         ){
-                            console.log(id+" "+word);
-                            // if (json.ENG){
-                            //     let arrSentence=[];
-                                
-                            //     for(let k=0;k<exampleSentence.Sentences.length;k++){
-                            //         let obj=[];
-                            //         let sentence1=exampleSentence.Sentences[k].Sentence;
-                                    
-                            //         sentence1=stringUtils.ReplaceAllString(sentence1,word,"[线]"+word+"[/线]");
-                                    
-                            //         if (sentence1.substring(0,word.length).toLowerCase()==word.toLowerCase()){
-                            //             let word1=sentence1.substring(0,word.length);
-                            //             sentence1=sentence1.replace(word1,"[线]"+word1+"[/线]");
-                            //         }
-                            //         //console.log(sentence1);
+                            //console.log(id+" "+word);
+                            if (json.ENG){
+                                // let arrSentence=[];
+
+                                // let arrEnglishExplanation=EnglishExplanation.EnglishExplanation;
+                                // //console.log(id+" "+arrEnglishExplanation.length);
+                                // for(let k=0;k<arrEnglishExplanation.length;k++){
+                                //     let obj={};
+                                //     obj.PartOfSpeech="";
+                                //     obj.ParaphraseList=[];
+                                //     let item1=arrEnglishExplanation[k];
                                     
-                            //         obj.push(sentence1);
-                            //         obj.push(exampleSentence.Sentences[k].Translate);
-                            //         arrSentence.push(obj);
-                            //     }
-                            //     if (!json.ENG.ExamplesSentences)
-                            //         json.ENG.ExamplesSentences=[];
+                                //     //console.log(k+" "+item1);
+                                //     if (item1.indexOf(".")>0){
+                                //         obj.PartOfSpeech=item1.substring(0,item1.indexOf(".")+1);
+                                //         let str=item1.substring(item1.indexOf(".")+1);
+                                //         str=stringUtils.Trim(str);
+                                //         //console.log("str: "+str);
+                                //         obj.ParaphraseList.push(str);
+                                //         //console.log(sentence1);
+                                //         arrSentence.push(obj);
+                                //     }
+                                // }
+
+                                // let temp="",arrPartOfSpeech=[];
+                                // for(let k=0;k<arrSentence.length;k++){
+                                //     let item=arrSentence[k];
+                                //     if (temp!=item.PartOfSpeech){
+                                //         let obj={};
+                                //         obj.PartOfSpeech=item.PartOfSpeech;
+                                //         obj.ParaphraseList=[];
+                                //         arrPartOfSpeech.push(obj);
+                                //     }
+                                //     temp=item.PartOfSpeech;
+                                // }
+
+                                // for(let k=0;k<arrSentence.length;k++){
+                                //     for(let n=0;n<arrPartOfSpeech.length;n++){
+                                //         if (arrSentence[k].PartOfSpeech==arrPartOfSpeech[n].PartOfSpeech){
+                                //             arrPartOfSpeech[n].ParaphraseList.push(arrSentence[k].ParaphraseList[0]);
+                                //         }
+                                //     }
+                                // }
+
+                                // //console.log(arrPartOfSpeech);
                                 
-                            //     json.ENG.ExamplesSentences=arrSentence;
-                            // }
-                            // json.ENG.CEFR_Level=exampleSentence.CEFR_Level;
+                                // json.ENG.EnglishExplanation=arrPartOfSpeech;
 
-                            // json=JSON.stringify(json);
-                            // let sql3="update MiaoguoLiteracy set JSONString=? where ID="+list2[j].ID+";";
-                            // //console.log(sql3);
-                            // //console.log(json);
-                            // await commonModel.RunSql(json,sql3);
+                                json.ENG.ParaphraseEng=json.ENG.EnglishExplanation;
+                                delete json.ENG.EnglishExplanation;
+                            }
+                            
+                            json=JSON.stringify(json);
+                            let sql3="update MiaoguoLiteracy set JSONString=? where ID="+list2[j].ID+";";
+                            //console.log(sql3);
+                            //console.log(json);
+                            await commonModel.RunSql(json,sql3);
                         }
                     }
 
                 }
                 catch(e){
-                    let sql2="update Words set ExampleSentence='' where ID="+id+";";
+                    //let sql2="update Words set ExampleSentence='' where ID="+id+";";
                     console.log("出错:"+word);
-                    await commonModel.RunSql(item.ExampleSentence,sql2);
+                    process.exit(1);
+                    //await commonModel.RunSql(item.ExampleSentence,sql2);
                 }
             }
-            //console.log(i +"/"+ list.length+" "+word);
+            console.log(i +"/"+ list.length+" "+word);
             
             // 在每次请求后添加延时，除非是最后一个请求
             // if (i < count - 1) {

src/test/build.test4.js

@@ -1,5 +1,6 @@
 import commonModel from '../model/commonModel.js';
 import fs from 'fs';
+import _ from 'lodash';
 import { stringUtils } from '../util/stringClass.js';
 import aiController from '../api/yjbdc/aiController.js';
 
@@ -7,93 +8,92 @@ async function runScript(){
     try {
         
         //按照高频单词的使用频率排序，列出所有单词
-        const sql="select * from Words where Word='';";
+        //const sql="select * from MiaoguoLiteracy where ID>0 order by ID desc;";
+        const sql="SELECT * FROM kylx365_db.MiaoguoLiteracy where SearchType='zici' and JSONString like '%pinyin%' and JSONString not like '%explain%' and ID>0 order by ID desc;";
+        
         let list = await commonModel.RunSql(null,sql);
         let count=list.length;
         console.log(count);
         const start=0;
-        //count=2;
-
-        // 添加延时函数，确保每分钟只发送9次请求（约每6.67秒一次请求）
-        const delay = (ms) => new Promise(resolve => setTimeout(resolve, ms));
-        const requestDelay = 7000; // 7秒，确保每分钟最多9次请求
+        //count=100;
         
         for(let i=start;i<count;i++){
             let item=list[i];
-
             //获得单词
             const word=item.Word;
 
-            let content={
-                "instruction": "用单词"+word+"生成例句，中国学生学习英文使用",
-                "requirements": [
-                    "判断单词在CEFR的最低级别，比如experience是B1",
-                    "用单词最常用的含义生成最低级别到C1各两句例句，比如experience生成B1、B2、C1各两句",
-                    "单词允许类似过去式、复数等变形",
-                    "提供例句翻译",
-                    "格式要求是JSON格式，完全遵循output_format，另外生成不要有重复“\"”",
-                    "如果有多个方案，直接给最好的"
-                ],
-                "output_format":{
-                    "word":"单词",
-                    "CEFR_Level":"A1",
-                    "Sentences": [
-                        {
-                        "Sentence":"句子1",
-                        "Translate": "翻译1",
-                        "Level": "A1",
-                        },{
-                        "Sentence":"句子2",
-                        "Translate": "翻译2",
-                        "Level": "A2",
-                        },
-                    ]
-                }
-            };
-            content=JSON.stringify(content);
-            //console.log(content);
-
-            let aiProvider="llama-4-maverick-17b-128e-instruct";
+            const reg = new RegExp("[A-Z]");
+            if (word.length==1 && reg.test(word)){
+                console.log(word+" 跳过");
+                continue;
+            }
 
-            //aiProvider="ali-qwen-plus";
-            //生成例句
-            let result = await aiController.generateArticle(content, aiProvider);
+            let json="";
             
+            try{
+                json=JSON.parse(item.JSONString);
+
+                if (item.SearchType=='zici'){
+                    //console.error( item.ID +" "+ word);
+                    let content = {
+                        "instruction": "生成词语“" + word + "”的相关信息。",
+                        "output_format": {
+                            "pinyin": "拼音（空格分隔）",
+                            "explain": ["释义1", "释义2..."],
+                            "synonym": ["近义词1", "近义词2..."],
+                            "antonym": ["反义词1", "反义词2..."],
+                            "englishWord": ["word1", "word2..."]
+                        }
+                    };
+                    content=JSON.stringify(content);
+                    //console.log(content);
+        
+                    let aiProvider="llama-4-maverick-17b-128e-instruct";
+                    aiProvider="ali-qwen-plus-2025-07-14";
+                    
+                    //生成例句
+                    let result = await aiController.generateArticle(content, aiProvider);
+                    
+                    result=JSON.parse(result);
+                    //console.log("result1:"+result);
 
-            console.log("result1:"+result);
-            //console.log(result.indexOf("{")); 
-            if (result.indexOf("```json")>0){
-                console.log("```json");
-                console.log(result.indexOf("```json"));
-                result=result.substring(result.indexOf("```json")+7);
-                result=result.substring(0,result.lastIndexOf("```"));
+                    let obj={};
+                    obj.pinyin=result.pinyin;
+                    obj.explain=result.explain;
+                    json.CHN.PinYin=[];
+                    json.CHN.PinYin.push(obj);
+                    json.CHN.TianKong=tiankongFun(word,result.pinyin);
+                    json.CHN.Synonym=result.synonym;
+                    json.CHN.Antonym=result.antonym;
+                    //console.log("pinyin:"+result.pinyin);
+                    //console.log("synonym:"+result.synonym);
+                    
+                    let eng={};
+                    eng.Word=word;
+                    eng.Paraphrase={
+                        PartOfSpeech:"",
+                        ParaphraseList:result.englishWord.join(","),
+                    }
+                    json.ENG=eng;
+                    
+                    json=JSON.stringify(json);
+                    let sql3="update MiaoguoLiteracy set JSONString=? where ID="+item.ID+";";
+                    //console.log(sql3);
+                    //console.log(json);
+                    await commonModel.RunSql(json,sql3);
+                    
+                }
             }
-            else if (result.indexOf("```")>0){
-                console.log("```");
-                console.log(result.indexOf("```"));
-                
-                result=result.substring(result.indexOf("```")+3);
-                result=result.substring(0,result.lastIndexOf("```"));
+            catch(e){
+                console.error("error:"+ item.ID +" "+ word +" " + e);
+                let sql3="delete from MiaoguoLiteracy where ID="+item.ID+";";
+                await commonModel.RunSql(null,sql3);
+                //process.exit(1);
             }
-            console.log("result2:"+result); 
-
-            result=result.replace("\"\": ","\": ");
-            result=result.replace("\"\":","\":");
-            result=result.replace(":\"\"",":\"");
-            result=result.replace(": \"\"",": \"");
-            result=result.replace(",\"\"",",\"");
-            result=result.replace("\"\",","\",");
-
-            let sql2="update Words set ExampleSentence=? where ID="+item.ID+";";
-            await commonModel.RunSql(result,sql2);
+            //console.log(content);
             
-            console.log( i +"/"+ list.length+" "+word);
+            console.log( i +"/"+ list.length+" "+ item.ID +" "+ word);
             
-            // 在每次请求后添加延时，除非是最后一个请求
-            if (i < count - 1) {
-                console.log(`等待 ${requestDelay/1000} 秒后继续下一个请求...`);
-                await delay(requestDelay);
-            }
         }
         
         console.log("完成");
@@ -108,3 +108,21 @@ async function runScript(){
 runScript().catch(error => {
     console.error('Error in runScript:', error);
 });
+
+// let a=tiankongFun("时事","shí shì");
+// console.log(a);
+function tiankongFun(word,pinyin){
+    let TianKong = [];
+    if (word.length <= 4 && pinyin ) {
+        
+        var arrPinyin = pinyin.split(" ");
+        //console.log(arrPinyin);
+        for (var i = 0; i < word.length; i++) {
+            var str = stringUtils.ReplaceAllString(word,word[i],arrPinyin[i]);
+            //var str=param.Word.substring(0,i)+arrPinyin[i]+param.Word.substring(i+1);
+            TianKong.push(str);
+        }
+        TianKong= _.uniq(TianKong);
+    }
+    return TianKong;
+}

src/test/build.test41.js

@@ -0,0 +1,57 @@
+import commonModel from '../model/commonModel.js';
+import fs from 'fs';
+import _ from 'lodash';
+import { stringUtils } from '../util/stringClass.js';
+import aiController from '../api/yjbdc/aiController.js';
+
+async function runScript(){
+    try {
+        
+        //按照高频单词的使用频率排序，列出所有单词
+        //const sql="select * from MiaoguoLiteracy where ID>0 order by ID desc;";
+        const sql="SELECT a.ID,b.ID as 'ID2' FROM MiaoguoLiteracy a inner join MiaoguoLiteracy b on a.ID<b.ID and a.Word=b.Word and a.SearchType=b.SearchType  where a.SearchType='eng' order by a.ID;";
+        
+        let list = await commonModel.RunSql(null,sql);
+        let count=list.length;
+        console.log(count);
+        const start=0;
+        //count=100;
+        
+        for(let i=start;i<count;i++){
+            let item=list[i];
+            let sql3="delete from MiaoguoLiteracy where ID="+item.ID2+";";
+            //console.log(sql3);
+            await commonModel.RunSql(null,sql3);
+            console.log( i +"/"+ list.length+" "+ item.ID);
+        }
+        
+        console.log("完成");
+        process.exit(1);
+    } catch (error) {
+        console.error('Error executing script:', error);
+        process.exit(1);
+    }
+}
+
+// 处理Promise并添加错误捕获
+runScript().catch(error => {
+    console.error('Error in runScript:', error);
+});
+
+// let a=tiankongFun("时事","shí shì");
+// console.log(a);
+function tiankongFun(word,pinyin){
+    let TianKong = [];
+    if (word.length <= 4 && pinyin ) {
+        
+        var arrPinyin = pinyin.split(" ");
+        //console.log(arrPinyin);
+        for (var i = 0; i < word.length; i++) {
+            var str = stringUtils.ReplaceAllString(word,word[i],arrPinyin[i]);
+            //var str=param.Word.substring(0,i)+arrPinyin[i]+param.Word.substring(i+1);
+            TianKong.push(str);
+        }
+        TianKong= _.uniq(TianKong);
+    }
+    return TianKong;
+}

src/test/build.人教版单词.js

@@ -1,6 +1,7 @@
 import commonModel from '../model/commonModel.js';
 import { stringUtils } from '../util/stringClass.js';
 import fs from 'fs';
+import _ from 'lodash';
 
 async function runScript(){
     try {
@@ -8,18 +9,20 @@ async function runScript(){
         let arr=data.split("\n")
 
 
-        for(var i=0;i<arr.length;i++){
-            if (arr[i].indexOf("/")<0){
-                arr[i]=arr[i].replace("\t","\t\t");
-            }
-        }
-
+        // for(var i=0;i<arr.length;i++){
+        //     arr[i]=stringUtils.ReplaceAllString(arr[i],"\t","\t");
+        //     //console.log(arr[i]);
+        // }
+        const BOOK_ID=191;
+        let count=0;
         for(var i=0;i<arr.length;i++){
             var item=arr[i].split("\t");
+            item = item.filter(item2 => item2 && item2.trim() !== '');
+            //console.log(item.join("\t"));
             if (item[0]){
                 let obj={};
                 obj.Word=stringUtils.Trim(stringUtils.ReplaceAllString(item[0],"'","ˈ"));
-                obj.Word=obj.Word.replace("*","");
+                //obj.Word=obj.Word.replace("*","");
                 
                 if (item[1]){
                     obj.Soundmark="["+stringUtils.Trim(stringUtils.ReplaceAllString(item[1],"/",""))+"]";
@@ -28,16 +31,21 @@ async function runScript(){
                 }
                     
                 obj.Translate=stringUtils.Trim(item[2]);
-                obj.BookID=211;
+                obj.BookID=BOOK_ID;
                 obj.LessonID=stringUtils.Trim(item[3].replace("Unit",""));
+                obj.LessonID=obj.LessonID.replace(" |","");
                 obj.LessonName="Unit "+obj.LessonID;
                 console.log(JSON.stringify(obj));
 
                 const sql = "INSERT INTO Words SET ?";
                 await commonModel.RunSql(obj,sql);
-                
+                count++;
             }
         }
+
+        const sql2 = "UPDATE MiaoguoBook SET WordNum="+count+" Where BookIDOld="+BOOK_ID;
+        await commonModel.RunSql(null,sql2);
+
         console.log("完成");
         process.exit(1);
     } catch (error) {

src/test/build.人教版常用表达法.js

@@ -4,8 +4,11 @@ import fs from 'fs';
 
 async function runScript(){
     try {
+        const BOOK_ID=203;
+
         var data = fs.readFileSync('data2.txt', 'utf8');
         let arr=data.split("\n")
+        let count=0;
         for(var i=0;i<arr.length;i++){
             var item=arr[i].split("|");
             if (item[1]){
@@ -14,15 +17,23 @@ async function runScript(){
                 obj.Word=stringUtils.ReplaceAllString(obj.Word,"'","ˈ");
                 obj.Translate=stringUtils.Trim(item[2]);
                 obj.Translate=stringUtils.ReplaceAllString(obj.Translate,"'","ˈ");
-                obj.BookID=206;
+                obj.BookID=BOOK_ID;
                 obj.LessonID=stringUtils.Trim(item[3].replace("Unit",""));
+                obj.LessonName="Unit "+obj.LessonID;
                 console.log(JSON.stringify(obj));
 
                 const sql = "INSERT INTO Words SET ?";
                 await commonModel.RunSql(obj,sql);
+
+                count++;
                 
             }
         }
+
+        const sql2 = "UPDATE MiaoguoBook SET WordNum="+count+" Where BookIDOld="+BOOK_ID+";";
+        console.log(sql2);
+        await commonModel.RunSql(null,sql2);
+
         console.log("完成");
         process.exit(1);
     } catch (error) {

src/test/build.古诗文背诵.js

@@ -46,7 +46,7 @@ async function runScript() {
         .poem-title {
             font-size: 32px;
             font-weight: bold;
-            margin: 0 0 20px 0;
+            margin: 50px 0 20px 0;
             text-align: center;
             color: #8b4513;
             text-shadow: 1px 1px 2px rgba(0,0,0,0.1);
@@ -73,11 +73,19 @@ async function runScript() {
             max-width: 80%;
         }
         .tag {
-            font-size: 12px;
+            font-size: 16px;
+            color: #999;
+            position: absolute;
+            top: 20px;
+            left: 20px;
+            text-align: left;
+        }
+        .tag2 {
+            font-size: 9px;
             color: #999;
             position: absolute;
-            bottom: 20px;
             right: 20px;
+            bottom: 20px;
             text-align: right;
         }
     </style>
@@ -138,11 +146,9 @@ async function runScript() {
             // 同年级按学期排序（上在前）
             return termA === '上' ? -1 : 1;
         });
-// ... existing code ...
-
 
         // 确保排序后的键符合预期顺序
-        console.log('Sorted Keys:', sortedKeys);
+        //console.log('Sorted Keys:', sortedKeys);
 
         for (const key of sortedKeys) {
             const gradeMatches = groupedByGradeAndTerm[key];
@@ -153,19 +159,21 @@ async function runScript() {
 
             // 处理诗词
             for (const match of poems) {
-                const tag = match[1];
+                let tag = match[1];
+                tag=stringUtils.ReplaceAllString(tag,",","·");
+                
                 const title = match[2];
                 const author = match[3] === 'NULL' ? '' : match[3];
                 const dynasty = match[4] === 'NULL' ? '' : match[4].replace(/\\[|\\]/g, '');
 
                 let poemContent = match[5];
                 const poemMatches = poemContent.match(/\"([^\"]+)\"/g) || [];
-                const cleanedPoem = poemMatches.map(line => line.replace(/\"/g, '')).join('<br>');
+                const cleanedPoem = poemMatches.map(line => line.replace(/\"/g, '').replace(/，/g, '<span style="white-space: nowrap;">，</span>')).join('<br>');
 
                 let translation = match[6];
                 const translationMatches = translation.match(/\"([^\"]+)\"/g) || [];
-                const cleanedTranslation = translationMatches.map(line => line.replace(/\"/g, '')).join('<br>');
-
+                // 如果译文内容较长，则不使用<br>标签，让文本自然换行
+                const cleanedTranslation = translationMatches.map(line => line.replace(/\"/g, '')).join(translation.length > 300 ? ' ' : '');
                 const formattedTitle = title.replace(/([。]|(?<!——)\s+)(?!——)\s*/g, '$1<br>');
 
                 htmlContent += `
@@ -175,24 +183,26 @@ async function runScript() {
         <div class="poem-content">${cleanedPoem}</div>
         <div class="poem-translation">${cleanedTranslation}</div>
         <div class="tag">${tag}</div>
+        <div class="tag2">微信小程序：秒过·错题记忆卡 出品</div>
     </div>`;
             }
 
             // 处理日积月累
             for (const match of accumulations) {
-                const tag = match[1];
+                let tag = match[1];
+                tag=stringUtils.ReplaceAllString(tag,",","·");
                 const title = match[2];
                 const author = match[3] === 'NULL' ? '' : match[3];
                 const dynasty = match[4] === 'NULL' ? '' : match[4].replace(/\\[|\\]/g, '');
 
                 let poemContent = match[5];
                 const poemMatches = poemContent.match(/\"([^\"]+)\"/g) || [];
-                const cleanedPoem = poemMatches.map(line => line.replace(/\"/g, '')).join('<br>');
+                const cleanedPoem = poemMatches.map(line => line.replace(/\"/g, '').replace(/，/g, '<span style="white-space: nowrap;">，</span>')).join('<br>');
 
                 let translation = match[6];
                 const translationMatches = translation.match(/\"([^\"]+)\"/g) || [];
-                const cleanedTranslation = translationMatches.map(line => line.replace(/\"/g, '')).join('<br>');
-
+                // 如果译文内容较长，则不使用<br>标签，让文本自然换行
+                const cleanedTranslation = translationMatches.map(line => line.replace(/\"/g, '')).join(translation.length > 300 ? ' ' : '');
                 const formattedTitle = title.replace(/([。]|(?<!——)\s+)(?!——)\s*/g, '$1<br>');
 
                 htmlContent += `
@@ -202,6 +212,7 @@ async function runScript() {
         <div class="poem-content">${cleanedPoem}</div>
         <div class="poem-translation">${cleanedTranslation}</div>
         <div class="tag">${tag}</div>
+        <div class="tag2">微信小程序：秒过·错题记忆卡 出品</div>
     </div>`;
             }
         }

src/test/data.txt

@@ -0,0 +1,118 @@
+team	/tiːm/	（游戏或运动的）队；（一起工作的）组，班	Unit 1
+player	/ˈpleɪə(r)/	运动员；参赛选手	Unit 1
+him	/hɪm/	他	Unit 1
+lovely	/ˈlʌvli/	美丽的；优美的	Unit 1
+clever	/ˈklevə(r)/	聪明的；聪颖的	Unit 1
+young	/jʌŋ/	幼小的；年轻的	Unit 1
+hard-working	/hɑːd ˈwɜːkɪŋ/	工作努力的；辛勤的	Unit 1
+science	/ˈsaɪəns/	科学；自然科学	Unit 1
+robot	/ˈrəʊbɒt/	机器人	Unit 1
+jump	/dʒʌmp/	跳；跃	Unit 1
+rope	/rəʊp/	绳；粗绳	Unit 1
+piano	/pɪˈænəʊ/	钢琴	Unit 1
+chess	/tʃes/	国际象棋	Unit 1
+front	/frʌnt/	前部	Unit 1
+easy	/ˈiːzi/	容易的；轻易的	Unit 1
+star	/stɑː(r)/	歌唱（或表演）明星	Unit 1
+wonderful	/ˈwʌndəfl/	精彩的；绝妙的	Unit 1
+Australia	/ɒˈstreɪliə/	澳大利亚	Unit 1
+sad	/sæd/	悲哀的；难过的	Unit 2
+matter	/ˈmætə(r)/	事情；问题	Unit 2
+project	/ˈprɒdʒekt/	项目；方案	Unit 2
+centre	/ˈsentə(r)/	中心	Unit 2
+agree	/əˈɡriː/	同意；赞成	Unit 2
+finish	/ˈfɪnɪʃ/	完成；做好	Unit 2
+Monday	/ˈmʌndeɪ/	星期一	Unit 2
+worried	/ˈwʌrid/	担心的；担忧的	Unit 2
+both	/bəʊθ/	两者	Unit 2
+excited	/ɪkˈsaɪtɪd/	激动的；兴奋的	Unit 2
+wrong	/rɒŋ/	错误的	Unit 2
+angry	/ˈæŋɡri/	愤怒的；生气的	Unit 2
+afraid	/əˈfreɪd/	担心；害怕	Unit 2
+parent	/ˈpeərənt/	父亲；母亲	Unit 2
+ask	/ɑːsk/	问；询问	Unit 2
+move	/muːv/	搬家；移动	Unit 2
+yours	/jɔːz/	您的（用于书信结尾的签名前）	Unit 2
+Wednesday	/ˈwenzdeɪ/	星期三	Unit 3
+subject	/ˈsʌbdʒɪkt/	科目；学科	Unit 3
+Tuesday	/ˈtjuːzdeɪ/	星期二	Unit 3
+Friday	/ˈfraɪdeɪ/	星期五	Unit 3
+because	/bɪˈkɒz/	因为	Unit 3
+Monday	/ˈmʌndeɪ/	星期一	Unit 3
+Thursday	/ˈθɜːzdeɪ/	星期四	Unit 3
+start	/stɑːt/	开始	Unit 3
+usually	/ˈjuːʒuəli/	通常地；经常地	Unit 3
+weekend	/ˌwiːkˈend/	周末	Unit 3
+sometimes	/ˈsʌmtaɪmz/	有时；间或	Unit 3
+Saturday	/ˈsætədeɪ/	星期六	Unit 3
+Sunday	/ˈsʌndeɪ/	星期日	Unit 3
+lesson	/ˈlesn/	课；一节课	Unit 3
+evening	/ˈiːvnɪŋ/	晚上；傍晚	Unit 3
+answer	/ˈɑːnsə(r)/	答复；回答	Unit 3
+ping-pong	/ˈpɪŋ pɒŋ/	乒乓球	Unit 3
+night	/naɪt/	夜；夜晚	Unit 3
+visit	/ˈvɪzɪt/	看望；拜访；参观	Unit 3
+grandparent	/ˈɡrænpeərənt/	祖父；祖母；外祖父；外祖母	Unit 3
+stay	/steɪ/	待；保持；继续是	Unit 4
+should	/ʃʊd/	（提出或征询建议）该，可以	Unit 4
+flu	/fluː/	流行性感冒；流感	Unit 4
+else	/els/	其他的；别的	Unit 4
+exercise	/ˈeksəsaɪz/	锻炼；训练；操练	Unit 4
+enough	/ɪˈnʌf/	足够的；充足的；充分的	Unit 4
+if	/ɪf/	如果；假若；倘若	Unit 4
+habit	/ˈhæbɪt/	习惯	Unit 4
+show	/ʃəʊ/	（电视或广播）节目	Unit 4
+phone	/fəʊn/	电话；电话机	Unit 4
+then	/ðen/	那么；因此；既然如此	Unit 4
+rest	/rest/	休息；放松	Unit 4
+take care of	/teɪk keə(r) ɒv/	爱护；照顾	Unit 4
+check	/tʃek/	查看；查明	Unit 4
+less	/les/	较少的，更少的	Unit 4
+brush	/brʌʃ/	（用刷子）刷净，刷亮，刷平顺	Unit 4
+tooth	/tuːθ/	牙；齿	Unit 4
+twice	/twaɪs/	两次；两遍	Unit 4
+hour	/ˈaʊə(r)/	小时	Unit 4
+free	/friː/	没有安排活动的；空闲的	Unit 4
+hungry	/ˈhʌŋɡri/	感到饿的	Unit 5
+beef	/biːf/	牛肉	Unit 5
+ice cream	/aɪs kriːm/	（一份）冰激凌	Unit 5
+little	/ˈlɪtl/	少许；一点	Unit 5
+dumpling	/ˈdʌmplɪŋ/	饺子；汤圆	Unit 5
+tea	/tiː/	茶叶；茶；茶水	Unit 5
+hamburger	/ˈhæmbɜːɡə(r)/	汉堡包；汉堡牛肉饼	Unit 5
+Mrs	/ˈmɪsɪz/	（用于女子的姓氏或姓名前）太太，夫人	Unit 5
+coconut	/ˈkəʊkənʌt/	椰子	Unit 5
+interesting	/ˈɪntrəstɪŋ/	有趣的；有吸引力的	Unit 5
+seed	/siːd/	种子；籽	Unit 5
+pull	/pʊl/	拔出；抽出	Unit 5
+stem	/stem/	（花草的）茎；梗，柄	Unit 5
+root	/ruːt/	根；根茎	Unit 5
+lotus	/ˈləʊtəs/	莲属植物	Unit 5
+lake	/leɪk/	湖；湖泊	Unit 5
+world	/wɜːld/	世界；地球；天下	Unit 5
+round	/raʊnd/	圆形的；环形的；球形的	Unit 5
+different	/ˈdɪfrənt/	不同的；有区别的；有差异的	Unit 5
+way	/weɪ/	方法；手段；途径；方式	Unit 5
+river	/ˈrɪvə(r)/	河；江	Unit 6
+nature	/ˈneɪtʃə(r)/	自然界；大自然	Unit 6
+waterfall	/ˈwɔːtəfɔːl/	瀑布	Unit 6
+forest	/ˈfɒrɪst/	森林；林区	Unit 6
+famous	/ˈfeɪməs/	著名的；出名的	Unit 6
+mountain	/ˈmaʊntən/	高山；山岳	Unit 6
+wind	/wɪnd/	风；气流	Unit 6
+trip	/trɪp/	（尤指短程往返的）旅行，旅游，出行	Unit 6
+dangerous	/ˈdeɪndʒərəs/	有危险的；不安全的	Unit 6
+heavy	/ˈhevi/	程度大的；严重的	Unit 6
+hotel	/həʊˈtel/	旅馆；旅社	Unit 6
+close	/kləʊz/	关；关闭；闭上	Unit 6
+umbrella	/ʌmˈbrelə/	伞；雨伞	Unit 6
+raincoat	/ˈreɪnkəʊt/	雨衣	Unit 6
+worry	/ˈwʌri/	担心；担忧；发愁	Unit 6
+fine	/faɪn/	晴朗的	Unit 6
+fog	/fɒɡ/	雾	Unit 6
+flood	/flʌd/	洪水；水灾	Unit 6
+fire	/ˈfaɪə(r)/	火；火灾	Unit 6
+know	/nəʊ/	知道；了解	Unit 6
+before	/bɪˈfɔː(r)/	在……之前	Unit 6
+go hiking	/ɡəʊ ˈhaɪkɪŋ/	徒步旅行	Unit 6
+bring	/brɪŋ/	带……到某处；带来；取来	Unit 6

src/test/data2.txt

@@ -1,37 +1,36 @@
-| That's the tallest dinosaur in this hall. | 那是这个厅里最高的恐龙。 | Unit1 |
-| It's taller than both of us together. | 它比我俩加起来还高。 | Unit1 |
-| How tall are you? | 你有多高？ | Unit1 |
-| I'm 1.65 metres. | 我身高1.65米。 | Unit1 |
-| What size are your shoes, Mike? | 迈克，你穿多大号的鞋？ | Unit1 |
-| Your feet are bigger than mine. My shoes are size 37. | 你的脚比我的大。我穿37号的鞋。 | Unit1 |
-| How heavy are you? | 你体重多少？ | Unit1 |
-| I'm 48 kilograms. | 我体重48公斤。 | Unit1 |
-| How was your weekend? | 你周末过得怎么样？ | Unit2 |
-| It was good, thank you. | 很好，谢谢。 | Unit2 |
-| What did you do? | 你（周末）干什么了？ | Unit2 |
-| I stayed at home with your grandma. We drank tea in the afternoon and watched TV. | 我和你外婆待在家里。我们喝了下午茶，还看了电视。 | Unit2 |
-| Did you do anything else? | 你还做了其他什么事吗？ | Unit2 |
-| Yes, I cleaned my room and washed my clothes. | 是的，我打扫了房间，还洗了衣服。 | Unit2 |
-| I want to buy the new film magazine. | 我想买期新的电影杂志。 | Unit2 |
-| What did you do last weekend? Did you see a film? | 你上周末干什么了？你看电影了吗？ | Unit2 |
-| No, I had a cold. I stayed at home all weekend and slept. | 没有，我感冒了。整个周末都待在家里睡觉。 | Unit2 |
-| What happened? | 怎么了？ | Unit3 |
-| Are you all right? | 你还好吧？ | Unit3 |
-| I'm OK now. | 我现在没事了。 | Unit3 |
-| Where did you go? | 你去哪儿了？ | Unit3 |
-| It looks like a mule! | 它看起来像头骡子！ | Unit3 |
-| Did you go to Turpan? | 你们去吐鲁番了吗？ | Unit3 |
-| Yes, we did. | 是的，去了。 | Unit3 |
-| How did you go there? | 你们怎么去的？ | Unit3 |
-| We went there by plane. | 我们坐飞机去的。 | Unit3 |
-| Sounds great! | 听上去不错！ | Unit3 |
-| There was no library in my old school. | 我以前的学校里没有图书馆。 | Unit4 |
-| Tell us about your school, please. | 请给我们讲讲您的学校吧。 | Unit4 |
-| How do you know that? | 你怎么知道的？ | Unit4 |
-| There were no computers or Internet in my time. | 我那时候没有电脑也没有网络。 | Unit4 |
-| Before, I was quiet. Now, I'm very active in class. | 以前我很安静。现在我在课堂上很活跃。 | Unit4 |
-| I was short, so I couldn't ride my bike well. Now, I go cycling every day. | 我以前个子小，自行车骑得不好。现在我天天骑车。 | Unit4 |
-| Less is more. | 少即是多。 | Unit1 |
-| All work and no play makes Jack a dull boy. | 只工作不玩耍，聪明杰克也变傻。 | Unit2 |
-| All's well that ends well. | 结果好，一切都好。 | Unit3 |
-| Life is what you make it. | 生活是自己创造出来的。 | Unit4 |
+| What's he like?                                                       | 他什么样？              | Unit1 |
+| He's tall and strong.                                                 | 他又高又壮。             | Unit1 |
+| Is he good at football?                                               | 他擅长踢足球吗？           | Unit1 |
+| Yes, I think he is.                                                   | 是的，我想他擅长。          | Unit1 |
+| What can you do for the festival?                                     | 你能为科学艺术节做什么？       | Unit1 |
+| I can make a robot.                                                   | 我能制作机器人。           | Unit1 |
+| Can you make robots, Sarah?                                           | 萨拉，你能做机器人吗？        | Unit1 |
+| No, I can't.                                                          | 不，我不能。             | Unit1 |
+| Hi, Mike. You look sad. What's the matter?                            | 嗨，迈克。你看起来不开心。怎么回事？ | Unit2 |
+| It's about our school project.                                        | 是关于我们学校的项目。        | Unit2 |
+| So you don't agree with each other?                                   | 所以你俩意见不一致？         | Unit2 |
+| Why not do both?                                                      | 为什么不两个活动都做呢？       | Unit2 |
+| It's important to listen to each other.                               | 听取彼此的想法很重要。        | Unit2 |
+| Yes, Miss White. I need to talk to Mike.                              | 是的，怀特老师。我需要和迈克谈谈。  | Unit2 |
+| What do you have on Wednesdays?                                       | 星期三你有什么课？          | Unit3 |
+| I have Chinese, maths, music and PE.                                  | 我有语文课、数学课、音乐课和体育课。 | Unit3 |
+| What do you usually do at the weekend, children?                      | 孩子们，周末你们通常做什么？     | Unit3 |
+| I often play football. Sometimes I play Chinese chess with my father. | 我经常踢足球。有时我和爸爸下象棋。  | Unit3 |
+| Does your mother work on Saturdays and Sundays?                       | 你妈妈周六周日都工作吗？       | Unit3 |
+| Yes, she does.                                                        | 是的，她（周末两天）都工作。     | Unit3 |
+| How can we all stay healthy?                                          | 我们怎样才能保持健康？        | Unit4 |
+| We should eat healthy food.                                           | 我们应该吃健康的食物。        | Unit4 |
+| Can I play on Mum's phone?                                            | 我可以玩玩妈妈的手机吗？       | Unit4 |
+| No. You shouldn't play on a phone so often.                           | 不行。你不应总是玩手机。       | Unit4 |
+| What would you like to eat?                                           | 你想吃些什么？            | Unit5 |
+| I'd like beef and rice.                                               | 我想吃牛肉和米饭。          | Unit5 |
+| Would you like some chicken soup too?                                 | 你还想喝鸡汤吗？           | Unit5 |
+| Yes, please.                                                          | 是的，请（给我鸡汤）。        | Unit5 |
+| Where does your coconut come from?                                    | 你的椰子是哪里的？          | Unit5 |
+| Hainan!                                                               | 海南！                | Unit5 |
+| There are also many rivers in the nature park.                        | 这个自然公园还有许多河流。      | Unit6 |
+| Is there a waterfall in the forest?                                   | 森林里有瀑布吗？           | Unit6 |
+| Yes, there is.                                                        | 是的，这里有。            | Unit6 |
+| Are there any famous mountains in the nature park?                    | 自然公园有名山吗？          | Unit6 |
+| Yes, there are.                                                       | 是的，这里有。            | Unit6 |
+| There will be heavy rain in the afternoon too.                        | 今天下午还将有大雨。         | Unit6 |

src/util/constant/index.js

@@ -36,7 +36,7 @@ export default {
             {Version:"zkk2",BuildSecond:30,Model:"doubao-kimi-k2-250711",Content:"字节kimi_k2\n平均30秒生成",CSS:""},
             
             {Version:"akm",BuildSecond:30,Model:"ali-Moonshot-Kimi-K2-Instruct",Content:"阿里KimiK2\n平均30秒生成",CSS:""},
-            {Version:"qwp",BuildSecond:30,Model:"ali-qwen-plus-2025-07-28",Content:"阿里千问plus\n平均30秒生成",CSS:""},
+            {Version:"qwp",BuildSecond:30,Model:"ali-qwen-plus-2025-07-14",Content:"阿里千问plus\n平均30秒生成",CSS:""},
             {Version:"qwm",BuildSecond:45,Model:"ali-qwen-max",Content:"阿里千问Max\n平均45秒生成",CSS:""},
             {Version:"lm4m",BuildSecond:15,Model:"llama-4-maverick-17b-128e-instruct",Content:"阿里脸书llama4maverick\n平均20秒生成",CSS:""},
             {Version:"lm4s",BuildSecond:20,Model:"llama-4-scout-17b-16e-instruct",Content:"阿里脸书llama4Scout\n平均15秒生成",CSS:""},

src/util/stringClass.js

@@ -795,7 +795,7 @@ export const stringUtils = {
     },
     //判断是否是英文
     IsEnglish: (temp) => {
-        const reg = new RegExp("[A-Za-z]+");
+        const reg = new RegExp("^[A-Za-z]+(?:['-][A-Za-z]+)*$");
         return reg.test(temp);     /*进行验证*/
     },
     //循环熔断函数