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

init

Browse Source
This commit is contained in:
xy
2026-03-13 01:38:40 +00:00
parent e6e4f88257
commit 28855885cd
311 changed files with 89544 additions and 94350 deletions
Download Patch File Download Diff File Expand all files Collapse all files
web-server/app/service/Auth.ts
+68 -56
View File
@@ -1,23 +1,23 @@
import { COUNTER, DEFAULT_LV, ADULT_AGE, GUEST_MAX_TIME, BLOCK_TYPE, DEBUG_MAGIC_WORD } from '@consts';
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';
import { COUNTER, DEFAULT_LV, ADULT_AGE, GUEST_MAX_TIME, BLOCK_TYPE, DEBUG_MAGIC_WORD } from '../../../shared/consts';
import { RoleModel, WarStar } from '../../../shared/db/Role';
import { UserModel, UserType } from '../../../shared/db/User';
import { STATUS, GET_SMS_TYPE, ADDICTION_PREVENTION_CODE } from '../../../shared/consts';
import { smsModel } from '../../../shared/db/Sms';
import { Service } from 'egg';
import Counter from '@db/Counter';
import { gameData, getExpByLv } from '../pubUtils/data';
import Counter from '../../../shared/db/Counter';
import { gameData, getExpByLv } from '../../../shared/pubUtils/data';
import { isString } from 'underscore';
import { getAge, nowSeconds } from '../pubUtils/timeUtil';
import { isDevelopEnv, resResult } from '../pubUtils/util';
import { checkTeeanAgerTime } from '../pubUtils/authenticateUtil';
// import { authenticate } from '../pubUtils/httpUtil';
import { getChannelId, loginValidata } from '../pubUtils/sdkUtil';
import { LoginValidateData37 } from 'app/domain/sdk';
import { ServerlistModel } from '@db/Serverlist';
import { DicWar } from '../pubUtils/dictionary/DicWar';
import { RScriptRecordModel } from '@db/RScriptRecord';
import { deletRole } from '../pubUtils/roleUtil';
import { getAge, nowSeconds } from '../../../shared/pubUtils/timeUtil';
import { isDevelopEnv, resResult } from '../../../shared/pubUtils/util';
import { checkTeeanAgerTime } from '../../../shared/pubUtils/authenticateUtil';
// import { authenticate } from '../../../shared/pubUtils/httpUtil';
import { getChannelId, loginValidata } from '../../../shared/pubUtils/sdkUtil';
import { LoginValidateData37 } from '../../../shared/domain/sdk';
import { ServerlistModel } from '../../../shared/db/Serverlist';
import { DicWar } from '../../../shared/pubUtils/dictionary/DicWar';
import { RScriptRecordModel } from '../../../shared/db/RScriptRecord';
import { deletRole } from '../../../shared/pubUtils/roleUtil';
/**
* Test Service
@@ -51,7 +51,7 @@ export default class Auth extends Service {
if (getuiCID) {//更新个推cid
await UserModel.updateGetuiCID(tel, getuiCID);
}
if(user && user.userCode) {
if (user && user.userCode) {
ctx.service.utils.checkOnlineUser(user.userCode);
}
let param = this.getReturnParam(user, null);
@@ -74,7 +74,7 @@ export default class Auth extends Service {
if (getuiCID) {//更新个推cid
await UserModel.updateGetuiCID(user.tel, getuiCID);
}
if(user && user.userCode) {
if (user && user.userCode) {
ctx.service.utils.checkOnlineUser(user.userCode);
}
let param = this.getReturnParam(user, oldUser.deviceId);
@@ -113,7 +113,7 @@ export default class Auth extends Service {
}
}
public checkTelNo(telNo) {
public checkTelNo(telNo: string) {
if (!isString(telNo)) {
return { status: 1, resResult: resResult(STATUS.WRONG_PARMS) };
}
@@ -123,7 +123,9 @@ export default class Auth extends Service {
return { status: 0 };
}
async sendSmsCodeByGuodu(tel, code) {
async sendSmsCodeByGuodu(tel: string, code: string) {
console.log("准备发送短信...");
const ctx = this.ctx;
const url = `http://221.179.172.68:8000/QxtSms/QxtFirewall?OperID=bantu3&OperPass=c8XcTffG&DesMobile=${tel}&Content=${encodeURIComponent(`【同人游戏】验证码${code}，您正在登录赵云传，若非本人操作，请勿泄露`)}&Content_Code=1`;
const result = await ctx.curl(url, {
@@ -132,7 +134,7 @@ export default class Auth extends Service {
return result.data;
}
testLimit(sms, interval) {
testLimit(sms: any, interval: number) {
if (sms.updateTime.getTime() > Date.now() - interval) {
return true;
}
@@ -146,6 +148,7 @@ export default class Auth extends Service {
public async getSms(type: number, tel: string) {
const ctx = this.ctx;
console.log("准备发送短信...");
const telVerify = this.checkTelNo(tel);
if (telVerify.status !== 0) {
@@ -158,8 +161,16 @@ export default class Auth extends Service {
return ctx.service.utils.resResult(STATUS.TEL_HAS_USED);
}
}
console.log(2, tel);
let sms: any;
try {
sms = await smsModel.findByTel(tel, false);
} catch (error) {
console.log(error);
}
console.log(3, sms);
const sms = await smsModel.findByTel(tel, false);
if (sms) {
if (await sms.timeLimit(10000)) {
return this.ctx.service.utils.resResult(STATUS.SMS_IN_60S);
@@ -168,7 +179,7 @@ export default class Auth extends Service {
return this.ctx.service.utils.resResult(STATUS.SMS_CNT_LIMIT);
}
}
console.log(sms);
let code = '';
if (sms && (!sms.used || sms.isFixed)) {
code = sms.code;
@@ -176,6 +187,7 @@ export default class Auth extends Service {
code = this.ctx.service.utils.generateNum(6);
}
const smsResult = await this.sendSmsCodeByGuodu(tel, code);
console.log(smsResult);
await smsModel.updateByTel(tel, code, false, new Date(), sms?.hasSendToday() ? sms.countToday + 1 : 1);
@@ -225,11 +237,11 @@ export default class Auth extends Service {
// 用户注册登录
const token = ctx.service.utils.generateStr(256);
const {user, deviceId: oldDeviceId} = await UserModel.createOrUpdate(false, tel, token, platform, pkgName, serverType, deviceId, ctx.clientIp);
const { user, deviceId: oldDeviceId } = await UserModel.createOrUpdate(false, tel, token, platform, pkgName, serverType, deviceId, ctx.clientIp);
if (getuiCID) {//更新个推cid
await UserModel.updateGetuiCID(tel, getuiCID);
}
if(user && user.userCode) {
if (user && user.userCode) {
ctx.service.utils.checkOnlineUser(user.userCode);
}
let param = this.getReturnParam(user, oldDeviceId);
@@ -289,12 +301,12 @@ export default class Auth extends Service {
// 用户注册登录
const token = ctx.service.utils.generateStr(256);
const {user, deviceId: oldDeviceId} = await UserModel.checkPass(tel, pw, token, deviceId);
const { user, deviceId: oldDeviceId } = await UserModel.checkPass(tel, pw, token, deviceId);
if (!user) return ctx.service.utils.resResult(STATUS.PASSWORD_ERR);
if (getuiCID) {//更新个推cid
await UserModel.updateGetuiCID(tel, getuiCID);
}
if(user && user.userCode) {
if (user && user.userCode) {
ctx.service.utils.checkOnlineUser(user.userCode);
}
let param = this.getReturnParam(user, oldDeviceId);
@@ -305,14 +317,14 @@ export default class Auth extends Service {
const ctx = this.ctx;
const { uid } = ctx;
let canLogin = await this.ctx.service.utils.validateCanLogin();
if(!canLogin) return this.ctx.service.utils.resResult(STATUS.ONLINE_USER_MAX);
if (!canLogin) return this.ctx.service.utils.resResult(STATUS.ONLINE_USER_MAX);
const role = await RoleModel.findByUid(uid, serverId, 'roleId blockType +closeTime');
if (role) {
if(role.blockType == BLOCK_TYPE.BLOCK) {
if (role.blockType == BLOCK_TYPE.BLOCK) {
return ctx.service.utils.resResult(STATUS.BLOCKED);
}
if(role.closeTime > 0 && role.closeTime < nowSeconds()) {
if (role.closeTime > 0 && role.closeTime < nowSeconds()) {
return ctx.service.utils.resResult(STATUS.ROLE_CLOSED);
}
return ctx.service.utils.resResult(STATUS.SUCCESS, { roleId: role.roleId });
@@ -325,12 +337,12 @@ export default class Auth extends Service {
const ctx = this.ctx;
const { uid } = ctx;
const exist = await RoleModel.exists({ 'userInfo.uid': uid, serverId });
if (exist === true) {
if (exist) {
return ctx.service.utils.resResult(STATUS.ROLE_EXIST);
}
const server = await ServerlistModel.findByServerId(serverId);
if(!server) return ctx.service.utils.resResult(STATUS.SERVER_NOT_FOUND);
if(nowSeconds() > server.stopRegisterTime) return ctx.service.utils.resResult(STATUS.SERVER_STOP_REGISTER);
if (!server) return ctx.service.utils.resResult(STATUS.SERVER_NOT_FOUND);
if (nowSeconds() > server.stopRegisterTime) return ctx.service.utils.resResult(STATUS.SERVER_STOP_REGISTER);
const roleId = ctx.service.utils.genCode(10);
const code = ctx.service.utils.genCode(6);
@@ -338,7 +350,7 @@ export default class Auth extends Service {
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) { // 审核服跳关卡
if (server.isReview) { // 审核服跳关卡
await this.skipPrologueWhenReview(roleId);
}
return ctx.service.utils.resResult(STATUS.SUCCESS, { roleId: role.roleId });
@@ -348,12 +360,12 @@ export default class Auth extends Service {
private async skipPrologueWhenReview(roleId: string) {
const fromWarId = 101, toWarId = 103;
let warStars: WarStar[] = [];
let warStars: WarStar[] = [];
let insertParams: DicWar[] = [];
for(let i = fromWarId; i <= toWarId; i++) {
for (let i = fromWarId; i <= toWarId; i++) {
let dicWar = gameData.war.get(i);
insertParams.push(dicWar);
if(i < toWarId) warStars.push({ id: dicWar.war_id, warType: dicWar.warType, star: 0, stars: [] });
if (i < toWarId) warStars.push({ id: dicWar.war_id, warType: dicWar.warType, star: 0, stars: [] });
}
await RScriptRecordModel.insertScripts(roleId, insertParams, [toWarId]);
await RoleModel.updateRoleInfo(roleId, { warStar: warStars, mainWarId: toWarId - 1 })
@@ -432,22 +444,22 @@ export default class Auth extends Service {
channelType: string, pst: string, clientId: string, deviceId: string, platform: string, platformAppid: string, childGameId: number, pkgName: string, serverType: string, getuiCID: string, distinctId: string
}) {
const { channelType, pst, clientId, deviceId, platform, platformAppid, childGameId, pkgName, serverType, getuiCID } = params;
const ctx = this.ctx;
let requestResult = await loginValidata(channelType, { clientId, pst, platform, platformAppid, childGameId });
if(!requestResult) return this.ctx.service.utils.resResult(STATUS.CHANNEL_ERR);
if (!requestResult) return this.ctx.service.utils.resResult(STATUS.CHANNEL_ERR);
if(requestResult.code != 1) {
if (requestResult.code != 1) {
return this.ctx.service.utils.resResult(STATUS.VALIDATE_ERR, requestResult);
}
let channelId = getChannelId(channelType, requestResult.data.uid);
const token = ctx.service.utils.generateStr(256);
let { user, deviceId: oldDeviceId } = await UserModel.createOrUpdateChannelUser(channelId, channelType, {
...requestResult.data, childGameId:`${childGameId}`, platformAppid
...requestResult.data, childGameId: `${childGameId}`, platformAppid
}, token, platform, pkgName, serverType, deviceId, ctx.clientIp);
if(user && user.userCode) {
if (user && user.userCode) {
ctx.service.utils.checkOnlineUser(user.userCode);
}
@@ -455,7 +467,7 @@ export default class Auth extends Service {
await UserModel.updateGetuiCIDByChannel(channelId, getuiCID);
}
let channelInfo: any = {};
if(channelType == '37') {
if (channelType == '37') {
channelInfo.uid = (<LoginValidateData37>user.channelInfo).uid;
}
return ctx.service.utils.resResult(STATUS.SUCCESS, {
@@ -468,36 +480,36 @@ export default class Auth extends Service {
});
}
public async deleteRole(roleId: string, magicWord: string) {
console.log('enter Auth deleteRole');
const ctx = this.ctx;
if(magicWord != DEBUG_MAGIC_WORD) {
if (magicWord != DEBUG_MAGIC_WORD) {
return ctx.service.utils.resResult(STATUS.WRONG_PARMS);
}
if(!isDevelopEnv(ctx.app.config.realEnv)) {
if (!isDevelopEnv(ctx.app.config.realEnv)) {
return ctx.service.utils.resResult(STATUS.DEVELOP_ONLY);
}
let result = await deletRole(roleId);
if(!result) return ctx.service.utils.resResult(STATUS.WRONG_PARMS);
if (!result) return ctx.service.utils.resResult(STATUS.WRONG_PARMS);
return ctx.service.utils.resResult(STATUS.SUCCESS);
}
public async closeAccount(roleId: string) {
const ctx = this.ctx;
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() )
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);
if (role.closeTime > 0) return ctx.service.utils.resResult(STATUS.ROLE_CLOSED);
role = await RoleModel.closeAccount(roleId, nowSeconds() + 15 * 24 * 60 * 60);
return ctx.service.utils.resResult(STATUS.SUCCESS, { closeTime: role.closeTime });
}
private getCdTimeStr(cancelCloseTime: number) {
let gap = cancelCloseTime + 24 * 60 * 60 - nowSeconds();
let h = Math.floor(gap/60/60);
let m = Math.floor((gap - h * 60 * 60 )/60);
let h = Math.floor(gap / 60 / 60);
let m = Math.floor((gap - h * 60 * 60) / 60);
let s = gap - h * 60 * 60 - m * 60;
return `${h}小时${m}分${s}秒`
}
@@ -505,10 +517,10 @@ export default class Auth extends Service {
public async cancelCloseAccount(roleId: string) {
const ctx = this.ctx;
let role = await RoleModel.findByRoleId(roleId, '+cancelCloseTime userInfo');
if(!role || role.userInfo.uid != ctx.uid ) return ctx.service.utils.resResult(STATUS.ROLE_NOT_FOUND);
if (!role || role.userInfo.uid != ctx.uid) return ctx.service.utils.resResult(STATUS.ROLE_NOT_FOUND);
role = await RoleModel.cancelCloseAccount(roleId, nowSeconds());
if(!role) return ctx.service.utils.resResult(STATUS.ROLE_CLOSE_TIME_OVER);
if (!role) return ctx.service.utils.resResult(STATUS.ROLE_CLOSE_TIME_OVER);
return ctx.service.utils.resResult(STATUS.SUCCESS, { closeTime: role.closeTime });
}
web-server/app/service/Sdk.ts
+34 -34
View File
@@ -1,24 +1,24 @@
import { Service } from 'egg';
import { REDIS_KEY, PAY_37_CALLBACK_CODE, SDK_37_CONST, ORDER_STATE, SDK_37_TREAT_CODE, SERVER_STATUS, SDK_37_REFUND_CODE, SDK_37_ACTIVITY_CODE, PUBLIC_ACCOUNT_GIFT, GIFT_GENERATE_TYPE, GIFT_TYPE } from '@consts';
import { GetGuildInfoByUserParam, GetRoleByServerParam, GetRoleByUidParam, GetServerAndUidParam, GetServerListParam, GetServerParam, GuildNameCallBackParam, IOSRefundParam, PayCallback37Data, RoleNameCallBackParam, SendGiftCodeParam } from '../domain/sdk';
import { REDIS_KEY, PAY_37_CALLBACK_CODE, SDK_37_CONST, ORDER_STATE, SDK_37_TREAT_CODE, SERVER_STATUS, SDK_37_REFUND_CODE, SDK_37_ACTIVITY_CODE, PUBLIC_ACCOUNT_GIFT, GIFT_GENERATE_TYPE, GIFT_TYPE } from '../../../shared/consts';
import { GetGuildInfoByUserParam, GetRoleByServerParam, GetRoleByUidParam, GetServerAndUidParam, GetServerListParam, GetServerParam, GuildNameCallBackParam, IOSRefundParam, PayCallback37Data, RoleNameCallBackParam, SendGiftCodeParam } from '../../../shared/domain/sdk';
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 { RoleModel } from '@db/Role';
import { gameData } from 'app/pubUtils/data';
import { resResult } from 'app/pubUtils/util';
import { UserModel } from '@db/User';
import { UserGuildModel } from '@db/UserGuild';
import { GuildModel } from '@db/Guild';
import { ServerlistModel } from '@db/Serverlist';
import { checkParamPrice, get37GetServerMd5Sign, get37Md5SignA, get37Md5SignB, getChannelId, getRedisSubChannel, md5 } from '../../../shared/pubUtils/sdkUtil';
import { UserOrderModel } from '../../../shared/db/UserOrder';
import { nowSeconds } from '../../../shared/pubUtils/timeUtil';
import { RoleModel } from '../../../shared/db/Role';
import { gameData } from '../../../shared/pubUtils/data';
import { resResult } from '../../../shared/pubUtils/util';
import { UserModel } from '../../../shared/db/User';
import { UserGuildModel } from '../../../shared/db/UserGuild';
import { GuildModel } from '../../../shared/db/Guild';
import { ServerlistModel } from '../../../shared/db/Serverlist';
import moment = require('moment');
import { RegionModel } from '@db/Region';
import { ActivityPublicAccountCodeModel } from '@db/ActivityPublicAccountCode';
import { GiftCodeDetailModel } from '@db/GiftCodeDetail';
import { GiftCodeModel } from '@db/GiftCode';
import { UserGiftCodeDetailModel } from '@db/UserGiftCodeDetail';
import { RegionModel } from '../../../shared/db/Region';
import { ActivityPublicAccountCodeModel } from '../../../shared/db/ActivityPublicAccountCode';
import { GiftCodeDetailModel } from '../../../shared/db/GiftCodeDetail';
import { GiftCodeModel } from '../../../shared/db/GiftCode';
import { UserGiftCodeDetailModel } from '../../../shared/db/UserGiftCodeDetail';
/**
* Test Service
@@ -79,9 +79,9 @@ export default class Sdk extends Service {
}
ctx.service.utils.log('DEBUG', `[${ctx.request.url}] [${ctx.logcode}] pay37Callback save order check ok`);
let redisClient: RedisClient = app.context.redisClient;
let redisClient: RedisClient = (app.context as any).redisClient;
let name = getRedisSubChannel(REDIS_KEY.PAY_CHANNEL, app.config.env);
let result = await redisClient.publishAsync(name, JSON.stringify(params));
let result = await (redisClient as any).publishAsync(name, JSON.stringify(params));
if(result == 0) {
return ctx.service.utils.resResult(PAY_37_CALLBACK_CODE.SERVER_IS_BUSY, '');
}
@@ -140,7 +140,7 @@ export default class Sdk extends Service {
// let redisClient: RedisClient = app.context.redisClient;
// let name = getRedisSubChannel(REDIS_KEY.PAY_CHANNEL, app.config.env);
// let result = await redisClient.publishAsync(name, JSON.stringify(params));
// let result = await (redisClient as any).publishAsync(name, JSON.stringify(params));
// if(result == 0) {
// return ctx.service.utils.resResult(PAY_IOS_37_CALLBACK_CODE.SERVER_IS_BUSY, '');
// }
@@ -193,9 +193,9 @@ export default class Sdk extends Service {
}
console.log('*****refundIOSCallback save order check ok')
let redisClient: RedisClient = app.context.redisClient;
let redisClient: RedisClient = (app.context as any).redisClient;
let name = getRedisSubChannel(REDIS_KEY.REFUND_CHANNEL, app.config.env);
let result = await redisClient.publishAsync(name, JSON.stringify(params));
let result = await (redisClient as any).publishAsync(name, JSON.stringify(params));
if(result == 0) {
return ctx.service.utils.resResult(SDK_37_REFUND_CODE.FAIL, '');
}
@@ -262,9 +262,9 @@ export default class Sdk extends Service {
}
// 2. redis发布
let redisClient: RedisClient = app.context.redisClient;
let redisClient: RedisClient = (app.context as any).redisClient;
let name = getRedisSubChannel(REDIS_KEY.TREAT_ROLE_CHANNEL, app.config.env);
let result = await redisClient.publishAsync(name, role.roleId);
let result = await (redisClient as any).publishAsync(name, role.roleId);
if(result == 0) {
console.error('用户名违规处理, 未发布到订阅频道');
return SDK_37_TREAT_CODE.ERR.code;
@@ -288,10 +288,10 @@ export default class Sdk extends Service {
}
// 2. redis发布
let redisClient: RedisClient = app.context.redisClient;
let redisClient: RedisClient = (app.context as any).redisClient;
let name = getRedisSubChannel(REDIS_KEY.TREAT_GUILD_CHANNEL, app.config.env);
let content = JSON.stringify({ code: guild.code, serverId: params.sid, type: params.type });
let result = await redisClient.publishAsync(name, content);
let result = await (redisClient as any).publishAsync(name, content);
if(result == 0) {
return SDK_37_TREAT_CODE.ERR.code;
}
@@ -375,7 +375,7 @@ export default class Sdk extends Service {
}
public reportTAEventWithDistinctId(distinctId: string, eventName: string, properties: any, ip: string) {
let ta = this.app.context.ta;
let ta = (this.app.context as any).ta;
if(!ta) return
let event = {
// 账号 ID （可选)
@@ -390,7 +390,7 @@ export default class Sdk extends Service {
ip: ip,
// 事件属性 (可选)
properties,
callback(err) {
callback(err: any) {
console.log('*****测试接入事件', err)
}
@@ -399,7 +399,7 @@ export default class Sdk extends Service {
}
public reportTAEventWithRoleIdAndDistinctId(roleId: string, distinctId: string, eventName: string, properties: any, ip?: string) {
let ta = this.app.context.ta;
let ta = (this.app.context as any).ta;
if(!ta) return
let event = {
// 账号 ID （可选)
@@ -414,7 +414,7 @@ export default class Sdk extends Service {
ip: ip,
// 事件属性 (可选)
properties,
callback(err) {
callback(err: any) {
console.log('*****测试接入事件', err)
}
@@ -484,7 +484,7 @@ export default class Sdk extends Service {
await GiftCodeDetailModel.increaseUsedNum(giftCodeDetail.code);
await GiftCodeModel.increaseUsedNum(giftCode.id);
await ctx.service.utils.pushGiftCodeChannel(role.roleId, giftCode.id);
await ctx.service.utils.pushGiftCodeChannel(String(role.roleId), String(giftCode.id));
}
return resResult(SDK_37_ACTIVITY_CODE.SUCCESS, []);
@@ -564,8 +564,8 @@ export default class Sdk extends Service {
let user = await UserModel.findUserByChannel(channelId);
if(!user) return resResult(SDK_37_ACTIVITY_CODE.ROLE_NOT_FOUND);
let redisClient: RedisClient = this.ctx.app.context.redisClient;
let servers = await redisClient.hgetallAsync(REDIS_KEY.SERVER);
let redisClient: RedisClient = (this.ctx.app.context as any).redisClient;
let servers = await (redisClient as any).hgetallAsync(REDIS_KEY.SERVER);
let roles = await RoleModel.findAllByUid(user.uid);
let result = roles
.filter(role => !role.closeTime || role.closeTime > nowSeconds())
@@ -661,7 +661,7 @@ export default class Sdk extends Service {
}
} catch(e) {
console.error(e);
return { state: 0, data: null, msg: SDK_37_ACTIVITY_CODE.INTERNAL_ERR };
return { state: 0, data: null as any, msg: SDK_37_ACTIVITY_CODE.INTERNAL_ERR };
}
}
web-server/app/service/TurboCore.ts
+2 -2
View File
@@ -57,7 +57,7 @@ export default class TurboCore extends Service {
* @param params 参数列表
* @param secret 密钥
*/
private getTurboSign(params, secret) {
private getTurboSign(params: any, secret: string) {
const paramsString = this.joinParamsStr(params);
let stringToSign = paramsString;
@@ -74,7 +74,7 @@ export default class TurboCore extends Service {
* 将参数组合成字符串
* @param params 参数列表
*/
private joinParamsStr(params) {
private joinParamsStr(params: any) {
const signString = Object.keys(params).filter(function(key) {
return params[key] !== undefined && params[key] !== '' && [ 'pfx', 'partner_key', 'sign', 'key' ].indexOf(key) < 0;
}).sort()
web-server/app/service/Update.ts
+2 -2
View File
@@ -1,5 +1,5 @@
import { STATUS, } from '@consts';
import { RegionType } from '@db/Region';
import { STATUS, } from '../../../shared/consts';
import { RegionType } from '../../../shared/db/Region';
import { Service } from 'egg';
// let fs = require("fs");
web-server/app/service/Utils.ts
+37 -20
View File
@@ -1,12 +1,12 @@
import { Service } from 'egg';
import { resResult as pubResult } from '../pubUtils/util';
import { gameData } from 'app/pubUtils/data';
import { resResult as pubResult } from '../../../shared/pubUtils/util';
import { gameData } from '../../../shared/pubUtils/data';
import { RedisClient } from 'redis';
import { REDIS_KEY, SERVER_STATUS } from '@consts';
import { getRedisSubChannel } from 'app/pubUtils/sdkUtil';
import { ServerlistType } from '@db/Serverlist';
import { nowSeconds } from 'app/pubUtils/timeUtil';
import { checkWhiteList } from 'app/pubUtils/sysUtil';
import { REDIS_KEY, SERVER_STATUS } from '../../../shared/consts';
import { getRedisSubChannel } from '../../../shared/pubUtils/sdkUtil';
import { ServerlistType } from '../../../shared/db/Serverlist';
import { nowSeconds } from '../../../shared/pubUtils/timeUtil';
import { checkWhiteList } from '../../../shared/pubUtils/sysUtil';
const csprng = require('csprng');
/**
* Utils Service
@@ -21,7 +21,7 @@ export default class Utils extends Service {
return `${csprng(len, radix)}`;
}
public genCode(len) {
public genCode(len: number) {
const chars = '123456789ABCDEFGHJKLMNPQRSTWXYZabcdefghijklmnopqrstuvwxyz';
const charArr = chars.split('');
let code = '';
@@ -43,7 +43,7 @@ export default class Utils extends Service {
return code;
}
public resResult(status: {code: number, simStr: string}, data?, customMsg?: string) {
public resResult(status: {code: number, simStr: string}, data?: any, customMsg?: string) {
return pubResult(status, data, customMsg);
}
@@ -62,18 +62,18 @@ export default class Utils extends Service {
}
public async checkOnlineUser(userCode: string) {
let redisClient: RedisClient = this.ctx.app.context.redisClient;
let onlineRoleId = await redisClient.hgetAsync(REDIS_KEY.USER_CODE, userCode);
let redisClient: RedisClient = (this.ctx.app.context as any).redisClient;
let onlineRoleId = await (redisClient as any).hgetAsync(REDIS_KEY.USER_CODE, userCode);
let isWhiteList = await checkWhiteList(this.ctx.app.config.realEnv, this.ctx.clientIp, this.ctx.uid);
if (!isWhiteList && !!onlineRoleId) { // 多地登陆踢下线
let str = await redisClient.hgetAsync(REDIS_KEY.ONLINE_USERS, onlineRoleId);
let str = await (redisClient as any).hgetAsync(REDIS_KEY.ONLINE_USERS, onlineRoleId);
if(str) {
try {
let [,sid] = str?.split('|')??[];
let name = getRedisSubChannel(REDIS_KEY.USER_CHANNEL, this.ctx.app.config.env);
await redisClient.publishAsync(name, `${sid}|${onlineRoleId}`);
await (redisClient as any).publishAsync(name, `${sid}|${onlineRoleId}`);
} catch(e) {
console.error('checkOnlineUser', e);
}
@@ -82,22 +82,22 @@ export default class Utils extends Service {
}
public async pushPubAccountGiftChannel(activityId: number, userCode: string, channelId: string) {
let redisClient: RedisClient = this.ctx.app.context.redisClient;
let redisClient: RedisClient = (this.ctx.app.context as any).redisClient;
try {
let name = getRedisSubChannel(REDIS_KEY.PUBLIC_ACCOUNT_GIFT, this.ctx.app.config.env);
await redisClient.publishAsync(name, `${activityId}|${userCode}|${channelId}`);
await (redisClient as any).publishAsync(name, `${activityId}|${userCode}|${channelId}`);
} catch(e) {
console.error('pushPubAccountGiftChannel', e);
}
}
public async pushGiftCodeChannel(roleId: string, giftCode: string) {
let redisClient: RedisClient = this.ctx.app.context.redisClient;
let redisClient: RedisClient = (this.ctx.app.context as any).redisClient;
try {
let name = getRedisSubChannel(REDIS_KEY.SEND_GIFT_CODE, this.ctx.app.config.env);
await redisClient.publishAsync(name, `${roleId}|${giftCode}`);
await (redisClient as any).publishAsync(name, `${roleId}|${giftCode}`);
} catch(e) {
console.error('pushPubAccountGiftChannel', e);
}
@@ -109,9 +109,9 @@ export default class Utils extends Service {
if(gameData.serverConst.CLOSE_LOGIN == 1) return false;
if(gameData.serverConst.CLOSE_LOGIN_WHEN_ONLINE_MAX) {
let redisClient: RedisClient = this.ctx.app.context.redisClient;
let count = await redisClient.hlenAsync(REDIS_KEY.ONLINE_USERS);
const Max = await redisClient.getAsync(REDIS_KEY.MAX_ONLINE_USERS);
let redisClient: RedisClient = (this.ctx.app.context as any).redisClient;
let count = await (redisClient as any).hlenAsync(REDIS_KEY.ONLINE_USERS);
const Max = await (redisClient as any).getAsync(REDIS_KEY.MAX_ONLINE_USERS);
console.log('validateCanLogin:', count, Max);
if(Max && count >= parseInt(Max)) {
@@ -128,11 +128,28 @@ export default class Utils extends Service {
// 比较以 . 分隔的版本号。返回 0 则版本号相等，返回正数则 versionA 大，返回负数则 versionB 大
public compareVersion (versionA: string, versionB: string) {
if (!versionA && !versionB) {
return 0;
}
if (!versionA) {
return -1;
}
if (!versionB) {
return 1;
}
var vA = versionA.split('.');
var vB = versionB.split('.');
for (var i = 0; i < vA.length; ++i) {
var a = parseInt(vA[i]);
var b = parseInt(vB[i] || '0');
if (isNaN(a) || isNaN(b)) {
if (a === b) {
continue;
} else {
return isNaN(a) ? -1 : 1;
}
}
if (a === b) {
} else {
web-server/app/service/Wjx.ts
+2 -2
View File
@@ -1,7 +1,7 @@
import { SurveyRecModel } from '@db/SurveyRec';
import { SurveyModel } from '@db/Survery';
import { checkWjxSign, getRedisSubChannel } from 'app/pubUtils/sdkUtil';
import { checkWjxSign, getRedisSubChannel } from '@pubUtils/sdkUtil';
import { Service } from 'egg';
import { RedisClient } from 'redis';
import { REDIS_KEY } from '@consts';
@@ -33,7 +33,7 @@ export default class Sdk extends Service {
rec = await SurveyRecModel.createSurveyRec(roleId, params.activity, params.index, JSON.stringify(params));
// 3. 发邮件
let redisClient: RedisClient = this.app.context.redisClient;
let redisClient: RedisClient = (this.app.context as any).redisClient;
let name = getRedisSubChannel(REDIS_KEY.SURVEY_CHANNEL, this.app.config.env);
let result = await redisClient.publishAsync(name, rec.code);
if(result == 0) {