cgserver 7.2.684 → 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,33 +4,49 @@ 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 {
-    httpRequest(url, noParse) {
+    get(options_url) {
+        let options = null;
+        if (Core_1.core.isString(options_url)) {
+            options = { url: options_url };
+        }
+        else {
+            options = options_url;
+        }
         return new Promise((resolve, reject) => {
-            request.get(url, {
-                strictSSL: false,
-                rejectUnauthorized: false
-            }, (error, response, body) => {
-                if (!noParse) {
+            request.get(options, (error, response, body) => {
+                let bd = body;
+                if (error) {
+                    Log_1.GLog.error("get:" + options.url);
+                    Log_1.GLog.error(error);
+                }
+                try {
+                    if (Core_1.core.isString(body)) {
+                        body = JSON.parse(body);
+                    }
+                }
+                catch (e) {
                     try {
-                        if (body) {
-                            body = JSON.parse(body);
-                        }
+                        body = qs.parse(body);
                     }
                     catch (e) {
-                        try {
-                            body = qs.parse(body);
-                        }
-                        catch (e) { }
+                        body = bd;
                     }
                 }
                 resolve({ error, response, body });
             });
         });
     }
-    httpPost(options) {
+    post(options_url) {
+        let options = null;
+        if (Core_1.core.isString(options_url)) {
+            options = { url: options_url };
+        }
+        else {
+            options = options_url;
+        }
         return new Promise((resolve, reject) => {
             request.post(options, (error, response, body) => {
                 let bd = body;
@@ -39,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/lib/ThirdParty/AppleTool.js

@@ -174,12 +174,12 @@ class AppleTool {
         let reqb = new RequestBody();
         reqb['receipt-data'] = receipt;
         //先验证生产环境
-        var resb = (await HttpTool_1.GHttpTool.httpPost({ url, form: JSON.stringify(reqb) })).body;
+        var resb = (await HttpTool_1.GHttpTool.post({ url, form: JSON.stringify(reqb) })).body;
         Log_1.GLog.info("production end onVerify_Res============================status=" + (resb ? resb.status : "null"));
         //状态21007表示是沙盒环境
         if (resb && resb.status == 21007) {
             url = this._sandboxVerifyUrl;
-            resb = (await HttpTool_1.GHttpTool.httpPost({ url, form: JSON.stringify(reqb) })).body;
+            resb = (await HttpTool_1.GHttpTool.post({ url, form: JSON.stringify(reqb) })).body;
             Log_1.GLog.info("sandbox end onVerify_Res============================status=" + (resb ? resb.status : "null"));
         }
         Log_1.GLog.info(resb);

package/dist/lib/ThirdParty/OpenSocial.js

@@ -16,7 +16,7 @@ class OpenSocial {
             unionid: unionid,
             openid: openid
         };
-        let rs = await HttpTool_1.GHttpTool.httpPost({ url: IServerConfig_1.GServerCfg.third_cfg.open_social.user_url, json: msg });
+        let rs = await HttpTool_1.GHttpTool.post({ url: IServerConfig_1.GServerCfg.third_cfg.open_social.user_url, json: msg });
         return rs.body;
     }
     async updatePwd(unionid, openid, new_pwd) {
@@ -25,7 +25,7 @@ class OpenSocial {
             openid: openid,
             password: new_pwd
         };
-        let jsonData = await HttpTool_1.GHttpTool.httpPost({ url: IServerConfig_1.GServerCfg.third_cfg.open_social.update_pwd_url, json: msg });
+        let jsonData = await HttpTool_1.GHttpTool.post({ url: IServerConfig_1.GServerCfg.third_cfg.open_social.update_pwd_url, json: msg });
         return jsonData.body || jsonData.error;
     }
 }

package/dist/lib/ThirdParty/QQTool.js

@@ -75,7 +75,7 @@ class QQTool {
         //必须	成功授权后的回调地址，必须是注册appid时填写的主域名下的地址，建议设置为网站首页或网站的用户中心
         let redirect_uri = URLEncode.encode(IServerConfig_1.GServerCfg.third_cfg.qq.redirect_uri);
         let url = "https://graph.qq.com/oauth2.0/token?code=" + auth_code + "&grant_type=" + grant_type + "&client_id=" + client_id + "&client_secret=" + client_secret + "&redirect_uri=" + redirect_uri;
-        let rs = await HttpTool_1.GHttpTool.httpRequest(url);
+        let rs = await HttpTool_1.GHttpTool.get(url);
         if (rs.body && rs.body.access_token) {
             return rs.body.access_token;
         }
@@ -86,7 +86,7 @@ class QQTool {
     }
     async getOpenId(access_token) {
         let url = "https://graph.qq.com/oauth2.0/me?access_token=" + access_token;
-        let rs = await HttpTool_1.GHttpTool.httpRequest(url);
+        let rs = await HttpTool_1.GHttpTool.get(url);
         let body = rs.response ? rs.response.body : null;
         if (body) {
             body = body.replace("callback( ", "");
@@ -104,7 +104,7 @@ class QQTool {
     }
     async getUserInfo(access_token, openid) {
         let url = "https://graph.qq.com/user/get_user_info?access_token=" + access_token + "&oauth_consumer_key=" + IServerConfig_1.GServerCfg.third_cfg.qq.app_id + "&openid=" + openid;
-        let rs = await HttpTool_1.GHttpTool.httpRequest(url);
+        let rs = await HttpTool_1.GHttpTool.get(url);
         if (rs.body) {
             return rs.body;
         }

package/dist/lib/ThirdParty/WechatTool.js

@@ -41,7 +41,7 @@ class WechatTool {
             return null;
         }
         let url = "https://api.weixin.qq.com/sns/oauth2/access_token?appid=" + IServerConfig_1.GServerCfg.third_cfg.wechat.app_id + "&secret=" + IServerConfig_1.GServerCfg.third_cfg.wechat.app_key + "&code=" + auth_code + "&grant_type=authorization_code";
-        let rs = await HttpTool_1.GHttpTool.httpRequest(url);
+        let rs = await HttpTool_1.GHttpTool.get(url);
         /*
         {
             "access_token":"ACCESS_TOKEN",
@@ -63,7 +63,7 @@ class WechatTool {
     }
     async getUserInfo(access_token, openid) {
         let url = "https://api.weixin.qq.com/sns/userinfo?access_token=" + access_token + "&openid=" + openid;
-        let rs = await HttpTool_1.GHttpTool.httpRequest(url);
+        let rs = await HttpTool_1.GHttpTool.get(url);
         if (rs.body) {
             return rs.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/dist/types/Logic/HttpTool.d.ts

@@ -1,12 +1,12 @@
 import * as request from "request";
 export declare let GHttpTool: HttpTool;
 declare class HttpTool {
-    httpRequest(url: string, noParse?: boolean): Promise<{
+    get(options_url: request.OptionsWithUrl | string): Promise<{
         error: any;
         response: any;
         body: any;
     }>;
-    httpPost(options: request.OptionsWithUrl): Promise<{
+    post(options_url: request.OptionsWithUrl | string): Promise<{
         error: any;
         response: any;
         body: any;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cgserver",
-  "version": "7.2.684",
+  "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",