cgserver 7.1.661 → 7.2.684

package/dist/lib/Logic/HttpTool.js

@@ -4,6 +4,7 @@ exports.GHttpTool = void 0;
 const request = require("request");
 const qs = require("querystring");
 const Log_1 = require("./Log");
+const cgserver_1 = require("cgserver");
 exports.GHttpTool = null;
 class HttpTool {
     httpRequest(url, noParse) {
@@ -29,16 +30,16 @@ class HttpTool {
             });
         });
     }
-    httpPost(url, form) {
+    httpPost(options) {
         return new Promise((resolve, reject) => {
-            request.post({ url: url, form: form }, (error, response, body) => {
+            request.post(options, (error, response, body) => {
                 let bd = body;
                 if (error) {
-                    Log_1.GLog.error("post:" + url);
+                    Log_1.GLog.error("post:" + options.url);
                     Log_1.GLog.error(error);
                 }
                 try {
-                    if (body) {
+                    if (cgserver_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, JSON.stringify(reqb))).body;
+        var resb = (await HttpTool_1.GHttpTool.httpPost({ 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, JSON.stringify(reqb))).body;
+            resb = (await HttpTool_1.GHttpTool.httpPost({ 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(IServerConfig_1.GServerCfg.third_cfg.open_social.user_url, msg);
+        let rs = await HttpTool_1.GHttpTool.httpPost({ 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(IServerConfig_1.GServerCfg.third_cfg.open_social.update_pwd_url, msg);
+        let jsonData = await HttpTool_1.GHttpTool.httpPost({ url: IServerConfig_1.GServerCfg.third_cfg.open_social.update_pwd_url, json: msg });
         return jsonData.body || jsonData.error;
     }
 }

package/dist/types/Logic/HttpTool.d.ts

@@ -1,3 +1,4 @@
+import * as request from "request";
 export declare let GHttpTool: HttpTool;
 declare class HttpTool {
     httpRequest(url: string, noParse?: boolean): Promise<{
@@ -5,7 +6,7 @@ declare class HttpTool {
         response: any;
         body: any;
     }>;
-    httpPost(url: any, form: any): Promise<{
+    httpPost(options: request.OptionsWithUrl): Promise<{
         error: any;
         response: any;
         body: any;

package/package.json

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