配置:去除stable服env的特殊处理

This commit is contained in:
luying
2021-12-08 14:59:01 +08:00
parent b51a2839da
commit 02c2096704
14 changed files with 66 additions and 75 deletions
-1
View File
@@ -31,7 +31,6 @@ export default class GameController extends Controller {
let serverList = new Array<GroupParam>();
let loginServerList = new Array<ServerParamWithRole>();
console.log('****', ctx.app.config.realEnv)
let allServers = await ServerlistModel.findByEnv(ctx.app.config.realEnv);
let roles = await RoleModel.findAllByUid(uid, true, true);
for (let server of allServers) {
+4 -2
View File
@@ -1,12 +1,14 @@
import { STATUS } from '@consts';
import { ServerlistModel } from '@db/Serverlist';
import { nowSeconds } from 'app/pubUtils/timeUtil';
import { checkWhiteList } from 'app/pubUtils/util';
module.exports = () => {
return async function checkMainten(ctx, next) {
const { serverId } = ctx.request.body;
if (serverId) {
let maintenServers = await ctx.service.game.getServerMainten();
if (maintenServers.indexOf(serverId) != -1) {
let server = await ServerlistModel.findByServerId(serverId);
if (server && server.maintenance && server.maintenance.isOpen && server.maintenance.startTime < nowSeconds() && server.maintenance.endTime > nowSeconds()) {
let isWhiteList = await checkWhiteList(ctx.tel, ctx.request.ip);
if (isWhiteList) {
await next();
-33
View File
@@ -1,33 +0,0 @@
import { Service } from 'egg';
/**
* Test Service
*/
export default class Game extends Service {
// public setServerMainten(maintenServers: number[]) {
// return this.app['maintenServers'] = maintenServers;
// }
public async getServerMainten() {
// // return this.app['maintenServers']||[];
// const maintenance = await MaintenanceModel.findOpenMaintenance();
// if(maintenance) {
// return maintenance.serverIds;
// } else {
// return [];
// }
return []
}
// public async readDbMaintenance() {
// const maintenance = await MaintenanceModel.findOpenMaintenance();
// if(maintenance) {
// this.setServerMainten(maintenance.serverIds);
// }
// }
}
-2
View File
@@ -7,7 +7,6 @@ type AnyFunc<T = any> = (...args: any[]) => T;
type CanExportFunc = AnyFunc<Promise<any>> | AnyFunc<IterableIterator<any>>;
type AutoInstanceType<T, U = T extends CanExportFunc ? T : T extends AnyFunc ? ReturnType<T> : T> = U extends AnyClass ? InstanceType<U> : U;
import ExportAuth from '../../../app/service/Auth';
import ExportGame from '../../../app/service/Game';
import ExportSdk from '../../../app/service/Sdk';
import ExportTest from '../../../app/service/Test';
import ExportTurboCore from '../../../app/service/TurboCore';
@@ -17,7 +16,6 @@ import ExportUtils from '../../../app/service/Utils';
declare module 'egg' {
interface IService {
auth: AutoInstanceType<typeof ExportAuth>;
game: AutoInstanceType<typeof ExportGame>;
sdk: AutoInstanceType<typeof ExportSdk>;
test: AutoInstanceType<typeof ExportTest>;
turboCore: AutoInstanceType<typeof ExportTurboCore>;