cgserver 8.3.5 → 8.3.6

package/dist/lib/Framework/Decorator/AdminValidate.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AdminValidate = void 0;
+function AdminValidate(target, propertyName, descriptor) {
+    let method = descriptor.value;
+    descriptor.value = function () {
+        let self = this;
+        if (!self.isLogin) {
+            self.redirect(null, "Login");
+            return;
+        }
+        if (!self.isAdmin) {
+            self.showText("需要管理员权限");
+            return;
+        }
+        return method.apply(this, arguments);
+    };
+}
+exports.AdminValidate = AdminValidate;

package/dist/lib/Framework/Decorator/AuthorityValidate.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AuthorityValidate = void 0;
+let AuthorityValidate = function (rg, ctr_name) {
+    ctr_name = ctr_name || "Wechat";
+    return function (target, propertyName, descriptor) {
+        let method = descriptor.value;
+        descriptor.value = function () {
+            let self = this;
+            if (!self.isLogin) {
+                self.redirect(null, ctr_name);
+                return;
+            }
+            if (rg && self.selfUser.role_group != rg) {
+                self.redirect(null, ctr_name); //权限不足
+                return;
+            }
+            return method.apply(this, arguments);
+        };
+    };
+};
+exports.AuthorityValidate = AuthorityValidate;

package/dist/lib/Framework/Decorator/CreatorValidate.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CreatorValidate = void 0;
+function CreatorValidate(target, propertyName, descriptor) {
+    let method = descriptor.value;
+    descriptor.value = function () {
+        let self = this;
+        if (!self.isLogin) {
+            self.redirect(null, "Login");
+            return;
+        }
+        if (!self.isCreator) {
+            self.showText("需要创始人权限");
+            return;
+        }
+        return method.apply(this, arguments);
+    };
+}
+exports.CreatorValidate = CreatorValidate;

package/dist/lib/Framework/Decorator/JsonAdminValidate.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.JsonAdminValidate = void 0;
+function JsonAdminValidate(target, propertyName, descriptor) {
+    let method = descriptor.value;
+    descriptor.value = function () {
+        let self = this;
+        if (!self.isAdmin) {
+            self.showJson({ errcode: { id: 1, des: "需要管理员或创始人权限" }, err: "需要管理员或创始人权限" });
+            return;
+        }
+        return method.apply(this, arguments);
+    };
+}
+exports.JsonAdminValidate = JsonAdminValidate;

package/dist/lib/Framework/Decorator/JsonAuthorityValidate.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.JsonAuthorityValidate = void 0;
+let JsonAuthorityValidate = function (rg) {
+    return function (target, propertyName, descriptor) {
+        let method = descriptor.value;
+        descriptor.value = function () {
+            let self = this;
+            if (!self.isLogin) {
+                self.showJson({ errcode: { id: 1, des: "未登陆" }, err: "未登陆" });
+            }
+            if (rg && self.selfUser.role_group != rg) {
+                self.showJson({ errcode: { id: 2, des: "权限不足" }, err: "权限不足" });
+                return;
+            }
+            return method.apply(this, arguments);
+        };
+    };
+};
+exports.JsonAuthorityValidate = JsonAuthorityValidate;

package/dist/lib/Framework/Decorator/JsonCreatorValidate.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.JsonCreatorValidate = void 0;
+function JsonCreatorValidate(target, propertyName, descriptor) {
+    let method = descriptor.value;
+    descriptor.value = function () {
+        let self = this;
+        if (!self.isLogin) {
+            self.showJson({ errcode: { id: 1, des: "请登陆后尝试" }, err: "请登陆后尝试" });
+            return;
+        }
+        if (!self.isCreator) {
+            self.showJson({ errcode: { id: 1, des: "需要创始人权限" }, err: "需要创始人权限" });
+            return;
+        }
+        return method.apply(this, arguments);
+    };
+}
+exports.JsonCreatorValidate = JsonCreatorValidate;

package/dist/lib/Framework/Decorator/SyncCall.js

@@ -0,0 +1,41 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SyncCall2 = exports.SyncCall = void 0;
+const SyncQueueTool_1 = require("../Logic/SyncQueueTool");
+/**
+ * 异步函数变为同步函数，当前进程有效
+ * @param target
+ * @param propertyName
+ * @param descriptor
+ */
+function SyncCall(target, propertyName, descriptor) {
+    let method = descriptor.value;
+    descriptor.value = function () {
+        let self = this;
+        let ret = SyncQueueTool_1.GSyncQueueTool.add(method.name, async () => {
+            return await method.apply(self, arguments);
+        });
+        return ret;
+    };
+}
+exports.SyncCall = SyncCall;
+/**
+ * 异步函数变为同步函数，当前进程有效
+ * @param param_index 动态参数的索引
+ */
+function SyncCall2(param_index) {
+    return (target, propertyName, descriptor) => {
+        let method = descriptor.value;
+        descriptor.value = function () {
+            let key = propertyName;
+            if (param_index != undefined && param_index < arguments.length) {
+                key = propertyName + "_" + arguments[param_index];
+            }
+            let ret = SyncQueueTool_1.GSyncQueueTool.add(key, async () => {
+                return await method.apply(target, arguments);
+            });
+            return ret;
+        };
+    };
+}
+exports.SyncCall2 = SyncCall2;

package/dist/lib/Framework/Decorator/SyncCallServer.js

@@ -0,0 +1,77 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SyncCallServer2 = exports.SyncCallServer = void 0;
+const Core_1 = require("../Core/Core");
+const SyncQueueTool_1 = require("../Logic/SyncQueueTool");
+const MongoCacheService_1 = require("../Service/MongoCacheService");
+/**
+ * 异步函数变为同步函数
+ * 服务器间的异步，效率低
+ * 只支持mongo模式
+ * @returns
+ */
+function SyncCallServer(target, propertyName, descriptor) {
+    let method = descriptor.value;
+    descriptor.value = async () => {
+        let key = "sync_" + method.name;
+        let func = async () => {
+            let item = await MongoCacheService_1.GMongoCacheSer.getData(key);
+            let ret = null;
+            while (item) {
+                await Core_1.core.sleep(200);
+                item = await MongoCacheService_1.GMongoCacheSer.getData(key);
+            }
+            //10秒后过期，避免卡死
+            let mcm = await MongoCacheService_1.GMongoCacheSer.addData(key, true, Date.now() + 10 * 1000);
+            if (!mcm) {
+                await func();
+            }
+            return;
+        };
+        await func();
+        let ret = SyncQueueTool_1.GSyncQueueTool.add(method.name, async () => {
+            return await method.apply(self, arguments);
+        });
+        await MongoCacheService_1.GMongoCacheSer.deleteOne({ key });
+        return ret;
+    };
+}
+exports.SyncCallServer = SyncCallServer;
+/**
+ * 异步函数变为同步函数
+ * 服务器间的异步，效率低
+ * 只支持mongo模式
+ * @returns
+ */
+let SyncCallServer2 = function (params_index) {
+    return function (target, propertyName, descriptor) {
+        let method = descriptor.value;
+        descriptor.value = async () => {
+            let key = "sync_" + method.name;
+            if (params_index != undefined && params_index < arguments.length) {
+                key = key + "_" + arguments[params_index];
+            }
+            let func = async () => {
+                let item = await MongoCacheService_1.GMongoCacheSer.getData(key);
+                let ret = null;
+                while (item) {
+                    await Core_1.core.sleep(200);
+                    item = await MongoCacheService_1.GMongoCacheSer.getData(key);
+                }
+                //10秒后过期，避免卡死
+                let mcm = await MongoCacheService_1.GMongoCacheSer.addData(key, true, Date.now() + 10 * 1000);
+                if (!mcm) {
+                    await func();
+                }
+                return;
+            };
+            await func();
+            let ret = SyncQueueTool_1.GSyncQueueTool.add(method.name, async () => {
+                return await method.apply(self, arguments);
+            });
+            await MongoCacheService_1.GMongoCacheSer.deleteOne({ key });
+            return ret;
+        };
+    };
+};
+exports.SyncCallServer2 = SyncCallServer2;

package/dist/lib/Framework/Service/MongoUserService.js

@@ -11,7 +11,7 @@ const _ = require("underscore");
 const MongoBaseService_1 = require("../Database/MongoBaseService");
 const MongoManager_1 = require("../Database/MongoManager");
 const ini_1 = require("./ini");
-const SyncCall_1 = require("../WebServer/Decorator/SyncCall");
+const SyncCall_1 = require("../Decorator/SyncCall");
 class MongoUserModel extends MongoManager_1.MongoBaseModel {
     id = -1;
     account_id = -1;

package/dist/lib/Framework/index.js

@@ -141,17 +141,17 @@ var MysqlAccountService_2 = require("./Service/MysqlAccountService");
 Object.defineProperty(exports, "MysqlAccountModel", { enumerable: true, get: function () { return MysqlAccountService_2.MysqlAccountModel; } });
 var MongoAccountService_2 = require("./Service/MongoAccountService");
 Object.defineProperty(exports, "MongoAccountModel", { enumerable: true, get: function () { return MongoAccountService_2.MongoAccountModel; } });
-var AdminValidate_1 = require("./WebServer/Decorator/AdminValidate");
+var AdminValidate_1 = require("./Decorator/AdminValidate");
 Object.defineProperty(exports, "AdminValidate", { enumerable: true, get: function () { return AdminValidate_1.AdminValidate; } });
-var AuthorityValidate_1 = require("./WebServer/Decorator/AuthorityValidate");
+var AuthorityValidate_1 = require("./Decorator/AuthorityValidate");
 Object.defineProperty(exports, "AuthorityValidate", { enumerable: true, get: function () { return AuthorityValidate_1.AuthorityValidate; } });
-var CreatorValidate_1 = require("./WebServer/Decorator/CreatorValidate");
+var CreatorValidate_1 = require("./Decorator/CreatorValidate");
 Object.defineProperty(exports, "CreatorValidate", { enumerable: true, get: function () { return CreatorValidate_1.CreatorValidate; } });
-var JsonAdminValidate_1 = require("./WebServer/Decorator/JsonAdminValidate");
+var JsonAdminValidate_1 = require("./Decorator/JsonAdminValidate");
 Object.defineProperty(exports, "JsonAdminValidate", { enumerable: true, get: function () { return JsonAdminValidate_1.JsonAdminValidate; } });
-var JsonAuthorityValidate_1 = require("./WebServer/Decorator/JsonAuthorityValidate");
+var JsonAuthorityValidate_1 = require("./Decorator/JsonAuthorityValidate");
 Object.defineProperty(exports, "JsonAuthorityValidate", { enumerable: true, get: function () { return JsonAuthorityValidate_1.JsonAuthorityValidate; } });
-var JsonCreatorValidate_1 = require("./WebServer/Decorator/JsonCreatorValidate");
+var JsonCreatorValidate_1 = require("./Decorator/JsonCreatorValidate");
 Object.defineProperty(exports, "JsonCreatorValidate", { enumerable: true, get: function () { return JsonCreatorValidate_1.JsonCreatorValidate; } });
 var ControllerManager_1 = require("./WebServer/Engine/ControllerManager");
 Object.defineProperty(exports, "GCtrMgr", { enumerable: true, get: function () { return ControllerManager_1.GCtrMgr; } });
@@ -183,9 +183,9 @@ var IRpcServerWebSocket_1 = require("./SocketServer/IRpcServerWebSocket");
 Object.defineProperty(exports, "IRpcServerWebSocket", { enumerable: true, get: function () { return IRpcServerWebSocket_1.IRpcServerWebSocket; } });
 var IRpcClientWebSocket_1 = require("./SocketServer/IRpcClientWebSocket");
 Object.defineProperty(exports, "IRpcClientWebSocket", { enumerable: true, get: function () { return IRpcClientWebSocket_1.IRpcClientWebSocket; } });
-var SyncCall_1 = require("./WebServer/Decorator/SyncCall");
+var SyncCall_1 = require("./Decorator/SyncCall");
 Object.defineProperty(exports, "SyncCall", { enumerable: true, get: function () { return SyncCall_1.SyncCall; } });
 Object.defineProperty(exports, "SyncCall2", { enumerable: true, get: function () { return SyncCall_1.SyncCall2; } });
-var SyncCallServer_1 = require("./WebServer/Decorator/SyncCallServer");
+var SyncCallServer_1 = require("./Decorator/SyncCallServer");
 Object.defineProperty(exports, "SyncCallServer", { enumerable: true, get: function () { return SyncCallServer_1.SyncCallServer; } });
 Object.defineProperty(exports, "SyncCallServer2", { enumerable: true, get: function () { return SyncCallServer_1.SyncCallServer2; } });

package/dist/types/Framework/Decorator/AdminValidate.d.ts

@@ -0,0 +1 @@
+export declare function AdminValidate(target: any, propertyName: string, descriptor: TypedPropertyDescriptor<Function>): void;

package/dist/types/Framework/Decorator/AuthorityValidate.d.ts

@@ -0,0 +1,2 @@
+import { ERoleGroup } from "../Service/ini";
+export declare let AuthorityValidate: (rg?: ERoleGroup, ctr_name?: string) => (target: any, propertyName: string, descriptor: TypedPropertyDescriptor<Function>) => void;

package/dist/types/Framework/Decorator/CreatorValidate.d.ts

@@ -0,0 +1 @@
+export declare function CreatorValidate(target: any, propertyName: string, descriptor: TypedPropertyDescriptor<Function>): void;

package/dist/types/Framework/Decorator/JsonAdminValidate.d.ts

@@ -0,0 +1 @@
+export declare function JsonAdminValidate(target: any, propertyName: string, descriptor: TypedPropertyDescriptor<Function>): void;

package/dist/types/Framework/Decorator/JsonAuthorityValidate.d.ts

@@ -0,0 +1,2 @@
+import { ERoleGroup } from "../Service/ini";
+export declare let JsonAuthorityValidate: (rg?: ERoleGroup) => (target: any, propertyName: string, descriptor: TypedPropertyDescriptor<Function>) => void;

package/dist/types/Framework/Decorator/JsonCreatorValidate.d.ts

@@ -0,0 +1 @@
+export declare function JsonCreatorValidate(target: any, propertyName: string, descriptor: TypedPropertyDescriptor<Function>): void;

package/dist/types/Framework/Decorator/SyncCall.d.ts

@@ -0,0 +1,12 @@
+/**
+ * 异步函数变为同步函数，当前进程有效
+ * @param target
+ * @param propertyName
+ * @param descriptor
+ */
+export declare function SyncCall(target: any, propertyName: string, descriptor: TypedPropertyDescriptor<Function>): void;
+/**
+ * 异步函数变为同步函数，当前进程有效
+ * @param param_index 动态参数的索引
+ */
+export declare function SyncCall2(param_index?: number): (target: any, propertyName: string, descriptor: TypedPropertyDescriptor<Function>) => void;

package/dist/types/Framework/Decorator/SyncCallServer.d.ts

@@ -0,0 +1,14 @@
+/**
+ * 异步函数变为同步函数
+ * 服务器间的异步，效率低
+ * 只支持mongo模式
+ * @returns
+ */
+export declare function SyncCallServer(target: any, propertyName: string, descriptor: TypedPropertyDescriptor<Function>): void;
+/**
+ * 异步函数变为同步函数
+ * 服务器间的异步，效率低
+ * 只支持mongo模式
+ * @returns
+ */
+export declare let SyncCallServer2: (params_index?: number) => (target: any, propertyName: string, descriptor: TypedPropertyDescriptor<Function>) => void;

package/dist/types/Framework/index.d.ts

@@ -62,12 +62,12 @@ export { MysqlBaseUserController } from './WebServer/Controller/MysqlBaseUserCon
 export { MongoBaseUserController } from './WebServer/Controller/MongoBaseUserController';
 export { MysqlAccountModel } from './Service/MysqlAccountService';
 export { MongoAccountModel } from './Service/MongoAccountService';
-export { AdminValidate } from './WebServer/Decorator/AdminValidate';
-export { AuthorityValidate } from './WebServer/Decorator/AuthorityValidate';
-export { CreatorValidate } from './WebServer/Decorator/CreatorValidate';
-export { JsonAdminValidate } from './WebServer/Decorator/JsonAdminValidate';
-export { JsonAuthorityValidate } from './WebServer/Decorator/JsonAuthorityValidate';
-export { JsonCreatorValidate } from './WebServer/Decorator/JsonCreatorValidate';
+export { AdminValidate } from './Decorator/AdminValidate';
+export { AuthorityValidate } from './Decorator/AuthorityValidate';
+export { CreatorValidate } from './Decorator/CreatorValidate';
+export { JsonAdminValidate } from './Decorator/JsonAdminValidate';
+export { JsonAuthorityValidate } from './Decorator/JsonAuthorityValidate';
+export { JsonCreatorValidate } from './Decorator/JsonCreatorValidate';
 export { GCtrMgr } from './WebServer/Engine/ControllerManager';
 export { Engine } from './WebServer/Engine/Engine';
 export { RazorJs } from './WebServer/Engine/RazorJs';
@@ -82,5 +82,5 @@ export { Rpc, RpcConfig } from './ThirdParty/Rpc';
 export { CgMq, CgMqConfig } from './ThirdParty/CgMq';
 export { IRpcServerWebSocket } from './SocketServer/IRpcServerWebSocket';
 export { IRpcClientWebSocket } from './SocketServer/IRpcClientWebSocket';
-export { SyncCall, SyncCall2 } from './WebServer/Decorator/SyncCall';
-export { SyncCallServer, SyncCallServer2 } from './WebServer/Decorator/SyncCallServer';
+export { SyncCall, SyncCall2 } from './Decorator/SyncCall';
+export { SyncCallServer, SyncCallServer2 } from './Decorator/SyncCallServer';

package/package.json

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