q-koa 10.8.0 → 10.8.2

package/core/file/plugins/administrator/model.js

@@ -19,7 +19,10 @@ exports.password = {
   defaultValue: '',
   sortOrder: 2,
   set: function (value) {
-    this.setDataValue('password', md5(value))
+    if (value.length === 32) {
+      this.setDataValue('password', md5(value))
+    } else {
+    }
   },
 }
 

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

@@ -1,6 +1,11 @@
 const Alipay = require('../../services/alipay')
 
 const { getAppByCtx, getConfig } = require('q-koa')
+
+const path = require('path')
+const fs = require('fs')
+const AlipaySdk = require('alipay-sdk').default
+
 exports.h5_pay = async (ctx) => {
   const { app, appName } = getAppByCtx(ctx)
 
@@ -66,3 +71,70 @@ exports.notify = async (ctx) => {
     ctx.body = 'success'
   }
 }
+
+exports.mp_pay = async (ctx) => {
+  const { app, appName } = getAppByCtx(ctx)
+  const appConfig = getConfig(app)
+  const { is_dev, site_host } = await appConfig.getObject('base')
+  const {
+    app_id,
+    alipay_public_key,
+    key,
+    is_sandbox,
+    ...rest
+  } = await appConfig.getObject('alipay')
+
+  const {
+    name,
+    out_trade_no: _out_trade_no,
+    prefix = '',
+    order_id,
+    type,
+    price,
+    is_admin = false,
+    buyer_id = '2088722007804916',
+  } = ctx.request.body
+
+  const gateway = is_sandbox
+    ? `https://openapi.alipaydev.com/gateway.do`
+    : 'https://openapi.alipay.com/gateway.do'
+
+  const notify_url = `https://${
+    site_host || 'api.kuashou.com'
+  }/${appName}/alipay/notify`
+
+  const alipaySdk = new AlipaySdk({
+    appId: app_id,
+    signType: 'RSA2', // 签名算法,默认 RSA2
+    gateway, // 支付宝网关地址 ，沙箱环境下使用时需要修改
+    alipayPublicKey: alipay_public_key,
+    privateKey: fs.readFileSync(
+      path.resolve(
+        __dirname,
+        `${process.cwd()}/app/${appName}/plugins/alipay/private-key.pem`
+      ),
+      'ascii'
+    ),
+    notify_url,
+  })
+
+  const out_trade_no = _out_trade_no
+    ? _out_trade_no
+    : prefix
+    ? `${key.length > 10 ? appName : key}_${prefix}-${order_id}_${type}`
+    : `${key.length > 10 ? appName : key}_${order_id}_${type}`
+
+  const res = await alipaySdk.exec('alipay.trade.create', {
+    bizContent: {
+      out_trade_no,
+      total_amount: is_admin || is_dev ? 1 : Math.round(price * 100),
+      subject: name,
+      buyer_id,
+    },
+  })
+  if (res.code !== '10000') {
+    throw new Error(res.subMsg)
+  }
+  const { code, msg, tradeNo, ...other } = res
+  return ctx.SUCCESS(tradeNo)
+}

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

@@ -1,4 +1,4 @@
-const { lodash, getAppByCtx, getConfig } = require('q-koa')
+const { lodash, getAppByCtx, getConfig, moment } = require('q-koa')
 
 const axios = require('axios')
 const OAuth = require('wechat-oauth')
@@ -484,6 +484,16 @@ exports.mp_login = async (ctx) => {
     user: tokenResult,
   })
 
+  if (
+    result.updated_at &&
+    moment().diff(moment(result.updated_at), 'hours') > 24
+  ) {
+    app.model.user.upsert({
+      id: result.id,
+      updated_at: moment(),
+    })
+  }
+
   return ctx.SUCCESS({
     token,
     user: app.appConfig.loginData

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "q-koa",
-  "version": "10.8.0",
+  "version": "10.8.2",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -16,6 +16,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
+    "alipay-sdk": "^3.2.0",
     "@alicloud/pop-core": "^1.7.9",
     "@sigodenjs/wechatpay": "^2.1.1",
     "ali-oss": "^6.11.2",