0

src/api/common/commonController.js

@@ -207,7 +207,7 @@ export async function GetBaiduToken (ctx) {
     
     let appidObj=getAppIDAndSecret(ProgramID);
     let appid = appidObj.appid;
-    let secret = appidObj.secret;    
+    let secret = appidObj.secret;
 
     const url = `https://api.weixin.qq.com/sns/jscode2session?appid=${appid}&secret=${secret}&js_code=${Code}&grant_type=authorization_code`;
 

src/api/mps/mpsCommonController.js

@@ -389,7 +389,7 @@ export async function GetMPSNotice(ctx) {
         // result.Content=content[rand];
 
         const content=[
-            "2025年「名额到区、名额到校」数据已更新。17日将继续更新「1-15平行志愿」，感谢您的耐心等待与支持！\n\n另向您推荐团队新作「语境背单词」小程序，通过阅读理解+选择题，帮孩子高效记忆单词、灵活运用考点，为初高中生设计，欢迎体验！",
+            "2025年「名额到区、名额到校、1-15平行志愿」数据已更新。感谢您的耐心等待与支持！\n\n另向您推荐团队新作「语境背单词」小程序，通过阅读理解+选择题，帮孩子高效记忆单词、灵活运用考点，为初高中生设计，欢迎体验！",
         ];
         result.Content=content[0];
 

src/api/yjbdc/yjbdcController.js

@@ -17,8 +17,6 @@ import tencentcloud from 'tencentcloud-sdk-nodejs-ocr';
 const ONE_DAY_MAX_BUILD_COUNT=12;//一天最大生成数
 
 const OcrClient = tencentcloud.ocr.v20181119.Client;
-// AI平台配置
-const DEFAULT_AI_PROVIDER = 'volces1-5'; // 默认使用火山云AI
 
 //小程序登录
 export async function YJBDCLogin(ctx) {
@@ -264,8 +262,11 @@ export async function GenerateArticle(ctx) {
             //console.log("content:"+content);
             
             // 从请求参数中获取AI提供者，如果没有指定则使用默认值
-            let aiProvider = DEFAULT_AI_PROVIDER;
-            if (params.Level>=2){
+            let aiProvider = 'volces1-5';
+            if (params.AIVersion=="1.0"){
+                aiProvider="volces1-5";
+            }
+            else if (params.AIVersion=="1.5"){
                 aiProvider="volces1-6";
             }
             
@@ -301,6 +302,7 @@ export async function GenerateArticle(ctx) {
                 param2.Words=words;
                 param2.Level=params.Level;
                 param2.articleStyle=articleStyle;
+                param2.AIProvider=aiProvider;
                 param2.BuildStr=content;
                 param2.GenerateTime=Math.round((timeEnd-timeStart)/1000);
                 
@@ -337,10 +339,11 @@ export async function GetYJBDCArticleList(ctx) {
     const param = {
         UserID: ctx.query.UserID || 0,
         ID:ctx.query.ID || 0,
+        IsChoiceness:ctx.query.IsChoiceness || 0,//是否是精选文章
         IsTodayCount: ctx.query.IsTodayCount || false,
     };
     // 尝试从缓存获取
-    const url='GetYJBDCArticleList?UserID='+param.UserID+"&ID="+param.ID;
+    const url='GetYJBDCArticleList?IsChoiceness='+param.IsChoiceness+'&UserID='+param.UserID+'&ID='+param.ID;
     let result = globalCache.get(url);
     if (result === 0) {
 
@@ -912,9 +915,20 @@ export async function GeneratePDF(ctx) {
             });
         });
 
+        let filename="语境背单词_"+moment().format("YYMMDD_HHmm");
         // 设置响应头
         ctx.set('Content-Type', 'application/pdf');
-        ctx.set('Content-Disposition', 'attachment; filename=article.pdf');
+        
+        // 使用ASCII文件名作为主文件名，确保兼容性
+        const asciiFilename = 'yjbdc_' + moment().format("YYMMDD_HHmm") + '.pdf';
+        
+        // 对中文文件名进行URL编码，用于filename*参数
+        const encodedFilename = encodeURIComponent(filename + '.pdf');
+        
+        // 设置Content-Disposition头部，使用标准格式
+        // 首先提供ASCII文件名，然后提供UTF-8编码的文件名
+        ctx.set('Content-Disposition', `attachment; filename=${asciiFilename}; filename*=UTF-8''${encodedFilename}`);
+        
         ctx.body = pdfBuffer;
 
     } catch (error) {

src/model/yjbdc.js

@@ -111,6 +111,10 @@ class YJBDC {
                     return await query(sql, [obj.UserID,obj.ID]);
                 }
             }
+            else if (obj.IsChoiceness){
+                let sql = "SELECT `ID`,`CreateTime`,`Words`,`Level`,`ArticleStyle`,`ArticleStart`,`ArticleTitle`,`Flag` FROM YJBDC_Articles WHERE ArticleTitle is not null and Flag=0 limit 4;";
+                return await query(sql, null);
+            }
             else{
                 let sql = "SELECT `ID`,`UserID`,`CreateTime`,`Words`,`Level`,`ArticleStyle`,`ArticleStart`,`Flag` FROM YJBDC_Articles WHERE UserID=? order by ID desc;";
                 return await query(sql, [obj.UserID]);

src/test/build.test.js

@@ -8,17 +8,22 @@ async function runScript(){
         console.log("SET SQL_SAFE_UPDATES = 0;");
         var data = fs.readFileSync('data.txt', 'utf8');
         let arr=data.split(");")
-        var districtID=1;
+        var districtID=14;
         var start=0;
         var end=arr.length;
         for(var i=start;i<end;i++){
             var item=arr[i].split(",");
             if (item[0]){
-                var item2=(Number(item[2])-50);
+                var item2=item[1];
                 item[0]=item[0].replace("(","");
                 item[0]=item[0].replace("\n","");
                 item[0]=item[0].replace("\r","");
-                var sql="update MPS_Score set ScoreTotal="+item2+",Score1="+item[3]+",Score2="+item[4]+",Score3="+item[5]+",Score4="+item[6]+" where SchoolFullNameJunior="+item[0]+" and SchoolFullName="+item[1]+" and DistrictID="+districtID+" and ScoreYear=2025 and ScoreType='名额到校';";
+                for(let j=2;j<7;j++){
+                    if (!item[j])
+                        item[j]=null
+                }
+                
+                var sql="update MPS_Score set ScoreTotal="+item2+",Score1="+item[2]+",Score2="+item[3]+",Score3="+item[4]+",Score4="+item[5]+" where SchoolFullName="+item[0]+" and DistrictID="+districtID+" and ScoreYear=2025 and ScoreType='1-15志愿';";
                 console.log(sql);
             }
         }

src/test/data copy.txt

@@ -0,0 +1,46 @@
+('同济创意',613,364,106,117,106);
+('上海中学',705.5,417.5,137,136,142);
+('久隆模范',653.5,381,123,121,130);
+('田家炳',640.5,370.5,121,126,122);
+('扬波中学',566,320,109,98,109);
+('新和中学',586,355,110,115,97);
+('风范中学',563.5,327,89,108,104);
+('上戏附中',620.5,370,116,119,115);
+('安生学校',514.5,276.5,102,114,103);
+('上音安师',531,299,76,105,102);
+('复旦复兴',680,407,133,130,130);
+('师大一附',670.5,397.5,128,131,129);
+('上财北郊',664.5,383.5,130,127,139);
+('上音北虹',627,371.5,123,121,123);
+('继光高级',567,338,87,121,91);
+('鲁迅中学',614.5,353.5,119,109,120);
+('五十二中',514.5,286.5,95,104,104);
+('上师虹口',641,375,129,116,124);
+('同济澄衷',594.5,355.5,108,113,109);
+('交大附中',703,415.5,142,134,141.5);
+('复旦附中',705,417,136,136,138);
+('燎原双语',569,333,100,102,105);
+('存志高级',659,387,128,119,129);
+('创艺高级',551.5,314.5,91,116,101);
+('华曜高级',637.5,375.5,122,109,118);
+('同洲模范',584.5,347,106,117,100);
+('宝山世外',662.5,386,125,125,132);
+('远东学校',524.5,306,95,113,92);
+('华盛怀少',560.5,330,96,107,98);
+('师大二附',704,417.5,144,128,142);
+('丰华高级',588.5,339,108,107,119);
+('金苹果',563.5,330.5,97,114,96);
+('东鼎外语',564.5,327.5,88,117,99);
+('尚德实验',623,365,120,116,115);
+('交大南洋',582,335.5,98,115,107);
+('永昌中学',542.5,317,112,105,97);
+('金山世外',625.5,356.5,106,124,126);
+('领科双语',634.5,385,120,127,115);
+('西外外语',547.5,308.5,99,114,105);
+('赫贤学校',606.5,357.5,103,116,110);
+('青浦世外',603.5,357.5,110,110,109);
+('宋庆龄',554,310,94,107,108);
+('协和双语',592.5,351,105,111,103);
+('博华高级',538.5,312,113,113,98);
+('城桥中学',544.5,314.5,105,119,96);
+('民一中学',504,291,83,104,81);

src/test/data.txt

@@ -1,23 +1,48 @@
-Tom's ancestors were great inventors, and he wanted to
-be an inventor too. On his 10th anniversary of starting to
-learn about inventions, he made an announcement that
-he would try to make an alternative energy device.
-However, the process was really hard, and he almost lost
-his appetite because of the difficulties. His friends and
-family advocated him to keep going and not to give up.
-Tom absorbed all the knowledge he could from books and
-the Internet. Finally, after many tries, his new device was
-successful, and the audience applauded for his wonderful
-work. People all appreciated his effort and creativity in the
-court of public opinion.
-
-absorb
-abvocate
-alternative
-ancestor
-anniversary
-announcement
-appetite
-applaud
-appreciate
-court
+('上海市上海中学',711.0,422.0,148,126,145);
+('上海田家炳中学',643.0,384.0,123,125,117);
+('上海戏剧学院附属高级中学（艺术班）',599.5,355.5,121,108,107);
+('上海安生学校',NULL,NULL,NULL,NULL,NULL);
+('上海音乐学院附属安师实验中学（艺术班）',591.5,363.5,110,124,92);
+('上海交通大学附属中学',707.5,419.5,141,132,141);
+('复旦大学附属中学',708.0,417.0,147,126,144);
+('上海市民办燎原双语高级中学',567.5,330.5,108,107,99);
+('上海闵行区诺达双语学校',NULL,NULL,NULL,NULL,NULL);
+('上海民办行中中学',520.0,289.0,100,109,92);
+('上海存志高级中学',572.5,325.5,110,108,110);
+('上海创艺高级中学',538.5,310.5,75,108,93);
+('上海市宝山华曜高级中学',602.0,352.0,110,112,109);
+('上海市同洲模范学校',534.5,303.5,116,109,95);
+('上海金瑞学校',NULL,NULL,NULL,NULL,NULL);
+('上海宝山区世外学校',675.0,401.0,134,125,129);
+('上海市民办远东学校',561.0,316.0,130,112,105);
+('上海华旭双语学校',NULL,NULL,NULL,NULL,NULL);
+('上海嘉定区民办华盛怀少学校',NULL,NULL,NULL,NULL,NULL);
+('华东师范大学第二附属中学',707.0,420.0,145,129,142);
+('上海师范大学附属中学',699.0,411.0,135,132,142);
+('上海市浦东新区民办浦实高级中学',563.0,332.0,110,113,102);
+('上海市民办丰华高级中学',563.0,336.0,106,116,104);
+('上海浦东新区民办东鼎外国语学校',574.5,339.5,96,118,100);
+('上海市民办尚德实验学校',611.0,351.0,121,116,119);
+('上海市民办交大南洋中学',563.5,333.5,113,118,96);
+('上海市民办永昌中学',540.5,291.5,114,111,115);
+('上海金山区世外学校',620.5,370.0,124,116,112);
+('上海市松江区科德高级中学',602.0,367.0,117,117,99);
+('上海市松江九峰实验学校',664.0,398.0,129,125,125);
+('上海领科双语学校',662.5,384.5,121,120,134);
+('上海市西外外国语学校',548.5,318.0,100,113,102);
+('上海赫贤学校',523.0,294.5,87,100,92);
+('上海松江区爱菊学校',530.0,305.0,114,91,104);
+('上海市青浦高级中学',668.5,396.5,128,123,126);
+('复旦大学附属中学青浦分校',689.5,403.5,135,127,141);
+('上海市朱家角中学',656.0,376.0,109,125,131);
+('上海市青浦区第二中学',570.5,341.0,103,117,100);
+('上海市青浦区东湖中学',603.0,355.0,114,113,114);
+('上海市青浦区第一中学',631.0,373.0,123,121,121);
+('上海青浦区世外高级中学',518.5,283.5,78,121,95);
+('上海青浦区宏润博源高级中学',557.5,337.5,97,109,94);
+('上海宋庆龄学校',593.0,351.0,105,123,100);
+('上海青浦区协和双语学校',536.5,322.0,97,114,80);
+('上海美达菲双语高级中学',NULL,NULL,NULL,NULL,NULL);
+('上海奉贤区博华高级中学',552.5,319.5,118,105,106);
+('上海市崇明区城桥中学',532.5,310.5,87,104,93);
+('上海民办民一中学',499.5,267.5,122,104,108);