cgserver 6.3.3 → 6.4.1

package/dist/lib/Logic/AsyncQueueTool.js

@@ -0,0 +1,52 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GAsyncQueueTool = void 0;
+const cgserver_1 = require("../cgserver");
+const Log_1 = require("./Log");
+class AsyncQueueItem {
+    key = "";
+    running = false;
+    funcs = [];
+    constructor(key) {
+        this.key = key;
+    }
+    add(func) {
+        this.funcs.push(func);
+        this._run();
+    }
+    async _run() {
+        if (this.running) {
+            return;
+        }
+        this.running = true;
+        while (this.funcs.length > 0) {
+            try {
+                let func = this.funcs.shift();
+                if (!func) {
+                    continue;
+                }
+                if (cgserver_1.core.isAsyncFunc(func)) {
+                    await func().catch((error) => {
+                        Log_1.GLog.error(error);
+                    });
+                }
+                else {
+                    func();
+                }
+            }
+            catch (error) {
+                Log_1.GLog.error(error);
+            }
+        }
+        this.running = false;
+    }
+}
+class AsyncQueueTool {
+    //队列数据,一个key队列必须有先后
+    _queues;
+    add(key, func) {
+        this._queues[key] = this._queues[key] || new AsyncQueueItem(key);
+        this._queues[key].add(func);
+    }
+}
+exports.GAsyncQueueTool = new AsyncQueueTool();

package/dist/lib/ThirdParty/AlipayTool.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.GAlipayTool = void 0;
+exports.GAlipayTool = exports.AlipayCallBack = exports.AlipayResult = void 0;
 const alipay_sdk_1 = require("alipay-sdk");
 const aliUtil = require("alipay-sdk/lib/util");
 const AliPayUtil_1 = require("alipay_sdk2/AliPayUtil");
@@ -8,6 +8,51 @@ const fs = require("fs");
 const FrameworkConfig_1 = require("../Config/FrameworkConfig");
 const form_1 = require("alipay-sdk/lib/form");
 const Log_1 = require("../Logic/Log");
+class AlipayResult {
+    alipay_trade_app_pay_response = {
+        code: "10000",
+        msg: "Success",
+        app_id: "2021003143637369",
+        auth_app_id: "2021003143637369",
+        charset: "utf-8",
+        timestamp: "2022-08-10 16:38:04",
+        out_trade_no: "62f36e657a355ecc1cb8eec2",
+        total_amount: "0.05",
+        trade_no: "2022081022001489431433911625",
+        seller_id: "2088441785429273"
+    };
+    sign = "d/Guf6QYnuk9fFlRS1EUFTY+n3/jQKp7IwQENG4WXO+qxMGglPXa3RhUHaJELTMwC4tcKhz8Z8GCiiI1Y7G84kAql1jyoekaOMWvdPRDOjkAqouP3oh5v9r23BziJUxgv/kanBRfOoTKvIT7R0L5DyfxMpEoHdssPHAtENMiniCVZlRUkAhHxjmgMrP0rzMtBvqctC5Me6UiV1yBdGWecLk9RNwMTZF8QSXKVpWXmhmimdjjFjGMcE6r7LoV9YW1Bsvjoq2kdRMX7CJZufGk1Y5Qz8Cv+E9QxTnDJMtA0XyYzte53/dSw0W3Z4Gbosn/kV4QDBRzN39NwwuoFwGuVg==";
+    sign_type = "RSA2";
+}
+exports.AlipayResult = AlipayResult;
+class AlipayCallBack {
+    gmt_create = "2022-08-10 16=38=03";
+    charset = "utf-8";
+    seller_email = "zdpuke@163.com";
+    subject = "一把砖石";
+    sign = "gytkeBGeea9V05lI6Qvvut8CZnXtXJmbb0dMDd76a6fgN2k2IO0HH4wkJylMQG3EXYJQctysURDtIB0dhqaZbDVtePsM3iQVeI2jwT3YS3XGS4xi13k8foag9vCcSgojKjxJS3ihfzuyK/Pc+KDTOQftoWP2s1dPUpJNGLcZp4sUFysl0Iyzf+2vXh4OJUPQ3DvCqePnDUawq1+AUUj63WHWvdsGCP70+eTsbKxJxWBhHfMVrwkOmUI0zivcHpHLVHbfTFvaM5LAa/ivSU8jiDHqgHYFZqqzTyZ1DLxEy0Ypo3sKBs5eK/UhdsNf5tjse7PxYJwMU2ziIo9gnqv6fQ==";
+    buyer_id = 2088202482689432;
+    invoice_amount = "0.05";
+    notify_id = 2.022081000222164e+33;
+    fund_bill_list = [{ amount: "0.05", fundChannel: "PCREDIT" }];
+    notify_type = "trade_status_sync";
+    trade_status = "TRADE_SUCCESS";
+    receipt_amount = "0.05";
+    app_id = 2021003143637369;
+    buyer_pay_amount = "0.05";
+    sign_type = "RSA2";
+    seller_id = 2088441785429273;
+    gmt_payment = "2022-08-10 16:38:03";
+    notify_time = "2022-08-10 16:38:04";
+    version = 1;
+    out_trade_no = "62f36e657a355ecc1cb8eec2";
+    total_amount = "0.05";
+    trade_no = 2.0220810220014894e+27;
+    auth_app_id = 2021003143637369;
+    buyer_logon_id = "138****3531";
+    point_amount = 0;
+}
+exports.AlipayCallBack = AlipayCallBack;
 exports.GAlipayTool = null;
 class AlipayTool {
     _alipaySdk = null;
@@ -79,10 +124,11 @@ class AlipayTool {
      */
     _buildOrderParams(out_trade_no, total_amount, subject = "1", body = "我是测试数据", timeout_express = "30m", product_code = "QUICK_MSECURITY_PAY") {
         let order_params = {
+            notifyUrl: this._cfg.notify_url,
             bizContent: {
                 timeout_express: timeout_express,
                 product_code: product_code,
-                total_amount: total_amount + "",
+                total_amount: total_amount,
                 subject: encodeURIComponent(subject),
                 body: encodeURIComponent(body),
                 out_trade_no: out_trade_no

package/dist/lib/cgserver.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.JsonProtoFilter = exports.GoogleProtoFilter = exports.MongoCacheModel = exports.GMongoCacheSer = exports.MongoUserModel = exports.MysqlUserModel = exports.MongoUserService = exports.MysqlUserService = exports.GMongoAccountSer = exports.MongoAccountService = exports.GMysqlAccountSer = exports.MysqlAccountService = exports.EAccountFrom = exports.EUserState = exports.ERoleGroup = exports.GLog = exports.GHttpTool = exports.GCacheTool = exports.RedisManager = exports.GRedisMgr = exports.GMysqlMgr = exports.MysqlBaseService = exports.GMSSqlMgr = exports.GMongoMgr = exports.MongoBaseModel = exports.MysqlBaseModel = exports.MongoBaseService = exports.EPropertyType = exports.Type = exports.Table = exports.Property = exports.PrimaryKey = exports.NotNull = exports.AutoIncrement = exports.Timer = exports.core = exports.ServerConfig = exports.GFCfg = exports.FrameworkConfig = exports.Config = exports.FrameworkErrorCode = exports.GTriggerMgr = exports.Trigger = exports.Point = exports.Entity = exports.BehaviorAI = exports.AStar = exports.AiObject = exports.GDBCache = exports.GProtoFactory = void 0;
-exports.GCgServer = exports.WebServerConfig = exports.Response = exports.Request = exports.RazorJs = exports.Engine = exports.GCtrMgr = exports.JsonCreatorValidate = exports.JsonAuthorityValidate = exports.JsonAdminValidate = exports.CreatorValidate = exports.AuthorityValidate = exports.AdminValidate = exports.MongoAccountModel = exports.MysqlAccountModel = exports.MongoBaseUserController = exports.BaseUserController = exports.BaseController = exports.IWebServer = exports.GWechatTool = exports.GWechatOATool = exports.GQQTool = exports.GQiniuTool = exports.GOpenSocial = exports.GEmailTool = exports.GAppleTool = exports.GSmsTool = exports.GAlipayTool = exports.IWebSocket = exports.ISocketServer = exports.IServerWebSocket = exports.IClientWebSocket = void 0;
+exports.GCgServer = exports.GAsyncQueueTool = exports.WebServerConfig = exports.Response = exports.Request = exports.RazorJs = exports.Engine = exports.GCtrMgr = exports.JsonCreatorValidate = exports.JsonAuthorityValidate = exports.JsonAdminValidate = exports.CreatorValidate = exports.AuthorityValidate = exports.AdminValidate = exports.MongoAccountModel = exports.MysqlAccountModel = exports.MongoBaseUserController = exports.BaseUserController = exports.BaseController = exports.IWebServer = exports.GWechatTool = exports.GWechatOATool = exports.GQQTool = exports.GQiniuTool = exports.GOpenSocial = exports.GEmailTool = exports.GAppleTool = exports.GSmsTool = exports.GAlipayTool = exports.IWebSocket = exports.ISocketServer = exports.IServerWebSocket = exports.IClientWebSocket = void 0;
 var ProtoFactory_1 = require("./SocketServer/ProtoFilter/ProtoFactory");
 Object.defineProperty(exports, "GProtoFactory", { enumerable: true, get: function () { return ProtoFactory_1.GProtoFactory; } });
 var DBCache_1 = require("./Database/Decorator/DBCache");
@@ -157,6 +157,8 @@ var Response_1 = require("./WebServer/Engine/Response");
 Object.defineProperty(exports, "Response", { enumerable: true, get: function () { return Response_1.Response; } });
 var FrameworkConfig_2 = require("./Config/FrameworkConfig");
 Object.defineProperty(exports, "WebServerConfig", { enumerable: true, get: function () { return FrameworkConfig_2.WebServerConfig; } });
+var AsyncQueueTool_1 = require("./Logic/AsyncQueueTool");
+Object.defineProperty(exports, "GAsyncQueueTool", { enumerable: true, get: function () { return AsyncQueueTool_1.GAsyncQueueTool; } });
 const Log_2 = require("./Logic/Log");
 class CgServer {
     constructor() {

package/dist/types/Logic/AsyncQueueTool.d.ts

@@ -0,0 +1,16 @@
+declare class AsyncQueueItem {
+    key: string;
+    running: boolean;
+    funcs: Function[];
+    constructor(key: string);
+    add(func: Function): void;
+    protected _run(): Promise<void>;
+}
+declare class AsyncQueueTool {
+    protected _queues: {
+        [key: string]: AsyncQueueItem;
+    };
+    add(key: string, func: Function): void;
+}
+export declare let GAsyncQueueTool: AsyncQueueTool;
+export {};

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

@@ -1,5 +1,51 @@
 import AlipaySdk from 'alipay-sdk';
 import { AliPayUtil } from "alipay_sdk2/AliPayUtil";
+export declare class AlipayResult {
+    alipay_trade_app_pay_response: {
+        code: string;
+        msg: string;
+        app_id: string;
+        auth_app_id: string;
+        charset: string;
+        timestamp: string;
+        out_trade_no: string;
+        total_amount: string;
+        trade_no: string;
+        seller_id: string;
+    };
+    sign: string;
+    sign_type: string;
+}
+export declare class AlipayCallBack {
+    gmt_create: string;
+    charset: string;
+    seller_email: string;
+    subject: string;
+    sign: string;
+    buyer_id: number;
+    invoice_amount: string;
+    notify_id: number;
+    fund_bill_list: {
+        amount: string;
+        fundChannel: string;
+    }[];
+    notify_type: string;
+    trade_status: string;
+    receipt_amount: string;
+    app_id: number;
+    buyer_pay_amount: string;
+    sign_type: string;
+    seller_id: number;
+    gmt_payment: string;
+    notify_time: string;
+    version: number;
+    out_trade_no: string;
+    total_amount: string;
+    trade_no: number;
+    auth_app_id: number;
+    buyer_logon_id: string;
+    point_amount: number;
+}
 export declare let GAlipayTool: AlipayTool;
 declare class AlipayTool {
     protected _alipaySdk: AlipaySdk;
@@ -28,10 +74,11 @@ declare class AlipayTool {
      * @returns
      */
     protected _buildOrderParams(out_trade_no: string, total_amount: number, subject?: string, body?: string, timeout_express?: string, product_code?: string): {
+        notifyUrl: string;
         bizContent: {
             timeout_express: string;
             product_code: string;
-            total_amount: string;
+            total_amount: number;
             subject: string;
             body: string;
             out_trade_no: string;

package/dist/types/cgserver.d.ts

@@ -72,6 +72,7 @@ export { RazorJs } from './WebServer/Engine/RazorJs';
 export { Request } from './WebServer/Engine/Request';
 export { Response } from './WebServer/Engine/Response';
 export { WebServerConfig } from './Config/FrameworkConfig';
+export { GAsyncQueueTool } from './Logic/AsyncQueueTool';
 declare class CgServer {
     constructor();
     init(): void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cgserver",
-  "version": "6.3.3",
+  "version": "6.4.1",
   "author": "trojan",
   "type": "commonjs",
   "description": "free for all.Websocket or Http",