q-koa 13.5.0 → 13.6.0

package/core/app.js

@@ -446,6 +446,7 @@ class APP {
         router
       )
 
+      const { push } = require('./file/plugins/log/service')
       try {
         const target = includeList.find((i) => i.app === appName)
         const dbName =
@@ -465,18 +466,54 @@ class APP {
         const configFile = path.resolve(__dirname, configPath)
         const configExist = fs.existsSync(configFile)
 
-        if (this.config.redis && this.config.redis.url) {
-          const client = redis.createClient(this.config.redis)
-          client.on('error', (err) => console.log('Redis Client Error', err))
+        if (
+          this.config.redis &&
+          this.config.redis.host &&
+          this.config.redis.port
+        ) {
+          let subscriber
+          let client
+          try {
+            client = redis.createClient({
+              socket: {
+                host: this.config.redis.host,
+                port: this.config.redis.port,
+                reconnectStrategy: false,
+              },
+              ...(this.config.redis.database
+                ? {
+                    database: this.config.redis.database,
+                  }
+                : {}),
+            })
+
+            client.on('error', (err) => console.log('Redis Client Error', err))
+
+            await client.connect()
+
+            subscriber = client.duplicate()
+            await subscriber.connect()
+            push({
+              appName,
+              message: `${appName}连接redis成功，${this.config.ip}:${this.port}`,
+            })
+          } catch (e) {
+            client = null
 
-          await client.connect()
+            push({
+              appName,
+              message: `${appName}连接redis失败，${e.message}`,
+            })
+          }
 
-          const subscriber = client.duplicate()
-          await subscriber.connect()
           this.app[appName] = {
             sequelize: db,
-            redisClient: client,
-            subscriber,
+            ...(client
+              ? {
+                  redisClient: client,
+                  subscriber,
+                }
+              : {}),
             appConfig: _.defaultsDeep(
               configExist ? require(path.resolve(__dirname, configPath)) : {},
               this.config.app,
@@ -531,8 +568,6 @@ class APP {
         await this.initModel(appName)
         // const models = Object.keys(this.app[appName].model).join(' / ')
       } catch (e) {
-        const { push } = require('./file/plugins/log/service')
-
         push({
           appName,
           message: `${appName}数据库连接失败`,

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

@@ -97,6 +97,7 @@ exports.refund = async ({
   out_trade_no: _out_trade_no,
   out_refund_no: _out_refund_no,
   is_pem = false,
+  mch_id = '',
   ...rest
 }) => {
   if (!ctx) throw new Error('?ctx')
@@ -110,12 +111,14 @@ exports.refund = async ({
 
   const payObj = new Pay({
     appId: appId,
-    mchId: mchId,
+    mchId: mch_id || mchId,
     key: key.length > 10 ? key : partner_key, // 微信商户平台API密钥,
     pfx: await fsPromise.readFile(
       path.resolve(
         __dirname,
-        `${process.cwd()}/app/${appName}/plugins/weixin/${key}/apiclient_cert.p12`
+        `${process.cwd()}/app/${appName}/plugins/weixin/${
+          mch_id || key
+        }/apiclient_cert.p12`
       )
     ),
   })
@@ -134,20 +137,24 @@ exports.refund = async ({
   if (!orderDetail) throw new Error('不存在该订单')
   const wxpay = WXPay({
     appid: appId,
-    mch_id: mchId,
+    mch_id: mch_id || mchId,
     partner_key: key.length > 10 ? key : partner_key, // 微信商户平台API密钥
     ...(isPem
       ? {
           cert_pem: await fsPromise.readFile(
             path.resolve(
               __dirname,
-              `${process.cwd()}/app/${appName}/plugins/weixin/${key}/apiclient_cert.pem`
+              `${process.cwd()}/app/${appName}/plugins/weixin/${
+                mch_id || key
+              }/apiclient_cert.pem`
             )
           ),
           key_pem: await fsPromise.readFile(
             path.resolve(
               __dirname,
-              `${process.cwd()}/app/${appName}/plugins/weixin/${key}/apiclient_key.pem`
+              `${process.cwd()}/app/${appName}/plugins/weixin/${
+                mch_id || key
+              }/apiclient_key.pem`
             )
           ),
         }
@@ -210,6 +217,7 @@ exports.refundOnly = async ({
   out_trade_no: _out_trade_no,
   out_refund_no: _out_refund_no,
   is_pem = false,
+  mch_id = '',
   ...rest
 }) => {
   if (!ctx) throw new Error('?ctx')
@@ -223,12 +231,14 @@ exports.refundOnly = async ({
 
   const payObj = new Pay({
     appId: appId,
-    mchId: mchId,
+    mchId: mch_id || mchId,
     key: key.length > 10 ? key : partner_key, // 微信商户平台API密钥,
     pfx: await fsPromise.readFile(
       path.resolve(
         __dirname,
-        `${process.cwd()}/app/${appName}/plugins/weixin/${key}/apiclient_cert.p12`
+        `${process.cwd()}/app/${appName}/plugins/weixin/${
+          mch_id || key
+        }/apiclient_cert.p12`
       )
     ), // 微信商户平台证书
   })
@@ -238,7 +248,7 @@ exports.refundOnly = async ({
 
   const wxpay = WXPay({
     appid: appId,
-    mch_id: mchId,
+    mch_id: mch_id || mchId,
     partner_key: key.length > 10 ? key : partner_key, // 微信商户平台API密钥
     ...(isPem
       ? {
@@ -364,6 +374,7 @@ exports.cash = async ({
   user_id,
   number,
   pay_config = 'weixin_pay',
+  mch_id = '',
 }) => {
   if (!ctx) throw new Error('?ctx')
   const { app, appName } = getAppByCtx(ctx)
@@ -388,12 +399,14 @@ exports.cash = async ({
 
   const payObj = new Pay({
     appId: appId,
-    mchId: mchId,
+    mchId: mch_id || mchId,
     key: key.length > 10 ? key : partner_key, // 微信商户平台API密钥,
     pfx: await fsPromise.readFile(
       path.resolve(
         __dirname,
-        `${process.cwd()}/app/${appName}/plugins/weixin/${key}/apiclient_cert.p12`
+        `${process.cwd()}/app/${appName}/plugins/weixin/${
+          mch_id || key
+        }/apiclient_cert.p12`
       )
     ), // 微信商户平台证书
   })
@@ -952,8 +965,10 @@ const handleBillData = (result) => {
   return {
     header: arr[0],
     list,
-    result: list.map((item) => {
+    result: list.map((item, index) => {
       const array = item.split(',')
+
+      const mchid = array[2].substring(1)
       const orderdate = array[20].substring(1).slice(2, 10)
       const orderPrefix = array[6].substring(1).split('_')[1]
       let order_id = 0
@@ -976,6 +991,7 @@ const handleBillData = (result) => {
         ).format('YYYY-MM-DD')
       }
       return {
+        mchid,
         created_at: array[0].substring(1),
         transactionid: array[5].substring(1),
         [`${[prefix, 'order_id'].filter(Boolean).join('_')}`]: order_id,
@@ -1000,7 +1016,12 @@ const handleBillData = (result) => {
   }
 }
 
-exports.downloadBill = async ({ ctx, pay_config = 'weixin_pay', ...rest }) => {
+exports.downloadBill = async ({
+  ctx,
+  pay_config = 'weixin_pay',
+  mch_id = '',
+  ...rest
+}) => {
   if (!ctx) throw new Error('?ctx')
   const { app, appName } = getAppByCtx(ctx)
   const appConfig = getConfig(app)
@@ -1009,12 +1030,14 @@ exports.downloadBill = async ({ ctx, pay_config = 'weixin_pay', ...rest }) => {
   )
   const payObj = new Pay({
     appId: appId,
-    mchId: mchId,
+    mchId: mch_id || mchId,
     key: key.length > 10 ? key : partner_key, // 微信商户平台API密钥,
     pfx: await fsPromise.readFile(
       path.resolve(
         __dirname,
-        `${process.cwd()}/app/${appName}/plugins/weixin/${key}/apiclient_cert.p12`
+        `${process.cwd()}/app/${appName}/plugins/weixin/${
+          mch_id || key
+        }/apiclient_cert.p12`
       )
     ), // 微信商户平台证书
   })

package/package.json

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