q-koa 7.9.9 → 8.0.2

package/core/app.js

@@ -236,7 +236,7 @@ class APP {
       ) {
         this.app[appName].model.log.upsert(errorData)
       }
-      throw new Error(err)
+      throw new Error(err.message)
     })
 
     // this.app.on('message', async (content) => {
@@ -381,7 +381,7 @@ class APP {
       } catch (e) {
         console.log(`${appName}数据库连接失败`)
         console.log(e)
-        throw new Error(e)
+        throw new Error(e.message)
       }
       if (
         this.app[appName] &&
@@ -1764,7 +1764,14 @@ APP.getAppByCtx = (ctx) => {
     controller,
   }
 }
-
+APP.getUserByCtx = (ctx) => {
+  try {
+    const appName = ctx.router.opts.prefix.substring(1)
+    return ctx.request[`${appName}-user`].id
+  } catch (e) {
+    return 0
+  }
+}
 APP.getClientTypeByCtx = (ctx) => {
   const typeEnum = {
     1: 'admin',

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

@@ -80,7 +80,7 @@ exports.mp_getPhone = async (ctx) => {
     (!exist.mp_user.appid || exist.mp_user.appid === app_id)
 
   if (mobileExist) {
-    throw new Error('系统已存在该手机号')
+    return ctx.ERROR('系统已存在该手机号')
   }
 
   const userResult = await app.model.mp_user.findOne({
@@ -90,7 +90,7 @@ exports.mp_getPhone = async (ctx) => {
   })
 
   if (!userResult || !userResult.user_id)
-    throw new Error('微信获取手机失败,请重试')
+    return ctx.ERROR('微信获取手机失败,请重试')
 
   await app.model.user.upsert({
     id: userResult.user_id,
@@ -207,7 +207,7 @@ exports.mp_getPhoneNew = async (ctx) => {
     (!exist.mp_user.appid || exist.mp_user.appid === app_id)
 
   if (mobileExist) {
-    throw new Error('系统已存在该手机号')
+    return ctx.ERROR('系统已存在该手机号')
   }
 
   await app.model.user.upsert({

package/core/file/services/aliSms.js

@@ -1,37 +1,40 @@
 const Core = require('@alicloud/pop-core')
 const { lodash } = require('q-koa')
-module.exports = class Sms {
-  constructor(config) {
-    this.config = {
-      accessKeyId: config.accessKeyId, // 开发者账号id
-      accessKeySecret: config.accessKeySecret, // 开发者token
-      SignName: config.SignName, // 应用id
-      param: Array.from(
-        {
-          length: config.number || 4,
-        },
-        () => lodash.random(0, 9)
-      ).join(''),
+module.exports = class Singleton {
+  constructor(key) {
+    this.key = key
+
+    /**
+     * 单例模式
+     */
+    if (!Singleton.instance) {
+      Singleton.instance = this
+    }
+    const previous = Singleton.instance.getConfig()
+    if (!lodash.isEqual(previous, key)) {
+      Singleton.instance = this
     }
+    return Singleton.instance
+  }
+
+  init() {
     this.client = new Core({
-      accessKeyId: this.config.accessKeyId,
-      accessKeySecret: this.config.accessKeySecret,
+      accessKeyId: this.key.accessKeyId,
+      accessKeySecret: this.key.accessKeySecret,
       endpoint: 'https://dysmsapi.aliyuncs.com',
       apiVersion: '2017-05-25',
     })
   }
 
   async send({ mobile, TemplateCode, TemplateParam }) {
-    // if(!mobile) throw new Error('请输入手机号码')
+    console.log('JSON.stringify(TemplateParam)')
     const result = await this.client.request(
       'SendSms',
       {
         PhoneNumbers: mobile,
-        SignName: this.config.SignName,
+        SignName: this.key.SignName,
         TemplateCode,
-        TemplateParam: JSON.stringify({
-          code: this.config.param,
-        }),
+        TemplateParam: JSON.stringify(TemplateParam),
       },
       {
         method: 'POST',
@@ -40,7 +43,7 @@ module.exports = class Sms {
     return result
   }
 
-  getCode() {
-    return this.config.param
+  getConfig() {
+    return this.key
   }
 }

package/package.json

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