cgserver 3.2.0 → 3.4.0

package/lib/Framework/Database/MongoManger.d.ts

@@ -0,0 +1,67 @@
+import * as mongo from 'mongodb';
+export declare class MongoBaseModel {
+    _id: any;
+}
+export declare class MrResult {
+    /**
+     * select 的数据量
+     */
+    length: number;
+    /**
+     * 插入数据的自增id
+     */
+    insertId: number;
+    insertIds: {
+        [key: number]: number;
+    };
+    /**
+     * update 更新数据的影响条数
+     */
+    changedRows: number;
+    /**
+     * 插入或删除数据的影响条数
+     */
+    affectedRows: number;
+}
+export declare class MgReturn {
+    error: any;
+    result: MrResult;
+    list: any[];
+}
+export declare let GMongoMgr: MongoManager;
+declare class MongoManager {
+    protected _init_cbs: any[];
+    protected _mongo: mongo.Db;
+    protected _mongo_init_succ: boolean;
+    protected _inited: boolean;
+    get isValid(): boolean;
+    constructor();
+    init(): Promise<boolean>;
+    registerInitCb(cb: Function): void;
+    onConnect(): void;
+    onEnd(): void;
+    onError(err: any): void;
+    getAutoIds(key: string): Promise<number>;
+    /**
+     * 获取单条消息
+     * @param collection
+     */
+    findOne(collection: string, property?: {}, where?: {}, sort?: {}): Promise<any>;
+    findMany(collection: string, property?: {}, where?: {}, sort?: {}): Promise<any>;
+    findCount(collection: string, property?: {}, where?: {}): Promise<number>;
+    random(collection: string, size: number, property?: {}, where?: {}): Promise<any[]>;
+    deleteOne(collection: any, con: any): Promise<number>;
+    deleteMany(collection: any, con: any): Promise<number>;
+    /**
+     * 插入数据
+     * @param collection
+     * @param data
+     */
+    insertOne(collection: string, data: any): Promise<mongo.InsertOneWriteOpResult<any>>;
+    insertManay(collection: string, data: []): Promise<mongo.InsertWriteOpResult<any>>;
+    updateOne(collection: string, model: any, condition?: {}): Promise<mongo.UpdateWriteOpResult>;
+    updateMany(collection: string, model: any, condition?: {}): Promise<mongo.UpdateWriteOpResult>;
+    createIndex(collection: string, index: any): Promise<string>;
+    aggregate(collection: string, size: number, property?: {}, where?: {}): Promise<any[]>;
+}
+export {};

package/lib/Framework/Database/MongoManger.js

@@ -0,0 +1,221 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GMongoMgr = exports.MgReturn = exports.MrResult = exports.MongoBaseModel = void 0;
+const FrameworkConfig_1 = require("../Config/FrameworkConfig");
+const Log_1 = require("../Logic/Log");
+const mongo = require("mongodb");
+class MongoBaseModel {
+}
+exports.MongoBaseModel = MongoBaseModel;
+class MrResult {
+    constructor() {
+        /**
+         * select 的数据量
+         */
+        this.length = 0;
+        /**
+         * 插入数据的自增id
+         */
+        this.insertId = null;
+        this.insertIds = null;
+        /**
+         * update 更新数据的影响条数
+         */
+        this.changedRows = null;
+        /**
+         * 插入或删除数据的影响条数
+         */
+        this.affectedRows = null;
+    }
+}
+exports.MrResult = MrResult;
+class MgReturn {
+    constructor() {
+        this.error = null;
+        this.result = new MrResult();
+        this.list = [];
+    }
+}
+exports.MgReturn = MgReturn;
+exports.GMongoMgr = null;
+class MongoManager {
+    constructor() {
+        this._init_cbs = [];
+        this._mongo = null;
+        this._mongo_init_succ = false;
+        this._inited = false;
+    }
+    get isValid() {
+        return this._inited;
+    }
+    async init() {
+        if (this._inited) {
+            return false;
+        }
+        if (this._mongo) {
+            return true;
+        }
+        if (!FrameworkConfig_1.GFCfg.db.mongo || !FrameworkConfig_1.GFCfg.db.mongo.open) {
+            return true;
+        }
+        this._inited = true;
+        Log_1.GLog.info("mongo config=" + JSON.stringify(FrameworkConfig_1.GFCfg.db.mongo), true);
+        let client = new mongo.MongoClient("mongodb://" + FrameworkConfig_1.GFCfg.db.mongo.host + ":" + FrameworkConfig_1.GFCfg.db.mongo.port);
+        await client.connect();
+        this.onConnect();
+        this._mongo = client.db(FrameworkConfig_1.GFCfg.db.mongo.database);
+        this._mongo.on("end", this.onEnd.bind(this));
+        this._mongo.on("error", this.onError.bind(this));
+        for (let i = 0; i < this._init_cbs.length; ++i) {
+            this._init_cbs[i]();
+        }
+        return true;
+    }
+    registerInitCb(cb) {
+        this._init_cbs.push(cb);
+    }
+    onConnect() {
+        this._mongo_init_succ = true;
+        Log_1.GLog.info("mogo has connected!");
+    }
+    onEnd() {
+        this._mongo_init_succ = false;
+        Log_1.GLog.info("mogo has ended!");
+    }
+    onError(err) {
+        Log_1.GLog.info("Error " + err);
+    }
+    async getAutoIds(key) {
+        if (!this._mongo) {
+            return -1;
+        }
+        let col = this._mongo.collection("auto_ids");
+        let sd = await col.findOneAndUpdate({ _id: key }, { $inc: { sequence_value: 1 } });
+        return parseInt(sd.value);
+    }
+    /**
+     * 获取单条消息
+     * @param collection
+     */
+    async findOne(collection, property = {}, where = {}, sort = {}) {
+        if (!this._mongo) {
+            return;
+        }
+        let col = this._mongo.collection(collection);
+        let one = null;
+        if (!sort) {
+            one = await col.findOne(where || {}, property);
+        }
+        else {
+            one = await col.find(where || {}, property).sort(sort).limit(1);
+        }
+        return one;
+    }
+    async findMany(collection, property = {}, where = {}, sort = {}) {
+        if (!this._mongo) {
+            return;
+        }
+        let col = this._mongo.collection(collection);
+        let list = null;
+        if (!sort) {
+            list = await col.find(where || {}, property);
+        }
+        else {
+            list = await col.find(where || {}, property).sort(sort);
+        }
+        return list;
+    }
+    async findCount(collection, property = {}, where = {}) {
+        if (!this._mongo) {
+            return -1;
+        }
+        let col = this._mongo.collection(collection);
+        let count = await col.find(where || {}, property).count();
+        return count;
+    }
+    async random(collection, size, property = {}, where = {}) {
+        if (!this._mongo) {
+            return [];
+        }
+        let col = this._mongo.collection(collection);
+        let list = await col.aggregate([{ '$match': where },
+            { '$project': property },
+            { '$sample': { 'size': size } }
+        ]).toArray();
+        return list;
+    }
+    async deleteOne(collection, con) {
+        if (!this._mongo) {
+            return -1;
+        }
+        let col = this._mongo.collection(collection);
+        let rs = await col.deleteOne(con || {});
+        return rs.deletedCount;
+    }
+    async deleteMany(collection, con) {
+        if (!this._mongo) {
+            return -1;
+        }
+        let col = this._mongo.collection(collection);
+        let rs = await col.deleteMany(con || {});
+        return rs.deletedCount;
+    }
+    /**
+     * 插入数据
+     * @param collection
+     * @param data
+     */
+    async insertOne(collection, data) {
+        if (!this._mongo) {
+            return;
+        }
+        let col = this._mongo.collection(collection);
+        let rs = await col.insertOne(data);
+        return rs;
+    }
+    async insertManay(collection, data) {
+        if (!this._mongo) {
+            return;
+        }
+        let col = this._mongo.collection(collection);
+        let rs = await col.insertMany(data);
+        return rs;
+    }
+    async updateOne(collection, model, condition = {}) {
+        if (!this._mongo) {
+            return;
+        }
+        let col = this._mongo.collection(collection);
+        let rs = await col.updateOne(condition, { $set: model }, { upsert: true });
+        return rs;
+    }
+    async updateMany(collection, model, condition = {}) {
+        if (!this._mongo) {
+            return;
+        }
+        let col = this._mongo.collection(collection);
+        let rs = await col.updateMany(condition, { $set: model }, { upsert: true });
+        return rs;
+    }
+    async createIndex(collection, index) {
+        if (!this._mongo) {
+            return;
+        }
+        let col = this._mongo.collection(collection);
+        let rs = await col.createIndex(index);
+        return rs;
+    }
+    async aggregate(collection, size, property = {}, where = {}) {
+        if (!this._mongo) {
+            return;
+        }
+        let col = this._mongo.collection(collection);
+        let list = await col.aggregate([{ '$match': where },
+            { '$project': property },
+            { '$sample': { 'size': size } }
+        ]).toArray();
+        return list;
+    }
+}
+exports.GMongoMgr = new MongoManager();
+//# sourceMappingURL=MongoManger.js.map

package/lib/Framework/Database/MongoManger.js.map

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

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

@@ -1,21 +1,6 @@
 import { BaseModel, BaseService } from './../Database/BaseService';
 import { UserModel } from './UserService';
-export declare enum EAccountState {
-    Ban = -1,
-    Waitting = 0,
-    Normarl = 1
-}
-export declare enum EAccountFrom {
-    Guest = 0,
-    OpenSocial = 1,
-    WeChat = 2,
-    QQ = 3,
-    Phone = 4,
-    Email = 5,
-    Name = 6,
-    QuickPhone = 7,
-    Apple = 8
-}
+import { EAccountFrom } from './ini';
 export declare class AccountModel extends BaseModel {
     id: number;
     phone: string;

package/lib/Framework/Service/AccountService.js

@@ -6,7 +6,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AccountService = exports.GAccountSer = exports.AccountModel = exports.EAccountFrom = exports.EAccountState = void 0;
+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");
@@ -20,24 +20,7 @@ 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");
-var EAccountState;
-(function (EAccountState) {
-    EAccountState[EAccountState["Ban"] = -1] = "Ban";
-    EAccountState[EAccountState["Waitting"] = 0] = "Waitting";
-    EAccountState[EAccountState["Normarl"] = 1] = "Normarl";
-})(EAccountState = exports.EAccountState || (exports.EAccountState = {}));
-var EAccountFrom;
-(function (EAccountFrom) {
-    EAccountFrom[EAccountFrom["Guest"] = 0] = "Guest";
-    EAccountFrom[EAccountFrom["OpenSocial"] = 1] = "OpenSocial";
-    EAccountFrom[EAccountFrom["WeChat"] = 2] = "WeChat";
-    EAccountFrom[EAccountFrom["QQ"] = 3] = "QQ";
-    EAccountFrom[EAccountFrom["Phone"] = 4] = "Phone";
-    EAccountFrom[EAccountFrom["Email"] = 5] = "Email";
-    EAccountFrom[EAccountFrom["Name"] = 6] = "Name";
-    EAccountFrom[EAccountFrom["QuickPhone"] = 7] = "QuickPhone";
-    EAccountFrom[EAccountFrom["Apple"] = 8] = "Apple";
-})(EAccountFrom = exports.EAccountFrom || (exports.EAccountFrom = {}));
+const ini_1 = require("./ini");
 let AccountModel = class AccountModel extends BaseService_1.BaseModel {
     constructor() {
         super(...arguments);
@@ -136,30 +119,31 @@ class AccountService extends BaseService_1.BaseService {
     async add(unionid, openid, ip, from) {
         let account = this._getNewModel();
         switch (from) {
-            case EAccountFrom.OpenSocial:
-            case EAccountFrom.WeChat:
-            case EAccountFrom.QQ:
-            case EAccountFrom.Apple:
+            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 EAccountFrom.Email:
+            case ini_1.EAccountFrom.Email:
                 {
                     account.email = unionid;
                     account.password = openid;
                     break;
                 }
-            case EAccountFrom.Phone:
-            case EAccountFrom.QuickPhone:
+            case ini_1.EAccountFrom.Phone:
+            case ini_1.EAccountFrom.QuickPhone:
                 {
                     account.phone = unionid;
                     account.password = openid;
                     break;
                 }
-            case EAccountFrom.Name:
-            case EAccountFrom.Guest:
+            case ini_1.EAccountFrom.Name:
+            case ini_1.EAccountFrom.Guest:
                 {
                     account.name = unionid;
                     account.password = openid;
@@ -247,12 +231,13 @@ class AccountService extends BaseService_1.BaseService {
         let extra_info = extra;
         if (!account) {
             switch (from) {
-                case EAccountFrom.OpenSocial:
-                case EAccountFrom.QQ:
-                case EAccountFrom.WeChat:
-                case EAccountFrom.Guest:
-                case EAccountFrom.QuickPhone:
-                case EAccountFrom.Apple:
+                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;
@@ -271,13 +256,14 @@ class AccountService extends BaseService_1.BaseService {
         let user = await UserService_1.GUserSer.getByAccountId(account.id);
         if (!user) {
             switch (from) {
-                case EAccountFrom.OpenSocial:
-                case EAccountFrom.QQ:
-                case EAccountFrom.WeChat:
-                case EAccountFrom.Apple:
+                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 == EAccountFrom.OpenSocial) {
+                            if (from == ini_1.EAccountFrom.OpenSocial) {
                                 let body = await OpenSocial_1.GOpenSocial.getUser(unionid, openid);
                                 if (body && body.errcode) {
                                     rs.errcode = body.errcode;
@@ -292,7 +278,7 @@ class AccountService extends BaseService_1.BaseService {
                                         };
                                 }
                             }
-                            else if (from == EAccountFrom.QQ) {
+                            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;
@@ -305,7 +291,7 @@ class AccountService extends BaseService_1.BaseService {
                                         nickname: userInfo.nickname
                                     };
                             }
-                            else if (from == EAccountFrom.WeChat) {
+                            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;
@@ -318,7 +304,7 @@ class AccountService extends BaseService_1.BaseService {
                                         nickname: userInfo.nickname
                                     };
                             }
-                            else if (from == EAccountFrom.Apple) {
+                            else if (from == ini_1.EAccountFrom.Apple || from == ini_1.EAccountFrom.Google) {
                                 extra_info =
                                     {
                                         logo: "32",
@@ -335,8 +321,8 @@ class AccountService extends BaseService_1.BaseService {
                         }
                         break;
                     }
-                case EAccountFrom.QuickPhone:
-                case EAccountFrom.Guest:
+                case ini_1.EAccountFrom.QuickPhone:
+                case ini_1.EAccountFrom.Guest:
                     {
                         let user = null;
                         if (extra_info) {
@@ -371,13 +357,14 @@ class AccountService extends BaseService_1.BaseService {
     }
     async _login(unionid, openid, from) {
         let rs = { errcode: null, account: null };
-        if (from == EAccountFrom.QQ
-            || from == EAccountFrom.WeChat
-            || from == EAccountFrom.OpenSocial
-            || from == EAccountFrom.Apple) {
+        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 == EAccountFrom.QuickPhone) {
+        else if (from == ini_1.EAccountFrom.QuickPhone) {
             let key = "phone_code_" + unionid;
             let code = CacheTool_1.GCacheTool.get(key);
             if (!code || code != openid) {
@@ -386,21 +373,21 @@ class AccountService extends BaseService_1.BaseService {
             }
             rs.account = await this.getByPhone(unionid);
         }
-        else if (from == EAccountFrom.Phone) {
+        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 == EAccountFrom.Email) {
+        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 == EAccountFrom.Name || from == EAccountFrom.Guest) {
+        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 == EAccountFrom.Name) {
+            if (!rs.account && from == ini_1.EAccountFrom.Name) {
                 rs.errcode = _error_1.EErrorCode.Login_Failed;
             }
         }
@@ -421,7 +408,7 @@ class AccountService extends BaseService_1.BaseService {
         extra = extra || {};
         let am = this._getNewModel();
         switch (type) {
-            case EAccountFrom.Phone:
+            case ini_1.EAccountFrom.Phone:
                 {
                     am.phone = key;
                     let temp = await this.get("id", "phone=?", [key]);
@@ -431,7 +418,7 @@ class AccountService extends BaseService_1.BaseService {
                     }
                     break;
                 }
-            case EAccountFrom.Email:
+            case ini_1.EAccountFrom.Email:
                 {
                     am.email = key;
                     let temp = await this.get("id", "email=?", [key]);
@@ -441,7 +428,7 @@ class AccountService extends BaseService_1.BaseService {
                     }
                     break;
                 }
-            case EAccountFrom.Name:
+            case ini_1.EAccountFrom.Name:
                 {
                     am.name = key;
                     let temp = await this.get("id", "name=?", [key]);

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

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

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

@@ -1,22 +1,7 @@
 import { BaseService } from '../Database/BaseMongoService';
 import { MongoBaseModel } from '../Database/MongoManager';
+import { EAccountFrom } from './ini';
 import { UserModel } from './MongoUserService';
-export declare enum EAccountState {
-    Ban = -1,
-    Waitting = 0,
-    Normarl = 1
-}
-export declare enum EAccountFrom {
-    Guest = 0,
-    OpenSocial = 1,
-    WeChat = 2,
-    QQ = 3,
-    Phone = 4,
-    Email = 5,
-    Name = 6,
-    QuickPhone = 7,
-    Apple = 8
-}
 export declare class AccountModel extends MongoBaseModel {
     id: number;
     phone: string;