cgserver 12.2.5 → 12.2.7

package/README.md

@@ -1,5 +1,11 @@
 # 版本更新日志
 
+## v12.2.7
+- redis 轻微更新，无实际影响
+
+## v12.2.6
+- mongo 新增 findOneAndUpdate 接口到处
+
 ## v12.2.5
 - Core 统一hash接口
 

package/dist/lib/Framework/Config/DbConfig.js

@@ -3,9 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DbConfig = void 0;
 const MSSqlManager_1 = require("../Database/MSSql/MSSqlManager");
 const MysqlManager_1 = require("../Database/Mysql/MysqlManager");
-const RedisManager_1 = require("../Database/Redis/RedisManager");
 class DbConfig {
-    redis = new RedisManager_1.RedisConfig();
+    redis = null;
     mongos = [];
     mongo = null;
     mysql = new MysqlManager_1.MysqlConfig();

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

@@ -54,6 +54,10 @@ class MongoBaseService {
         let rs = await this.mongoDb.findOne(this._table, where, property);
         return rs.one;
     }
+    async findOneAndUpdate(where = null, update, options) {
+        let rs = await this.mongoDb.findOneAndUpdate(this._table, where, update, options);
+        return rs;
+    }
     async countDocuments(where = null, options) {
         let rs = await this.mongoDb.countDocuments(this._table, where);
         return rs.count;

package/dist/lib/Framework/Database/Mongo/MongoManager.js

@@ -698,6 +698,20 @@ class MongoExt {
         this._mongocfg.debug && Log_1.gLog.info({ key: "bulkWrite", dt, arguments });
         return bwr;
     }
+    async findOneAndUpdate(collection, filter, update, options) {
+        let now = Date.now();
+        let dt = 0;
+        if (!this._mongoDb) {
+            dt = Date.now() - now;
+            this._mongocfg.debug && Log_1.gLog.info({ key: "findOneAndUpdate", dt, arguments });
+            return;
+        }
+        let col = this._mongoDb.collection(collection);
+        let rs = await col.findOneAndUpdate(filter, update, options);
+        dt = Date.now() - now;
+        this._mongocfg.debug && Log_1.gLog.info({ key: "findOneAndUpdate", dt, arguments });
+        return rs;
+    }
 }
 exports.MongoExt = MongoExt;
 exports.gMongoMgr = new MongoManager();

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

@@ -33,17 +33,9 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.gRedisMgr = exports.RedisManager = exports.RedisConfig = void 0;
+exports.gRedisMgr = exports.RedisManager = void 0;
 const redis = __importStar(require("redis"));
 const Log_1 = require("../../Logic/Log");
-class RedisConfig {
-    open = false;
-    host = "127.0.0.1";
-    port = 6379;
-    database = 0;
-    password = null;
-}
-exports.RedisConfig = RedisConfig;
 class RedisManager {
     _redis = null;
     get redis() {
@@ -51,11 +43,10 @@ class RedisManager {
     }
     _redisCfg = null;
     async init(redisCfg) {
+        if (!redisCfg || !redisCfg.open) {
+            return;
+        }
         let p = new Promise((resolve) => {
-            if (!redisCfg || !redisCfg.open) {
-                resolve(null);
-                return;
-            }
             if (this._redis) {
                 resolve(null);
                 return;

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.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.IWebSocketServer = exports.IClientWebSocket = exports.IServerWebSocket = exports.JsonProtoFilter = exports.GoogleProtoFilter = exports.EProtoType = exports.RedisManager = exports.RedisConfig = 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.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.IWebSocketServer = exports.IClientWebSocket = exports.IServerWebSocket = exports.JsonProtoFilter = exports.GoogleProtoFilter = exports.EProtoType = exports.RedisManager = 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");
@@ -95,7 +95,6 @@ Object.defineProperty(exports, "MongoConfig", { enumerable: true, get: function
 var MysqlManager_2 = require("./Database/Mysql/MysqlManager");
 Object.defineProperty(exports, "MysqlConfig", { enumerable: true, get: function () { return MysqlManager_2.MysqlConfig; } });
 var RedisManager_1 = require("./Database/Redis/RedisManager");
-Object.defineProperty(exports, "RedisConfig", { enumerable: true, get: function () { return RedisManager_1.RedisConfig; } });
 Object.defineProperty(exports, "RedisManager", { enumerable: true, get: function () { return RedisManager_1.RedisManager; } });
 var IProtoFilter_1 = require("./Server/ProtoFilter/IProtoFilter");
 Object.defineProperty(exports, "EProtoType", { enumerable: true, get: function () { return IProtoFilter_1.EProtoType; } });

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

@@ -27,6 +27,9 @@ export declare class MongoBaseService<T extends MongoBaseModel> {
     }, 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>;

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

@@ -205,5 +205,6 @@ export declare class MongoExt {
      */
     quickTransaction(cb: Function, options?: mongo.TransactionOptions): Promise<false | any>;
     bulkWrite(collection: string, operations: mongo.AnyBulkWriteOperation<mongo.BSON.Document>[], options?: mongo.BulkWriteOptions): Promise<mongo.BulkWriteResult>;
+    findOneAndUpdate(collection: string, filter: any, update: any, options?: mongo.FindOneAndUpdateOptions): Promise<any>;
 }
 export declare let gMongoMgr: MongoManager;

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

@@ -1,12 +1,8 @@
 import * as redis from 'redis';
-export declare class RedisConfig {
-    open: boolean;
-    host: string;
-    port: number;
-    database: number;
-    password: any;
-}
 type RedisClientType = redis.RedisClientType<redis.RedisDefaultModules & redis.RedisModules, redis.RedisFunctions, redis.RedisScripts>;
+export type RedisConfig = {
+    open: boolean;
+} & redis.RedisClientOptions;
 export declare class RedisManager {
     protected _redis: RedisClientType;
     get redis(): RedisClientType;

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

@@ -39,7 +39,7 @@ export { DbConfig } from './Config/DbConfig';
 export { MSSqlConfig } from './Database/MSSql/MSSqlManager';
 export { MongoConfig } from './Database/Mongo/MongoManager';
 export { MysqlConfig } from './Database/Mysql/MysqlManager';
-export { RedisConfig, RedisManager } from './Database/Redis/RedisManager';
+export { RedisManager } from './Database/Redis/RedisManager';
 export { EProtoType } from './Server/ProtoFilter/IProtoFilter';
 export { GoogleProtoFilter } from './Server/ProtoFilter/GoogleProtoFilter';
 export { IProtoFilter } from './Server/ProtoFilter/IProtoFilter';

package/package.json

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