q-koa 12.7.1 → 12.8.1

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

@@ -73,27 +73,23 @@ exports.upload = async (ctx) => {
   return ctx.SUCCESS(responseData)
 }
 
-exports.oss_upload = async (ctx) => {
+exports.oss_upload = async (ctx, _data) => {
   const { app } = getAppByCtx(ctx)
 
-  if (
-    !(ctx.request.files && ctx.request.files.file) &&
-    !(ctx.request.body.url && ctx.request.body.filename)
-  ) {
-    ctx.status = 500
-    ctx.ERROR('请选择上传文件')
+  if (!_data) {
+    if (
+      !(ctx.request.files && ctx.request.files.file) &&
+      !(ctx.request.body.url && ctx.request.body.filename)
+    ) {
+      ctx.status = 500
+      ctx.ERROR('请选择上传文件')
+    }
   }
 
   const appConfig = getConfig(app)
 
-  const {
-    accessKeyId,
-    accessKeySecret,
-    bucket,
-    region,
-    cdn_host,
-    oss_host,
-  } = await appConfig.getObject('oss')
+  const { accessKeyId, accessKeySecret, bucket, region, cdn_host, oss_host } =
+    await appConfig.getObject('oss')
 
   if (!(accessKeyId && accessKeySecret && bucket && region)) {
     throw new Error('没有配置oss设置')
@@ -108,6 +104,7 @@ exports.oss_upload = async (ctx) => {
   })
   let fileName
   let imageData
+
   if (ctx.request.files && ctx.request.files.file) {
     const { file } = ctx.request.files
     fileName = `${String(
@@ -115,32 +112,45 @@ exports.oss_upload = async (ctx) => {
     )}.${file.name.split('.')[file.name.split('.').length - 1]}`
     imageData = file.path
   } else {
-    const { url: imageUrl, filename: imageFileName } = ctx.request.body
-    fileName = imageFileName
-    const formatUrl = imageUrl.startsWith('//') ? 'http:' + imageUrl : imageUrl
-    try {
-      imageData = await axios
-        .get(formatUrl, {
-          responseType: 'arraybuffer',
-        })
-        .then((res) => res.data)
-    } catch (e) {
-      ctx.status = 500
-      ctx.ERROR('请求图片错误')
+    if (_data) {
+      fileName = _data.fileName
+      imageData = _data.buffer
+    } else {
+      const { url: imageUrl, filename: imageFileName } = ctx.request.body
+      fileName = imageFileName
+      const formatUrl = imageUrl.startsWith('//')
+        ? 'http:' + imageUrl
+        : imageUrl
+      try {
+        imageData = await axios
+          .get(formatUrl, {
+            responseType: 'arraybuffer',
+          })
+          .then((res) => res.data)
+      } catch (e) {
+        ctx.status = 500
+        ctx.ERROR('请求图片错误')
+      }
     }
   }
   const result = await client.put(fileName, imageData)
   if (result.res && result.res.status === 200) {
     if (oss_host && cdn_host) {
       const url = result.url.replace(oss_host, cdn_host)
-      return ctx.SUCCESS({
+      ctx.SUCCESS({
         url,
       })
+      return {
+        url,
+      }
     } else {
       const url = result.url
-      return ctx.SUCCESS({
+      ctx.SUCCESS({
         url,
       })
+      return {
+        url,
+      }
     }
   } else {
     throw new Error(result.res.statusMessage)

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

@@ -1,4 +1,7 @@
 const axios = require('axios')
+const XLSX = require('xlsx')
+const moment = require('moment')
+
 exports.gpt = async ({ content }) => {
   let result = ''
   let messages = [
@@ -35,3 +38,17 @@ exports.gpt = async ({ content }) => {
 
   return result
 }
+
+exports.formatXLSX = ({ header, data, fileName: _fileName }) => {
+  const fileName = `${_fileName || moment().format('YYYYMMDDHHmmss') + ''}.xlsx`
+  const workbook = XLSX.utils.book_new()
+  const worksheetData = [header, ...data]
+  const worksheet = XLSX.utils.aoa_to_sheet(worksheetData)
+  XLSX.utils.book_append_sheet(workbook, worksheet, 'Sheet1')
+  const buffer = XLSX.write(workbook, { type: 'buffer', bookType: 'xlsx' })
+
+  return {
+    fileName,
+    buffer,
+  }
+}

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

@@ -338,11 +338,14 @@ exports.mp_login = async (ctx) => {
 
   let uid
   if (openIdUser) {
-    await app.model.mp_user.update(post, {
-      where: {
-        openid: post.openid,
-      },
-    })
+    await app.model.mp_user.update(
+      lodash.omit(post, openIdUser.user_id ? ['user_id'] : []),
+      {
+        where: {
+          openid: post.openid,
+        },
+      }
+    )
     if (app.attributes.user.mp_openid) {
       app.model.user.update(
         {
@@ -1215,6 +1218,21 @@ exports.url_link = async (ctx) => {
   ctx.SUCCESS(result)
 }
 
+exports.short_link = async (ctx) => {
+  const { app } = getAppByCtx(ctx)
+
+  const { page, scene, title, config = 'weixin_mp' } = ctx.request.body
+  if (!app.service.weixin) throw new Error(`weixin可能没有service.js`)
+  const result = await app.service.weixin.short_link({
+    app,
+    page,
+    scene,
+    title,
+    config,
+  })
+  ctx.SUCCESS(result)
+}
+
 exports.url_scheme = async (ctx) => {
   const { app } = getAppByCtx(ctx)
 

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

@@ -103,7 +103,6 @@ exports.refund = async ({
       }/${appName}/weixin/refund_notify/${pay_config}`,
     }
 
-    console.log(data)
     const { result_code, err_code_des, ...restData } = isPem
       ? await wxpay.refund(data)
       : await payObj.refund(data)
@@ -198,7 +197,6 @@ exports.refundOnly = async ({
       out_refund_no,
     }
 
-    console.log(data)
     const { result_code, err_code_des, ...restData } = (await isPem)
       ? await wxpay.refund(data)
       : await payObj.refund(data)
@@ -452,6 +450,28 @@ exports.url_link = async ({ app, page, scene, config = 'weixin_mp' }) => {
   return result
 }
 
+exports.short_link = async ({
+  app,
+  page,
+  scene,
+  title,
+  config = 'weixin_mp',
+}) => {
+  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.createShortLink({
+    page,
+    scene,
+    title,
+  })
+  return result
+}
+
 exports.user_enter_tempsession = async ({ app, result }) => {
   console.log('user_enter_tempsession', result)
 }

package/core/file/services/weixinMP.js

@@ -12,6 +12,8 @@ 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 createShortLinkUrl =
+  'https://api.weixin.qq.com/wxa/genwxashortlink?access_token=%s'
 const sendMessageUrl =
   'https://api.weixin.qq.com/cgi-bin/message/subscribe/send?access_token=%s'
 const handleMessageUrl =
@@ -367,6 +369,34 @@ module.exports = class Singleton {
     return result.url_link
   }
 
+  async createShortLink(options) {
+    const { page, scene, ...rest } = options
+    const access_token = await this.getAccessToken()
+    const url = util.format(createShortLinkUrl, access_token)
+    const query = options.scene
+      ? Object.keys(options.scene)
+          .map((item) => `${item}=${options.scene[item]}`)
+          .join('&')
+      : ''
+    const payLoad = {
+      ...rest,
+      page_url: options.page + (query ? '?' + query : ''),
+      page_title: options.title,
+      is_permanent: true,
+    }
+
+    const result = await axios.post(url, payLoad).then((res) => res.data)
+
+    if (result.errcode) {
+      if (result.errcode === 40001) {
+        cache.reset()
+        return await this.createShortLink(options)
+      }
+      throw new Error(`${result.errcode};${result.errmsg}`)
+    }
+    return result.link
+  }
+
   async createUrlscheme(options) {
     const { page, scene, ...rest } = options
     const access_token = await this.getAccessToken()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "q-koa",
-  "version": "12.7.1",
+  "version": "12.8.1",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -59,7 +59,8 @@
     "sha1": "^1.1.1",
     "redis": "^4.0.3",
     "yly-nodejs-sdk": "^1.0.2",
-    "vm2": "^3.9.19"
+    "vm2": "^3.9.19",
+    "xlsx": "^0.18.5"
   },
   "devDependencies": {
     "eslint": "^4.19.1",