q-koa 12.4.5 → 12.4.8

package/core/app.js

@@ -648,12 +648,16 @@ class APP {
                       beforeCreate: (res, t) => {
                         try {
                           if (folder === 'log') {
-                            this.app[appName].service.log && this.app[appName].service.log.push({
-                              app: this.app[appName],
-                              appName,
-                              message: res.toJSON().message,
-                              url: res.toJSON().url,
-                            })
+                            if (this.is_dev && !this.app[appName].service.log) {
+                              console.error('缺少log/service.js,')
+                            }
+                            this.app[appName].service.log &&
+                              this.app[appName].service.log.push({
+                                app: this.app[appName],
+                                appName,
+                                message: res.toJSON().message,
+                                url: res.toJSON().url,
+                              })
                           }
                           if (res.toJSON().user_id) {
                             res.createdid = res.toJSON().user_id

package/core/config.js

@@ -142,7 +142,7 @@ module.exports = {
       router.get('/cache/clear', app.controller.cache.clear)
       router.get('/cache/getAll', app.controller.cache.getAll)
     }
-    if (app.model.weixin) {
+    if (app.controller.weixin) {
       router.get('/weixin/h5_login', app.controller.weixin.h5_login)
       router.get(
         '/weixin/h5_login_callback',

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

@@ -6,9 +6,29 @@ const is_dev = process.env.NODE_ENV !== 'production'
 exports.push = async ({ app, appName = '通知', url, message }) => {
   const log_push_url = lodash.get(
     app,
-    'appConfig.log_push_url',
+    'appConfig.log.url',
     'https://api.day.app/ieaRfoE3LiPveGbY5qmUwk'
   )
+
+  const log_push_excludes = lodash.get(app, 'appConfig.log.excludes', {
+    url: [],
+    message: ['账号密码错误', 'read ETIMEDOUT'],
+  })
+  if (
+    url &&
+    log_push_excludes.url &&
+    log_push_excludes.url.some((i) => i.includes(url))
+  ) {
+    return
+  }
+
+  if (
+    message &&
+    log_push_excludes.message &&
+    log_push_excludes.message.some((i) => i.includes(message))
+  ) {
+    return
+  }
   if (log_push_url) {
     const appConfig = getConfig(app)
     const { site_name, logo_image, logo_img } = await appConfig.getObject(

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

@@ -561,6 +561,44 @@ exports.dashboard = async (ctx) => {
   ctx.SUCCESS(result)
 }
 
+exports.showModelCount = async (ctx) => {
+  const { app, appName } = getAppByCtx(ctx)
+  const { is_count = false } = ctx.request.body
+  const result = await app.sequelize.showAllSchemas()
+  const list = result.map(
+    (item) => item[`Tables_in_${app.sequelize.config.database}`]
+  )
+  let tableList = []
+  for (let i = 0; i < list.length; i++) {
+    if (!app.model[list[i]]) continue
+    const defaultConfigPath = path.resolve(__dirname, `../${list[i]}/config.js`)
+    const defaultConfigExist = fs.existsSync(defaultConfigPath)
+    const target =
+      app.config[list[i]] &&
+      Object.keys(app.config[list[i]]).length === 0 &&
+      defaultConfigExist
+        ? require(defaultConfigPath)
+        : app.config[list[i]]
+    const count = await app.model[list[i]].count()
+    const maxTarget = await app.model[list[i]].findOne({
+      order: [['id', 'DESC']],
+      attributes: ['id'],
+    })
+    if (maxTarget) {
+      tableList = [
+        ...tableList,
+        {
+          count,
+          max_id: maxTarget.id,
+          name: target.name,
+          model: list[i],
+        },
+      ]
+    }
+  }
+  return ctx.SUCCESS(tableList.sort((a, b) => b.count - a.count))
+}
+
 exports.showAllModel = async (ctx) => {
   const { app, appName } = getAppByCtx(ctx)
   const { is_count = false } = ctx.request.body

package/core/file/services/geo.js

@@ -61,7 +61,7 @@ module.exports = class Singleton {
     if (data.message === '查询无结果') {
       throw new Error(`找不到【${name}】，可能需要更详细一点（省市区）`)
     } else {
-      throw new Error(`${this.key.split('-')[0]}${data.message}`)
+      throw new Error(`${this.key.split('-')[0]} ${name} ${data.message}`)
     }
   }
 

package/package.json

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