cgserver 6.2.9 → 6.3.0

package/dist/lib/SocketServer/IWebSocket.js

@@ -157,12 +157,12 @@ class IWebSocket {
                 try {
                     if (Core_1.core.isAsyncFunc(otherfunc)) {
                         //默认支持其他所有处理消息
-                        await otherfunc.call(jsonData).catch((reason) => {
+                        await otherfunc.call(this, jsonData).catch((reason) => {
                             Log_1.GLog.error(reason);
                         });
                     }
                     else {
-                        otherfunc.call(jsonData);
+                        otherfunc.call(this, jsonData);
                     }
                 }
                 catch (e) {
@@ -177,12 +177,12 @@ class IWebSocket {
             try {
                 if (Core_1.core.isAsyncFunc(func)) {
                     //默认支持其他所有处理消息
-                    await func.call(jsonData).catch((reason) => {
+                    await func.call(this, jsonData).catch((reason) => {
                         Log_1.GLog.error(reason);
                     });
                 }
                 else {
-                    func.call(jsonData);
+                    func.call(this, jsonData);
                 }
             }
             catch (e) {

package/dist/lib/ThirdParty/AlipayTool.js

@@ -2,11 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GAlipayTool = void 0;
 const alipay_sdk_1 = require("alipay-sdk");
+const aliUtil = require("alipay-sdk/lib/util");
 const AliPayUtil_1 = require("alipay_sdk2/AliPayUtil");
 const fs = require("fs");
 const FrameworkConfig_1 = require("../Config/FrameworkConfig");
 const form_1 = require("alipay-sdk/lib/form");
 const Log_1 = require("../Logic/Log");
+const cgserver_1 = require("../cgserver");
 exports.GAlipayTool = null;
 class AlipayTool {
     _alipaySdk = null;
@@ -66,6 +68,46 @@ class AlipayTool {
             });
         }
     }
+    /**
+     *  charset:"utf-8",method:"alipay.trade.app.pay",sign_type:"RSA2,version:"1.0"
+     * @param out_trade_no
+     * @param total_amount
+     * @param subject
+     * @param body
+     * @param timeout_express
+     * @param product_code
+     * @returns
+     */
+    _buildOrderParams(out_trade_no, total_amount, subject = "1", body = "我是测试数据", timeout_express = "30m", product_code = "QUICK_MSECURITY_PAY") {
+        let order_params = {
+            app_id: this._cfg.app_id,
+            biz_content: JSON.stringify({
+                timeout_express: timeout_express,
+                product_code: product_code,
+                total_amount: total_amount + "",
+                subject: encodeURIComponent(subject),
+                body: encodeURIComponent(body),
+                out_trade_no: out_trade_no
+            }),
+            charset: "utf-8",
+            method: "alipay.trade.app.pay",
+            sign_type: "RSA2",
+            timestamp: cgserver_1.core.format(Date.now(), "yyyy-MM-dd hh:mm::ss"),
+            version: "1.0"
+        };
+        return order_params;
+    }
+    _sign(order_params) {
+        let sign = aliUtil.sign("alipay.trade.app.pay", order_params, this._alipaySdk.config);
+        return sign;
+    }
+    getOrderInfo(out_trade_no, total_amount, subject = "1", body = "我是测试数据") {
+        let order_params = this._buildOrderParams(out_trade_no, total_amount, subject, body);
+        let sign = this._sign(order_params);
+        let { url, execParams } = this._alipaySdk["formatUrl"]("", sign);
+        const order_info = (url + '&biz_content=' + encodeURIComponent(execParams.biz_content)).substring(1);
+        return order_info;
+    }
     /**
      *
      * @param title

package/dist/lib/WebServer/Engine/Response.js

@@ -8,6 +8,7 @@ class Response {
     _res = null;
     _cookie_prefix = "";
     _cfg = null;
+    _create_time = -1;
     constructor(res, cfg) {
         this._cfg = cfg;
         this._res = res;
@@ -15,6 +16,7 @@ class Response {
         this._init();
     }
     _init() {
+        this._create_time = Date.now();
     }
     /**
      *
@@ -91,6 +93,7 @@ class Response {
         if (!this._cfg.debug) {
             return;
         }
+        Log_1.GLog.info("dttime:" + (Date.now() - this._create_time).toLocaleString() + "ms", true);
         Log_1.GLog.info(data, true);
     }
 }

package/dist/types/ThirdParty/AlipayTool.d.ts

@@ -17,6 +17,27 @@ declare class AlipayTool {
         notify_url: string;
     };
     init(): boolean;
+    /**
+     *  charset:"utf-8",method:"alipay.trade.app.pay",sign_type:"RSA2,version:"1.0"
+     * @param out_trade_no
+     * @param total_amount
+     * @param subject
+     * @param body
+     * @param timeout_express
+     * @param product_code
+     * @returns
+     */
+    protected _buildOrderParams(out_trade_no: string, total_amount: number, subject?: string, body?: string, timeout_express?: string, product_code?: string): {
+        app_id: string;
+        biz_content: string;
+        charset: string;
+        method: string;
+        sign_type: string;
+        timestamp: any;
+        version: string;
+    };
+    protected _sign(order_params: any): any;
+    getOrderInfo(out_trade_no: string, total_amount: number, subject?: string, body?: string): string;
     /**
      *
      * @param title

package/dist/types/WebServer/Engine/Response.d.ts

@@ -4,6 +4,7 @@ export declare class Response {
     protected _res: Express.Response;
     protected _cookie_prefix: string;
     protected _cfg: WebServerConfig;
+    protected _create_time: number;
     constructor(res: Express.Response, cfg: WebServerConfig);
     protected _init(): void;
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cgserver",
-  "version": "6.2.9",
+  "version": "6.3.0",
   "author": "trojan",
   "type": "commonjs",
   "description": "free for all.Websocket or Http",
@@ -46,7 +46,6 @@
     "@types/underscore": "^1.11.3",
     "@types/urlencode": "^1.1.2",
     "@types/websocket": "^1.0.4",
-    "alipay_sdk2": "^1.1.6",
     "alipay-sdk": "^3.1.7",
     "colors": "^1.4.0",
     "cookie-parser": "^1.4.5",