q-koa 8.0.0 → 8.0.3

package/core/app.js

@@ -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,
@@ -149,10 +149,10 @@ exports.mp_getPhone = async (ctx) => {
 exports.getPhone = async (ctx) => {
   const { app } = getAppByCtx(ctx)
 
-  const { code, iv, encryptedData } = ctx.request.body
+  const { code, iv, encryptedData, config = 'weixin_mp' } = ctx.request.body
 
   const appConfig = getConfig(app)
-  const { app_id, app_secrect } = await appConfig.getObject('weixin_mp')
+  const { app_id, app_secrect } = await appConfig.getObject(config)
 
   const weixinLoginUrl = `https://api.weixin.qq.com/sns/jscode2session?appid=${app_id}&secret=${app_secrect}&js_code=${code}&grant_type=authorization_code`
 
@@ -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({
@@ -918,15 +918,39 @@ exports.notify = async (ctx) => {
   ctx.res.end(returnResult)
 }
 
+exports.urlScheme = async (ctx) => {
+  const { app } = getAppByCtx(ctx)
+
+  const { page, scene, config = 'weixin_mp' } = ctx.request.body
+  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 result = await weixinMp.createUrlscheme({
+    page,
+    scene,
+  })
+  ctx.SUCCESS(result)
+}
+
 exports.qr_code = async (ctx) => {
   const { app } = getAppByCtx(ctx)
 
-  const { page, is_hyaline, scene, is_oss = false } = ctx.request.body
+  const {
+    page,
+    is_hyaline,
+    scene,
+    is_oss = false,
+    config = 'weixin_mp',
+  } = ctx.request.body
 
   // if (!lodash.get(ctx.request, `${appName}-user.id`, null)) throw new Error('没有登录')
 
   const appConfig = getConfig(app)
-  const { app_id, app_secrect } = await appConfig.getObject('weixin_mp')
+  const { app_id, app_secrect } = await appConfig.getObject(config)
 
   const { site_host } = await appConfig.getObject('base')
   const weixinMp = new WeixinMp({
@@ -984,10 +1008,16 @@ exports.qr_code = async (ctx) => {
 exports.sendMessage = async (ctx) => {
   const { app } = getAppByCtx(ctx)
 
-  const { openid, template_id, data, page } = ctx.request.body
+  const {
+    openid,
+    template_id,
+    data,
+    page,
+    config = 'weixin_mp',
+  } = ctx.request.body
 
   const appConfig = getConfig(app)
-  const { app_id, app_secrect } = await appConfig.getObject('weixin_mp')
+  const { app_id, app_secrect } = await appConfig.getObject(config)
 
   const weixinMp = new WeixinMp({
     appid: app_id,

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/core/file/services/weixinMP.js

@@ -8,6 +8,8 @@ const getPhoneNumberUrl =
   'https://api.weixin.qq.com/wxa/business/getuserphonenumber?access_token=%s'
 const createQRCodeUrl =
   'https://api.weixin.qq.com/wxa/getwxacodeunlimit?access_token=%s'
+const createUrlschemeUrl =
+  'https://api.weixin.qq.com/wxa/generatescheme?access_token=%s'
 const sendMessageUrl =
   'https://api.weixin.qq.com/cgi-bin/message/subscribe/send?access_token=%s'
 const handleMessageUrl =
@@ -41,6 +43,7 @@ const cache = new LRU({
   maxAge: 1000 * 60 * 60,
 })
 const uuid = require('node-uuid')
+const { rest } = require('lodash')
 
 const uploadPromise = (options) => {
   return new Promise((resolve, reject) => {
@@ -296,6 +299,34 @@ module.exports = class Singleton {
     return result.phone_info
   }
 
+  async createUrlscheme(options) {
+    const { page, scene, ...rest } = options
+    const access_token = await this.getAccessToken()
+    const url = util.format(createUrlschemeUrl, access_token)
+    const payLoad = {
+      ...rest,
+      jump_wxa: {
+        query: options.scene
+          ? Object.keys(options.scene)
+              .map((item) => `${item}=${options.scene[item]}`)
+              .join('&')
+          : '',
+        path: options.page,
+      },
+    }
+
+    const result = await axios.post(url, payLoad).then((res) => res.data)
+
+    if (result.errcode) {
+      if (result.errcode === 40001) {
+        cache.reset()
+        return await this.getPhoneNumber(code)
+      }
+      throw new Error(`${result.errcode};${result.errmsg}`)
+    }
+    return result.openlink
+  }
+
   async createQR(options) {
     if (!this.config.targetPath) throw new Error('没有配置文件夹')
     const access_token = await this.getAccessToken()

package/package.json

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