q-koa 10.1.1 → 10.1.3

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

@@ -1,5 +1,5 @@
 const md5 = require('js-md5')
-const { getAppByCtx, getConfig, lodash } = require('q-koa')
+const { getAppByCtx, getConfig, lodash, moment } = require('q-koa')
 const { getAppConfig } = require('../../utils')
 
 exports.login = async (ctx) => {
@@ -395,6 +395,16 @@ exports.checkLogin = async (ctx) => {
     const token = await app.sign({
       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/core/file/plugins/weixin/controller.js

@@ -894,8 +894,8 @@ exports.mp_pay = async (ctx) => {
   const out_trade_no = _out_trade_no
     ? _out_trade_no
     : prefix
-    ? `${key}_${prefix}-${order_id}_${type}`
-    : `${key}_${order_id}_${type}`
+    ? `${key.length > 10 ? appName : key}_${prefix}-${order_id}_${type}`
+    : `${key.length > 10 ? appName : key}_${order_id}_${type}`
 
   const notify_url = `https://${
     site_host || 'api.kuashou.com'
@@ -928,6 +928,11 @@ exports.mp_pay = async (ctx) => {
     timeStamp,
   } = prePayResult
 
+  if (!nonce_str) {
+    console.error(`可能微信商户被暂停使用`)
+    throw new Error(`签名错误，请通知平台检查后再试`)
+  }
+
   if (prepay_id.includes('undefined')) {
     const model = type === 'H5-WEIXIN' ? 'h5_user' : 'mp_user'
     const userTarget = await app.model[model].findOne({

package/package.json

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