Merge branch 'dev' of https://gitea.anxinyun.cn/gao.zhiyuan/OperationalService into dev

api/app/lib/controllers/alarm/app.js

@@ -133,7 +133,7 @@ async function notedInspection (ctx) {
 async function apiError (ctx) {
    try {
       const models = ctx.fs.dc.models;
-      const { projectAppId, alarmContent, router, statusCode, screenshot = '', type } = ctx.request.body
+      const { projectAppId, alarmContent, router, statusCode = null, screenshot = '', type } = ctx.request.body
       const now = moment().format()
 
       if (!type) {
@@ -254,6 +254,10 @@ async function apiErrorList (ctx) {
                '$app->projectCorrelations.pep_project_id$': {
                   $in: projectRes.map(p => p.id)
                },
+            }
+         )
+         findOption.where.$or.push(
+            {
                '$app.name$': { $like: `%${keyword}%` }
             }
          )

api/app/lib/controllers/alarm/video.js

@@ -294,7 +294,7 @@ async function vcmpAppAuthToken (ctx) {
       ctx.status = 200;
       ctx.body = { token }
    } catch (error) {
-      ctx.fs.logger.error(`path: ${ctx.path}, error: error`);
+      ctx.fs.logger.error(`path: ${ctx.path}, error: ${error}`);
       ctx.status = 400;
       ctx.body = {
          message: typeof error == 'string' ? error : undefined