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-08 10:01:05 +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

6
web-server/app/controller/game.ts
View File

@@ -5,7 +5,7 @@ import { BattleRecordModel } from '@db/BattleRecord';
import { STATUS, WAR_TYPE } from '@consts';
import { Controller } from 'egg';
import * as fs from 'fs';
import Role from '@db/Role';
import { RoleModel } from '@db/Role';
import { NoticeModel } from '@db/Notice';
import { ServerParamWithRole, GroupParam } from '../domain/gameField/serverlist';
import { reloadResources } from 'app/pubUtils/data';
@@ -104,7 +104,7 @@ export default class GameController extends Controller {
// let env = isReview? curRegion.reviewEnv: ctx.app.config.realEnv;
let allServers = await ServerlistModel.findByEnv(ctx.app.config.realEnv, false);
let hasRole = await Role.checkHasRole(uid, curRegion.latestServerUniqId);
let hasRole = await RoleModel.checkHasRole(uid, curRegion.latestServerUniqId);
if(pid && gid) {
const pkg = await PackageModel.getPackageByGidPid(gid, pid);
@@ -113,7 +113,7 @@ export default class GameController extends Controller {
}
}
let roles = await Role.findAllByUid(uid, true, true);
let roles = await RoleModel.findAllByUid(uid, true, true);
for (let server of allServers) {
let status = ctx.service.utils.getServerStatus(server, version, hasRole)
let curGroup = serverList.find(cur => cur.groupId == server.groupId);

4
web-server/app/middleware/checkMainten.ts
View File

@@ -2,7 +2,7 @@ import { STATUS } from '@consts';
import { ServerlistModel } from '@db/Serverlist';
import { nowSeconds } from 'app/pubUtils/timeUtil';
import { checkWhiteList } from 'app/pubUtils/sysUtil';
import Role from '@db/Role';
import { RoleModel } from '@db/Role';
module.exports = () => {
return async function checkMainten(ctx, next) {
@@ -16,7 +16,7 @@ module.exports = () => {
} else {
const versionFlag = ctx.service.utils.compareVersion(version||'0.0.0.0', server.maintenance.version||'0.0.0.1');
if(versionFlag >= 0) { // 新版本号
let hasRole = await Role.checkHasRole(ctx.uid, server.latestServerUniqId); // 是否是老玩家
let hasRole = await RoleModel.checkHasRole(ctx.uid, server.latestServerUniqId); // 是否是老玩家
if(!hasRole) {
return await next();
} else {

16
web-server/app/service/Auth.ts
View File

@@ -1,6 +1,6 @@
import { COUNTER, DEFAULT_LV, ADULT_AGE, GUEST_MAX_TIME, BLOCK_TYPE, DEBUG_MAGIC_WORD } from '@consts';
import Role, { RoleModel, WarStar } from '@db/Role';
import { RoleModel, WarStar } from '@db/Role';
import { UserModel, UserType } from '@db/User';
import { STATUS, GET_SMS_TYPE, ADDICTION_PREVENTION_CODE } from '@consts';
import { smsModel } from '@db/Sms';
@@ -307,7 +307,7 @@ export default class Auth extends Service {
let canLogin = await this.ctx.service.utils.validateCanLogin();
if(!canLogin) return this.ctx.service.utils.resResult(STATUS.ONLINE_USER_MAX);
const role = await Role.findByUid(uid, serverId, 'roleId blockType +closeTime');
const role = await RoleModel.findByUid(uid, serverId, 'roleId blockType +closeTime');
if (role) {
if(role.blockType == BLOCK_TYPE.BLOCK) {
return ctx.service.utils.resResult(STATUS.BLOCKED);
@@ -336,7 +336,7 @@ export default class Auth extends Service {
const code = ctx.service.utils.genCode(6);
const seqId = await Counter.getNewCounter(COUNTER.ROLE) || -1;
const role = await Role.createRole(uid, serverId, { roleId, code, roleName: "默认玩家名", seqId, lv: DEFAULT_LV, exp: (getExpByLv(DEFAULT_LV - 1) || { sum: 0 }).sum || 0 }, distinctId);
const role = await RoleModel.createRole(uid, serverId, { roleId, code, roleName: "默认玩家名", seqId, lv: DEFAULT_LV, exp: (getExpByLv(DEFAULT_LV - 1) || { sum: 0 }).sum || 0 }, distinctId);
if (role) {
if(server.isReview) { // 审核服跳关卡
await this.skipPrologueWhenReview(roleId);
@@ -356,7 +356,7 @@ export default class Auth extends Service {
if(i < toWarId) warStars.push({ id: dicWar.war_id, warType: dicWar.warType, star: 0, stars: [] });
}
await RScriptRecordModel.insertScripts(roleId, insertParams, [toWarId]);
await Role.updateRoleInfo(roleId, { warStar: warStars, mainWarId: toWarId - 1 })
await RoleModel.updateRoleInfo(roleId, { warStar: warStars, mainWarId: toWarId - 1 })
}
/**
@@ -485,12 +485,12 @@ export default class Auth extends Service {
public async closeAccount(roleId: string) {
const ctx = this.ctx;
let role = await Role.findByRoleId(roleId, '+closeTime +cancelCloseTime userInfo');
let role = await RoleModel.findByRoleId(roleId, '+closeTime +cancelCloseTime userInfo');
if(!role || role.userInfo.uid != ctx.uid ) return ctx.service.utils.resResult(STATUS.ROLE_NOT_FOUND);
if(role.cancelCloseTime > 0 && role.cancelCloseTime + 24 * 60 * 60 > nowSeconds() )
return ctx.service.utils.resResult(STATUS.ROLE_CLOSE_COOL_DOWN, `注销冷却中，请${this.getCdTimeStr(role.cancelCloseTime)}后再试`);
if(role.closeTime > 0) return ctx.service.utils.resResult(STATUS.ROLE_CLOSED);
role = await Role.closeAccount(roleId, nowSeconds() + 15 * 24 * 60 * 60);
role = await RoleModel.closeAccount(roleId, nowSeconds() + 15 * 24 * 60 * 60);
return ctx.service.utils.resResult(STATUS.SUCCESS, { closeTime: role.closeTime });
}
@@ -504,10 +504,10 @@ export default class Auth extends Service {
public async cancelCloseAccount(roleId: string) {
const ctx = this.ctx;
let role = await Role.findByRoleId(roleId, '+cancelCloseTime userInfo');
let role = await RoleModel.findByRoleId(roleId, '+cancelCloseTime userInfo');
if(!role || role.userInfo.uid != ctx.uid ) return ctx.service.utils.resResult(STATUS.ROLE_NOT_FOUND);
role = await Role.cancelCloseAccount(roleId, nowSeconds());
role = await RoleModel.cancelCloseAccount(roleId, nowSeconds());
if(!role) return ctx.service.utils.resResult(STATUS.ROLE_CLOSE_TIME_OVER);
return ctx.service.utils.resResult(STATUS.SUCCESS, { closeTime: role.closeTime });
}

18
web-server/app/service/Sdk.ts
View File

@@ -6,7 +6,7 @@ import { RedisClient } from 'redis';
import { checkParamPrice, get37GetServerMd5Sign, get37Md5SignA, get37Md5SignB, getChannelId, getRedisSubChannel, md5 } from '../pubUtils/sdkUtil';
import { UserOrderModel } from '@db/UserOrder';
import { nowSeconds } from 'app/pubUtils/timeUtil';
import Role from '@db/Role';
import { RoleModel } from '@db/Role';
import { gameData } from 'app/pubUtils/data';
import { resResult } from 'app/pubUtils/util';
import { UserModel } from '@db/User';
@@ -62,7 +62,7 @@ export default class Sdk extends Service {
}
ctx.service.utils.log('DEBUG', `[${ctx.request.url}] [${ctx.logcode}] pay37Callback check money ok ${order.price} ${params.money}`);
let role = await Role.findByRoleId(order.roleId);
let role = await RoleModel.findByRoleId(order.roleId);
if(!role) {
return ctx.service.utils.resResult(PAY_37_CALLBACK_CODE.ROLE_NOT_FOUND, '');
}
@@ -121,7 +121,7 @@ export default class Sdk extends Service {
// }
// console.log('*****pay37Callback check money ok', order.price, params.money)
// let role = await Role.findByRoleId(order.roleId);
// let role = await RoleModel.findByRoleId(order.roleId);
// if(!role) {
// return ctx.service.utils.resResult(PAY_IOS_37_CALLBACK_CODE.ROLE_NOT_FOUND, '');
// }
@@ -176,7 +176,7 @@ export default class Sdk extends Service {
}
console.log('*****refundIOSCallback check order status ok', params.money, typeof params.money)
let role = await Role.findByRoleId(order.roleId);
let role = await RoleModel.findByRoleId(order.roleId);
if(!role) {
return ctx.service.utils.resResult(SDK_37_REFUND_CODE.ROLE_NOT_FOUND, '');
}
@@ -249,7 +249,7 @@ export default class Sdk extends Service {
return SDK_37_TREAT_CODE.SUCCESS.code;
}
let role = await Role.findByUidAndSetMark(user.uid, params.sid);
let role = await RoleModel.findByUidAndSetMark(user.uid, params.sid);
if(!role) {
console.error('用户名违规处理, 未找到玩家角色', user.uid, params.sid);
return SDK_37_TREAT_CODE.SUCCESS.code;
@@ -307,7 +307,7 @@ export default class Sdk extends Service {
let user = await UserModel.findUserByChannel(channelId);
if(!user) return resResult(SDK_37_TREAT_CODE.USER_NOT_FOUND);
let role = await Role.findByUid(user.uid, params.sid);
let role = await RoleModel.findByUid(user.uid, params.sid);
if(!role) return resResult(SDK_37_TREAT_CODE.ROLE_NOT_FOUND);
let userGuild = await UserGuildModel.getMyGuild(role.roleId);
@@ -465,7 +465,7 @@ export default class Sdk extends Service {
return resResult(SDK_37_ACTIVITY_CODE.GIFT_CHANNEL_ERR);
}
let role = await Role.findByUid(user.uid, params.server_id);
let role = await RoleModel.findByUid(user.uid, params.server_id);
if(!role) return resResult(SDK_37_ACTIVITY_CODE.ROLE_NOT_FOUND);
if(params.role_id && role.roleId != params.role_id) return resResult(SDK_37_ACTIVITY_CODE.ROLE_NOT_FOUND);
@@ -514,7 +514,7 @@ export default class Sdk extends Service {
let server = await ServerlistModel.findByServerId(params.server_id);
if(!server) return resResult(SDK_37_ACTIVITY_CODE.SERVER_NOT_FOUND);
let role = await Role.findByUid(user.uid, params.server_id, 'roleId roleName lv createTime serverId');
let role = await RoleModel.findByUid(user.uid, params.server_id, 'roleId roleName lv createTime serverId');
if(!role) return resResult(SDK_37_ACTIVITY_CODE.ROLE_NOT_FOUND);
return resResult(SDK_37_ACTIVITY_CODE.SUCCESS, [{
id: role.roleId,
@@ -559,7 +559,7 @@ export default class Sdk extends Service {
let redisClient: RedisClient = this.ctx.app.context.redisClient;
let servers = await redisClient.hgetallAsync(REDIS_KEY.SERVER);
let roles = await Role.findAllByUid(user.uid);
let roles = await RoleModel.findAllByUid(user.uid);
let result = roles
.filter(role => !role.closeTime || role.closeTime > nowSeconds())
.map(role => ({

4
web-server/app/service/Wjx.ts
View File

@@ -5,7 +5,7 @@ import { checkWjxSign, getRedisSubChannel } from 'app/pubUtils/sdkUtil';
import { Service } from 'egg';
import { RedisClient } from 'redis';
import { REDIS_KEY } from '@consts';
import Role from '@db/Role';
import { RoleModel } from '@db/Role';
/**
* Test Service
@@ -24,7 +24,7 @@ export default class Sdk extends Service {
let roleId = params[`q${curConfig.roleIndex}`];
if(!roleId) return 0;
let role = await Role.findByRoleId(roleId);
let role = await RoleModel.findByRoleId(roleId);
if(!role) return 0;
let rec = await SurveyRecModel.findByRoleIdAndId(roleId, params.activity);