q-koa 12.3.8 → 12.4.0

package/core/app.js

@@ -10,7 +10,6 @@ const moment = require('moment')
 const { EventEmitter } = require('events')
 const nodeVm = require('vm')
 const LRU = require('lru-cache')
-const axios = require('axios')
 
 const { Serve } = require('static-koa-router')
 
@@ -527,11 +526,7 @@ class APP {
     const pluginDirResult = pluginDirList.filter(
       (item) => !excludesModel.includes(item)
     )
-    const log_push_url = _.get(
-      this.app[appName],
-      'appConfig.log_push_url',
-      'https://api.day.app/ieaRfoE3LiPveGbY5qmUwk'
-    )
+
     for (let i = 0; i < pluginDirResult.length; i++) {
       const folder = pluginDirResult[i]
       const isFolder = fs
@@ -647,23 +642,13 @@ class APP {
                     hooks: {
                       beforeCreate: (res, t) => {
                         try {
-                          if (folder === 'log' && log_push_url) {
-                            const logUrl =
-                              `${log_push_url}/${appName}/${encodeURIComponent(
-                                res.toJSON().message
-                              )}` +
-                              (is_dev
-                                ? ''
-                                : `?url=${encodeURIComponent(
-                                    res.toJSON().url
-                                  )}`)
-                            axios({
-                              url: logUrl,
-                              method: 'get',
-                              timeout: 3000,
+                          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,
                             })
-                              .then((res) => res.data)
-                              .catch((e) => console.log(e.message))
                           }
                           if (res.toJSON().user_id) {
                             res.createdid = res.toJSON().user_id

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

@@ -0,0 +1,25 @@
+const { lodash } = require('q-koa')
+const axios = require('axios')
+
+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',
+    'https://api.day.app/ieaRfoE3LiPveGbY5qmUwk'
+  )
+  if (log_push_url) {
+    const logUrl =
+      `${log_push_url}/${appName}/${encodeURIComponent(message)}` +
+      (is_dev ? '' : `?url=${encodeURIComponent(url)}`)
+
+    axios({
+      url: logUrl,
+      method: 'get',
+      timeout: 3000,
+    })
+      .then((res) => res.data)
+      .catch((e) => console.log(e.message))
+  }
+}

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

@@ -33,7 +33,11 @@ exports.login = async (ctx) => {
   let result = await app.model.user.findOne({
     where,
   })
-  if (!result) throw new Error('账号密码错误')
+
+  if (!result) {
+    console.warn(where)
+    throw new Error('账号密码错误')
+  }
   if (_config === 'none') {
     const tokenResult = {
       id: result.id,

package/package.json

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