@jayfong/x-server 2.4.3 → 2.6.0

package/lib/_cjs/services/pay.js

@@ -94,20 +94,52 @@ class PayService {
 
   verifyNotifyData(data) {
     try {
-      var _this$alipaySdk;
+      if (!data || typeof data !== 'object') {
+        return false;
+      } // 支付宝
+      // https://opendocs.alipay.com/open/270/105902
 
-      return !!data && typeof data === 'object' && ( // 支付宝
-      data.passback_params === 'alipay' ? !!((_this$alipaySdk = this.alipaySdk) != null && _this$alipaySdk.checkNotifySign(data)) : // 微信支付
-      data.resource ? JSON.parse(this.wepayDecrypt(data.resource)).attach === 'wepay' : false);
+
+      if (data.passback_params === 'alipay') {
+        var _this$alipaySdk;
+
+        if (!((_this$alipaySdk = this.alipaySdk) != null && _this$alipaySdk.checkNotifySign(data))) {
+          return false;
+        }
+
+        return {
+          channelOrderNo: data.trade_no
+        };
+      } // 微信支付
+      // https://pay.weixin.qq.com/wiki/doc/apiv3/apis/chapter3_1_5.shtml
+
+
+      if (data.resource) {
+        const params = JSON.parse(this.wepayDecrypt(data.resource));
+
+        if (params.attach === 'wepay') {
+          return {
+            channelOrderNo: params.transaction_id
+          };
+        }
+
+        return false;
+      }
+
+      return false;
     } catch {
       return false;
     }
   }
 
   verifyNotifyDataOrFail(data, message) {
-    if (!this.verifyNotifyData(data)) {
+    const res = this.verifyNotifyData(data);
+
+    if (!res) {
       throw new _http_error.HttpError.BadRequest(message);
     }
+
+    return res;
   }
 
   wepaySign(data) {

package/lib/_cjs/x.js

@@ -13,6 +13,8 @@ var _path = _interopRequireDefault(require("path"));
 
 var _dispose = require("./services/dispose");
 
+var _emoji = require("./services/emoji");
+
 var _log = require("./services/log");
 
 const env = JSON.parse(process.env.X_SERVER_ENVS || '{}');
@@ -33,4 +35,4 @@ _fsExtra.default.ensureDirSync(x.dataDir);
 
 x.register(new _dispose.DisposeService({
   disposeOnExit: true
-}), new _log.LogService());
+}), new _log.LogService(), new _emoji.EmojiService());

package/lib/services/emoji.d.ts

@@ -0,0 +1,10 @@
+import { BaseService } from './base';
+export declare class EmojiService implements BaseService {
+    serviceName: string;
+    unify(text: string): string;
+}
+declare module '../x' {
+    interface X {
+        emoji: EmojiService;
+    }
+}