cgserver 5.4.12 → 5.4.15

package/lib/Framework/Logic/Log.d.ts

@@ -0,0 +1,15 @@
+import * as log4js from "log4js";
+export declare let GLog: Log;
+declare class Log {
+    protected _logger: log4js.Logger;
+    protected _client_logger: log4js.Logger;
+    protected _errorLogger: log4js.Logger;
+    protected _inited: boolean;
+    init(cfg: log4js.Configuration): void;
+    error(message?: any, ...optionalParams: any[]): void;
+    info(message: any, to_console?: any): void;
+    warn(message?: any, ...optionalParams: any[]): void;
+    record(message?: any, ...optionalParams: any[]): void;
+    clientLog(message?: any, ...optionalParams: any[]): void;
+}
+export {};

package/lib/Framework/Logic/Log.js

@@ -0,0 +1,78 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GLog = void 0;
+const Core_1 = require("../Core/Core");
+const colors = require("colors");
+const log4js = require("log4js");
+/**
+ * 输出颜色
+ */
+colors.setTheme({
+    silly: 'rainbow',
+    input: 'grey',
+    verbose: 'cyan',
+    prompt: 'red',
+    info: 'green',
+    data: 'blue',
+    help: 'cyan',
+    warn: 'yellow',
+    debug: 'magenta',
+    error: 'red'
+});
+exports.GLog = null;
+class Log {
+    //default log
+    _logger = null;
+    //the log from client
+    _client_logger = null;
+    //error and warn
+    _errorLogger = null;
+    _inited = false;
+    init(cfg) {
+        if (this._inited) {
+            return;
+        }
+        this._inited = true;
+        colors.enable();
+        log4js.configure(cfg);
+        this._logger = log4js.getLogger(cfg.categories.default.appenders[0] || "log_date");
+        this._client_logger = log4js.getLogger(cfg.categories.default.appenders[1] || "client_log_date");
+        this._errorLogger = log4js.getLogger(cfg.categories.default.appenders[2] || "error_log_file");
+    }
+    error(message, ...optionalParams) {
+        if (Core_1.core.isObject(message)) {
+            message = JSON.stringify(message);
+        }
+        this._errorLogger.error(message);
+        var time = new Date();
+        var time_str = Core_1.core.format(time, "[YYYY-MM-DD HH:mm:SS.");
+        time_str += time.getMilliseconds() + "]";
+        console.error(time_str + " " + message);
+    }
+    info(message, to_console) {
+        if (Core_1.core.isObject(message)) {
+            message = JSON.stringify(message);
+        }
+        this._logger.info(message);
+        if (to_console) {
+            var time = new Date();
+            var time_str = Core_1.core.format(time, "[YYYY-MM-DD HH:mm:SS.");
+            time_str += time.getMilliseconds() + "]";
+            console.log(time_str + " " + message);
+        }
+    }
+    warn(message, ...optionalParams) {
+        if (Core_1.core.isObject(message)) {
+            message = JSON.stringify(message);
+        }
+        this._errorLogger.warn(message);
+    }
+    record(message, ...optionalParams) {
+        this.info(message, optionalParams);
+    }
+    clientLog(message, ...optionalParams) {
+        this._client_logger.error(message);
+    }
+}
+exports.GLog = new Log();
+//# sourceMappingURL=Log.js.map

package/lib/Framework/Logic/Log.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Log.js","sourceRoot":"","sources":["../../../Framework/Logic/Log.ts"],"names":[],"mappings":"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"}

package/lib/Framework/Service/AccountService.d.ts

@@ -0,0 +1,77 @@
+import { BaseModel, BaseService } from './../Database/BaseService';
+import { UserModel } from './UserService';
+import { EAccountFrom } from './ini';
+export declare class AccountModel extends BaseModel {
+    id: number;
+    phone: string;
+    email: string;
+    name: string;
+    password: string;
+    unionid: string;
+    openid: string;
+    create_time: number;
+    create_ip: string;
+    login_time: number;
+    login_ip: string;
+    from: number;
+    state: number;
+}
+export declare let GAccountSer: AccountService;
+export declare class AccountService extends BaseService<AccountModel> {
+    protected _account_cache_key_pre: string;
+    protected _account_cache_time_sec: number;
+    constructor();
+    protected _getNewModel(): AccountModel;
+    /**
+     * 注册新账号
+     * @param unionid
+     * @param openid
+     * @param ip
+     * @param from
+     */
+    add(unionid: string, openid: string, ip: string, from: EAccountFrom): Promise<AccountModel>;
+    /**
+     * 通过第三方信息获取账号
+     * @param unionid
+     * @param openid
+     */
+    getByThird(unionid: string, openid: string): Promise<AccountModel>;
+    /**
+     * 通过第三方信息获取账号
+     * @param unionid
+     */
+    getByUnionid(unionid: string): Promise<AccountModel>;
+    getByPhone(phone: string): Promise<AccountModel>;
+    /**
+     * 登陆接口
+     * @param unionid
+     * @param openid
+     * @param ip
+     * @param from
+     * @param access_token qq、wechat使用
+     */
+    login(unionid: string, openid: string, ip: string, from: EAccountFrom, access_token?: string, extra?: {
+        nickname: string;
+        sex: number;
+        logo: string;
+    }): Promise<{
+        errcode: any;
+        account: AccountModel;
+        is_new: boolean;
+    }>;
+    protected _login(unionid: string, openid: string, from: EAccountFrom): Promise<{
+        errcode: any;
+        account: AccountModel;
+    }>;
+    /**
+     * 修改密码
+     * @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: UserModel;
+        errcode: any;
+    }>;
+}

package/lib/Framework/Service/AccountService.js

@@ -0,0 +1,474 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AccountService = exports.GAccountSer = exports.AccountModel = void 0;
+const Property_1 = require("./../Database/Decorator/Property");
+const BaseService_1 = require("./../Database/BaseService");
+const CacheTool_1 = require("../Logic/CacheTool");
+const _error_1 = require("../Config/_error_");
+const OpenSocial_1 = require("../ThirdParty/OpenSocial");
+const UserService_1 = require("./UserService");
+const QQTool_1 = require("../ThirdParty/QQTool");
+const WechatTool_1 = require("../ThirdParty/WechatTool");
+const Table_1 = require("../Database/Decorator/Table");
+const PrimaryKey_1 = require("../Database/Decorator/PrimaryKey");
+const NotNull_1 = require("../Database/Decorator/NotNull");
+const Type_1 = require("../Database/Decorator/Type");
+const AutoIncrement_1 = require("../Database/Decorator/AutoIncrement");
+const ini_1 = require("./ini");
+let AccountModel = class AccountModel extends BaseService_1.BaseModel {
+    id = -1;
+    phone = "";
+    email = "";
+    name = "";
+    password = "";
+    unionid = ""; //第三方
+    openid = "";
+    create_time = -1;
+    create_ip = "";
+    login_time = -1;
+    login_ip = "";
+    from = 0;
+    state = 0;
+};
+__decorate([
+    (0, Type_1.Type)(Property_1.EPropertyType.Int),
+    NotNull_1.NotNull,
+    PrimaryKey_1.PrimaryKey,
+    AutoIncrement_1.AutoIncrement
+], AccountModel.prototype, "id", void 0);
+__decorate([
+    NotNull_1.NotNull,
+    (0, Type_1.Type)(Property_1.EPropertyType.Varchar)
+], AccountModel.prototype, "phone", void 0);
+__decorate([
+    NotNull_1.NotNull,
+    (0, Type_1.Type)(Property_1.EPropertyType.Varchar)
+], AccountModel.prototype, "email", void 0);
+__decorate([
+    NotNull_1.NotNull,
+    (0, Type_1.Type)(Property_1.EPropertyType.Varchar)
+], AccountModel.prototype, "name", void 0);
+__decorate([
+    NotNull_1.NotNull,
+    (0, Type_1.Type)(Property_1.EPropertyType.Varchar)
+], AccountModel.prototype, "password", void 0);
+__decorate([
+    NotNull_1.NotNull,
+    (0, Type_1.Type)(Property_1.EPropertyType.Varchar, "", 128)
+], AccountModel.prototype, "unionid", void 0);
+__decorate([
+    NotNull_1.NotNull,
+    (0, Type_1.Type)(Property_1.EPropertyType.Varchar, "", 128)
+], AccountModel.prototype, "openid", void 0);
+__decorate([
+    NotNull_1.NotNull,
+    (0, Type_1.Type)(Property_1.EPropertyType.BigInt)
+], AccountModel.prototype, "create_time", void 0);
+__decorate([
+    NotNull_1.NotNull,
+    (0, Type_1.Type)(Property_1.EPropertyType.Varchar)
+], AccountModel.prototype, "create_ip", void 0);
+__decorate([
+    NotNull_1.NotNull,
+    (0, Type_1.Type)(Property_1.EPropertyType.BigInt)
+], AccountModel.prototype, "login_time", void 0);
+__decorate([
+    NotNull_1.NotNull,
+    (0, Type_1.Type)(Property_1.EPropertyType.Varchar)
+], AccountModel.prototype, "login_ip", void 0);
+__decorate([
+    NotNull_1.NotNull,
+    (0, Type_1.Type)(Property_1.EPropertyType.Int)
+], AccountModel.prototype, "from", void 0);
+__decorate([
+    NotNull_1.NotNull,
+    (0, Type_1.Type)(Property_1.EPropertyType.Int)
+], AccountModel.prototype, "state", void 0);
+AccountModel = __decorate([
+    (0, Table_1.Table)("account", 1, "账号")
+], AccountModel);
+exports.AccountModel = AccountModel;
+//暂时不实例化，方便重写
+exports.GAccountSer = null;
+class AccountService extends BaseService_1.BaseService {
+    _account_cache_key_pre = "table_account_";
+    _account_cache_time_sec = 1 * 60 * 60 * 1000;
+    constructor() {
+        super(AccountModel);
+        exports.GAccountSer = this;
+    }
+    _getNewModel() {
+        return new AccountModel();
+    }
+    /**
+     * 注册新账号
+     * @param unionid
+     * @param openid
+     * @param ip
+     * @param from
+     */
+    async add(unionid, openid, ip, from) {
+        let account = this._getNewModel();
+        switch (from) {
+            case ini_1.EAccountFrom.OpenSocial:
+            case ini_1.EAccountFrom.WeChat:
+            case ini_1.EAccountFrom.QQ:
+            case ini_1.EAccountFrom.Apple:
+            case ini_1.EAccountFrom.Google:
+                {
+                    account.unionid = unionid;
+                    account.openid = openid;
+                    break;
+                }
+            case ini_1.EAccountFrom.Email:
+                {
+                    account.email = unionid;
+                    account.password = openid;
+                    break;
+                }
+            case ini_1.EAccountFrom.Phone:
+            case ini_1.EAccountFrom.QuickPhone:
+                {
+                    account.phone = unionid;
+                    account.password = openid;
+                    break;
+                }
+            case ini_1.EAccountFrom.Name:
+            case ini_1.EAccountFrom.Guest:
+                {
+                    account.name = unionid;
+                    account.password = openid;
+                    break;
+                }
+        }
+        account.create_time = Date.now();
+        account.create_ip = ip;
+        account.login_time = Date.now();
+        account.login_ip = ip;
+        account.from = from;
+        account.state = 1;
+        delete account.id;
+        let sr = await this.insert(account);
+        if (sr.error
+            || !sr.results.insertId) {
+            return null;
+        }
+        account.id = sr.results.insertId;
+        return account;
+    }
+    /**
+     * 通过第三方信息获取账号
+     * @param unionid
+     * @param openid
+     */
+    async getByThird(unionid, openid) {
+        let key = this._account_cache_key_pre + unionid;
+        let am = CacheTool_1.GCacheTool.get(key);
+        if (am) {
+            return am;
+        }
+        am = await this.get(null, "unionid=? and openid=?", [unionid, openid]);
+        if (am) {
+            CacheTool_1.GCacheTool.add(key, am, this._account_cache_time_sec);
+        }
+        return am;
+    }
+    /**
+     * 通过第三方信息获取账号
+     * @param unionid
+     */
+    async getByUnionid(unionid) {
+        let key = this._account_cache_key_pre + unionid;
+        let am = CacheTool_1.GCacheTool.get(key);
+        if (am) {
+            return am;
+        }
+        am = await this.get(null, "unionid=?", [unionid]);
+        if (am) {
+            CacheTool_1.GCacheTool.add(key, am, this._account_cache_time_sec);
+        }
+        return am;
+    }
+    async getByPhone(phone) {
+        let key = this._account_cache_key_pre + phone;
+        let am = CacheTool_1.GCacheTool.get(key);
+        if (am) {
+            return am;
+        }
+        am = await this.get(null, "phone=?", [phone]);
+        if (am) {
+            CacheTool_1.GCacheTool.add(key, am, this._account_cache_time_sec);
+        }
+        return am;
+    }
+    /**
+     * 登陆接口
+     * @param unionid
+     * @param openid
+     * @param ip
+     * @param from
+     * @param access_token qq、wechat使用
+     */
+    async login(unionid, openid, ip, from, access_token, extra) {
+        let rs = { errcode: null, account: null, is_new: false };
+        if (!unionid || !openid) {
+            rs.errcode = _error_1.EErrorCode.Wrong_Params;
+            return rs;
+        }
+        let login_rs = await this._login(unionid, openid, from);
+        rs.account = login_rs.account;
+        rs.errcode = login_rs.errcode;
+        if (rs.errcode) {
+            return rs;
+        }
+        let account = rs.account;
+        let extra_info = extra;
+        if (!account) {
+            switch (from) {
+                case ini_1.EAccountFrom.OpenSocial:
+                case ini_1.EAccountFrom.QQ:
+                case ini_1.EAccountFrom.WeChat:
+                case ini_1.EAccountFrom.Guest:
+                case ini_1.EAccountFrom.QuickPhone:
+                case ini_1.EAccountFrom.Apple:
+                case ini_1.EAccountFrom.Google:
+                    {
+                        account = await this.add(unionid, openid, ip, from);
+                        break;
+                    }
+                default:
+                    {
+                        rs.errcode = _error_1.EErrorCode.No_Account;
+                        return rs;
+                    }
+            }
+        }
+        if (!account) {
+            rs.errcode = _error_1.EErrorCode.No_Account;
+            return rs;
+        }
+        let user = await UserService_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) {
+                                let userInfo = await QQTool_1.GQQTool.getUserInfo(access_token, openid);
+                                if (userInfo.ret) {
+                                    rs.errcode = _error_1.EErrorCode.Server_Error;
+                                    return rs;
+                                }
+                                extra_info =
+                                    {
+                                        logo: userInfo.figureurl_qq,
+                                        sex: (userInfo.gender == "男" ? 1 : 0),
+                                        nickname: userInfo.nickname
+                                    };
+                            }
+                            else if (from == ini_1.EAccountFrom.WeChat) {
+                                let userInfo = await WechatTool_1.GWechatTool.getUserInfo(access_token, openid);
+                                if (userInfo.errcode) {
+                                    rs.errcode = _error_1.EErrorCode.Server_Error;
+                                    return rs;
+                                }
+                                extra_info =
+                                    {
+                                        logo: userInfo.headimgurl,
+                                        sex: (userInfo.sex == 1 ? 1 : 0),
+                                        nickname: userInfo.nickname
+                                    };
+                            }
+                            else if (from == ini_1.EAccountFrom.Apple || from == ini_1.EAccountFrom.Google) {
+                                extra_info =
+                                    {
+                                        logo: "32",
+                                        sex: 0,
+                                        nickname: "noname"
+                                    };
+                            }
+                        }
+                        let user = await UserService_1.GUserSer.add(account.id, extra_info.nickname, extra_info.sex, extra_info.logo);
+                        if (!user) {
+                            this.removeById(account.id);
+                            rs.errcode = _error_1.EErrorCode.User_Create_Failed;
+                            return rs;
+                        }
+                        break;
+                    }
+                case ini_1.EAccountFrom.QuickPhone:
+                case ini_1.EAccountFrom.Guest:
+                    {
+                        let user = null;
+                        if (extra_info) {
+                            user = await UserService_1.GUserSer.add(account.id, extra_info.nickname, extra_info.sex, extra_info.logo);
+                        }
+                        else {
+                            user = await UserService_1.GUserSer.add(account.id, null, null, null);
+                        }
+                        if (!user) {
+                            this.removeById(account.id);
+                            rs.errcode = _error_1.EErrorCode.User_Create_Failed;
+                            return rs;
+                        }
+                        break;
+                    }
+                default:
+                    {
+                        rs.errcode = _error_1.EErrorCode.No_Account;
+                        return rs;
+                    }
+            }
+            rs.is_new = true;
+            if (extra) {
+                await UserService_1.GUserSer.updateBaseInfoByAccount(account.id, extra_info.nickname, extra_info.sex, extra_info.logo);
+            }
+        }
+        if (user && extra_info) {
+            await UserService_1.GUserSer.updateProperty("nickname=?,sex=?,logo=?", "id=?", [extra_info.nickname, extra_info.sex || 0, extra_info.logo, user.id]);
+        }
+        rs.account = account;
+        return rs;
+    }
+    async _login(unionid, openid, from) {
+        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);
+        }
+        else if (from == ini_1.EAccountFrom.QuickPhone) {
+            let key = "phone_code_" + unionid;
+            let code = CacheTool_1.GCacheTool.get(key);
+            if (!code || code != openid) {
+                rs.errcode = _error_1.EErrorCode.Wrong_Phone_Code;
+                return rs;
+            }
+            rs.account = await this.getByPhone(unionid);
+        }
+        else if (from == ini_1.EAccountFrom.Phone) {
+            rs.account = await this.get(null, "phone=? and password=?", [unionid, openid]);
+            if (!rs.account) {
+                rs.errcode = _error_1.EErrorCode.Login_Failed;
+            }
+        }
+        else if (from == ini_1.EAccountFrom.Email) {
+            rs.account = await this.get(null, "email=? and password=?", [unionid, openid]);
+            if (!rs.account) {
+                rs.errcode = _error_1.EErrorCode.Login_Failed;
+            }
+        }
+        else if (from == ini_1.EAccountFrom.Name || from == ini_1.EAccountFrom.Guest) {
+            rs.account = await this.get(null, "name=? and password=?", [unionid, openid]);
+            if (!rs.account && from == ini_1.EAccountFrom.Name) {
+                rs.errcode = _error_1.EErrorCode.Login_Failed;
+            }
+        }
+        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 || {};
+        let am = this._getNewModel();
+        switch (type) {
+            case ini_1.EAccountFrom.Phone:
+                {
+                    am.phone = key;
+                    let temp = await this.get("id", "phone=?", [key]);
+                    if (temp) {
+                        rs.errcode = _error_1.EErrorCode.Account_Phone_Exist;
+                        return rs;
+                    }
+                    break;
+                }
+            case ini_1.EAccountFrom.Email:
+                {
+                    am.email = key;
+                    let temp = await this.get("id", "email=?", [key]);
+                    if (temp) {
+                        rs.errcode = _error_1.EErrorCode.Account_Email_Exist;
+                        return rs;
+                    }
+                    break;
+                }
+            case ini_1.EAccountFrom.Name:
+                {
+                    am.name = key;
+                    let temp = await this.get("id", "name=?", [key]);
+                    if (temp) {
+                        rs.errcode = _error_1.EErrorCode.Account_Name_Exist;
+                        return rs;
+                    }
+                    break;
+                }
+            default:
+                {
+                    rs.errcode = _error_1.EErrorCode.Account_Type_Error;
+                    return rs;
+                }
+        }
+        am.password = password;
+        am.create_time = Date.now();
+        am.create_ip = ip;
+        am.login_time = Date.now();
+        am.login_ip = ip;
+        let sr = await this.insert(am);
+        if (sr.results.insertId) {
+            am.id = sr.results.insertId;
+        }
+        else {
+            am = null;
+        }
+        if (!am) {
+            rs.errcode = _error_1.EErrorCode.Mysql_Error;
+            return rs;
+        }
+        let user = await UserService_1.GUserSer.add(am.id, extra.nickname, extra.sex, extra.logo);
+        if (!user) {
+            this.removeById(am.id);
+            rs.errcode = _error_1.EErrorCode.User_Create_Failed;
+            return rs;
+        }
+        rs.user = user;
+        return rs;
+    }
+}
+exports.AccountService = AccountService;
+//# sourceMappingURL=AccountService.js.map

package/lib/Framework/Service/AccountService.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"AccountService.js","sourceRoot":"","sources":["../../../Framework/Service/AccountService.ts"],"names":[],"mappings":"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"}