cgserver 12.3.2 → 12.3.4

package/README.md

@@ -1,5 +1,9 @@
 # 版本更新日志
-
+## v12.3.4
+- cache的过期时间修改
+## v12.3.3
+- redis 相关语法提示问题
+- 支付宝接口增强
 ## v12.3.2
 - get 请求的参数修正
 

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

@@ -699,6 +699,7 @@ class MongoExt {
         return bwr;
     }
     async findOneAndUpdate(collection, filter, update, options) {
+        this._convertWhere(filter);
         let now = Date.now();
         let dt = 0;
         if (!this._mongoDb) {

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/Server/WebServer/Controller/MongoBaseUserController.js

@@ -75,7 +75,7 @@ class MongoBaseUserController extends BaseController_1.BaseController {
             return user;
         }
         if (this._engine.cfg.session_type == FrameworkConfig_1.ESessionType.Redis) {
-            let user_id = parseInt((await RedisManager_1.gRedisMgr.redis.get(this._session_id)) || "-1");
+            let user_id = +(await RedisManager_1.gRedisMgr.redis.get(this._session_id)).toString();
             if (user_id > 0) {
                 user = (await this._userser.getById(user_id));
             }

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

@@ -73,7 +73,7 @@ class MysqlBaseUserController extends BaseController_1.BaseController {
             return user;
         }
         if (this._engine.cfg.session_type == FrameworkConfig_1.ESessionType.Redis) {
-            let user_id = parseInt((await RedisManager_1.gRedisMgr.redis.get(this._session_id)) || "-1");
+            let user_id = +(await RedisManager_1.gRedisMgr.redis.get(this._session_id)).toString();
             if (user_id > 0) {
                 user = (await MysqlUserService_1.GUserSer.getById(user_id));
             }

package/dist/lib/Framework/ThirdParty/AlipayTool.js

@@ -53,13 +53,13 @@ class AlipayTool {
      * @param notifyData 回调数据
      * @returns 验证结果
      */
-    async verifyNotify(notifyData) {
+    async verifyNotify(notifyData, raw) {
         try {
             if (!this._alipaySdk) {
                 return false;
             }
             // 验证签名
-            const signValid = await this._alipaySdk.checkNotifySign(notifyData);
+            const signValid = await this._alipaySdk.checkNotifySign(notifyData, raw);
             if (!signValid) {
                 Log_1.gLog.error({ tip: '支付宝回调签名验证失败' });
                 return false;