cgserver 12.3.3 → 12.3.5

package/README.md

@@ -1,4 +1,8 @@
 # 版本更新日志
+## v12.3.4
+- 取消所有默认创建的index
+## v12.3.4
+- cache的过期时间修改
 ## v12.3.3
 - redis 相关语法提示问题
 - 支付宝接口增强

package/dist/lib/Framework/Logic/CacheTool.js

@@ -39,7 +39,7 @@ class CacheItem {
     key = "";
     value = null;
     milliseconds = 0;
-    expire_time = -1;
+    expire_time = new Date();
 }
 class CacheTool {
     _items = {};
@@ -60,7 +60,7 @@ class CacheTool {
                 delete this._items[key];
                 continue;
             }
-            if (time > item.expire_time) {
+            if (time > item.expire_time.getTime()) {
                 this.remove(key);
             }
         }
@@ -70,13 +70,13 @@ class CacheTool {
         if (!item) {
             return;
         }
-        let time = new Date().getTime();
-        if (time > item.expire_time) {
+        let now = new Date().getTime();
+        if (now > item.expire_time.getTime()) {
             this.remove(key);
             return;
         }
         if (refresh) {
-            item.expire_time = time + item.milliseconds;
+            item.expire_time = new Date(now + item.milliseconds);
         }
         return item.value;
     }
@@ -95,7 +95,7 @@ class CacheTool {
         }
         item.value = value;
         item.milliseconds = milliseconds;
-        item.expire_time = new Date().getTime() + milliseconds;
+        item.expire_time = new Date(Date.now() + milliseconds);
     }
     remove(key) {
         this._items[key] = null;

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

@@ -3,7 +3,6 @@ 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 = "";
@@ -16,17 +15,6 @@ 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) {

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

@@ -2,7 +2,7 @@ declare class CacheItem {
     key: string;
     value: any;
     milliseconds: number;
-    expire_time: number;
+    expire_time: Date;
 }
 export declare class CacheTool {
     protected _items: {
@@ -13,15 +13,15 @@ export declare class CacheTool {
      * 定时清除缓存
      */
     protected _refresh(): void;
-    get(key: any, refresh?: boolean): any;
+    get(key: string, refresh?: boolean): any;
     /**
      *
      * @param key
      * @param value
      * @param time 缓存的毫秒数
      */
-    add(key: any, value: any, milliseconds: any): void;
-    remove(key: any): void;
+    add(key: string, value: any, milliseconds: number): void;
+    remove(key: string): void;
 }
 export declare let gCacheTool: CacheTool;
 export {};

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

@@ -10,9 +10,6 @@ export declare class MongoCacheModel extends MongoBaseModel {
  * 可以用来缓存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>;
 }

package/package.json

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