cgserver 8.3.2546 → 8.5.0

package/README.md

@@ -1,23 +1,3 @@
-7.0.568
-1、serverconfig的命名变化
-2、IServerConfig去掉webserver配置
-6.6.5
-1、mongomanager可单独初始化
-6.6.5
-1、mongoaccountservice增加登录时间和ip
-6.5.8
-1、修改编译bug
-6.5.7
-1、debug标志又cgserver处命令行处理，默认为false
-6.5.7
-1、增加配置debug，是否是debug调试模式，主要区别于读取数据档，debug默认读取file_d文件，release默认读取file_r文件，如果不存在都会读取file文件
-6.5.6
-1、增加一点服务器事件，目前cgserver只支持start
-6.5.5
-1、修改GLog的输出，控制台的输出由FrameworkConfig控制，console_level(默认0) -1都不输出，0仅输出error，1都输出
-6.5.3
-1、增加账号状态EAccountState
-6.5.3
-1、事件分发器GEventTool添加emit
-6.5.2
-1、添加事件分发器GEventTool
+8.4.1
+1、更新所有库到最新版
+2、暴力升级redis接口注意修改

package/dist/lib/Framework/Database/RedisManager.js

@@ -9,12 +9,9 @@ class RedisManager {
     get redis() {
         return this._redis;
     }
-    _resis_init_succ = false;
     _redisCfg = null;
-    constructor() {
-    }
     async init(redisCfg) {
-        return new Promise((resolve) => {
+        let p = new Promise((resolve) => {
             if (!redisCfg || !redisCfg.open) {
                 resolve(null);
                 return;
@@ -24,8 +21,8 @@ class RedisManager {
                 return;
             }
             this._redisCfg = redisCfg;
-            Log_1.GLog.info("begin conect redis=" + JSON.stringify(redisCfg));
-            this._redis = redis.createClient(redisCfg.port, redisCfg.host, { parser: "javascript", return_buffers: false, connect_timeout: 3000, password: redisCfg.password });
+            Log_1.GLog.info("begin connect redis=" + JSON.stringify(redisCfg));
+            this._redis = redis.createClient(redisCfg);
             this._redis.on("connect", () => {
                 this.onConnect();
                 resolve(null);
@@ -33,376 +30,24 @@ class RedisManager {
             this._redis.on("end", this.onEnd.bind(this));
             this._redis.on("error", this.onError.bind(this));
         });
+        let ret = await p;
+        for (let key in this._redis) {
+            if (typeof this._redis[key] == "function") {
+                this[key] = this._redis[key].bind(this._redis);
+            }
+        }
+        return ret;
     }
     onConnect() {
-        if (this._redisCfg.database) {
-            this._redis.select(this._redisCfg.database);
-        }
-        this._resis_init_succ = true;
         Log_1.GLog.info("redis has connected!");
     }
     onEnd() {
-        this._resis_init_succ = false;
         this._redis = null;
         this.init(this._redisCfg); //重连
     }
     onError(err) {
-        Log_1.GLog.info("Error connected=" + this._redis.connected + ": " + err);
-    }
-    expire(key, seconds) {
-        return new Promise((resolve, reject) => {
-            if (!this._redis) {
-                resolve(null);
-                return;
-            }
-            this._redis.expire(key, seconds, (err, reply) => {
-                if (err) {
-                    Log_1.GLog.error(err);
-                }
-                resolve(reply);
-            });
-        });
-    }
-    incr(key) {
-        return new Promise((resolve, reject) => {
-            if (!this._redis) {
-                resolve(null);
-                return;
-            }
-            this._redis.incr(key, (err, reply) => {
-                if (err) {
-                    Log_1.GLog.error(err);
-                }
-                resolve(reply);
-            });
-        });
-    }
-    set(key, value) {
-        return new Promise((resolve, reject) => {
-            if (!this._redis) {
-                resolve(null);
-                return;
-            }
-            this._redis.set(key, value, (err, reply) => {
-                if (err) {
-                    Log_1.GLog.error(err);
-                }
-                resolve(reply);
-            });
-        });
-    }
-    get(key) {
-        return new Promise((resolve, reject) => {
-            if (!this._redis) {
-                resolve(null);
-                return;
-            }
-            this._redis.get(key, (err, reply) => {
-                if (err) {
-                    Log_1.GLog.error(err);
-                }
-                resolve(reply);
-            });
-        });
-    }
-    /**
-     *
-     * @param key
-     * @param cb 有表示异步
-     */
-    del(key, cb) {
-        return new Promise((resolve, reject) => {
-            if (!this._redis) {
-                resolve(null);
-                return;
-            }
-            this._redis.del(key, (err, reply) => {
-                if (err) {
-                    Log_1.GLog.error(err);
-                }
-                resolve(reply);
-            });
-        });
-    }
-    hset(h, key, value) {
-        return new Promise((resolve, reject) => {
-            if (!this._redis) {
-                resolve(null);
-                return;
-            }
-            this._redis.hset(h, key, value, (err, reply) => {
-                if (err) {
-                    Log_1.GLog.error(err);
-                }
-                resolve(reply);
-            });
-        });
-    }
-    hget(h, key) {
-        return new Promise((resolve, reject) => {
-            if (!this._redis) {
-                resolve(null);
-                return;
-            }
-            this._redis.hget(h, key, (err, reply) => {
-                if (err) {
-                    Log_1.GLog.error(err);
-                }
-                resolve(reply);
-            });
-        });
-    }
-    hdel(key, sub_key) {
-        return new Promise((resolve, reject) => {
-            if (!this._redis) {
-                resolve(null);
-                return;
-            }
-            this._redis.hdel(key, sub_key, (err, reply) => {
-                if (err) {
-                    Log_1.GLog.error(err);
-                }
-                resolve(reply);
-            });
-        });
-    }
-    /**
-     * hash值，能转换位整数的就自动转换为整数
-     * @param h key
-     */
-    hgetall(h) {
-        return new Promise((resolve, reject) => {
-            if (!this._redis) {
-                resolve(null);
-                return;
-            }
-            this._redis.hgetall(h, (err, replys) => {
-                if (err) {
-                    Log_1.GLog.error(err);
-                    resolve(replys);
-                    return;
-                }
-                let value = {};
-                for (let k in replys) {
-                    let v = replys[k];
-                    let iv = parseInt(v);
-                    if (v == "" + iv) {
-                        value[k] = iv;
-                    }
-                    else {
-                        value[k] = v;
-                    }
-                }
-                if (!replys) {
-                    value = null;
-                }
-                resolve(value);
-            });
-        });
-    }
-    /**
-     *
-     * @param h
-     * @param array
-     */
-    hmset(h, array) {
-        return new Promise((resolve, reject) => {
-            if (!this._redis) {
-                resolve(null);
-                return;
-            }
-            this._redis.hmset(h, array, (err, replys) => {
-                if (err) {
-                    Log_1.GLog.error(err);
-                }
-                resolve(replys);
-            });
-        });
-    }
-    lpush(key, array) {
-        return new Promise((resolve, reject) => {
-            if (!this._redis) {
-                resolve(null);
-                return;
-            }
-            this._redis.lpush(key, array, (err, replys) => {
-                if (err) {
-                    Log_1.GLog.error(err);
-                }
-                resolve(replys);
-            });
-        });
-    }
-    lrange(key, start, end) {
-        return new Promise((resolve, reject) => {
-            if (!this._redis) {
-                resolve(null);
-                return;
-            }
-            if (!this._redis) {
-                return null;
-            }
-            if (!start) {
-                start = 0;
-            }
-            if (!end) {
-                end = -1;
-            }
-            this._redis.lrange(key, start, end, (err, replys) => {
-                if (err) {
-                    Log_1.GLog.error(err);
-                }
-                resolve(replys);
-            });
-        });
-    }
-    ltrim(key, start, end) {
-        return new Promise((resolve, reject) => {
-            if (!this._redis) {
-                resolve(null);
-                return;
-            }
-            if (!this._redis) {
-                return null;
-            }
-            if (!start) {
-                start = 0;
-            }
-            if (!end) {
-                end = -1;
-            }
-            this._redis.ltrim(key, start, end, (err, replys) => {
-                if (err) {
-                    Log_1.GLog.error(err);
-                }
-                resolve(replys);
-            });
-        });
-    }
-    sadd(key, array) {
-        return new Promise((resolve, reject) => {
-            if (!this._redis) {
-                resolve(null);
-                return;
-            }
-            this._redis.sadd(key, array, (err, replys) => {
-                if (err) {
-                    Log_1.GLog.error(err);
-                }
-                resolve(replys);
-            });
-        });
-    }
-    smembers(key) {
-        return new Promise((resolve, reject) => {
-            if (!this._redis) {
-                resolve(null);
-                return;
-            }
-            this._redis.smembers(key, (err, replys) => {
-                if (err) {
-                    Log_1.GLog.error(err);
-                }
-                resolve(replys);
-            });
-        });
-    }
-    srem(key, array) {
-        return new Promise((resolve, reject) => {
-            if (!this._redis) {
-                resolve(null);
-                return;
-            }
-            this._redis.srem(key, array, (err, replys) => {
-                if (err) {
-                    Log_1.GLog.error(err);
-                }
-                resolve(replys);
-            });
-        });
-    }
-    keys(key) {
-        return new Promise((resolve, reject) => {
-            if (!this._redis) {
-                resolve(null);
-                return;
-            }
-            this._redis.keys(key, (err, replys) => {
-                if (err) {
-                    Log_1.GLog.error(err);
-                }
-                resolve(replys);
-            });
-        });
-    }
-    multi() {
-        if (!this._redis) {
-            return null;
-        }
-        return this._redis.multi();
-    }
-    exists(key) {
-        return new Promise((resolve, reject) => {
-            if (!this._redis) {
-                resolve(null);
-                return;
-            }
-            this._redis.exists(key, (err, replys) => {
-                if (err) {
-                    Log_1.GLog.error(err);
-                }
-                resolve(replys);
-            });
-        });
-    }
-    exec(multi) {
-        return new Promise((resolve, reject) => {
-            if (!this._redis || !multi) {
-                resolve(null);
-                return;
-            }
-            multi.exec((err, replys) => {
-                if (err) {
-                    Log_1.GLog.error(err);
-                }
-                resolve(replys);
-            });
-        });
-    }
-    publish(channel, value) {
-        return new Promise((resolve, reject) => {
-            if (!this._redis) {
-                resolve(null);
-                return;
-            }
-            this._redis.publish(channel, value, (err, num) => {
-                if (err) {
-                    Log_1.GLog.error(err);
-                }
-                resolve(num);
-            });
-        });
-    }
-    subscribe(channel) {
-        return new Promise((resolve, reject) => {
-            if (!this._redis) {
-                resolve(null);
-                return;
-            }
-            this._redis.subscribe(channel, (err, msg) => {
-                if (err) {
-                    Log_1.GLog.error(err);
-                }
-                resolve(msg);
-            });
-        });
-    }
-    on(message, cb) {
-        if (!this._redis) {
-            return;
-        }
-        this._redis.on(message, cb);
+        Log_1.GLog.info("Error connected=" + this._redis + ": " + err);
     }
 }
 exports.RedisManager = RedisManager;
-exports.GRedisMgr = new RedisManager();
+exports.GRedisMgr = (new RedisManager());

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;