cgserver 8.2.2545 → 8.3.4

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

@@ -42,12 +42,9 @@ class UserService extends MongoBaseService_1.MongoBaseService {
         super("user", type);
         exports.GUserSer = this;
     }
-    _newUserModel() {
-        return (new MongoUserModel());
-    }
     async _createNewUser(account_id, nickname, sex, logo, group) {
         group = group || ini_1.ERoleGroup.Common;
-        let um = this._newUserModel();
+        let um = new this._t_type();
         um.account_id = account_id;
         um.nickname = nickname;
         if (!um.nickname || um.nickname.length == 0) {

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

@@ -24,8 +24,6 @@ class MysqlUserModel extends MysqlBaseService_1.BaseModel {
     role_group = 4;
     role = 0;
     phone = "";
-    wechat = "";
-    qq = "";
     email = "";
     about = "";
     pre_user_id = -1;
@@ -73,14 +71,6 @@ __decorate([
     NotNull_1.NotNull,
     (0, Type_1.Type)(Property_1.EPropertyType.Varchar, "")
 ], MysqlUserModel.prototype, "phone", void 0);
-__decorate([
-    NotNull_1.NotNull,
-    (0, Type_1.Type)(Property_1.EPropertyType.Varchar, "")
-], MysqlUserModel.prototype, "wechat", void 0);
-__decorate([
-    NotNull_1.NotNull,
-    (0, Type_1.Type)(Property_1.EPropertyType.Varchar, "")
-], MysqlUserModel.prototype, "qq", void 0);
 __decorate([
     NotNull_1.NotNull,
     (0, Type_1.Type)(Property_1.EPropertyType.Varchar, "")
@@ -125,12 +115,9 @@ class MysqlUserService extends MysqlBaseService_1.MysqlBaseService {
         super(type);
         exports.GUserSer = this;
     }
-    _newUserModel() {
-        return (new MysqlUserModel());
-    }
     async _createNewUser(account_id, nickname, sex, logo, group) {
         group = group || ini_1.ERoleGroup.Common;
-        let um = this._newUserModel();
+        let um = new this._t_type();
         um.account_id = account_id;
         um.nickname = nickname;
         if (!um.nickname || um.nickname.length == 0) {

package/dist/lib/Framework/WebServer/Decorator/SyncCall.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SyncCall = void 0;
+exports.SyncCall2 = exports.SyncCall = void 0;
 const SyncQueueTool_1 = require("../../Logic/SyncQueueTool");
 /**
  * 异步函数变为同步函数，当前进程有效
@@ -19,3 +19,23 @@ function SyncCall(target, propertyName, descriptor) {
     };
 }
 exports.SyncCall = SyncCall;
+/**
+ * 异步函数变为同步函数，当前进程有效
+ * @param param_index 动态参数的索引
+ */
+function SyncCall2(param_index) {
+    return (target, propertyName, descriptor) => {
+        let method = descriptor.value;
+        descriptor.value = function () {
+            let key = propertyName;
+            if (param_index != undefined && param_index < arguments.length) {
+                key = propertyName + "_" + arguments[param_index];
+            }
+            let ret = SyncQueueTool_1.GSyncQueueTool.add(key, async () => {
+                return await method.apply(target, arguments);
+            });
+            return ret;
+        };
+    };
+}
+exports.SyncCall2 = SyncCall2;

package/dist/lib/Framework/WebServer/Decorator/SyncCallServer.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SyncCallServer = void 0;
+exports.SyncCallServer2 = exports.SyncCallServer = void 0;
 const Core_1 = require("../../Core/Core");
 const SyncQueueTool_1 = require("../../Logic/SyncQueueTool");
 const MongoCacheService_1 = require("../../Service/MongoCacheService");
@@ -10,11 +10,47 @@ const MongoCacheService_1 = require("../../Service/MongoCacheService");
  * 只支持mongo模式
  * @returns
  */
-let SyncCallServer = function () {
+function SyncCallServer(target, propertyName, descriptor) {
+    let method = descriptor.value;
+    descriptor.value = async () => {
+        let key = "sync_" + method.name;
+        let func = async () => {
+            let item = await MongoCacheService_1.GMongoCacheSer.getData(key);
+            let ret = null;
+            while (item) {
+                await Core_1.core.sleep(200);
+                item = await MongoCacheService_1.GMongoCacheSer.getData(key);
+            }
+            //10秒后过期，避免卡死
+            let mcm = await MongoCacheService_1.GMongoCacheSer.addData(key, true, Date.now() + 10 * 1000);
+            if (!mcm) {
+                await func();
+            }
+            return;
+        };
+        await func();
+        let ret = SyncQueueTool_1.GSyncQueueTool.add(method.name, async () => {
+            return await method.apply(self, arguments);
+        });
+        await MongoCacheService_1.GMongoCacheSer.deleteOne({ key });
+        return ret;
+    };
+}
+exports.SyncCallServer = SyncCallServer;
+/**
+ * 异步函数变为同步函数
+ * 服务器间的异步，效率低
+ * 只支持mongo模式
+ * @returns
+ */
+let SyncCallServer2 = function (params_index) {
     return function (target, propertyName, descriptor) {
         let method = descriptor.value;
         descriptor.value = async () => {
             let key = "sync_" + method.name;
+            if (params_index != undefined && params_index < arguments.length) {
+                key = key + "_" + arguments[params_index];
+            }
             let func = async () => {
                 let item = await MongoCacheService_1.GMongoCacheSer.getData(key);
                 let ret = null;
@@ -38,4 +74,4 @@ let SyncCallServer = function () {
         };
     };
 };
-exports.SyncCallServer = SyncCallServer;
+exports.SyncCallServer2 = SyncCallServer2;

package/dist/lib/Framework/cgserver.js

@@ -24,6 +24,12 @@ class CgServer {
     }
     init() {
         process.on("uncaughtException", this.onUnCaughtException.bind(this));
+        process.on("exit", this.onExit.bind(this));
+        //ctrl+c
+        process.on("SIGINT", this.onExit.bind(this));
+        //kill pid
+        process.on("SIGUSR1", this.onExit.bind(this));
+        process.on("SIGUSR2", this.onExit.bind(this));
         process.env.TZ = "Asia/Shanghai";
         EventTool_1.GEventTool.on("socket_server_init_done", this.onStart.bind(this));
         EventTool_1.GEventTool.on("web_server_init_done", this.onStart.bind(this));
@@ -58,6 +64,20 @@ class CgServer {
             Core_1.core.safeCall(events[i]);
         }
     }
+    async onExit() {
+        let events = this._events["exit"] || [];
+        let exit = true;
+        for (let i = 0; i < events.length; ++i) {
+            //只要有一个函数返回true，就不退出
+            let ret = await Core_1.core.safeCall(events[i]);
+            if (ret === true) {
+                exit = false;
+            }
+        }
+        if (exit) {
+            process.exit(0);
+        }
+    }
     addListener(event, func) {
         this._events[event] = this._events[event] || [];
         this._events[event].push(func);
@@ -76,6 +96,10 @@ class CgServer {
     }
     onUnCaughtException(e) {
         Log_1.GLog.error(e.stack);
+        let events = this._events["uncaughtexception"] || [];
+        for (let i = 0; i < events.length; ++i) {
+            Core_1.core.safeCall(events[i]);
+        }
     }
     addWebServer(server) {
         this._webservers.push(server);

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

@@ -28,7 +28,6 @@ export declare class UserService<T extends MongoUserModel> extends MongoBaseServ
     constructor(type: {
         new (): T;
     });
-    protected _newUserModel(): T;
     protected _createNewUser(account_id: number, nickname: string, sex: number, logo: string, group?: ERoleGroup): Promise<T>;
     add(account_id: number, nickname: string, sex: number, logo: string, group?: ERoleGroup): Promise<T>;
     getByAccountId(account_id: number): Promise<T>;

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

@@ -10,8 +10,6 @@ export declare class MysqlUserModel extends BaseModel {
     role_group: number;
     role: number;
     phone: string;
-    wechat: string;
-    qq: string;
     email: string;
     about: string;
     pre_user_id: number;
@@ -27,7 +25,6 @@ export declare class MysqlUserService<T extends MysqlUserModel> extends MysqlBas
     constructor(type: {
         new (): T;
     });
-    protected _newUserModel(): T;
     protected _createNewUser(account_id: number, nickname: string, sex: number, logo: string, group?: ERoleGroup): Promise<T>;
     updateBaseInfoByAccount(account_id: number, nickname: string, sex: number, logo: string): Promise<string>;
     add(account_id: number, nickname: string, sex: number, logo: string, group?: ERoleGroup): Promise<any>;

package/dist/types/Framework/WebServer/Decorator/SyncCall.d.ts

@@ -5,3 +5,8 @@
  * @param descriptor
  */
 export declare function SyncCall(target: any, propertyName: string, descriptor: TypedPropertyDescriptor<Function>): void;
+/**
+ * 异步函数变为同步函数，当前进程有效
+ * @param param_index 动态参数的索引
+ */
+export declare function SyncCall2(param_index?: number): (target: any, propertyName: string, descriptor: TypedPropertyDescriptor<Function>) => void;

package/dist/types/Framework/WebServer/Decorator/SyncCallServer.d.ts

@@ -4,4 +4,11 @@
  * 只支持mongo模式
  * @returns
  */
-export declare let SyncCallServer: () => (target: any, propertyName: string, descriptor: TypedPropertyDescriptor<Function>) => void;
+export declare function SyncCallServer(target: any, propertyName: string, descriptor: TypedPropertyDescriptor<Function>): void;
+/**
+ * 异步函数变为同步函数
+ * 服务器间的异步，效率低
+ * 只支持mongo模式
+ * @returns
+ */
+export declare let SyncCallServer2: (params_index?: number) => (target: any, propertyName: string, descriptor: TypedPropertyDescriptor<Function>) => void;

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

@@ -14,8 +14,9 @@ declare class CgServer {
     init(): void;
     protected _done: number;
     onStart(): void;
-    addListener(event: "start", func: () => void): void;
-    removeListener(event: "start", func: () => void): boolean;
+    onExit(): Promise<void>;
+    addListener(event: "start" | "exit" | "uncaughtexception", func: () => void): void;
+    removeListener(event: "start" | "exit" | "uncaughtexception", func: () => void): boolean;
     onUnCaughtException(e: any): void;
     addWebServer(server: IWebServer): void;
     addSocketServer(server: ISocketServer): void;

package/package.json

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

package/debug.log

@@ -1,8 +0,0 @@
-[0704/133635.639:ERROR:registration_protocol_win.cc(107)] CreateFile: ϵͳ�Ҳ���ָ�����ļ��� (0x2)
-[0704/133639.210:ERROR:registration_protocol_win.cc(107)] CreateFile: ϵͳ�Ҳ���ָ�����ļ��� (0x2)
-[0704/133639.327:ERROR:registration_protocol_win.cc(107)] CreateFile: ϵͳ�Ҳ���ָ�����ļ��� (0x2)
-[0705/134804.446:ERROR:registration_protocol_win.cc(107)] CreateFile: ϵͳ�Ҳ���ָ�����ļ��� (0x2)
-[0705/134805.911:ERROR:registration_protocol_win.cc(107)] CreateFile: ϵͳ�Ҳ���ָ�����ļ��� (0x2)
-[0705/134805.944:ERROR:registration_protocol_win.cc(107)] CreateFile: ϵͳ�Ҳ���ָ�����ļ��� (0x2)
-[0705/155200.976:ERROR:registration_protocol_win.cc(107)] CreateFile: ϵͳ�Ҳ���ָ�����ļ��� (0x2)
-[0705/155201.034:ERROR:registration_protocol_win.cc(107)] CreateFile: ϵͳ�Ҳ���ָ�����ļ��� (0x2)

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

@@ -1,473 +0,0 @@
-"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;

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

@@ -1,184 +0,0 @@
-"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.UserService = exports.GUserSer = exports.UserModel = void 0;
-const _ = require("underscore");
-const MysqlBaseService_1 = require("../Database/MysqlBaseService");
-const PrimaryKey_1 = require("../Database/Decorator/PrimaryKey");
-const NotNull_1 = require("../Database/Decorator/NotNull");
-const Property_1 = require("../Database/Decorator/Property");
-const Type_1 = require("../Database/Decorator/Type");
-const ini_1 = require("./ini");
-class UserModel extends MysqlBaseService_1.BaseModel {
-    id = -1;
-    account_id = -1;
-    nickname = "";
-    sex = -1;
-    logo = "";
-    state = ini_1.EUserState.Waitting;
-    role_group = 4;
-    role = 0;
-    phone = "";
-    wechat = "";
-    qq = "";
-    email = "";
-    about = "";
-    pre_user_id = -1;
-    exp = 0;
-    level = 1; //等级
-    vip_exp = 0;
-    vip_level = 0; //等级
-    is_robot = 0;
-    create_time = 0;
-}
-__decorate([
-    (0, Type_1.Type)(Property_1.EPropertyType.Int),
-    NotNull_1.NotNull,
-    PrimaryKey_1.PrimaryKey
-], UserModel.prototype, "id", void 0);
-__decorate([
-    NotNull_1.NotNull,
-    (0, Type_1.Type)(Property_1.EPropertyType.Int, -1)
-], UserModel.prototype, "account_id", void 0);
-__decorate([
-    NotNull_1.NotNull,
-    (0, Type_1.Type)(Property_1.EPropertyType.Varchar, "noname", 32)
-], UserModel.prototype, "nickname", void 0);
-__decorate([
-    NotNull_1.NotNull,
-    (0, Type_1.Type)(Property_1.EPropertyType.SmallInt, 0)
-], UserModel.prototype, "sex", void 0);
-__decorate([
-    NotNull_1.NotNull,
-    (0, Type_1.Type)(Property_1.EPropertyType.Varchar, "", 255)
-], UserModel.prototype, "logo", void 0);
-__decorate([
-    NotNull_1.NotNull,
-    (0, Type_1.Type)(Property_1.EPropertyType.Int, 0)
-], UserModel.prototype, "state", void 0);
-__decorate([
-    NotNull_1.NotNull,
-    (0, Type_1.Type)(Property_1.EPropertyType.Int, 4)
-], UserModel.prototype, "role_group", void 0);
-__decorate([
-    NotNull_1.NotNull,
-    (0, Type_1.Type)(Property_1.EPropertyType.Int, 0)
-], UserModel.prototype, "role", void 0);
-__decorate([
-    NotNull_1.NotNull,
-    (0, Type_1.Type)(Property_1.EPropertyType.Varchar, "")
-], UserModel.prototype, "phone", void 0);
-__decorate([
-    NotNull_1.NotNull,
-    (0, Type_1.Type)(Property_1.EPropertyType.Varchar, "")
-], UserModel.prototype, "wechat", void 0);
-__decorate([
-    NotNull_1.NotNull,
-    (0, Type_1.Type)(Property_1.EPropertyType.Varchar, "")
-], UserModel.prototype, "qq", void 0);
-__decorate([
-    NotNull_1.NotNull,
-    (0, Type_1.Type)(Property_1.EPropertyType.Varchar, "")
-], UserModel.prototype, "email", void 0);
-__decorate([
-    NotNull_1.NotNull,
-    (0, Type_1.Type)(Property_1.EPropertyType.Varchar, "", 512)
-], UserModel.prototype, "about", void 0);
-__decorate([
-    NotNull_1.NotNull,
-    (0, Type_1.Type)(Property_1.EPropertyType.Int, -1)
-], UserModel.prototype, "pre_user_id", void 0);
-__decorate([
-    NotNull_1.NotNull,
-    (0, Type_1.Type)(Property_1.EPropertyType.Int, 0)
-], UserModel.prototype, "exp", void 0);
-__decorate([
-    NotNull_1.NotNull,
-    (0, Type_1.Type)(Property_1.EPropertyType.Int, 1)
-], UserModel.prototype, "level", void 0);
-__decorate([
-    NotNull_1.NotNull,
-    (0, Type_1.Type)(Property_1.EPropertyType.Int, 0)
-], UserModel.prototype, "vip_exp", void 0);
-__decorate([
-    NotNull_1.NotNull,
-    (0, Type_1.Type)(Property_1.EPropertyType.Int, 0)
-], UserModel.prototype, "vip_level", void 0);
-__decorate([
-    NotNull_1.NotNull,
-    (0, Type_1.Type)(Property_1.EPropertyType.TinyInt, 0)
-], UserModel.prototype, "is_robot", void 0);
-__decorate([
-    NotNull_1.NotNull,
-    (0, Type_1.Type)(Property_1.EPropertyType.BigInt, 0)
-], UserModel.prototype, "create_time", void 0);
-exports.UserModel = UserModel;
-//暂时不实例化，方便重写
-exports.GUserSer = null;
-class UserService extends MysqlBaseService_1.MysqlBaseService {
-    constructor(type) {
-        super(type);
-        exports.GUserSer = this;
-    }
-    _newUserModel() {
-        return (new UserModel());
-    }
-    async _createNewUser(account_id, nickname, sex, logo, group) {
-        group = group || ini_1.ERoleGroup.Common;
-        let um = this._newUserModel();
-        um.account_id = account_id;
-        um.nickname = nickname;
-        if (!um.nickname || um.nickname.length == 0) {
-            um.nickname = "noname";
-        }
-        um.sex = sex || 0;
-        um.logo = logo || "";
-        um.account_id = account_id;
-        um.state = ini_1.EUserState.Waitting;
-        um.role_group = group;
-        um.role = 0;
-        //随机userid
-        let id = 0;
-        do {
-            id = _.random(1000000, 9999999);
-            let p = await this.get("id", "id=?", [id]);
-            if (!p) {
-                break;
-            }
-        } while (true);
-        um.id = id;
-        return um;
-    }
-    async updateBaseInfoByAccount(account_id, nickname, sex, logo) {
-        let sr = await this.updateProperty("nickname=?,sex=?,logo=?", "account_id=?", [nickname, sex, logo, account_id]);
-        if (sr.error && sr.results.affectedRows <= 0) {
-            return "更新失败";
-        }
-        return;
-    }
-    async add(account_id, nickname, sex, logo, group) {
-        let um = await this._createNewUser(account_id, nickname, sex, logo, group);
-        let sr = await this.insert(um);
-        if (sr.error || sr.results.length <= 0) {
-            return null;
-        }
-        return um;
-    }
-    async updateRoleGroup(user_id, role_group) {
-        let sr = await this.updateProperty("role_group=?", "id=?", [role_group, user_id]);
-        if (sr.error && sr.results.affectedRows <= 0) {
-            return "更新失败";
-        }
-        return;
-    }
-    async getByAccountId(account_id) {
-        let pm = await this.get(null, "account_id=?", [account_id]);
-        return pm;
-    }
-}
-exports.UserService = UserService;

package/dist/lib/Framework/WebServer/Controller/BaseUserController.js

@@ -1,169 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.BaseUserController = void 0;
-const BaseController_1 = require("./BaseController");
-const UserService_1 = require("../../Service/UserService");
-const CacheTool_1 = require("../../Logic/CacheTool");
-const FrameworkConfig_1 = require("../../Config/FrameworkConfig");
-const RedisManager_1 = require("../../Database/RedisManager");
-const MongoCacheService_1 = require("../../Service/MongoCacheService");
-const ini_1 = require("../../Service/ini");
-class BaseUserController extends BaseController_1.BaseController {
-    _user_session_id = "user_session_id";
-    _self_user = null;
-    _user = null; //网页内容的所属，比如，查看别人的博客，那这个信息就是作者的
-    _session_id = null;
-    get selfUser() {
-        return this._self_user;
-    }
-    get isSelf() {
-        return this._self_user && (this._self_user.id == this._user.id);
-    }
-    get isLogin() {
-        return this._self_user && true;
-    }
-    get isCreator() {
-        return this._self_user && (this._self_user.role_group == ini_1.ERoleGroup.Creator);
-    }
-    get isAdmin() {
-        return this._self_user && (this._self_user.role_group == ini_1.ERoleGroup.Admin || this._self_user.role_group == ini_1.ERoleGroup.Creator);
-    }
-    get isProxy() {
-        return this._self_user && (this._self_user.role_group == ini_1.ERoleGroup.Proxy);
-    }
-    get isCommon() {
-        return this._self_user && (this._self_user.role_group == ini_1.ERoleGroup.Common);
-    }
-    async init() {
-        this._engine.cfg.session_type = this._engine.cfg.session_type || FrameworkConfig_1.ESessionType.Cache;
-        this._session_id = this._request.getCookie(this._user_session_id) || this._request.params.session_id || this._request.postData.session_id;
-        let userId = -1;
-        if (this._session_id) {
-            let user = await this._getUserBySession(this._session_id);
-            if (!user) {
-                this._update_session();
-                //Session不存在清除客户端cookie
-                this._response.clearCookie(this._user_session_id);
-            }
-            else {
-                this._login(user);
-                userId = user.id;
-            }
-        }
-        let params = this._request.params;
-        if (params.userId && params.userId != userId + "") {
-            this._user = (await UserService_1.GUserSer.getById(params.userId));
-        }
-        else {
-            //不是别人的信息就查看自己的
-            this._user = this._self_user;
-        }
-    }
-    async _getUserBySession(session) {
-        let user = null;
-        if (!session) {
-            return user;
-        }
-        //每次强制从cache中先找，提高效率
-        //if(this._engine.cfg.session_type==ESessionType.Cache)
-        {
-            user = CacheTool_1.GCacheTool.get(this._session_id);
-        }
-        if (user) {
-            return user;
-        }
-        if (this._engine.cfg.session_type == FrameworkConfig_1.ESessionType.Redis) {
-            let user_id = parseInt((await RedisManager_1.GRedisMgr.get(this._session_id)) || "-1");
-            if (user_id > 0) {
-                user = (await UserService_1.GUserSer.getById(user_id));
-            }
-        }
-        else if (this._engine.cfg.session_type == FrameworkConfig_1.ESessionType.Mongo) {
-            let user_id = (await MongoCacheService_1.GMongoCacheSer.getData(this._session_id)) || -1;
-            if (user_id > 0) {
-                user = (await UserService_1.GUserSer.getById(user_id));
-            }
-        }
-        if (user) {
-            this._login(user);
-        }
-        return user;
-    }
-    _logout() {
-        if (this._session_id) {
-            if (this._engine.cfg.session_type == FrameworkConfig_1.ESessionType.Cache) {
-                CacheTool_1.GCacheTool.remove(this._session_id);
-            }
-            else if (this._engine.cfg.session_type == FrameworkConfig_1.ESessionType.Redis) {
-                RedisManager_1.GRedisMgr.del(this._session_id);
-            }
-            else if (this._engine.cfg.session_type == FrameworkConfig_1.ESessionType.Mongo) {
-                MongoCacheService_1.GMongoCacheSer.deleteOne({ key: this._session_id });
-            }
-            this._session_id = null;
-        }
-        this._response.clearCookie(this._user_session_id);
-    }
-    _login(user) {
-        if (!user) {
-            return;
-        }
-        if (!this._session_id) {
-            this._session_id = Math.random().toString(36).substring(2) + user.id;
-        }
-        let time = 0;
-        if (this._request.postData.remember == "on") {
-            time = this._engine.cfg.cookie.expires.account_remember;
-        }
-        else {
-            time = this._engine.cfg.cookie.expires.account;
-        }
-        this._response.setCookie(this._user_session_id, this._session_id, time);
-        //if(this._engine.cfg.session_type==ESessionType.Cache)
-        {
-            if (time > 24 * 60 * 60) {
-                CacheTool_1.GCacheTool.add(this._session_id, user, 24 * 60 * 60 * 1000);
-            }
-            else {
-                CacheTool_1.GCacheTool.add(this._session_id, user, time * 1000);
-            }
-        }
-        if (this._engine.cfg.session_type == FrameworkConfig_1.ESessionType.Redis) {
-            RedisManager_1.GRedisMgr.set(this._session_id, user.id).then(() => {
-                RedisManager_1.GRedisMgr.expire(this._session_id, time);
-            });
-        }
-        else if (this._engine.cfg.session_type == FrameworkConfig_1.ESessionType.Mongo) {
-            let cm = new MongoCacheService_1.MongoCacheModel();
-            cm.key = this._session_id;
-            cm.data = user.id;
-            cm.expireAt = Date.now() + time * 1000;
-            MongoCacheService_1.GMongoCacheSer.updateOne(cm, { key: cm.key }, true);
-        }
-        this._self_user = user;
-    }
-    /**
-     * 已经被启用
-     */
-    async _update_session() {
-    }
-    async update_user(user_id) {
-        let user = (await UserService_1.GUserSer.getById(user_id));
-        if (this._user && this._user.id == user.id) {
-            this._user = user;
-        }
-        if (this._self_user && this._self_user.id == user.id) {
-            this._login(user);
-        }
-    }
-    //填充每个页面需要的通用数据
-    _init_data(datas) {
-        let data = super._init_data(datas);
-        data.model.isLogin = this.isLogin;
-        data.model.user = this._user;
-        data.model.selfUser = this._self_user;
-        data.model.isSelf = this.isSelf;
-        return data;
-    }
-}
-exports.BaseUserController = BaseUserController;

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

@@ -1,77 +0,0 @@
-import { BaseModel, MysqlBaseService } from '../Database/MysqlBaseService';
-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 MysqlBaseService<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/dist/types/Framework/Service/UserService.d.ts

@@ -1,36 +0,0 @@
-import { MysqlBaseService, BaseModel } from "../Database/MysqlBaseService";
-import { ERoleGroup } from "./ini";
-export declare class UserModel extends BaseModel {
-    id: number;
-    account_id: number;
-    nickname: string;
-    sex: number;
-    logo: string;
-    state: number;
-    role_group: number;
-    role: number;
-    phone: string;
-    wechat: string;
-    qq: string;
-    email: string;
-    about: string;
-    pre_user_id: number;
-    exp: number;
-    level: number;
-    vip_exp: number;
-    vip_level: number;
-    is_robot: number;
-    create_time: number;
-}
-export declare let GUserSer: UserService<UserModel>;
-export declare class UserService<T extends UserModel> extends MysqlBaseService<T> {
-    constructor(type: {
-        new (): T;
-    });
-    protected _newUserModel(): T;
-    protected _createNewUser(account_id: number, nickname: string, sex: number, logo: string, group?: ERoleGroup): Promise<T>;
-    updateBaseInfoByAccount(account_id: number, nickname: string, sex: number, logo: string): Promise<string>;
-    add(account_id: number, nickname: string, sex: number, logo: string, group?: ERoleGroup): Promise<any>;
-    updateRoleGroup(user_id: number, role_group: ERoleGroup): Promise<string>;
-    getByAccountId(account_id: number): Promise<T>;
-}

package/dist/types/Framework/WebServer/Controller/BaseUserController.d.ts

@@ -1,27 +0,0 @@
-import { BaseController } from './BaseController';
-import { UserModel } from '../../Service/UserService';
-export declare class BaseUserController<T extends UserModel> extends BaseController {
-    protected _user_session_id: string;
-    protected _self_user: T;
-    protected _user: T;
-    protected _session_id: string;
-    get selfUser(): T;
-    get isSelf(): boolean;
-    get isLogin(): boolean;
-    get isCreator(): boolean;
-    get isAdmin(): boolean;
-    get isProxy(): boolean;
-    get isCommon(): boolean;
-    init(): Promise<void>;
-    protected _getUserBySession(session: string): Promise<T>;
-    protected _logout(): void;
-    protected _login(user: T): void;
-    /**
-     * 已经被启用
-     */
-    protected _update_session(): Promise<void>;
-    update_user(user_id: number): Promise<void>;
-    protected _init_data(datas: any): {
-        model: any;
-    };
-}