0

src/api/mps/mpsSchoolController.js

@@ -223,7 +223,7 @@ export async function GetMPSSchoolInfo (ctx) {
             info.ImageOtherSmall = arrImageSmall;
         }
 
-        if (!info.Accommodation)
+        if (!info.Accommodation || info.Accommodation=="undefined")
             info.Accommodation="";
 
         if (info.Address)

src/api/yjbdc/yjbdcController.js

@@ -13,6 +13,8 @@ import yjbdc from '../../model/yjbdc.js';
 import PDFDocument from 'pdfkit';
 import tencentcloud from 'tencentcloud-sdk-nodejs-ocr';
 
+const ONE_DAY_MAX_BUILD_COUNT=12;//一天最大生成数
+
 const OcrClient = tencentcloud.ocr.v20181119.Client;
 const headers = {
     'User-Agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/39.0.2171.65 Safari/537.36',
@@ -254,26 +256,31 @@ export async function GenerateArticle(ctx) {
                 "content": content,
             }
         ]};
-        const response = await axios.post(encodeURI(url), postJSON, { headers });
-        //console.log("parsedBody:" + JSON.stringify(response.data.choices[0].message.content));
-
-        let result2=response.data.choices[0].message.content;
-        let param2={};
-        param2.UserID=ctx.query.UserID;
-        param2.CreateTime=moment().format('YYYY-MM-DD HH:mm:ss');
-        param2.Words=words;
-        param2.Level=params.Level;
-        param2.articleStyle=params.ArticleStyle;
-        param2.BuildStr=content;
-        param2.ArticleStart=JSON.parse(result2).ArticleEnglish[0];
-        // 去除JSON字符串中的所有换行符(\r\n, \n, \r)
-        param2.JSONString=JSON.stringify(result2.replace(/[\r\n]+/g, ''));
-        param2.Flag=0;
-        await yjbdc.AddArticleInfo(param2);
-
-        result = { errcode: 10000, result: result2 };
-        globalCache.set(url, result, config.BufferMemoryTime);
-        console.log("缓存60秒");
+        try{
+            const response = await axios.post(encodeURI(url), postJSON, { headers });
+            console.log("parsedBody:" + JSON.stringify(response.data.choices[0].message.content));
+
+            let result2=response.data.choices[0].message.content;
+            let param2={};
+            param2.UserID=ctx.query.UserID;
+            param2.CreateTime=moment().format('YYYY-MM-DD HH:mm:ss');
+            param2.Words=words;
+            param2.Level=params.Level;
+            param2.articleStyle=params.ArticleStyle;
+            param2.BuildStr=content;
+            param2.ArticleStart=JSON.parse(result2).ArticleEnglish[0];
+            // 去除JSON字符串中的所有换行符(\r\n, \n, \r)
+            param2.JSONString=JSON.stringify(result2.replace(/[\r\n]+/g, ''));
+            param2.Flag=0;
+            await yjbdc.AddArticleInfo(param2);
+
+            result = { errcode: 10000, result: result2 };
+            globalCache.set(url, result, config.BufferMemoryTime);
+            console.log("缓存60秒");
+        }
+        catch(err){
+            result = { errcode: 10000, result: "-1" };
+        }
     }
     
     ctx.body = result;
@@ -295,7 +302,8 @@ export async function GetYJBDCArticleList(ctx) {
             for(let i=0;i<result.length;i++){
                 let item=result[i];
                 item.CreateTime=moment(item.CreateTime).format("YYYY年MM月DD日 HH:mm");
-                switch (item.Level){
+                //debugger;
+                switch (Number(item.Level)){
                     case 0:
                         item.LevelStr="小学";
                         break;
@@ -323,9 +331,14 @@ export async function GetYJBDCArticleList(ctx) {
             if (result[i].CreateTime>=today)
                 count++;
         }
+
+        let maxcount=ONE_DAY_MAX_BUILD_COUNT;
+        if (param.UserID<4){
+            maxcount=100;
+        }
         result={
             TodayCount:count,
-            MaxCount:12,
+            MaxCount:maxcount,
         };
     }