q-koa 13.8.55 → 13.8.57

package/core/app.js

@@ -8,7 +8,6 @@ const Sequelize = require('sequelize')
 const redis = require('redis')
 const moment = require('moment')
 const { EventEmitter } = require('events')
-const nodeVm = require('vm')
 const { LRUCache } = require('lru-cache')
 const axios = require('axios')
 
@@ -67,7 +66,7 @@ const starter = new EventEmitter()
 const formatPostFunction = (str) => `eval(${str})`
 
 const runVm = (_str) => {
-  return nodeVm.runInNewContext(_str)
+  return new Function(`return ${_str}`)()
 }
 
 const getLiteral = (str) => {
@@ -371,6 +370,16 @@ class APP {
 
         const version = require('q-koa/package.json').version
         console.log(chalk.green(`version: ${version}`))
+
+        // 监听完成后，执行各 appConfig 中配置的 startHook，上下文为对应 app
+        Object.keys(this.app).forEach((name) => {
+          const startHook = _.get(this.app[name], 'appConfig.startHook')
+          if (typeof startHook === 'function') {
+            Promise.resolve(startHook(this.app[name])).catch((e) => {
+              console.log(chalk.red(`${name} startHook执行失败`), e)
+            })
+          }
+        })
       })
 
       // keep-alive 超时必须大于负载均衡的空闲连接超时（CLB/ALB 默认 15 秒），

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

@@ -550,106 +550,6 @@ exports.initDataWithCache = exports.initData = async (ctx) => {
   return ctx.SUCCESS(result)
 }
 
-exports.recentlyError = async (ctx) => {
-  // const {
-  //   app,
-  //   appName,
-  // } = getAppByCtx(ctx);
-
-  if (ctx.ws) {
-    const ws = await ctx.ws()
-    const send = (data) => ws.send(JSON.stringify(data))
-    ctx.app.on('error', async (err) => {
-      console.log(err)
-      try {
-        send({
-          type: 'error',
-          payload: err ? err.errorData : {},
-        })
-      } catch (e) {
-        console.log(e)
-      }
-    })
-  } else {
-    throw new Error('这是一个websocket url')
-  }
-}
-
-exports.sandbox = async (ctx) => {
-  const code = `
-          module.exports = async (callback)=>{
-              callback({
-                name:1
-              })
-          }
-      `
-  // const { code } = ctx.request.body;
-  const vm = new VM({
-    sandbox: {
-      axios,
-      module,
-      setTimeout,
-      sleep: (time) =>
-        new Promise((resolve) => setTimeout(resolve, time * 1000)),
-    },
-  })
-  vm.run(code)(ctx.SUCCESS)
-}
-
-exports.onlineChat = async (ctx) => {
-  if (ctx.ws) {
-    const ws = await ctx.ws()
-    const send = (data) => ws.send(JSON.stringify(data))
-    ws.on('message', async (code) => {
-      const vm = new VM({
-        sandbox: {
-          send: (data) => ws.send(JSON.stringify(data)),
-          axios,
-        },
-      })
-      vm.run(code)
-      const unhandledRejections = {}
-
-      process.on('unhandledRejection', (reason) => {
-        if (unhandledRejections[reason]) {
-          console.log('====?', reason)
-        } else {
-          send({
-            type: 'error',
-            payload: `${reason}`,
-          })
-          unhandledRejections[reason] = true
-        }
-      })
-    })
-  } else {
-    throw new Error('这是一个websocket url')
-  }
-}
-
-exports.chat = async (ctx) => {
-  const { app } = getAppByCtx(ctx)
-  if (ctx.ws) {
-    const ws = await ctx.ws()
-    const send = (data) => ws.send(JSON.stringify(data))
-    ws.on('message', async (payload) => {
-      const message = JSON.parse(payload)
-      const result = await app.model.ask.create({
-        user_id: message.payload.user_id,
-        content: message.payload.content,
-        is_ask: Boolean(message.payload.user_id),
-      })
-
-      send({
-        type: 'message',
-        payload: result,
-      })
-    })
-  } else {
-    throw new Error('这是一个websocket url')
-  }
-}
-
 exports.showModelCount = async (ctx) => {
   const { app, appName } = getAppByCtx(ctx)
   const { is_count = false } = ctx.request.body

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

@@ -2,10 +2,9 @@ const lodash = require('lodash')
 const { Sequelize } = require('q-koa')
 const { formatLiteralObj, filterFunction } = require('../../utils')
 const formatPostFunction = (str) => `eval(${str})`
-const nodeVm = require('vm')
 const axios = require('axios')
 const runVm = (_str) => {
-  return nodeVm.runInNewContext(_str)
+  return new Function(`return ${_str}`)()
 }
 
 const memRunVm = lodash.memoize(runVm)

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

@@ -452,6 +452,112 @@ exports.mp_getPhoneNew = async (ctx) => {
   })
 }
 
+/**
+ * 小程序手机号实时认证组件（getRealtimePhoneNumber）
+ * 后端换取接口与普通手机号一致，code 来自实时认证组件回调
+ */
+exports.mp_getRealPhone = async (ctx) => {
+  const { app, appName } = getAppByCtx(ctx)
+
+  const { code, config = 'weixin_mp' } = ctx.request.body
+
+  const user_id = ctx.request[appName + '-user'].id
+  const appConfig = getConfig(app)
+  const { app_id, app_secrect } = await appConfig.getObject(config)
+
+  const weixinMp = new WeixinMp({
+    appid: app_id,
+    secrect: app_secrect,
+  })
+  weixinMp.init()
+
+  const { phoneNumber } = await weixinMp.getPhoneNumber(code)
+
+  if (!phoneNumber) throw new Error('微信获取手机失败，请重试')
+
+  const exist = await app.model.user.findOne({
+    where: {
+      mobile: phoneNumber,
+    },
+    include: [
+      {
+        model: app.model.mp_user,
+      },
+    ],
+  })
+
+  const mobileExist =
+    exist &&
+    exist.mp_user &&
+    (!exist.mp_user.appid || exist.mp_user.appid === app_id)
+
+  if (mobileExist) {
+    return ctx.ERROR('系统已存在该手机号')
+  }
+
+  await app.model.user.upsert({
+    id: user_id,
+    mobile: phoneNumber,
+  })
+
+  const result = await app.model.user.findOne({
+    where: {
+      id: user_id,
+    },
+    include: [
+      {
+        model: app.model.h5_user,
+      },
+      {
+        model: app.model.mp_user,
+      },
+      {
+        model: app.model.toutiao_user,
+      },
+      ...app.include.user,
+    ].filter((item) => item.model),
+  })
+
+  const is_token_name = app.appConfig.is_token_name
+
+  const tokenResult = {
+    id: result.id,
+    ...(is_token_name
+      ? {
+          name: result.name,
+        }
+      : {}),
+    mp_user: result.mp_user
+      ? {
+          openid: result.mp_user && result.mp_user.openid,
+        }
+      : null,
+    ...(result.h5_user
+      ? {
+          h5_user: {
+            openid: result.h5_user && result.h5_user.openid,
+          },
+        }
+      : {}),
+    ...(result.toutiao_user
+      ? {
+          toutiao_user: {
+            openid: result.toutiao_user && result.toutiao_user.openid,
+          },
+        }
+      : {}),
+  }
+
+  const token = await app.sign({
+    user: tokenResult,
+  })
+
+  return ctx.SUCCESS({
+    token,
+    user: result,
+  })
+}
+
 /**
  * 微信小程序登录
  */

package/package.json

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