cgserver 10.0.0 → 10.0.2

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

@@ -191,3 +191,4 @@ export declare class MongoExt {
      */
     quickTransaction(cb: Function, options?: mongo.TransactionOptions): Promise<false | any>;
 }
+export declare let gMongoMgr: MongoManager;

package/dist/types/Framework/Database/MysqlManager.d.ts

@@ -27,3 +27,4 @@ export declare class MysqlManager {
     query(sqlStr: string, values?: any): Promise<SqlReturn>;
     transaction(sqls: any[]): Promise<SqlReturns>;
 }
+export declare let gMysqlMgr: MysqlManager;

package/dist/types/Framework/Database/RedisManager.d.ts

@@ -20,4 +20,5 @@ export declare class RedisManager {
     onEnd(): void;
     onError(err: any): void;
 }
+export declare let gRedisMgr: RedisManager;
 export {};

package/dist/types/Framework/Logic/CacheTool.d.ts

@@ -23,4 +23,5 @@ export declare class CacheTool {
     add(key: any, value: any, milliseconds: any): void;
     remove(key: any): void;
 }
+export declare let gCacheTool: CacheTool;
 export {};

package/dist/types/Framework/Logic/EventTool.d.ts

@@ -9,3 +9,4 @@ export declare class EventTool {
     emit(event: string, ...args: any[]): void;
     listenerCount(event: string): number;
 }
+export declare let gEventTool: EventTool;

package/dist/types/Framework/Logic/HttpTool.d.ts

@@ -16,3 +16,4 @@ export declare class HttpTool {
         originbody: any;
     }>;
 }
+export declare let gHttpTool: HttpTool;

package/dist/types/Framework/Logic/Log.d.ts

@@ -22,3 +22,4 @@ export declare class Log {
     protected _isNumber(param: any): boolean;
     protected _format(src: any, formatStr: any): any;
 }
+export declare let gLog: Log;

package/dist/types/Framework/Logic/SyncQueueTool.d.ts

@@ -17,4 +17,5 @@ export declare class SyncQueueTool {
     };
     add(key: string, func: Function, thisArg?: any, ...params: any[]): Promise<unknown>;
 }
+export declare let gSyncQueueTool: SyncQueueTool;
 export {};

package/dist/types/Framework/Service/MongoCacheService.d.ts

@@ -5,8 +5,13 @@ export declare class MongoCacheModel extends MongoBaseModel {
     data: any;
     expireAt: number;
 }
+/**
+ * mongo版本的缓存服务
+ * 可以用来缓存kv数据
+ */
 export declare class MongoCacheService extends MongoBaseService<MongoCacheModel> {
     constructor();
     getData(key: string): Promise<any>;
     addData(key: string, data: any, expireAt?: number): Promise<MongoCacheModel>;
 }
+export declare let gMongoCacheSer: MongoCacheService;

package/dist/types/Framework/SocketServer/ProtoFilter/ProtoFactory.d.ts

@@ -8,4 +8,5 @@ export declare class ProtoFactory {
     registerFilter(type: EProtoType, proto_filter_class: ProtoFilterClass): void;
     createFilter(type: EProtoType): IProtoFilter;
 }
+export declare let gProtoFactory: ProtoFactory;
 export {};

package/dist/types/Framework/ThirdParty/QQTool.d.ts

@@ -38,3 +38,4 @@ export declare class QQTool {
     getOpenId(access_token: string): Promise<string>;
     getUserInfo(access_token: string, openid: string): Promise<QQUserInfo>;
 }
+export declare let gQQTool: QQTool;

package/dist/types/Framework/ThirdParty/WechatTool.d.ts

@@ -27,3 +27,4 @@ export declare class WechatTool {
     convertOAMsg(xmlStr: string): WechatOAMsg;
     toReplyXmlStr(msg: WechatOAMsg): string;
 }
+export declare let gWechatTool: WechatTool;

package/dist/types/Framework/WebServer/Engine/ControllerManager.d.ts

@@ -1,4 +1,7 @@
 import { BaseController } from "../Controller/BaseController";
+/**
+ * web服务中mvc的控制器管理器
+ */
 export declare class ControllerManager {
     protected _static_ctr: {
         [module_name: string]: {
@@ -31,3 +34,4 @@ export declare class ControllerManager {
     getStaticCtr(module_name: string, controller_name: string): BaseController;
     getClass(module_name: string, controller_name: string): any;
 }
+export declare let gCtrMgr: ControllerManager;

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

@@ -37,3 +37,4 @@ export declare class CgServer {
     pause(): void;
     resume(): void;
 }
+export declare let gCgServer: CgServer;

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

@@ -1,5 +1,4 @@
 import { TriggerManager } from './AI/TriggerMgr';
-import { IServerConfig } from './Config/IServerConfig';
 import { ByteTool } from './Core/ByteTool';
 import { DBCache } from './Database/Decorator/DBCache';
 import { MSSqlManager } from './Database/MSSqlManager';
@@ -23,12 +22,15 @@ import { QiniuTool } from './ThirdParty/QiniuTool';
 import { WechatTool } from './ThirdParty/WechatTool';
 import { ControllerManager } from './WebServer/Engine/ControllerManager';
 import { CgServer } from './cgserver';
+import { core } from './Core/Core';
+/**
+ * cg引擎的，全局对象
+ */
 export declare class global {
     static gMongoServiceMgr: MongoServiceManager;
     static gCgServer: CgServer;
     static gDbCache: DBCache;
     static gTriggerMgr: TriggerManager;
-    static gServerCfg: IServerConfig;
     static gMongoMgr: MongoManager;
     static gMSSqlMgr: MSSqlManager;
     static gMysqlMgr: MysqlManager;
@@ -48,6 +50,19 @@ export declare class global {
     static gAlipayTool: AlipayTool;
     static gAppleTool: AppleTool;
     static gProtoFactory: ProtoFactory;
+    /**
+     * web服务中mvc的控制器管理器
+     */
     static gCtrMgr: ControllerManager;
+    /**
+     * mongo版本的缓存服务
+     * 可以用来缓存kv数据
+     */
     static gMongoCacheSer: MongoCacheService;
+    /**
+     * 一些通用的常用函数，
+     * 比如格式化字符串，常用加解密，
+     * 时间计算，类型判断等
+     */
+    static core: typeof core;
 }

package/package.json

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

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

@@ -1,128 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.MongoBaseService = void 0;
-const MongoManager_1 = require("./MongoManager");
-class MongoBaseService {
-    _table = "";
-    get table() {
-        return this._table;
-    }
-    _inited = false;
-    get isInited() {
-        return this._inited;
-    }
-    get mongoDb() {
-        return MongoManager_1.GMongoMgr.getMongo(this._dbname);
-    }
-    _dbname = "";
-    get dbname() {
-        if (!this._dbname) {
-            this._dbname = MongoManager_1.GMongoMgr.defdbname;
-        }
-        return this._dbname;
-    }
-    _t_type = null;
-    constructor(table, type, dbname = "") {
-        this._t_type = type;
-        this._table = table;
-        this._dbname = dbname;
-    }
-    async getNextId(key = "") {
-        if (!key) {
-            key = this._table;
-        }
-        let id = await this.mongoDb.getAutoIds(this._table);
-        return id;
-    }
-    toObjectId(id) {
-        return this.mongoDb.toObjectId(id);
-    }
-    /**
-     * 没有id(非_id)的表不能使用该函数
-     * @param id
-     */
-    async getById(id) {
-        let rs = await this.mongoDb.findOne(this._table, null, { id: id });
-        return rs.one;
-    }
-    async get(property = null, where = null) {
-        let rs = await this.mongoDb.findOne(this._table, property, where);
-        return rs.one;
-    }
-    async countDocuments(where = null, options) {
-        let rs = await this.mongoDb.countDocuments(this._table, where);
-        return rs.count;
-    }
-    async gets(property = null, where = null, sort = null, skip = 0, limit = 0) {
-        let rs = await this.mongoDb.findMany(this._table, property, where, sort, skip, limit);
-        return rs.list;
-    }
-    async getRandoms(num, property, where = null) {
-        let rs = await this.mongoDb.simpleAggregate(this._table, property, where, null, num);
-        return rs.list;
-    }
-    async updateOne(model, where, upsert = false) {
-        let rs = await this.mongoDb.updateOne(this._table, model, where, upsert);
-        return rs;
-    }
-    async updateMany(model, where = null) {
-        let rs = await this.mongoDb.updateMany(this._table, model, where);
-        return rs;
-    }
-    async insert(model) {
-        let rs = await this.mongoDb.insertOne(this._table, model);
-        return rs;
-    }
-    async deleteOne(where) {
-        let rs = await this.mongoDb.deleteOne(this._table, where);
-        return rs;
-    }
-    async deleteMany(where) {
-        let rs = await this.mongoDb.deleteMany(this._table, where);
-        return rs;
-    }
-    async createIndex(index, options) {
-        let rs = await this.mongoDb.createIndex(this._table, index, options);
-        return rs;
-    }
-    aggregate(pipeline, options) {
-        let ret = this.mongoDb.aggregate(this._table, pipeline, options);
-        return ret;
-    }
-    /**
-     * 仅仅支持一级
-     * @param array 数据名称 比如 items
-     * @param where 数组内赛选条件 比如 "items.id":1
-     * @param pre_match 数组上一级赛选条件 比如 "user_id":1
-     */
-    async getsInArray(array, where, pre_match) {
-        let agg = this.aggregate();
-        if (pre_match) {
-            agg = agg.match(pre_match);
-        }
-        agg = agg.unwind("$" + array);
-        if (where) {
-            agg = agg.match(where);
-        }
-        let all = await agg.toArray();
-        let items = [];
-        for (let i = 0; i < all.length; ++i) {
-            items.push(all[i][array]);
-        }
-        return items;
-    }
-    /**
-     * 仅仅支持一级
-     * @param array 数据名称 比如 items
-     * @param where 数组内赛选条件 比如 "items.id":1
-     * @param pre_match 数组上一级赛选条件 比如 "user_id":1
-     */
-    async getInArray(array, where, pre_match) {
-        let items = await this.getsInArray(array, where, pre_match);
-        if (items.length <= 0) {
-            return null;
-        }
-        return items[0];
-    }
-}
-exports.MongoBaseService = MongoBaseService;