cgserver 7.2.686 → 7.2.689

package/dist/lib/Database/MongoBaseService.js

@@ -75,5 +75,40 @@ class MongoBaseService {
         let ret = MongoManager_1.GMongoMgr.aggregate(this._table, pipeline, options);
         return ret;
     }
+    /**
+     * 仅仅支持一级
+     * @param array 数据名称 比如 items
+     * @param where 数组内赛选条件 比如 "items.id":1
+     * @param pre_match 数组上一级赛选条件 比如 "user_id":1
+     */
+    async getsInArray(array, where, pre_match) {
+        let agg = this.aggregate();
+        if (pre_match) {
+            agg = agg.match(pre_match);
+        }
+        agg = agg.unwind("$" + array);
+        if (where) {
+            agg = agg.match(where);
+        }
+        let all = await agg.toArray();
+        let items = [];
+        for (let i = 0; i < all.length; ++i) {
+            items.push(all[i][array]);
+        }
+        return items;
+    }
+    /**
+     * 仅仅支持一级
+     * @param array 数据名称 比如 items
+     * @param where 数组内赛选条件 比如 "items.id":1
+     * @param pre_match 数组上一级赛选条件 比如 "user_id":1
+     */
+    async getInArray(array, where, pre_match) {
+        let items = await this.getsInArray(array, where, pre_match);
+        if (items.length <= 0) {
+            return null;
+        }
+        return items[0];
+    }
 }
 exports.MongoBaseService = MongoBaseService;

package/dist/lib/Logic/HttpTool.js

@@ -4,12 +4,12 @@ exports.GHttpTool = void 0;
 const request = require("request");
 const qs = require("querystring");
 const Log_1 = require("./Log");
-const cgserver_1 = require("cgserver");
+const Core_1 = require("../Core/Core");
 exports.GHttpTool = null;
 class HttpTool {
     get(options_url) {
         let options = null;
-        if (cgserver_1.core.isString(options_url)) {
+        if (Core_1.core.isString(options_url)) {
             options = { url: options_url };
         }
         else {
@@ -23,7 +23,7 @@ class HttpTool {
                     Log_1.GLog.error(error);
                 }
                 try {
-                    if (cgserver_1.core.isString(body)) {
+                    if (Core_1.core.isString(body)) {
                         body = JSON.parse(body);
                     }
                 }
@@ -41,7 +41,7 @@ class HttpTool {
     }
     post(options_url) {
         let options = null;
-        if (cgserver_1.core.isString(options_url)) {
+        if (Core_1.core.isString(options_url)) {
             options = { url: options_url };
         }
         else {
@@ -55,7 +55,7 @@ class HttpTool {
                     Log_1.GLog.error(error);
                 }
                 try {
-                    if (cgserver_1.core.isString(body)) {
+                    if (Core_1.core.isString(body)) {
                         body = JSON.parse(body);
                     }
                 }

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

@@ -64,4 +64,18 @@ export declare class MongoBaseService<T> {
         rs: string;
     }>;
     aggregate(pipeline?: Document[], options?: mongo.AggregateOptions): mongo.AggregationCursor<mongo.Document>;
+    /**
+     * 仅仅支持一级
+     * @param array 数据名称 比如 items
+     * @param where 数组内赛选条件 比如 "items.id":1
+     * @param pre_match 数组上一级赛选条件 比如 "user_id":1
+     */
+    getsInArray<T>(array: string, where?: any, pre_match?: any): Promise<T[]>;
+    /**
+     * 仅仅支持一级
+     * @param array 数据名称 比如 items
+     * @param where 数组内赛选条件 比如 "items.id":1
+     * @param pre_match 数组上一级赛选条件 比如 "user_id":1
+     */
+    getInArray<T>(array: string, where?: any, pre_match?: any): Promise<T>;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cgserver",
-  "version": "7.2.686",
+  "version": "7.2.689",
   "author": "trojan",
   "type": "commonjs",
   "description": "free for all.Websocket or Http",
@@ -48,7 +48,6 @@
     "@types/websocket": "^1.0.4",
     "alipay_sdk2": "^1.1.6",
     "alipay-sdk": "^3.1.7",
-    "cgserver": "^6.9.468",
     "colors": "^1.4.0",
     "cookie-parser": "^1.4.5",
     "cors": "^2.8.5",