0

src/api/yjbdc/yjbdcController.js

@@ -236,13 +236,6 @@ export async function GenerateArticle(ctx) {
             else if (params.AIVersion=="1.5"){
                 aiProvider = 'doubao-kimi-k2-250711';
             }
-
-
-            // if (aiProvider.indexOf("llama")>=0)
-            //     content=content.replace("[补充1]","，如果生成的JSON中有ArticleEnglishCorrected和ArticleChineseCorrected，直接覆盖原有的ArticleEnglish和ArticleChinese，不要再生成。");
-            // else
-            //     content=content.replace("[补充1]","");
-            
             
             try {
                 //开始时间
@@ -387,7 +380,6 @@ export async function getMiaoguoTodayAllWords(ctx) {
     ctx.body = result;
 }
 
-
 //获得文章列表或具体文章
 export async function GetYJBDCArticleList(ctx) {
     const param = {
@@ -396,6 +388,8 @@ export async function GetYJBDCArticleList(ctx) {
         IsChoiceness:ctx.query.IsChoiceness || 0,//是否是精选文章
         IsTodayCount: ctx.query.IsTodayCount || false,
         IsNew: ctx.query.IsNew || 0,
+        PageID: ctx.query.PageID || 999999,
+        PageCount: ctx.query.PageCount || 5,
     };
     // 尝试从缓存获取
     const url='GetYJBDCArticleList?IsChoiceness='+param.IsChoiceness+'&UserID='+param.UserID+'&ID='+param.ID;
@@ -443,10 +437,14 @@ export async function GetYJBDCArticleList(ctx) {
         };
     }
     else if (!param.ID){
-        let arr=[];
+        let arr=[],count=0;
         for(let i=0;i<result.length;i++){
-            if (result[i].Flag==0)
-                arr.push(result[i]);
+            if (result[i].Flag==0){
+                if (param.PageID>result[i].ID && count<param.PageCount){
+                    arr.push(result[i]);
+                    count++;
+                }
+            }
         }
         result=arr;
     }

src/model/yjbdc.js

@@ -120,7 +120,7 @@ class YJBDC {
                 return await query(sql, null);
             }
             else{
-                let sql = "SELECT `ID`,`UserID`,`CreateTime`,`Words`,`Level`,`ArticleStyle`,`ArticleStart`,`ReadCount`,`Flag` FROM YJBDC_Articles WHERE UserID=? order by ID desc limit 100;";
+                let sql = "SELECT `ID`,`UserID`,`CreateTime`,`Words`,`Level`,`ArticleStyle`,`ArticleStart`,`ReadCount`,`Flag` FROM YJBDC_Articles WHERE UserID=? order by ID desc;";
                 return await query(sql, [obj.UserID]);
             }
         } catch (error) {