diff --git a/game-server/app/servers/connector/filter/global.ts b/game-server/app/servers/connector/filter/global.ts index b808190b5..5c09bac0f 100644 --- a/game-server/app/servers/connector/filter/global.ts +++ b/game-server/app/servers/connector/filter/global.ts @@ -2,13 +2,14 @@ import {Application, RouteRecord, FrontendOrBackendSession, HandlerCallback, pin // import { checkEvent } from '../../../services/eventSercive'; import { refresh } from '../../../services/refreshService'; import { checkPrivateChat, checkGuildChat, checkOtherChat, checkRoleName, checkGuildName } from "../../../services/sdkService"; -import { resResult, checkWhiteList, genCode, isCheckWord } from "../../../pubUtils/util"; +import { resResult, checkWhiteList, genCode } from "../../../pubUtils/util"; import { BLOCK_TYPE, CHANNEL_PREFIX, MSG_TYPE, PUSH_ROUTE, STATUS } from "../../../consts"; import { nowSeconds } from "../../../pubUtils/timeUtil"; import { getServerMainten } from "../../../services/gmService"; import { errlogger } from "../../../util/logger"; import { gameData } from "../../../pubUtils/data"; import { sendMessageToUser } from "../../../services/pushService"; +import { isCheckWord } from "../../../pubUtils/sdkUtil"; export function globalFilter(app: Application) { return new Filter(app); } diff --git a/game-server/app/servers/guild/handler/auctionHandler.ts b/game-server/app/servers/guild/handler/auctionHandler.ts index 925ae2b6d..c985acdd4 100644 --- a/game-server/app/servers/guild/handler/auctionHandler.ts +++ b/game-server/app/servers/guild/handler/auctionHandler.ts @@ -191,7 +191,7 @@ export class AuctionHandler { const bidRec = lot.bidRoles.find(role => { return role.roleId === roleId }); const { gid } = lot; return { ...bidRec, gid, status: auctionBidStatus(roleId, lot) }; - }); + }).sort((a,b) => b.time.getTime() - a.time.getTime()); return resResult(STATUS.SUCCESS, { bidRecs }); } @@ -210,7 +210,7 @@ export class AuctionHandler { // const price = lotPrice === 0 ? getBasePrice(gid, count) : lotPrice; const sold = guildBidStatus(lot); return { ...lot, price: lotPrice, sold }; - }); + }).sort((a,b) => b.time.getTime() - a.time.getTime());; return resResult(STATUS.SUCCESS, { lotRecs }); } diff --git a/game-server/app/servers/guild/handler/cityActivityHandler.ts b/game-server/app/servers/guild/handler/cityActivityHandler.ts index 5d80bab4d..a876baddf 100644 --- a/game-server/app/servers/guild/handler/cityActivityHandler.ts +++ b/game-server/app/servers/guild/handler/cityActivityHandler.ts @@ -1,6 +1,6 @@ import { Application, ChannelService, BackendSession, pinus, HandlerService, } from "pinus"; import { GUILD_ACTIVITY_TYPE, STATUS, REDIS_KEY, GUILD_POINT_WAYS, CITY_STATUS, TASK_TYPE, ITEM_CHANGE_REASON, PUSH_ROUTE } from "../../../consts"; -import { isDebugTime, resResult } from "../../../pubUtils/util"; +import { resResult } from "../../../pubUtils/util"; import { getGuildActivityStatus, getCityActivityObj, getCityStatus as pubGetCityStatus, getCities, getCityActivityRank, sendSingleCityActEndMsg, getPreDayActiveData, sendGuildCityDeclare } from "../../../services/guildActivity/guildActivityService"; import { GuildActivityCityModel } from "../../../db/GuildActivityCity"; import { gameData } from "../../../pubUtils/data"; @@ -17,6 +17,7 @@ import { guildInter } from "../../../pubUtils/interface"; import { dispatch } from "../../../pubUtils/dispatcher"; import { ServerRecordModel } from "../../../db/ServerRecords"; import { sendMessageToCityWithSuc } from "../../../services/pushService"; +import { isDebugTime } from "../../../pubUtils/sdkUtil"; export default function (app: Application) { new HandlerService(app, {}); diff --git a/game-server/app/servers/order/handler/orderHandler.ts b/game-server/app/servers/order/handler/orderHandler.ts index df1f06c0c..0d5395497 100644 --- a/game-server/app/servers/order/handler/orderHandler.ts +++ b/game-server/app/servers/order/handler/orderHandler.ts @@ -1,5 +1,5 @@ import { Application, BackendSession, HandlerService, } from 'pinus'; -import { genCode, isDebugPay, resResult } from '../../../pubUtils/util'; +import { genCode, resResult } from '../../../pubUtils/util'; import { ACTIVITY_TYPE, DEBUG_MAGIC_WORD, DEBUG_PRICE, ORDER_STATE, PAY_TYPE, STATUS, TASK_TYPE, TA_EVENT } from '../../../consts'; import { dicRMB } from '../../../pubUtils/dictionary/DicRMB'; import { UserOrderModel } from '../../../db/UserOrder'; @@ -10,6 +10,7 @@ import { applyOrder37 } from '../../../services/pay/37Pay'; import { checkOrderCanBuy, settleOrder, settleOrderAli, settleOrderWx } from '../../../services/orderService'; import { getActivityById } from '../../../services/activity/activityService'; import { reportTAEvent } from '../../../services/sdkService'; +import { isDebugPay } from '../../../pubUtils/sdkUtil'; export default function (app: Application) { new HandlerService(app, {}); diff --git a/game-server/app/services/auctionService.ts b/game-server/app/services/auctionService.ts index 11649b30e..ba8e9346d 100644 --- a/game-server/app/services/auctionService.ts +++ b/game-server/app/services/auctionService.ts @@ -1,7 +1,7 @@ import { DividendModel } from './../db/Dividend'; import { LOT_CODE_LEN, AUCTION_STAGE, AUCTION_TIME, DIVIDEND_CODE_LEN, DIVIDEND_STATUS, LOT_STATUS, MAIL_TYPE, CURRENCY_BY_TYPE, CURRENCY_TYPE, ROLE_RECEIVE_STATUS, AUCTION_BID_STATUS, DEBUG_MAGIC_WORD, AUCTION_SOURCE, TA_EVENT, getAuctionSourceTypeName, PUSH_ROUTE, GUILD_JOB } from './../consts'; import { DividendRec, } from "../domain/dbGeneral"; -import { genCode, getRandSingleEelm, isDebugTime } from '../pubUtils/util'; +import { genCode, getRandSingleEelm } from '../pubUtils/util'; import { LotModel, LotParam, LotType } from '../db/Lot'; import { getCurDay, getTimeFunD, getTimeFunM, nowSeconds } from '../pubUtils/timeUtil'; import { gameData, getGoodById } from '../pubUtils/data'; @@ -15,6 +15,7 @@ import { RewardInter } from '../pubUtils/interface'; import { reportTAEvent } from './sdkService'; import { getAllServers } from './redisService'; import { sendMessageToGuildWithSuc, sendMessageToServer, sendMessageToServerWithSuc } from './pushService'; +import { isDebugTime } from '../pubUtils/sdkUtil'; // ! 获取底价,假数据 export function getBasePrice(gid: number, count: number) { @@ -279,7 +280,6 @@ export async function calculateDividend(dividend: DividendType) { const totalRatio = totalDividendRatio(participantsData); const dividends: DividendRec[] = participantsData.map(data => { const { roleId } = data; - console.log('### calculateDividend', calcuTotalPrice, dividendRate(data), totalRatio) const posNum = posDividend(calcuTotalPrice, dividendRate(data), totalRatio); const weekendNum = weekendDividend(posNum, begin); return { diff --git a/game-server/app/services/orderService.ts b/game-server/app/services/orderService.ts index 7fc5aa208..e84209fda 100644 --- a/game-server/app/services/orderService.ts +++ b/game-server/app/services/orderService.ts @@ -17,8 +17,7 @@ import { makeSelfServerShop } from './activity/selfServiceShopActivityService'; import { makeRefreshShopReward } from './activity/refreshShopService'; import { ActivityMonopolyModel, ActivityMonopolyModelType } from '../db/ActivityMonopoly'; import { ActivityMonopolyLandModel, ActivityMonopolyLandModelType } from '../db/ActivityMonopolyLand'; -import { pinus } from 'pinus'; -import { isDebugPay, resResult } from '../pubUtils/util'; +import { resResult } from '../pubUtils/util'; import { checkOrderWX } from './pay/weixinPay'; import { addRechargeMoney } from './activity/rechargeMoneyService'; import { addVipRechargeMoney } from './activity/vipRechargeMoneyService'; diff --git a/game-server/app/services/pay/37Pay.ts b/game-server/app/services/pay/37Pay.ts index 07b45d4d5..d3ce104ef 100644 --- a/game-server/app/services/pay/37Pay.ts +++ b/game-server/app/services/pay/37Pay.ts @@ -4,8 +4,8 @@ import { UserModel } from "../../db/User"; import { LoginValidateData37 } from "../../domain/sdk"; import { DicRMB } from "../../pubUtils/dictionary/DicRMB"; import { nowSeconds } from "../../pubUtils/timeUtil"; -import { isDebugPay, resResult } from "../../pubUtils/util"; -import { get37Md5SignA } from "../../pubUtils/sdkUtil"; +import { resResult } from "../../pubUtils/util"; +import { get37Md5SignA, isDebugPay } from "../../pubUtils/sdkUtil"; import { pinus } from "pinus"; import { gameData } from "../../pubUtils/data"; diff --git a/game-server/app/services/refreshService.ts b/game-server/app/services/refreshService.ts index f43149c72..7dc66e08a 100644 --- a/game-server/app/services/refreshService.ts +++ b/game-server/app/services/refreshService.ts @@ -1,15 +1,11 @@ import { FrontendOrBackendSession, pinus } from "pinus"; -import { STATUS } from '../consts/statusCode'; -import { isDebugTime, resResult, shouldRefresh, shouldRefreshWeek } from '../pubUtils/util'; +import { shouldRefresh, shouldRefreshWeek } from '../pubUtils/util'; import { nowSeconds } from "../pubUtils/timeUtil"; -// import { RoleModel } from '../db/Role'; import { refDailyTask, refDailyTaskBox } from './task/taskService' -// import { EVENT_STATUS, FUNCS_ID } from "../consts"; -// import { startEvent } from "./eventSercive"; -import * as dicParam from '../pubUtils/dicParam'; import { dispatch } from "../pubUtils/dispatcher"; import { sendMessageToUserWithSuc } from "./pushService"; import { PUSH_ROUTE } from "../consts"; +import { isDebugTime } from "../pubUtils/sdkUtil"; /** * 刷新 diff --git a/shared/pubUtils/sdkUtil.ts b/shared/pubUtils/sdkUtil.ts index 96da22281..c5daacd68 100644 --- a/shared/pubUtils/sdkUtil.ts +++ b/shared/pubUtils/sdkUtil.ts @@ -3,7 +3,7 @@ import { request37 } from './httpUtil'; import { nowSeconds } from './timeUtil'; import { LoginValidataReturn37, Chat37Params, GetServerListParam } from '../domain/sdk'; import * as crypto from 'crypto' -import { isDebugPay } from './util'; +import { gameData } from './data'; // 通用加密方法 @@ -145,4 +145,16 @@ export function checkParamPrice(orderPrice: number, paramPrice: string) { if(!isDebugPay() && orderPrice != parseFloat(paramPrice)) return false; if(isDebugPay() && parseFloat(paramPrice) != DEBUG_PRICE) return false; return true +} + +export function isDebugTime() { + return gameData.serverConst.DEBUG_TIME === 1; +} + +export function isDebugPay() { + return gameData.serverConst.DEBUG_PAY === 1; +} + +export function isCheckWord() { + return gameData.serverConst.CHECK_WORD === 1; } \ No newline at end of file diff --git a/shared/pubUtils/timeUtil.ts b/shared/pubUtils/timeUtil.ts index e3bea3324..d68e3b3bc 100644 --- a/shared/pubUtils/timeUtil.ts +++ b/shared/pubUtils/timeUtil.ts @@ -1,5 +1,5 @@ import { REFRESH_TIME, TIME_OUTPUT_TYPE, SHOP_REFRESH_TYPE } from '../consts'; -import { isDebugTime } from './util'; +import { isDebugTime } from './sdkUtil'; /** * 时间 diff --git a/shared/pubUtils/util.ts b/shared/pubUtils/util.ts index 17d3d3566..378fdbfd9 100644 --- a/shared/pubUtils/util.ts +++ b/shared/pubUtils/util.ts @@ -12,7 +12,6 @@ import { getTimeFunM } from './timeUtil'; import { Floor } from '../domain/activityField/gachaField'; import { WhiteListModel } from '../db/RegionWhiteList'; import { RewardInter } from './interface'; -import { gameData } from './data'; const randomName = require("chinese-random-name"); const moment = require('moment'); const crypto = require('crypto'); @@ -820,16 +819,4 @@ export function addToMap(map: Map, id: T, value: number) { // }, 0); // return { topLineup, topLineupCe }; -// } - -export function isDebugTime() { - return gameData.serverConst.DEBUG_TIME === 1; -} - -export function isDebugPay() { - return gameData.serverConst.DEBUG_PAY === 1; -} - -export function isCheckWord() { - return gameData.serverConst.CHECK_WORD === 1; -} \ No newline at end of file +// } \ No newline at end of file