cgserver 7.8.2113 → 7.9.2113

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

@@ -0,0 +1,140 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GLog = void 0;
+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;
+    /**
+     * 该level只是用来控制控制台的显示的
+     * -1不输出到console，0，仅错误信息输出到console，1，都输出到console
+     */
+    _console_level = 0;
+    init(cfg, console_level = 0) {
+        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");
+        this._console_level = console_level;
+    }
+    error(message) {
+        if (this._isObject(message)) {
+            if (message.stack) {
+                message = message.stack;
+            }
+            else {
+                message = JSON.stringify(message);
+            }
+        }
+        this._errorLogger?.error(message);
+        if (this._console_level >= 0) {
+            let time_str = this._getTimeStr();
+            console.error(time_str + " " + message);
+        }
+    }
+    info(message) {
+        if (this._isObject(message)) {
+            message = JSON.stringify(message);
+        }
+        this._logger?.info(message);
+        if (this._console_level >= 0) {
+            let time_str = this._getTimeStr();
+            console.log(time_str + " " + message);
+        }
+    }
+    warn(message) {
+        if (this._isObject(message)) {
+            message = JSON.stringify(message);
+        }
+        this._errorLogger?.warn(message);
+        if (this._console_level >= 0) {
+            let time_str = this._getTimeStr();
+            console.error(time_str + " " + message);
+        }
+    }
+    record(message) {
+        this.info(message);
+    }
+    clientLog(message) {
+        this._client_logger?.error(message);
+    }
+    _getTimeStr() {
+        let time = new Date();
+        let time_str = this._format(time, "[YYYY-MM-DD HH:mm:SS.");
+        time_str += time.getMilliseconds() + "]";
+        return time_str;
+    }
+    _isObject(param) {
+        return typeof (param) === "object";
+    }
+    _isString(param) {
+        return typeof (param) === "string";
+    }
+    _isNumber(param) {
+        return typeof (param) === "number";
+    }
+    _format(src, formatStr) {
+        if (this._isString(src)) {
+            let args = Array.prototype.slice.call(arguments, 1);
+            return src.replace(/\{(\d+)\}/g, function (m, i) {
+                return args[i];
+            });
+        }
+        else {
+            if (this._isNumber(src)) {
+                src = new Date(src);
+            }
+            let str = formatStr;
+            let Week = ['日', '一', '二', '三', '四', '五', '六'];
+            let month = src.getMonth() + 1;
+            let year = src.getFullYear();
+            let date = src.getDate();
+            let hour = src.getHours();
+            let min = src.getMinutes();
+            let sec = src.getSeconds();
+            let day = src.getDay();
+            str = str.replace(/yyyy|YYYY/, year);
+            str = str.replace(/yy|YY/, (year % 100) > 9 ? (year % 100).toString() : '0' + (year % 100));
+            str = str.replace(/MM/, month > 9 ? month.toString() : '0' + month);
+            str = str.replace(/M/g, month);
+            str = str.replace(/w|W/g, Week[day]);
+            str = str.replace(/dd|DD/, date > 9 ? date.toString() : '0' + date);
+            str = str.replace(/d|D/g, date);
+            str = str.replace(/hh|HH/, hour > 9 ? hour.toString() : '0' + hour);
+            str = str.replace(/h|H/g, hour);
+            str = str.replace(/mm/, min > 9 ? min.toString() : '0' + min);
+            str = str.replace(/m/g, min);
+            str = str.replace(/ss|SS/, sec > 9 ? sec.toString() : '0' + sec);
+            str = str.replace(/s|S/g, sec);
+            return str;
+        }
+    }
+}
+exports.GLog = new Log();

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

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

package/dist/lib/Framework/Logic/SyncQueueTool.js

@@ -0,0 +1,43 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GSyncQueueTool = void 0;
+const Core_1 = require("../Core/Core");
+class SyncQueueItem {
+    key = "";
+    running = false;
+    funcs = [];
+    constructor(key) {
+        this.key = key;
+    }
+    async add(func, thisArg = null, ...params) {
+        return new Promise((resolve, reject) => {
+            this.funcs.push({ func: func, thisArg: thisArg, params: params, resolve: resolve });
+            this._run();
+        });
+    }
+    async _run() {
+        if (this.running) {
+            return;
+        }
+        this.running = true;
+        while (this.funcs.length > 0) {
+            let funcitem = this.funcs.shift();
+            if (!funcitem.func) {
+                continue;
+            }
+            let rs = await Core_1.core.safeCall(funcitem.func, funcitem.thisArg, ...funcitem.params);
+            await Core_1.core.safeCall(funcitem.resolve, null, rs);
+        }
+        this.running = false;
+    }
+}
+class SyncQueueTool {
+    //队列数据,一个key队列必须有先后
+    _queues = {};
+    async add(key, func, thisArg = null, ...params) {
+        this._queues[key] = this._queues[key] || new SyncQueueItem(key);
+        let error = await this._queues[key].add(func, thisArg, ...params);
+        return error;
+    }
+}
+exports.GSyncQueueTool = new SyncQueueTool();

package/dist/lib/Framework/Logic/SyncQueueTool.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"SyncQueueTool.js","sourceRoot":"","sources":["../../../../src/Framework/Logic/SyncQueueTool.ts"],"names":[],"mappings":";;;AAAA,uCAAmC;AAEnC,MAAM,aAAa;IAEf,GAAG,GAAC,EAAE,CAAA;IACN,OAAO,GAAC,KAAK,CAAA;IACb,KAAK,GAA8D,EAAE,CAAA;IACrE,YAAY,GAAU;QAElB,IAAI,CAAC,GAAG,GAAC,GAAG,CAAA;IAChB,CAAC;IACD,KAAK,CAAC,GAAG,CAAC,IAAa,EAAC,UAAY,IAAI,EAAC,GAAG,MAAM;QAE9C,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAC,MAAM,EAAC,EAAE;YAEjC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAC,IAAI,EAAC,IAAI,EAAC,OAAO,EAAC,OAAO,EAAC,MAAM,EAAC,MAAM,EAAC,OAAO,EAAC,OAAO,EAAC,CAAC,CAAA;YAC1E,IAAI,CAAC,IAAI,EAAE,CAAA;QACf,CAAC,CAAC,CAAA;IACN,CAAC;IACS,KAAK,CAAC,IAAI;QAEhB,IAAG,IAAI,CAAC,OAAO,EACf;YACI,OAAM;SACT;QACD,IAAI,CAAC,OAAO,GAAC,IAAI,CAAA;QACjB,OAAM,IAAI,CAAC,KAAK,CAAC,MAAM,GAAC,CAAC,EACzB;YACI,IAAI,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAA;YACjC,IAAG,CAAC,QAAQ,CAAC,IAAI,EACjB;gBACI,SAAQ;aACX;YACD,IAAI,EAAE,GAAG,MAAM,WAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,EAAC,QAAQ,CAAC,OAAO,EAAC,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAA;YAC/E,MAAM,WAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,OAAO,EAAC,IAAI,EAAC,EAAE,CAAC,CAAA;SAChD;QACD,IAAI,CAAC,OAAO,GAAC,KAAK,CAAA;IACtB,CAAC;CACJ;AACD,MAAM,aAAa;IAEf,mBAAmB;IACT,OAAO,GAA8B,EAAE,CAAA;IACjD,KAAK,CAAC,GAAG,CAAC,GAAU,EAAC,IAAa,EAAC,UAAY,IAAI,EAAC,GAAG,MAAM;QAEzD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAE,IAAI,aAAa,CAAC,GAAG,CAAC,CAAA;QAC3D,IAAI,KAAK,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,IAAI,EAAC,OAAO,EAAC,GAAG,MAAM,CAAC,CAAA;QAC/D,OAAO,KAAK,CAAA;IAChB,CAAC;CACJ;AACU,QAAA,cAAc,GAAC,IAAI,aAAa,EAAE,CAAA"}

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

@@ -0,0 +1,473 @@
+"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 MysqlBaseService_1 = require("../Database/MysqlBaseService");
+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 MysqlBaseService_1.BaseModel {
+    id = -1;
+    phone = "";
+    email = "";
+    name = "";
+    password = "";
+    unionid = ""; //第三方
+    openid = "";
+    create_time = -1;
+    create_ip = "";
+    login_time = -1;
+    login_ip = "";
+    from = 0;
+    state = ini_1.EAccountState.Waitting;
+};
+__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 MysqlBaseService_1.MysqlBaseService {
+    _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 = ini_1.EAccountState.Waitting;
+        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;