@jayfong/x-server 2.1.6 → 2.2.0

package/lib/_cjs/cli/cli.js

@@ -189,6 +189,7 @@ _yargs.default.command('dev', '开始开发', _ => _.positional('index', {
     host: process.env.HOST,
     user: process.env.USER,
     key: process.env.KEY,
-    dir: process.env.DIR
+    dir: process.env.DIR,
+    cmd: process.env.CMD
   });
 }).parse();

package/lib/_cjs/cli/deploy_util.js

@@ -47,7 +47,8 @@ class DeployUtil {
         set -ex
         tar -zxvf ${remoteAppFile} -C ${appDir}
         cd ${appDir}/dist
-        [ -f no_install.lock ] && yarn_disable_self_update_check=true tyn 
+        [ -f no_install.lock ] && yarn_disable_self_update_check=true tyn
+        ${options.cmd || ''}
         pm2 startOrReload pm2.config.js
       `, {
       cwd: options.cwd,

package/lib/_cjs/services/pay.js

@@ -56,8 +56,9 @@ class PayService {
   }
 
   async prepareWepay(options) {
+    const appId = options.appId || this.options.wepay.appId;
     const res = await this.wepayRequest('https://api.mch.weixin.qq.com/v3/pay/transactions/jsapi', {
-      appid: this.options.wepay.appId,
+      appid: appId,
       mchid: this.options.wepay.merchantId,
       description: options.goodsName,
       out_trade_no: options.tradeNumber,
@@ -78,7 +79,7 @@ class PayService {
     }
 
     const params = {
-      appId: this.options.wepay.appId,
+      appId: appId,
       timestamp: String(Math.round(Date.now() / 1000)),
       nonceStr: Math.random().toString().substr(2, 12),
       package: `prepay_id=${res.prepay_id}`,

package/lib/cli/cli.js

@@ -171,6 +171,7 @@ yargs.command('dev', '开始开发', _ => _.positional('index', {
     host: process.env.HOST,
     user: process.env.USER,
     key: process.env.KEY,
-    dir: process.env.DIR
+    dir: process.env.DIR,
+    cmd: process.env.CMD
   });
 }).parse();

package/lib/cli/deploy_util.d.ts

@@ -4,6 +4,7 @@ export interface DeployOptions {
     user: string;
     key: string;
     dir: string;
+    cmd?: string;
 }
 export declare class DeployUtil {
     static deploy(options: DeployOptions): Promise<void>;

package/lib/cli/deploy_util.js

@@ -35,7 +35,8 @@ export class DeployUtil {
         set -ex
         tar -zxvf ${remoteAppFile} -C ${appDir}
         cd ${appDir}/dist
-        [ -f no_install.lock ] && yarn_disable_self_update_check=true tyn 
+        [ -f no_install.lock ] && yarn_disable_self_update_check=true tyn
+        ${options.cmd || ''}
         pm2 startOrReload pm2.config.js
       `, {
       cwd: options.cwd,

package/lib/services/pay.d.ts

@@ -48,6 +48,8 @@ export interface PayServicePrepareWepayOptions {
     totalMoney: number;
     /** 通知地址(POST) */
     notifyUrl: string;
+    /** 对应公众号的 appId */
+    appId?: string;
     /** 对应公众号用户的 openid */
     openid: string;
 }

package/lib/services/pay.js

@@ -44,8 +44,9 @@ export class PayService {
   }
 
   async prepareWepay(options) {
+    const appId = options.appId || this.options.wepay.appId;
     const res = await this.wepayRequest('https://api.mch.weixin.qq.com/v3/pay/transactions/jsapi', {
-      appid: this.options.wepay.appId,
+      appid: appId,
       mchid: this.options.wepay.merchantId,
       description: options.goodsName,
       out_trade_no: options.tradeNumber,
@@ -66,7 +67,7 @@ export class PayService {
     }
 
     const params = {
-      appId: this.options.wepay.appId,
+      appId: appId,
       timestamp: String(Math.round(Date.now() / 1000)),
       nonceStr: Math.random().toString().substr(2, 12),
       package: `prepay_id=${res.prepay_id}`,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jayfong/x-server",
-  "version": "2.1.6",
+  "version": "2.2.0",
   "license": "ISC",
   "sideEffects": false,
   "main": "lib/_cjs/index.js",