cgserver 12.3.4 → 12.3.6

package/README.md

@@ -1,4 +1,8 @@
 # 版本更新日志
+## v12.3.6
+- cache的过期时间修改
+## v12.3.5
+- 取消所有默认创建的index
 ## v12.3.4
 - cache的过期时间修改
 ## v12.3.3

package/dist/lib/Framework/Decorator/SyncCallServer.js

@@ -23,7 +23,7 @@ function SyncCallServer(target, propertyName, descriptor) {
                 item = await MongoCacheService_1.gMongoCacheSer.getData(key);
             }
             //10秒后过期，避免卡死
-            let mcm = await MongoCacheService_1.gMongoCacheSer.addData(key, true, Date.now() + 10 * 1000);
+            let mcm = await MongoCacheService_1.gMongoCacheSer.addData(key, true, new Date(Date.now() + 10 * 1000));
             if (!mcm) {
                 await func();
             }
@@ -59,7 +59,7 @@ let SyncCallServer2 = function (params_index) {
                     item = await MongoCacheService_1.gMongoCacheSer.getData(key);
                 }
                 //10秒后过期，避免卡死
-                let mcm = await MongoCacheService_1.gMongoCacheSer.addData(key, true, Date.now() + 10 * 1000);
+                let mcm = await MongoCacheService_1.gMongoCacheSer.addData(key, true, new Date(Date.now() + 10 * 1000));
                 if (!mcm) {
                     await func();
                 }

package/dist/lib/Framework/Server/WebServer/Controller/MongoBaseUserController.js

@@ -136,11 +136,7 @@ class MongoBaseUserController extends BaseController_1.BaseController {
             });
         }
         else if (this._engine.cfg.session_type == FrameworkConfig_1.ESessionType.Mongo) {
-            let cm = new MongoCacheService_1.MongoCacheModel();
-            cm.key = this._session_id;
-            cm.data = user.id;
-            cm.expireAt = Date.now() + time * 1000;
-            MongoCacheService_1.gMongoCacheSer.updateOne({ key: cm.key }, cm, { upsert: true });
+            MongoCacheService_1.gMongoCacheSer.addData(this._session_id, user.id, new Date(Date.now() + time * 1000));
         }
         this._self_user = user;
     }

package/dist/lib/Framework/Server/WebServer/Controller/MysqlBaseUserController.js

@@ -134,11 +134,7 @@ class MysqlBaseUserController extends BaseController_1.BaseController {
             });
         }
         else if (this._engine.cfg.session_type == FrameworkConfig_1.ESessionType.Mongo) {
-            let cm = new MongoCacheService_1.MongoCacheModel();
-            cm.key = this._session_id;
-            cm.data = user.id;
-            cm.expireAt = Date.now() + time * 1000;
-            MongoCacheService_1.gMongoCacheSer.updateOne({ key: cm.key }, cm, { upsert: true });
+            MongoCacheService_1.gMongoCacheSer.addData(this._session_id, user.id, new Date(Date.now() + time * 1000));
         }
         this._self_user = user;
     }

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

@@ -3,12 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.gMongoCacheSer = exports.MongoCacheService = exports.MongoCacheModel = void 0;
 const MongoBaseService_1 = require("../Database/Mongo/MongoBaseService");
 const MongoManager_1 = require("../Database/Mongo/MongoManager");
-const cgserver_1 = require("../cgserver");
 //暂时就用这个了，反正没啥用户
 class MongoCacheModel extends MongoManager_1.MongoBaseModel {
     key = "";
     data = null;
-    expireAt = Date.now() + 365 * 24 * 60 * 60 * 1000;
+    expireAt = new Date(Date.now() + 365 * 24 * 60 * 60 * 1000);
 }
 exports.MongoCacheModel = MongoCacheModel;
 /**
@@ -16,25 +15,17 @@ exports.MongoCacheModel = MongoCacheModel;
  * 可以用来缓存kv数据
  */
 class MongoCacheService extends MongoBaseService_1.MongoBaseService {
-    constructor(table, type, dbname = "") {
-        super(table, type, dbname);
-        cgserver_1.gCgServer.addListener("start", () => {
-            if (!this.mongoDb) {
-                //客户端未开启mongo
-                return;
-            }
-            this.createIndex({ key: 1 });
-            this.createIndex({ expireAt: 1 }, { expireAfterSeconds: 0 });
-        });
-    }
     async getData(key) {
         let cm = await this.findOne({ key: key });
         if (!cm) {
             return null;
         }
+        if (cm.expireAt.getTime() < Date.now()) {
+            return null;
+        }
         return cm.data;
     }
-    async addData(key, data, expireAt = Date.now() + 365 * 24 * 60 * 60 * 1000) {
+    async addData(key, data, expireAt = new Date(Date.now() + 365 * 24 * 60 * 60 * 1000)) {
         let mcm = new MongoCacheModel();
         mcm.key = key;
         mcm.data = data;

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.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.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;
 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");
@@ -116,8 +116,6 @@ 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");

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

@@ -3,17 +3,14 @@ import { MongoBaseModel } from "../Database/Mongo/MongoManager";
 export declare class MongoCacheModel extends MongoBaseModel {
     key: string;
     data: any;
-    expireAt: number;
+    expireAt: Date;
 }
 /**
  * mongo版本的缓存服务
  * 可以用来缓存kv数据
  */
 export declare class MongoCacheService extends MongoBaseService<MongoCacheModel> {
-    constructor(table: string, type: {
-        new (): MongoCacheModel;
-    }, dbname?: string);
     getData(key: string): Promise<any>;
-    addData(key: string, data: any, expireAt?: number): Promise<MongoCacheModel>;
+    addData(key: string, data: any, expireAt?: Date): Promise<MongoCacheModel>;
 }
 export declare let gMongoCacheSer: MongoCacheService;

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

@@ -50,7 +50,6 @@ export { IWebSocketServer, WebSocketServerConfig } from './Server/WebSocketServe
 export { IWebSocket, BaseMsg } from './Server/WebSocketServer/IWebSocket';
 export { IWebServer } from './Server/WebServer/IWebServer';
 export { BaseController } from './Server/WebServer/Controller/BaseController';
-export { MysqlBaseUserController } from './Server/WebServer/Controller/MysqlBaseUserController';
 export { MongoBaseUserController } from './Server/WebServer/Controller/MongoBaseUserController';
 export { MysqlAccountModel } from './Service/MysqlAccountService';
 export { MongoAccountModel } from './Service/MongoAccountService';

package/package.json

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