cgserver 12.3.1 → 12.3.3

package/README.md

@@ -1,4 +1,9 @@
 # 版本更新日志
+## v12.3.3
+- redis 相关语法提示问题
+- 支付宝接口增强
+## v12.3.2
+- get 请求的参数修正
 
 ## v12.3.1
 - bugfix

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/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/Server/WebServer/Engine/Request.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Request = void 0;
-const url_1 = require("url");
 const Core_1 = require("../../../Core/Core");
 const Log_1 = require("../../../Logic/Log");
 class Request {
@@ -159,10 +158,7 @@ class Request {
         }
         let quote_index = path.indexOf("?");
         if (quote_index >= 0) {
-            let url = new url_1.URL(path);
-            url.searchParams.forEach((value, name, searchParams) => {
-                this._params[name] = value;
-            });
+            this._params = this._req.query || {};
             path = path.substring(0, quote_index);
         }
         let params = path.split("/");

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;