xinyuxi/ZYZ
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "✨ feat(db): 修改role表数据库操作方式"

Browse Source 
This reverts commit e39af3649288cc5802739cfe862c818fe56e194e.
This commit is contained in:
luying
2023-05-22 19:43:21 +08:00
parent 2d45b2c66c
commit 7bc9e1fe49
79 changed files with 423 additions and 423 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game-server/app/servers/connector/handler/entryHandler.ts
+9 -9
View File
@@ -1,5 +1,5 @@
import { STATUS } from './../../../consts/statusCode';
import Role, { RoleType } from './../../../db/Role';
import { RoleModel, RoleType } from './../../../db/Role';
import { UserModel, UserType } from '../../../db/User';
import { GMUserModel } from '../../../db/GMUser';
import { Application, HandlerService, pinus, } from 'pinus';
@@ -87,7 +87,7 @@ export class EntryHandler {
let ipLocation = await getIpLocation(ip);
let role = await Role.findByUidAndSetTime(user.uid, serverId, ip, ipLocation, null, true);
let role = await RoleModel.findByUidAndSetTime(user.uid, serverId, ip, ipLocation, null, true);
if (!role) {
return resResult(STATUS.ROLE_NOT_FOUND);
}
@@ -118,7 +118,7 @@ export class EntryHandler {
async getData(msg: { }, session: FrontendSession) {
let ip = session.get('ip');
let roleId = session.get('roleId');
let role = await Role.findByRoleId(roleId, '-_id', true, true);
let role = await RoleModel.findByRoleId(roleId, '-_id', true, true);
// 推送数据
pushData(role.hasInit, role, session);
@@ -189,7 +189,7 @@ export class EntryHandler {
let self = this;
let roleId = session.get('roleId');
let role = await Role.findByRoleIdAndSetTime(roleId, '-_id', true);
let role = await RoleModel.findByRoleIdAndSetTime(roleId, '-_id', true);
if (!role) {
return resResult(STATUS.ROLE_NOT_FOUND);
}
@@ -213,9 +213,9 @@ export class EntryHandler {
let roleId = session.get('roleId');
let ip = session.get('ip');
let role = await Role.findByRoleId(roleId, 'lv');
let role = await RoleModel.findByRoleId(roleId, 'lv');
if(!role) return resResult(STATUS.ROLE_NOT_FOUND);
let apJson = await getAp(roleId, ip, role.lv);
return resResult(STATUS.SUCCESS, { apJson });
}
@@ -263,7 +263,7 @@ export class EntryHandler {
} catch(e) {
console.error(e.stack);
}
Role.updateRoleInfo(roleId, { quitTime: nowSeconds() });
RoleModel.updateRoleInfo(roleId, { quitTime: nowSeconds() });
// if(teamCode) { // 如果有寻宝中的队伍，那么等于战败
// setComBtlOnUserLeave(roleId, teamCode)
// }
@@ -375,7 +375,7 @@ export class EntryHandler {
return resResult(STATUS.TOKEN_ERR);
}
let roleId = session.get('roleId');
let role = await Role.findByRoleId(roleId, '-_id', true, true);
let role = await RoleModel.findByRoleId(roleId, '-_id', true, true);
let module = await getModuleData(type, { role, session });
return resResult(STATUS.SUCCESS, { role: module });
}
@@ -394,7 +394,7 @@ export class EntryHandler {
const code = genCode(6);
const seqId = await Counter.getNewCounter(COUNTER.ROLE) || -1;
await Role.createRole(user.uid, serverId, { roleId, code, roleName: roleId, seqId, lv: DEFAULT_LV, exp: (getExpByLv(DEFAULT_LV - 1) || { sum: 0 }).sum || 0 }, '');
await RoleModel.createRole(user.uid, serverId, { roleId, code, roleName: roleId, seqId, lv: DEFAULT_LV, exp: (getExpByLv(DEFAULT_LV - 1) || { sum: 0 }).sum || 0 }, '');
}
console.log('debugQueryTokenByTel got user:', token);
return resResult(STATUS.SUCCESS, { user: token });