ios:审核服判断逻辑

This commit is contained in:
luying
2022-06-23 09:39:46 +08:00
parent 5e5b052aa0
commit f105c79837
9 changed files with 77 additions and 6 deletions

View File

@@ -60,6 +60,12 @@ export default class Region extends BaseModel {
@prop({ required: true, type: () => ServerStategy, _id: false })
stategy: ServerStategy; // 策略配置
@prop({ required: true })
reviewEnv: string; // 对应的审核服
@prop({ required: true })
reviewVersion: string; // 大于这个版本的都是审核服
public static async createNewRegion(params: RegionUpdate, uid = 1) {
let id = await CounterAllModal.getNewCounter(COUNTER.REGION);

View File

@@ -40,6 +40,9 @@ export default class Serverlist extends BaseModel {
@prop({ required: true })
env: string; // 环境变量
@prop({ required: true })
isReview: boolean; // 是否是审核服
@prop({ required: true })
prefix: string; // 前缀
@@ -143,9 +146,14 @@ export default class Serverlist extends BaseModel {
return server;
}
public static async findByEnv(env?: string) {
let server: ServerlistType[] = await ServerlistModel.find({ env, serverStatus: { $gt: 0 } }).sort({ id: -1 }).lean({ getters: true, virtuals: true });
return server;
public static async findByEnv(env?: string, isReview = false) {
if(isReview) {
let server: ServerlistType[] = await ServerlistModel.find({ env, serverStatus: { $gt: 0 }, isReview }).sort({ id: -1 }).lean({ getters: true, virtuals: true });
return server;
} else {
let server: ServerlistType[] = await ServerlistModel.find({ env, serverStatus: { $gt: 0 } }).sort({ id: -1 }).lean({ getters: true, virtuals: true });
return server;
}
}
//根据多个活动id查询活动数据

View File

@@ -78,6 +78,8 @@ export class UpdateRegionParams {
versionCode: string = '';
curVersion: string = '';
updateResUrl: string = '';
reviewVersion: string = '';
reviewEnv: string = '';
maxPlayerCnt: number = 0;
timers: SERVER_TIMER[] = [];
@@ -117,6 +119,8 @@ export class UpdateRegionParams {
remark: this.remark,
versionCode: this.versionCode,
curVersion: this.curVersion,
reviewVersion: this.reviewVersion,
reviewEnv: this.reviewEnv,
updateResUrl: this.updateResUrl,
stategy
}
@@ -128,6 +132,8 @@ export class UpdateRegionParams {
remark: this.remark||oldRegion.remark,
versionCode: this.versionCode||oldRegion.versionCode,
curVersion: this.curVersion||oldRegion.curVersion,
reviewVersion: this.reviewVersion||oldRegion.reviewVersion,
reviewEnv: this.reviewEnv||oldRegion.reviewEnv,
updateResUrl: this.updateResUrl||oldRegion.updateResUrl,
stategy: { ...(oldRegion.stategy||{}), ...stategy }
}