cgserver 12.0.8 → 12.2.0

package/dist/lib/Framework/ThirdParty/QQTool.js

@@ -1,129 +1,162 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.gQQTool = exports.QQTool = exports.QQUserInfo = void 0;
-const _ = require("underscore");
-const URLEncode = require("urlencode");
-const Log_1 = require("../Logic/Log");
-const HttpTool_1 = require("../Logic/HttpTool");
-const IServerConfig_1 = require("../Config/IServerConfig");
-class QQUserInfo {
-    ret = 0;
-    msg = "";
-    is_lost = 0;
-    nickname = "";
-    gender = ""; //"男"
-    province = ""; //"四川"
-    city = ""; //"成都"
-    year = ""; //"1988"
-    constellation = "";
-    figureurl = ""; //http://qzapp.qlogo.cn/qzapp/101775753/B5EA2E2138715A07DE91B5BACBA0CCE5/30
-    figureurl_1 = ""; //http://qzapp.qlogo.cn/qzapp/101775753/B5EA2E2138715A07DE91B5BACBA0CCE5/50
-    figureurl_2 = ""; //http://qzapp.qlogo.cn/qzapp/101775753/B5EA2E2138715A07DE91B5BACBA0CCE5/100
-    figureurl_qq_1 = ""; //http://thirdqq.qlogo.cn/g?b=oidb&k=jgOibQ4eLHDBT57oAib1DrOg&s=40&t=1556419177
-    figureurl_qq_2 = ""; //http://thirdqq.qlogo.cn/g?b=oidb&k=jgOibQ4eLHDBT57oAib1DrOg&s=100&t=1556419177
-    figureurl_qq = ""; //http://thirdqq.qlogo.cn/g?b=oidb&k=jgOibQ4eLHDBT57oAib1DrOg&s=140&t=1556419177
-    figureurl_type = ""; //"1"
-    is_yellow_vip; //"0"
-    vip = ""; //"0"
-    yellow_vip_level = ""; //"0"
-    level = ""; //"0"
-    is_yellow_year_vip = ""; //"0"
-}
-exports.QQUserInfo = QQUserInfo;
-class QQTool {
-    /**
-     * 获取Authorization Code
-     * @param scope 可选	请求用户授权时向用户显示的可进行授权的列表。
-                    可填写的值是API文档中列出的接口，以及一些动作型的授权（目前仅有：do_like），如果要填写多个接口名称，请用逗号隔开。
-                    例如：scope=get_user_info,list_album,upload_pic,do_like
-                    不传则默认请求对接口get_user_info进行授权。
-                    建议控制授权项的数量，只传入必要的接口名称，因为授权项越多，用户越可能拒绝进行任何授权。
-     * @param display 仅PC网站接入时使用。
-                    用于展示的样式。不传则默认展示为PC下的样式。
-                    如果传入“mobile”，则展示为mobile端下的样式。
-     */
-    getAuthCodeUrl(scope, display) {
-        if (!IServerConfig_1.gServerCfg.qq) {
-            Log_1.gLog.error("qq config not found!");
-            return null;
-        }
-        //必须	成功授权后的回调地址，必须是注册appid时填写的主域名下的地址，建议设置为网站首页或网站的用户中心
-        let redirect_uri = URLEncode.encode(IServerConfig_1.gServerCfg.qq.redirect_uri);
-        //必须	申请QQ登录成功后，分配给应用的appid。
-        let client_id = IServerConfig_1.gServerCfg.qq.app_id;
-        //必须	授权类型，此值固定为“code”。
-        let response_type = "code";
-        //必须	client端的状态值。用于第三方应用防止CSRF攻击，成功授权后回调时会原样带回。请务必严格按照流程检查用户与state参数状态的绑定。
-        let state = _.random(1000000, 9999999);
-        //PC网站
-        let url = "https://graph.qq.com/oauth2.0/authorize?redirect_uri=" + redirect_uri + "&response_type=" + response_type + "&state=" + state + "&client_id=" + client_id;
-        if (scope) {
-            url += "&scope=" + scope;
-        }
-        if (display) {
-            url += "&display=" + display;
-        }
-        return url;
-    }
-    async getAccessToken(auth_code) {
-        if (!auth_code) {
-            return null;
-        }
-        if (!IServerConfig_1.gServerCfg.qq) {
-            Log_1.gLog.error("qq config not found!");
-            return null;
-        }
-        //必须	授权类型，在本步骤中，此值为“authorization_code”。
-        let grant_type = "authorization_code";
-        //必须	申请QQ登录成功后，分配给应用的appid。
-        let client_id = IServerConfig_1.gServerCfg.qq.app_id;
-        //必须	申请QQ登录成功后，分配给网站的appkey。
-        let client_secret = IServerConfig_1.gServerCfg.qq.app_key;
-        //必须	成功授权后的回调地址，必须是注册appid时填写的主域名下的地址，建议设置为网站首页或网站的用户中心
-        let redirect_uri = URLEncode.encode(IServerConfig_1.gServerCfg.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.get(url);
-        if (rs.body && rs.body.access_token) {
-            return rs.body.access_token;
-        }
-        else {
-            Log_1.gLog.error(rs.body);
-        }
-        return null;
-    }
-    async getOpenId(access_token) {
-        let url = "https://graph.qq.com/oauth2.0/me?access_token=" + access_token;
-        let rs = await HttpTool_1.gHttpTool.get(url);
-        let body = rs.response ? rs.response.body : null;
-        if (body) {
-            body = body.replace("callback( ", "");
-            body = body.replace(" );\n", "");
-            try {
-                body = JSON.parse(body);
-            }
-            catch (e) { }
-            if (!body.openid) {
-                Log_1.gLog.error(rs.response.body);
-            }
-            return body.openid;
-        }
-        return null;
-    }
-    async getUserInfo(access_token, openid) {
-        if (!access_token || !openid) {
-            return null;
-        }
-        if (!IServerConfig_1.gServerCfg.qq) {
-            Log_1.gLog.error("qq config not found!");
-            return null;
-        }
-        let url = "https://graph.qq.com/user/get_user_info?access_token=" + access_token + "&oauth_consumer_key=" + IServerConfig_1.gServerCfg.qq.app_id + "&openid=" + openid;
-        let rs = await HttpTool_1.gHttpTool.get(url);
-        if (rs.body) {
-            return rs.body;
-        }
-        return null;
-    }
-}
-exports.QQTool = QQTool;
-exports.gQQTool = new QQTool();
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.gQQTool = exports.QQTool = exports.QQUserInfo = void 0;
+const _ = __importStar(require("underscore"));
+const URLEncode = __importStar(require("urlencode"));
+const Log_1 = require("../Logic/Log");
+const HttpTool_1 = require("../Logic/HttpTool");
+const IServerConfig_1 = require("../Config/IServerConfig");
+class QQUserInfo {
+    ret = 0;
+    msg = "";
+    is_lost = 0;
+    nickname = "";
+    gender = ""; //"男"
+    province = ""; //"四川"
+    city = ""; //"成都"
+    year = ""; //"1988"
+    constellation = "";
+    figureurl = ""; //http://qzapp.qlogo.cn/qzapp/101775753/B5EA2E2138715A07DE91B5BACBA0CCE5/30
+    figureurl_1 = ""; //http://qzapp.qlogo.cn/qzapp/101775753/B5EA2E2138715A07DE91B5BACBA0CCE5/50
+    figureurl_2 = ""; //http://qzapp.qlogo.cn/qzapp/101775753/B5EA2E2138715A07DE91B5BACBA0CCE5/100
+    figureurl_qq_1 = ""; //http://thirdqq.qlogo.cn/g?b=oidb&k=jgOibQ4eLHDBT57oAib1DrOg&s=40&t=1556419177
+    figureurl_qq_2 = ""; //http://thirdqq.qlogo.cn/g?b=oidb&k=jgOibQ4eLHDBT57oAib1DrOg&s=100&t=1556419177
+    figureurl_qq = ""; //http://thirdqq.qlogo.cn/g?b=oidb&k=jgOibQ4eLHDBT57oAib1DrOg&s=140&t=1556419177
+    figureurl_type = ""; //"1"
+    is_yellow_vip; //"0"
+    vip = ""; //"0"
+    yellow_vip_level = ""; //"0"
+    level = ""; //"0"
+    is_yellow_year_vip = ""; //"0"
+}
+exports.QQUserInfo = QQUserInfo;
+class QQTool {
+    /**
+     * 获取Authorization Code
+     * @param scope 可选	请求用户授权时向用户显示的可进行授权的列表。
+                    可填写的值是API文档中列出的接口，以及一些动作型的授权（目前仅有：do_like），如果要填写多个接口名称，请用逗号隔开。
+                    例如：scope=get_user_info,list_album,upload_pic,do_like
+                    不传则默认请求对接口get_user_info进行授权。
+                    建议控制授权项的数量，只传入必要的接口名称，因为授权项越多，用户越可能拒绝进行任何授权。
+     * @param display 仅PC网站接入时使用。
+                    用于展示的样式。不传则默认展示为PC下的样式。
+                    如果传入“mobile”，则展示为mobile端下的样式。
+     */
+    getAuthCodeUrl(scope, display) {
+        if (!IServerConfig_1.gServerCfg.qq) {
+            Log_1.gLog.error("qq config not found!");
+            return null;
+        }
+        //必须	成功授权后的回调地址，必须是注册appid时填写的主域名下的地址，建议设置为网站首页或网站的用户中心
+        let redirect_uri = URLEncode.encode(IServerConfig_1.gServerCfg.qq.redirect_uri);
+        //必须	申请QQ登录成功后，分配给应用的appid。
+        let client_id = IServerConfig_1.gServerCfg.qq.app_id;
+        //必须	授权类型，此值固定为“code”。
+        let response_type = "code";
+        //必须	client端的状态值。用于第三方应用防止CSRF攻击，成功授权后回调时会原样带回。请务必严格按照流程检查用户与state参数状态的绑定。
+        let state = _.random(1000000, 9999999);
+        //PC网站
+        let url = "https://graph.qq.com/oauth2.0/authorize?redirect_uri=" + redirect_uri + "&response_type=" + response_type + "&state=" + state + "&client_id=" + client_id;
+        if (scope) {
+            url += "&scope=" + scope;
+        }
+        if (display) {
+            url += "&display=" + display;
+        }
+        return url;
+    }
+    async getAccessToken(auth_code) {
+        if (!auth_code) {
+            return null;
+        }
+        if (!IServerConfig_1.gServerCfg.qq) {
+            Log_1.gLog.error("qq config not found!");
+            return null;
+        }
+        //必须	授权类型，在本步骤中，此值为“authorization_code”。
+        let grant_type = "authorization_code";
+        //必须	申请QQ登录成功后，分配给应用的appid。
+        let client_id = IServerConfig_1.gServerCfg.qq.app_id;
+        //必须	申请QQ登录成功后，分配给网站的appkey。
+        let client_secret = IServerConfig_1.gServerCfg.qq.app_key;
+        //必须	成功授权后的回调地址，必须是注册appid时填写的主域名下的地址，建议设置为网站首页或网站的用户中心
+        let redirect_uri = URLEncode.encode(IServerConfig_1.gServerCfg.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.get(url);
+        if (rs.body && rs.body.access_token) {
+            return rs.body.access_token;
+        }
+        else {
+            Log_1.gLog.error(rs.body);
+        }
+        return null;
+    }
+    async getOpenId(access_token) {
+        let url = "https://graph.qq.com/oauth2.0/me?access_token=" + access_token;
+        let rs = await HttpTool_1.gHttpTool.get(url);
+        let body = rs.response ? rs.response.body : null;
+        if (body) {
+            body = body.replace("callback( ", "");
+            body = body.replace(" );\n", "");
+            try {
+                body = JSON.parse(body);
+            }
+            catch (e) { }
+            if (!body.openid) {
+                Log_1.gLog.error(rs.response.body);
+            }
+            return body.openid;
+        }
+        return null;
+    }
+    async getUserInfo(access_token, openid) {
+        if (!access_token || !openid) {
+            return null;
+        }
+        if (!IServerConfig_1.gServerCfg.qq) {
+            Log_1.gLog.error("qq config not found!");
+            return null;
+        }
+        let url = "https://graph.qq.com/user/get_user_info?access_token=" + access_token + "&oauth_consumer_key=" + IServerConfig_1.gServerCfg.qq.app_id + "&openid=" + openid;
+        let rs = await HttpTool_1.gHttpTool.get(url);
+        if (rs.body) {
+            return rs.body;
+        }
+        return null;
+    }
+}
+exports.QQTool = QQTool;
+exports.gQQTool = new QQTool();

package/dist/lib/Framework/ThirdParty/QiniuTool.js

@@ -1,29 +1,62 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.gQiniuTool = exports.QiniuTool = void 0;
-const qiniu = require("qiniu");
-const IServerConfig_1 = require("../Config/IServerConfig");
-const Log_1 = require("../Logic/Log");
-class QiniuTool {
-    get host() {
-        if (!IServerConfig_1.gServerCfg.qiniu) {
-            return "";
-        }
-        return IServerConfig_1.gServerCfg.qiniu.host;
-    }
-    getUploadToken(filename) {
-        if (!IServerConfig_1.gServerCfg.qiniu) {
-            Log_1.gLog.error("qiniu config not found!");
-            return "";
-        }
-        let mac = new qiniu.auth.digest.Mac(IServerConfig_1.gServerCfg.qiniu.accessKey, IServerConfig_1.gServerCfg.qiniu.secretKey);
-        let options = {
-            scope: IServerConfig_1.gServerCfg.qiniu.bucket + ":" + filename,
-        };
-        let putPolicy = new qiniu.rs.PutPolicy(options);
-        let uploadToken = putPolicy.uploadToken(mac);
-        return uploadToken;
-    }
-}
-exports.QiniuTool = QiniuTool;
-exports.gQiniuTool = new QiniuTool();
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.gQiniuTool = exports.QiniuTool = void 0;
+const qiniu = __importStar(require("qiniu"));
+const IServerConfig_1 = require("../Config/IServerConfig");
+const Log_1 = require("../Logic/Log");
+class QiniuTool {
+    get host() {
+        if (!IServerConfig_1.gServerCfg.qiniu) {
+            return "";
+        }
+        return IServerConfig_1.gServerCfg.qiniu.host;
+    }
+    getUploadToken(filename) {
+        if (!IServerConfig_1.gServerCfg.qiniu) {
+            Log_1.gLog.error("qiniu config not found!");
+            return "";
+        }
+        let mac = new qiniu.auth.digest.Mac(IServerConfig_1.gServerCfg.qiniu.accessKey, IServerConfig_1.gServerCfg.qiniu.secretKey);
+        let options = {
+            scope: IServerConfig_1.gServerCfg.qiniu.bucket + ":" + filename,
+        };
+        let putPolicy = new qiniu.rs.PutPolicy(options);
+        let uploadToken = putPolicy.uploadToken(mac);
+        return uploadToken;
+    }
+}
+exports.QiniuTool = QiniuTool;
+exports.gQiniuTool = new QiniuTool();

package/dist/lib/Framework/ThirdParty/Rpc.js

@@ -1,79 +1,79 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Rpc = void 0;
-const Core_1 = require("../Core/Core");
-const Log_1 = require("../Logic/Log");
-const CgMq_1 = require("../Server/RpcWebSocketServer/CgMq");
-class Remote {
-    _retmsg = null;
-    get retMsg() {
-        return this._retmsg;
-    }
-    _cgmq = null;
-    get cgmq() {
-        return this._cgmq;
-    }
-    _to_group = "";
-    _to_id = "";
-    _listen = "";
-    _is_mq = false;
-    constructor(group, id, cgmq, listen, is_mq = false) {
-        this._to_group = group;
-        this._to_id = id;
-        this._listen = listen;
-        this._is_mq = is_mq;
-        this._cgmq = cgmq;
-    }
-    async call(func_name, ...args) {
-        this._retmsg = await this._cgmq.callRemote(this._to_group, this._to_id, this._listen, func_name, this._is_mq, ...args);
-        let datas = [];
-        if (this._retmsg) {
-            datas = this._retmsg.data;
-        }
-        let ret = { rets: datas, ret: null };
-        if (datas && datas.length > 0) {
-            ret.ret = datas[0];
-        }
-        return ret;
-    }
-}
-class Rpc {
-    _cgmq = null;
-    get cgmq() {
-        return this._cgmq;
-    }
-    async init(cfg) {
-        this._cgmq = new CgMq_1.CgMq();
-        let ret = await this._cgmq.init(cfg, this.onMsg.bind(this));
-        return ret;
-    }
-    getRemote(group, id = "", listener = "", is_mq = false) {
-        return new Remote(group, id, this._cgmq, listener, is_mq);
-    }
-    //mq消息不需要回复
-    getRemoteMq(group, id = "", listener = "") {
-        return this.getRemote(group, id, listener, true);
-    }
-    async onMsg(msg) {
-        if (!msg || !msg.data || !msg.data.cmd) {
-            return;
-        }
-        let cmd = msg.data.cmd;
-        let func = this[cmd];
-        if (!func) {
-            Log_1.gLog.error({ des: "rpc no cmd", msg });
-            return;
-        }
-        let data = await Core_1.core.safeCall(func, this, ...msg.data?.args, msg);
-        return data;
-    }
-    async listen(listeners) {
-        let ret = await this._cgmq.listen(listeners);
-        return ret;
-    }
-    async unlisten(listeners) {
-        let ret = await this._cgmq.unlisten(listeners);
-        return ret;
-    }
-}
-exports.Rpc = Rpc;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Rpc = void 0;
+const Core_1 = require("../Core/Core");
+const Log_1 = require("../Logic/Log");
+const CgMq_1 = require("../Server/RpcWebSocketServer/CgMq");
+class Remote {
+    _retmsg = null;
+    get retMsg() {
+        return this._retmsg;
+    }
+    _cgmq = null;
+    get cgmq() {
+        return this._cgmq;
+    }
+    _to_group = "";
+    _to_id = "";
+    _listen = "";
+    _is_mq = false;
+    constructor(group, id, cgmq, listen, is_mq = false) {
+        this._to_group = group;
+        this._to_id = id;
+        this._listen = listen;
+        this._is_mq = is_mq;
+        this._cgmq = cgmq;
+    }
+    async call(func_name, ...args) {
+        this._retmsg = await this._cgmq.callRemote(this._to_group, this._to_id, this._listen, func_name, this._is_mq, ...args);
+        let datas = [];
+        if (this._retmsg) {
+            datas = this._retmsg.data;
+        }
+        let ret = { rets: datas, ret: null };
+        if (datas && datas.length > 0) {
+            ret.ret = datas[0];
+        }
+        return ret;
+    }
+}
+class Rpc {
+    _cgmq = null;
+    get cgmq() {
+        return this._cgmq;
+    }
+    async init(cfg) {
+        this._cgmq = new CgMq_1.CgMq();
+        let ret = await this._cgmq.init(cfg, this.onMsg.bind(this));
+        return ret;
+    }
+    getRemote(group, id = "", listener = "", is_mq = false) {
+        return new Remote(group, id, this._cgmq, listener, is_mq);
+    }
+    //mq消息不需要回复
+    getRemoteMq(group, id = "", listener = "") {
+        return this.getRemote(group, id, listener, true);
+    }
+    async onMsg(msg) {
+        if (!msg || !msg.data || !msg.data.cmd) {
+            return;
+        }
+        let cmd = msg.data.cmd;
+        let func = this[cmd];
+        if (!func) {
+            Log_1.gLog.error({ des: "rpc no cmd", msg });
+            return;
+        }
+        let data = await Core_1.core.safeCall(func, this, ...msg.data?.args, msg);
+        return data;
+    }
+    async listen(listeners) {
+        let ret = await this._cgmq.listen(listeners);
+        return ret;
+    }
+    async unlisten(listeners) {
+        let ret = await this._cgmq.unlisten(listeners);
+        return ret;
+    }
+}
+exports.Rpc = Rpc;