cgserver 8.6.0 → 8.6.2

package/README.md

@@ -1,3 +1,4 @@
-8.4.1
-1、更新所有库到最新版
-2、暴力升级redis接口注意修改
+8.6.12
+1、C# post url-encoded data support
+8.6.1
+1、quickTrasaction support options

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

@@ -440,12 +440,12 @@ class MongoManager {
      * @param collection
      * @param cb
      */
-    async quickTransaction(cb) {
+    async quickTransaction(cb, options) {
         if (!this._mongoDb) {
             return false;
         }
         let session = this._mongoClient.startSession();
-        session.startTransaction();
+        session.startTransaction(options);
         try {
             let rs = await cb(session);
             await session.commitTransaction();
@@ -454,9 +454,11 @@ class MongoManager {
         }
         catch (e) {
             await session.abortTransaction();
-            session.endSession();
             Log_1.GLog.error(e.stack);
         }
+        finally {
+            await session.endSession();
+        }
         return false;
     }
 }

package/dist/lib/Framework/WebServer/Engine/Request.js

@@ -53,19 +53,32 @@ class Request {
     }
     get postData() {
         var body = this._req.body || {};
-        //服务器会有一层空key的json解析
-        for (let k in body) {
-            var v = body[k];
-            if (!Core_1.core.isString(v)) {
-                continue;
-            }
-            if (parseInt(v) == v) {
-                body[k] = parseInt(v);
-            }
-            else if (parseFloat(v) == v) {
-                body[k] == parseFloat(v);
-            }
-        }
+        //特殊处理C#的post x-www-form-urlencoded 数据，这个数据很奇怪会把整体数据作为一个key，然后value为空字符串
+        let keys = Object.keys(body);
+        if (keys.length == 1
+            && body[keys[0]] == ""
+            && Core_1.core.isObject(keys[0])) {
+            body = keys[0];
+        }
+        // 暂时去掉强制数值转换
+        // //服务器会有一层空key的json解析
+        // for(let k in body)
+        // {
+        //     var v = body[k]
+        //     if(!core.isString(v))
+        //     {
+        //         continue
+        //     }
+        //     let intv = parseInt(v)
+        //     if(intv==v)
+        //     {
+        //         body[k]=intv
+        //     }
+        //     else if(parseFloat(v)==v)
+        //     {
+        //         body[k]==parseFloat(v)
+        //     }
+        // }
         return body;
     }
     get url() {

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

@@ -11,16 +11,16 @@ export declare class MongoBaseService<T> {
     constructor(table: string, type: {
         new (): T;
     });
-    getNextId(key?: string): Promise<any>;
+    getNextId(key?: string): Promise<number>;
     /**
      * 没有id(非_id)的表不能使用该函数
      * @param id
      */
-    getById(id: any): Promise<any>;
-    get(proterty?: {}, where?: {}): Promise<any>;
+    getById(id: any): Promise<T>;
+    get(proterty?: {}, where?: {}): Promise<T>;
     countDocuments(where?: {}, options?: mongo.CountDocumentsOptions): Promise<number>;
-    gets(property?: {}, where?: {}, sort?: {}, skip?: number, limit?: number): Promise<any[]>;
-    getRandoms(num: number, proterty?: {}, where?: {}): Promise<any[]>;
+    gets(property?: {}, where?: {}, sort?: {}, skip?: number, limit?: number): Promise<T[]>;
+    getRandoms(num: number, proterty?: {}, where?: {}): Promise<T[]>;
     updateOne(model: any, where?: {}, upsert?: boolean): Promise<{
         errcode: {
             id: number;

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

@@ -57,7 +57,7 @@ declare class MongoManager {
      * @param key
      * @returns 小于等于0为异常
      */
-    getAutoIds(key: string): Promise<any>;
+    getAutoIds(key: string): Promise<number>;
     protected _convertWhere(where?: any): any;
     /**
      * 获取单条消息
@@ -151,6 +151,6 @@ declare class MongoManager {
      * @param collection
      * @param cb
      */
-    quickTransaction(cb: Function): Promise<false | any>;
+    quickTransaction(cb: Function, options?: mongo.TransactionOptions): Promise<false | any>;
 }
 export {};

package/package.json

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