cgserver 8.6.7 → 8.6.10

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

@@ -1,171 +1,171 @@
-"use strict";
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.MysqlUserService = exports.GUserSer = exports.MysqlUserModel = void 0;
-const _ = require("underscore");
-const MysqlBaseService_1 = require("../Database/MysqlBaseService");
-const PrimaryKey_1 = require("../Database/Decorator/PrimaryKey");
-const NotNull_1 = require("../Database/Decorator/NotNull");
-const Property_1 = require("../Database/Decorator/Property");
-const Type_1 = require("../Database/Decorator/Type");
-const ini_1 = require("./ini");
-class MysqlUserModel extends MysqlBaseService_1.BaseModel {
-    id = -1;
-    account_id = -1;
-    nickname = "";
-    sex = -1;
-    logo = "";
-    state = ini_1.EUserState.Waitting;
-    role_group = 4;
-    role = 0;
-    phone = "";
-    email = "";
-    about = "";
-    pre_user_id = -1;
-    exp = 0;
-    level = 1; //等级
-    vip_exp = 0;
-    vip_level = 0; //等级
-    is_robot = 0;
-    create_time = 0;
-}
-__decorate([
-    (0, Type_1.Type)(Property_1.EPropertyType.Int),
-    NotNull_1.NotNull,
-    PrimaryKey_1.PrimaryKey
-], MysqlUserModel.prototype, "id", void 0);
-__decorate([
-    NotNull_1.NotNull,
-    (0, Type_1.Type)(Property_1.EPropertyType.Int, -1)
-], MysqlUserModel.prototype, "account_id", void 0);
-__decorate([
-    NotNull_1.NotNull,
-    (0, Type_1.Type)(Property_1.EPropertyType.Varchar, "noname", 32)
-], MysqlUserModel.prototype, "nickname", void 0);
-__decorate([
-    NotNull_1.NotNull,
-    (0, Type_1.Type)(Property_1.EPropertyType.SmallInt, 0)
-], MysqlUserModel.prototype, "sex", void 0);
-__decorate([
-    NotNull_1.NotNull,
-    (0, Type_1.Type)(Property_1.EPropertyType.Varchar, "", 255)
-], MysqlUserModel.prototype, "logo", void 0);
-__decorate([
-    NotNull_1.NotNull,
-    (0, Type_1.Type)(Property_1.EPropertyType.Int, 0)
-], MysqlUserModel.prototype, "state", void 0);
-__decorate([
-    NotNull_1.NotNull,
-    (0, Type_1.Type)(Property_1.EPropertyType.Int, 4)
-], MysqlUserModel.prototype, "role_group", void 0);
-__decorate([
-    NotNull_1.NotNull,
-    (0, Type_1.Type)(Property_1.EPropertyType.Int, 0)
-], MysqlUserModel.prototype, "role", void 0);
-__decorate([
-    NotNull_1.NotNull,
-    (0, Type_1.Type)(Property_1.EPropertyType.Varchar, "")
-], MysqlUserModel.prototype, "phone", void 0);
-__decorate([
-    NotNull_1.NotNull,
-    (0, Type_1.Type)(Property_1.EPropertyType.Varchar, "")
-], MysqlUserModel.prototype, "email", void 0);
-__decorate([
-    NotNull_1.NotNull,
-    (0, Type_1.Type)(Property_1.EPropertyType.Varchar, "", 512)
-], MysqlUserModel.prototype, "about", void 0);
-__decorate([
-    NotNull_1.NotNull,
-    (0, Type_1.Type)(Property_1.EPropertyType.Int, -1)
-], MysqlUserModel.prototype, "pre_user_id", void 0);
-__decorate([
-    NotNull_1.NotNull,
-    (0, Type_1.Type)(Property_1.EPropertyType.Int, 0)
-], MysqlUserModel.prototype, "exp", void 0);
-__decorate([
-    NotNull_1.NotNull,
-    (0, Type_1.Type)(Property_1.EPropertyType.Int, 1)
-], MysqlUserModel.prototype, "level", void 0);
-__decorate([
-    NotNull_1.NotNull,
-    (0, Type_1.Type)(Property_1.EPropertyType.Int, 0)
-], MysqlUserModel.prototype, "vip_exp", void 0);
-__decorate([
-    NotNull_1.NotNull,
-    (0, Type_1.Type)(Property_1.EPropertyType.Int, 0)
-], MysqlUserModel.prototype, "vip_level", void 0);
-__decorate([
-    NotNull_1.NotNull,
-    (0, Type_1.Type)(Property_1.EPropertyType.TinyInt, 0)
-], MysqlUserModel.prototype, "is_robot", void 0);
-__decorate([
-    NotNull_1.NotNull,
-    (0, Type_1.Type)(Property_1.EPropertyType.BigInt, 0)
-], MysqlUserModel.prototype, "create_time", void 0);
-exports.MysqlUserModel = MysqlUserModel;
-//暂时不实例化，方便重写
-exports.GUserSer = null;
-class MysqlUserService extends MysqlBaseService_1.MysqlBaseService {
-    constructor(type) {
-        super(type);
-        exports.GUserSer = this;
-    }
-    async _createNewUser(account_id, nickname, sex, logo, group) {
-        group = group || ini_1.ERoleGroup.Common;
-        let um = new this._t_type();
-        um.account_id = account_id;
-        um.nickname = nickname;
-        if (!um.nickname || um.nickname.length == 0) {
-            um.nickname = "noname";
-        }
-        um.sex = sex || 0;
-        um.logo = logo || "";
-        um.account_id = account_id;
-        um.state = ini_1.EUserState.Waitting;
-        um.role_group = group;
-        um.role = 0;
-        //随机userid
-        let id = 0;
-        do {
-            id = _.random(1000000, 9999999);
-            let p = await this.get("id", "id=?", [id]);
-            if (!p) {
-                break;
-            }
-        } while (true);
-        um.id = id;
-        return um;
-    }
-    async updateBaseInfoByAccount(account_id, nickname, sex, logo) {
-        let sr = await this.updateProperty("nickname=?,sex=?,logo=?", "account_id=?", [nickname, sex, logo, account_id]);
-        if (sr.error && sr.results.affectedRows <= 0) {
-            return "更新失败";
-        }
-        return;
-    }
-    async add(account_id, nickname, sex, logo, group) {
-        let um = await this._createNewUser(account_id, nickname, sex, logo, group);
-        let sr = await this.insert(um);
-        if (sr.error || sr.results.length <= 0) {
-            return null;
-        }
-        return um;
-    }
-    async updateRoleGroup(user_id, role_group) {
-        let sr = await this.updateProperty("role_group=?", "id=?", [role_group, user_id]);
-        if (sr.error && sr.results.affectedRows <= 0) {
-            return "更新失败";
-        }
-        return;
-    }
-    async getByAccountId(account_id) {
-        let pm = await this.get(null, "account_id=?", [account_id]);
-        return pm;
-    }
-}
-exports.MysqlUserService = MysqlUserService;
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MysqlUserService = exports.GUserSer = exports.MysqlUserModel = void 0;
+const _ = require("underscore");
+const MysqlBaseService_1 = require("../Database/MysqlBaseService");
+const PrimaryKey_1 = require("../Database/Decorator/PrimaryKey");
+const NotNull_1 = require("../Database/Decorator/NotNull");
+const Property_1 = require("../Database/Decorator/Property");
+const Type_1 = require("../Database/Decorator/Type");
+const ini_1 = require("./ini");
+class MysqlUserModel extends MysqlBaseService_1.BaseModel {
+    id = -1;
+    account_id = -1;
+    nickname = "";
+    sex = -1;
+    logo = "";
+    state = ini_1.EUserState.Waitting;
+    role_group = 4;
+    role = 0;
+    phone = "";
+    email = "";
+    about = "";
+    pre_user_id = -1;
+    exp = 0;
+    level = 1; //等级
+    vip_exp = 0;
+    vip_level = 0; //等级
+    is_robot = 0;
+    create_time = 0;
+}
+exports.MysqlUserModel = MysqlUserModel;
+__decorate([
+    (0, Type_1.Type)(Property_1.EPropertyType.Int),
+    NotNull_1.NotNull,
+    PrimaryKey_1.PrimaryKey
+], MysqlUserModel.prototype, "id", void 0);
+__decorate([
+    NotNull_1.NotNull,
+    (0, Type_1.Type)(Property_1.EPropertyType.Int, -1)
+], MysqlUserModel.prototype, "account_id", void 0);
+__decorate([
+    NotNull_1.NotNull,
+    (0, Type_1.Type)(Property_1.EPropertyType.Varchar, "noname", 32)
+], MysqlUserModel.prototype, "nickname", void 0);
+__decorate([
+    NotNull_1.NotNull,
+    (0, Type_1.Type)(Property_1.EPropertyType.SmallInt, 0)
+], MysqlUserModel.prototype, "sex", void 0);
+__decorate([
+    NotNull_1.NotNull,
+    (0, Type_1.Type)(Property_1.EPropertyType.Varchar, "", 255)
+], MysqlUserModel.prototype, "logo", void 0);
+__decorate([
+    NotNull_1.NotNull,
+    (0, Type_1.Type)(Property_1.EPropertyType.Int, 0)
+], MysqlUserModel.prototype, "state", void 0);
+__decorate([
+    NotNull_1.NotNull,
+    (0, Type_1.Type)(Property_1.EPropertyType.Int, 4)
+], MysqlUserModel.prototype, "role_group", void 0);
+__decorate([
+    NotNull_1.NotNull,
+    (0, Type_1.Type)(Property_1.EPropertyType.Int, 0)
+], MysqlUserModel.prototype, "role", void 0);
+__decorate([
+    NotNull_1.NotNull,
+    (0, Type_1.Type)(Property_1.EPropertyType.Varchar, "")
+], MysqlUserModel.prototype, "phone", void 0);
+__decorate([
+    NotNull_1.NotNull,
+    (0, Type_1.Type)(Property_1.EPropertyType.Varchar, "")
+], MysqlUserModel.prototype, "email", void 0);
+__decorate([
+    NotNull_1.NotNull,
+    (0, Type_1.Type)(Property_1.EPropertyType.Varchar, "", 512)
+], MysqlUserModel.prototype, "about", void 0);
+__decorate([
+    NotNull_1.NotNull,
+    (0, Type_1.Type)(Property_1.EPropertyType.Int, -1)
+], MysqlUserModel.prototype, "pre_user_id", void 0);
+__decorate([
+    NotNull_1.NotNull,
+    (0, Type_1.Type)(Property_1.EPropertyType.Int, 0)
+], MysqlUserModel.prototype, "exp", void 0);
+__decorate([
+    NotNull_1.NotNull,
+    (0, Type_1.Type)(Property_1.EPropertyType.Int, 1)
+], MysqlUserModel.prototype, "level", void 0);
+__decorate([
+    NotNull_1.NotNull,
+    (0, Type_1.Type)(Property_1.EPropertyType.Int, 0)
+], MysqlUserModel.prototype, "vip_exp", void 0);
+__decorate([
+    NotNull_1.NotNull,
+    (0, Type_1.Type)(Property_1.EPropertyType.Int, 0)
+], MysqlUserModel.prototype, "vip_level", void 0);
+__decorate([
+    NotNull_1.NotNull,
+    (0, Type_1.Type)(Property_1.EPropertyType.TinyInt, 0)
+], MysqlUserModel.prototype, "is_robot", void 0);
+__decorate([
+    NotNull_1.NotNull,
+    (0, Type_1.Type)(Property_1.EPropertyType.BigInt, 0)
+], MysqlUserModel.prototype, "create_time", void 0);
+//暂时不实例化，方便重写
+exports.GUserSer = null;
+class MysqlUserService extends MysqlBaseService_1.MysqlBaseService {
+    constructor(type) {
+        super(type);
+        exports.GUserSer = this;
+    }
+    async _createNewUser(account_id, nickname, sex, logo, group) {
+        group = group || ini_1.ERoleGroup.Common;
+        let um = new this._t_type();
+        um.account_id = account_id;
+        um.nickname = nickname;
+        if (!um.nickname || um.nickname.length == 0) {
+            um.nickname = "noname";
+        }
+        um.sex = sex || 0;
+        um.logo = logo || "";
+        um.account_id = account_id;
+        um.state = ini_1.EUserState.Waitting;
+        um.role_group = group;
+        um.role = 0;
+        //随机userid
+        let id = 0;
+        do {
+            id = _.random(1000000, 9999999);
+            let p = await this.get("id", "id=?", [id]);
+            if (!p) {
+                break;
+            }
+        } while (true);
+        um.id = id;
+        return um;
+    }
+    async updateBaseInfoByAccount(account_id, nickname, sex, logo) {
+        let sr = await this.updateProperty("nickname=?,sex=?,logo=?", "account_id=?", [nickname, sex, logo, account_id]);
+        if (sr.error && sr.results.affectedRows <= 0) {
+            return "更新失败";
+        }
+        return;
+    }
+    async add(account_id, nickname, sex, logo, group) {
+        let um = await this._createNewUser(account_id, nickname, sex, logo, group);
+        let sr = await this.insert(um);
+        if (sr.error || sr.results.length <= 0) {
+            return null;
+        }
+        return um;
+    }
+    async updateRoleGroup(user_id, role_group) {
+        let sr = await this.updateProperty("role_group=?", "id=?", [role_group, user_id]);
+        if (sr.error && sr.results.affectedRows <= 0) {
+            return "更新失败";
+        }
+        return;
+    }
+    async getByAccountId(account_id) {
+        let pm = await this.get(null, "account_id=?", [account_id]);
+        return pm;
+    }
+}
+exports.MysqlUserService = MysqlUserService;

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

@@ -1,36 +1,36 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.EAccountFrom = exports.EAccountState = exports.EUserState = exports.ERoleGroup = void 0;
-var ERoleGroup;
-(function (ERoleGroup) {
-    ERoleGroup[ERoleGroup["Creator"] = 1] = "Creator";
-    ERoleGroup[ERoleGroup["Admin"] = 2] = "Admin";
-    ERoleGroup[ERoleGroup["Proxy"] = 3] = "Proxy";
-    ERoleGroup[ERoleGroup["Common"] = 4] = "Common"; //普通成员
-})(ERoleGroup = exports.ERoleGroup || (exports.ERoleGroup = {}));
-var EUserState;
-(function (EUserState) {
-    EUserState[EUserState["Ban"] = -1] = "Ban";
-    EUserState[EUserState["Waitting"] = 0] = "Waitting";
-    EUserState[EUserState["Normarl"] = 1] = "Normarl";
-})(EUserState = exports.EUserState || (exports.EUserState = {}));
-var EAccountState;
-(function (EAccountState) {
-    EAccountState[EAccountState["Delete"] = -2] = "Delete";
-    EAccountState[EAccountState["Ban"] = -1] = "Ban";
-    EAccountState[EAccountState["Waitting"] = 0] = "Waitting";
-    EAccountState[EAccountState["Normarl"] = 1] = "Normarl";
-})(EAccountState = exports.EAccountState || (exports.EAccountState = {}));
-var EAccountFrom;
-(function (EAccountFrom) {
-    EAccountFrom[EAccountFrom["Guest"] = 0] = "Guest";
-    EAccountFrom[EAccountFrom["OpenSocial"] = 1] = "OpenSocial";
-    EAccountFrom[EAccountFrom["WeChat"] = 2] = "WeChat";
-    EAccountFrom[EAccountFrom["QQ"] = 3] = "QQ";
-    EAccountFrom[EAccountFrom["Phone"] = 4] = "Phone";
-    EAccountFrom[EAccountFrom["Email"] = 5] = "Email";
-    EAccountFrom[EAccountFrom["Name"] = 6] = "Name";
-    EAccountFrom[EAccountFrom["QuickPhone"] = 7] = "QuickPhone";
-    EAccountFrom[EAccountFrom["Apple"] = 8] = "Apple";
-    EAccountFrom[EAccountFrom["Google"] = 9] = "Google";
-})(EAccountFrom = exports.EAccountFrom || (exports.EAccountFrom = {}));
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EAccountFrom = exports.EAccountState = exports.EUserState = exports.ERoleGroup = void 0;
+var ERoleGroup;
+(function (ERoleGroup) {
+    ERoleGroup[ERoleGroup["Creator"] = 1] = "Creator";
+    ERoleGroup[ERoleGroup["Admin"] = 2] = "Admin";
+    ERoleGroup[ERoleGroup["Proxy"] = 3] = "Proxy";
+    ERoleGroup[ERoleGroup["Common"] = 4] = "Common"; //普通成员
+})(ERoleGroup || (exports.ERoleGroup = ERoleGroup = {}));
+var EUserState;
+(function (EUserState) {
+    EUserState[EUserState["Ban"] = -1] = "Ban";
+    EUserState[EUserState["Waitting"] = 0] = "Waitting";
+    EUserState[EUserState["Normarl"] = 1] = "Normarl";
+})(EUserState || (exports.EUserState = EUserState = {}));
+var EAccountState;
+(function (EAccountState) {
+    EAccountState[EAccountState["Delete"] = -2] = "Delete";
+    EAccountState[EAccountState["Ban"] = -1] = "Ban";
+    EAccountState[EAccountState["Waitting"] = 0] = "Waitting";
+    EAccountState[EAccountState["Normarl"] = 1] = "Normarl";
+})(EAccountState || (exports.EAccountState = EAccountState = {}));
+var EAccountFrom;
+(function (EAccountFrom) {
+    EAccountFrom[EAccountFrom["Guest"] = 0] = "Guest";
+    EAccountFrom[EAccountFrom["OpenSocial"] = 1] = "OpenSocial";
+    EAccountFrom[EAccountFrom["WeChat"] = 2] = "WeChat";
+    EAccountFrom[EAccountFrom["QQ"] = 3] = "QQ";
+    EAccountFrom[EAccountFrom["Phone"] = 4] = "Phone";
+    EAccountFrom[EAccountFrom["Email"] = 5] = "Email";
+    EAccountFrom[EAccountFrom["Name"] = 6] = "Name";
+    EAccountFrom[EAccountFrom["QuickPhone"] = 7] = "QuickPhone";
+    EAccountFrom[EAccountFrom["Apple"] = 8] = "Apple";
+    EAccountFrom[EAccountFrom["Google"] = 9] = "Google";
+})(EAccountFrom || (exports.EAccountFrom = EAccountFrom = {}));

package/dist/lib/Framework/SocketServer/IClientWebSocket.js

@@ -1,44 +1,44 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.IClientWebSocket = void 0;
-const IWebSocket_1 = require("./IWebSocket");
-const Log_1 = require("../Logic/Log");
-const IProtoFilter_1 = require("./ProtoFilter/IProtoFilter");
-/**
- * 服务器接收到的客户端的连接
- * 客户端的session对象
- */
-class IClientWebSocket extends IWebSocket_1.IWebSocket {
-    _server = null;
-    get server() {
-        return this._server;
-    }
-    constructor(server, protoType = IProtoFilter_1.EProtoType.Json, protoPath = "") {
-        super(protoType, protoPath);
-        this._server = server;
-        this._tipKey = this._server.name;
-    }
-    onClose(reasonCode, description) {
-        super.onClose(reasonCode, description);
-        this._server.removeServerWebSocketBySocketId(this._socket_id);
-    }
-    broadCast(data) {
-        if (!data) {
-            Log_1.GLog.info("Send Message warning:null data!");
-            return;
-        }
-        Log_1.GLog.info("broadCast:----------------------------------");
-        Log_1.GLog.info(data);
-        let msg = this._protoFilter.encode(data);
-        this._server.broadCast(msg);
-    }
-    _onDecode(message, ...params) {
-        let msg = super._onDecode(message, "msgReq");
-        return msg;
-    }
-    _onEncode(data, ...params) {
-        let msg = super._onEncode(data, "msgRes");
-        return msg;
-    }
-}
-exports.IClientWebSocket = IClientWebSocket;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.IClientWebSocket = void 0;
+const IWebSocket_1 = require("./IWebSocket");
+const Log_1 = require("../Logic/Log");
+const IProtoFilter_1 = require("./ProtoFilter/IProtoFilter");
+/**
+ * 服务器接收到的客户端的连接
+ * 客户端的session对象
+ */
+class IClientWebSocket extends IWebSocket_1.IWebSocket {
+    _server = null;
+    get server() {
+        return this._server;
+    }
+    constructor(server, protoType = IProtoFilter_1.EProtoType.Json, protoPath = "") {
+        super(protoType, protoPath);
+        this._server = server;
+        this._tipKey = this._server.name;
+    }
+    onClose(reasonCode, description) {
+        super.onClose(reasonCode, description);
+        this._server.removeServerWebSocketBySocketId(this._socket_id);
+    }
+    broadCast(data) {
+        if (!data) {
+            Log_1.GLog.info("Send Message warning:null data!");
+            return;
+        }
+        Log_1.GLog.info("broadCast:----------------------------------");
+        Log_1.GLog.info(data);
+        let msg = this._protoFilter.encode(data);
+        this._server.broadCast(msg);
+    }
+    _onDecode(message, ...params) {
+        let msg = super._onDecode(message, "msgReq");
+        return msg;
+    }
+    _onEncode(data, ...params) {
+        let msg = super._onEncode(data, "msgRes");
+        return msg;
+    }
+}
+exports.IClientWebSocket = IClientWebSocket;

package/dist/lib/Framework/SocketServer/IRpc.js

@@ -1,12 +1,12 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.IRpc = exports.RpcBaseMsg = void 0;
-const IWebSocket_1 = require("./IWebSocket");
-class RpcBaseMsg extends IWebSocket_1.BaseMsg {
-    __rpcid = "";
-    __return = false;
-}
-exports.RpcBaseMsg = RpcBaseMsg;
-class IRpc {
-}
-exports.IRpc = IRpc;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.IRpc = exports.RpcBaseMsg = void 0;
+const IWebSocket_1 = require("./IWebSocket");
+class RpcBaseMsg extends IWebSocket_1.BaseMsg {
+    __rpcid = "";
+    __return = false;
+}
+exports.RpcBaseMsg = RpcBaseMsg;
+class IRpc {
+}
+exports.IRpc = IRpc;