cgserver 12.3.6 → 13.0.0

package/dist/lib/Framework/Server/WebServer/Controller/MongoBaseUserController.js

@@ -4,16 +4,13 @@ exports.MongoBaseUserController = void 0;
 const BaseController_1 = require("./BaseController");
 const FrameworkConfig_1 = require("../../../Config/FrameworkConfig");
 const MongoCacheService_1 = require("../../../Service/MongoCacheService");
-const ini_1 = require("../../../Service/ini");
 const CacheTool_1 = require("../../../Logic/CacheTool");
 const RedisManager_1 = require("../../../Database/Redis/RedisManager");
-const MongoServiceManager_1 = require("../../../Database/Mongo/MongoServiceManager");
 class MongoBaseUserController extends BaseController_1.BaseController {
     _user_session_id = "user_session_id";
     _self_user = null;
     _user = null; //网页内容的所属，比如，查看别人的博客，那这个信息就是作者的
     _session_id = null;
-    _userser = null;
     get selfUser() {
         return this._self_user;
     }
@@ -23,23 +20,14 @@ class MongoBaseUserController extends BaseController_1.BaseController {
     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);
+    get userService() {
+        throw new Error("请重写userService方法");
     }
     async init() {
-        this._userser = MongoServiceManager_1.gMongoServiceMgr.getService("user");
+        let userSer = this.userService;
         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;
+        let userId = "";
         if (this._session_id) {
             let user = await this._getUserBySession(this._session_id);
             if (!user) {
@@ -53,8 +41,8 @@ class MongoBaseUserController extends BaseController_1.BaseController {
             }
         }
         let params = this._request.params;
-        if (params.userId && params.userId != userId + "") {
-            this._user = (await this._userser.getById(params.userId));
+        if (params.userId && params.userId != userId) {
+            this._user = (await this.userService.findById(params.userId));
         }
         else {
             //不是别人的信息就查看自己的
@@ -66,8 +54,6 @@ class MongoBaseUserController extends BaseController_1.BaseController {
         if (!session) {
             return user;
         }
-        //每次强制从cache中先找，提高效率
-        //if(this._engine.cfg.session_type==ESessionType.Cache)
         {
             user = CacheTool_1.gCacheTool.get(this._session_id);
         }
@@ -75,15 +61,15 @@ class MongoBaseUserController extends BaseController_1.BaseController {
             return user;
         }
         if (this._engine.cfg.session_type == FrameworkConfig_1.ESessionType.Redis) {
-            let user_id = +(await RedisManager_1.gRedisMgr.redis.get(this._session_id)).toString();
-            if (user_id > 0) {
-                user = (await this._userser.getById(user_id));
+            let user_id = (await RedisManager_1.gRedisMgr.redis.get(this._session_id)).toString();
+            if (user_id) {
+                user = (await this.userService.findById(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 this._userser.getById(user_id));
+                user = (await this.userService.findById(user_id));
             }
         }
         if (user) {
@@ -146,7 +132,7 @@ class MongoBaseUserController extends BaseController_1.BaseController {
     async _update_session() {
     }
     async update_user(user_id) {
-        let user = (await this._userser.getById(user_id));
+        let user = (await this.userService.findById(user_id));
         if (this._user && this._user.id == user.id) {
             this._user = user;
         }

package/dist/lib/Framework/Server/WebServer/Controller/MysqlBaseUserController.js

@@ -4,8 +4,6 @@ exports.MysqlBaseUserController = void 0;
 const BaseController_1 = require("./BaseController");
 const MysqlUserService_1 = require("../../../Service/MysqlUserService");
 const FrameworkConfig_1 = require("../../../Config/FrameworkConfig");
-const MongoCacheService_1 = require("../../../Service/MongoCacheService");
-const ini_1 = require("../../../Service/ini");
 const CacheTool_1 = require("../../../Logic/CacheTool");
 const RedisManager_1 = require("../../../Database/Redis/RedisManager");
 class MysqlBaseUserController extends BaseController_1.BaseController {
@@ -22,18 +20,6 @@ class MysqlBaseUserController extends BaseController_1.BaseController {
     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;
@@ -78,12 +64,6 @@ class MysqlBaseUserController extends BaseController_1.BaseController {
                 user = (await MysqlUserService_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 MysqlUserService_1.GUserSer.getById(user_id));
-            }
-        }
         if (user) {
             this._login(user);
         }
@@ -97,9 +77,6 @@ class MysqlBaseUserController extends BaseController_1.BaseController {
             else if (this._engine.cfg.session_type == FrameworkConfig_1.ESessionType.Redis) {
                 RedisManager_1.gRedisMgr.redis.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);
@@ -133,9 +110,6 @@ class MysqlBaseUserController extends BaseController_1.BaseController {
                 RedisManager_1.gRedisMgr.redis.expire(this._session_id, time);
             });
         }
-        else if (this._engine.cfg.session_type == FrameworkConfig_1.ESessionType.Mongo) {
-            MongoCacheService_1.gMongoCacheSer.addData(this._session_id, user.id, new Date(Date.now() + time * 1000));
-        }
         this._self_user = user;
     }
     /**

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

@@ -1,31 +1,38 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MongoAccountService = exports.MongoAccountModel = void 0;
+exports.MongoAccountService = void 0;
+const mongoose_1 = __importDefault(require("mongoose"));
 const _error_1 = require("../Config/_error_");
 const MongoBaseService_1 = require("../Database/Mongo/MongoBaseService");
-const MongoManager_1 = require("../Database/Mongo/MongoManager");
-const MongoServiceManager_1 = require("../Database/Mongo/MongoServiceManager");
 const CacheTool_1 = require("../Logic/CacheTool");
 const QQTool_1 = require("../ThirdParty/QQTool");
 const WechatTool_1 = require("../ThirdParty/WechatTool");
 const ini_1 = require("./ini");
-class MongoAccountModel extends MongoManager_1.MongoBaseModel {
-    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;
-}
-exports.MongoAccountModel = MongoAccountModel;
 class MongoAccountService extends MongoBaseService_1.MongoBaseService {
+    get userService() {
+        throw new Error("请重写userService方法");
+    }
+    constructor(extaccountdef) {
+        const accountSchema = new mongoose_1.default.Schema({ ...{
+                phone: { type: String, default: "" },
+                email: { type: String, default: "" },
+                name: { type: String, default: "" },
+                password: { type: String, default: "" },
+                unionid: { type: String, default: "" }, // 第三方唯一标识
+                openid: { type: String, default: "" }, // 第三方开放ID
+                create_time: { type: Date, default: new Date() },
+                create_ip: { type: String, default: "" },
+                login_time: { type: Date, default: new Date() },
+                login_ip: { type: String, default: "" },
+                from: { type: Number, default: ini_1.EAccountFrom.Guest }, // 来源
+                state: { type: Number, default: ini_1.EAccountState.Waitting } // 状态
+            }, ...extaccountdef });
+        super('account', accountSchema);
+        let userService = this.userService;
+    }
     /**
      * 注册新账号
      * @param unionid
@@ -33,52 +40,44 @@ class MongoAccountService extends MongoBaseService_1.MongoBaseService {
      * @param ip
      * @param from
      */
-    async add(unionid, openid, ip, from) {
-        let account = new this._t_type();
+    async add(key, pass, ip, from) {
+        let account = {};
         switch (from) {
             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;
+                    account.unionid = key;
+                    account.openid = pass;
                     break;
                 }
             case ini_1.EAccountFrom.Email:
                 {
-                    account.email = unionid;
-                    account.password = openid;
+                    account.email = key;
+                    account.password = pass;
                     break;
                 }
             case ini_1.EAccountFrom.Phone:
             case ini_1.EAccountFrom.QuickPhone:
                 {
-                    account.phone = unionid;
-                    account.password = openid;
+                    account.phone = key;
+                    account.password = pass;
                     break;
                 }
             case ini_1.EAccountFrom.Name:
             case ini_1.EAccountFrom.Guest:
                 {
-                    account.name = unionid;
-                    account.password = openid;
+                    account.name = key;
+                    account.password = pass;
                     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;
-        account.id = await this.getNextId();
         let sr = await this.insert(account);
-        if (sr.errcode) {
-            return null;
-        }
-        account._id = sr.rs.insertedId;
-        return account;
+        return sr.model;
     }
     /**
      * 通过第三方信息获取账号
@@ -149,8 +148,8 @@ class MongoAccountService extends MongoBaseService_1.MongoBaseService {
             return rs;
         }
         if (force_user) {
-            let userser = MongoServiceManager_1.gMongoServiceMgr.getService("user");
-            let user = await userser.getByAccountId(account.id);
+            let userser = this.userService;
+            let user = await userser.findOne({ account_id: account.id });
             if (!user) {
                 switch (from) {
                     case ini_1.EAccountFrom.QQ:
@@ -210,7 +209,7 @@ class MongoAccountService extends MongoBaseService_1.MongoBaseService {
                                 user = await userser.add(account.id, extra_info.nickname, extra_info.sex, extra_info.logo);
                             }
                             else {
-                                user = await userser.add(account.id, null, null, null);
+                                user = await userser.add(account.id);
                             }
                             if (!user) {
                                 this.deleteOne({ id: account.id });
@@ -228,112 +227,50 @@ class MongoAccountService extends MongoBaseService_1.MongoBaseService {
                 rs.is_new = true;
             }
         }
-        account.login_time = Date.now();
+        account.login_time = new Date();
         account.login_ip = ip;
-        this.updateOne({ id: account.id }, { login_time: account.login_time, login_ip: account.login_ip });
+        await account.save();
         rs.account = account;
         return rs;
     }
-    async _login(unionid, openid, from) {
-        unionid += "";
-        openid += "";
+    async _login(key, pass, from) {
+        key += "";
+        pass += "";
         let rs = { errcode: null, account: null };
         if (from == ini_1.EAccountFrom.QQ
             || from == ini_1.EAccountFrom.WeChat
             || from == ini_1.EAccountFrom.Apple
             || from == ini_1.EAccountFrom.Google) {
-            rs.account = await this.getByThird(unionid, openid);
+            rs.account = await this.getByThird(key, pass);
         }
         else if (from == ini_1.EAccountFrom.QuickPhone) {
-            let key = "phone_code_" + unionid;
-            let code = CacheTool_1.gCacheTool.get(key);
-            if (!code || code != openid) {
+            let _phone_key = "phone_code_" + key;
+            let code = CacheTool_1.gCacheTool.get(_phone_key);
+            if (!code || code != pass) {
                 rs.errcode = _error_1.EErrorCode.Wrong_Phone_Code;
                 return rs;
             }
-            rs.account = await this.getByPhone(unionid);
+            rs.account = await this.getByPhone(key);
         }
         else if (from == ini_1.EAccountFrom.Phone) {
-            rs.account = await this.findOne({ phone: unionid, password: openid });
+            rs.account = await this.findOne({ phone: key, password: pass });
             if (!rs.account) {
                 rs.errcode = _error_1.EErrorCode.Login_Failed;
             }
         }
         else if (from == ini_1.EAccountFrom.Email) {
-            rs.account = await this.findOne({ email: unionid, password: openid });
+            rs.account = await this.findOne({ email: key, password: pass });
             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.findOne({ name: unionid, password: openid });
+            rs.account = await this.findOne({ name: key, password: pass });
             if (!rs.account && from == ini_1.EAccountFrom.Name) {
                 rs.errcode = _error_1.EErrorCode.Login_Failed;
             }
         }
         return rs;
     }
-    async register(type, key, password, ip, extra) {
-        let rs = { user: null, errcode: null };
-        extra = extra || {};
-        let am = new this._t_type();
-        switch (type) {
-            case ini_1.EAccountFrom.Phone:
-                {
-                    am.phone = key;
-                    let temp = await this.findOne({ phone: key }, { id: 1 });
-                    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.findOne({ email: key }, { id: 1 });
-                    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.findOne({ name: key }, { id: 1 });
-                    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;
-        am.id = await this.getNextId();
-        let rs_am = await this.insert(am);
-        if (!rs_am.rs.insertedId) {
-            rs.errcode = _error_1.EErrorCode.Mysql_Error;
-            return rs;
-        }
-        let userser = MongoServiceManager_1.gMongoServiceMgr.getService("user");
-        let user = await userser.add(am.id, extra.nickname, extra.sex, extra.logo);
-        if (!user) {
-            this.deleteOne({ id: am.id });
-            rs.errcode = _error_1.EErrorCode.User_Create_Failed;
-            return rs;
-        }
-        rs.user = user;
-        return rs;
-    }
 }
 exports.MongoAccountService = MongoAccountService;

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

@@ -1,20 +1,24 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.gMongoCacheSer = exports.MongoCacheService = exports.MongoCacheModel = void 0;
+exports.gMongoCacheSer = exports.MongoCacheService = void 0;
+const mongoose_1 = __importDefault(require("mongoose"));
 const MongoBaseService_1 = require("../Database/Mongo/MongoBaseService");
-const MongoManager_1 = require("../Database/Mongo/MongoManager");
-//暂时就用这个了，反正没啥用户
-class MongoCacheModel extends MongoManager_1.MongoBaseModel {
-    key = "";
-    data = null;
-    expireAt = new Date(Date.now() + 365 * 24 * 60 * 60 * 1000);
-}
-exports.MongoCacheModel = MongoCacheModel;
+let mongoCacheSchema = new mongoose_1.default.Schema({
+    key: { type: String, required: true },
+    data: { type: Object, required: true },
+    expireAt: { type: Date, default: new Date(Date.now() + 365 * 24 * 60 * 60 * 1000), require: true }
+});
 /**
  * mongo版本的缓存服务
  * 可以用来缓存kv数据
  */
 class MongoCacheService extends MongoBaseService_1.MongoBaseService {
+    constructor() {
+        super("cache", mongoCacheSchema);
+    }
     async getData(key) {
         let cm = await this.findOne({ key: key });
         if (!cm) {
@@ -25,17 +29,14 @@ class MongoCacheService extends MongoBaseService_1.MongoBaseService {
         }
         return cm.data;
     }
-    async addData(key, data, expireAt = new Date(Date.now() + 365 * 24 * 60 * 60 * 1000)) {
-        let mcm = new MongoCacheModel();
-        mcm.key = key;
-        mcm.data = data;
-        mcm.expireAt = expireAt;
-        let rs = await this.updateOne({ key: mcm.key }, mcm, { upsert: true });
-        if (rs.rs.upsertedCount <= 0) {
-            return null;
+    async addData(key, data, expireAt) {
+        let m = { key: key, data: data };
+        if (expireAt) {
+            m.expireAt = expireAt;
         }
-        return mcm;
+        let rs = await this.insert(m);
+        return rs.model;
     }
 }
 exports.MongoCacheService = MongoCacheService;
-exports.gMongoCacheSer = new MongoCacheService("cache", MongoCacheModel);
+exports.gMongoCacheSer = new MongoCacheService();

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

@@ -15,12 +15,6 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-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;
-};
 var __importStar = (this && this.__importStar) || (function () {
     var ownKeys = function(o) {
         ownKeys = Object.getOwnPropertyNames || function (o) {
@@ -38,92 +32,60 @@ var __importStar = (this && this.__importStar) || (function () {
         return result;
     };
 })();
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MongoUserService = exports.MongoUserModel = void 0;
+exports.MongoUserService = void 0;
 const _ = __importStar(require("underscore"));
 const MongoBaseService_1 = require("../Database/Mongo/MongoBaseService");
-const MongoManager_1 = require("../Database/Mongo/MongoManager");
+const mongoose_1 = __importDefault(require("mongoose"));
 const ini_1 = require("./ini");
-const SyncCall_1 = require("../Decorator/SyncCall");
-class MongoUserModel extends MongoManager_1.MongoBaseModel {
-    id = -1;
-    account_id = -1;
-    nickname = "";
-    sex = -1;
-    logo = "";
-    state = 0;
-    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;
-}
-exports.MongoUserModel = MongoUserModel;
 //暂时不实例化，方便重写
 class MongoUserService extends MongoBaseService_1.MongoBaseService {
-    async _createNewUser(account_id, nickname, sex, logo, group) {
-        group = group || ini_1.ERoleGroup.Common;
-        let um = new this._t_type();
-        um.account_id = account_id;
-        um.nickname = nickname;
-        if (!um.nickname || um.nickname.length == 0) {
-            um.nickname = "noname";
+    constructor(extuserdef) {
+        const userSchema = new mongoose_1.default.Schema({ ...{
+                _id: { type: Number },
+                account_id: { type: String, index: { unique: true } },
+                state: { type: Number, default: ini_1.EUserState.Normal },
+                is_robot: { type: Boolean, default: false },
+                create_time: { type: Date, default: Date.now },
+                login_time: { type: Date, default: Date.now },
+                create_ip: { type: String, default: "" },
+                login_ip: { type: String, default: "" },
+                nickname: { type: String, default: "noname" },
+                logo: { type: String, default: "" },
+                sex: { type: Number, default: 0 }
+            }, ...extuserdef }, { id: false });
+        userSchema.virtual('id').get(function () {
+            return this._id;
+        });
+        super('user', userSchema);
+    }
+    async add(account_id, nickname, sex, logo) {
+        let m = {};
+        m.account_id = account_id;
+        if (nickname) {
+            m.nickname = nickname;
+        }
+        if (sex !== undefined) {
+            m.sex = sex;
+        }
+        if (logo) {
+            m.logo = logo;
         }
-        um.sex = sex || 0;
-        um.logo = logo || "";
-        um.account_id = account_id;
-        um.state = 0;
-        um.role_group = group;
-        um.role = 0;
-        um.create_time = Date.now();
         //随机userid
         let id = 0;
         do {
-            id = _.random(1000000, 9999999);
+            id = _.random(10000000, 99999999);
             let p = await this.findOne({ id: id }, { id: 1 });
             if (!p) {
                 break;
             }
         } while (true);
-        um.id = id;
-        return um;
-    }
-    async add(account_id, nickname, sex, logo, group) {
-        let um = await this._createNewUser(account_id, nickname, sex, logo, group);
-        let rs = await this.insert(um);
-        if (rs.errcode || !rs.rs.insertedId) {
-            return null;
-        }
-        um._id = rs.rs.insertedId;
-        return um;
-    }
-    async getByAccountId(account_id) {
-        let pm = await this.findOne({ account_id: account_id });
-        return pm;
-    }
-    async updateBaseInfoByAccount(account_id, nickname, sex, logo) {
-        let model = {
-            nickname: nickname,
-            sex: sex,
-            logo: logo
-        };
-        let sr = await this.updateOne({ account_id: account_id }, model);
-        if (sr.errcode) {
-            return "更新失败";
-        }
-        return;
+        m._id = id;
+        let rs = await this.insert(m);
+        return rs.model;
     }
 }
 exports.MongoUserService = MongoUserService;
-__decorate([
-    SyncCall_1.SyncCall
-], MongoUserService.prototype, "_createNewUser", null);

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

@@ -148,8 +148,7 @@ class MysqlUserService extends MysqlBaseService_1.MysqlBaseService {
         super(type);
         exports.GUserSer = this;
     }
-    async _createNewUser(account_id, nickname, sex, logo, group) {
-        group = group || ini_1.ERoleGroup.Common;
+    async _createNewUser(account_id, nickname, sex, logo) {
         let um = new this._t_type();
         um.account_id = account_id;
         um.nickname = nickname;
@@ -160,7 +159,6 @@ class MysqlUserService extends MysqlBaseService_1.MysqlBaseService {
         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;
@@ -181,21 +179,14 @@ class MysqlUserService extends MysqlBaseService_1.MysqlBaseService {
         }
         return;
     }
-    async add(account_id, nickname, sex, logo, group) {
-        let um = await this._createNewUser(account_id, nickname, sex, logo, group);
+    async add(account_id, nickname, sex, logo) {
+        let um = await this._createNewUser(account_id, nickname, sex, logo);
         let sr = await this.insert(um);
         if (sr.error || sr.queryResult.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.execResult.affectedRows <= 0) {
-            return "更新失败";
-        }
-        return;
-    }
     async getByAccountId(account_id) {
         let pm = await this.get(null, "account_id=?", [account_id]);
         return pm;