q-koa 8.0.2 → 8.0.5

package/core/app.js

@@ -70,7 +70,16 @@ class APP {
   constructor(_config) {
     const config = _.defaultsDeep(_config, defaultConfig)
     const { port } = config
-    this.config = config
+    this.config = {
+      ...config,
+      includes: config.includes.map((item) => {
+        return typeof item === 'string'
+          ? {
+              item,
+            }
+          : item
+      }),
+    }
     this.port = port
     this.app = new Koa()
     this.server = null
@@ -244,11 +253,12 @@ class APP {
     // });
 
     starter.on('loadAll', async () => {
-      const appName = this.config.includes[0]
+      const routerName = this.config.includes[0].routerName
+      const appName = this.config.includes[0].dirName
       this.server = this.app.listen(this.port, () => {
         console.log(`server is running at http://localhost:${this.port}`)
         console.log(
-          `first app is http://localhost:3001/${appName}/setting/findOne`
+          `first app is http://localhost:3001/${routerName}/setting/findOne`
         )
       })
 
@@ -295,20 +305,17 @@ class APP {
   }
 
   async initApp() {
-    let dirList = await fsPromise.readdir(
-      path.resolve(__dirname, `${rootDirectory}/${APP_DIR}`)
-    )
-    dirList = dirList.filter((item) => this.config.includes.includes(item))
-
+    if (this.config.includes.length === 0) throw new Error('请填入项目')
     let dbFlag = false
-    for (let i = 0; i < dirList.length; i++) {
-      const appName = dirList[i]
+    for (let i = 0; i < this.config.includes.length; i++) {
+      const routerName = this.config.includes[i].routerName
+      const appName = this.config.includes[i].dirName
 
       console.log(
         chalk.green(`==================== 启动 ${appName} ====================`)
       )
       const routerConfig = {
-        prefix: `/${appName}`,
+        prefix: `/${routerName}`,
       }
       const router = new Router(routerConfig)
       Serve(
@@ -784,7 +791,10 @@ class APP {
 
   initRouter(router) {
     router.post('/:controller', async (ctx, next) => {
-      const appName = router.opts.prefix.substring(1)
+      const routerName = router.opts.prefix.substring(1)
+      const appName = this.config.includes.find(
+        (i) => i.routerName === routerName
+      )
       const { app } = ctx
       const { controller } = ctx.params
       if (
@@ -796,7 +806,10 @@ class APP {
       await next()
     })
     const handleRouter = async (ctx) => {
-      const appName = router.opts.prefix.substring(1)
+      const routerName = router.opts.prefix.substring(1)
+      const appName = this.config.includes.find(
+        (i) => i.routerName === routerName
+      ).dirName
       const { app } = ctx
 
       const { controller, fn, sub } = ctx.params

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

@@ -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`
 
@@ -918,15 +918,57 @@ exports.notify = async (ctx) => {
   ctx.res.end(returnResult)
 }
 
+exports.url_link = 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.createUrlLink({
+    page,
+    scene,
+  })
+  ctx.SUCCESS(result)
+}
+
+exports.url_scheme = 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 +1026,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/weixinMP.js

@@ -8,6 +8,10 @@ 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 createUrlLinkUrl =
+  'https://api.weixin.qq.com/wxa/generate_urllink?access_token=%s'
 const sendMessageUrl =
   'https://api.weixin.qq.com/cgi-bin/message/subscribe/send?access_token=%s'
 const handleMessageUrl =
@@ -41,6 +45,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 +301,60 @@ module.exports = class Singleton {
     return result.phone_info
   }
 
+  async createUrlLink(options) {
+    const { page, scene, ...rest } = options
+    const access_token = await this.getAccessToken()
+    const url = util.format(createUrlLinkUrl, access_token)
+    const payLoad = {
+      ...rest,
+      path: options.page,
+      query: options.scene
+        ? Object.keys(options.scene)
+            .map((item) => `${item}=${options.scene[item]}`)
+            .join('&')
+        : '',
+    }
+
+    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.url_link
+  }
+
+  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.2",
+  "version": "8.0.5",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -40,6 +40,7 @@
     "koa-static": "^5.0.0",
     "koa-useragent": "^4.0.0",
     "koa-xml-body": "^2.1.0",
+    "koa-proxies": "^0.12.2",
     "lodash": "^4.17.15",
     "lru-cache": "^5.1.1",
     "mockjs": "^1.0.1-beta3",