cgserver 7.8.2113 → 7.9.2113

package/dist/lib/ThirdParty/WechatTool.js

@@ -1,74 +1,148 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+exports.__esModule = true;
 exports.WechatTool = exports.GWechatTool = exports.WechatUserInfo = void 0;
-const _ = require("underscore");
-const URLEncode = require("urlencode");
-const IServerConfig_1 = require("../Config/IServerConfig");
-const HttpTool_1 = require("../Logic/HttpTool");
-const Log_1 = require("../Logic/Log");
-class WechatUserInfo {
-    openid = "OPENID";
-    nickname = "NICKNAME";
-    sex = 1;
-    province = "PROVINCE";
-    city = "CITY";
-    country = "COUNTRY";
-    headimgurl = "http://wx.qlogo.cn/mmopen/g3MonUZtNHkdmzicIlibx6iaFqAc56vxLSUfpb6n5WKSYVY0ChQKkiaJSgQ1dZuTOgvLLrhJbERQQ4eMsv84eavHiaiceqxibJxCfHe/0";
-    privilege = [
-        "PRIVILEGE1",
-        "PRIVILEGE2"
-    ];
-    unionid = "o6_bmasdasdsad6_2sgVt7hMZOPfL";
-}
+var _ = require("underscore");
+var URLEncode = require("urlencode");
+var IServerConfig_1 = require("../Config/IServerConfig");
+var HttpTool_1 = require("../Logic/HttpTool");
+var Log_1 = require("../Logic/Log");
+var WechatUserInfo = /** @class */ (function () {
+    function WechatUserInfo() {
+        this.openid = "OPENID";
+        this.nickname = "NICKNAME";
+        this.sex = 1;
+        this.province = "PROVINCE";
+        this.city = "CITY";
+        this.country = "COUNTRY";
+        this.headimgurl = "http://wx.qlogo.cn/mmopen/g3MonUZtNHkdmzicIlibx6iaFqAc56vxLSUfpb6n5WKSYVY0ChQKkiaJSgQ1dZuTOgvLLrhJbERQQ4eMsv84eavHiaiceqxibJxCfHe/0";
+        this.privilege = [
+            "PRIVILEGE1",
+            "PRIVILEGE2"
+        ];
+        this.unionid = "o6_bmasdasdsad6_2sgVt7hMZOPfL";
+    }
+    return WechatUserInfo;
+}());
 exports.WechatUserInfo = WechatUserInfo;
 exports.GWechatTool = null;
-class WechatTool {
+var WechatTool = /** @class */ (function () {
+    function WechatTool() {
+    }
     /**
      * 获取获取code的url
      */
-    getAuthCodeUrl() {
-        let appid = "wx80f0f10fe1304e9d";
-        let url = "https://open.weixin.qq.com/connect/qrconnect?appid=" + IServerConfig_1.GServerCfg.third_cfg.wechat.app_id;
+    WechatTool.prototype.getAuthCodeUrl = function () {
+        var appid = "wx80f0f10fe1304e9d";
+        var url = "https://open.weixin.qq.com/connect/qrconnect?appid=" + IServerConfig_1.GServerCfg.third_cfg.wechat.app_id;
         url += "&redirect_uri=" + URLEncode.encode(IServerConfig_1.GServerCfg.third_cfg.wechat.redirect_uri);
         url += "&response_type=code&scope=snsapi_login";
         //必须	client端的状态值。用于第三方应用防止CSRF攻击，成功授权后回调时会原样带回。请务必严格按照流程检查用户与state参数状态的绑定。
-        let state = _.random(1000000, 9999999);
+        var state = _.random(1000000, 9999999);
         url += "&state=" + state;
         return url;
-    }
-    async getAccessInfo(auth_code) {
-        if (!auth_code) {
-            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.get(url);
-        /*
-        {
-            "access_token":"ACCESS_TOKEN",
-            "expires_in":7200,
-            "refresh_token":"REFRESH_TOKEN",
-            "openid":"OPENID",
-            "scope":"SCOPE",
-            "unionid": "o6_bmasdasdsad6_2sgVt7hMZOPfL"
-        }
-        {"errcode":40029,"errmsg":"invalid code"}
-        */
-        if (rs.body && rs.body.access_token) {
-            return rs.body;
-        }
-        else {
-            Log_1.GLog.error(rs.body);
-        }
-        return null;
-    }
-    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.get(url);
-        if (rs.body) {
-            return rs.body;
-        }
-        return null;
-    }
-}
+    };
+    WechatTool.prototype.getAccessInfo = function (auth_code) {
+        return __awaiter(this, void 0, void 0, function () {
+            var url, rs;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        if (!auth_code) {
+                            return [2 /*return*/, null];
+                        }
+                        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";
+                        return [4 /*yield*/, HttpTool_1.GHttpTool.get(url)
+                            /*
+                            {
+                                "access_token":"ACCESS_TOKEN",
+                                "expires_in":7200,
+                                "refresh_token":"REFRESH_TOKEN",
+                                "openid":"OPENID",
+                                "scope":"SCOPE",
+                                "unionid": "o6_bmasdasdsad6_2sgVt7hMZOPfL"
+                            }
+                            {"errcode":40029,"errmsg":"invalid code"}
+                            */
+                        ];
+                    case 1:
+                        rs = _a.sent();
+                        /*
+                        {
+                            "access_token":"ACCESS_TOKEN",
+                            "expires_in":7200,
+                            "refresh_token":"REFRESH_TOKEN",
+                            "openid":"OPENID",
+                            "scope":"SCOPE",
+                            "unionid": "o6_bmasdasdsad6_2sgVt7hMZOPfL"
+                        }
+                        {"errcode":40029,"errmsg":"invalid code"}
+                        */
+                        if (rs.body && rs.body.access_token) {
+                            return [2 /*return*/, rs.body];
+                        }
+                        else {
+                            Log_1.GLog.error(rs.body);
+                        }
+                        return [2 /*return*/, null];
+                }
+            });
+        });
+    };
+    WechatTool.prototype.getUserInfo = function (access_token, openid) {
+        return __awaiter(this, void 0, void 0, function () {
+            var url, rs;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        url = "https://api.weixin.qq.com/sns/userinfo?access_token=" + access_token + "&openid=" + openid;
+                        return [4 /*yield*/, HttpTool_1.GHttpTool.get(url)];
+                    case 1:
+                        rs = _a.sent();
+                        if (rs.body) {
+                            return [2 /*return*/, rs.body];
+                        }
+                        return [2 /*return*/, null];
+                }
+            });
+        });
+    };
+    return WechatTool;
+}());
 exports.WechatTool = WechatTool;
 exports.GWechatTool = new WechatTool();

package/dist/lib/WebServer/Controller/BaseController.js

@@ -1,35 +1,50 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.BaseController = void 0;
-class BaseController {
-    _request = null;
-    get request() {
-        return this._request;
-    }
-    _response = null;
-    get response() {
-        return this._response;
-    }
-    //模块名称
-    _module = "";
-    _ctr_name = "";
-    get ctrName() {
-        return this._ctr_name;
-    }
-    _engine = null;
-    get postData() {
-        if (!this._request) {
-            return {};
-        }
-        return this._request.postData || {};
-    }
-    get paramData() {
-        if (!this._request) {
-            return {};
-        }
-        return this._request.params || {};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
-    constructor(req, res, engine) {
+};
+exports.__esModule = true;
+exports.BaseController = void 0;
+var BaseController = /** @class */ (function () {
+    function BaseController(req, res, engine) {
+        this._request = null;
+        this._response = null;
+        //模块名称
+        this._module = "";
+        this._ctr_name = "";
+        this._engine = null;
         this._engine = engine;
         this._request = req;
         this._response = res;
@@ -38,46 +53,92 @@ class BaseController {
             this._request.debugInfo();
         }
     }
-    async init() {
-    }
+    Object.defineProperty(BaseController.prototype, "request", {
+        get: function () {
+            return this._request;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(BaseController.prototype, "response", {
+        get: function () {
+            return this._response;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(BaseController.prototype, "ctrName", {
+        get: function () {
+            return this._ctr_name;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(BaseController.prototype, "postData", {
+        get: function () {
+            if (!this._request) {
+                return {};
+            }
+            return this._request.postData || {};
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(BaseController.prototype, "paramData", {
+        get: function () {
+            if (!this._request) {
+                return {};
+            }
+            return this._request.params || {};
+        },
+        enumerable: false,
+        configurable: true
+    });
+    BaseController.prototype.init = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                return [2 /*return*/];
+            });
+        });
+    };
     /**
      * 方便static ctr使用
      * @param req
      * @param res
      * @param engine
      */
-    initStatic(req, res, engine) {
+    BaseController.prototype.initStatic = function (req, res, engine) {
         this._engine = engine;
         this._request = req;
         this._response = res;
         this._request.debugInfo();
-    }
+    };
     //填充每个页面需要的通用数据
-    _init_data(model) {
+    BaseController.prototype._init_data = function (model) {
         model = model || {};
         model.webName = this._engine.cfg.web_name;
-        return { model };
-    }
-    showJson(model) {
+        return { model: model };
+    };
+    BaseController.prototype.showJson = function (model) {
         this._response.renderJson(model, this._request.headers.origin);
-    }
-    show(model) {
-        let html = this._engine.getRenderHtml(this._request, this._response, this._init_data(model));
+    };
+    BaseController.prototype.show = function (model) {
+        var html = this._engine.getRenderHtml(this._request, this._response, this._init_data(model));
         this._response.renderHtml(html);
-    }
-    showText(text, noMeta) {
+    };
+    BaseController.prototype.showText = function (text, noMeta) {
         if (!noMeta) {
             text = "<meta http-equiv='Content-Type' content='text/html; charset=utf-8' />" + text;
         }
         this._response.renderHtml(text);
-    }
-    redirect(module, controller, action, params) {
+    };
+    BaseController.prototype.redirect = function (module, controller, action, params) {
         module = module || this._module;
         controller = controller || this._ctr_name;
-        let url = this.parseFullUrl(module, controller, action);
+        var url = this.parseFullUrl(module, controller, action);
         params = params || {};
-        let str_p = "";
-        for (let key in params) {
+        var str_p = "";
+        for (var key in params) {
             str_p += "&" + key + "=" + params[key];
         }
         if (str_p.length > 0) {
@@ -85,15 +146,15 @@ class BaseController {
         }
         url += str_p;
         this._response.redirect(url);
-    }
-    parseFullUrl(module, controller, action) {
+    };
+    BaseController.prototype.parseFullUrl = function (module, controller, action) {
         if (typeof action === "undefined" || !action) {
             action = "index";
             if (this._engine.cfg.routs.defaults.action == action) {
                 action = null;
             }
         }
-        let url = "";
+        var url = "";
         if (this._engine.cfg.routs.onlyModule) {
             url = this._request.root + "/" + controller;
         }
@@ -104,9 +165,14 @@ class BaseController {
             url += "/" + action;
         }
         return url;
-    }
-    get remoteHost() {
-        return this._request.remoteHost;
-    }
-}
+    };
+    Object.defineProperty(BaseController.prototype, "remoteHost", {
+        get: function () {
+            return this._request.remoteHost;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    return BaseController;
+}());
 exports.BaseController = BaseController;