q-koa 8.5.5 → 8.6.2

package/core/app.js

@@ -1835,7 +1835,7 @@ APP.getClientTypeByCtx = (ctx) => {
 
 APP.getConfig = (app) => ({
   async getObject(type) {
-    let configList = await app.cache.get('configList')
+    let configList = app.cache.get('configList')
     if (!configList) {
       configList = await app.model.setting.findAll({
         raw: true,

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

@@ -10,6 +10,7 @@ const axios = require('axios')
 const util = require('util')
 const jwt = require('jsonwebtoken')
 
+const { getImageType } = require('../../utils')
 const Email = require('../../services/email')
 const Geo = require('../../services/geo')
 const Express = require('../../services/express')
@@ -419,3 +420,57 @@ exports.express = async (ctx) => {
 
   ctx.SUCCESS(result)
 }
+
+exports.urlToOss = async (ctx) => {
+  const { app, appName } = getAppByCtx(ctx)
+  const appConfig = getConfig(app)
+  const { is_dev } = await appConfig.getObject('base')
+  const { url } = ctx.request.body
+  const {
+    accessKeyId,
+    accessKeySecret,
+    bucket,
+    region,
+    cdn_host,
+    oss_host,
+  } = await appConfig.getObject('oss')
+
+  if (!url || ['aliyun', cdn_host, oss_host].some((i) => url.includes(i)))
+    return ctx.SUCCESS(url)
+
+  if (!(accessKeyId && accessKeySecret && bucket && region)) {
+    throw new Error('没有配置oss设置')
+  }
+
+  const client = new OSS({
+    accessKeyId,
+    accessKeySecret,
+    bucket,
+    region,
+    secure: true,
+  })
+  const buffer = await axios
+    .get(url, {
+      responseType: 'arraybuffer',
+    })
+    .then((res) => res.data)
+
+  const type = getImageType(buffer)
+  console.log('type', type)
+  const fileName = `${
+    String(new Date().getTime()).split('').reverse().join('') + Math.random()
+  }${type}`
+
+  const result = await client.put(fileName, buffer)
+
+  if (result && result.res && result.res.status === 200) {
+    if (oss_host && cdn_host) {
+      const url = result.url.replace(oss_host, cdn_host)
+      return ctx.SUCCESS(url)
+    } else {
+      return ctx.SUCCESS(result.url)
+    }
+  } else {
+    throw new Error('上传失败')
+  }
+}

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

@@ -7,6 +7,7 @@ exports.initData = async ({ includes, excludes, app, ctx }) => {
   const appConfig = getConfig(app)
   const { version: cacheVersion } = await appConfig.getObject('base')
   const apiVersion = ctx.request.header.version
+  const config = ctx.request.header.config
 
   if (!(excludes instanceof Array)) {
     excludes = [excludes]
@@ -218,6 +219,14 @@ exports.initData = async ({ includes, excludes, app, ctx }) => {
     {}
   )
   if (obj.setting && apiVersion && cacheVersion) {
+    let target = null
+    if (config) {
+      const application = app.cache.get('application')
+      if (application) {
+        target = application.find((a) => a.config === config)
+      }
+    }
+
     return {
       ...obj,
       setting: obj.setting.map((i) => {
@@ -227,6 +236,17 @@ exports.initData = async ({ includes, excludes, app, ctx }) => {
             value: apiVersion === cacheVersion,
           }
         }
+
+        if (
+          target &&
+          target.hasOwnProperty(i.code) &&
+          i.hasOwnProperty('value')
+        ) {
+          return {
+            ...(i.toJSON ? i.toJSON() : i),
+            value: target[i.code],
+          }
+        }
         return i
       }),
     }

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

@@ -743,12 +743,14 @@ exports.h5_pay = async (ctx) => {
   } = ctx.request.body
 
   const appConfig = getConfig(app)
-  const { appId, key, mchId } = await appConfig.getObject(pay_config)
+  const { appId, key, mchId, partner_key } = await appConfig.getObject(
+    pay_config
+  )
   const { is_dev, site_host } = await appConfig.getObject('base')
 
   const payObj = new WeixinPay({
     appId,
-    key,
+    key: key.length > 10 ? key : partner_key,
     mchId,
   })
   const result = await payObj.run({
@@ -803,7 +805,7 @@ exports.mp_pay = async (ctx) => {
   }
   const appConfig = getConfig(app)
 
-  const { mchId, key } = await appConfig.getObject(pay_config)
+  const { mchId, key, partner_key } = await appConfig.getObject(pay_config)
   const { is_dev, site_host } = await appConfig.getObject('base')
   // 公众号支付用 服务号 appid，其他用小程序 appid
   const app_id =
@@ -814,7 +816,7 @@ exports.mp_pay = async (ctx) => {
   const wxpay = WXPay({
     appid: app_id,
     mch_id: mchId,
-    partner_key: key, // 微信商户平台API密钥
+    partner_key: key.length > 10 ? key : partner_key, // 微信商户平台API密钥
   })
 
   const pay = (options) =>
@@ -1152,12 +1154,12 @@ exports.checkPay = async (ctx) => {
 
   const appConfig = getConfig(app)
   const app_id = (await appConfig.getObject(config)).app_id
-  const { mchId, key } = await appConfig.getObject(pay_config)
+  const { mchId, key, partner_key } = await appConfig.getObject(pay_config)
 
   const wxpay = WXPay({
     appid: app_id,
     mch_id: mchId,
-    partner_key: key, // 微信商户平台API密钥
+    partner_key: key.length > 10 ? key : partner_key, // 微信商户平台API密钥
   })
 
   const checkOrder = (obj) => {

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

@@ -18,13 +18,15 @@ exports.refund = async ({
 }) => {
   const { app, appName } = getAppByCtx(ctx)
   const appConfig = getConfig(app)
-  const { mchId, key, appId } = await appConfig.getObject(pay_config)
+  const { mchId, key, appId, partner_key } = await appConfig.getObject(
+    pay_config
+  )
   const { site_host } = await appConfig.getObject('base')
 
   const payObj = new Pay({
     appId: appId,
     mchId: mchId,
-    key: key, // 微信商户平台API密钥,
+    key: key.length > 10 ? key : partner_key, // 微信商户平台API密钥,
     pfx: await fsPromise.readFile(
       path.resolve(
         __dirname,
@@ -72,14 +74,16 @@ exports.cash = async ({
 }) => {
   const { app, appName } = getAppByCtx(ctx)
   const appConfig = getConfig(app)
-  const { mchId, key, appId } = await appConfig.getObject(pay_config)
+  const { mchId, key, appId, partner_key } = await appConfig.getObject(
+    pay_config
+  )
 
   const { is_dev } = await appConfig.getObject('base')
 
   const payObj = new Pay({
     appId: appId,
     mchId: mchId,
-    key: key, // 微信商户平台API密钥,
+    key: key.length > 10 ? key : partner_key, // 微信商户平台API密钥,
     pfx: await fsPromise.readFile(
       path.resolve(
         __dirname,

package/core/file/utils/index.js

@@ -17,13 +17,28 @@ exports.getList = (config) => (type) => {
 
 exports.getObject = (config, app) => async (type) => {
   if (app) {
-    const applicationList = await app.cache.get('application')
+    const applicationList = app.cache.get('application')
     if (
       applicationList &&
       applicationList.find((item) => item.config === type)
     ) {
       return applicationList.find((item) => item.config === type)
     }
+
+    if (!applicationList) {
+      if (app.model.application) {
+        const result = await app.model.application.findAll()
+
+        if (result.length > 0) {
+          app.cache.set('application', JSON.parse(JSON.stringify(result)))
+
+          const target = result.find((item) => item.config === type)
+          if (target) {
+            return target
+          }
+        }
+      }
+    }
   }
   const obj = config.find((i) => i.code === type)
   if (!obj) throw new Error(`找不到${type}相关设置`)
@@ -68,3 +83,60 @@ exports.safeSplit = (mainStr, str) => {
   }
   return ['', '']
 }
+
+exports.getImageType = (fileBuffer) => {
+  // 将上文提到的 文件标识头 按 字节 整理到数组中
+  const imageBufferHeaders = [
+    { bufBegin: [0xff, 0xd8], bufEnd: [0xff, 0xd9], suffix: '.jpg' },
+    { bufBegin: [0x00, 0x00, 0x02, 0x00, 0x00], suffix: '.tga' },
+    { bufBegin: [0x00, 0x00, 0x10, 0x00, 0x00], suffix: '.rle' },
+    {
+      bufBegin: [0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a],
+      suffix: '.png',
+    },
+    { bufBegin: [0x47, 0x49, 0x46, 0x38, 0x39, 0x61], suffix: '.gif' },
+    { bufBegin: [0x47, 0x49, 0x46, 0x38, 0x37, 0x61], suffix: '.gif' },
+    { bufBegin: [0x42, 0x4d], suffix: '.bmp' },
+    { bufBegin: [0x0a], suffix: '.pcx' },
+    { bufBegin: [0x49, 0x49], suffix: '.tif' },
+    { bufBegin: [0x4d, 0x4d], suffix: '.tif' },
+    {
+      bufBegin: [0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x20, 0x20],
+      suffix: '.ico',
+    },
+    {
+      bufBegin: [0x00, 0x00, 0x02, 0x00, 0x01, 0x00, 0x20, 0x20],
+      suffix: '.cur',
+    },
+    { bufBegin: [0x46, 0x4f, 0x52, 0x4d], suffix: '.iff' },
+    { bufBegin: [0x52, 0x49, 0x46, 0x46], suffix: '.ani' },
+  ]
+  for (const imageBufferHeader of imageBufferHeaders) {
+    let isEqual
+    // 判断标识头前缀
+    if (imageBufferHeader.bufBegin) {
+      const buf = Buffer.from(imageBufferHeader.bufBegin)
+      isEqual = buf.equals(
+        //使用 buffer.slice 方法 对 buffer 以字节为单位切割
+        fileBuffer.slice(0, imageBufferHeader.bufBegin.length)
+      )
+    }
+    // 判断标识头后缀
+    if (isEqual && imageBufferHeader.bufEnd) {
+      const buf = Buffer.from(imageBufferHeader.bufEnd)
+      isEqual = buf.equals(fileBuffer.slice(-imageBufferHeader.bufEnd.length))
+    }
+    if (isEqual) {
+      if (
+        ['.ani', '.iff', '.cur', '.tif', '.pcx', '.rle', '.tga'].includes(
+          imageBufferHeader.suffix
+        )
+      ) {
+        return '.jpg'
+      }
+      return imageBufferHeader.suffix
+    }
+  }
+  // 未能识别到该文件类型
+  return ''
+}

package/core/middlewares.js

@@ -21,12 +21,8 @@ exports.miErrors = () => async (ctx, next) => {
   try {
     return await next()
   } catch (e) {
-    // app.event.emit('message', {
-    //   type: 'error',
-    //   payload: {
-    //     message: e.message,
-    //   },
-    // });
+    console.log(e.message)
+    console.log(e.stack)
     const errorData = {
       url: ctx.request.href,
       body: ctx.request.body,

package/package.json

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