q-koa 13.8.46 → 13.8.48

package/core/app.js

@@ -587,11 +587,16 @@ class APP {
       } catch (e) {
         push({
           appName,
-          message: `${appName}数据库连接失败`,
+          message: `${appName}启动失败：${e.message}`,
         })
-        console.log(`${appName}数据库连接失败`)
+        console.log(chalk.red(`${appName}启动失败，跳过该应用并继续启动后续应用`))
         console.log(e)
-        throw new Error(e.message)
+        // 清理可能已部分初始化的 app 对象，避免残留不完整状态
+        if (this.app[appName]) {
+          delete this.app[appName]
+        }
+        // 不抛出错误，跳过该应用的路由注册，继续启动后续应用
+        continue
       }
       if (
         this.app[appName] &&

package/core/file/plugins/common/controller.js

@@ -232,87 +232,6 @@ exports.channel = async (ctx) => {
   }
 }
 
-exports.swagger = async (ctx) => {
-  const { app, appName } = getAppByCtx(ctx)
-  if (app.cache && app.cache.get('swagger'))
-    return ctx.SUCCESS(app.cache.get('swagger'))
-
-  const filePath = path.resolve(
-    __dirname,
-    `${process.cwd()}/app/${appName}/plugins`
-  )
-  const apis = []
-  const pathList = await fsPromise.readdir(filePath)
-  for (let i = 0; i < pathList.length; i++) {
-    const folder = pathList[i]
-    const isFolder = fs.lstatSync(path.resolve(filePath, folder)).isDirectory()
-    if (isFolder) {
-      const models = []
-      if (app.model[folder]) {
-        const result = await app.sequelize
-          .getQueryInterface()
-          .describeTable(folder)
-        Object.keys(result).forEach((attr) => {
-          models.push(lodash.merge(app.attributes[folder][attr], result[attr]))
-          // models[attr] = lodash.merge(app.attributes[folder][attr], result[attr]);
-        })
-      }
-
-      const controllers = []
-      const controllerFilePath = path.resolve(filePath, folder, 'controller.js')
-      const isControllerExist = fs.existsSync(controllerFilePath)
-      if (isControllerExist) {
-        const controllerFile = await fsPromise.readFile(
-          controllerFilePath,
-          'utf-8'
-        )
-        const annotations = controllerFile.match(annotationsReg)
-
-        if (annotations) {
-          for (let j = 0; j < annotations.length; j++) {
-            const annotation = annotations[j]
-            let res
-            const obj = {}
-            while ((res = apiReg.exec(annotation))) {
-              res = res.map((item) => item.toLowerCase())
-              if (res[1] === 'param') {
-                const arr = res[3].split('/')
-                if (obj[res[1]]) {
-                  obj[res[1]].push({
-                    key: arr[0],
-                    type: arr[1],
-                    name: arr[2],
-                  })
-                } else {
-                  obj[res[1]] = []
-
-                  obj[res[1]].push({
-                    key: arr[0],
-                    type: arr[1],
-                    name: arr[2],
-                  })
-                }
-              } else {
-                obj[res[1]] = res[3]
-              }
-            }
-            controllers.push(obj)
-          }
-        }
-      }
-      apis.push({
-        name: folder,
-        desc: lodash.get(app, `config.${folder}.name`, `${folder}`),
-        models,
-        controllers,
-      })
-    }
-  }
-  app.cache && app.cache.set('swagger', apis)
-  // console.log(dir)
-  ctx.SUCCESS(apis)
-}
-
 exports.getLocation = async (ctx, _data) => {
   const { app } = getAppByCtx(ctx)
 

package/core/file/plugins/log/service.js

@@ -64,9 +64,7 @@ exports.push = async ({ app, appName = '通知', url, message }) => {
           }),
       ...(logo_image || logo_img
         ? {
-            icon: encodeURIComponent(
-              (logo_image || logo_img).replace('http', 'https')
-            ),
+            icon: logo_image || logo_img,
           }
         : {}),
     }

package/core/file/plugins/system/controller.js

@@ -215,22 +215,6 @@ exports.initModel = async (ctx) => {
     return ctx.ERROR(`app.model没有${model}`)
   }
 }
-
-exports.customRouter = async (ctx) => {
-  // const {
-  //   app,
-  //   appName,
-  // } = getAppByCtx(ctx);
-
-  // const list = [{
-  //   path: 'jiangong_statis',
-  //   name: '数据面板'
-  // }]
-  const list = []
-  ctx.SUCCESS(list)
-  return list
-}
-
 exports.showTables = async (ctx, _data) => {
   const { app, appName } = getAppByCtx(ctx)
   const { omit = [] } = _data || ctx.request.body
@@ -666,21 +650,6 @@ exports.chat = async (ctx) => {
   }
 }
 
-exports.dashboard = async (ctx) => {
-  // const {
-  //   app,
-  // } = getAppByCtx(ctx);
-
-  const result = [
-    //   {
-    //   name: '用户',
-    //   number: 5,
-    //   route: 'page/user'
-    // }
-  ]
-  ctx.SUCCESS(result)
-}
-
 exports.showModelCount = async (ctx) => {
   const { app, appName } = getAppByCtx(ctx)
   const { is_count = false } = ctx.request.body

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "q-koa",
-  "version": "13.8.46",
+  "version": "13.8.48",
   "description": "",
   "main": "index.js",
   "scripts": {