q-koa 12.4.2 → 12.4.5

package/core/app.js

@@ -50,6 +50,11 @@ const starter = new EventEmitter()
 
 const formatPostFunction = (str) => `eval(${str})`
 
+const runVm = (_str) => {
+  return nodeVm.runInNewContext(_str)
+}
+
+const memRunVm = _.memoize(runVm)
 const connectDatabase = (database) => (config) => {
   if (!database) throw new Error('请配置数据库名称')
   if (!config.username) throw new Error('请配置数据库账号')
@@ -1001,11 +1006,11 @@ class APP {
                * 如果像user_distribute里有两个user，需要用这个来重新建立关系
                */
               const _str = formatPostFunction(relate)
-              nodeVm.runInNewContext(_str)(app[appName])
+              memRunVm(_str)(app[appName])
               // relate.toFunction()(app[appName]);
             }
             const _str = formatPostFunction(include)
-            const postInclude = nodeVm.runInNewContext(_str)
+            const postInclude = memRunVm(_str)
             const strInclude = postInclude(app[appName])
             // const postInclude = include.toFunction();
 

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

@@ -110,9 +110,9 @@ exports.oss_upload = async (ctx) => {
   let imageData
   if (ctx.request.files && ctx.request.files.file) {
     const { file } = ctx.request.files
-    fileName = `${
-      String(new Date().getTime()).split('').reverse().join('') + Math.random()
-    }.${file.name.split('.')[file.name.split('.').length - 1]}`
+    fileName = `${String(
+      new Date().getYear() + new Date().getMonth() + Math.random()
+    )}.${file.name.split('.')[file.name.split('.').length - 1]}`
     imageData = file.path
   } else {
     const { url: imageUrl, filename: imageFileName } = ctx.request.body

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

@@ -1,4 +1,4 @@
-const { lodash } = require('q-koa')
+const { lodash, getConfig } = require('q-koa')
 const axios = require('axios')
 
 const is_dev = process.env.NODE_ENV !== 'production'
@@ -10,9 +10,31 @@ exports.push = async ({ app, appName = '通知', url, message }) => {
     'https://api.day.app/ieaRfoE3LiPveGbY5qmUwk'
   )
   if (log_push_url) {
-    const logUrl =
-      `${log_push_url}/${appName}/${encodeURIComponent(message)}` +
-      (is_dev ? '' : `?url=${encodeURIComponent(url)}`)
+    const appConfig = getConfig(app)
+    const { site_name, logo_image, logo_img } = await appConfig.getObject(
+      'base'
+    )
+
+    const queryObject = {
+      ...(is_dev ? {} : { url: encodeURIComponent(url) }),
+      ...(logo_image || logo_img
+        ? {
+            icon: encodeURIComponent(
+              (logo_image || logo_img).replace('http', 'https')
+            ),
+          }
+        : {}),
+    }
+
+    const query = Object.keys(queryObject)
+      .map((key) => {
+        return `${key}=${queryObject[key]}`
+      })
+      .join('&')
+
+    const logUrl = `${log_push_url}/${encodeURIComponent(
+      site_name || appName
+    )}/${encodeURIComponent(message)}${query ? '?' + query : ''}`
 
     axios({
       url: logUrl,

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

@@ -2,6 +2,11 @@ const { getConfig, lodash, Sequelize } = require('q-koa')
 const formatPostFunction = (str) => `eval(${str})`
 const nodeVm = require('vm')
 const axios = require('axios')
+const runVm = (_str) => {
+  return nodeVm.runInNewContext(_str)
+}
+
+const memRunVm = lodash.memoize(runVm)
 
 exports.initData = async ({ includes, excludes, app, ctx }) => {
   const appConfig = getConfig(app)
@@ -86,7 +91,7 @@ exports.initData = async ({ includes, excludes, app, ctx }) => {
 
           if (include) {
             const _str = formatPostFunction(include)
-            const postInclude = nodeVm.runInNewContext(_str)
+            const postInclude = memRunVm(_str)
             // const postInclude = include.toFunction();
             if (!Array.isArray(postInclude(app))) {
               if (process.env.NODE_ENV !== 'production') {

package/package.json

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