cgserver 9.1.8 → 9.1.10

package/README.md

@@ -1,3 +1,10 @@
+9.1.10
+1、删除一些无用配置和代码
+2、整理现有的代码，增加一些人性化的提示
+9.1.9
+1、周起始时间bug修正
+9.1.8
+1、强制mongocache访问mongo的bug修改
 9.1.7
 1、httptool 默认可以支持全局输出日志了
 9.1.6

package/dist/lib/Framework/Config/FrameworkConfig.js

@@ -37,6 +37,61 @@ class WebServerConfig {
     rootview = "";
 }
 exports.WebServerConfig = WebServerConfig;
+class AliSmsConfig {
+    signName = "";
+    accessKeyId = "";
+    secretAccessKey = "";
+    templateCode = "";
+}
+class QiNiuConfig {
+    host = "";
+    bucket = "";
+    accessKey = "";
+    secretKey = "";
+}
+class EmailConfig {
+    host = "";
+    port = 587;
+    secure = false;
+    auth = null;
+    from = "";
+}
+class QQConfig {
+    app_id = "";
+    app_key = "";
+    redirect_uri = "";
+}
+class WechatConfig {
+    app_id = "";
+    app_key = "";
+    redirect_uri = "";
+}
+class AlipayConfig {
+    open = false;
+    dev = false;
+    app_id = "";
+    app_key = "";
+    gateway = "";
+    //RSA1 RSA2
+    signType = "";
+    /** 指定private key类型, 默认： PKCS1, PKCS8: PRIVATE KEY, PKCS1: RSA PRIVATE KEY */
+    keyType = "";
+    alipay_root_cert_sn = "";
+    alipay_cert_sn = "";
+    app_cert_sn = "";
+    notify_url = "";
+    app_id_dev = "";
+    app_key_dev = "";
+    gateway_dev = "";
+    //RSA1 RSA2
+    signType_dev = "";
+    /** 指定private key类型, 默认： PKCS1, PKCS8: PRIVATE KEY, PKCS1: RSA PRIVATE KEY */
+    keyType_dev = "";
+    alipay_root_cert_sn_dev = "";
+    alipay_cert_sn_dev = "";
+    app_cert_sn_dev = "";
+    notify_url_dev;
+}
 class FrameworkConfig extends Config_1.Config {
     /*
     *-1不输出到console，0，仅错误信息输出到console，1，都输出到console
@@ -119,82 +174,14 @@ class FrameworkConfig extends Config_1.Config {
      * 控制网络消息的
      */
     debug_msg = false;
-    local_host = "127.0.0.1";
-    internet_host = "127.0.0.1";
     db = new DbConfig_1.DbConfig();
-    third_cfg = {
-        open_social: {
-            app_id: "appid_42313131",
-            app_secret: "apps_FDS4342J34JL432",
-            auth_url: "http://47.99.195.103:6666/auth/account/",
-            user_url: "http://47.99.195.103:6666/auth/userinfo/",
-            update_pwd_url: "http://47.99.195.103:6666/auth/updatepwd/"
-        },
-        aliSms: {
-            signName: "而已网络",
-            accessKeyId: "LTAIeqjiZ5OCev0B",
-            secretAccessKey: "0w1fmDEORshI94QqtampBaAPQDqUAj",
-            templateCode: "SMS_154589473"
-        },
-        qiniu: {
-            host: "p0bj0dycx.bkt.clouddn.com",
-            bucket: "eryiniuniu",
-            accessKey: "OETxflxP9V5ZzPcjE30asCv-YxWBvDpmMPJegtI4",
-            secretKey: "kZWsom120P0-cfQt_9_1-wR_X8RwuLeMXKbU_uc4"
-        },
-        email: {
-            host: "smtp.live.com",
-            port: 587,
-            secure: false,
-            auth: {
-                user: "chengang01@live.com",
-                pass: "cg123!@#" // generated ethereal password
-            },
-            from: "OpenSocial <chengang01@live.com>"
-        },
-        qq: {
-            app_id: "101775753",
-            app_key: "753d0f02f3c4093062e7b2f56c7fcb0c",
-            redirect_uri: "http://www.eryinet.com/qq/callback"
-        },
-        wechat: {
-            app_id: "wx80f0f10fe1304e9d",
-            app_key: "a76fc337c49b309886a6538d31c344e2",
-            redirect_uri: "http://www.eryinet.com/wechat/callback"
-        },
-        alipay: {
-            open: false,
-            dev: false,
-            app_id: "",
-            app_key: "",
-            gateway: "",
-            //RSA1 RSA2
-            signType: 'RSA2',
-            /** 指定private key类型, 默认： PKCS1, PKCS8: PRIVATE KEY, PKCS1: RSA PRIVATE KEY */
-            keyType: 'PKCS1',
-            alipay_root_cert_sn: "",
-            alipay_cert_sn: "",
-            app_cert_sn: "",
-            notify_url: "",
-            app_id_dev: "",
-            app_key_dev: "",
-            gateway_dev: "",
-            //RSA1 RSA2
-            signType_dev: 'RSA2',
-            /** 指定private key类型, 默认： PKCS1, PKCS8: PRIVATE KEY, PKCS1: RSA PRIVATE KEY */
-            keyType_dev: 'PKCS1',
-            alipay_root_cert_sn_dev: "",
-            alipay_cert_sn_dev: "",
-            app_cert_sn_dev: "",
-            notify_url_dev: ""
-        },
-        apple: {
-            keyIds: {}
-        },
-        cgrpc: null
-    };
-    //key是ip，value是domain
-    ip_to_domain = {};
+    aliSms = null;
+    qiniu = null;
+    email = null;
+    qq = null;
+    wechat = null;
+    alipay = null;
+    apple;
     root_path = process.cwd();
     constructor() {
         super("FrameworkConfig");

package/dist/lib/Framework/Core/Core.js

@@ -499,17 +499,17 @@ class core {
         let time = new Date(now.getFullYear(), now.getMonth());
         return time.getTime();
     }
-    static getLastWeekStartTime() {
+    static getNextWeekStartTime() {
         let one_day = 24 * 60 * 60 * 1000;
         let time = this.getTodayStartTime();
         let day = new Date().getDay();
-        return time - (day + 7) * one_day;
+        return time + (7 - (day - 1)) * one_day;
     }
     static getCurWeekStartTime() {
         let one_day = 24 * 60 * 60 * 1000;
         let time = this.getTodayStartTime();
         let day = new Date().getDay();
-        return time - day * one_day;
+        return time - (day - 1) * one_day;
     }
     static isSameMonth(src_time, target_time) {
         let src_date = new Date(src_time);

package/dist/lib/Framework/Service/MongoAccountService.js

@@ -5,7 +5,6 @@ const _error_1 = require("../Config/_error_");
 const MongoBaseService_1 = require("../Database/MongoBaseService");
 const MongoManager_1 = require("../Database/MongoManager");
 const CacheTool_1 = require("../Logic/CacheTool");
-const OpenSocial_1 = require("../ThirdParty/OpenSocial");
 const QQTool_1 = require("../ThirdParty/QQTool");
 const WechatTool_1 = require("../ThirdParty/WechatTool");
 const ini_1 = require("./ini");
@@ -37,7 +36,6 @@ class MongoAccountService extends MongoBaseService_1.MongoBaseService {
     async add(unionid, openid, ip, from) {
         let account = new this._t_type();
         switch (from) {
-            case ini_1.EAccountFrom.OpenSocial:
             case ini_1.EAccountFrom.WeChat:
             case ini_1.EAccountFrom.QQ:
             case ini_1.EAccountFrom.Apple:
@@ -129,7 +127,6 @@ class MongoAccountService extends MongoBaseService_1.MongoBaseService {
         let extra_info = {};
         if (!account) {
             switch (from) {
-                case ini_1.EAccountFrom.OpenSocial:
                 case ini_1.EAccountFrom.QQ:
                 case ini_1.EAccountFrom.WeChat:
                 case ini_1.EAccountFrom.Guest:
@@ -155,29 +152,13 @@ class MongoAccountService extends MongoBaseService_1.MongoBaseService {
             let user = await MongoUserService_1.GUserSer.getByAccountId(account.id);
             if (!user) {
                 switch (from) {
-                    case ini_1.EAccountFrom.OpenSocial:
                     case ini_1.EAccountFrom.QQ:
                     case ini_1.EAccountFrom.WeChat:
                     case ini_1.EAccountFrom.Apple:
                     case ini_1.EAccountFrom.Google:
                         {
                             if (!extra_info) {
-                                if (from == ini_1.EAccountFrom.OpenSocial) {
-                                    let body = await OpenSocial_1.GOpenSocial.getUser(unionid, openid);
-                                    if (body && body.errcode) {
-                                        rs.errcode = body.errcode;
-                                        return rs;
-                                    }
-                                    else if (body && body.user) {
-                                        extra_info =
-                                            {
-                                                logo: body.user.logo,
-                                                sex: body.user.sex,
-                                                nickname: body.user.nickname
-                                            };
-                                    }
-                                }
-                                else if (from == ini_1.EAccountFrom.QQ) {
+                                if (from == ini_1.EAccountFrom.QQ) {
                                     let userInfo = await QQTool_1.GQQTool.getUserInfo(access_token, openid);
                                     if (!userInfo) {
                                         rs.errcode = _error_1.EErrorCode.Server_Error;
@@ -258,7 +239,6 @@ class MongoAccountService extends MongoBaseService_1.MongoBaseService {
         let rs = { errcode: null, account: null };
         if (from == ini_1.EAccountFrom.QQ
             || from == ini_1.EAccountFrom.WeChat
-            || from == ini_1.EAccountFrom.OpenSocial
             || from == ini_1.EAccountFrom.Apple
             || from == ini_1.EAccountFrom.Google) {
             rs.account = await this.getByThird(unionid, openid);
@@ -292,16 +272,6 @@ class MongoAccountService extends MongoBaseService_1.MongoBaseService {
         }
         return rs;
     }
-    /**
-     * 修改密码
-     * @param unionid
-     * @param openid
-     * @param new_pwd
-     */
-    async updatePwd(unionid, openid, new_pwd) {
-        let rs = await OpenSocial_1.GOpenSocial.updatePwd(unionid, openid, new_pwd);
-        return rs;
-    }
     async register(type, key, password, ip, extra) {
         let rs = { user: null, errcode: null };
         extra = extra || {};

package/dist/lib/Framework/Service/MysqlAccountService.js

@@ -11,7 +11,6 @@ const Property_1 = require("../Database/Decorator/Property");
 const MysqlBaseService_1 = require("../Database/MysqlBaseService");
 const CacheTool_1 = require("../Logic/CacheTool");
 const _error_1 = require("../Config/_error_");
-const OpenSocial_1 = require("../ThirdParty/OpenSocial");
 const MysqlUserService_1 = require("./MysqlUserService");
 const QQTool_1 = require("../ThirdParty/QQTool");
 const WechatTool_1 = require("../ThirdParty/WechatTool");
@@ -112,7 +111,6 @@ class MysqlAccountService extends MysqlBaseService_1.MysqlBaseService {
     async add(unionid, openid, ip, from) {
         let account = new this._t_type();
         switch (from) {
-            case ini_1.EAccountFrom.OpenSocial:
             case ini_1.EAccountFrom.WeChat:
             case ini_1.EAccountFrom.QQ:
             case ini_1.EAccountFrom.Apple:
@@ -203,7 +201,6 @@ class MysqlAccountService extends MysqlBaseService_1.MysqlBaseService {
         let extra_info = {};
         if (!account) {
             switch (from) {
-                case ini_1.EAccountFrom.OpenSocial:
                 case ini_1.EAccountFrom.QQ:
                 case ini_1.EAccountFrom.WeChat:
                 case ini_1.EAccountFrom.Guest:
@@ -229,29 +226,13 @@ class MysqlAccountService extends MysqlBaseService_1.MysqlBaseService {
             let user = await MysqlUserService_1.GUserSer.getByAccountId(account.id);
             if (!user) {
                 switch (from) {
-                    case ini_1.EAccountFrom.OpenSocial:
                     case ini_1.EAccountFrom.QQ:
                     case ini_1.EAccountFrom.WeChat:
                     case ini_1.EAccountFrom.Apple:
                     case ini_1.EAccountFrom.Google:
                         {
                             if (!extra_info) {
-                                if (from == ini_1.EAccountFrom.OpenSocial) {
-                                    let body = await OpenSocial_1.GOpenSocial.getUser(unionid, openid);
-                                    if (body && body.errcode) {
-                                        rs.errcode = body.errcode;
-                                        return rs;
-                                    }
-                                    else if (body && body.user) {
-                                        extra_info =
-                                            {
-                                                logo: body.user.logo,
-                                                sex: body.user.sex,
-                                                nickname: body.user.nickname
-                                            };
-                                    }
-                                }
-                                else if (from == ini_1.EAccountFrom.QQ) {
+                                if (from == ini_1.EAccountFrom.QQ) {
                                     let userInfo = await QQTool_1.GQQTool.getUserInfo(access_token, openid);
                                     if (userInfo.ret) {
                                         rs.errcode = _error_1.EErrorCode.Server_Error;
@@ -327,7 +308,6 @@ class MysqlAccountService extends MysqlBaseService_1.MysqlBaseService {
         let rs = { errcode: null, account: null };
         if (from == ini_1.EAccountFrom.QQ
             || from == ini_1.EAccountFrom.WeChat
-            || from == ini_1.EAccountFrom.OpenSocial
             || from == ini_1.EAccountFrom.Apple
             || from == ini_1.EAccountFrom.Google) {
             rs.account = await this.getByThird(unionid, openid);
@@ -361,16 +341,6 @@ class MysqlAccountService extends MysqlBaseService_1.MysqlBaseService {
         }
         return rs;
     }
-    /**
-     * 修改密码
-     * @param unionid
-     * @param openid
-     * @param new_pwd
-     */
-    async updatePwd(unionid, openid, new_pwd) {
-        let rs = await OpenSocial_1.GOpenSocial.updatePwd(unionid, openid, new_pwd);
-        return rs;
-    }
     async register(type, key, password, ip, extra) {
         let rs = { user: null, errcode: null };
         extra = extra || {};

package/dist/lib/Framework/Service/ini.js

@@ -24,7 +24,7 @@ var EAccountState;
 var EAccountFrom;
 (function (EAccountFrom) {
     EAccountFrom[EAccountFrom["Guest"] = 0] = "Guest";
-    EAccountFrom[EAccountFrom["OpenSocial"] = 1] = "OpenSocial";
+    EAccountFrom[EAccountFrom["_OpenSocial"] = 1] = "_OpenSocial";
     EAccountFrom[EAccountFrom["WeChat"] = 2] = "WeChat";
     EAccountFrom[EAccountFrom["QQ"] = 3] = "QQ";
     EAccountFrom[EAccountFrom["Phone"] = 4] = "Phone";

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

@@ -71,26 +71,26 @@ class AlipayTool {
         notify_url: ""
     };
     init() {
-        if (!IServerConfig_1.GServerCfg.third_cfg.alipay
-            || !IServerConfig_1.GServerCfg.third_cfg.alipay.open) {
+        if (!IServerConfig_1.GServerCfg.alipay
+            || !IServerConfig_1.GServerCfg.alipay.open) {
             return false;
         }
         let suffix = "";
-        if (IServerConfig_1.GServerCfg.third_cfg.alipay.dev) {
+        if (IServerConfig_1.GServerCfg.alipay.dev) {
             suffix = "_dev";
         }
         this._cfg = {
-            app_id: IServerConfig_1.GServerCfg.third_cfg.alipay["app_id" + suffix],
-            app_key: IServerConfig_1.GServerCfg.third_cfg.alipay["app_key" + suffix],
-            gateway: IServerConfig_1.GServerCfg.third_cfg.alipay["gateway" + suffix],
+            app_id: IServerConfig_1.GServerCfg.alipay["app_id" + suffix],
+            app_key: IServerConfig_1.GServerCfg.alipay["app_key" + suffix],
+            gateway: IServerConfig_1.GServerCfg.alipay["gateway" + suffix],
             //RSA1 RSA2
-            signType: IServerConfig_1.GServerCfg.third_cfg.alipay["signType" + suffix],
+            signType: IServerConfig_1.GServerCfg.alipay["signType" + suffix],
             /** 指定private key类型, 默认： PKCS1, PKCS8: PRIVATE KEY, PKCS1: RSA PRIVATE KEY */
-            keyType: IServerConfig_1.GServerCfg.third_cfg.alipay["signType" + suffix],
-            alipay_root_cert_sn: IServerConfig_1.GServerCfg.third_cfg.alipay["alipay_root_cert_sn" + suffix],
-            alipay_cert_sn: IServerConfig_1.GServerCfg.third_cfg.alipay["alipay_cert_sn" + suffix],
-            app_cert_sn: IServerConfig_1.GServerCfg.third_cfg.alipay["app_cert_sn" + suffix],
-            notify_url: IServerConfig_1.GServerCfg.third_cfg.alipay["notify_url" + suffix]
+            keyType: IServerConfig_1.GServerCfg.alipay["signType" + suffix],
+            alipay_root_cert_sn: IServerConfig_1.GServerCfg.alipay["alipay_root_cert_sn" + suffix],
+            alipay_cert_sn: IServerConfig_1.GServerCfg.alipay["alipay_cert_sn" + suffix],
+            app_cert_sn: IServerConfig_1.GServerCfg.alipay["app_cert_sn" + suffix],
+            notify_url: IServerConfig_1.GServerCfg.alipay["notify_url" + suffix]
         };
         if (this._cfg.alipay_cert_sn) {
             this._aliPay = new AliPayUtil_1.AliPayUtil(this._cfg.alipay_cert_sn, this._cfg.app_key);
@@ -111,6 +111,7 @@ class AlipayTool {
                 keyType: this._cfg.keyType
             });
         }
+        Log_1.GLog.info("alipay init success!");
     }
     /**
      *  charset:"utf-8",method:"alipay.trade.app.pay",sign_type:"RSA2,version:"1.0"

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

@@ -9,11 +9,15 @@ class SMSTool {
     _is_init = false;
     _sms_client = null;
     init() {
+        if (!IServerConfig_1.GServerCfg.aliSms) {
+            return false;
+        }
         if (this._is_init) {
             return true;
         }
         this._is_init = true;
-        this._sms_client = new SMSClient({ accessKeyId: IServerConfig_1.GServerCfg.third_cfg.aliSms.accessKeyId, secretAccessKey: IServerConfig_1.GServerCfg.third_cfg.aliSms.secretAccessKey });
+        this._sms_client = new SMSClient({ accessKeyId: IServerConfig_1.GServerCfg.aliSms.accessKeyId, secretAccessKey: IServerConfig_1.GServerCfg.aliSms.secretAccessKey });
+        Log_1.GLog.info("SMSClient init success!");
     }
     /**
      * 发送短信验证码
@@ -25,8 +29,8 @@ class SMSTool {
         return new Promise((resolve, reject) => {
             this._sms_client.sendSMS({
                 PhoneNumbers: phone,
-                SignName: IServerConfig_1.GServerCfg.third_cfg.aliSms.signName,
-                TemplateCode: IServerConfig_1.GServerCfg.third_cfg.aliSms.templateCode,
+                SignName: IServerConfig_1.GServerCfg.aliSms.signName,
+                TemplateCode: IServerConfig_1.GServerCfg.aliSms.templateCode,
                 TemplateParam: JSON.stringify({ code: code })
             }).then((res) => {
                 if (res.Code == "OK") {

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

@@ -187,7 +187,7 @@ class AppleTool {
     }
     signature(nickname, create_time, appBundleID, productIdentifier, offerIdentifier) {
         let keyIdentifier = "";
-        for (var k in IServerConfig_1.GServerCfg.third_cfg.apple.keyIds) {
+        for (var k in IServerConfig_1.GServerCfg.apple.keyIds) {
             keyIdentifier = k;
             break;
         }
@@ -200,7 +200,7 @@ class AppleTool {
             nonce.toLowerCase() + '\u2063' +
             create_time;
         // Get the PEM-formatted private key string associated with the Key ID.
-        const path = IServerConfig_1.GServerCfg.third_cfg.apple.keyIds[keyIdentifier];
+        const path = IServerConfig_1.GServerCfg.apple.keyIds[keyIdentifier];
         const keyString = fs.readFileSync(path).toString();
         // Create an Elliptic Curve Digital Signature Algorithm (ECDSA) object using the private key.
         const key = new ec_key_1.default(keyString, 'pem');

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

@@ -8,23 +8,28 @@ exports.GEmailTool = null;
 class EmailTool {
     send(to, subject, html) {
         return new Promise((resolve, reject) => {
+            if (!IServerConfig_1.GServerCfg.email) {
+                Log_1.GLog.error("email config not found!");
+                resolve("email config not found!");
+                return;
+            }
             let transport = nodeMailer.createTransport({
-                host: IServerConfig_1.GServerCfg.third_cfg.email.host,
-                port: IServerConfig_1.GServerCfg.third_cfg.email.port,
-                secure: IServerConfig_1.GServerCfg.third_cfg.email.secure,
+                host: IServerConfig_1.GServerCfg.email.host,
+                port: IServerConfig_1.GServerCfg.email.port,
+                secure: IServerConfig_1.GServerCfg.email.secure,
                 auth: {
-                    user: IServerConfig_1.GServerCfg.third_cfg.email.auth.user,
-                    pass: IServerConfig_1.GServerCfg.third_cfg.email.auth.pass
+                    user: IServerConfig_1.GServerCfg.email.auth.user,
+                    pass: IServerConfig_1.GServerCfg.email.auth.pass
                 }
             });
             let mail = {
-                from: IServerConfig_1.GServerCfg.third_cfg.email.from,
+                from: IServerConfig_1.GServerCfg.email.from,
                 to: to,
                 subject: subject,
                 html: html
             };
             transport.sendMail(mail, (_err, msg) => {
-                Log_1.GLog.error(JSON.stringify(_err));
+                Log_1.GLog.error(_err);
                 resolve(_err);
             });
         });

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

@@ -44,10 +44,14 @@ class QQTool {
                     如果传入“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.third_cfg.qq.redirect_uri);
+        let redirect_uri = URLEncode.encode(IServerConfig_1.GServerCfg.qq.redirect_uri);
         //必须	申请QQ登录成功后，分配给应用的appid。
-        let client_id = IServerConfig_1.GServerCfg.third_cfg.qq.app_id;
+        let client_id = IServerConfig_1.GServerCfg.qq.app_id;
         //必须	授权类型，此值固定为“code”。
         let response_type = "code";
         //必须	client端的状态值。用于第三方应用防止CSRF攻击，成功授权后回调时会原样带回。请务必严格按照流程检查用户与state参数状态的绑定。
@@ -66,14 +70,18 @@ class QQTool {
         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.third_cfg.qq.app_id;
+        let client_id = IServerConfig_1.GServerCfg.qq.app_id;
         //必须	申请QQ登录成功后，分配给网站的appkey。
-        let client_secret = IServerConfig_1.GServerCfg.third_cfg.qq.app_key;
+        let client_secret = IServerConfig_1.GServerCfg.qq.app_key;
         //必须	成功授权后的回调地址，必须是注册appid时填写的主域名下的地址，建议设置为网站首页或网站的用户中心
-        let redirect_uri = URLEncode.encode(IServerConfig_1.GServerCfg.third_cfg.qq.redirect_uri);
+        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) {
@@ -106,7 +114,11 @@ class QQTool {
         if (!access_token || !openid) {
             return null;
         }
-        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;
+        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;

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

@@ -3,15 +3,23 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.GQiniuTool = void 0;
 const qiniu = require("qiniu");
 const IServerConfig_1 = require("../Config/IServerConfig");
+const Log_1 = require("../Logic/Log");
 exports.GQiniuTool = null;
 class QiniuTool {
     get host() {
-        return IServerConfig_1.GServerCfg.third_cfg.qiniu.host;
+        if (!IServerConfig_1.GServerCfg.qiniu) {
+            return "";
+        }
+        return IServerConfig_1.GServerCfg.qiniu.host;
     }
     getUploadToken(filename) {
-        let mac = new qiniu.auth.digest.Mac(IServerConfig_1.GServerCfg.third_cfg.qiniu.accessKey, IServerConfig_1.GServerCfg.third_cfg.qiniu.secretKey);
+        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.third_cfg.qiniu.bucket + ":" + filename,
+            scope: IServerConfig_1.GServerCfg.qiniu.bucket + ":" + filename,
         };
         let putPolicy = new qiniu.rs.PutPolicy(options);
         let uploadToken = putPolicy.uploadToken(mac);

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

@@ -27,9 +27,12 @@ class 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;
-        url += "&redirect_uri=" + URLEncode.encode(IServerConfig_1.GServerCfg.third_cfg.wechat.redirect_uri);
+        if (!IServerConfig_1.GServerCfg.wechat) {
+            Log_1.GLog.error("wechat config not found!");
+            return null;
+        }
+        let url = "https://open.weixin.qq.com/connect/qrconnect?appid=" + IServerConfig_1.GServerCfg.wechat.app_id;
+        url += "&redirect_uri=" + URLEncode.encode(IServerConfig_1.GServerCfg.wechat.redirect_uri);
         url += "&response_type=code&scope=snsapi_login";
         //必须	client端的状态值。用于第三方应用防止CSRF攻击，成功授权后回调时会原样带回。请务必严格按照流程检查用户与state参数状态的绑定。
         let state = _.random(1000000, 9999999);
@@ -40,7 +43,11 @@ class WechatTool {
         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";
+        if (!IServerConfig_1.GServerCfg.wechat) {
+            Log_1.GLog.error("wechat config not found!");
+            return null;
+        }
+        let url = "https://api.weixin.qq.com/sns/oauth2/access_token?appid=" + IServerConfig_1.GServerCfg.wechat.app_id + "&secret=" + IServerConfig_1.GServerCfg.wechat.app_key + "&code=" + auth_code + "&grant_type=authorization_code";
         let rs = await HttpTool_1.GHttpTool.get(url);
         /*
         {

package/dist/lib/Framework/index.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GMongoCacheSer = exports.MongoUserModel = exports.MysqlUserModel = exports.MongoUserService = exports.MysqlUserService = exports.MongoAccountService = exports.MysqlAccountService = exports.EAccountFrom = exports.EUserState = exports.ERoleGroup = exports.GLog = exports.GHttpTool = exports.GCacheTool = exports.RedisManager = exports.GRedisMgr = exports.SqlReturns = exports.SqlReturn = exports.SqlResult = exports.GMysqlMgr = exports.MysqlBaseService = exports.GMSSqlMgr = exports.GMongoMgr = exports.MongoExt = exports.MongoManager = exports.MongoBaseModel = exports.MysqlBaseModel = exports.MongoBaseService = exports.EPropertyType = exports.Type = exports.Table = exports.Property = exports.PrimaryKey = exports.NotNull = exports.AutoIncrement = exports.Timer = exports.core = exports.GServerCfg = exports.IServerConfig = exports.FrameworkConfig = exports.Config = exports.FrameworkErrorCode = exports.GTriggerMgr = exports.Trigger = exports.Point = exports.Entity = exports.BehaviorAI = exports.AStar = exports.AiObject = exports.GDBCache = exports.GCgServer = void 0;
-exports.CgMq = exports.Rpc = exports.RpcBaseMsg = exports.EAccountState = exports.GEventTool = exports.GSyncQueueTool = exports.WebServerConfig = exports.Response = exports.Request = exports.RazorJs = exports.Engine = exports.GCtrMgr = exports.JsonCreatorValidate = exports.JsonAuthorityValidate = exports.JsonAdminValidate = exports.CreatorValidate = exports.AuthorityValidate = exports.AdminValidate = exports.MongoAccountModel = exports.MysqlAccountModel = exports.MongoBaseUserController = exports.MysqlBaseUserController = exports.BaseController = exports.IWebServer = exports.GWechatTool = exports.GWechatOATool = exports.GQQTool = exports.GQiniuTool = exports.GOpenSocial = exports.GEmailTool = exports.GAppleTool = exports.GSmsTool = exports.AlipayCallBack = exports.AlipayResult = exports.GAlipayTool = exports.BaseMsg = exports.IWebSocket = exports.ISocketServer = exports.IClientWebSocket = exports.IServerWebSocket = exports.JsonProtoFilter = exports.GoogleProtoFilter = exports.EProtoType = exports.GProtoFactory = exports.RedisConfig = exports.MysqlConfig = exports.MongoConfig = exports.MSSqlConfig = exports.DbConfig = exports.MongoCacheModel = void 0;
-exports.GByteTool = exports.SyncCallServer2 = exports.SyncCallServer = exports.SyncCall2 = exports.SyncCall = exports.IRpcClientWebSocket = exports.IRpcServerWebSocket = exports.RpcConfig = void 0;
+exports.RpcConfig = exports.CgMq = exports.Rpc = exports.RpcBaseMsg = exports.EAccountState = exports.GEventTool = exports.GSyncQueueTool = exports.WebServerConfig = exports.Response = exports.Request = exports.RazorJs = exports.Engine = exports.GCtrMgr = exports.JsonCreatorValidate = exports.JsonAuthorityValidate = exports.JsonAdminValidate = exports.CreatorValidate = exports.AuthorityValidate = exports.AdminValidate = exports.MongoAccountModel = exports.MysqlAccountModel = exports.MongoBaseUserController = exports.MysqlBaseUserController = exports.BaseController = exports.IWebServer = exports.GWechatTool = exports.GWechatOATool = exports.GQQTool = exports.GQiniuTool = exports.GEmailTool = exports.GAppleTool = exports.GSmsTool = exports.AlipayCallBack = exports.AlipayResult = exports.GAlipayTool = exports.BaseMsg = exports.IWebSocket = exports.ISocketServer = exports.IClientWebSocket = exports.IServerWebSocket = exports.JsonProtoFilter = exports.GoogleProtoFilter = exports.EProtoType = exports.GProtoFactory = exports.RedisConfig = exports.MysqlConfig = exports.MongoConfig = exports.MSSqlConfig = exports.DbConfig = exports.MongoCacheModel = void 0;
+exports.GByteTool = exports.SyncCallServer2 = exports.SyncCallServer = exports.SyncCall2 = exports.SyncCall = exports.IRpcClientWebSocket = exports.IRpcServerWebSocket = void 0;
 var cgserver_1 = require("./cgserver");
 Object.defineProperty(exports, "GCgServer", { enumerable: true, get: function () { return cgserver_1.GCgServer; } });
 var DBCache_1 = require("./Database/Decorator/DBCache");
@@ -132,8 +132,6 @@ var AppleTool_1 = require("./ThirdParty/AppleTool");
 Object.defineProperty(exports, "GAppleTool", { enumerable: true, get: function () { return AppleTool_1.GAppleTool; } });
 var EmailTool_1 = require("./ThirdParty/EmailTool");
 Object.defineProperty(exports, "GEmailTool", { enumerable: true, get: function () { return EmailTool_1.GEmailTool; } });
-var OpenSocial_1 = require("./ThirdParty/OpenSocial");
-Object.defineProperty(exports, "GOpenSocial", { enumerable: true, get: function () { return OpenSocial_1.GOpenSocial; } });
 var QiniuTool_1 = require("./ThirdParty/QiniuTool");
 Object.defineProperty(exports, "GQiniuTool", { enumerable: true, get: function () { return QiniuTool_1.GQiniuTool; } });
 var QQTool_1 = require("./ThirdParty/QQTool");

package/dist/types/Framework/Config/FrameworkConfig.d.ts

@@ -1,4 +1,3 @@
-import { RpcConfig } from "../ThirdParty/CgMq";
 import { Config } from "./Config";
 import { DbConfig } from "./DbConfig";
 export declare enum ESessionType {
@@ -46,6 +45,62 @@ export declare class WebServerConfig {
     }[];
     rootview: string;
 }
+declare class AliSmsConfig {
+    signName: string;
+    accessKeyId: string;
+    secretAccessKey: string;
+    templateCode: string;
+}
+declare class QiNiuConfig {
+    host: string;
+    bucket: string;
+    accessKey: string;
+    secretKey: string;
+}
+declare class EmailConfig {
+    host: string;
+    port: number;
+    secure: boolean;
+    auth: {
+        user: string;
+        pass: string;
+    };
+    from: string;
+}
+declare class QQConfig {
+    app_id: string;
+    app_key: string;
+    redirect_uri: string;
+}
+declare class WechatConfig {
+    app_id: string;
+    app_key: string;
+    redirect_uri: string;
+}
+declare class AlipayConfig {
+    open: boolean;
+    dev: boolean;
+    app_id: string;
+    app_key: string;
+    gateway: string;
+    signType: string;
+    /** 指定private key类型, 默认： PKCS1, PKCS8: PRIVATE KEY, PKCS1: RSA PRIVATE KEY */
+    keyType: string;
+    alipay_root_cert_sn: string;
+    alipay_cert_sn: string;
+    app_cert_sn: string;
+    notify_url: string;
+    app_id_dev: string;
+    app_key_dev: string;
+    gateway_dev: string;
+    signType_dev: string;
+    /** 指定private key类型, 默认： PKCS1, PKCS8: PRIVATE KEY, PKCS1: RSA PRIVATE KEY */
+    keyType_dev: string;
+    alipay_root_cert_sn_dev: string;
+    alipay_cert_sn_dev: string;
+    app_cert_sn_dev: string;
+    notify_url_dev: "";
+}
 export declare class FrameworkConfig extends Config {
     console_level: number;
     log: {
@@ -125,80 +180,18 @@ export declare class FrameworkConfig extends Config {
      * 控制网络消息的
      */
     debug_msg: boolean;
-    local_host: string;
-    internet_host: string;
     db: DbConfig;
-    third_cfg: {
-        open_social: {
-            app_id: string;
-            app_secret: string;
-            auth_url: string;
-            user_url: string;
-            update_pwd_url: string;
-        };
-        aliSms: {
-            signName: string;
-            accessKeyId: string;
-            secretAccessKey: string;
-            templateCode: string;
-        };
-        qiniu: {
-            host: string;
-            bucket: string;
-            accessKey: string;
-            secretKey: string;
-        };
-        email: {
-            host: string;
-            port: number;
-            secure: boolean;
-            auth: {
-                user: string;
-                pass: string;
-            };
-            from: string;
-        };
-        qq: {
-            app_id: string;
-            app_key: string;
-            redirect_uri: string;
-        };
-        wechat: {
-            app_id: string;
-            app_key: string;
-            redirect_uri: string;
-        };
-        alipay: {
-            open: boolean;
-            dev: boolean;
-            app_id: string;
-            app_key: string;
-            gateway: string;
-            signType: "RSA2" | "RSA";
-            /** 指定private key类型, 默认： PKCS1, PKCS8: PRIVATE KEY, PKCS1: RSA PRIVATE KEY */
-            keyType: "PKCS1" | "PKCS8";
-            alipay_root_cert_sn: string;
-            alipay_cert_sn: string;
-            app_cert_sn: string;
-            notify_url: string;
-            app_id_dev: string;
-            app_key_dev: string;
-            gateway_dev: string;
-            signType_dev: "RSA2" | "RSA";
-            /** 指定private key类型, 默认： PKCS1, PKCS8: PRIVATE KEY, PKCS1: RSA PRIVATE KEY */
-            keyType_dev: "PKCS1" | "PKCS8";
-            alipay_root_cert_sn_dev: string;
-            alipay_cert_sn_dev: string;
-            app_cert_sn_dev: string;
-            notify_url_dev: string;
-        };
-        apple: {
-            keyIds: {};
-        };
-        cgrpc: RpcConfig;
+    aliSms: AliSmsConfig;
+    qiniu: QiNiuConfig;
+    email: EmailConfig;
+    qq: QQConfig;
+    wechat: WechatConfig;
+    alipay: AlipayConfig;
+    apple: {
+        keyIds: {};
     };
-    ip_to_domain: {};
     root_path: string;
     constructor();
     init(): boolean;
 }
+export {};

package/dist/types/Framework/Core/Core.d.ts

@@ -84,7 +84,7 @@ export declare class core {
     static getStartTime(time?: number): number;
     static getLastMonthStartTime(): number;
     static getCurMonthStartTime(): number;
-    static getLastWeekStartTime(): number;
+    static getNextWeekStartTime(): number;
     static getCurWeekStartTime(): number;
     static isSameMonth(src_time: number, target_time: number): boolean;
     static isSameDay(src_time: number, target_time: number): boolean;

package/dist/types/Framework/Service/MongoAccountService.d.ts

@@ -55,13 +55,6 @@ export declare class MongoAccountService<T extends MongoAccountModel> extends Mo
         errcode: any;
         account: T;
     }>;
-    /**
-     * 修改密码
-     * @param unionid
-     * @param openid
-     * @param new_pwd
-     */
-    updatePwd(unionid: string, openid: string, new_pwd: string): Promise<any>;
     register(type: EAccountFrom, key: string, password: string, ip: string, extra?: any): Promise<{
         user: MongoUserModel;
         errcode: any;

package/dist/types/Framework/Service/MysqlAccountService.d.ts

@@ -60,13 +60,6 @@ export declare class MysqlAccountService<T extends MysqlAccountModel> extends My
         errcode: any;
         account: T;
     }>;
-    /**
-     * 修改密码
-     * @param unionid
-     * @param openid
-     * @param new_pwd
-     */
-    updatePwd(unionid: string, openid: string, new_pwd: string): Promise<any>;
     register(type: EAccountFrom, key: string, password: string, ip: string, extra?: any): Promise<{
         user: MysqlUserModel;
         errcode: any;

package/dist/types/Framework/Service/ini.d.ts

@@ -17,7 +17,7 @@ export declare enum EAccountState {
 }
 export declare enum EAccountFrom {
     Guest = 0,
-    OpenSocial = 1,
+    _OpenSocial = 1,
     WeChat = 2,
     QQ = 3,
     Phone = 4,

package/dist/types/Framework/index.d.ts

@@ -56,7 +56,6 @@ export { GAlipayTool, AlipayResult, AlipayCallBack } from './ThirdParty/AlipayTo
 export { GSmsTool } from './ThirdParty/Alisms';
 export { GAppleTool } from './ThirdParty/AppleTool';
 export { GEmailTool } from './ThirdParty/EmailTool';
-export { GOpenSocial } from './ThirdParty/OpenSocial';
 export { GQiniuTool } from './ThirdParty/QiniuTool';
 export { GQQTool } from './ThirdParty/QQTool';
 export { GWechatOATool } from './ThirdParty/WechatOATool';

package/package.json

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