cgserver 12.3.5 → 13.0.0

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

@@ -15,12 +15,6 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-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;
-};
 var __importStar = (this && this.__importStar) || (function () {
     var ownKeys = function(o) {
         ownKeys = Object.getOwnPropertyNames || function (o) {
@@ -38,92 +32,60 @@ var __importStar = (this && this.__importStar) || (function () {
         return result;
     };
 })();
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MongoUserService = exports.MongoUserModel = void 0;
+exports.MongoUserService = void 0;
 const _ = __importStar(require("underscore"));
 const MongoBaseService_1 = require("../Database/Mongo/MongoBaseService");
-const MongoManager_1 = require("../Database/Mongo/MongoManager");
+const mongoose_1 = __importDefault(require("mongoose"));
 const ini_1 = require("./ini");
-const SyncCall_1 = require("../Decorator/SyncCall");
-class MongoUserModel extends MongoManager_1.MongoBaseModel {
-    id = -1;
-    account_id = -1;
-    nickname = "";
-    sex = -1;
-    logo = "";
-    state = 0;
-    role_group = 4;
-    role = 0;
-    phone = "";
-    wechat = "";
-    qq = "";
-    email = "";
-    about = "";
-    pre_user_id = -1;
-    exp = 0;
-    level = 1; //等级
-    vip_exp = 0;
-    vip_level = 0; //等级
-    is_robot = 0;
-    create_time = 0;
-}
-exports.MongoUserModel = MongoUserModel;
 //暂时不实例化，方便重写
 class MongoUserService extends MongoBaseService_1.MongoBaseService {
-    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";
+    constructor(extuserdef) {
+        const userSchema = new mongoose_1.default.Schema({ ...{
+                _id: { type: Number },
+                account_id: { type: String, index: { unique: true } },
+                state: { type: Number, default: ini_1.EUserState.Normal },
+                is_robot: { type: Boolean, default: false },
+                create_time: { type: Date, default: Date.now },
+                login_time: { type: Date, default: Date.now },
+                create_ip: { type: String, default: "" },
+                login_ip: { type: String, default: "" },
+                nickname: { type: String, default: "noname" },
+                logo: { type: String, default: "" },
+                sex: { type: Number, default: 0 }
+            }, ...extuserdef }, { id: false });
+        userSchema.virtual('id').get(function () {
+            return this._id;
+        });
+        super('user', userSchema);
+    }
+    async add(account_id, nickname, sex, logo) {
+        let m = {};
+        m.account_id = account_id;
+        if (nickname) {
+            m.nickname = nickname;
+        }
+        if (sex !== undefined) {
+            m.sex = sex;
+        }
+        if (logo) {
+            m.logo = logo;
         }
-        um.sex = sex || 0;
-        um.logo = logo || "";
-        um.account_id = account_id;
-        um.state = 0;
-        um.role_group = group;
-        um.role = 0;
-        um.create_time = Date.now();
         //随机userid
         let id = 0;
         do {
-            id = _.random(1000000, 9999999);
+            id = _.random(10000000, 99999999);
             let p = await this.findOne({ id: id }, { id: 1 });
             if (!p) {
                 break;
             }
         } while (true);
-        um.id = id;
-        return um;
-    }
-    async add(account_id, nickname, sex, logo, group) {
-        let um = await this._createNewUser(account_id, nickname, sex, logo, group);
-        let rs = await this.insert(um);
-        if (rs.errcode || !rs.rs.insertedId) {
-            return null;
-        }
-        um._id = rs.rs.insertedId;
-        return um;
-    }
-    async getByAccountId(account_id) {
-        let pm = await this.findOne({ account_id: account_id });
-        return pm;
-    }
-    async updateBaseInfoByAccount(account_id, nickname, sex, logo) {
-        let model = {
-            nickname: nickname,
-            sex: sex,
-            logo: logo
-        };
-        let sr = await this.updateOne({ account_id: account_id }, model);
-        if (sr.errcode) {
-            return "更新失败";
-        }
-        return;
+        m._id = id;
+        let rs = await this.insert(m);
+        return rs.model;
     }
 }
 exports.MongoUserService = MongoUserService;
-__decorate([
-    SyncCall_1.SyncCall
-], MongoUserService.prototype, "_createNewUser", null);

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

@@ -148,8 +148,7 @@ class MysqlUserService extends MysqlBaseService_1.MysqlBaseService {
         super(type);
         exports.GUserSer = this;
     }
-    async _createNewUser(account_id, nickname, sex, logo, group) {
-        group = group || ini_1.ERoleGroup.Common;
+    async _createNewUser(account_id, nickname, sex, logo) {
         let um = new this._t_type();
         um.account_id = account_id;
         um.nickname = nickname;
@@ -160,7 +159,6 @@ class MysqlUserService extends MysqlBaseService_1.MysqlBaseService {
         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;
@@ -181,21 +179,14 @@ class MysqlUserService extends MysqlBaseService_1.MysqlBaseService {
         }
         return;
     }
-    async add(account_id, nickname, sex, logo, group) {
-        let um = await this._createNewUser(account_id, nickname, sex, logo, group);
+    async add(account_id, nickname, sex, logo) {
+        let um = await this._createNewUser(account_id, nickname, sex, logo);
         let sr = await this.insert(um);
         if (sr.error || sr.queryResult.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.execResult.affectedRows <= 0) {
-            return "更新失败";
-        }
-        return;
-    }
     async getByAccountId(account_id) {
         let pm = await this.get(null, "account_id=?", [account_id]);
         return pm;

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

@@ -1,25 +1,19 @@
 "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 = {}));
+exports.EAccountFrom = exports.EAccountState = exports.EUserState = void 0;
 var EUserState;
 (function (EUserState) {
+    EUserState[EUserState["Delete"] = -2] = "Delete";
     EUserState[EUserState["Ban"] = -1] = "Ban";
     EUserState[EUserState["Waitting"] = 0] = "Waitting";
-    EUserState[EUserState["Normarl"] = 1] = "Normarl";
+    EUserState[EUserState["Normal"] = 1] = "Normal";
 })(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[EAccountState["Normal"] = 1] = "Normal";
 })(EAccountState || (exports.EAccountState = EAccountState = {}));
 var EAccountFrom;
 (function (EAccountFrom) {

package/dist/lib/Framework/global.js

@@ -6,7 +6,6 @@ const ByteTool_1 = require("./Core/ByteTool");
 const DBCache_1 = require("./Database/Decorator/DBCache");
 const MSSqlManager_1 = require("./Database/MSSql/MSSqlManager");
 const MongoManager_1 = require("./Database/Mongo/MongoManager");
-const MongoServiceManager_1 = require("./Database/Mongo/MongoServiceManager");
 const MysqlManager_1 = require("./Database/Mysql/MysqlManager");
 const CacheTool_1 = require("./Logic/CacheTool");
 const EventTool_1 = require("./Logic/EventTool");
@@ -31,7 +30,6 @@ const CgRankTool_1 = require("./ThirdParty/CgRankTool");
  * cg引擎的，全局对象
  */
 class global {
-    static gMongoServiceMgr = MongoServiceManager_1.gMongoServiceMgr;
     static gCgServer = cgserver_1.gCgServer;
     static gDbCache = DBCache_1.gDbCache;
     static gTriggerMgr = TriggerMgr_1.gTriggerMgr;

package/dist/lib/Framework/index_export_.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MysqlConfig = exports.MongoConfig = exports.MSSqlConfig = exports.DbConfig = exports.MongoCacheService = exports.MongoCacheModel = exports.MongoUserModel = exports.MysqlUserModel = exports.MongoUserService = exports.MysqlUserService = exports.MongoAccountService = exports.MysqlAccountService = exports.EAccountFrom = exports.EUserState = exports.ERoleGroup = exports.SqlReturns = exports.SqlReturn = exports.MysqlBaseService = exports.MongoExt = exports.MongoManager = 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.IServerConfig = exports.FrameworkConfig = exports.Config = exports.FrameworkErrorCode = exports.Trigger = exports.Point = exports.Entity = exports.BehaviorAI = exports.AStar = exports.AiObject = exports.MongoServiceManager = exports.CgRankRankData = exports.CgRankRankItem = exports.CgRankCommandItem = exports.CgRankTool = exports.AliSmsConfig = exports.AlipaySdk = exports.EAlipayExecType = void 0;
-exports.global = exports.SyncCallServer2 = exports.SyncCallServer = exports.SyncCall2 = exports.SyncCall = exports.IRpcClientWebSocket = exports.IRpcServerWebSocket = exports.RpcConfig = exports.CgMq = exports.Rpc = exports.RpcBaseMsg = exports.PacketParser = exports.SocketServerConfig = exports.ISocketServer = exports.ISocket = exports.IServerSocket = exports.IClientSocket = exports.EAccountState = exports.WebServerConfig = exports.Response = exports.Request = exports.RazorJs = exports.Engine = exports.JsonCreatorValidate = exports.JsonAuthorityValidate = exports.JsonAdminValidate = exports.CreatorValidate = exports.AuthorityValidate = exports.AdminValidate = exports.MongoAccountModel = exports.MysqlAccountModel = exports.MongoBaseUserController = exports.MysqlBaseUserController = exports.BaseController = exports.IWebServer = exports.BaseMsg = exports.IWebSocket = exports.WebSocketServerConfig = exports.IWebSocketServer = exports.IClientWebSocket = exports.IServerWebSocket = exports.JsonProtoFilter = exports.GoogleProtoFilter = exports.EProtoType = exports.RedisManager = void 0;
+exports.IServerWebSocket = exports.JsonProtoFilter = exports.GoogleProtoFilter = exports.EProtoType = exports.RedisManager = exports.MysqlConfig = exports.MongoConfig = exports.MSSqlConfig = exports.DbConfig = exports.MongoCacheService = exports.MysqlUserModel = exports.MongoUserService = exports.MysqlUserService = exports.MongoAccountService = exports.MysqlAccountService = exports.EAccountFrom = exports.EUserState = exports.SqlReturns = exports.SqlReturn = exports.MysqlBaseService = exports.MongoExt = exports.MongoManager = exports.MysqlBaseModel = exports.MongoBaseService = exports.EPropertyType = exports.Type = exports.Table = exports.Property = exports.PrimaryKey = exports.NotNull = exports.AutoIncrement = exports.Timer = exports.core = exports.IServerConfig = exports.FrameworkConfig = exports.Config = exports.FrameworkErrorCode = exports.Trigger = exports.Point = exports.Entity = exports.BehaviorAI = exports.AStar = exports.AiObject = exports.CgRankRankData = exports.CgRankRankItem = exports.CgRankCommandItem = exports.CgRankTool = exports.AliSmsConfig = exports.AlipaySdk = exports.EAlipayExecType = void 0;
+exports.global = exports.SyncCallServer2 = exports.SyncCallServer = exports.SyncCall2 = exports.SyncCall = exports.IRpcClientWebSocket = exports.IRpcServerWebSocket = exports.RpcConfig = exports.CgMq = exports.Rpc = exports.RpcBaseMsg = exports.PacketParser = exports.SocketServerConfig = exports.ISocketServer = exports.ISocket = exports.IServerSocket = exports.IClientSocket = exports.EAccountState = exports.WebServerConfig = exports.Response = exports.Request = exports.RazorJs = exports.Engine = exports.JsonAuthorityValidate = exports.MysqlAccountModel = exports.MongoBaseUserController = exports.BaseController = exports.IWebServer = exports.BaseMsg = exports.IWebSocket = exports.WebSocketServerConfig = exports.IWebSocketServer = exports.IClientWebSocket = void 0;
 var AlipayTool_1 = require("./ThirdParty/AlipayTool");
 Object.defineProperty(exports, "EAlipayExecType", { enumerable: true, get: function () { return AlipayTool_1.EAlipayExecType; } });
 var alipay_sdk_1 = require("alipay-sdk");
@@ -13,8 +13,6 @@ Object.defineProperty(exports, "CgRankTool", { enumerable: true, get: function (
 Object.defineProperty(exports, "CgRankCommandItem", { enumerable: true, get: function () { return CgRankTool_1.CgRankCommandItem; } });
 Object.defineProperty(exports, "CgRankRankItem", { enumerable: true, get: function () { return CgRankTool_1.CgRankRankItem; } });
 Object.defineProperty(exports, "CgRankRankData", { enumerable: true, get: function () { return CgRankTool_1.CgRankRankData; } });
-var MongoServiceManager_1 = require("./Database/Mongo/MongoServiceManager");
-Object.defineProperty(exports, "MongoServiceManager", { enumerable: true, get: function () { return MongoServiceManager_1.MongoServiceManager; } });
 var AiObject_1 = require("./AI/AiObject");
 Object.defineProperty(exports, "AiObject", { enumerable: true, get: function () { return AiObject_1.AiObject; } });
 var Astar_1 = require("./AI/Astar");
@@ -59,7 +57,6 @@ Object.defineProperty(exports, "MongoBaseService", { enumerable: true, get: func
 var MysqlBaseService_1 = require("./Database/Mysql/MysqlBaseService");
 Object.defineProperty(exports, "MysqlBaseModel", { enumerable: true, get: function () { return MysqlBaseService_1.BaseModel; } });
 var MongoManager_1 = require("./Database/Mongo/MongoManager");
-Object.defineProperty(exports, "MongoBaseModel", { enumerable: true, get: function () { return MongoManager_1.MongoBaseModel; } });
 Object.defineProperty(exports, "MongoManager", { enumerable: true, get: function () { return MongoManager_1.MongoManager; } });
 Object.defineProperty(exports, "MongoExt", { enumerable: true, get: function () { return MongoManager_1.MongoExt; } });
 var MysqlBaseService_2 = require("./Database/Mysql/MysqlBaseService");
@@ -68,7 +65,6 @@ var MysqlManager_1 = require("./Database/Mysql/MysqlManager");
 Object.defineProperty(exports, "SqlReturn", { enumerable: true, get: function () { return MysqlManager_1.SqlReturn; } });
 Object.defineProperty(exports, "SqlReturns", { enumerable: true, get: function () { return MysqlManager_1.SqlReturns; } });
 var ini_1 = require("./Service/ini");
-Object.defineProperty(exports, "ERoleGroup", { enumerable: true, get: function () { return ini_1.ERoleGroup; } });
 Object.defineProperty(exports, "EUserState", { enumerable: true, get: function () { return ini_1.EUserState; } });
 Object.defineProperty(exports, "EAccountFrom", { enumerable: true, get: function () { return ini_1.EAccountFrom; } });
 var MysqlAccountService_1 = require("./Service/MysqlAccountService");
@@ -81,10 +77,7 @@ var MongoUserService_1 = require("./Service/MongoUserService");
 Object.defineProperty(exports, "MongoUserService", { enumerable: true, get: function () { return MongoUserService_1.MongoUserService; } });
 var MysqlUserService_2 = require("./Service/MysqlUserService");
 Object.defineProperty(exports, "MysqlUserModel", { enumerable: true, get: function () { return MysqlUserService_2.MysqlUserModel; } });
-var MongoUserService_2 = require("./Service/MongoUserService");
-Object.defineProperty(exports, "MongoUserModel", { enumerable: true, get: function () { return MongoUserService_2.MongoUserModel; } });
 var MongoCacheService_1 = require("./Service/MongoCacheService");
-Object.defineProperty(exports, "MongoCacheModel", { enumerable: true, get: function () { return MongoCacheService_1.MongoCacheModel; } });
 Object.defineProperty(exports, "MongoCacheService", { enumerable: true, get: function () { return MongoCacheService_1.MongoCacheService; } });
 var DbConfig_1 = require("./Config/DbConfig");
 Object.defineProperty(exports, "DbConfig", { enumerable: true, get: function () { return DbConfig_1.DbConfig; } });
@@ -116,26 +109,12 @@ var IWebServer_1 = require("./Server/WebServer/IWebServer");
 Object.defineProperty(exports, "IWebServer", { enumerable: true, get: function () { return IWebServer_1.IWebServer; } });
 var BaseController_1 = require("./Server/WebServer/Controller/BaseController");
 Object.defineProperty(exports, "BaseController", { enumerable: true, get: function () { return BaseController_1.BaseController; } });
-var MysqlBaseUserController_1 = require("./Server/WebServer/Controller/MysqlBaseUserController");
-Object.defineProperty(exports, "MysqlBaseUserController", { enumerable: true, get: function () { return MysqlBaseUserController_1.MysqlBaseUserController; } });
 var MongoBaseUserController_1 = require("./Server/WebServer/Controller/MongoBaseUserController");
 Object.defineProperty(exports, "MongoBaseUserController", { enumerable: true, get: function () { return MongoBaseUserController_1.MongoBaseUserController; } });
 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("./Decorator/AdminValidate");
-Object.defineProperty(exports, "AdminValidate", { enumerable: true, get: function () { return AdminValidate_1.AdminValidate; } });
-var AuthorityValidate_1 = require("./Decorator/AuthorityValidate");
-Object.defineProperty(exports, "AuthorityValidate", { enumerable: true, get: function () { return AuthorityValidate_1.AuthorityValidate; } });
-var CreatorValidate_1 = require("./Decorator/CreatorValidate");
-Object.defineProperty(exports, "CreatorValidate", { enumerable: true, get: function () { return CreatorValidate_1.CreatorValidate; } });
-var JsonAdminValidate_1 = require("./Decorator/JsonAdminValidate");
-Object.defineProperty(exports, "JsonAdminValidate", { enumerable: true, get: function () { return JsonAdminValidate_1.JsonAdminValidate; } });
 var JsonAuthorityValidate_1 = require("./Decorator/JsonAuthorityValidate");
 Object.defineProperty(exports, "JsonAuthorityValidate", { enumerable: true, get: function () { return JsonAuthorityValidate_1.JsonAuthorityValidate; } });
-var JsonCreatorValidate_1 = require("./Decorator/JsonCreatorValidate");
-Object.defineProperty(exports, "JsonCreatorValidate", { enumerable: true, get: function () { return JsonCreatorValidate_1.JsonCreatorValidate; } });
 var Engine_1 = require("./Server/WebServer/Engine/Engine");
 Object.defineProperty(exports, "Engine", { enumerable: true, get: function () { return Engine_1.Engine; } });
 var RazorJs_1 = require("./Server/WebServer/Engine/RazorJs");

package/dist/types/Framework/Config/_error_.d.ts

@@ -1,99 +1,35 @@
 export declare let EErrorCode: FrameworkErrorCode;
+export declare class Errcode {
+    id: number;
+    des: string;
+    constructor(id: number, des: string);
+}
 /**
  * 1-100
  */
 export declare class FrameworkErrorCode {
-    Wrong_Params: {
-        id: number;
-        des: string;
-    };
-    Verify_failed: {
-        id: number;
-        des: string;
-    };
-    Account_Create_Failed: {
-        id: number;
-        des: string;
-    };
-    User_Create_Failed: {
-        id: number;
-        des: string;
-    };
-    Server_Error: {
-        id: number;
-        des: string;
-    };
-    No_Account: {
-        id: number;
-        des: string;
-    };
-    Mysql_Error: {
-        id: number;
-        des: string;
-    };
-    No_Mysql: {
-        id: number;
-        des: string;
-    };
-    No_Mssql: {
-        id: number;
-        des: string;
-    };
-    No_User: {
-        id: number;
-        des: string;
-    };
-    Account_Phone_Exist: {
-        id: number;
-        des: string;
-    };
-    Account_Email_Exist: {
-        id: number;
-        des: string;
-    };
-    Account_Name_Exist: {
-        id: number;
-        des: string;
-    };
-    Account_Type_Error: {
-        id: number;
-        des: string;
-    };
-    Email_Send_Failed: {
-        id: number;
-        des: string;
-    };
-    Login_Failed: {
-        id: number;
-        des: string;
-    };
-    Password_Too_Short: {
-        id: number;
-        des: string;
-    };
-    Wrong_Phone: {
-        id: number;
-        des: string;
-    };
-    PhoneCode_Too_Quick: {
-        id: number;
-        des: string;
-    };
-    PhoneCode_GetFailed: {
-        id: number;
-        des: string;
-    };
-    Wrong_Phone_Code: {
-        id: number;
-        des: string;
-    };
-    No_Mongo: {
-        id: number;
-        des: string;
-    };
-    Mongo_Error: {
-        id: number;
-        des: string;
-    };
+    Wrong_Params: Errcode;
+    Verify_failed: Errcode;
+    Account_Create_Failed: Errcode;
+    User_Create_Failed: Errcode;
+    Server_Error: Errcode;
+    No_Account: Errcode;
+    Mysql_Error: Errcode;
+    No_Mysql: Errcode;
+    No_Mssql: Errcode;
+    No_User: Errcode;
+    Account_Phone_Exist: Errcode;
+    Account_Email_Exist: Errcode;
+    Account_Name_Exist: Errcode;
+    Account_Type_Error: Errcode;
+    Email_Send_Failed: Errcode;
+    Login_Failed: Errcode;
+    Password_Too_Short: Errcode;
+    Wrong_Phone: Errcode;
+    PhoneCode_Too_Quick: Errcode;
+    PhoneCode_GetFailed: Errcode;
+    Wrong_Phone_Code: Errcode;
+    No_Mongo: Errcode;
+    Mongo_Error: Errcode;
     constructor();
 }

package/dist/types/Framework/Database/Mongo/MongoBaseService.d.ts

@@ -1,119 +1,41 @@
-import { MongoBaseModel } from "./MongoManager";
-import * as mongo from 'mongodb';
-export declare class MongoBaseService<T extends MongoBaseModel> {
-    protected _table: string;
-    get table(): string;
-    protected _inited: boolean;
-    get isInited(): boolean;
-    get mongoDb(): import("./MongoManager").MongoExt;
-    protected _dbname: string;
-    get dbname(): string;
-    set dbname(db: string);
-    protected _t_type: {
-        new (): T;
-    };
-    constructor(table: string, type: {
-        new (): T;
-    }, dbname?: string);
-    getNextId(key?: string): Promise<number>;
-    toObjectId(id: string): mongo.BSON.ObjectId;
-    /**
-     * 没有id(非_id)的表不能使用该函数
-     * @param id
-     */
-    getById(id: any): Promise<T>;
-    findOne(where?: {
-        [key: string]: any;
-    }, property?: {
-        [key: string]: any;
-    }): Promise<T>;
-    findOneAndUpdate(where: {
-        [key: string]: any;
-    }, update: any, options?: mongo.FindOneAndUpdateOptions): Promise<T>;
-    countDocuments(where?: {
-        [key: string]: any;
-    }, options?: mongo.CountDocumentsOptions): Promise<number>;
-    findMany(where?: {
-        [key: string]: any;
-    }, property?: any, sort?: any, skip?: number, limit?: number): Promise<T[]>;
-    getRandoms(num: number, where: {
-        [key: string]: any;
-    }, property?: {
-        [key: string]: any;
-    }): Promise<T[]>;
-    updateOne(where: {
-        [key: string]: any;
-    }, model: any, options?: mongo.UpdateOptions): Promise<{
-        errcode: {
-            id: number;
-            des: string;
-        };
-        rs: mongo.UpdateResult;
+import mongoose, { Document, FilterQuery, UpdateQuery, Types, MongooseQueryOptions } from 'mongoose';
+import { Errcode } from '../../Config/_error_';
+export declare class MongoBaseService<T extends Document> {
+    protected _model: mongoose.Model<T>;
+    protected _schema: mongoose.Schema<T>;
+    protected _collection_name: string;
+    get model(): mongoose.Model<T, {}, {}, {}, mongoose.IfAny<T, any, mongoose.Document<unknown, {}, T, {}> & mongoose.Default__v<mongoose.Require_id<T>>>, any>;
+    constructor(collection_name: string, schema: mongoose.Schema<T>);
+    findOne(filter?: FilterQuery<T>, projection?: any, options?: any): Promise<T | null>;
+    find(filter?: FilterQuery<T>, projection?: mongoose.ProjectionType<T>, options?: MongooseQueryOptions): Promise<T[]>;
+    findMany(filter?: FilterQuery<T>, projection?: any, options?: any, skip?: number, limit?: number): Promise<T[]>;
+    findById(id: string | Types.ObjectId, projection?: any, options?: any): Promise<T | null>;
+    create(doc: Partial<T>): Promise<T>;
+    insert(doc: Partial<T>): Promise<{
+        errcode: Errcode;
+        model?: T;
     }>;
-    updateMany(where: {
-        [key: string]: any;
-    }, model?: any, options?: mongo.UpdateOptions): Promise<{
-        errcode: {
-            id: number;
-            des: string;
-        };
-        rs: mongo.Document | mongo.UpdateResult;
+    updateOne(filter: FilterQuery<T>, update: UpdateQuery<T>, options?: any): Promise<{
+        errcode?: Errcode;
+        rs?: mongoose.UpdateResult;
     }>;
-    insert(model: T): Promise<{
-        errcode: {
-            id: number;
-            des: string;
-        };
-        rs: mongo.InsertOneResult<any>;
+    updateMany(filter: FilterQuery<T>, update: UpdateQuery<T>, options?: any): Promise<{
+        errcode: null;
+    } | {
+        errcode: any;
     }>;
-    deleteOne(where: any): Promise<{
-        errcode: {
-            id: number;
-            des: string;
-        };
-        count: number;
+    deleteOne(filter: FilterQuery<T>): Promise<{
+        errcode: Errcode;
+        rs?: mongoose.DeleteResult;
     }>;
-    deleteMany(where: any): Promise<{
-        errcode: {
-            id: number;
-            des: string;
-        };
-        count: number;
+    deleteMany(filter: FilterQuery<T>): Promise<{
+        errcode: null;
+    } | {
+        errcode: any;
     }>;
-    createIndex(index: any, options?: mongo.CreateIndexesOptions): Promise<{
-        errcode: {
-            id: number;
-            des: string;
-        };
-        rs: string;
-    }>;
-    aggregate(pipeline?: Document[], options?: mongo.AggregateOptions): mongo.AggregationCursor<mongo.BSON.Document>;
-    /**
-     * 仅仅支持一级
-     * @param array 数据名称 比如 items
-     * @param where 数组内赛选条件 比如 "items.id":1
-     * @param pre_match 数组上一级赛选条件 比如 "user_id":1
-     */
-    getsInArray<T>(array: string, where?: {
-        [key: string]: any;
-    }, pre_match?: any): Promise<T[]>;
-    /**
-     * 仅仅支持一级
-     * @param array 数据名称 比如 items
-     * @param where 数组内赛选条件 比如 "items.id":1
-     * @param pre_match 数组上一级赛选条件 比如 "user_id":1
-     */
-    getInArray<T>(array: string, where?: {
-        [key: string]: any;
-    }, pre_match?: any): Promise<T>;
-    distinct(key: string | number, where?: {
-        [key: string]: any;
-    }): Promise<{
-        errcode: {
-            id: number;
-            des: string;
-        };
-        lst: any;
-    }>;
-    bulkWrite(operations: mongo.AnyBulkWriteOperation<mongo.BSON.Document>[], options?: mongo.BulkWriteOptions): Promise<mongo.BulkWriteResult>;
+    exists(filter: FilterQuery<T>): Promise<boolean>;
+    aggregate(pipeline?: any[]): mongoose.Aggregate<any[]>;
+    findOneAndUpdate(filter: FilterQuery<T>, update: UpdateQuery<T>, options?: any): Promise<T | null>;
+    countDocuments(filter?: FilterQuery<T>): Promise<number>;
+    getAutoIds(): Promise<number>;
 }