q-koa 8.0.6 → 8.1.3

package/core/app.js

@@ -133,6 +133,13 @@ class APP {
     this.app.use(async (ctx, next) => {
       const verify = util.promisify(jwt.verify)
       const { url, host, ip, method } = ctx.request
+
+      if (ctx.request.header['user-agent'].startsWith('Tencent Security')) {
+        return ctx.ERROR('error')
+      }
+      if (this.config.blackList.includes(ip)) {
+        return ctx.ERROR('error')
+      }
       const appName = url.split('/')[1]
       const { secret, whiteList, _whiteList, tokenKey, expiresIn } =
         ctx.app[appName] && ctx.app[appName].appConfig
@@ -179,7 +186,7 @@ class APP {
         ctx.cookies.get(`${appName}-${tokenKey}`) ||
         ctx.query[`${appName}-${tokenKey}`]
 
-      if (url.length > 2) {
+      if (url.length > 2 && this.config.log.request) {
         console.log(
           moment().format('HH:mm:ss'),
           url,
@@ -191,7 +198,9 @@ class APP {
       try {
         const { user } = await verify(token, secret)
         if (user) {
-          console.log('user id ---> ', appName, '--->', user.id, user.name)
+          if (this.config.log.request) {
+            console.log('user id ---> ', appName, '--->', user.id, user.name)
+          }
           ctx.request[`${appName}-user`] = user
         }
       } catch (e) {
@@ -344,9 +353,9 @@ class APP {
         }
 
         // const proxyConfig = _.get(this.app[appName], 'appConfig.proxy');
-        const taskConfig = _.get(this.app[appName], 'appConfig.task', {
-          is_available: false,
-        })
+        // const taskConfig = _.get(this.app[appName], 'appConfig.task', {
+        //   is_available: false,
+        // })
         // if (proxyConfig) {
         //   this.app.use(proxy(`/${appName}`, proxyConfig));
         // }
@@ -375,9 +384,9 @@ class APP {
 
         await this.initModel(appName)
         // const models = Object.keys(this.app[appName].model).join(' / ')
-        if (taskConfig.is_available) {
-          this.initTask(appName)
-        }
+        // if (taskConfig.is_available) {
+        //   this.initTask(appName)
+        // }
       } catch (e) {
         console.log(`${appName}数据库连接失败`)
         console.log(e)
@@ -1013,7 +1022,7 @@ class APP {
                     continue
                   }
                   const model = myInclude[j].model
-                  const modelName = model.getName()
+                  const modelName = myInclude[j].as || model.getName()
 
                   if (app[appName].attributes[controller][modelName + '_id']) {
                     const idList = rows
@@ -1077,7 +1086,7 @@ class APP {
                       continue
                     }
                     const model = myInclude[j].model
-                    const modelName = model.getName()
+                    const modelName = myInclude[j].as || model.getName()
                     if (
                       app[appName].attributes[controller][modelName + '_id']
                     ) {

package/core/config.js

@@ -5,6 +5,10 @@ module.exports = {
   static: {
     dir: 'public',
   },
+  log: {
+    request: true,
+  },
+  blackList: [],
   task: {
     dir: 'task',
   },

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

@@ -223,7 +223,7 @@ exports.initData = async ({ includes, excludes, app, ctx }) => {
       setting: obj.setting.map((i) => {
         if (i.code === 'is_check' && i.value === false) {
           return {
-            ...i.toJSON(),
+            ...(i.toJSON ? i.toJSON() : i),
             value: apiVersion === cacheVersion,
           }
         }

package/package.json

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