cgserver 6.5.3 → 6.5.4

package/README.md

@@ -1,4 +1,6 @@
 6.5.3
+1、增加账号状态EAccountState
+6.5.3
 1、事件分发器GEventTool添加emit
 6.5.2
 1、添加事件分发器GEventTool

package/dist/lib/Service/AccountService.js

@@ -34,7 +34,7 @@ let AccountModel = class AccountModel extends MysqlBaseService_1.BaseModel {
     login_time = -1;
     login_ip = "";
     from = 0;
-    state = 0;
+    state = ini_1.EAccountState.Waitting;
 };
 __decorate([
     (0, Type_1.Type)(Property_1.EPropertyType.Int),
@@ -152,7 +152,7 @@ class AccountService extends MysqlBaseService_1.MysqlBaseService {
         account.login_time = Date.now();
         account.login_ip = ip;
         account.from = from;
-        account.state = 1;
+        account.state = ini_1.EAccountState.Waitting;
         delete account.id;
         let sr = await this.insert(account);
         if (sr.error

package/dist/lib/Service/MongoAccountService.js

@@ -23,7 +23,7 @@ class AccountModel extends MongoManager_1.MongoBaseModel {
     login_time = -1;
     login_ip = "";
     from = 0;
-    state = 0;
+    state = ini_1.EAccountState.Waitting;
 }
 exports.AccountModel = AccountModel;
 //暂时不实例化，方便重写
@@ -84,7 +84,7 @@ class AccountService extends MongoBaseService_1.MongoBaseService {
         account.login_time = Date.now();
         account.login_ip = ip;
         account.from = from;
-        account.state = 1;
+        account.state = ini_1.EAccountState.Waitting;
         account.id = await this.getNextId();
         let sr = await this.insert(account);
         if (sr.errcode) {

package/dist/lib/Service/UserService.js

@@ -20,7 +20,7 @@ class UserModel extends MysqlBaseService_1.BaseModel {
     nickname = "";
     sex = -1;
     logo = "";
-    state = 0;
+    state = ini_1.EUserState.Waitting;
     role_group = 4;
     role = 0;
     phone = "";
@@ -139,7 +139,7 @@ class UserService extends MysqlBaseService_1.MysqlBaseService {
         um.sex = sex || 0;
         um.logo = logo || "";
         um.account_id = account_id;
-        um.state = 0;
+        um.state = ini_1.EUserState.Waitting;
         um.role_group = group;
         um.role = 0;
         //随机userid

package/dist/lib/Service/ini.js

@@ -16,6 +16,7 @@ var EUserState;
 })(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";

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.GEventTool = 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;
+exports.GCgServer = exports.EAccountState = exports.GEventTool = 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");
@@ -161,6 +161,8 @@ var AsyncQueueTool_1 = require("./Logic/AsyncQueueTool");
 Object.defineProperty(exports, "GAsyncQueueTool", { enumerable: true, get: function () { return AsyncQueueTool_1.GAsyncQueueTool; } });
 var EventTool_1 = require("./Logic/EventTool");
 Object.defineProperty(exports, "GEventTool", { enumerable: true, get: function () { return EventTool_1.GEventTool; } });
+var ini_2 = require("./Service/ini");
+Object.defineProperty(exports, "EAccountState", { enumerable: true, get: function () { return ini_2.EAccountState; } });
 const Log_2 = require("./Logic/Log");
 class CgServer {
     constructor() {

package/dist/types/Service/ini.d.ts

@@ -10,6 +10,7 @@ export declare enum EUserState {
     Normarl = 1
 }
 export declare enum EAccountState {
+    Delete = -2,
     Ban = -1,
     Waitting = 0,
     Normarl = 1

package/dist/types/cgserver.d.ts

@@ -74,6 +74,7 @@ export { Response } from './WebServer/Engine/Response';
 export { WebServerConfig } from './Config/FrameworkConfig';
 export { GAsyncQueueTool } from './Logic/AsyncQueueTool';
 export { GEventTool } from './Logic/EventTool';
+export { EAccountState } from './Service/ini';
 declare class CgServer {
     constructor();
     init(): void;

package/package.json

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