cgserver 6.1.4 → 6.1.7

package/dist/lib/Database/MongoManager.js

@@ -100,7 +100,7 @@ class MongoManager {
             return 0 + 1;
         }
         catch (e) {
-            Log_1.GLog.error(e);
+            Log_1.GLog.error(e.stack);
         }
         return -1;
     }
@@ -141,7 +141,7 @@ class MongoManager {
             }
         }
         catch (e) {
-            Log_1.GLog.error(e);
+            Log_1.GLog.error(e.stack);
             rs.errcode = _error_1.EErrorCode.Mongo_Error;
         }
         rs.one = one;
@@ -170,7 +170,7 @@ class MongoManager {
             list = await cursor.toArray();
         }
         catch (e) {
-            Log_1.GLog.error(e);
+            Log_1.GLog.error(e.stack);
             rs.errcode = _error_1.EErrorCode.Mongo_Error;
         }
         rs.list = list;
@@ -189,7 +189,7 @@ class MongoManager {
             count = await col.countDocuments(where || {}, options);
         }
         catch (e) {
-            Log_1.GLog.error(e);
+            Log_1.GLog.error(e.stack);
             rs.errcode = _error_1.EErrorCode.Mongo_Error;
         }
         rs.count = count;
@@ -208,7 +208,7 @@ class MongoManager {
             del_rs = await col.deleteOne(where || {});
         }
         catch (e) {
-            Log_1.GLog.error(e);
+            Log_1.GLog.error(e.stack);
             rs.errcode = _error_1.EErrorCode.Mongo_Error;
         }
         if (del_rs) {
@@ -229,7 +229,7 @@ class MongoManager {
             del_rs = await col.deleteMany(where || {});
         }
         catch (e) {
-            Log_1.GLog.error(e);
+            Log_1.GLog.error(e.stack);
             rs.errcode = _error_1.EErrorCode.Mongo_Error;
         }
         if (del_rs) {
@@ -254,7 +254,7 @@ class MongoManager {
             in_rs = await col.insertOne(data);
         }
         catch (e) {
-            Log_1.GLog.error(e);
+            Log_1.GLog.error(e.stack);
             rs.errcode = _error_1.EErrorCode.Mongo_Error;
         }
         rs.rs = in_rs;
@@ -272,7 +272,7 @@ class MongoManager {
             in_rs = await col.insertMany(data);
         }
         catch (e) {
-            Log_1.GLog.error(e);
+            Log_1.GLog.error(e.stack);
             rs.errcode = _error_1.EErrorCode.Mongo_Error;
         }
         rs.rs = in_rs;
@@ -292,19 +292,11 @@ class MongoManager {
         }
         let up_rs = null;
         try {
-            let updateModel = null;
-            let firstKey = Object.keys(model)[0];
-            if (!firstKey.startsWith("$")) {
-                updateModel = { $set: model };
-            }
-            else {
-                updateModel = model;
-            }
             let col = this._mongo.collection(collection);
-            up_rs = await col.updateOne(where, updateModel, { upsert: upsert });
+            up_rs = await col.updateOne(where, model, { upsert: upsert });
         }
         catch (e) {
-            Log_1.GLog.error(e);
+            Log_1.GLog.error(e.stack);
             rs.errcode = _error_1.EErrorCode.Mongo_Error;
         }
         rs.rs = up_rs;
@@ -334,7 +326,7 @@ class MongoManager {
             up_rs = await col.updateMany(where, updateModel, { upsert: upsert });
         }
         catch (e) {
-            Log_1.GLog.error(e);
+            Log_1.GLog.error(e.stack);
             rs.errcode = _error_1.EErrorCode.Mongo_Error;
         }
         rs.rs = up_rs;
@@ -352,7 +344,7 @@ class MongoManager {
             i_rs = await col.createIndex(index, callback);
         }
         catch (e) {
-            Log_1.GLog.error(e);
+            Log_1.GLog.error(e.stack);
             rs.errcode = _error_1.EErrorCode.Mongo_Error;
         }
         rs.rs = i_rs;
@@ -383,7 +375,7 @@ class MongoManager {
             }
         }
         catch (e) {
-            Log_1.GLog.error(e);
+            Log_1.GLog.error(e.stack);
             rs.errcode = _error_1.EErrorCode.Mongo_Error;
         }
         rs.list = list;

package/dist/types/WebServer/Engine/ControllerManager.d.ts

@@ -8,9 +8,7 @@ declare class ControllerManager {
     };
     protected _ctr_cls: {
         [module_name: string]: {
-            [ctrname: string]: {
-                new (): BaseController;
-            };
+            [ctrname: string]: any;
         };
     };
     protected _cache_action_names: {
@@ -20,9 +18,7 @@ declare class ControllerManager {
             };
         };
     };
-    registerController(module_name: string, ctr_name: string, cls: {
-        new (): BaseController;
-    }): void;
+    registerController(module_name: string, ctr_name: string, cls: any): void;
     protected _cacheActionName(module_name: string, ctr_name: string, cls: Function): void;
     getActionName(module_name: string, ctr_name: string, action_name: string): string;
     /**
@@ -34,6 +30,6 @@ declare class ControllerManager {
     registerStaticController(module_name: string, ctr_name: string, obj: BaseController): void;
     protected _cacheActionNameForStatic(module_name: string, ctr_name: string, obj: BaseController): void;
     getStaticCtr(module_name: string, controller_name: string): BaseController;
-    getClass(module_name: string, controller_name: string): new () => BaseController;
+    getClass(module_name: string, controller_name: string): any;
 }
 export {};

package/package.json

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