init

README.md

@@ -12,7 +12,7 @@
 `cd game-server && node tsrun.js`
 
 ## 运行 web-server
-`cd web-server && node app`
+`cd web-server && node dev`
 
 cd 到 web-server下面
 `npm run stop && npm run tsc && npm run start`
@@ -28,3 +28,12 @@ cd 到 web-server下面
 `pm2 start ./dist/app.js --name="activity-server-2" -x -- env=dev id=activity-server-2 host=172.26.145.171 port=9061 serverType=activity`
 `pm2 start ./dist/app.js --name="connector-server-4" -x -- env=alpha id=connector-server-4 host=172.26.145.171 port=9062 clientHost=121.89.211.172 clientPort=3050 serverType=connector frontend=true`
 8.主机部分的server.ts内的server如果需要做rpc remote，host需要从127.0.0.1改为私网地址
+
+
+---
+
+web-server
+
+`cd web-server`
+
+`HOME=/root node node_modules/.bin/egg-bin dev`

game-server/app.ts

@@ -1,7 +1,7 @@
 require('xprofiler').start({
     log_dir: '/zyz_logs/xprofiler',
 });
-import { COM_TEAM_STATUS, STATUS } from './app/consts';
+import { COM_TEAM_STATUS, STATUS } from '@consts';
 import {
     createTcpAcceptor,
     createTcpMailBox,
@@ -19,17 +19,17 @@ import { preload } from './preload';
 import { globalFilter } from'./app/servers/connector/filter/global';
 import { guildAuthFilter } from'./app/servers/guild/filter/guildAuthFilter';
 import { tokenFilter } from'./app/servers/gm/filter/tokenFilter';
-import { connectRedis } from './app/pubUtils/redis';
+import { connectRedis } from '@pubUtils/redis';
 import * as timeTaskService from './app/services/timeTaskService';
 import * as redlockCacheService from './app/services/redlockCacheService';
 import * as redLockService from './app/services/redLockService';
 // TODO 需要整理。
 import _pinus = require('pinus');
 import { updateTeamStatus } from './app/services/battle/comBattleService';
-import { resResult, genCode } from './app/pubUtils/util';
+import { resResult, genCode } from '@pubUtils/util';
 import { errlogger, infologger, loadLogger } from './app/util/logger';
 import { connectThinkingData, getTire } from './app/services/sdkService';
-import { loadSubDb, loadGmDb } from './app/db';
+import { loadSubDb, loadGmDb } from '@db';
 import { loadActivities } from './app/services/memoryCache/activityData';
 import { checkAndSetApiIsClose } from './app/services/chatService';
 import { initGuildActivityIndexInPinus, resetJoinWoodenHorse } from './app/services/guildActivity/guildActivityService';
@@ -307,6 +307,7 @@ function setupFilters(app: _pinus.Application) {
     app.filter(new pinus.filters.time());
     app.filter(new pinus.filters.timeout());
 
+    // @ts-ignore
     app.filter(globalFilter(app));
     app.globalAfter((err: Error, routeRecord: RouteRecord, msg: any, session: FrontendOrBackendSession, resp: any, cb: HandlerCallback) => {
         if (err) infologger.debug(err);

game-server/app/components/EvalComponent.ts

@@ -1,4 +1,4 @@
-import { Application, IComponent } from "pinus";
+import { Application, IComponent } from "pinus";
 
 export class EvalComponent implements IComponent {
     name = "EvalComponent";

game-server/app/components/UpdateComponent.ts

@@ -1,4 +1,4 @@
-import { Application, IComponent, manualReloadCrons, manualReloadHandlers, manualReloadRemoters } from "pinus";
+import { Application, IComponent, manualReloadCrons, manualReloadHandlers, manualReloadRemoters } from "pinus";
 
 export class UpdateComponent implements IComponent {
     name = "UpdateComponent";

game-server/app/modules/UsrAdmin.ts

@@ -1,4 +1,4 @@
-import { Application, IModule, MonitorCallback, MasterCallback, MonitorAgent, MasterAgent } from "pinus";
+import { Application, IModule, MonitorCallback, MasterCallback, MonitorAgent, MasterAgent } from "pinus";
 
 
 export class UsrAdminModule implements IModule {

game-server/app/servers/activity/handler/activityHandler.ts

@@ -1,10 +1,10 @@
-import { Application, BackendSession, HandlerService, pinus, } from 'pinus';
+import { Application, BackendSession, HandlerService, pinus, } from 'pinus';
-import { resResult } from '../../../pubUtils/util';
+import { resResult } from '@pubUtils/util';
 import { ENCRYPT_IV, ENCRYPT_KEY, STATUS, TASK_TYPE } from '../../../consts';
-import { ActivityGroupModel } from '../../../db/ActivityGroup';
+import { ActivityGroupModel } from '@db/ActivityGroup';
 import { getActivitiesWithOrder, getActivity, getActivityById, getActivityByServerId, shouldReplace } from '../../../services/activity/activityService';
-import { ActivityModelType } from '../../../db/Activity';
+import { ActivityModelType } from '@db/Activity';
-import { UserOrderModel } from '../../../db/UserOrder';
+import { UserOrderModel } from '@db/UserOrder';
 
 export default function (app: Application) {
     new HandlerService(app, {});
@@ -116,3 +116,4 @@ export class ActivityHandler {
         return resResult(STATUS.SUCCESS, { activities: [...activities], activityByType: [...activityByType], activityByServer: [...activityByServer], groupToServer: [...groupToServer] });
     }
 }
+

game-server/app/servers/activity/handler/activityMonopolyHandler.ts

@@ -1,14 +1,14 @@
-import { Application, BackendSession, HandlerService } from 'pinus';
+import { Application, BackendSession, HandlerService } from 'pinus';
-import { resResult } from '../../../pubUtils/util';
+import { resResult } from '@pubUtils/util';
 import { LAND_TYPE, STATUS, CURRENCY_TYPE, CURRENCY_BY_TYPE, BANK_TYPE, ACTIVITY_RESOURCES_TYPE, ITEM_CHANGE_REASON } from '../../../consts';
-import { ActivityMonopolyModel, ActivityMonopolyModelType } from '../../../db/ActivityMonopoly';
+import { ActivityMonopolyModel, ActivityMonopolyModelType } from '@db/ActivityMonopoly';
-import { ActivityMonopolyLandModel, ActivityMonopolyLandModelType } from '../../../db/ActivityMonopolyLand';
+import { ActivityMonopolyLandModel, ActivityMonopolyLandModelType } from '@db/ActivityMonopolyLand';
 import { getPlayerMonopolyData, nextPosition } from '../../../services/activity/monopolyService';
 import { random } from 'underscore';
 import { handleCost } from '../../../services/role/rewardService';
 import { addReward, stringToConsumeParam, stringToRewardParam } from '../../../services/activity/giftPackageService';
 import { getPlayerRefreshShopDataByRoundIndex } from '../../../services/activity/refreshShopService';
-import { ActivityRefreshShopModel } from '../../../db/ActivityRefreshShop';
+import { ActivityRefreshShopModel } from '@db/ActivityRefreshShop';
 
 export default function (app: Application) {
     new HandlerService(app, {});
@@ -249,3 +249,4 @@ export class ActivityMonopolyHandler {
         }));
     }
 }
+

game-server/app/servers/activity/handler/authorGachaHandler.ts

@@ -1,10 +1,10 @@
-import { Application, BackendSession, HandlerService, } from "pinus";
+import { Application, BackendSession, HandlerService, } from "pinus";
 import { getPlayerAuthorGachaDataShow } from "../../../services/activity/authorGachaService";
-import { parseGoodStrWithType, resResult } from "../../../pubUtils/util";
+import { parseGoodStrWithType, resResult } from "@pubUtils/util";
 import { ITEM_CHANGE_REASON, STATUS } from "../../../consts";
-import { AuthorGachaData } from "../../../domain/activityField/authorGachaField";
+import { AuthorGachaData } from "@domain/activityField/authorGachaField";
 import { addReward } from "../../../services/activity/giftPackageService";
-import { ActivityAuthorGachaRecModel } from "../../../db/AuthorGachaRec";
+import { ActivityAuthorGachaRecModel } from "@db/AuthorGachaRec";
 
 
 export default function (app: Application) {
@@ -63,3 +63,4 @@ export class AuthorGachaHandler {
         return resResult(STATUS.SUCCESS, { goods: result.goods, curBox: playerData.box })
     }
 }
+

game-server/app/servers/activity/handler/bindPhoneHandler.ts

@@ -1,15 +1,15 @@
-import { Application, BackendSession, HandlerService } from 'pinus';
+import { Application, BackendSession, HandlerService } from 'pinus';
-import { resResult } from '../../../pubUtils/util';
+import { resResult } from '@pubUtils/util';
 import { BIND_PHONE_STATUS, ITEM_CHANGE_REASON, PUSH_ROUTE, SNS_LINK_TYPE, STATUS } from '../../../consts';
 import { getPlayerDailyChallengesData } from '../../../services/activity/dailyChallengesService';
-import { DailyItem } from '../../../domain/activityField/dailyChallengesField';
+import { DailyItem } from '@domain/activityField/dailyChallengesField';
 import { addReward, stringToRewardParam } from '../../../services/activity/giftPackageService';
-import { RewardParam } from '../../../domain/activityField/rewardField';
+import { RewardParam } from '@domain/activityField/rewardField';
-import { ActivityDailyChallengesModel } from '../../../db/ActivityDailyChallenges';
+import { ActivityDailyChallengesModel } from '@db/ActivityDailyChallenges';
 import { getBindPhoneData, getAllSnsLinkDataShow, getPublicAccountData } from '../../../services/activity/bindPhoneService';
-import { ActivityBindPhoneRewardModel } from '../../../db/ActivityBindPhoneReward';
+import { ActivityBindPhoneRewardModel } from '@db/ActivityBindPhoneReward';
-import { ActivityPublicAccountCodeModel } from '../../../db/ActivityPublicAccountCode';
+import { ActivityPublicAccountCodeModel } from '@db/ActivityPublicAccountCode';
-import { UserModel } from '../../../db/User';
+import { UserModel } from '@db/User';
 import { sendMessageToUserWithSuc } from '../../../services/pushService';
 
 
@@ -154,3 +154,4 @@ export class BindPhoneHandler {
         return resResult(STATUS.SUCCESS);
     }
 }
+

game-server/app/servers/activity/handler/chongyangHandler.ts

@@ -1,12 +1,12 @@
-import { Application, BackendSession, HandlerService, } from 'pinus';
+import { Application, BackendSession, HandlerService, } from 'pinus';
-import { genCode, resResult } from '../../../pubUtils/util';
+import { genCode, resResult } from '@pubUtils/util';
 import { ITEM_CHANGE_REASON, STATUS } from '../../../consts';
 import { getPlayerChongYangData, getPlayerChongYangDataShow } from '../../../services/activity/chongyangService';
-import { ActivityChongYangRecModel, ChongYangGameRecord } from '../../../db/ActivityChongYangRec';
+import { ActivityChongYangRecModel, ChongYangGameRecord } from '@db/ActivityChongYangRec';
-import { RewardInter } from '../../../pubUtils/interface';
+import { RewardInter } from '@pubUtils/interface';
 import { stringToConsumeParam, stringToRewardParam } from '../../../services/activity/giftPackageService';
 import { addItems, handleCost } from '../../../services/role/rewardService';
-import { getZeroPoint } from '../../../pubUtils/timeUtil';
+import { getZeroPoint } from '@pubUtils/timeUtil';
 
 
 export default function (app: Application) {
@@ -163,3 +163,4 @@ export class ChongYangHandler {
         });
     }
 }
+

game-server/app/servers/activity/handler/dailyChallengesHandler.ts

@@ -1,11 +1,11 @@
-import { Application, BackendSession, HandlerService } from 'pinus';
+import { Application, BackendSession, HandlerService } from 'pinus';
-import { resResult } from '../../../pubUtils/util';
+import { resResult } from '@pubUtils/util';
 import { ITEM_CHANGE_REASON, STATUS } from '../../../consts';
 import { getPlayerDailyChallengesData } from '../../../services/activity/dailyChallengesService';
-import { DailyItem } from '../../../domain/activityField/dailyChallengesField';
+import { DailyItem } from '@domain/activityField/dailyChallengesField';
 import { addReward, stringToRewardParam } from '../../../services/activity/giftPackageService';
-import { RewardParam } from '../../../domain/activityField/rewardField';
+import { RewardParam } from '@domain/activityField/rewardField';
-import { ActivityDailyChallengesModel } from '../../../db/ActivityDailyChallenges';
+import { ActivityDailyChallengesModel } from '@db/ActivityDailyChallenges';
 
 
 export default function (app: Application) {
@@ -78,3 +78,4 @@ export class DailyChallengesHandler {
     }
 
 }
+

game-server/app/servers/activity/handler/dailyCoinHandler.ts

@@ -1,14 +1,14 @@
-import { Application, BackendSession, HandlerService } from 'pinus';
+import { Application, BackendSession, HandlerService } from 'pinus';
-import { resResult } from '../../../pubUtils/util';
+import { resResult } from '@pubUtils/util';
 import { ACTIVITY_RESOURCES_TYPE, CURRENCY_BY_TYPE, CURRENCY_TYPE, DAILY_COIN_BOX_STATUS, ITEM_CHANGE_REASON, STATUS } from '../../../consts';
 import { getGoldObject, handleCost } from '../../../services/role/rewardService';
 import { getPlayerDailyCoinData, mergeData } from '../../../services/activity/dailyCoinService';
-import { ConsumeExchangeFormulaItem, CoinRewardFormulaItem } from '../../../domain/activityField/dailyCoinField';
+import { ConsumeExchangeFormulaItem, CoinRewardFormulaItem } from '@domain/activityField/dailyCoinField';
-import { ActivityDailyCoinModel } from '../../../db/ActivityDailyCoin';
+import { ActivityDailyCoinModel } from '@db/ActivityDailyCoin';
 import { addReward, stringToRewardParam } from '../../../services/activity/giftPackageService';
-import { RewardParam } from '../../../domain/activityField/rewardField';
+import { RewardParam } from '@domain/activityField/rewardField';
-import { ItemInter } from '../../../pubUtils/interface';
+import { ItemInter } from '@pubUtils/interface';
-import { RoleModel } from '../../../db/Role';
+import { RoleModel } from '@db/Role';
 import moment = require('moment');
 
 
@@ -164,3 +164,4 @@ export class DailyCoinHandler {
     }
 
 }
+

game-server/app/servers/activity/handler/dailyGKHandler.ts

@@ -1,8 +1,8 @@
-import { Application, BackendSession, HandlerService, } from 'pinus';
+import { Application, BackendSession, HandlerService, } from 'pinus';
-import { resResult } from '../../../pubUtils/util';
+import { resResult } from '@pubUtils/util';
 import { STATUS } from '../../../consts';
 import { getPlayerDailyGKData } from '../../../services/activity/dailyGKService';
-import { DailyGKItem } from '../../../domain/activityField/dailyGKField';
+import { DailyGKItem } from '@domain/activityField/dailyGKField';
 
 
 export default function (app: Application) {
@@ -75,3 +75,4 @@ export class DailyGKHandler {
     }
 
 }
+

game-server/app/servers/activity/handler/dailyGiftsHandler.ts

@@ -1,12 +1,12 @@
-import { Application, BackendSession, HandlerService, } from 'pinus';
+import { Application, BackendSession, HandlerService, } from 'pinus';
-import { resResult } from '../../../pubUtils/util';
+import { resResult } from '@pubUtils/util';
 import { STATUS, ACTIVITY_RESOURCES_TYPE, ITEM_CHANGE_REASON } from '../../../consts';
 import { handleCost } from '../../../services/role/rewardService';
 import { getPlayerDailyGiftsData } from '../../../services/activity/dailyGiftsService';
-import { DailyGiftItem } from '../../../domain/activityField/dailyGiftsField';
+import { DailyGiftItem } from '@domain/activityField/dailyGiftsField';
-import { ActivityDailyGiftsModel } from '../../../db/ActivityDailyGifts';
+import { ActivityDailyGiftsModel } from '@db/ActivityDailyGifts';
 import { addReward, stringToRewardParam } from '../../../services/activity/giftPackageService';
-import { RewardParam } from '../../../domain/activityField/rewardField';
+import { RewardParam } from '@domain/activityField/rewardField';
 
 
 export default function (app: Application) {
@@ -91,3 +91,4 @@ export class DailyGiftsHandler {
     }
 
 }
+

game-server/app/servers/activity/handler/dailyMealHandler.ts

@@ -1,12 +1,12 @@
-import { Application, BackendSession, HandlerService, } from 'pinus';
+import { Application, BackendSession, HandlerService, } from 'pinus';
-import { resResult } from '../../../pubUtils/util';
+import { resResult } from '@pubUtils/util';
 import { ITEM_CHANGE_REASON, STATUS } from '../../../consts';
 import { handleCost } from '../../../services/role/rewardService';
 import { getPlayerDailyMealData } from '../../../services/activity/dailyMealService';
-import { DailyMealItem } from '../../../domain/activityField/dailyMealField';
+import { DailyMealItem } from '@domain/activityField/dailyMealField';
-import { ActivityDailyMealModel } from '../../../db/ActivityDailyMeal';
+import { ActivityDailyMealModel } from '@db/ActivityDailyMeal';
 import { addReward, stringToConsumeParam, stringToRewardParam } from '../../../services/activity/giftPackageService';
-import { RewardParam } from '../../../domain/activityField/rewardField';
+import { RewardParam } from '@domain/activityField/rewardField';
 import moment = require('moment');
 
 
@@ -86,3 +86,4 @@ export class DailyMealHandler {
     }
 
 }
+

game-server/app/servers/activity/handler/dailyRMBGiftsHandler.ts

@@ -1,12 +1,12 @@
-import { Application, BackendSession, HandlerService, } from 'pinus';
+import { Application, BackendSession, HandlerService, } from 'pinus';
-import { resResult } from '../../../pubUtils/util';
+import { resResult } from '@pubUtils/util';
 import { ITEM_CHANGE_REASON, STATUS, } from '../../../consts';
 import { getPlayerDailyRMBGiftsData } from '../../../services/activity/dailyRMBGiftsService';
-import { RewardParam } from '../../../domain/activityField/rewardField';
+import { RewardParam } from '@domain/activityField/rewardField';
 import { addReward, stringToRewardParam } from '../../../services/activity/giftPackageService';
-import { ActivityDailyRMBGiftsModel } from '../../../db/ActivityDailyRMBGifts';
+import { ActivityDailyRMBGiftsModel } from '@db/ActivityDailyRMBGifts';
 import moment = require('moment');
-import { DailyRMBGiftsItem } from '../../../domain/activityField/dailyRMBGiftsField';
+import { DailyRMBGiftsItem } from '@domain/activityField/dailyRMBGiftsField';
 
 export default function (app: Application) {
     new HandlerService(app, {});
@@ -93,3 +93,4 @@ export class DailyRMBGiftsHandler {
     }
 
 }
+

game-server/app/servers/activity/handler/dragonBoatHandler.ts

@@ -1,9 +1,9 @@
-import { Application, BackendSession, HandlerService, } from 'pinus';
+import { Application, BackendSession, HandlerService, } from 'pinus';
-import { parseNumberList, resResult } from '../../../pubUtils/util';
+import { parseNumberList, resResult } from '@pubUtils/util';
 import { ITEM_CHANGE_REASON, STATUS } from '../../../consts';
 import { addReward, stringToConsumeParam, stringToRewardParam } from '../../../services/activity/giftPackageService';
 import { getPlayerDragonBoatData, getPlayerDragonBoatDataShow } from '../../../services/activity/dragonBoatService';
-import { ActivityDragonBoatModel } from '../../../db/ActivityDragonBoat';
+import { ActivityDragonBoatModel } from '@db/ActivityDragonBoat';
 import { handleCost } from '../../../services/role/rewardService';
 
 export default function (app: Application) {
@@ -135,3 +135,4 @@ export class DragonBoatHandler {
          });
     }
 }
+

game-server/app/servers/activity/handler/entertainHandler.ts

@@ -1,9 +1,9 @@
-import { Application, BackendSession, HandlerService, } from 'pinus';
+import { Application, BackendSession, HandlerService, } from 'pinus';
-import { getRandSingleEelm, parseNumberList, resResult } from '../../../pubUtils/util';
+import { getRandSingleEelm, parseNumberList, resResult } from '@pubUtils/util';
 import { ITEM_CHANGE_REASON, STATUS } from '../../../consts';
 import { addReward, stringToConsumeParam, stringToRewardParam } from '../../../services/activity/giftPackageService';
 import { getPlayerEntertainData, getPlayerEntertainDataShow } from '../../../services/activity/entertainService';
-import { ActivityEntertainRecModel } from '../../../db/ActivityEntertainRec';
+import { ActivityEntertainRecModel } from '@db/ActivityEntertainRec';
 import { handleCost } from '../../../services/role/rewardService';
 
 export default function (app: Application) {
@@ -130,3 +130,4 @@ export class EntertainHandler {
          });
     }
 }
+

game-server/app/servers/activity/handler/firstGiftHandler.ts

@@ -1,11 +1,11 @@
-import { Application, BackendSession, HandlerService, } from 'pinus';
+import { Application, BackendSession, HandlerService, } from 'pinus';
-import { resResult } from '../../../pubUtils/util';
+import { resResult } from '@pubUtils/util';
 import { FIRST_GIFT_STATE, ITEM_CHANGE_REASON, STATUS } from '../../../consts';
 import { getPlayerFirstGiftData, getPlayerFirstGiftDataShow } from '../../../services/activity/firstGiftService';
-import { RoleModel } from '../../../db/Role';
+import { RoleModel } from '@db/Role';
 import { addReward, stringToRewardParam } from '../../../services/activity/giftPackageService';
-import { ActivityFirstGiftModel } from '../../../db/ActivityFirstGift';
+import { ActivityFirstGiftModel } from '@db/ActivityFirstGift';
-import { RewardParam } from '../../../domain/activityField/rewardField';
+import { RewardParam } from '@domain/activityField/rewardField';
 
 export default function (app: Application) {
     new HandlerService(app, {});
@@ -90,3 +90,4 @@ export class FirstGiftHandler {
     }
 
 }
+

game-server/app/servers/activity/handler/forgeHandler.ts

@@ -1,9 +1,9 @@
-import { Application, BackendSession, HandlerService, } from 'pinus';
+import { Application, BackendSession, HandlerService, } from 'pinus';
-import { resResult } from '../../../pubUtils/util';
+import { resResult } from '@pubUtils/util';
 import { ITEM_CHANGE_REASON, STATUS } from '../../../consts';
 import { addReward, stringToConsumeParam, stringToRewardParam } from '../../../services/activity/giftPackageService';
 import { getMetialStr, getPlayerForgeData, getPlayerForgeDataShow } from '../../../services/activity/forgeService';
-import { ActivityForgeModel } from '../../../db/ActivityForge';
+import { ActivityForgeModel } from '@db/ActivityForge';
 import { handleCost } from '../../../services/role/rewardService';
 
 export default function (app: Application) {
@@ -115,3 +115,4 @@ export class ForgeHandler {
          });
     }
 }
+

game-server/app/servers/activity/handler/gachaHandler.ts

@@ -1,26 +1,26 @@
-import { Application, BackendSession, HandlerService, } from "pinus";
+import { Application, BackendSession, HandlerService, } from "pinus";
-import { resResult, shouldRefresh, getRandSingleEelm, getGachaRemainFloor } from "../../../pubUtils/util";
+import { resResult, shouldRefresh, getRandSingleEelm, getGachaRemainFloor } from "@pubUtils/util";
 import { STATUS, GACHA_TYPE, HERO_QUALITY_TYPE, TASK_TYPE, ITEM_CHANGE_REASON, } from "../../../consts";
-import { gameData, getDefArtifactByGid } from "../../../pubUtils/data";
+import { gameData, getDefArtifactByGid } from "@pubUtils/data";
-import { UserGachaModel } from "../../../db/UserGacha";
+import { UserGachaModel } from "@db/UserGacha";
 import { refreshGacha, getGachaList, getVisitedHeroList, GachaPull, GachaResults, getDicGachaByGachaCnt, getNormalGachaId, getDicGachas } from "../../../services/activity/gachaService";
-import { RoleModel } from "../../../db/Role";
+import { RoleModel } from "@db/Role";
-import { HeroModel } from "../../../db/Hero";
+import { HeroModel } from "@db/Hero";
 import { handleCost, addItems } from "../../../services/role/rewardService";
-import { getZeroPointD, getTimeFun } from "../../../pubUtils/timeUtil";
+import { getZeroPointD, getTimeFun } from "@pubUtils/timeUtil";
-import { UserGachaRecModel } from "../../../db/UserGachaRec";
+import { UserGachaRecModel } from "@db/UserGachaRec";
-import { RECRUIT } from "../../../pubUtils/dicParam";
+import { RECRUIT } from "@pubUtils/dicParam";
 import { getActivityById } from "../../../services/activity/activityService";
 import { checkTaskInGacha } from "../../../services/task/taskService";
 import { createHeroes } from "../../../services/role/createHero";
 import { getGuideGachaData } from "../../../services/activity/gachaService";
 import { getPlayerNewHeroGachaData } from "../../../services/activity/newHeroService";
 import { isHeroHidden } from "../../../services/dataService";
-import { GachaResultIndb } from "../../../domain/activityField/gachaField";
+import { GachaResultIndb } from "@domain/activityField/gachaField";
-import { CreateHeroParam } from "../../../domain/roleField/hero";
+import { CreateHeroParam } from "@domain/roleField/hero";
-import { ItemInter, RewardInter } from "../../../pubUtils/interface";
+import { ItemInter, RewardInter } from "@pubUtils/interface";
 import { getPlayerAuthorGachaData } from "../../../services/activity/authorGachaService";
-import { ActivityAuthorGachaRecModel, ActivityAuthorGachaRecModelType } from "../../../db/AuthorGachaRec";
+import { ActivityAuthorGachaRecModel, ActivityAuthorGachaRecModelType } from "@db/AuthorGachaRec";
 
 export default function (app: Application) {
     new HandlerService(app, {});
@@ -545,3 +545,4 @@ export class GachaHandler {
       return resResult(STATUS.SUCCESS);
    }
 }
+

game-server/app/servers/activity/handler/groupShopHandler.ts

@@ -1,15 +1,15 @@
-import { Application, BackendSession, HandlerService, } from "pinus";
+import { Application, BackendSession, HandlerService, } from "pinus";
-import { resResult } from "../../../pubUtils/util";
+import { resResult } from "@pubUtils/util";
 import { STATUS, ITEM_CHANGE_REASON, GROUP_SHOP_PRICE_STATUS, PUSH_ROUTE, ACTIVITY_TYPE, } from "../../../consts";
 import { getGroupShopData, getGroupShopDataShow, getGroupShopPriceStatus, getGroupShopServerData, refundGroupShop } from "../../../services/activity/groupShopService";
 import { addItems, getGoldObject, handleCost } from "../../../services/role/rewardService";
-import { ActivityGroupShopUserRecModel, GroupShopBuyRecord } from "../../../db/ActivityGroupShopUserRec";
+import { ActivityGroupShopUserRecModel, GroupShopBuyRecord } from "@db/ActivityGroupShopUserRec";
-import { ActivityGroupShopRecModel, GroupShopRecord } from "../../../db/ActivityGroupShopRec";
+import { ActivityGroupShopRecModel, GroupShopRecord } from "@db/ActivityGroupShopRec";
 import { pick } from "underscore";
 import { addRoleToGroupShopChannel, leaveGroupShopChannel } from "../../../services/chatChannelService";
 import { sendMessageToGroupShopWithSuc } from "../../../services/pushService";
 import { getActivitiesByType } from "../../../services/activity/activityService";
-import { GroupShopData } from "../../../domain/activityField/groupShopField";
+import { GroupShopData } from "@domain/activityField/groupShopField";
 
 export default function (app: Application) {
     new HandlerService(app, {});
@@ -150,3 +150,4 @@ export class GroupShopHandler {
         return resResult(STATUS.SUCCESS, { playerData });
     }
 }
+

game-server/app/servers/activity/handler/growthFundHandler.ts

@@ -1,11 +1,11 @@
-import { Application, BackendSession, HandlerService, } from 'pinus';
+import { Application, BackendSession, HandlerService, } from 'pinus';
-import { resResult } from '../../../pubUtils/util';
+import { resResult } from '@pubUtils/util';
 import { ITEM_CHANGE_REASON, STATUS } from '../../../consts';
 import { getPlayerGrowthFundData } from '../../../services/activity/growthFundService';
-import { GrowthFundItem } from '../../../domain/activityField/growthFundField';
+import { GrowthFundItem } from '@domain/activityField/growthFundField';
-import { ActivityGrowthFundModel } from '../../../db/ActivityGrowthFund';
+import { ActivityGrowthFundModel } from '@db/ActivityGrowthFund';
 import { addReward, stringToRewardParam } from '../../../services/activity/giftPackageService';
-import { RewardParam } from '../../../domain/activityField/rewardField';
+import { RewardParam } from '@domain/activityField/rewardField';
 
 
 export default function (app: Application) {
@@ -82,3 +82,4 @@ export class GrowthFundHandler {
     }
 
 }
+

game-server/app/servers/activity/handler/growthHandler.ts

@@ -1,12 +1,12 @@
-import { Application, BackendSession, HandlerService, } from 'pinus';
+import { Application, BackendSession, HandlerService, } from 'pinus';
-import { resResult } from '../../../pubUtils/util';
+import { resResult } from '@pubUtils/util';
 import { ITEM_CHANGE_REASON, STATUS } from '../../../consts';
 import { getPlayerGrowthData } from '../../../services/activity/growthService';
-import { GrowthItem, PointRewardItem } from '../../../domain/activityField/growthField';
+import { GrowthItem, PointRewardItem } from '@domain/activityField/growthField';
-import { ActivityGrowthModel } from '../../../db/ActivityGrowth';
+import { ActivityGrowthModel } from '@db/ActivityGrowth';
 import { addReward, stringToRewardParam } from '../../../services/activity/giftPackageService';
-import { RewardParam } from '../../../domain/activityField/rewardField';
+import { RewardParam } from '@domain/activityField/rewardField';
-import { ActivityGrowthPointModel } from '../../../db/ActivityGrowthPoint';
+import { ActivityGrowthPointModel } from '@db/ActivityGrowthPoint';
 
 
 export default function (app: Application) {
@@ -122,3 +122,4 @@ export class GrowthHandler {
         }));
     }
 }
+

game-server/app/servers/activity/handler/guildPayHandler.ts

@@ -1,9 +1,9 @@
-import { Application, BackendSession, HandlerService, pinus, } from 'pinus';
+import { Application, BackendSession, HandlerService, pinus, } from 'pinus';
 import { isNumber } from 'underscore';
 import { ITEM_CHANGE_REASON, STATUS } from '../../../consts';
-import { ActivityGuildPayRecordModel } from '../../../db/ActivityGuildPayRecord';
+import { ActivityGuildPayRecordModel } from '@db/ActivityGuildPayRecord';
-import { RewardParam } from '../../../domain/activityField/rewardField';
+import { RewardParam } from '@domain/activityField/rewardField';
-import { resResult } from '../../../pubUtils/util';
+import { resResult } from '@pubUtils/util';
 import { addReward, stringToRewardParam } from '../../../services/activity/giftPackageService';
 import { getGuildPayDataShow, getGuildPayData } from '../../../services/activity/guildPayService';
 
@@ -84,3 +84,4 @@ export class GuildPayHandler {
          });
     }
 }
+

game-server/app/servers/activity/handler/limitPackageHandler.ts

@@ -1,11 +1,11 @@
-import { Application, BackendSession, HandlerService, } from 'pinus';
+import { Application, BackendSession, HandlerService, } from 'pinus';
-import { resResult } from '../../../pubUtils/util';
+import { resResult } from '@pubUtils/util';
 import { ACTIVITY_TYPE, ITEM_CHANGE_REASON, STATUS } from '../../../consts';
 import { newPlayerLimitPackageActivity, getPlayerLimitPackageData } from '../../../services/activity/limitPackageService';
 import { addReward, stringToConsumeParam, stringToRewardParam } from '../../../services/activity/giftPackageService';
-import { ActivityShopModel } from '../../../db/ActivityShop';
+import { ActivityShopModel } from '@db/ActivityShop';
 import moment = require('moment');
-import { RoleModel } from '../../../db/Role';
+import { RoleModel } from '@db/Role';
 import { handleCost } from '../../../services/role/rewardService';
 
 export default function (app: Application) {
@@ -132,3 +132,4 @@ export class LimitPackageHandler {
     }
 
 }
+

game-server/app/servers/activity/handler/luckyHandler.ts

@@ -1,11 +1,11 @@
-import { Application, BackendSession, HandlerService, } from 'pinus';
+import { Application, BackendSession, HandlerService, } from 'pinus';
-import { resResult } from '../../../pubUtils/util';
+import { resResult } from '@pubUtils/util';
 import { ITEM_CHANGE_REASON, STATUS } from '../../../consts';
 import { getPlayerLuckyDataShow, getPlayerLuckyData } from '../../../services/activity/luckyService';
 import { addItems, handleCost } from '../../../services/role/rewardService';
 import { pick } from 'underscore';
 import { addReward, stringToRewardParam } from '../../../services/activity/giftPackageService';
-import { ActivityLuckyModel } from '../../../db/ActivityLuckyRec';
+import { ActivityLuckyModel } from '@db/ActivityLuckyRec';
 
 
 export default function (app: Application) {
@@ -96,3 +96,4 @@ export class LuckyTurntableNewHandler {
         return resResult(STATUS.SUCCESS, { ...result, box: { ...box, isReceived: true } });
     }
 }
+

game-server/app/servers/activity/handler/luckyTurntableHandler.ts

@@ -1,9 +1,9 @@
-import { Application, BackendSession, HandlerService, } from 'pinus';
+import { Application, BackendSession, HandlerService, } from 'pinus';
-import { resResult } from '../../../pubUtils/util';
+import { resResult } from '@pubUtils/util';
 import { ITEM_CHANGE_REASON, STATUS } from '../../../consts';
 import { getPlayerLuckyTurntableDataShow, getPlayerLuckyTurntableData } from '../../../services/activity/luckyTurntableService';
 import { addItems, handleCost } from '../../../services/role/rewardService';
-import { ActivityTurntableModel } from '../../../db/ActivityTurntableRec';
+import { ActivityTurntableModel } from '@db/ActivityTurntableRec';
 import { pick } from 'underscore';
 import { addReward, stringToRewardParam } from '../../../services/activity/giftPackageService';
 
@@ -96,3 +96,4 @@ export class LuckyTurntableHandler {
         return resResult(STATUS.SUCCESS, { ...result, box: {...box, isReceived: true} });
     }
 }
+

game-server/app/servers/activity/handler/midAutumnHandler.ts

@@ -1,10 +1,10 @@
-import { Application, BackendSession, HandlerService, } from 'pinus';
+import { Application, BackendSession, HandlerService, } from 'pinus';
-import { genCode, getRandSingleEelm, parseNumberList, resResult } from '../../../pubUtils/util';
+import { genCode, getRandSingleEelm, parseNumberList, resResult } from '@pubUtils/util';
 import { ITEM_CHANGE_REASON, STATUS } from '../../../consts';
 import { addReward, stringToConsumeParam, stringToRewardParam } from '../../../services/activity/giftPackageService';
 import { addItems, handleCost } from '../../../services/role/rewardService';
-import { ActivityMidAutumnRecModel } from '../../../db/ActivityMidAutumnRec';
+import { ActivityMidAutumnRecModel } from '@db/ActivityMidAutumnRec';
-import { RewardInter } from '../../../pubUtils/interface';
+import { RewardInter } from '@pubUtils/interface';
 import { getPlayerMidAutumnData, getPlayerMidAutumnDataShow } from '../../../services/activity/midAutumnService';
 import { combineItems } from '../../../services/role/util';
 
@@ -181,3 +181,4 @@ export class MidAutumnHandler {
          });
     }
 }
+

game-server/app/servers/activity/handler/miniGameHandler.ts

@@ -1,14 +1,14 @@
-import { Application, BackendSession, HandlerService, } from 'pinus';
+import { Application, BackendSession, HandlerService, } from 'pinus';
-import { resResult } from '../../../pubUtils/util';
+import { resResult } from '@pubUtils/util';
 import { ITEM_CHANGE_REASON, MINI_GAME_TYPE, REDIS_KEY, STATUS, TASK_TYPE } from '../../../consts';
 import { addReward, stringToConsumeParam, stringToRewardParam } from '../../../services/activity/giftPackageService';
 import { getPlayerMiniGameData, getPlayerMiniGameDataShow } from '../../../services/activity/miniGameService';
-import { ActivityMiniGameRecModel } from '../../../db/ActivityMiniGameRec';
+import { ActivityMiniGameRecModel } from '@db/ActivityMiniGameRec';
-import { ActivityMiniGameModel } from '../../../db/ActivityMiniGame';
+import { ActivityMiniGameModel } from '@db/ActivityMiniGame';
 import { handleCost } from '../../../services/role/rewardService';
 import { Rank } from '../../../services/rankService';
-import { nowSeconds } from '../../../pubUtils/timeUtil';
+import { nowSeconds } from '@pubUtils/timeUtil';
-import { RoleRankInfo } from '../../../domain/rank';
+import { RoleRankInfo } from '@domain/rank';
 import { getAllServerName } from '../../../services/redisService';
 import { checkTask } from '../../../services/task/taskService';
 
@@ -215,3 +215,4 @@ export class ForgeHandler {
         });
     }
 }
+

game-server/app/servers/activity/handler/monthlyFundHandler.ts

@@ -1,10 +1,10 @@
-import { Application, BackendSession, HandlerService, } from 'pinus';
+import { Application, BackendSession, HandlerService, } from 'pinus';
-import { resResult } from '../../../pubUtils/util';
+import { resResult } from '@pubUtils/util';
 import { ITEM_CHANGE_REASON, STATUS } from '../../../consts';
 import { getMonthlyFundData, getMonthlyFundDataShow } from '../../../services/activity/monthlyFundService';
-import { ActivityWeeklyFundModel } from '../../../db/ActivityWeeklyFund';
+import { ActivityWeeklyFundModel } from '@db/ActivityWeeklyFund';
 import { addReward, stringToRewardParam } from '../../../services/activity/giftPackageService';
-import { ActivityMonthlyFundModel } from '../../../db/ActivityMonthlyFund';
+import { ActivityMonthlyFundModel } from '@db/ActivityMonthlyFund';
 import { monthlyFundSchedule } from '../../../services/timeTaskService';
 import moment = require('moment');
 
@@ -84,3 +84,4 @@ export class MonthlyFundHandler {
         return resResult(STATUS.SUCCESS);
     }
 }
+

game-server/app/servers/activity/handler/monthlyTicketHandler.ts

@@ -1,5 +1,5 @@
-import { Application, BackendSession, HandlerService, } from 'pinus';
+import { Application, BackendSession, HandlerService, } from 'pinus';
-import { resResult } from '../../../pubUtils/util';
+import { resResult } from '@pubUtils/util';
 import { STATUS, } from '../../../consts';
 import { getPlayerMonthlyTicketData, getPlayerMonthlyTicketDayReward } from '../../../services/activity/monthlyTicketService';
 
@@ -52,3 +52,4 @@ export class MonthlyTicketHandler {
         return resResult(STATUS.NO_MOTHLY_TICKET_REWARD);
     }
 }
+

game-server/app/servers/activity/handler/newHeroGKHandler.ts

@@ -1,8 +1,8 @@
-import { Application, BackendSession, HandlerService, } from 'pinus';
+import { Application, BackendSession, HandlerService, } from 'pinus';
-import { resResult } from '../../../pubUtils/util';
+import { resResult } from '@pubUtils/util';
 import { STATUS } from '../../../consts';
 import { getPlayerNewHeroGKData } from '../../../services/activity/newHeroGKService';
-import { ActivityNewHeroGKModel } from '../../../db/ActivityNewHeroGK';
+import { ActivityNewHeroGKModel } from '@db/ActivityNewHeroGK';
 
 
 export default function (app: Application) {
@@ -72,3 +72,4 @@ export class NewHeroGKHandler {
     }
 
 }
+

game-server/app/servers/activity/handler/newHeroGachaHandler.ts

@@ -1,5 +1,5 @@
-import { Application, BackendSession, HandlerService, } from 'pinus';
+import { Application, BackendSession, HandlerService, } from 'pinus';
-import { resResult } from '../../../pubUtils/util';
+import { resResult } from '@pubUtils/util';
 import { STATUS } from '../../../consts';
 import { getPlayerNewHeroGachaData } from '../../../services/activity/newHeroService';
 
@@ -31,3 +31,4 @@ export class NewHeroGachaHandler {
         return resResult(STATUS.SUCCESS, playerData);
     }
 }
+

game-server/app/servers/activity/handler/newHeroGiftsHandler.ts

@@ -1,10 +1,10 @@
-import { Application, BackendSession, HandlerService, } from 'pinus';
+import { Application, BackendSession, HandlerService, } from 'pinus';
-import { resResult } from '../../../pubUtils/util';
+import { resResult } from '@pubUtils/util';
 import { ITEM_CHANGE_REASON, STATUS, } from '../../../consts';
 import { getPlayerNewHeroGiftsData } from '../../../services/activity/newHeroService';
-import { RewardParam } from '../../../domain/activityField/rewardField';
+import { RewardParam } from '@domain/activityField/rewardField';
 import { addReward, stringToRewardParam } from '../../../services/activity/giftPackageService';
-import { ActivityNewHeroGiftModel } from '../../../db/ActivityNewHeroGift';
+import { ActivityNewHeroGiftModel } from '@db/ActivityNewHeroGift';
 
 export default function (app: Application) {
     new HandlerService(app, {});
@@ -71,3 +71,4 @@ export class NewHeroGiftsHandler {
         }));
     }
 }
+

game-server/app/servers/activity/handler/novemberHandler.ts

@@ -1,12 +1,12 @@
-import { Application, BackendSession, HandlerService, } from 'pinus';
+import { Application, BackendSession, HandlerService, } from 'pinus';
 import { getPlayerNovemberData, getPlayerNovemberDataShow } from '../../../services/activity/novemberServices';
-import { genCode, getRandSingleEelm, resResult } from '../../../pubUtils/util';
+import { genCode, getRandSingleEelm, resResult } from '@pubUtils/util';
 import { ITEM_CHANGE_REASON, STATUS } from '../../../consts';
-import { ActivityNovemberRecModel, NovemberRecord } from '../../../db/ActivityNovemberRec';
+import { ActivityNovemberRecModel, NovemberRecord } from '@db/ActivityNovemberRec';
-import { RewardInter } from '../../../pubUtils/interface';
+import { RewardInter } from '@pubUtils/interface';
 import { addItems, handleCost } from '../../../services/role/rewardService';
 import { stringToConsumeParam, stringToRewardParam } from '../../../services/activity/giftPackageService';
-import { getZeroPoint } from '../../../pubUtils/timeUtil';
+import { getZeroPoint } from '@pubUtils/timeUtil';
 
 /**
  * 辜月集会
@@ -168,3 +168,4 @@ export class NovemberHandler {
         return resResult(STATUS.SUCCESS, { activityId, todayPlayCnt: playerData.todayPlayCnt, playCnt: playerData.playCnt, goods });
     }
 }
+

game-server/app/servers/activity/handler/popUpShopHandler.ts

@@ -1,10 +1,10 @@
-import { Application, BackendSession, HandlerService, } from 'pinus';
+import { Application, BackendSession, HandlerService, } from 'pinus';
-import { resResult, } from '../../../pubUtils/util';
+import { resResult, } from '@pubUtils/util';
 import { STATUS, ITEM_CHANGE_REASON, POP_UP_SHOP_CONDITION_TYPE, ACTIVITY_TYPE, DEBUG_MAGIC_WORD, PUSH_ROUTE, } from '../../../consts';
 import { checkPopUpCondition, getPopUpShopData, getPopUpShopDataShow } from '../../../services/activity/popUpShopService';
-import { ActivityPopUpShopModel } from '../../../db/ActivityPopUpShop';
+import { ActivityPopUpShopModel } from '@db/ActivityPopUpShop';
 import { addReward, stringToConsumeParam, stringToRewardParam } from '../../../services/activity/giftPackageService';
-import { RewardParam } from '../../../domain/activityField/rewardField';
+import { RewardParam } from '@domain/activityField/rewardField';
 import { handleCost } from '../../../services/role/rewardService';
 import { setInterval } from 'timers';
 import { sendMessageToUserWithSuc } from '../../../services/pushService';
@@ -195,3 +195,4 @@ export class PopUpShopHandler {
         return resResult(STATUS.SUCCESS);
     }
 }
+

game-server/app/servers/activity/handler/qixiHandler.ts

@@ -1,11 +1,11 @@
-import { Application, BackendSession, HandlerService, } from 'pinus';
+import { Application, BackendSession, HandlerService, } from 'pinus';
-import { genCode, getRandSingleEelm, parseNumberList, resResult } from '../../../pubUtils/util';
+import { genCode, getRandSingleEelm, parseNumberList, resResult } from '@pubUtils/util';
 import { ITEM_CHANGE_REASON, STATUS } from '../../../consts';
 import { addReward, stringToConsumeParam, stringToRewardParam } from '../../../services/activity/giftPackageService';
 import { addItems, handleCost } from '../../../services/role/rewardService';
 import { getPlayerQixiData, getPlayerQixiDataShow } from '../../../services/activity/qixiService';
-import { ActivityQixiRecModel } from '../../../db/ActivityQixiRec';
+import { ActivityQixiRecModel } from '@db/ActivityQixiRec';
-import { RewardInter } from '../../../pubUtils/interface';
+import { RewardInter } from '@pubUtils/interface';
 
 export default function (app: Application) {
     new HandlerService(app, {});
@@ -184,3 +184,4 @@ export class QiXiHandler {
          });
     }
 }
+

game-server/app/servers/activity/handler/rebateHandler.ts

@@ -1,10 +1,10 @@
-import { Application, BackendSession, HandlerService } from 'pinus';
+import { Application, BackendSession, HandlerService } from 'pinus';
-import { genCode, resResult } from '../../../pubUtils/util';
+import { genCode, resResult } from '@pubUtils/util';
 import {  ITEM_CHANGE_REASON, STATUS } from '../../../consts';
 import { addReward, stringToRewardParam } from '../../../services/activity/giftPackageService';
 import { getPlayerRebateDataShow, getPlayerRebateData } from '../../../services/activity/rebateService';
-import { HistoryOrderModel } from '../../../db/HistoryOrder';
+import { HistoryOrderModel } from '@db/HistoryOrder';
-import { UserModel } from '../../../db/User';
+import { UserModel } from '@db/User';
 
 
 export default function (app: Application) {
@@ -76,3 +76,4 @@ export class RebateHandler {
         return resResult(STATUS.SUCCESS);
     }
 }
+

game-server/app/servers/activity/handler/rechargeMoneyHandler.ts

@@ -1,11 +1,11 @@
-import { Application, BackendSession, HandlerService, } from 'pinus';
+import { Application, BackendSession, HandlerService, } from 'pinus';
-import { resResult } from '../../../pubUtils/util';
+import { resResult } from '@pubUtils/util';
 import { ITEM_CHANGE_REASON, STATUS } from '../../../consts';
 import { getPlayerRechargeMoneyData, getPlayerRechargeMoneyDataShow } from '../../../services/activity/rechargeMoneyService';
-import { RechargeMoneyPool } from '../../../domain/activityField/rechargeMoneyField';
+import { RechargeMoneyPool } from '@domain/activityField/rechargeMoneyField';
 import { addReward, stringToRewardParam } from '../../../services/activity/giftPackageService';
-import { RewardParam } from '../../../domain/activityField/rewardField';
+import { RewardParam } from '@domain/activityField/rewardField';
-import { ActivityRechargeMoneyModel } from '../../../db/ActivityRechargeMoney';
+import { ActivityRechargeMoneyModel } from '@db/ActivityRechargeMoney';
 import { addItems } from '../../../services/role/rewardService';
 
 
@@ -73,3 +73,4 @@ export class RechargeMoneyHandler {
         });
     }
 }
+

game-server/app/servers/activity/handler/refreshShopHandler.ts

@@ -1,9 +1,9 @@
-import { Application, BackendSession, HandlerService, } from 'pinus';
+import { Application, BackendSession, HandlerService, } from 'pinus';
-import { resResult } from '../../../pubUtils/util';
+import { resResult } from '@pubUtils/util';
 import { ITEM_CHANGE_REASON, STATUS } from '../../../consts';
 import { getPlayerRefreshShopData } from '../../../services/activity/refreshShopService';
 import { addReward, stringToConsumeParam, stringToRewardParam } from '../../../services/activity/giftPackageService';
-import { ActivityRefreshShopModel } from '../../../db/ActivityRefreshShop';
+import { ActivityRefreshShopModel } from '@db/ActivityRefreshShop';
 import { handleCost } from '../../../services/role/rewardService';
 
 export default function (app: Application) {
@@ -89,3 +89,4 @@ export class RefreshShopHandler {
     }
 
 }
+

game-server/app/servers/activity/handler/refreshTaskHandler.ts

@@ -1,12 +1,12 @@
-import { Application, BackendSession, HandlerService, } from 'pinus';
+import { Application, BackendSession, HandlerService, } from 'pinus';
-import { resResult } from '../../../pubUtils/util';
+import { resResult } from '@pubUtils/util';
 import { ITEM_CHANGE_REASON, STATUS } from '../../../consts';
 import { getPlayerRefreshTaskData } from '../../../services/activity/refreshTaskService';
-import { RefreshTaskItem } from '../../../domain/activityField/refreshTaskField';
+import { RefreshTaskItem } from '@domain/activityField/refreshTaskField';
 import { addReward, stringToRewardParam } from '../../../services/activity/giftPackageService';
-import { RewardParam } from '../../../domain/activityField/rewardField';
+import { RewardParam } from '@domain/activityField/rewardField';
-import { ActivityRefreshTaskModel } from '../../../db/ActivityRefreshTask';
+import { ActivityRefreshTaskModel } from '@db/ActivityRefreshTask';
-import { ActivityRefreshTaskPointModel } from '../../../db/ActivityRefreshTaskPoint';
+import { ActivityRefreshTaskPointModel } from '@db/ActivityRefreshTaskPoint';
 
 
 export default function (app: Application) {
@@ -121,3 +121,4 @@ export class RefreshTaskHandler {
     }
 
 }
+

game-server/app/servers/activity/handler/selfServiceShopHandler.ts

@@ -1,12 +1,12 @@
-import { Application, BackendSession, HandlerService, } from 'pinus';
+import { Application, BackendSession, HandlerService, } from 'pinus';
-import { resResult, splitString } from '../../../pubUtils/util';
+import { resResult, splitString } from '@pubUtils/util';
 import { ITEM_CHANGE_REASON, STATUS, } from '../../../consts';
-import { SelfServiceShopData } from '../../../domain/activityField/selfServiceShopField';
+import { SelfServiceShopData } from '@domain/activityField/selfServiceShopField';
 import { handleCost } from '../../../services/role/rewardService';
-import { ActivitySelfServiceShopModel, ActivitySelfServiceShopModelType } from '../../../db/ActivitySelfServiceShop';
+import { ActivitySelfServiceShopModel, ActivitySelfServiceShopModelType } from '@db/ActivitySelfServiceShop';
-import { ActivitySelfServiceModel } from '../../../db/ActivitySelfService';
+import { ActivitySelfServiceModel } from '@db/ActivitySelfService';
-import { ActivitySelfServiceGoodsModel } from '../../../db/ActivitySelfServiceGoods';
+import { ActivitySelfServiceGoodsModel } from '@db/ActivitySelfServiceGoods';
-import { ActivityModelType } from '../../../db/Activity';
+import { ActivityModelType } from '@db/Activity';
 import { addSelfServiceShopGiftReward, getSelfServiceShopActivityData, getPlayerActivityData } from '../../../services/activity/selfServiceShopActivityService';
 import { addReward, stringToConsumeParam, stringToRewardParam } from '../../../services/activity/giftPackageService';
 import { random } from 'underscore';
@@ -171,3 +171,4 @@ export class SelfServiceShopHandler {
         return resResult(STATUS.SUCCESS, { warId });
     }
 }
+

game-server/app/servers/activity/handler/sevenDaysHandler.ts

@@ -1,15 +1,15 @@
-import { Application, BackendSession, HandlerService, } from 'pinus';
+import { Application, BackendSession, HandlerService, } from 'pinus';
-import { resResult } from '../../../pubUtils/util';
+import { resResult } from '@pubUtils/util';
 import { STATUS, ACTIVITY_RESOURCES_TYPE, ITEM_CHANGE_REASON } from '../../../consts';
 import { handleCost } from '../../../services/role/rewardService';
-import { ActivityGrowthModel } from '../../../db/ActivityGrowth';
+import { ActivityGrowthModel } from '@db/ActivityGrowth';
-import { ActivityDailyGiftsModel } from '../../../db/ActivityDailyGifts';
+import { ActivityDailyGiftsModel } from '@db/ActivityDailyGifts';
 import { addReward, stringToRewardParam } from '../../../services/activity/giftPackageService';
-import { RewardParam } from '../../../domain/activityField/rewardField';
+import { RewardParam } from '@domain/activityField/rewardField';
-import { ActivityDailyChallengesModel } from '../../../db/ActivityDailyChallenges';
+import { ActivityDailyChallengesModel } from '@db/ActivityDailyChallenges';
-import { ActivityGrowthPointModel } from '../../../db/ActivityGrowthPoint';
+import { ActivityGrowthPointModel } from '@db/ActivityGrowthPoint';
 import { getPlayerSevenDaysData, getPlayerSevenDaysGrowthData, getPlayerSevenDaysDailyChallengesData, getPlayerSevenDaysDailyGiftsData } from '../../../services/activity/sevenDaysService';
-import { SevenDaysGrowthItem, SevenDaysPointRewardItem, SevenDaysDailyItem, SevenDaysDailyGiftItem } from '../../../domain/activityField/sevenDaysField';
+import { SevenDaysGrowthItem, SevenDaysPointRewardItem, SevenDaysDailyItem, SevenDaysDailyGiftItem } from '@domain/activityField/sevenDaysField';
 
 
 export default function (app: Application) {
@@ -219,3 +219,4 @@ export class SevenDaysHandler {
     }
 
 }
+

game-server/app/servers/activity/handler/signInHandler.ts

@@ -1,14 +1,14 @@
-import { Application, BackendSession, HandlerService, } from 'pinus';
+import { Application, BackendSession, HandlerService, } from 'pinus';
-import { resResult } from '../../../pubUtils/util';
+import { resResult } from '@pubUtils/util';
 import { STATUS, ACTIVITY_TYPE, SERVER_OPEN_TIME, ITEM_CHANGE_REASON, } from '../../../consts';
 import { canBuyVip, getPlayerSignInData } from '../../../services/activity/signInService';
 import { handleCost } from '../../../services/role/rewardService';
-import { SignInItem } from '../../../domain/activityField/signInField';
+import { SignInItem } from '@domain/activityField/signInField';
-import { ActivitySignInModel } from '../../../db/ActivitySignIn';
+import { ActivitySignInModel } from '@db/ActivitySignIn';
 import moment = require('moment');
-import { RoleModel } from '../../../db/Role';
+import { RoleModel } from '@db/Role';
 import { addReward, stringToConsumeParam, stringToRewardParam } from '../../../services/activity/giftPackageService';
-import { RewardParam } from '../../../domain/activityField/rewardField';
+import { RewardParam } from '@domain/activityField/rewardField';
 
 
 export default function (app: Application) {
@@ -110,3 +110,4 @@ export class SignInHandler {
     }
 
 }
+

game-server/app/servers/activity/handler/taskPassHandler.ts

@@ -1,12 +1,12 @@
-import { Application, BackendSession, HandlerService, } from 'pinus';
+import { Application, BackendSession, HandlerService, } from 'pinus';
-import { resResult } from '../../../pubUtils/util';
+import { resResult } from '@pubUtils/util';
 import { ITEM_CHANGE_REASON, STATUS, } from '../../../consts';
 import { getTaskPassData, getTaskPassDataShow } from '../../../services/activity/taskPassService';
-import { ActivityTaskPassModel, ReceivedReward } from '../../../db/ActivityTaskPass';
+import { ActivityTaskPassModel, ReceivedReward } from '@db/ActivityTaskPass';
-import { RewardParam } from '../../../domain/activityField/rewardField';
+import { RewardParam } from '@domain/activityField/rewardField';
-import { nowSeconds } from '../../../pubUtils/timeUtil';
+import { nowSeconds } from '@pubUtils/timeUtil';
 import { addReward, stringToConsumeParam, stringToRewardParam } from '../../../services/activity/giftPackageService';
-import { ItemInter } from '../../../pubUtils/interface';
+import { ItemInter } from '@pubUtils/interface';
 import { isNumber, pick } from 'underscore';
 import { handleCost } from '../../../services/role/rewardService';
 
@@ -85,3 +85,4 @@ export class TaskPassHandler {
         return resResult(STATUS.SUCCESS, result);
     }
 }
+

game-server/app/servers/activity/handler/thirtyDaysHandler.ts

@@ -1,14 +1,14 @@
-import { Application, BackendSession, HandlerService, } from 'pinus';
+import { Application, BackendSession, HandlerService, } from 'pinus';
-import { resResult } from '../../../pubUtils/util';
+import { resResult } from '@pubUtils/util';
 import { STATUS, ACTIVITY_TYPE, ITEM_CHANGE_REASON } from '../../../consts';
 import { getPlayerThirtyDaysData } from '../../../services/activity/thirtyDaysService';
-import { ThirtyDaysData, ThirtyDaysItem, ThirtyDaysPointItem } from '../../../domain/activityField/thirtyDaysField';
+import { ThirtyDaysData, ThirtyDaysItem, ThirtyDaysPointItem } from '@domain/activityField/thirtyDaysField';
-import { ActivityThirtyDaysModel } from '../../../db/ActivityThirtyDays';
+import { ActivityThirtyDaysModel } from '@db/ActivityThirtyDays';
-import { ActivityThirtyDaysPointRewardModel } from '../../../db/ActivityThirtyDaysPointReward';
+import { ActivityThirtyDaysPointRewardModel } from '@db/ActivityThirtyDaysPointReward';
-import { ActivityModel, ActivityModelType } from '../../../db/Activity';
+import { ActivityModel, ActivityModelType } from '@db/Activity';
-import { ServerlistModel } from '../../../db/Serverlist';
+import { ServerlistModel } from '@db/Serverlist';
 import { addReward, stringToRewardParam } from '../../../services/activity/giftPackageService';
-import { RewardParam } from '../../../domain/activityField/rewardField';
+import { RewardParam } from '@domain/activityField/rewardField';
 
 export default function (app: Application) {
     new HandlerService(app, {});
@@ -140,3 +140,4 @@ export class ThirtyDaysHandler {
         }));
     }
 }
+

game-server/app/servers/activity/handler/timeLimitRankHandler.ts

@@ -1,13 +1,13 @@
-import { Application, BackendSession, HandlerService, } from 'pinus';
+import { Application, BackendSession, HandlerService, } from 'pinus';
-import { resResult } from '../../../pubUtils/util';
+import { resResult } from '@pubUtils/util';
 import { DEBUG_MAGIC_WORD, getRedisKeyByRankType, HERO_SELECT, ITEM_CHANGE_REASON, RANK_TYPE, ROLE_SELECT, STATUS } from '../../../consts';
 import { pick } from 'underscore';
 import { getTimeLimitRankData, getTimeLimitRankDataShow, sendRankMail, takeSnapshot } from '../../../services/activity/timeLimitRankService';
 import { getRankInHandler, Rank } from '../../../services/rankService';
 import { getActivityById } from '../../../services/activity/activityService';
-import { TimeLimitRankData } from '../../../domain/activityField/timeLimitRankField';
+import { TimeLimitRankData } from '@domain/activityField/timeLimitRankField';
 import { getServerCreateTime, hasKey } from '../../../services/redisService';
-import { KeyName } from '../../../domain/rank';
+import { KeyName } from '@domain/rank';
 
 
 export default function (app: Application) {
@@ -98,3 +98,4 @@ export class TimeLimitRankHandler {
         return resResult(STATUS.SUCCESS);
     }
 }
+

game-server/app/servers/activity/handler/treasureHuntHandler.ts

@@ -1,16 +1,16 @@
-import { Application, BackendSession, HandlerService, } from 'pinus';
+import { Application, BackendSession, HandlerService, } from 'pinus';
-import { resResult } from '../../../pubUtils/util';
+import { resResult } from '@pubUtils/util';
 import { ITEM_CHANGE_REASON, STATUS, } from '../../../consts';
 import { getPlayerTreasureHuntData, getPlayerTreasureHuntShopData, getPlayerTreasureHuntTaskData, getPlayerTreasureHuntTreasureShopData, getPlayerTreasureHuntChallengeData, getPlayerTreasureHuntFirstPageData } from '../../../services/activity/treasureHuntService';
-import { ActivityTreasureHuntShopModel } from '../../../db/ActivityTreasureHuntShop';
+import { ActivityTreasureHuntShopModel } from '@db/ActivityTreasureHuntShop';
-import { ActivityTreasureHuntTaskModel } from '../../../db/ActivityTreasureHuntTask';
+import { ActivityTreasureHuntTaskModel } from '@db/ActivityTreasureHuntTask';
 import { handleCost } from '../../../services/role/rewardService';
 import { addReward, stringToConsumeParam, stringToRewardParam } from '../../../services/activity/giftPackageService';
-import { RewardParam } from '../../../domain/activityField/rewardField';
+import { RewardParam } from '@domain/activityField/rewardField';
-import { ActivityTreasureHuntTreasureShopModel } from '../../../db/ActivityTreasureHuntTreasureShop';
+import { ActivityTreasureHuntTreasureShopModel } from '@db/ActivityTreasureHuntTreasureShop';
-import { ActivityTreasureHuntFirstPageModel } from '../../../db/ActivityTreasureHuntFirstPage';
+import { ActivityTreasureHuntFirstPageModel } from '@db/ActivityTreasureHuntFirstPage';
 import { CheckMeterial } from '../../../services/role/checkMaterial';
-import { ActivityTreasureHuntChallengeModel } from '../../../db/ActivityTreasureHuntChallenge';
+import { ActivityTreasureHuntChallengeModel } from '@db/ActivityTreasureHuntChallenge';
 
 
 export default function (app: Application) {
@@ -230,3 +230,4 @@ export class TreasureHuntHandler {
         }));
     }
 }
+

game-server/app/servers/activity/handler/vipRechargeMoneyHandler.ts

@@ -1,13 +1,13 @@
-import { Application, BackendSession, HandlerService, } from 'pinus';
+import { Application, BackendSession, HandlerService, } from 'pinus';
-import { resResult } from '../../../pubUtils/util';
+import { resResult } from '@pubUtils/util';
 import { ITEM_CHANGE_REASON, STATUS, } from '../../../consts';
 import { getPlayerVipRechargeMoneyData, } from '../../../services/activity/vipRechargeMoneyService';
-import { VipRechargeMoneyItem } from '../../../domain/activityField/vipRechargeMoneyField';
+import { VipRechargeMoneyItem } from '@domain/activityField/vipRechargeMoneyField';
 import { addReward, stringToRewardParam } from '../../../services/activity/giftPackageService';
-import { RewardParam } from '../../../domain/activityField/rewardField';
+import { RewardParam } from '@domain/activityField/rewardField';
-import { ActivityVipRechargeMoneyModel } from '../../../db/ActivityVipRechargeMoney';
+import { ActivityVipRechargeMoneyModel } from '@db/ActivityVipRechargeMoney';
-import { UserOrderModel } from '../../../db/UserOrder';
+import { UserOrderModel } from '@db/UserOrder';
-import { dicRMB } from '../../../pubUtils/dictionary/DicRMB';
+import { dicRMB } from '@pubUtils/dictionary/DicRMB';
 import moment = require('moment');
 
 
@@ -109,3 +109,4 @@ export class VipRechargeMoneyHandler {
         return resResult(STATUS.WRONG_PARMS);
     }
 }
+

game-server/app/servers/activity/handler/weeklyFundHandler.ts

@@ -1,8 +1,8 @@
-import { Application, BackendSession, HandlerService, } from 'pinus';
+import { Application, BackendSession, HandlerService, } from 'pinus';
-import { resResult } from '../../../pubUtils/util';
+import { resResult } from '@pubUtils/util';
 import { ITEM_CHANGE_REASON, STATUS } from '../../../consts';
 import { getWeeklyFundDataShow, getWeeklyFundData } from '../../../services/activity/weeklyFundService';
-import { ActivityWeeklyFundModel } from '../../../db/ActivityWeeklyFund';
+import { ActivityWeeklyFundModel } from '@db/ActivityWeeklyFund';
 import { addReward, stringToRewardParam } from '../../../services/activity/giftPackageService';
 
 
@@ -66,3 +66,4 @@ export class WeeklyFundHandler {
         });
     }
 }
+

game-server/app/servers/activity/handler/yuanbaoShopHandler.ts

@@ -1,5 +1,5 @@
-import { Application, BackendSession, HandlerService, } from 'pinus';
+import { Application, BackendSession, HandlerService, } from 'pinus';
-import { resResult } from '../../../pubUtils/util';
+import { resResult } from '@pubUtils/util';
 import { STATUS } from '../../../consts';
 import { getPlayerYuanbaoShopData } from '../../../services/activity/yuanbaoService';
 
@@ -31,3 +31,4 @@ export class YuanbaoShopHandler {
         return resResult(STATUS.SUCCESS, playerData);
     }
 }
+

game-server/app/servers/activity/remote/activityRemote.ts

@@ -1,19 +1,19 @@
-import { Application, ChannelService, HandlerService, } from 'pinus';
+import { Application, ChannelService, HandlerService, } from 'pinus';
-import { ActivityModel, ActivityModelType } from '../../../db/Activity';
+import { ActivityModel, ActivityModelType } from '@db/Activity';
-import { ServerlistModel } from '../../../db/Serverlist';
+import { ServerlistModel } from '@db/Serverlist';
-import { gameData, reloadResources } from '../../../pubUtils/data';
+import { gameData, reloadResources } from '@pubUtils/data';
 import { getServerMainten, setServerMainten, stopServerMainten } from '../../../services/gmService';
 import { taflush } from '../../../services/sdkService';
-import { ActivityInRemote } from '../../../domain/activityField/activityField';
+import { ActivityInRemote } from '@domain/activityField/activityField';
 import { errlogger } from '../../../util/logger';
-import { ActivityGroupModel } from '../../../db/ActivityGroup';
+import { ActivityGroupModel } from '@db/ActivityGroup';
 import { deleteActivities, loadActivities, saveActivitiesToGroup, updateActivities, _getActivityById, _getActivitiesByType, _getActivities, _getActivitiesByServerId, saveGroupToServer, addServerToGroup } from '../../../services/memoryCache/activityData';
 import { saveActivityMemory } from '../../../services/log/memoryLogService';
 import { setApiIsClose } from '../../../services/chatService';
 import { setKvToMemory } from '../../../services/pushService';
 import { sendPublicAccountGift } from '../../../services/activity/bindPhoneService';
 import { setHiddenData } from '../../../services/memoryCache/hiddenData';
-import * as dicParam from '../../../pubUtils/dicParam';
+import * as dicParam from '@pubUtils/dicParam';
 
 export default function (app: Application) {
     new HandlerService(app, {});
@@ -210,3 +210,4 @@ export class ActivityRemote {
         } 
     }
 }
+

game-server/app/servers/battle/handler/barrageHandler.ts

@@ -1,9 +1,9 @@
-import { Application, BackendSession } from "pinus";
+import { Application, BackendSession } from "pinus";
-import { ScriptBarrageModel } from "../../../db/ScriptBarrage";
+import { ScriptBarrageModel } from "@db/ScriptBarrage";
-import { BarrageReturn } from '../../../domain/roleField/barrage';
+import { BarrageReturn } from '@domain/roleField/barrage';
-import { resResult, getRandEelm } from "../../../pubUtils/util";
+import { resResult, getRandEelm } from "@pubUtils/util";
 import { STATUS } from "../../../consts";
-import { closeScriptBarrage } from "../../../pubUtils/sdkUtil";
+import { closeScriptBarrage } from "@pubUtils/sdkUtil";
 
 export default function(app: Application) {
     return new BarrageHandler(app);
@@ -53,3 +53,4 @@ export class BarrageHandler {
         return resResult(STATUS.SUCCESS, { barrageList });
     }
 }
+

game-server/app/servers/battle/handler/dailyBattleHandler.ts

@@ -1,11 +1,11 @@
-import { Application, BackendSession } from 'pinus';
+import { Application, BackendSession } from 'pinus';
-import { DailyRecordModel } from '../../../db/DailyRecord';
+import { DailyRecordModel } from '@db/DailyRecord';
-import { STATUS } from '../../../consts/statusCode';
+import { STATUS } from '@consts/statusCode';
-import { resResult } from '../../../pubUtils/util';
+import { resResult } from '@pubUtils/util';
-import { RoleModel } from '../../../db/Role';
+import { RoleModel } from '@db/Role';
 import { getDailyNum, getDailyBattleList, getDailyBuyCountCost } from '../../../services/dailyBattleService';
 import { getGoldObject, handleCost } from '../../../services/role/rewardService';
-import { gameData } from '../../../pubUtils/data';
+import { gameData } from '@pubUtils/data';
 import { DEBUG_MAGIC_WORD, ITEM_CHANGE_REASON } from '../../../consts';
 
 export default function(app: Application) {
@@ -68,3 +68,4 @@ export class DailyBattleHandler {
         return resResult(STATUS.SUCCESS);
     }
 }
+

game-server/app/servers/battle/handler/dungeonBattleHandler.ts

@@ -1,12 +1,12 @@
-import { Application, BackendSession } from 'pinus';
+import { Application, BackendSession } from 'pinus';
-import { STATUS } from '../../../consts/statusCode';
+import { STATUS } from '@consts/statusCode';
-import { resResult, shouldRefresh } from '../../../pubUtils/util';
+import { resResult, shouldRefresh } from '@pubUtils/util';
-import { RoleModel } from '../../../db/Role';
+import { RoleModel } from '@db/Role';
 import { getGoldObject, handleCost } from '../../../services/role/rewardService';
 import { getDungeonData, getDungeonBuyCountCost } from '../../../services/dungeonService';
-import * as dicParam from '../../../pubUtils/dicParam';
+import * as dicParam from '@pubUtils/dicParam';
-import { DungeonFirstModel } from '../../../db/DungeonFirst';
+import { DungeonFirstModel } from '@db/DungeonFirst';
-import { DungeonResultParam } from '../../../domain/battleField/dungeon';
+import { DungeonResultParam } from '@domain/battleField/dungeon';
 import { DEBUG_MAGIC_WORD, ITEM_CHANGE_REASON } from '../../../consts';
 import { getVipDungeonCnt } from '../../../services/activity/monthlyTicketService';
 
@@ -85,3 +85,4 @@ export class DungeonBattleHandler {
         return resResult(STATUS.SUCCESS);
     }
 }
+

game-server/app/servers/battle/handler/eventBattleHandler.ts

@@ -1,13 +1,13 @@
-import { Application, BackendSession, HandlerService, } from 'pinus';
+import { Application, BackendSession, HandlerService, } from 'pinus';
-import { EventRecordModel } from '../../../db/EventRecord';
+import { EventRecordModel } from '@db/EventRecord';
-import { RoleModel } from '../../../db/Role';
+import { RoleModel } from '@db/Role';
 import { EVENT_STATUS, EVENT_RECORD_STATUS, EVENT_ANSWER_STATUS, TASK_TYPE, DEBUG_MAGIC_WORD, ITEM_CHANGE_REASON, EVENT_TYPE, EVENT_QUIZ_NUM } from '../../../consts';
 import { checkEventStatus, getEventSuccessStatus, getEvent, checkQuiz, startEvent, refreshEvent, getEventTime, randomPosition, randomQuestion } from '../../../services/eventSercive';
 import { addItems } from '../../../services/role/rewardService';
-import { STATUS } from '../../../consts/statusCode';
+import { STATUS } from '@consts/statusCode';
-import { genCode, resResult } from '../../../pubUtils/util';
+import { genCode, resResult } from '@pubUtils/util';
 import { checkTask } from '../../../services/task/taskService';
-import { gameData } from '../../../pubUtils/data';
+import { gameData } from '@pubUtils/data';
 
 export default function (app: Application) {
     new HandlerService(app, {});
@@ -159,3 +159,4 @@ export class EventBattleHandler {
         return resResult(STATUS.SUCCESS);
     }
 }
+

game-server/app/servers/battle/handler/expeditionBattleHandler.ts

@@ -1,27 +1,27 @@
-import { Application, BackendSession, HandlerService, } from 'pinus';
+import { Application, BackendSession, HandlerService, } from 'pinus';
-import { BattleRecordModel } from '../../../db/BattleRecord';
+import { BattleRecordModel } from '@db/BattleRecord';
-import { ExpeditionRecordModel } from '../../../db/ExpeditionRecord';
+import { ExpeditionRecordModel } from '@db/ExpeditionRecord';
-import { ExpeditionWarRecordModel } from '../../../db/ExpeditionWarRecord';
+import { ExpeditionWarRecordModel } from '@db/ExpeditionWarRecord';
-import { ExpeditionPointModel } from '../../../db/ExpeditionPoint';
+import { ExpeditionPointModel } from '@db/ExpeditionPoint';
-import { RoleModel } from '../../../db/Role';
+import { RoleModel } from '@db/Role';
-import { genCode, getWarTypeName } from '../../../pubUtils/util';
+import { genCode, getWarTypeName } from '@pubUtils/util';
 import { getPointRewardStatus, getResetRemainCnt, findOrCreateEnemies, getExpeditionStatus } from '../../../services/expeditionService';
 import { DEBUG_MAGIC_WORD, EXPEDITION_WAR_RECORD_STATUS, ITEM_CHANGE_REASON, KING_EXP_RATIO_TYPE, TASK_TYPE, TA_EVENT } from '../../../consts';
 import { WarReward } from '../../../services/warRewardService';
 import { addItems } from '../../../services/role/rewardService';
 import { getAp, setAp } from '../../../services/actionPointService';
-import { STATUS } from '../../../consts/statusCode';
+import { STATUS } from '@consts/statusCode';
-import { resResult } from '../../../pubUtils/util';
+import { resResult } from '@pubUtils/util';
 import { calculateWarStar, checkBattleHeroes, getBattleRecordParam, roleLevelup } from '../../../services/normalBattleService';
 import { checkTask, checkTaskInBattleEnd, checkTaskInBattleStart, checkTaskInSkipExpedition } from '../../../services/task/taskService';
-import { gameData } from '../../../pubUtils/data';
+import { gameData } from '@pubUtils/data';
-import * as dicParam from '../../../pubUtils/dicParam';
+import * as dicParam from '@pubUtils/dicParam';
-import { getSeconds, nowSeconds } from '../../../pubUtils/timeUtil';
+import { getSeconds, nowSeconds } from '@pubUtils/timeUtil';
 import { reportTAEvent } from '../../../services/sdkService';
 import { getSumCe } from '../../../services/playerCeService';
 import { vipCanSkipExpedition } from '../../../services/activity/monthlyTicketService';
 import { isHeroHidden } from '../../../services/dataService';
-import { pvpEndParamInter } from '../../../pubUtils/interface';
+import { pvpEndParamInter } from '@pubUtils/interface';
 
 export default function (app: Application) {
     new HandlerService(app, {});
@@ -418,3 +418,4 @@ export class ExpeditionBattleHandler {
         return resResult(STATUS.SUCCESS);
     }
 }
+

game-server/app/servers/battle/handler/friendBattleHandler.ts

@@ -1,13 +1,13 @@
-import { Application, BackendSession, pinus, HandlerService, } from 'pinus';
+import { Application, BackendSession, pinus, HandlerService, } from 'pinus';
-import { LadderMatchModel } from '../../../db/LadderMatch';
+import { LadderMatchModel } from '@db/LadderMatch';
-import { HeroModel, HeroType } from '../../../db/Hero';
+import { HeroModel, HeroType } from '@db/Hero';
-import { ArtifactModel } from '../../../db/Artifact';
+import { ArtifactModel } from '@db/Artifact';
 import { getHeroesAttributes } from '../../../services/playerCeService';
-import { gameData } from '../../../pubUtils/data';
+import { gameData } from '@pubUtils/data';
-import { LadderOppDetailHeroReturn } from '../../../domain/battleField/ladder';
+import { LadderOppDetailHeroReturn } from '@domain/battleField/ladder';
-import { resResult } from '../../../pubUtils/util';
+import { resResult } from '@pubUtils/util';
-import { STATUS } from '../../../consts/statusCode';
+import { STATUS } from '@consts/statusCode';
-import { RoleType } from '../../../db/Role';
+import { RoleType } from '@db/Role';
 import { FRIEND_BATTLE_DISPATCH_JSONID } from '../../../consts';
 import { getLadderDefCe } from '../../../services/redisService';
 
@@ -59,3 +59,4 @@ export class FriendBattleHandler {
         return resResult(STATUS.SUCCESS, { title, combo, defCe, heroes: result })
     }
 }
+

game-server/app/servers/battle/handler/ladderHandler.ts

@@ -1,28 +1,28 @@
-
+
 import { Application, BackendSession, pinus, HandlerService, } from 'pinus';
 import { isArray, pick } from 'underscore';
-import { gameData } from '../../../pubUtils/data';
+import { gameData } from '@pubUtils/data';
-import { STATUS } from '../../../consts/statusCode';
+import { STATUS } from '@consts/statusCode';
-import { arrToMap, resResult } from '../../../pubUtils/util';
+import { arrToMap, resResult } from '@pubUtils/util';
-import { getTimeFunM } from '../../../pubUtils/timeUtil';
+import { getTimeFunM } from '@pubUtils/timeUtil';
-import { LadderMatchModel, LadderUpdateInter } from '../../../db/LadderMatch';
+import { LadderMatchModel, LadderUpdateInter } from '@db/LadderMatch';
 import { battleEndWhenChange, checkRank, generateInitRecInfo, generateOppPlayers, getBuyCntCost, getLadderData, getLadderEnemies, getLadderOppDetailData, getLadderOppStatus, getNumberArr, ladderBattleEndReward, pushLadderIconShow, refreshLadderDaily, refreshLadderEnemies, sendLadderDailyReward, uniqueArr } from '../../../services/ladderService';
-import { LadderDataReturn, LadderDefense, LadderDefenseHero, LadderOppDetailReturn, LadderOppLineupReturn, LadderOppPlayerHeroInfo, LadderOppPlayerReturn } from '../../../domain/battleField/ladder';
+import { LadderDataReturn, LadderDefense, LadderDefenseHero, LadderOppDetailReturn, LadderOppLineupReturn, LadderOppPlayerHeroInfo, LadderOppPlayerReturn } from '@domain/battleField/ladder';
-import { LadderMatchRecModel } from '../../../db/LadderMatchRec';
+import { LadderMatchRecModel } from '@db/LadderMatchRec';
-import { HeroModel } from '../../../db/Hero';
+import { HeroModel } from '@db/Hero';
-import { LADDER } from '../../../pubUtils/dicParam';
+import { LADDER } from '@pubUtils/dicParam';
 import { handleCost } from '../../../services/role/rewardService';
 import { DEBUG_MAGIC_WORD, ITEM_CHANGE_REASON, LADDER_OPP_STATUS, LADDER_STATUS, REDIS_KEY, WAR_TYPE } from '../../../consts';
 import { checkBattleHeroesByHid, getBattleRecordParam } from '../../../services/normalBattleService';
-import { ServerlistModel } from '../../../db/Serverlist';
+import { ServerlistModel } from '@db/Serverlist';
 import { saveLadderDefCeByData } from '../../../services/redisService';
 import { pushLadderTopChangeMsg } from '../../../services/sysChatService';
 import { checkTaskInLadderEnd, checkTaskInLadderStart, checkTaskInLadderSweep } from '../../../services/task/taskService';
-import { BattleRecordModel } from '../../../db/BattleRecord';
+import { BattleRecordModel } from '@db/BattleRecord';
 import { isHeroHidden } from '../../../services/dataService';
-import { getRemoteRplFilePath, getRemoteRplPrefix } from '../../../pubUtils/battleUtils';
+import { getRemoteRplFilePath, getRemoteRplPrefix } from '@pubUtils/battleUtils';
-import { pvpEndParamInter } from '../../../pubUtils/interface';
+import { pvpEndParamInter } from '@pubUtils/interface';
-import { Combo } from '../../../domain/battleField/pvp';
+import { Combo } from '@domain/battleField/pvp';
 
 export default function (app: Application) {
     new HandlerService(app, {});
@@ -453,3 +453,4 @@ export class LadderHandler {
         return resResult(STATUS.SUCCESS)
     }
 }
+

game-server/app/servers/battle/handler/normalBattleHandler.ts

@@ -1,34 +1,34 @@
-import { Application, BackendSession, HandlerService, } from 'pinus';
+import { Application, BackendSession, HandlerService, } from 'pinus';
-import { BattleRecordModel } from '../../../db/BattleRecord';
+import { BattleRecordModel } from '@db/BattleRecord';
-import { BattleSweepRecordModel } from '../../../db/BattleSweepRecord';
+import { BattleSweepRecordModel } from '@db/BattleSweepRecord';
-import { BattleCheatRecModel } from '../../../db/BattleCheatRec';
+import { BattleCheatRecModel } from '@db/BattleCheatRec';
-import { genCode, getReasonByWarType, getWarTypeName } from '../../../pubUtils/util';
+import { genCode, getReasonByWarType, getWarTypeName } from '@pubUtils/util';
 import { WAR_TYPE, EVENT_STATUS, REDIS_KEY, KING_EXP_RATIO_TYPE, TA_EVENT, ITEM_CHANGE_REASON, BLOCK_TYPE, CHECT_BLOCK_TYPE, CHECT_BATTLE_TYPE, CHECT_BATTLE_TYPE_HIDE, CHECT_BATTLE_TYPE_ATK_LIMIT } from '../../../consts';
 import { checkDaily, checkDailyAndIncrease } from '../../../services/dailyBattleService';
 import { checkTowerWar, towerBattleEnd } from '../../../services/battleService';
 import { WarReward } from '../../../services/warRewardService';
 import { getAp, setAp } from '../../../services/actionPointService';
 import { setBattleStatus, checkEventBattle } from '../../../services/eventSercive';
-import { STATUS } from '../../../consts/statusCode';
+import { STATUS } from '@consts/statusCode';
-import { resResult } from '../../../pubUtils/util';
+import { resResult } from '@pubUtils/util';
-import { RoleModel } from '../../../db/Role';
+import { RoleModel } from '@db/Role';
-import { RScriptRecordModel } from '../../../db/RScriptRecord';
+import { RScriptRecordModel } from '@db/RScriptRecord';
 import { checkBattleHeroes, roleLevelup, calculateWarStar, getBattleListOfTypes, getMainChapter, getStarOfChapter, checkWarCountAndInc, getBattleRecordParam } from '../../../services/normalBattleService';
 import { checkDungeonNum, checkDungeonAndIncrease, saveDungeonFirst } from '../../../services/dungeonService';
 // import { switchOnFunc } from '../../../services/funcSwitchService';
-import { gameData } from '../../../pubUtils/data';
+import { gameData } from '@pubUtils/data';
 import { pushMysteryFirstMsg, pushVestigeFirstMsg } from '../../../services/chatService';
-import { getSeconds, nowSeconds } from '../../../pubUtils/timeUtil';
+import { getSeconds, nowSeconds } from '@pubUtils/timeUtil';
 import { Rank } from '../../../services/rankService';
 import { checkTaskInBattleEnd, checkTaskInBattleStart, checkTaskInBattleSweep } from '../../../services/task/taskService';
-import { ActivitySelfServiceModel } from '../../../db/ActivitySelfService';
+import { ActivitySelfServiceModel } from '@db/ActivitySelfService';
 import { getSelfServiceShopActivityData } from '../../../services/activity/selfServiceShopActivityService';
 import { challengeDailyGK } from '../../../services/activity/dailyGKService';
 import { challengeNewHeroGK } from '../../../services/activity/newHeroService';
 import { reportTAEvent } from '../../../services/sdkService';
 import { getVipRegretCnt } from '../../../services/activity/monthlyTicketService';
 import { isArray, isNumber } from 'underscore';
-import { RewardInter, pvpEndParamInter } from '../../../pubUtils/interface';
+import { RewardInter, pvpEndParamInter } from '@pubUtils/interface';
 import { addItems } from '../../../services/role/rewardService';
 import { treasureHuntChallengeConsume } from '../../../services/activity/treasureHuntService';
 import { combineItems } from '../../../services/role/util';
@@ -653,3 +653,4 @@ export class NormalBattleHandler {
         });
     }
 }
+

game-server/app/servers/battle/handler/pvpHandler.ts

@@ -1,33 +1,33 @@
-import { WAR_TYPE } from './../../../consts/constModules/battleConst';
+import { WAR_TYPE } from './../../../consts/constModules/battleConst';
 
 import { Application, BackendSession, pinus, HandlerService, } from 'pinus';
 import { findIndex } from 'underscore';
-import { gameData, getPvpBoxBySeasonNumAndIndex } from '../../../pubUtils/data';
+import { gameData, getPvpBoxBySeasonNumAndIndex } from '@pubUtils/data';
 import { refreshEnemies, getEnemies, refChallengeCnt, generPVPOppRecInfo, generMyRecInfo, sendLastSeasonRewardIfNotSent, refreshRefOppCnt, generPvpLineupCe, calLineupScore, checkPvpSeasonIsStart, checkPvpSeasonIsSummit, getPvpSeasonStatus, checkPvpSeasonIsWaiting, refreshBuyChallengeCnt } from '../../../services/pvpService';
-import { RoleModel, RoleType } from '../../../db/Role';
+import { RoleModel, RoleType } from '@db/Role';
-import { STATUS } from '../../../consts/statusCode';
+import { STATUS } from '@consts/statusCode';
-import { resResult, genCode, checkRoleIsRobot, robotIdComBack, parseGoodStr } from '../../../pubUtils/util';
+import { resResult, genCode, checkRoleIsRobot, robotIdComBack, parseGoodStr } from '@pubUtils/util';
-import { PvpDefenseModel, pvpUpdateInter } from '../../../db/PvpDefense';
+import { PvpDefenseModel, pvpUpdateInter } from '@db/PvpDefense';
-import { PvpSeasonResultModel } from '../../../db/PvpSeasonResult';
+import { PvpSeasonResultModel } from '@db/PvpSeasonResult';
 import { Rank } from '../../../services/rankService';
 import { checkTask, checkTaskInPvpEnd } from '../../../services/task/taskService';
-import { Attack, Combo, Defense, DefenseHero, PvpDataReturn, pvpSaveDataReturn } from '../../../domain/battleField/pvp';
+import { Attack, Combo, Defense, DefenseHero, PvpDataReturn, pvpSaveDataReturn } from '@domain/battleField/pvp';
 import { DEBUG_MAGIC_WORD, FIGURE_UNLOCK_CONDITION, ITEM_CHANGE_REASON, LINEUP_NUM, REDIS_KEY, TASK_TYPE } from '../../../consts';
-import { PVP } from '../../../pubUtils/dicParam';
+import { PVP } from '@pubUtils/dicParam';
 import { addItems, getGoldObject, handleCost, unlockFigure } from '../../../services/role/rewardService';
 import { pick } from "underscore";
-import { HeroModel } from '../../../db/Hero';
+import { HeroModel } from '@db/Hero';
-import PvpHistoryOpp, { PvpHistoryOppModel, PvpHistoryOppType } from '../../../db/PvpHistoryOpp';
+import PvpHistoryOpp, { PvpHistoryOppModel, PvpHistoryOppType } from '@db/PvpHistoryOpp';
-import { BattleRecordModel } from '../../../db/BattleRecord';
+import { BattleRecordModel } from '@db/BattleRecord';
-import { PvpRecordModel, PvpRecordParam, PvpRecordType } from '../../../db/PvpRecord';
+import { PvpRecordModel, PvpRecordParam, PvpRecordType } from '@db/PvpRecord';
-import { pvpEndParamInter } from '../../../pubUtils/interface';
+import { pvpEndParamInter } from '@pubUtils/interface';
-import { getSeconds, nowSeconds } from '../../../pubUtils/timeUtil';
+import { getSeconds, nowSeconds } from '@pubUtils/timeUtil';
-import { getRemoteRplPrefix, getRemoteRplFilePath } from '../../../pubUtils/battleUtils';
+import { getRemoteRplPrefix, getRemoteRplFilePath } from '@pubUtils/battleUtils';
-import { PlayerDetail, PlayerDetailHero } from '../../../domain/battleField/guild';
+import { PlayerDetail, PlayerDetailHero } from '@domain/battleField/guild';
-import { PvpSaveDataModel } from '../../../db/PvpSaveData';
+import { PvpSaveDataModel } from '@db/PvpSaveData';
-import { PVPConfigModel } from '../../../db/PvpConfig';
+import { PVPConfigModel } from '@db/PvpConfig';
 import { getAllServerName, getServerName } from '../../../services/redisService';
-import { RoleRankInfo } from '../../../domain/rank';
+import { RoleRankInfo } from '@domain/rank';
 import { isHeroHidden } from '../../../services/dataService';
 import { getPVPGroupIdOfServer } from '../../../services/serverService';
 import { getBattleRecordParam } from '../../../services/normalBattleService';
@@ -927,3 +927,4 @@ export class PvpHandler {
         return resResult(STATUS.SUCCESS);
     }
 }
+

game-server/app/servers/battle/handler/rougeHandler.ts

@@ -1,34 +1,34 @@
-import { Application, BackendSession, pinus, HandlerService, } from 'pinus';
+import { Application, BackendSession, pinus, HandlerService, } from 'pinus';
-import { RougelikeRecordModel } from '../../../db/RougelikeRecord';
+import { RougelikeRecordModel } from '@db/RougelikeRecord';
-import { genCode, getRandEelmWithWeight, resResult } from '../../../pubUtils/util';
+import { genCode, getRandEelmWithWeight, resResult } from '@pubUtils/util';
 import { COLLECTION_TYPE, ITEM_CHANGE_REASON, REST_POINT_TYPE, ROUGE_LIKE_CARD_TYPE, ROUGE_LIKE_CHOOSE_REWARD, ROUGE_LIKE_NODE_TYPE, ROUGE_LIKE_STATUS, TASK_ROUGE_CARD_TYPE, TASK_TYPE } from '../../../consts';
-import { Quest, RestPoint, RougelikeRecordDetailModel } from '../../../db/RougelikeRecordDetail';
+import { Quest, RestPoint, RougelikeRecordDetailModel } from '@db/RougelikeRecordDetail';
-import { STATUS } from '../../../consts/statusCode';
+import { STATUS } from '@consts/statusCode';
-import { RougelikeCardModel, RougelikeCardPara, RougelikeCardType } from '../../../db/RougelikeCard';
+import { RougelikeCardModel, RougelikeCardPara, RougelikeCardType } from '@db/RougelikeCard';
-import { Card, RougelikeCharaModel, RougelikeCharaPara, RougelikeCharaType } from '../../../db/RougelikeChara';
+import { Card, RougelikeCharaModel, RougelikeCharaPara, RougelikeCharaType } from '@db/RougelikeChara';
-import { CollectionReturnParam, CommonCard, CommonChara, RewardInter, RewardOption, RougeDamageInter, SlotCard, layerNode } from '../../../pubUtils/interface';
+import { CollectionReturnParam, CommonCard, CommonChara, RewardInter, RewardOption, RougeDamageInter, SlotCard, layerNode } from '@pubUtils/interface';
 import { clone } from 'underscore';
-import { RougelikeScoreModel } from '../../../db/RougelikeScore';
+import { RougelikeScoreModel } from '@db/RougelikeScore';
-import { RougelikeTechModel } from '../../../db/RougelikeTech';
+import { RougelikeTechModel } from '@db/RougelikeTech';
-import { RougelikeCollectionModel } from '../../../db/RougelikeCollection';
+import { RougelikeCollectionModel } from '@db/RougelikeCollection';
-import { RougelikeLayerModel, RougelikeLayerType } from '../../../db/RougelikeLayer';
+import { RougelikeLayerModel, RougelikeLayerType } from '@db/RougelikeLayer';
-import { RoleModel } from '../../../db/Role';
+import { RoleModel } from '@db/Role';
-import { gameData } from '../../../pubUtils/data';
+import { gameData } from '@pubUtils/data';
 import { chooseNode, getCardCount, getGame, getInitCharaCard, getLayerNodeReward, getLayerRewardOneData, getMap, getMaxHp, getRandomSpirit, getRougeData, repaireSendScoreReward, updateChalleng, updateMaxHp } from '../../../services/battle/rougeService';
 import { checkPreRougeTech, getCurTechData, updateEffectId } from '../../../services/battle/rougeTechService';
-import { BattleRecordModel } from '../../../db/BattleRecord';
+import { BattleRecordModel } from '@db/BattleRecord';
-import { HeroModel } from '../../../db/Hero';
+import { HeroModel } from '@db/Hero';
-import { ROUGELIKE } from '../../../pubUtils/dicParam';
+import { ROUGELIKE } from '@pubUtils/dicParam';
 import { HandleAddCard, addSameTypeCollect, addSingleCollect, formateCharasOrCards } from '../../../services/battle/rougeCollectService';
-import { DicRougePassiveCollect } from '../../../pubUtils/dictionary/DicRougePassiveCollect';
+import { DicRougePassiveCollect } from '@pubUtils/dictionary/DicRougePassiveCollect';
-import { DicRougeHolyCard } from '../../../pubUtils/dictionary/DicRougeHolyCard';
+import { DicRougeHolyCard } from '@pubUtils/dictionary/DicRougeHolyCard';
-import { DicRougeSkillCard } from '../../../pubUtils/dictionary/DicRougeSkillCard';
+import { DicRougeSkillCard } from '@pubUtils/dictionary/DicRougeSkillCard';
-import { DicRougeOptionGroup } from '../../../pubUtils/dictionary/DicRougeOptionGroup';
+import { DicRougeOptionGroup } from '@pubUtils/dictionary/DicRougeOptionGroup';
 import { addItems, getRougeTechScoreObject, handleCost } from '../../../services/role/rewardService';
 import { getEffectWhenGameStart, getCharaHp, getAddCoin, getNoBossRecoveryHp, getBattleRecoveryNum, getRecoveryExtendHp, getTrainCardDiscount, checkCanChooseSkillCard, checkCanReRandomReward, getEnterGame } from '../../../services/battle/rougeEffectService';
-import { RougelikeExtendModel } from '../../../db/RougelikeExtend';
+import { RougelikeExtendModel } from '@db/RougelikeExtend';
 import * as util from 'util';
-import { DicRougePassiveCard } from '../../../pubUtils/dictionary/DicRougePassiveCard';
+import { DicRougePassiveCard } from '@pubUtils/dictionary/DicRougePassiveCard';
 import { checkTask } from '../../../services/task/taskService';
 
 export default function (app: Application) {
@@ -1325,3 +1325,4 @@ export class RougeHandler {
         return resResult(STATUS.SUCCESS);
     }
 }
+

game-server/app/servers/battle/handler/towerBattleHandler.ts

@@ -1,4 +1,4 @@
-import { STATUS } from './../../../consts/statusCode';
+import { STATUS } from './../../../consts/statusCode';
 import { HANG_UP_CONSTS, ITEM_CHANGE_REASON, MSG_SOURCE, POP_UP_SHOP_CONDITION_TYPE, REDIS_KEY } from './../../../consts';
 import { TaskHero, TowerTaskRecModel, TowerTaskRecType } from './../../../db/TowerTaskRec';
 import { HangUpSpdUpRecModel } from './../../../db/HangUpSpdUpRec';
@@ -6,17 +6,17 @@ import { HangUpRecordModel } from './../../../db/HangUpRecord';
 import { RoleModel } from './../../../db/Role';
 import { TowerRecordModel, WarStatus } from './../../../db/TowerRecord';
 import { Application, BackendSession } from 'pinus';
-import { resResult, genCode, shouldRefresh } from '../../../pubUtils/util';
+import { resResult, genCode, shouldRefresh } from '@pubUtils/util';
 import { calcuHangUpReward, refreshTasks, treatTask, getRemainTime, getTowerStatus, getHungupRewards, getTasks, checkTaskRewards, getTowerTaskCostGold, getManyHangSpdUpCostGold, getTaskStatus, checkForbiddenChar, checkAndStartHungUp, createNewTowerRecord, getTowerRecByLv, getTowerStatusByWarId, getTowerHeroCe, getWarStatusByLv } from '../../../services/battleService';
 import { addItems, getGoldObject, handleCost } from '../../../services/role/rewardService';
 import { checkBattleHeroes } from '../../../services/normalBattleService';
-import { gameData } from '../../../pubUtils/data';
+import { gameData } from '@pubUtils/data';
-import * as dicParam from '../../../pubUtils/dicParam';
+import * as dicParam from '@pubUtils/dicParam';
-import { HeroModel } from '../../../db/Hero';
+import { HeroModel } from '@db/Hero';
 import { vipCanSkipTower } from '../../../services/activity/monthlyTicketService';
 import { pushTowerMsg } from '../../../services/sysChatService';
-import { WarStar } from '../../../domain/dbGeneral';
+import { WarStar } from '@domain/dbGeneral';
-import { ItemInter, RewardInter } from '../../../pubUtils/interface';
+import { ItemInter, RewardInter } from '@pubUtils/interface';
 import { combineItems } from '../../../services/role/util';
 import { checkTaskInSkipTower } from '../../../services/task/taskService';
 import { Rank } from '../../../services/rankService';
@@ -397,3 +397,4 @@ export class TowerBattleHandler {
         return resResult(STATUS.SUCCESS, { goods, receivedBox: newReceived });
     }
 }
+

game-server/app/servers/battle/remote/battleRemote.ts

@@ -1,6 +1,6 @@
-import { Application, ChannelService, HandlerService, } from 'pinus';
+import { Application, ChannelService, HandlerService, } from 'pinus';
-import { PVPConfigModel, PVPConfigType } from '../../../db/PvpConfig';
+import { PVPConfigModel, PVPConfigType } from '@db/PvpConfig';
-import { gameData, reloadResources } from '../../../pubUtils/data';
+import { gameData, reloadResources } from '@pubUtils/data';
 import { setApiIsClose } from '../../../services/chatService';
 import { getServerMainten, setServerMainten, stopServerMainten } from '../../../services/gmService';
 import { setServerGroup } from '../../../services/serverService';
@@ -11,7 +11,7 @@ import { taflush } from '../../../services/sdkService';
 import { setPvpSeasonNum, setPvpSettleSeasonNum } from '../../../services/timeTaskService';
 import { errlogger } from '../../../util/logger';
 import { setHiddenData } from '../../../services/memoryCache/hiddenData';
-import * as dicParam from '../../../pubUtils/dicParam';
+import * as dicParam from '@pubUtils/dicParam';
 
 export default function (app: Application) {
     new HandlerService(app, {});
@@ -216,3 +216,4 @@ export class BattleRemote {
         } 
     }
 }
+

game-server/app/servers/chat/handler/chatHandler.ts

@@ -1,18 +1,18 @@
-import { CHANNEL_PREFIX, MSG_SOURCE, getChannelType } from './../../../consts/constModules/chatConst';
+import { CHANNEL_PREFIX, MSG_SOURCE, getChannelType } from './../../../consts/constModules/chatConst';
 import { Application, BackendSession, HandlerService, } from 'pinus';
-import { genCode, resResult } from '../../../pubUtils/util';
+import { genCode, resResult } from '@pubUtils/util';
 import { DEFAULT_MSG_PER_PAGE, SDK_PUSH_MSG_TYPE, SDK_PUSH_TARGET_TYPE, STATUS, TASK_TYPE } from '../../../consts';
 import { createAccuseData, createGroupMsg, createPrivateMsg, getPrivateMessages, pushGroupMsgToRoom, pushMsgToRole, updatePrivateMsgReadInfo, recentPrivateChatInfos, recentWorldMsgs, recentSysMsgs, recentGuildMsgs, updatePrivateMsgIsTop, delPrivateMsg, recentServerGroupMsgs, recentLeagueMsgs } from '../../../services/chatService';
 import { getSimpleRoleInfo } from '../../../services/roleService';
 import { checkTask } from '../../../services/task/taskService';
-import { RoleModel } from '../../../db/Role';
+import { RoleModel } from '@db/Role';
 import { getFriendRelationType } from '../../../services/friendService';
-import { GVGLeagueModel } from '../../../db/GVGLeague';
+import { GVGLeagueModel } from '@db/GVGLeague';
 import { getAllGroupOfServer } from '../../../services/serverService';
 import { getGuildCodeString } from '../../../services/gvg/gvgRecService';
-import { GroupMessageType } from '../../../db/GroupMessage';
+import { GroupMessageType } from '@db/GroupMessage';
 import { pushMsg37 } from '../../../services/sdkService';
-import { gameData } from '../../../pubUtils/data';
+import { gameData } from '@pubUtils/data';
 import { pushClientMsg } from '../../../services/pushService';
 
 
@@ -227,3 +227,4 @@ export class ChatHandler {
         return resResult(STATUS.SUCCESS, result);
     }
 }
+

game-server/app/servers/chat/remote/chatRemote.ts

@@ -1,5 +1,5 @@
-import { Application, ChannelService, HandlerService, } from 'pinus';
+import { Application, ChannelService, HandlerService, } from 'pinus';
-import { gameData, reloadResources } from '../../../pubUtils/data';
+import { gameData, reloadResources } from '@pubUtils/data';
 import { _checkFilterWords, taflush } from '../../../services/sdkService';
 import { getServerMainten, setServerMainten, stopServerMainten } from '../../../services/gmService';
 import { errlogger } from '../../../util/logger';
@@ -7,7 +7,7 @@ import { addUserToChannel, sendMessageToChannel, sendMessgeToChannelByBatch, set
 import { setApiIsClose } from '../../../services/chatService';
 import { setServerGroup } from '../../../services/serverService';
 import { setHiddenData } from '../../../services/memoryCache/hiddenData';
-import * as dicParam from '../../../pubUtils/dicParam';
+import * as dicParam from '@pubUtils/dicParam';
 
 export default function (app: Application) {
     new HandlerService(app, {});
@@ -209,3 +209,4 @@ export class ChatRemote {
         } 
     }
 }
+

game-server/app/servers/comBattle/handler/comBattleHandler.ts

@@ -1,4 +1,4 @@
-import { ComBattleInvitation, MemComBtlTeam } from '../../../domain/battleField/ComBattleTeamField';
+import { ComBattleInvitation, MemComBtlTeam } from '@domain/battleField/ComBattleTeamField';
 import { difference, pick } from 'underscore';
 /*
  * @Author: 梁桐川 
@@ -7,12 +7,12 @@ import { difference, pick } from 'underscore';
  * @Last Modified time: 2021-08-27 17:47:56
  */
 import { IT_TYPE, CURRENCY_BY_TYPE, CURRENCY_TYPE, COM_TEAM_STATUS, COM_BTL_CONST, CONSUME_TYPE,  MSG_SOURCE, ROLE_SELECT, TASK_TYPE, KING_EXP_RATIO_TYPE, ITEM_CHANGE_REASON, getChannelType, CHANNEL_PREFIX, DEBUG_MAGIC_WORD, PUSH_ROUTE, POPULATE_TYPE } from '../../../consts';
-import Role, { RoleModel } from '../../../db/Role';
+import Role, { RoleModel } from '@db/Role';
-import { STATUS } from '../../../consts/statusCode';
+import { STATUS } from '@consts/statusCode';
 import { Application, BackendSession } from 'pinus';
-import { resResult, getRandSingleEelm, cal } from '../../../pubUtils/util';
+import { resResult, getRandSingleEelm, cal } from '@pubUtils/util';
-import { RoleStatus, ComBattleTeamModel, ComBattleTeamType, BossHp, ComRoleStatusHero } from '../../../db/ComBattleTeam';
+import { RoleStatus, ComBattleTeamModel, ComBattleTeamType, BossHp, ComRoleStatusHero } from '@db/ComBattleTeam';
-import { ItemModel, ItemType } from '../../../db/Item';
+import { ItemModel, ItemType } from '@db/Item';
 import { addItems, handleCost } from '../../../services/role/rewardService';
 import { checkRoleInQueue, getServerName, redisClient, rmCreatedTeamFromRedis, rmRoleFromQueue, setTeamSearchReq } from '../../../services/redisService';
 import { getRandBlueprtId,  getFrd, updateRobotHurtByTime, comBtlLvInvalid, clearRobotHurtTimer, setDismissTimer, dismissTeam, handleComBtlProgress, getComBattleFriendAdd, teammateInBlackList, blueprtIdValid, hasEnoughBlueprt, addRoleToTeam, addRoleStToTeam, addValidSearchingRoles, validToJoin, addRobotsToTeam, addRobotsLater, teamIsFullToStart, oneTeamNotInBlack, getAllAssistCnt, checkHasMyTeam, checkTeamStatusAndSend, getComBtlLvByPlayerLv, addToSearchingTeams, getCapFrd, getCapExtraCnt, startTeam } from '../../../services/battle/comBattleService';
@@ -20,18 +20,18 @@ import { setAp } from '../../../services/actionPointService';
 import { roleLevelup } from '../../../services/normalBattleService';
 import { getSimpleRoleInfo } from '../../../services/roleService';
 import { pushComBtlTeamMsg, pushFriendTeamInviteMsg, pushNormalItemMsg, pushTeamInviteMsg } from '../../../services/chatService';
-import { EXTERIOR, INFO_WINDOW } from '../../../pubUtils/dicParam';
+import { EXTERIOR, INFO_WINDOW } from '@pubUtils/dicParam';
-import { getZeroPointD, getTimeFunD, getSeconds, nowSeconds } from '../../../pubUtils/timeUtil';
+import { getZeroPointD, getTimeFunD, getSeconds, nowSeconds } from '@pubUtils/timeUtil';
-import { FriendParams } from '../../../domain/roleField/friend';
+import { FriendParams } from '@domain/roleField/friend';
 import { checkTask, checkTaskInComBattleStart } from '../../../services/task/taskService';
-import { gameData, getWarByBlueprtId } from '../../../pubUtils/data';
+import { gameData, getWarByBlueprtId } from '@pubUtils/data';
-import { HeroModel } from '../../../db/Hero';
+import { HeroModel } from '@db/Hero';
 import { addUserToTeamChannel, delTeamChannel, removeFromTeamChannel, sendMessageToTeam, sendMessageToUsersWithSuc, sendMessageToUserWithSuc } from '../../../services/pushService';
 import { getFriendRelationType, getRecommendType } from '../../../services/friendService';
-import { FriendRelationModel } from '../../../db/FriendRelation';
+import { FriendRelationModel } from '@db/FriendRelation';
 import { isHeroHidden } from '../../../services/dataService';
 import { addComTeam, clearComBtlTimer,deleteComBattle,getComTeamByCode } from '../../../services/memoryCache/comBattleData';
-import { clearComBattleRoute } from '../../../pubUtils/dispatcher';
+import { clearComBattleRoute } from '@pubUtils/dispatcher';
 
 export default function(app: Application) {
     return new ComBattleHandler(app);
@@ -829,3 +829,4 @@ export class ComBattleHandler {
     }
 
 }
+

game-server/app/servers/comBattle/remote/comBattleRemote.ts

@@ -1,16 +1,16 @@
-import { Application, ChannelService, FrontendSession, RemoterClass, HandlerService, pinus, } from 'pinus';
+import { Application, ChannelService, FrontendSession, RemoterClass, HandlerService, pinus, } from 'pinus';
-import { resResult } from '../../../pubUtils/util';
+import { resResult } from '@pubUtils/util';
 import { STATUS } from '../../../consts';
 import { handleComBtlProgress, _addToSearchingTeams } from '../../../services/battle/comBattleService';
-import { MemComBtlTeam } from '../../../domain/battleField/ComBattleTeamField';
+import { MemComBtlTeam } from '@domain/battleField/ComBattleTeamField';
 import { errlogger } from '../../../util/logger';
 import { saveComBattleMemory } from '../../../services/log/memoryLogService';
 import { setApiIsClose } from '../../../services/chatService';
 import { setHiddenData } from '../../../services/memoryCache/hiddenData';
 import { setKvToMemory } from '../../../services/pushService';
 import { getServerMainten, setServerMainten, stopServerMainten } from '../../../services/gmService';
-import { gameData, reloadResources } from '../../../pubUtils/data';
+import { gameData, reloadResources } from '@pubUtils/data';
-import * as dicParam from '../../../pubUtils/dicParam';
+import * as dicParam from '@pubUtils/dicParam';
 
 export default function (app: Application) {
     new HandlerService(app, {});
@@ -143,3 +143,4 @@ export class ComBattleRemote {
         } 
     }
 }
+

game-server/app/servers/connector/filter/global.ts

@@ -1,21 +1,21 @@
 import {Application, RouteRecord, FrontendOrBackendSession, HandlerCallback, pinus, FrontendSession} from "pinus";
 // import { checkEvent } from '../../../services/eventSercive';
-import { refresh } from '../../../services/refreshService';
+import { refresh } from "@pubUtils/refreshService";
-import { checkPrivateChat, checkGuildChat, checkOtherChat, checkRoleName, checkGuildName } from "../../../services/sdkService";
+import { checkPrivateChat, checkGuildChat, checkOtherChat, checkRoleName, checkGuildName } from "@pubUtils/sdkService";
-import { resResult, genCode } from "../../../pubUtils/util";
+import { resResult, genCode } from "@pubUtils/util";
-import { checkWhiteList, MsgEncrypt } from "../../../pubUtils/sysUtil";
+import { checkWhiteList, MsgEncrypt } from "@pubUtils/sysUtil";
-import { BLOCK_TYPE, CHANNEL_PREFIX, MSG_TYPE, PUSH_ROUTE, STATUS } from "../../../consts";
+import { BLOCK_TYPE, CHANNEL_PREFIX, MSG_TYPE, PUSH_ROUTE, STATUS } from "@consts";
-import { nowSeconds } from "../../../pubUtils/timeUtil";
+import { nowSeconds } from "@pubUtils/timeUtil";
-import { getServerMainten } from "../../../services/gmService";
+import { getServerMainten } from "@pubUtils/gmService";
-import { errlogger, infologger } from "../../../util/logger";
+import { errlogger, infologger } from "@pubUtils/logger";
-import { gameData } from "../../../pubUtils/data";
+import { gameData } from "@pubUtils/data";
-import { sendMessageToUser } from "../../../services/pushService";
+import { sendMessageToUser } from "@pubUtils/pushService";
-import { isCheckWord, isSkipEncode } from "../../../pubUtils/sdkUtil";
+import { isCheckWord, isSkipEncode } from "@pubUtils/sdkUtil";
-import { isDevelopEnv } from "../../../services/utilService";
+import { isDevelopEnv } from "@pubUtils/utilService";
 import { isNumber } from "underscore";
-import { getServerCreateTime, redisClient } from "../../../services/redisService";
+import { getServerCreateTime, redisClient } from "@pubUtils/redisService";
-import { checkRouteParam } from "../../../services/checkParam";
+import { checkRouteParam } from "@pubUtils/checkParam";
-import { isApiClose } from "../../../services/chatService";
+import { isApiClose } from "@pubUtils/chatService";
 
 export function globalFilter(app: Application) {
     return new Filter(app);
@@ -35,7 +35,6 @@ class Filter {
         const roleId: string = session.get('roleId');
         const uid: number = session.get('userid');
         const ip: string = session.get('ip');
-        // console.log('*********** global before ip', ip)
         const version: string = session.get('version');
         const isNewUser: boolean = session.get('isNewUser');
         let guildCode = session.get('guildCode');
@@ -46,172 +45,293 @@ class Filter {
         if(!this.checkPassEncrypt(routeRecord.route)) {
             msg = this.decryptMsg(msg, session);
             if(!msg) return next(new Error('globalFilter'), resResult(STATUS.WRONG_PARMS, { route: routeRecord.route }));
-
+            // @ts-ignore
             if(!this.checkTimeStamp(msg)) return next(new Error('globalFilter'), resResult(STATUS.TIMESTAMP_ERR, { route: routeRecord.route }));
-            if(!this.checkDuplicateAccess(msg)) return next(new Error('globalFilter'), resResult(STATUS.DUPLICATE_ACCESS, { route: routeRecord.route }))
-        }
-        msg = this.setMsg(msg, { logCode });
-        // 访问频率控制
-        if(!this.checkFrequency(routeRecord.route, msg, roleId)) {
-            return next(new Error('globalFilter'), resResult(STATUS.ACCESS_BUSY, { route: routeRecord.route }));
-        }
-        if(!this.checkFunction(routeRecord.route, msg)) {
-            return next(new Error('globalFilter'), resResult(STATUS.FUNCTION_CLOSE, { route: routeRecord.route }));
         }
 
-        if(!checkRouteParam(routeRecord.route, msg)) {
+        // @ts-ignore
+        if (isApiClose(routeRecord.route)) {
+            // @ts-ignore
+            return next(new Error('globalFilter'), resResult(STATUS.API_CLOSE, { route: routeRecord.route }));
+        }
+
+        if(await this.checkMainten(serverId, sid, ip, uid, isNewUser)) {
+            const mainten = getServerMainten(serverId);
+            // @ts-ignore
+            return next(new Error('globalFilter'), resResult(STATUS.SERVER_MAINTAIN, { 
+                route: routeRecord.route,
+                startTime: mainten.startTime,
+                endTime: mainten.endTime
+            }));
+        }
+
+        // @ts-ignore
+        if(!isDevelopEnv(this.app.get('env'))) {
+            if(!this.checkPassEncrypt(routeRecord.route)) {
+                if(!this.checkSign(routeRecord.route, msg, session)) {
+                    infologger.error('checkSign false', routeRecord.route, msg, session.uid);
+                    // @ts-ignore
+                    return next(new Error('globalFilter'), resResult(STATUS.SIGN_ERROR, { route: routeRecord.route }));
+                }
+            }
+        }
+
+        if(roleId) {
+            // @ts-ignore
+            if(blockType && blockType === BLOCK_TYPE.ROLE) {
+                // @ts-ignore
+                return next(new Error('globalFilter'), resResult(STATUS.ROLE_BLOCKED, { route: routeRecord.route }));
+            }
+        }
+
+        if(await this.checkDuplicateAccess(msg)) {
+            infologger.error('checkDuplicateAccess false', routeRecord.route, msg);
+            // @ts-ignore
+            return next(new Error('globalFilter'), resResult(STATUS.DUPLICATE_ACCESS, { route: routeRecord.route }));
+        }
+
+        if(routeRecord.route.indexOf('Handler.') != -1) {
+            if (!checkRouteParam(msg, routeRecord.route)) {
+                infologger.error('checkRouteParam false', routeRecord.route, msg);
                 return next(new Error('globalFilter'), resResult(STATUS.WRONG_PARMS, { route: routeRecord.route }));
             }
-
-        // 玩家屏蔽
-        if(blockType == BLOCK_TYPE.BLOCK) return next(new Error('globalFilter'), resResult(STATUS.BLOCKED, { route: routeRecord.route }));
-        if(blockType == BLOCK_TYPE.BAN && this.checkBanRoute(routeRecord.route)) {
-            return next(new Error('globalFilter'), resResult(STATUS.BANNED, { route: routeRecord.route }));
         }
 
-        session.push('teamCode', () => {});
+        if(msg.body) {
-    
+            msg = msg.body;
-        if(isCheckWord(isDevelopEnv())) {
-            let hasBlockWords = await this.checkHasBlockWord(routeRecord.route, msg, roleId, serverId, guildCode);
-            if(hasBlockWords) return next(new Error('globalFilter'), resResult(STATUS.BLOCK_WORDS, { route: routeRecord.route }));
         }
 
-        if(routeRecord.route == 'guild.guildHandler.createGuild') {
+        if(!this.checkBlackList(roleId, serverId)) {
-            let guildCode = genCode(6);
+            infologger.error('checkBlackList true', roleId, serverId);
-            msg.guildCode = guildCode;
+            // @ts-ignore
+            return next(new Error('globalFilter'), resResult(STATUS.IN_BLACK_LIST, { route: routeRecord.route }));
         }
 
-        if(routeRecord.route != 'connector.entryHandler.enter' && await this.checkMainten(serverId, sid, ip, uid, isNewUser)) {
+        if(await this.checkHasBlockWord(routeRecord.route, msg, roleId, serverId, guildCode)) {
-            sendMessageToUser(roleId, PUSH_ROUTE.SERVER_MAINTENANCE, resResult(STATUS.SERVER_MAINTENANCE), sid);
+            infologger.error('checkHasBlockWord true', roleId, serverId);
-            const mainten = getServerMainten(serverId);
+            // @ts-ignore
-            return next(new Error('globalFilter'), resResult(STATUS.SERVER_MAINTENANCE, { route: routeRecord.route, curVersion: version, minVersion: mainten.version }));
+            return next(new Error('globalFilter'), resResult(STATUS.HAS_BLOCK_WORD, { route: routeRecord.route }));
         }
 
-        next(null);
+        if(routeRecord.route.indexOf('battle.') != -1) {
-    };
+            // @ts-ignore
-    
+            if(!this.checkVersion(routeRecord.route, version)) {
-    public async after (err: Error, routeRecord: RouteRecord, msg: any, session: FrontendOrBackendSession, resp: any, next: HandlerCallback) {
+                // @ts-ignore
-        //刷新
+                return next(new Error('globalFilter'), resResult(STATUS.VERSION_TOO_LOW, { route: routeRecord.route, version: version }));
-        await refresh(session);
+            }
-
-        infologger.debug('global after', msg && msg.logCode, routeRecord.route, msg && JSON.stringify(msg),  resp && JSON.stringify(resp), session && session.get('roleId'));
-        if(!this.checkPassEncrypt(routeRecord.route)) {
-            let data = this.encryptMsg(resp, session);
-            if(!data) return next(new Error('response data err'));
-            resp = this.setResp(resp, data);
         }
 
-        next(null);
+        const beginTime = Date.now();
-    };
+        this.accessTime.set(`${roleId}_${routeRecord.route}`, beginTime);
-
+        // @ts-ignore
-    // 检查调用频率
+        next();
-    private checkFrequency (route: string, msg: any, roleId: string) {
-        let protect = gameData.serverConst.PROTECT_API.find(cur => {
-            if(cur.route == route) {
-                let paramOK = true;
-                for(let key in cur.param) {
-                    if(msg[key] != cur.param[key]) {
-                        paramOK = false; break;
-                    }
-                }
-                if(paramOK) return true;
-            } 
-            return false;
-        });
-        if(!protect) {
-            return true;
-        }
-        let keyOfRouteWithUser = `${protect.id}_${roleId}`;
-        if(this.accessTime && this.accessTime.has(keyOfRouteWithUser)) {
-            console.log(this.accessTime.get(keyOfRouteWithUser) - Date.now());
-            if(Date.now() - this.accessTime.get(keyOfRouteWithUser) < protect.interval) {
-                errlogger.info(`${keyOfRouteWithUser} 间隔时间小于${protect.interval}ms，为 ${Date.now() - this.accessTime.get(keyOfRouteWithUser)}`);
-                return false;
-            }
-        }
-        if(!this.accessTime) this.accessTime = new Map<string, number>();
-        this.accessTime.set(keyOfRouteWithUser, Date.now());
-        return true;
     }
 
-    // 检查该接口是否关闭
+    private checkVersion(route: string, version: string) {
-    private checkFunction (route: string, msg: any) {
+        if(!version) return true;
-        if(isApiClose()) {
+        // @ts-ignore
-            let isClose = gameData.serverConst.CLOSE_APIS.find(cur => {
+        const minVersion = gameData.serverConst.MIN_VERSION[route];
-                if(cur.route == route) {
+        if(!minVersion) return true;
-                    if(cur.param == null) return true;
+        return version >= minVersion;
-                    for(let key in cur.param) {
-                        if(cur.param[key] == true && msg[key] != undefined) return true;
-                        if(cur.param[key] && msg[key] == cur.param[key]) return true;
-                    }
-                } 
-                return false;
-            });
-            return !isClose
-        }
-        return true;
     }
 
-    // 这个接口是否需要加密解密
-    private checkPassEncrypt (route: string) {
-        return isSkipEncode(isDevelopEnv()) || route.startsWith('gm.') || route == 'connector.entryHandler.gmEnter' || route == 'gate.gateHandler.queryEntry';
-    }
-    
-    // 解密接口
     private decryptMsg(msg: any, session: FrontendOrBackendSession) {
-        let msgEncrypt = new MsgEncrypt({ encodeK: msg?.k, encodeV: msg?.v });
+        if (!session) return msg;
-        let { aesKey, aesIV } = msgEncrypt.getKv();
+        const publicKey = session.get('publicKey');
-        msg = this.setMsg(msg, msgEncrypt.decryptMsg(msg?.data));
+        const encode = session.get('encode');
-        if(!msg) return false;
+        // @ts-ignore
-    
+        if(!encode || encode != MsgEncrypt.RSA) return msg;
-        session.set('k', aesKey);
+        if(!publicKey) return msg;
-        session.set('v', aesIV);
+        try {
-        session.push('k', () => {});
+            // @ts-ignore
-        session.push('v', () => {});
+            const decryptMsg = pinus.crypto.decrypt(Buffer.from(publicKey, 'base64'), Buffer.from(msg, 'base64'));
-        return msg
+            msg = JSON.parse(decryptMsg.toString());
-    }
+        } catch (e) {
-    
+            errlogger.error('decryptMsg error', e);
-    // 解密接口
+            return null;
-    private encryptMsg (resp: any, session: FrontendOrBackendSession) {
-        let msgEncrypt = new MsgEncrypt({ k: session.get('k'), v: session.get('v')});
-        let data = msgEncrypt.encryptMsg(resp);
-        return data;
-    }
-
-    // 传入的msg的修改
-    private setMsg (msg:any, targetObj: any) {
-        if(!msg || !targetObj || typeof targetObj != 'object') {
-            return false;
-        }
-        delete msg.k;
-        delete msg.v;
-        if(typeof msg.data == 'string') delete msg.data;
-        for(let key in targetObj) {
-            if(targetObj.hasOwnProperty(key)) {
-                msg[key] = targetObj[key];
-            }
         }
         return msg;
     }
 
-    // 传出的resp的修改
+    private checkSign(route: string, msg: any, session: FrontendOrBackendSession) {
-    private setResp(resp: any, data: string) {
+        if (!session) return false;
-        for(let key in resp) {
+        const sign = msg['sign'];
-            if(resp.hasOwnProperty(key)) {
+        const token = session.get('token');
-                delete resp[key];
+        if (!sign || !token) return false;
-            }
+        const md5 = require('crypto').createHash('md5');
-        }
+        const str = route + JSON.stringify(msg) + token;
-        resp.data = data;
+        const signVal = md5.update(str).digest('hex');
-        return resp;
+        return sign === signVal;
     }
 
-    // 禁言的接口
+    private checkPassEncrypt(route: string) {
-    private checkBanRoute (route: string) {
+        // @ts-ignore
-        return [
+        if(!gameData.serverConst.NOT_CHECK_SIGN_ROUTES) return false;
+        // @ts-ignore
+        return gameData.serverConst.NOT_CHECK_SIGN_ROUTES.indexOf(route) != -1;
+    }
+
+    private checkBlackList(roleId: string, serverId: number) {
+        if(!roleId) return true;
+        const blackRoleMap = this.app.get('blackRoleMap') || new Map();
+        const roleList = blackRoleMap.get(serverId);
+        if(!roleList) return true;
+        // @ts-ignore
+        if(roleList.indexOf(roleId) != -1) {
+            return false;
+        }
+        return true;
+    }
+
+    private checkRoleFrom(route: string, session: FrontendOrBackendSession) {
+        const needRoutes = [
+            'role.roleHandler.rename',
+            'role.roleHandler.setHead',
+            'role.roleHandler.setSign',
+        ];
+        if(needRoutes.indexOf(route) == -1) return true;
+        return session.get('roleId') === session.get('createRoleId');
+    }
+
+    private checkNoRepeatRoute(route: string, session: FrontendOrBackendSession) {
+        if(!session) return true;
+        const noRepeatRoutes = [
+            'role.roleHandler.createRole',
+            'gate.gateHandler.login',
+            'connector.entryHandler.enter',
+        ];
+        if(noRepeatRoutes.indexOf(route) == -1) return true;
+        if(session.get('hasEnter')) {
+            return false;
+        }
+        session.set('hasEnter', true);
+        return true;
+    }
+
+    private checkChat(route: string, session: FrontendOrBackendSession, msg: any) {
+        if(route.indexOf('chat.') == -1) return true;
+        // @ts-ignore
+        if(session.get('blockType') == BLOCK_TYPE.CHAT) {
+            return false;
+        }
+
+        const needCheckRoutes = [
             'chat.chatHandler.sendPrivateMessage',
             'chat.chatHandler.sendGroupMessage',
             'battle.comBattleHandler.sendTeamMsg',
             'battle.barrageHandler.sendBarrage',
+        ];
+        if(needCheckRoutes.indexOf(route) == -1) return true;
+        // @ts-ignore
+        const sendLimit = gameData.serverConst.SEND_CHAT_LIMIT;
+        const roleId = session.get('roleId');
+        getServerCreateTime(session.get('serverId')).then((now: number) => {
+        const lastTime = this.accessTime.get(`${roleId}_${route}`) || 0;
+        if(now - lastTime < sendLimit) {
+            return false;
+        }
+        });
+        return true;
+    }
+
+    private isNoCheckRoute(route: string) {
+        return [
+            'gate.gateHandler.login',
+            'connector.entryHandler.enter',
+            'role.roleHandler.initRole',
+            'role.roleHandler.createRole',
+            'chat.chatHandler.getInitData',
+            'chat.chatHandler.getChatList',
+            'chat.chatHandler.getPrivateChatList',
+            'battle.barrageHandler.getBarrages',
+            'activity.activityHandler.getActivityList',
+            'activity.activityHandler.getServerTime',
+            'role.roleHandler.getRoleInitInfo',
+            'role.roleHandler.getRoleOtherInfo',
+            'gate.gateHandler.getServerList',
+            'gate.gateHandler.getServerList1',
+            'gate.gateHandler.getServerTime',
+            'gm.gmHandler.getServerList',
+            'gm.gmHandler.getServerList1',
+            'gm.gmHandler.getServerTime',
+            'role.roleHandler.getOtherRoleInfo',
+            'battle.normalBattleHandler.getChapterInfo',
+            'battle.normalBattleHandler.getChapterStarReward',
+            'battle.normalBattleHandler.getBoxReward',
+            'battle.pvpHandler.getPvpInfo',
+            'battle.pvpHandler.getRankList',
+            'battle.ladderHandler.getLadderInfo',
+            'battle.ladderHandler.getLadderRankList',
+            'battle.ladderHandler.getSeasonReward',
+            'role.roleHandler.getRechargeList',
+            'role.roleHandler.getVipInfo',
+            'role.roleHandler.getMonthCard',
+            'activity.signInHandler.getSignInInfo',
+            'activity.dailyGiftsHandler.getInfo',
+            'activity.dailyMealHandler.getInfo',
+            'activity.dailyRMBGiftsHandler.getInfo',
+            'activity.growthFundHandler.getInfo',
+            'activity.monthlyFundHandler.getInfo',
+            'activity.sevenDaysHandler.getInfo',
+            'activity.firstGiftHandler.getInfo',
+            'activity.rechargeMoneyHandler.getInfo',
+            'activity.rebateHandler.getInfo',
+            'activity.thirtyDaysHandler.getInfo',
+            'activity.timeLimitRankHandler.getRankList',
+            'activity.timeLimitRankHandler.getMyRankInfo',
+            'guild.guildHandler.getGuildList',
+            'guild.guildHandler.getGuildDetail',
+            'guild.guildHandler.getGuildMemberList',
+            'guild.guildHandler.getApplyList',
+            'guild.guildHandler.getGuildLog',
+            'guild.guildHandler.searchGuild',
+            'guild.guildTrainHandler.getTrainInfo',
+            'guild.guildTrainHandler.getDonateLog',
+            'guild.guildRefineHandler.getRefineLog',
+            'guild.guildBossHandler.getGuildBossDetail',
+            'guild.guildBossHandler.getRankList',
+            'guild.gvgHandler.getGVGInfo',
+            'guild.gvgBattleHandler.getSeasonReward',
+            'guild.gvgBattleHandler.getRankList',
+            'guild.gvgBattleHandler.getMyRankInfo',
+            'guild.wishPoolHandler.getWishPoolInfo',
+            'activity.popUpShopHandler.getPopUpShopInfo',
+            'activity.yuanbaoShopHandler.getYuanbaoShopInfo',
+            'activity.refreshShopHandler.getRefreshShopInfo',
+            'activity.selfServiceShopActivityHandler.getSelfServiceShopInfo',
+            'activity.forgeHandler.getForgeInfo',
+            'activity.limitPackageHandler.getLimitPackageInfo',
+            'battle.towerBattleHandler.getTowerInfo',
+            'battle.towerBattleHandler.getTowerRankList',
+            'battle.towerBattleHandler.getMyTowerRankInfo',
+            'battle.expeditionBattleHandler.getExpeditionInfo',
+            'battle.expeditionBattleHandler.getExpeditionRankList',
+            'battle.dungeonBattleHandler.getDungeonInfo',
+            'battle.friendBattleHandler.getFriendBattleInfo',
+            'battle.friendBattleHandler.getFriendBattleRecord',
+            'battle.rougeHandler.getRougeInfo',
+            'battle.rougeHandler.getRougeRecord',
+            'activity.weeklyFundHandler.getInfo',
+            'activity.monthlyTicketHandler.getInfo',
+            'activity.newHeroGachaHandler.getNewHeroGachaInfo',
+            'activity.newHeroGKHandler.getNewHeroGKInfo',
+            'activity.newHeroGiftsHandler.getNewHeroGiftsInfo',
+            'activity.groupShopHandler.getGroupShopInfo',
+            'activity.luckyHandler.getLuckyInfo',
+            'activity.luckyTurntableHandler.getLuckyTurntableInfo',
+            'activity.treasureHuntHandler.getTreasureHuntInfo',
+            'activity.bindPhoneHandler.getPhoneState',
+            'activity.midAutumnHandler.getMidAutumnInfo',
+            'activity.dragonBoatHandler.getDragonBoatInfo',
+            'activity.qixiHandler.getQixiInfo',
+            'activity.chongyangHandler.getChongyangInfo',
+            'activity.novemberHandler.getNovemberInfo',
+            'activity.entertainHandler.getEntertainInfo',
+            'activity.miniGameHandler.getMiniGameInfo',
+            'activity.activityMonopolyHandler.getActivityMonopolyInfo',
+            'activity.vipRechargeMoneyHandler.getVipRechargeMoneyInfo',
+            'activity.refreshTaskHandler.getRefreshTaskInfo',
+            'battle.barrageHandler.sendBarrage',
             'guild.guildHandler.sendMail',
             'guild.guildHandler.setGuildInfo',
             'guild.gvgManageHandler.sendMail',
@@ -221,7 +341,6 @@ class Filter {
         ].indexOf(route) != -1
     }
 
-    // 检查聊天屏蔽词
     private async checkHasBlockWord (route: string, msg: any, roleId: string, serverId: number, guildCode: string) {     
         let hasBlockWords = false;
         switch(route) {
@@ -294,12 +413,11 @@ class Filter {
         return hasBlockWords;
     }
 
-    // 检查是否维护中
     private async checkMainten(serverId: number, sid: string, ip: string, uid: number, isNewUser: boolean) {
         if(!sid) return false;
 
         const mainten = getServerMainten(serverId);
-        if(!mainten) return false // 该服务器维护
+        if(!mainten) return false
         if(mainten.startTime > nowSeconds() || mainten.endTime < nowSeconds()) return false;
 
         let isWhiteList = await checkWhiteList(this.app.get('env'), ip, uid);

game-server/app/servers/connector/handler/entryHandler.ts

@@ -1,14 +1,14 @@
-import { STATUS } from './../../../consts/statusCode';
+import { STATUS } from './../../../consts/statusCode';
 import { RoleModel, RoleType } from './../../../db/Role';
-import { UserModel, UserType } from '../../../db/User';
+import { UserModel, UserType } from '@db/User';
-import { GMUserModel } from '../../../db/GMUser';
+import { GMUserModel } from '@db/GMUser';
 import { Application, HandlerService, pinus, } from 'pinus';
 import { FrontendSession } from 'pinus';
 import { HeroModel } from './../../../db/Hero';
-import { compareVersion, genCode, generateStr, resResult } from '../../../pubUtils/util';
+import { compareVersion, genCode, generateStr, resResult } from '@pubUtils/util';
 import { COM_BTL_QUALITY, HERO_SELECT, DEBUG_MAGIC_WORD, REDIS_KEY, TASK_TYPE, ENTERY_ROLE_PICK, COUNTER, DEFAULT_LV, TA_USERSET_TYPE, LOG_TYPE, JEWEL_SELECT, ITEM_SELECT, SKIN_SELECT, PUSH_ROUTE } from '../../../consts';
 // import { loginRefresh } from '../../../services/playerEventService';
-import { nowSeconds, getZeroPoint } from '../../../pubUtils/timeUtil';
+import { nowSeconds, getZeroPoint } from '@pubUtils/timeUtil';
 import { rmRoleFromQueue, roleLeave, getRoleOnlineInfo, roleLogin, getOnlineRoleByUserCode } from '../../../services/redisService';
 
 import { addRoleToGuildChannel, addRoleToSysChannel, addRoleToWorldChannel, leaveGroupShopChannel, leaveGuildAuctionChannel, leaveGuildChannel, leaveGVGAreaChannel, leaveGVGAreaTeamChannel, leaveGVGCityTeamChannel, leaveSysChannel, leaveWorldAuctionChannel, leaveWorldChannel } from '../../../services/chatService';
@@ -16,20 +16,20 @@ import { reportOneOnline, savePlayTime } from '../../../services/authenticateSer
 import { checkTaskInEntry, } from '../../../services/task/taskService';
 import { pushData, kickUser, getModuleData, assignServer, leaveServer } from '../../../services/connectorService';
 // import { setComBtlOnUserLeave } from '../../../services/comBattleService';
-import Counter from '../../../db/Counter';
+import Counter from '@db/Counter';
-import { getExpByLv } from '../../../pubUtils/data';
+import { getExpByLv } from '@pubUtils/data';
 import { reportCreateRoleEventToTa, reportTAEvent, reportTAUserSet } from '../../../services/sdkService';
-import { saveLoginAndOutLog } from '../../../pubUtils/logUtil';
+import { saveLoginAndOutLog } from '@pubUtils/logUtil';
 import { sendMessageToAllWithSuc, sendMessageToUserWithSuc } from '../../../services/pushService';
 import { checkIsNewUser, getIpLocation } from '../../../services/roleService';
 import { leaveRaceActivityToRemote } from '../../../services/guildActivity/guildActivityService';
 import { leaveCity } from '../../../services/gvg/gvgBattleService';
 import { autoCreateServerWhenRoleInit } from '../../../services/serverService';
 import { getHiddenData } from '../../../services/memoryCache/hiddenData';
-import { ServerlistModel } from '../../../db/Serverlist';
+import { ServerlistModel } from '@db/Serverlist';
-import { checkWhiteList } from '../../../pubUtils/sysUtil';
+import { checkWhiteList } from '@pubUtils/sysUtil';
 import { getAp } from '../../../services/actionPointService';
-import { RegionModel } from '../../../db/Region';
+import { RegionModel } from '@db/Region';
 
 export default function (app: Application) {
     new HandlerService(app, {});
@@ -421,3 +421,4 @@ export class EntryHandler {
         return resResult(STATUS.SUCCESS);
     }
 }
+

game-server/app/servers/connector/remote/connectorRemote.ts

@@ -1,20 +1,20 @@
-import { Application, HandlerService, } from 'pinus';
+import { Application, HandlerService, } from 'pinus';
-import { gameData, reloadResources } from '../../../pubUtils/data';
+import { gameData, reloadResources } from '@pubUtils/data';
-import { UserGuildType } from '../../../db/UserGuild';
+import { UserGuildType } from '@db/UserGuild';
 import { incServerNum, kickUser } from '../../../services/connectorService';
-import { PVPConfigModel, PVPConfigType } from '../../../db/PvpConfig';
+import { PVPConfigModel, PVPConfigType } from '@db/PvpConfig';
 import { setDicAuctionTime, setDicGuildActivity } from '../../../services/guildActivity/guildActivityService';
 import { getServerMainten, setServerMainten, stopServerMainten } from '../../../services/gmService';
 import { taflush } from '../../../services/sdkService';
 import { errlogger } from '../../../util/logger';
-import { setWeek } from '../../../pubUtils/timeUtil';
+import { setWeek } from '@pubUtils/timeUtil';
 import { savePvpSeasonMemory } from '../../../services/log/memoryLogService';
 import { setApiIsClose } from '../../../services/chatService';
 import { setPvpSeasonNum, setPvpSettleSeasonNum } from '../../../services/timeTaskService';
 import { setKvToMemory } from '../../../services/pushService';
 import { setServerGroup } from '../../../services/serverService';
 import { setHiddenData } from '../../../services/memoryCache/hiddenData';
-import * as dicParam from '../../../pubUtils/dicParam';
+import * as dicParam from '@pubUtils/dicParam';
 
 export default function (app: Application) {
     new HandlerService(app, {});
@@ -238,3 +238,4 @@ export class ConnectorRemote {
         } 
     }
 }
+

game-server/app/servers/gate/handler/gateHandler.ts

@@ -1,7 +1,7 @@
-import { STATUS } from './../../../consts/statusCode';
+import { STATUS } from './../../../consts/statusCode';
-import { dispatch } from '../../../pubUtils/dispatcher';
+import { dispatch } from '@pubUtils/dispatcher';
 import { Application, BackendSession, HandlerService, pinus, } from 'pinus';
-import { resResult } from '../../../pubUtils/util';
+import { resResult } from '@pubUtils/util';
 import { redisClient } from '../../../services/redisService';
 
 export default function (app: Application) {
@@ -36,3 +36,4 @@ export class GateHandler {
         return resResult(STATUS.SUCCESS, { host: res.clientHost, port: res.clientPort });
     }
 }
+

game-server/app/servers/gate/remote/gateRemote.ts

@@ -1,4 +1,4 @@
-import { Application, ChannelService, FrontendSession, RemoterClass, HandlerService, } from 'pinus';
+import { Application, ChannelService, FrontendSession, RemoterClass, HandlerService, } from 'pinus';
 export default function (app: Application) {
     new HandlerService(app, {});
     return new GateRemote(app);

game-server/app/servers/gm/filter/tokenFilter.ts

@@ -1,9 +1,9 @@
 import {Application, RouteRecord, FrontendOrBackendSession, HandlerCallback } from "pinus";
-import { GM_API_TYPE, STATUS } from "../../../consts";
+import { GM_API_TYPE, STATUS } from "@consts";
-import { GMGroupModel } from "../../../db/GMGroup";
+import { GMGroupModel } from "@db/GMGroup";
-import { GMRecordModel } from "../../../db/GMRecord";
+import { GMRecordModel } from "@db/GMRecord";
-import { gameData } from "../../../pubUtils/data";
+import { gameData } from "@pubUtils/data";
-import { resResult } from "../../../pubUtils/util";
+import { resResult } from "@pubUtils/util";
 
 export function tokenFilter(app: Application) {
     return new Filter(app);
@@ -46,3 +46,4 @@ Filter.prototype.after = function (err: Error, routeRecord: RouteRecord, msg: an
     }
     next(err);
 };
+

game-server/app/servers/gm/handler/gmHandler.ts

@@ -1,28 +1,28 @@
-import { Application, BackendSession, pinus } from 'pinus';
+import { Application, BackendSession, pinus } from 'pinus';
-import { getRandSingleEelm, isTimestamp, resResult } from '../../../pubUtils/util';
+import { getRandSingleEelm, isTimestamp, resResult } from '@pubUtils/util';
-import { STATUS } from '../../../consts/statusCode';
+import { STATUS } from '@consts/statusCode';
-import { GMMailModel, GMMailType } from '../../../db/GMMail';
+import { GMMailModel, GMMailType } from '@db/GMMail';
 import { ACTIVITY_TYPE, GM_MAIL_STATUS, GM_MAIL_TYPE, MAIL_TIME_TYPE, MEMORY_LOG_TYPE, PUSH_ROUTE, SURVEY_SELECT } from '../../../consts';
-import { ActivityModel } from '../../../db/Activity';
+import { ActivityModel } from '@db/Activity';
-import { ActivityGroupModel } from '../../../db/ActivityGroup';
+import { ActivityGroupModel } from '@db/ActivityGroup';
-import { ActivityGroupTypeModel } from '../../../db/ActivityGroupType';
+import { ActivityGroupTypeModel } from '@db/ActivityGroupType';
-import { getPastTime, getTimeFunM, nowSeconds } from '../../../pubUtils/timeUtil';
+import { getPastTime, getTimeFunM, nowSeconds } from '@pubUtils/timeUtil';
 import moment = require('moment');
 import { sendUngotDividend } from '../../../services/auctionService';
 import { taflush } from '../../../services/sdkService';
-import { ActivityInRemote } from '../../../domain/activityField/activityField';
+import { ActivityInRemote } from '@domain/activityField/activityField';
 import { pushCurrentTime } from '../../../services/auctionService';
-import { SurveyModel, SurveyUpdate } from '../../../db/Survery';
+import { SurveyModel, SurveyUpdate } from '@db/Survery';
 import { compaireMailGoods, getSurvey } from '../../../services/gmService';
 import { sendMessageToAllWithSuc } from '../../../services/pushService';
 import { sendMailByContent, sendMailsByGmMail } from '../../../services/mailService';
 import { saveMemory } from '../../../services/log/memoryLogService';
 import { getGVGConfigFromRemote } from '../../../services/gvg/gvgService';
-import { ServerGroupModel } from '../../../db/ServerGroup';
+import { ServerGroupModel } from '@db/ServerGroup';
 import { isNumber } from 'underscore';
 import { group } from 'console';
-import { GVGConfigModel } from '../../../db/GVGConfig';
+import { GVGConfigModel } from '@db/GVGConfig';
-import { ServerlistModel } from '../../../db/Serverlist';
+import { ServerlistModel } from '@db/Serverlist';
 import { getPvpTimeFromRemote } from '../../../services/pvpService';
 
 let timer: NodeJS.Timer;
@@ -355,3 +355,4 @@ export class GmHandler {
         return resResult(STATUS.SUCCESS);
     }
 }
+

game-server/app/servers/gm/handler/gmOrderHandler.ts

@@ -1,17 +1,17 @@
-import { Application, BackendSession, pinus } from 'pinus';
+import { Application, BackendSession, pinus } from 'pinus';
-import { genCode, getRandSingleEelm, resResult } from '../../../pubUtils/util';
+import { genCode, getRandSingleEelm, resResult } from '@pubUtils/util';
-import { STATUS } from '../../../consts/statusCode';
+import { STATUS } from '@consts/statusCode';
 import { ORDER_STATE, PAY_TYPE } from '../../../consts';
 import _ = require('underscore');
-import { dicRMB } from '../../../pubUtils/dictionary/DicRMB';
+import { dicRMB } from '@pubUtils/dictionary/DicRMB';
 import { getActivityById } from '../../../services/activity/activityService';
-import { UserOrderModel } from '../../../db/UserOrder';
+import { UserOrderModel } from '@db/UserOrder';
 import { settleOrder, settleOrderAli, settleOrderFromHandler, settleOrderWx } from '../../../services/orderService';
 import { getActivityProducts, getParamStr } from '../../../services/gmService';
-import { ActivityGroupModel } from '../../../db/ActivityGroup';
+import { ActivityGroupModel } from '@db/ActivityGroup';
-import { Receiver } from '../../../db/GMMail';
+import { Receiver } from '@db/GMMail';
 import { getRoleOnlineInfo } from '../../../services/redisService';
-import { RoleModel } from '../../../db/Role';
+import { RoleModel } from '@db/Role';
 
 export interface Cascader {
     value: number|string;
@@ -180,3 +180,4 @@ export class GmOrderHandler {
         });
     }
 }
+

game-server/app/servers/gm/handler/gmRoleHandler.ts

@@ -1,37 +1,37 @@
-import { Application, BackendSession, pinus } from 'pinus';
+import { Application, BackendSession, pinus } from 'pinus';
-import { resResult } from '../../../pubUtils/util';
+import { resResult } from '@pubUtils/util';
-import { STATUS } from '../../../consts/statusCode';
+import { STATUS } from '@consts/statusCode';
 import { getRoleOnlineInfo, redisClient, updateUserInfo } from '../../../services/redisService';
 import { addItems } from '../../../services/role/rewardService';
-import { RewardInter } from '../../../pubUtils/interface';
+import { RewardInter } from '@pubUtils/interface';
-import { gameData, getExpByLv, getHeroExpByLv, getHeroLvByExp, getLvByExp, getEquipByJobClassAndEPlace } from '../../../pubUtils/data';
+import { gameData, getExpByLv, getHeroExpByLv, getHeroLvByExp, getLvByExp, getEquipByJobClassAndEPlace } from '@pubUtils/data';
-import { RoleModel, RoleType, WarStar } from '../../../db/Role';
+import { RoleModel, RoleType, WarStar } from '@db/Role';
 import { BLOCK_TYPE, DEFAULT_HEROES, GUILD_AUTH, GUILD_DISMISS_WAY, GUILD_JOB, GUILD_MASTER_CHANGE_WAY, GUILD_STATUS, GUILD_STRUCTURE, HERO_SYSTEM_TYPE, ITEM_CHANGE_REASON, MAIL_TYPE, MEMORY_LOG_TYPE, PUSH_ROUTE, REDIS_KEY, TA_EVENT, WAR_TYPE } from '../../../consts';
-import { GuildFormParam, SetHeroParam } from '../../../domain/backEndField/params';
+import { GuildFormParam, SetHeroParam } from '@domain/backEndField/params';
-import { GuildModel, GuildUpdateParam } from '../../../db/Guild';
+import { GuildModel, GuildUpdateParam } from '@db/Guild';
 import { Rank } from '../../../services/rankService';
-import { UserGuildModel } from '../../../db/UserGuild';
+import { UserGuildModel } from '@db/UserGuild';
-import { UserGuildApplyModel } from '../../../db/UserGuildApply';
+import { UserGuildApplyModel } from '@db/UserGuildApply';
 import { reportTAEvent } from '../../../services/sdkService';
 import { sendMailByContent } from '../../../services/mailService';
-import { GuildLeader } from '../../../domain/rank';
+import { GuildLeader } from '@domain/rank';
-import { HeroModel } from '../../../db/Hero';
+import { HeroModel } from '@db/Hero';
-import { SkinModel } from '../../../db/Skin';
+import { SkinModel } from '@db/Skin';
-import { PvpDefenseModel } from '../../../db/PvpDefense';
+import { PvpDefenseModel } from '@db/PvpDefense';
 import { createHeroes } from '../../../services/role/createHero';
 import { calculateCeWithHero, calculateCeWithRole } from '../../../services/playerCeService';
 import { pushChangeGuildLeader, pushGuildDismiss, pushGuildInfoUpdate } from '../../../services/guildService';
 import { sendMessageToUserWithSuc } from '../../../services/pushService';
-import { RScriptRecordModel } from '../../../db/RScriptRecord';
+import { RScriptRecordModel } from '@db/RScriptRecord';
-import { DicWar } from '../../../pubUtils/dictionary/DicWar';
+import { DicWar } from '@pubUtils/dictionary/DicWar';
-import { SchoolModel } from '../../../db/School';
+import { SchoolModel } from '@db/School';
-import { JewelModel } from '../../../db/Jewel';
+import { JewelModel } from '@db/Jewel';
-import { RoleCeModel } from '../../../db/RoleCe';
+import { RoleCeModel } from '@db/RoleCe';
 import { setTrainLv } from '../../../services/gmService';
-import { ArtifactModel } from '../../../db/Artifact';
+import { ArtifactModel } from '@db/Artifact';
 import { roleLeave } from '../../../services/redisService';
-import { KeyName } from '../../../domain/rank';
+import { KeyName } from '@domain/rank';
-import { LadderMatchModel } from '../../../db/LadderMatch';
+import { LadderMatchModel } from '@db/LadderMatch';
 
 let timer: NodeJS.Timer;
 export default function (app: Application) {
@@ -435,3 +435,4 @@ export class GmRoleHandler {
         return resResult(STATUS.SUCCESS);
     }
 }
+

game-server/app/servers/gm/handler/gmServerHandler.ts

@@ -1,17 +1,17 @@
-import { Application, BackendSession, pinus } from 'pinus';
+import { Application, BackendSession, pinus } from 'pinus';
-import { genCode, getRandSingleEelm, isTimestamp, resResult } from '../../../pubUtils/util';
+import { genCode, getRandSingleEelm, isTimestamp, resResult } from '@pubUtils/util';
-import { STATUS } from '../../../consts/statusCode';
+import { STATUS } from '@consts/statusCode';
-import { UpdateHiddenDataParam, CreatePvpConfigParam, CreateServerParam, UpdateRegionParams, CreateServersParam } from '../../../domain/backEndField/params';
+import { UpdateHiddenDataParam, CreatePvpConfigParam, CreateServerParam, UpdateRegionParams, CreateServersParam } from '@domain/backEndField/params';
-import { RegionModel, RegionType } from '../../../db/Region';
+import { RegionModel, RegionType } from '@db/Region';
-import { getDicServerName } from '../../../pubUtils/data';
+import { getDicServerName } from '@pubUtils/data';
-import { Maintenance, ServerlistModel, ServerlistUpdate } from '../../../db/Serverlist';
+import { Maintenance, ServerlistModel, ServerlistUpdate } from '@db/Serverlist';
-import { nowSeconds, getFutureTime, getPastTime } from '../../../pubUtils/timeUtil';
+import { nowSeconds, getFutureTime, getPastTime } from '@pubUtils/timeUtil';
 import { calHiddenData } from '../../../services/gmService';
 import { isNumber } from 'util';
-import { MarqueeModel } from '../../../db/Marquee';
+import { MarqueeModel } from '@db/Marquee';
 import { setApiIsCloseToRemote } from '../../../services/chatService';
-import { PVPConfigModel } from '../../../db/PvpConfig';
+import { PVPConfigModel } from '@db/PvpConfig';
-import { HiddenDataByIdModel, HiddenDataByIdModelTypeParam } from '../../../db/HiddenDataById';
+import { HiddenDataByIdModel, HiddenDataByIdModelTypeParam } from '@db/HiddenDataById';
 import { isDevelopEnv } from '../../../services/utilService';
 import { redisClient } from "../../../services/redisService";
 import { REDIS_KEY } from "../../../consts";
@@ -269,3 +269,4 @@ export class GmHandler {
         return resResult(STATUS.SUCCESS);
     }
 }
+

game-server/app/servers/gm/remote/gmRemote.ts

@@ -1,9 +1,9 @@
-import { Application, ChannelService, HandlerService, } from 'pinus';
+import { Application, ChannelService, HandlerService, } from 'pinus';
 import { setServerGroup } from '../../../services/serverService';
 import { errlogger } from '../../../util/logger';
 import { setHiddenData } from '../../../services/memoryCache/hiddenData';
-import { gameData, reloadResources } from '../../../pubUtils/data';
+import { gameData, reloadResources } from '@pubUtils/data';
-import * as dicParam from '../../../pubUtils/dicParam';
+import * as dicParam from '@pubUtils/dicParam';
 
 export default function (app: Application) {
     new HandlerService(app, {});
@@ -83,3 +83,4 @@ export class GMRemote {
         } 
     }
 }
+

game-server/app/servers/guild/filter/guildAuthFilter.ts

@@ -1,8 +1,8 @@
 import {Application, RouteRecord, FrontendOrBackendSession, HandlerCallback } from "pinus";
-import { resResult } from "../../../pubUtils/util";
+import { resResult } from "@pubUtils/util";
-import { GUILD_AUTH_CHECK_TYPE, GUILD_OPERATE, GUILD_ROUTE_TO_OPERATE, STATUS } from "../../../consts";
+import { GUILD_AUTH_CHECK_TYPE, GUILD_OPERATE, GUILD_ROUTE_TO_OPERATE, STATUS } from "@consts";
-import { UserGuildModel, UserGuildType } from "../../../db/UserGuild";
+import { UserGuildModel, UserGuildType } from "@db/UserGuild";
-import { checkAuth, setUserGuildSession } from "../../../services/guildService";
+import { checkAuth, setUserGuildSession } from "@pubUtils/guildService";
 
 export function guildAuthFilter(app: Application) {
     return new Filter(app);
@@ -66,3 +66,4 @@ Filter.prototype.before = async function (routeRecord: RouteRecord, msg: any, se
 Filter.prototype.after = function (err: Error, routeRecord: RouteRecord, msg: any, session: FrontendOrBackendSession, resp: any, next: HandlerCallback) {
     next(err);
 };
+

game-server/app/servers/guild/handler/auctionHandler.ts

@@ -1,22 +1,22 @@
-import { DividendModel, DividendType } from './../../../db/Dividend';
+import { DividendModel, DividendType } from './../../../db/Dividend';
 import { Application, BackendSession, ChannelService, HandlerService, pinus, } from "pinus";
 import { AUCTION_STAGE, DEBUG_MAGIC_WORD, STATUS, CURRENCY_BY_TYPE, CURRENCY_TYPE, DATA_NAME, LOT_STATUS, CHANNEL_PREFIX, MAIL_TYPE, ITEM_CHANGE_REASON, TA_EVENT, ROLE_RECEIVE_STATUS, PUSH_ROUTE, AUCTION_BID_EXTEND_TIME } from "../../../consts";
-import { LotModel, LotParam } from "../../../db/Lot";
+import { LotModel, LotParam } from "@db/Lot";
-import { ItemReward } from "../../../domain/dbGeneral";
+import { ItemReward } from "@domain/dbGeneral";
-import { genCode, resResult } from "../../../pubUtils/util";
+import { genCode, resResult } from "@pubUtils/util";
 import { auctionStage, calculateDividend, genAuction, sendUngotDividend, startGuildAuction, startWorldAuction, stopAuction, todayGuildBegin, getBasePrice, debugAuctionLots, officialAuctionLots, auctionBidStatus, getMaxPrice, guildBidStatus, getAuction, pushAuctionOver, pushAuctionUpdate, processDividendFormat, processSingleDividendFormat, tomorrowGuildBegin, processLotsFormat, processSingleLotFormat, getAuctionRewardByPoolId, getLotStatus, extendLotTime } from "../../../services/auctionService";
 import { addItems, getGoldObject, handleCost } from '../../../services/role/rewardService';
 import { getSimpleRoleInfo } from '../../../services/roleService';
 import { getRoleOnlineInfo } from '../../../services/redisService';
 import { lockData } from '../../../services/redLockService';
-import { GuildModel } from '../../../db/Guild';
+import { GuildModel } from '@db/Guild';
-import { RoleModel, RoleType } from '../../../db/Role';
+import { RoleModel, RoleType } from '@db/Role';
 import { openGuildRefine } from '../../../services/guildRefineService';
 import { unlockTrain } from '../../../services/guildTrainService';
-import { UserGuildModel } from '../../../db/UserGuild';
+import { UserGuildModel } from '@db/UserGuild';
-import { UserGuildApplyModel } from '../../../db/UserGuildApply';
+import { UserGuildApplyModel } from '@db/UserGuildApply';
-import * as dicParam from '../../../pubUtils/dicParam';
+import * as dicParam from '@pubUtils/dicParam';
-import { gameData } from '../../../pubUtils/data';
+import { gameData } from '@pubUtils/data';
 import { sendMailByContent } from '../../../services/mailService';
 import { reportTAEvent } from '../../../services/sdkService';
 import { sendMessageToGuildWithSuc, sendMessageToServerWithSuc } from '../../../services/pushService';
@@ -397,3 +397,4 @@ export class AuctionHandler {
         return resResult(STATUS.SUCCESS, { dividend });
     }
 }
+

game-server/app/servers/guild/handler/cityActivityHandler.ts

@@ -1,26 +1,26 @@
-import { Application, ChannelService, BackendSession, pinus, HandlerService, } from "pinus";
+import { Application, ChannelService, BackendSession, pinus, HandlerService, } from "pinus";
 import { GUILD_ACTIVITY_TYPE, STATUS, REDIS_KEY, CITY_STATUS, TASK_TYPE, ITEM_CHANGE_REASON, PUSH_ROUTE, GUILD_ACTIVITY_STATUS } from "../../../consts";
-import { genCode, resResult } from "../../../pubUtils/util";
+import { genCode, resResult } from "@pubUtils/util";
 import { getGuildActivityStatus, getCityStatus as pubGetCityStatus, getCities, getCityActivityRank, sendSingleCityActEndMsg, declareCity, autoDeclareMyCity, getGAIndexInPinus, getDeclareIndex, sendCityGuildRankToUser } from "../../../services/guildActivity/guildActivityService";
-import { GuildActivityCityModel } from "../../../db/GuildActivityCity";
+import { GuildActivityCityModel } from "@db/GuildActivityCity";
-import { gameData } from "../../../pubUtils/data";
+import { gameData } from "@pubUtils/data";
-import { UserGuildActivityRecModel } from "../../../db/UserGuildActivityRec";
+import { UserGuildActivityRecModel } from "@db/UserGuildActivityRec";
 import { leaveCityChannel, addRoleToCityChannel } from "../../../services/chatService";
-import { GuildActivityRecordModel } from "../../../db/GuildActivityRec";
+import { GuildActivityRecordModel } from "@db/GuildActivityRec";
-import { nowSeconds, getTimeFun } from "../../../pubUtils/timeUtil";
+import { nowSeconds, getTimeFun } from "@pubUtils/timeUtil";
-import { GUILDACTIVITY } from "../../../pubUtils/dicParam";
+import { GUILDACTIVITY } from "@pubUtils/dicParam";
 import { getGoldObject, handleCost } from "../../../services/role/rewardService";
 import { Rank } from "../../../services/rankService";
 import { checkTask } from "../../../services/task/taskService";
-import { guildInter } from "../../../pubUtils/interface";
+import { guildInter } from "@pubUtils/interface";
-import { dispatch } from "../../../pubUtils/dispatcher";
+import { dispatch } from "@pubUtils/dispatcher";
-import { ServerRecordModel } from "../../../db/ServerRecords";
+import { ServerRecordModel } from "@db/ServerRecords";
 import { sendMessageToCityWithSuc } from "../../../services/pushService";
-import { isDebugTime } from "../../../pubUtils/sdkUtil";
+import { isDebugTime } from "@pubUtils/sdkUtil";
-import { GuildActivityCityDeclareModel } from "../../../db/GuildActivityCityDeclare";
+import { GuildActivityCityDeclareModel } from "@db/GuildActivityCityDeclare";
-import { GuildModel } from "../../../db/Guild";
+import { GuildModel } from "@db/Guild";
 import { getHistoryCity, redisClient, setHistoryCity } from "../../../services/redisService";
-import { HeroModel } from "../../../db/Hero";
+import { HeroModel } from "@db/Hero";
 import { getCityActivityObj } from "../../../services/memoryCache/guildActivityData";
 
 export default function (app: Application) {
@@ -423,3 +423,4 @@ export class CityActivityHandler {
         return resResult(STATUS.SUCCESS);
     }
 }
+

game-server/app/servers/guild/handler/donateHandler.ts

@@ -1,19 +1,19 @@
-import { Application, BackendSession, HandlerService, } from 'pinus';
+import { Application, BackendSession, HandlerService, } from 'pinus';
-import { UserGuildModel } from '../../../db/UserGuild';
+import { UserGuildModel } from '@db/UserGuild';
-import { resResult } from '../../../pubUtils/util';
+import { resResult } from '@pubUtils/util';
 import { DATA_NAME, ITEM_CHANGE_REASON, STATUS, TASK_TYPE } from '../../../consts';
-import { DonationModel } from '../../../db/Donation';
+import { DonationModel } from '@db/Donation';
-import { getZeroPoint, nowSeconds } from '../../../pubUtils/timeUtil';
+import { getZeroPoint, nowSeconds } from '@pubUtils/timeUtil';
-import { getArmyDonateBaseByLv, getArmyDonateBoxBaseById, getArmyDonateBoxBaseByLvAndIndex } from '../../../pubUtils/data';
+import { getArmyDonateBaseByLv, getArmyDonateBoxBaseById, getArmyDonateBoxBaseByLvAndIndex } from '@pubUtils/data';
-import { GuildModel } from '../../../db/Guild';
+import { GuildModel } from '@db/Guild';
 import { handleCost, addItems } from '../../../services/role/rewardService';
 import { CHAT_SERVER, GUILD_POINT_WAYS } from '../../../consts';
 import { addFund, donate, getDonation, getGuildFundByRefTime } from '../../../services/donateService';
 import { getUserGuildWithRefActive } from '../../../services/guildService';
-import { ARMY } from '../../../pubUtils/dicParam';
+import { ARMY } from '@pubUtils/dicParam';
 import { addActive } from '../../../services/guildService'
 import { checkTask, checkTaskInDonate } from '../../../services/task/taskService';
-import { guildInter } from '../../../pubUtils/interface';
+import { guildInter } from '@pubUtils/interface';
 import { lockData } from '../../../services/redLockService';
 import { getVipDonateConsume } from '../../../services/activity/monthlyTicketService';
 import { changeReceiveBoxIdByLvAndIndex } from '../../../services/donateService';
@@ -155,3 +155,4 @@ export class DonationHandler {
         return resResult(STATUS.SUCCESS, { receiveBoxs: haveGotBoxIds, goods });
     }
 }
+

game-server/app/servers/guild/handler/gateActivityHandler.ts

@@ -1,20 +1,20 @@
-import { Application, BackendSession, ChannelService, pinus, HandlerService, } from "pinus";
+import { Application, BackendSession, ChannelService, pinus, HandlerService, } from "pinus";
 import { getGuildActivityStatus, getRecordScore, participants, getGateActivityRank, getGAIndexInPinus } from "../../../services/guildActivity/guildActivityService";
-import { resResult } from "../../../pubUtils/util";
+import { resResult } from "@pubUtils/util";
 import { STATUS, GUILD_ACTIVITY_TYPE, GUILD_POINT_WAYS, ENEMIES_TYPE, GET_POINT_WAYS, TASK_TYPE, GUILD_ACTIVITY_STATUS } from "../../../consts";
-import { UserGuildActivityRecModel } from "../../../db/UserGuildActivityRec";
+import { UserGuildActivityRecModel } from "@db/UserGuildActivityRec";
-import { GUILDACTIVITY } from "../../../pubUtils/dicParam";
+import { GUILDACTIVITY } from "@pubUtils/dicParam";
-import { GuildActivityRecordModel } from "../../../db/GuildActivityRec";
+import { GuildActivityRecordModel } from "@db/GuildActivityRec";
 import { delGuildActivityRank } from "../../../services/redisService";
 import { REDIS_KEY } from "../../../consts";
-import { gameData } from "../../../pubUtils/data";
+import { gameData } from "@pubUtils/data";
-import { UserGuildModel } from "../../../db/UserGuild";
+import { UserGuildModel } from "@db/UserGuild";
-import { GuildActivityCityModel } from "../../../db/GuildActivityCity";
+import { GuildActivityCityModel } from "@db/GuildActivityCity";
 import { Rank } from "../../../services/rankService";
-import { getTimeFun, getZeroPointD } from "../../../pubUtils/timeUtil";
+import { getTimeFun, getZeroPointD } from "@pubUtils/timeUtil";
 import { checkTask } from "../../../services/task/taskService";
-import { guildInter } from "../../../pubUtils/interface";
+import { guildInter } from "@pubUtils/interface";
-import { ServerRecordModel } from "../../../db/ServerRecords";
+import { ServerRecordModel } from "@db/ServerRecords";
 import { getGateActivityObj } from "../../../services/memoryCache/guildActivityData";
 
 export default function (app: Application) {
@@ -330,3 +330,4 @@ export class GateActivityHandler {
         });
     }
 }
+

game-server/app/servers/guild/handler/guildBossHandler.ts

@@ -1,24 +1,24 @@
-import { Application, BackendSession, pinus, HandlerService, } from 'pinus';
+import { Application, BackendSession, pinus, HandlerService, } from 'pinus';
-import { resResult, genCode, getRandSingleEelm } from '../../../pubUtils/util';
+import { resResult, genCode, getRandSingleEelm } from '@pubUtils/util';
 import { AUCTION_SOURCE, DEBUG_MAGIC_WORD, ITEM_CHANGE_REASON, MAIL_TYPE, PUSH_ROUTE, STATUS, TASK_TYPE, WAR_TYPE } from '../../../consts';
-import { BossInstanceModel } from '../../../db/BossInstance';
+import { BossInstanceModel } from '@db/BossInstance';
-import { BattleRecordModel } from '../../../db/BattleRecord';
+import { BattleRecordModel } from '@db/BattleRecord';
-import { nowSeconds, getZeroPoint, getSeconds } from '../../../pubUtils/timeUtil';
+import { nowSeconds, getZeroPoint, getSeconds } from '@pubUtils/timeUtil';
 import { getBossInstanceInfo, checkBossBattleMemberExists, pushBossHpMessage, addBossInstance, refreshUserGuildOfBoss, refreshGuildOfBoss, getBossHp, getBossInstanceInfoByData, pushBossStatus, zoomOutDamage, zoomInDamage } from '../../../services/guildBossService';
 import { findWhere } from 'underscore'
-import { GUILD_STRUCTURE, GUILD_BOSS_STATUS, GUILD_POINT_WAYS } from '../../../consts/constModules/guildConst';
+import { GUILD_STRUCTURE, GUILD_BOSS_STATUS, GUILD_POINT_WAYS } from '@consts/constModules/guildConst';
-import { DATA_NAME } from '../../../consts/dataName';
+import { DATA_NAME } from '@consts/dataName';
-import { UserGuildModel } from '../../../db/UserGuild';
+import { UserGuildModel } from '@db/UserGuild';
 import { addActive, addBossWarExtendActive } from '../../../services/guildService';
-import { GuildModel } from '../../../db/Guild';
+import { GuildModel } from '@db/Guild';
-import { gameData, getBossByLv } from '../../../pubUtils/data';
+import { gameData, getBossByLv } from '@pubUtils/data';
 import { lockData } from '../../../services/redLockService';
 import { pushGuildBossSucMsg, getGuildChannelSid } from '../../../services/chatService';
 import { checkTask } from '../../../services/task/taskService';
-import { guildInter, pvpEndParamInter } from '../../../pubUtils/interface';
+import { guildInter, pvpEndParamInter } from '@pubUtils/interface';
 import { addItems, getGoldObject, handleCost } from '../../../services/role/rewardService';
-import * as dicParam from '../../../pubUtils/dicParam';
+import * as dicParam from '@pubUtils/dicParam';
-import { RoleModel } from '../../../db/Role';
+import { RoleModel } from '@db/Role';
 import { sendMailToGuildByContent } from '../../../services/mailService';
 import { genAuction, getAuctionRewardByPoolId } from '../../../services/auctionService';
 import { sendMessageToGuildWithSuc } from '../../../services/pushService';
@@ -296,3 +296,4 @@ export class GuildHandler {
 
     }
 }
+

game-server/app/servers/guild/handler/guildHandler.ts

@@ -1,18 +1,18 @@
-import { Application, BackendSession, ChannelService, HandlerService, } from 'pinus';
+import { Application, BackendSession, ChannelService, HandlerService, } from 'pinus';
-import { resResult, getRandEelm, shouldRefresh, sortArrRandom } from '../../../pubUtils/util';
+import { resResult, getRandEelm, shouldRefresh, sortArrRandom } from '@pubUtils/util';
 import { STATUS, GUILD_OPERATE, GUILD_AUTH, GUILD_JOB, GUILD_APPLY_TYPE, GUILD_STRUCTURE, GUILD_REC_TYPE, GUILD_STRUCTURE_NAME, MAIL_TYPE, REDIS_KEY, GUILD_SELECT, USER_GUILD_SELECT, TASK_TYPE, DEBUG_MAGIC_WORD, CHANNEL_PREFIX, MSG_TYPE, MSG_SOURCE, ITEM_CHANGE_REASON, TA_EVENT, GUILD_DISMISS_WAY, GUILD_MASTER_CHANGE_WAY, GUILD_QUIT_WAY, PUSH_ROUTE } from '../../../consts';
-import { UserGuildModel, UserGuildType } from '../../../db/UserGuild';
+import { UserGuildModel, UserGuildType } from '@db/UserGuild';
 import { checkAuth, joinGuild, getUserGuildWithRefActive, addActive, settleGuildWeekly, getMyGuildInfo, setUserGuildSession, getInvitationList, addGuildRecord, pushChangeGuildLeader, pushGuildMemberQuit, pushGuildDismiss, pushGuildInfoUpdate, getTodayGuildActive, getGuildQuitCdTime } from '../../../services/guildService';
-import { GuildModel, GuildType, GuildUpdateParam } from '../../../db/Guild';
+import { GuildModel, GuildType, GuildUpdateParam } from '@db/Guild';
-import { RoleModel, RoleType } from '../../../db/Role';
+import { RoleModel, RoleType } from '@db/Role';
-import { ARMY } from '../../../pubUtils/dicParam';
+import { ARMY } from '@pubUtils/dicParam';
 import { handleCost, addItems, getGoldObject } from '../../../services/role/rewardService';
-import { nowSeconds, getTimeFun, getSeconds, getZeroPointD, DAY_TO_MS, HOUR_TO_MS } from '../../../pubUtils/timeUtil';
+import { nowSeconds, getTimeFun, getSeconds, getZeroPointD, DAY_TO_MS, HOUR_TO_MS } from '@pubUtils/timeUtil';
-import { GuildListInfo, GuildMemberParam } from '../../../domain/battleField/guild';
+import { GuildListInfo, GuildMemberParam } from '@domain/battleField/guild';
-import { GuildLeader } from '../../../domain/rank';
+import { GuildLeader } from '@domain/rank';
-import { UserGuildApplyModel } from '../../../db/UserGuildApply';
+import { UserGuildApplyModel } from '@db/UserGuildApply';
-import { hasStructureConsume, getStructureConsume, gameData } from '../../../pubUtils/data';
+import { hasStructureConsume, getStructureConsume, gameData } from '@pubUtils/data';
-import { GuildRecModel } from '../../../db/GuildRec';
+import { GuildRecModel } from '@db/GuildRec';
 import { sendMailByContent, SendMailFun, sendMailToGuildByContent } from '../../../services/mailService';
 import { updateUserInfo, isRoleOnline, getRoleOnlineInfo } from '../../../services/redisService';
 
@@ -23,12 +23,12 @@ import { removeTrainRank } from '../../../services/guildTrainService';
 import { pushGuildNoticeUpdateMsg, pushGuildUpStructureMsg, addRoleToGuildChannel, getGuildChannelSid, createGroupMsg, pushGroupMsgToRoom } from '../../../services/chatService';
 import { Rank } from '../../../services/rankService';
 import { checkTask } from '../../../services/task/taskService';
-import { guildInter } from '../../../pubUtils/interface';
+import { guildInter } from '@pubUtils/interface';
-import * as dicParam from '../../../pubUtils/dicParam';
+import * as dicParam from '@pubUtils/dicParam';
 import { reportTAEvent } from '../../../services/sdkService';
 import { changeGuildActivity, guildDismisActivity, guildPayQuitGuild } from '../../../services/activity/guildPayService';
 import { sendMessageToUserWithSuc } from '../../../services/pushService';
-import { GuildActiveModel } from '../../../db/GuildActive';
+import { GuildActiveModel } from '@db/GuildActive';
 import { leaveRaceActivityToRemote, leaveRaceWhenDismissToRemote, leaveRaceWhenQuitGuildToRemote } from '../../../services/guildActivity/guildActivityService';
 import { getGVGInfoInGuild } from '../../../services/gvg/gvgService';
 import { guildAbdicateToLeague, guildDismissToLeague, memberQuitGuildToLeague } from '../../../services/gvg/gvgTeamService';
@@ -1033,3 +1033,4 @@ export class GuildHandler {
     }
 }
 
+

game-server/app/servers/guild/handler/guildRefineHandler.ts

@@ -1,21 +1,21 @@
-import { Application, BackendSession, pinus, HandlerService, } from 'pinus';
+import { Application, BackendSession, pinus, HandlerService, } from 'pinus';
-import { UserGuildModel } from '../../../db/UserGuild';
+import { UserGuildModel } from '@db/UserGuild';
-import { resResult } from '../../../pubUtils/util';
+import { resResult } from '@pubUtils/util';
 import { STATUS, GUILD_OPERATE, TASK_TYPE, ITEM_CHANGE_REASON, ITID, CONSUME_TYPE } from '../../../consts';
-import { GuildRefineModel } from '../../../db/GuildRefine';
+import { GuildRefineModel } from '@db/GuildRefine';
-import { gameData, getArmyDevelopConsumeById, getGoodById } from '../../../pubUtils/data';
+import { gameData, getArmyDevelopConsumeById, getGoodById } from '@pubUtils/data';
-import { nowSeconds } from '../../../pubUtils/timeUtil';
+import { nowSeconds } from '@pubUtils/timeUtil';
 import { handleCost, addItems } from '../../../services/role/rewardService';
-import { GuildModel } from '../../../db/Guild';
+import { GuildModel } from '@db/Guild';
 import { findIndex, findWhere } from 'underscore';
 import { lockData } from '../../../services/redLockService';
-import { ARMY } from '../../../pubUtils/dicParam';
+import { ARMY } from '@pubUtils/dicParam';
-import { CURRENCY_BY_TYPE, CURRENCY_TYPE } from '../../../consts/constModules/itemConst';
+import { CURRENCY_BY_TYPE, CURRENCY_TYPE } from '@consts/constModules/itemConst';
 import { checkEquipProduceStructureLv, openGuildRefine, refreshRefinCnt } from '../../../services/guildRefineService';
-import { DATA_NAME } from '../../../consts/dataName';
+import { DATA_NAME } from '@consts/dataName';
 import { checkTask } from '../../../services/task/taskService';
-import { guildInter } from '../../../pubUtils/interface';
+import { guildInter } from '@pubUtils/interface';
-import { DicArmyDevelopConsume } from '../../../pubUtils/dictionary/DicArmyDevelopConsume';
+import { DicArmyDevelopConsume } from '@pubUtils/dictionary/DicArmyDevelopConsume';
 
 export default function (app: Application) {
     new HandlerService(app, {});
@@ -200,3 +200,4 @@ export class GuildRefineHandler {
         return resResult(STATUS.SUCCESS, { scienceTrees });
     }
 }
+

game-server/app/servers/guild/handler/guildTrainHandler.ts

@@ -1,26 +1,26 @@
-import { Application, BackendSession, HandlerService, } from 'pinus';
+import { Application, BackendSession, HandlerService, } from 'pinus';
-import { resResult, genCode, getRandSingleEelm } from '../../../pubUtils/util';
+import { resResult, genCode, getRandSingleEelm } from '@pubUtils/util';
 import { DEBUG_MAGIC_WORD, ITEM_CHANGE_REASON, STATUS, TASK_TYPE, TRAIN_REWARD_TYPE } from '../../../consts';
-import { GuildTrainModel } from '../../../db/GuildTrain';
+import { GuildTrainModel } from '@db/GuildTrain';
-import { BattleRecordModel } from '../../../db/BattleRecord';
+import { BattleRecordModel } from '@db/BattleRecord';
-import { nowSeconds, getTimeFun, getZeroPoint } from '../../../pubUtils/timeUtil';
+import { nowSeconds, getTimeFun, getZeroPoint } from '@pubUtils/timeUtil';
 import { refreshTrain, getGuildTrainInfo, unlockTrain, getGuildTrainRewards, getGuildTrainInstance, getTrainBoxRewardsResult, resetTrain, getTrainBoxRewardsResultWithoutAlreadyGeted, checkGuildTrainReward, transTrainReward } from '../../../services/guildTrainService';
 import { findIndex, findWhere } from 'underscore'
 import { lockData } from '../../../services/redLockService';
-import { GUILD_REPORT_NUM, GUILD_POINT_WAYS } from '../../../consts/constModules/guildConst';
+import { GUILD_REPORT_NUM, GUILD_POINT_WAYS } from '@consts/constModules/guildConst';
-import { UserGuildModel } from '../../../db/UserGuild';
+import { UserGuildModel } from '@db/UserGuild';
-import { GuildModel } from '../../../db/Guild';
+import { GuildModel } from '@db/Guild';
-import { getArmyTrainJuDian, getTrainBaseByLv, gameData } from '../../../pubUtils/data';
+import { getArmyTrainJuDian, getTrainBaseByLv, gameData } from '@pubUtils/data';
-import { CURRENCY_BY_TYPE, CURRENCY_TYPE } from '../../../consts/constModules/itemConst';
+import { CURRENCY_BY_TYPE, CURRENCY_TYPE } from '@consts/constModules/itemConst';
 import { handleCost, addItems } from '../../../services/role/rewardService';
-import { ARMY } from '../../../pubUtils/dicParam';
+import { ARMY } from '@pubUtils/dicParam';
 import { addActive } from '../../../services/guildService';
-import { GuildTrainReportModel } from '../../../db/GuildTrainReport';
+import { GuildTrainReportModel } from '@db/GuildTrainReport';
-import { DATA_NAME } from '../../../consts/dataName';
+import { DATA_NAME } from '@consts/dataName';
 import { pushGuildTrainSucMsg } from '../../../services/chatService';
 import { checkTaskInGuildTrain } from '../../../services/task/taskService';
-import { guildInter, pvpEndParamInter, RewardInter } from '../../../pubUtils/interface';
+import { guildInter, pvpEndParamInter, RewardInter } from '@pubUtils/interface';
-import { getGuildTrainGkInfo } from '../../../pubUtils/data';
+import { getGuildTrainGkInfo } from '@pubUtils/data';
 import { getBattleRecordParam } from '../../../services/normalBattleService';
 
 export default function (app: Application) {
@@ -521,3 +521,4 @@ export class GuildTrainHandler {
         return resResult(STATUS.SUCCESS);
     }
 }
+

game-server/app/servers/guild/handler/gvgBattleHandler.ts

@@ -1,36 +1,36 @@
-import { GVGRecModel, GVGRecType } from '../../../db/GVGRec';
+import { GVGRecModel, GVGRecType } from '@db/GVGRec';
-import { GVGAreaInMap, GVGTeamInList, GVGTeamInListOnPoint, GVGTeamSpineInMap, LeagueGood, MyTeamInfo, MyTeamSimpleInfo } from '../../../domain/gvgField/returnData';
+import { GVGAreaInMap, GVGTeamInList, GVGTeamInListOnPoint, GVGTeamSpineInMap, LeagueGood, MyTeamInfo, MyTeamSimpleInfo } from '@domain/gvgField/returnData';
-import { GVGTeamModel, GVGTeamType, GVGTeamUpdate } from '../../../db/GVGTeam';
+import { GVGTeamModel, GVGTeamType, GVGTeamUpdate } from '@db/GVGTeam';
-import { GVGUserDataModel } from '../../../db/GVGUserData';
+import { GVGUserDataModel } from '@db/GVGUserData';
-import { GVGCityModel, GVGCityType } from '../../../db/GVGCity';
+import { GVGCityModel, GVGCityType } from '@db/GVGCity';
 import { Application, BackendSession, ChannelService, HandlerService, pinus } from "pinus";
-import { resResult, genCode, getRandSingleEelm } from "../../../pubUtils/util";
+import { resResult, genCode, getRandSingleEelm } from "@pubUtils/util";
-import { GVGLeagueModel } from '../../../db/GVGLeague';
+import { GVGLeagueModel } from '@db/GVGLeague';
 import { getGroupKey, getGVGConfig, getGVGPeriodData, getGVGServerType } from '../../../services/gvg/gvgService';
 import { redisAddBattleScore, battleEndSendMessage, calBattleScoreByCe, checkAreaIsInCity, checkGVGBattleStart, checkMoveStatus, getBattleRanksByCity, getBirthAreaOfCity, getGVGWarId, getOppHeroes, getTechKnifeHurt, getTechReviveMinus, initRobots, pushTeamMoveMessage, getAllGVGCitiesInfo, leaveCity, refreshTeams, checkEnterCityTime, generNewLineup, getBattleRank, checkSettleStatus, getSpineCnt, getPlayerRanksByCity, getPlayerSettleRanksByCity, checkGVGLineupWhenSave, sendWinStreakMessage, getNewLineup, sendAreaPointChange } from '../../../services/gvg/gvgBattleService';
 import { getGVGBattleData } from '../../../services/memoryCache/gvgBattleData';
-import { GVGBattleRecModel } from '../../../db/GVGBattleRec';
+import { GVGBattleRecModel } from '@db/GVGBattleRec';
 import { getFightTimeByPeriod } from '../../../services/gvg/gvgFightService';
-import { gameData, getReviveGold } from '../../../pubUtils/data';
+import { gameData, getReviveGold } from '@pubUtils/data';
 import { getAllServerName } from '../../../services/redisService';
 import { checkBattleHeroesByHid } from '../../../services/normalBattleService';
-import { SaveTeamParam, SaveTeamUpdateParam } from '../../../domain/gvgField/gvgDb';
+import { SaveTeamParam, SaveTeamUpdateParam } from '@domain/gvgField/gvgDb';
 import { GVG_AREA_TYPE, GVG_ATTACK_TYPE, GVG_ITEM, GVG_PERIOD, GVG_POINT_TYPE, GVG_REC_TYPE, ITEM_CHANGE_REASON, LEAGUE_MANAGE_TYPE, PUSH_ROUTE, REDIS_KEY, STATUS } from '../../../consts';
 import { addRoleToAreaChannel, addRoleToAreaTeamChannel, addRoleToGVGCityChannel, leaveGVGAreaChannel, leaveGVGAreaTeamChannel, leaveGVGCityTeamChannel } from '../../../services/chatChannelService';
-import { nowSeconds } from '../../../pubUtils/timeUtil';
+import { nowSeconds } from '@pubUtils/timeUtil';
-import { GVGUserItemModel } from '../../../db/GVGUserItem';
+import { GVGUserItemModel } from '@db/GVGUserItem';
 import { handleGVGCost } from '../../../services/gvg/gvgItemService';
 import { getGoldObject, handleCost } from '../../../services/role/rewardService';
-import { GVGCityAreaPointModel } from '../../../db/GVGCityAreaPoint';
+import { GVGCityAreaPointModel } from '@db/GVGCityAreaPoint';
 import { Rank } from '../../../services/rankService';
-import { LeagueRankInfo, RoleRankInfo } from '../../../domain/rank';
+import { LeagueRankInfo, RoleRankInfo } from '@domain/rank';
 import { addBattleEndRec } from '../../../services/gvg/gvgRecService';
-import { RoleModel } from '../../../db/Role';
+import { RoleModel } from '@db/Role';
-import { EXTERIOR, GVG } from '../../../pubUtils/dicParam';
+import { EXTERIOR, GVG } from '@pubUtils/dicParam';
 import { sendMessageToGuildWithSuc, sendMessageToGVGAreaByTeamWithSuc, sendMessageToUserWithSuc } from '../../../services/pushService';
 import { checkLeagueAuth } from '../../../services/gvg/gvgTeamService';
-import { GVGLeaguePrepareModel } from '../../../db/GVGLeaguePrepare';
+import { GVGLeaguePrepareModel } from '@db/GVGLeaguePrepare';
-import { gvgEndParamInter } from '../../../pubUtils/interface';
+import { gvgEndParamInter } from '@pubUtils/interface';
 
 export default function (app: Application) {
     new HandlerService(app, {});
@@ -956,3 +956,4 @@ export class GVGBattleHandler {
         return resResult(STATUS.SUCCESS);
     }
 }
+

game-server/app/servers/guild/handler/gvgFightHandler.ts

@@ -1,23 +1,23 @@
-import { Application, BackendSession, ChannelService, HandlerService, pinus } from "pinus";
+import { Application, BackendSession, ChannelService, HandlerService, pinus } from "pinus";
 import { GVG_ACTIVE_TYPE, GVG_ITEM, GVG_PERIOD, ITEM_CHANGE_REASON, REDIS_KEY, ROLE_SELECT, STATUS, TASK_TYPE, VESTIGE_OPP_STATUS, VESTIGE_STATUS, WAR_TYPE } from "../../../consts";
-import { BattleRecordModel } from "../../../db/BattleRecord";
+import { BattleRecordModel } from "@db/BattleRecord";
-import { GVGLeagueModel } from "../../../db/GVGLeague";
+import { GVGLeagueModel } from "@db/GVGLeague";
-import { GVGUserDailyDataModel } from "../../../db/GVGUserDailyData";
+import { GVGUserDailyDataModel } from "@db/GVGUserDailyData";
-import { GVGUserItemModel } from "../../../db/GVGUserItem";
+import { GVGUserItemModel } from "@db/GVGUserItem";
-import { GVGVestigeLeagueRankModel } from "../../../db/GVGVestigeLeagueRank";
+import { GVGVestigeLeagueRankModel } from "@db/GVGVestigeLeagueRank";
-import { GVGVestigeLockModel } from "../../../db/GVGVestigeLock";
+import { GVGVestigeLockModel } from "@db/GVGVestigeLock";
-import { GVGVestigeRankModel } from "../../../db/GVGVestigeRank";
+import { GVGVestigeRankModel } from "@db/GVGVestigeRank";
-import { GVGVestigeRecModel, GVGVestigeRecUpdate } from "../../../db/GVGVestigeRec";
+import { GVGVestigeRecModel, GVGVestigeRecUpdate } from "@db/GVGVestigeRec";
-import { GVGVestigeSumRankModel } from "../../../db/GVGVestigeSumRank";
+import { GVGVestigeSumRankModel } from "@db/GVGVestigeSumRank";
-import { HeroModel } from "../../../db/Hero";
+import { HeroModel } from "@db/Hero";
-import { RoleModel } from "../../../db/Role";
+import { RoleModel } from "@db/Role";
-import { GVGVestigeOppLineup, VestigeRank } from "../../../domain/gvgField/returnData";
+import { GVGVestigeOppLineup, VestigeRank } from "@domain/gvgField/returnData";
-import { RoleRankInfo } from "../../../domain/rank";
+import { RoleRankInfo } from "@domain/rank";
-import { getRemoteRplFilePath, getRemoteRplPrefix } from "../../../pubUtils/battleUtils";
+import { getRemoteRplFilePath, getRemoteRplPrefix } from "@pubUtils/battleUtils";
-import { gameData } from "../../../pubUtils/data";
+import { gameData } from "@pubUtils/data";
-import { GVG } from "../../../pubUtils/dicParam";
+import { GVG } from "@pubUtils/dicParam";
-import { RewardInter, pvpEndParamInter } from "../../../pubUtils/interface";
+import { RewardInter, pvpEndParamInter } from "@pubUtils/interface";
-import { parseGoodStr, resResult } from "../../../pubUtils/util";
+import { parseGoodStr, resResult } from "@pubUtils/util";
 import { isHeroHidden } from "../../../services/dataService";
 import { calBreakGoods, checkHeroIsUsedInOtherVestige, checkVestige, checkVestigeOppStatus, checkVestigeRank, generateAttackHeroInfo, generateAttackInfo, generateDefenseInfo, getDayKeyInfo, getMyVestigeRank, getOppDetailData, getOppPlayerByRanks, getVestigeRecStatus, getVestigeRank, getVestigeUsedHeroes, isRobot, refreshVestigeOppRanks, saveScoreToRank, updateMyVestigeRank, saveVestigeRankSchedule, calVestigeLeagueBoxRewards, checkFightTime, savePlayerRank, pushGvgFightIconShow } from "../../../services/gvg/gvgFightService";
 import { addGVGReward, combinePushItem, handleGVGCost } from "../../../services/gvg/gvgItemService";
@@ -29,7 +29,7 @@ import { Rank } from "../../../services/rankService";
 import { getAllServerName } from "../../../services/redisService";
 import { CheckMeterial } from "../../../services/role/checkMaterial";
 import { checkGVGTask } from "../../../services/task/taskService";
-import { Combo } from "../../../domain/battleField/pvp";
+import { Combo } from "@domain/battleField/pvp";
 
 export default function (app: Application) {
     new HandlerService(app, {});
@@ -582,3 +582,4 @@ export class GVGProduceHandler {
         return resResult(STATUS.SUCCESS);
     }
 }
+

game-server/app/servers/guild/handler/gvgHandler.ts

@@ -1,33 +1,33 @@
-import { Application, BackendSession, ChannelService, HandlerService, pinus } from "pinus";
+import { Application, BackendSession, ChannelService, HandlerService, pinus } from "pinus";
 import { GVG_ITEM, DATA_NAME, GVG_ACTIVE_TYPE, GVG_PERIOD, GVG_SERVER_TYPE, ITEM_CHANGE_REASON, LEAGUE_JOB, LEAGUE_MANAGE_TYPE, STATUS, GVG_REC_TYPE, TASK_TYPE, GVG_TECH_TYPE, PUSH_ROUTE } from "../../../consts";
-import { GVGLeagueModel } from "../../../db/GVGLeague";
+import { GVGLeagueModel } from "@db/GVGLeague";
-import { GVGLeaguePrepareModel } from "../../../db/GVGLeaguePrepare";
+import { GVGLeaguePrepareModel } from "@db/GVGLeaguePrepare";
-import { GuardCityInfoPage, GVGMainData, LeagueContributeInfo, LeagueMemberContributeInfo, LeagueRankInInfoPage } from "../../../domain/gvgField/returnData";
+import { GuardCityInfoPage, GVGMainData, LeagueContributeInfo, LeagueMemberContributeInfo, LeagueRankInInfoPage } from "@domain/gvgField/returnData";
-import { getRandEelm, resResult } from "../../../pubUtils/util";
+import { getRandEelm, resResult } from "@pubUtils/util";
 import { calLeagueCe, getGroupKey, getGVGConfig, getGVGPeriodData, getGVGServerType, getServerTypeByTime } from "../../../services/gvg/gvgService";
 import { autoCreateLeague, checkCanChooseJob, checkCanPrepare, checkLeagueAuth, getMyAuth } from "../../../services/gvg/gvgTeamService";
 import { getAllServerName } from "../../../services/redisService";
-import { Contribute, GVGUserDataModel } from "../../../db/GVGUserData";
+import { Contribute, GVGUserDataModel } from "@db/GVGUserData";
-import { GVGUserItemModel } from "../../../db/GVGUserItem";
+import { GVGUserItemModel } from "@db/GVGUserItem";
-import { GVGUserTaskModel } from "../../../db/GVGUserTask";
+import { GVGUserTaskModel } from "@db/GVGUserTask";
-import { GVG } from "../../../pubUtils/dicParam";
+import { GVG } from "@pubUtils/dicParam";
-import { RoleModel } from "../../../db/Role";
+import { RoleModel } from "@db/Role";
 import { addGVGTechActive, calFighterContribute, calProducerContribute, checkPreTech, checkTechIsIng, checkTechProgress, getDailyLoginReward, getMyContribute, pushTechChange, pushTechRollback, sendUngotBoxReward } from "../../../services/gvg/gvgPrepareService";
-import { GVGUserDailyDataModel } from "../../../db/GVGUserDailyData";
+import { GVGUserDailyDataModel } from "@db/GVGUserDailyData";
-import { gameData } from "../../../pubUtils/data";
+import { gameData } from "@pubUtils/data";
 import { lockLeagueData } from "../../../services/redLockService";
 import { addGVGReward, handleGVGCost } from "../../../services/gvg/gvgItemService";
-import { RewardInter } from "../../../pubUtils/interface";
+import { RewardInter } from "@pubUtils/interface";
 import { getGVGCities, getGVGCitiesInfo } from "../../../services/gvg/gvgBattleService";
-import { GVGRecModel } from "../../../db/GVGRec";
+import { GVGRecModel } from "@db/GVGRec";
 import { checkGVGTask } from "../../../services/task/taskService";
 import { getFightTimeByPeriod, getMyVestiges, getVestiges } from "../../../services/gvg/gvgFightService";
-import { getSeconds } from "../../../pubUtils/timeUtil";
+import { getSeconds } from "@pubUtils/timeUtil";
-import { GVGVestigeRankModel } from "../../../db/GVGVestigeRank";
+import { GVGVestigeRankModel } from "@db/GVGVestigeRank";
 import { addTechActivateMessage, addTechUnlockMessage } from "../../../services/gvg/gvgRecService";
-import { GuildModel } from "../../../db/Guild";
+import { GuildModel } from "@db/Guild";
-import { GVGCityModel } from "../../../db/GVGCity";
+import { GVGCityModel } from "@db/GVGCity";
-import { GVGRoleDataModel } from "../../../db/GVGRoleData";
+import { GVGRoleDataModel } from "@db/GVGRoleData";
 
 export default function (app: Application) {
     new HandlerService(app, {});
@@ -645,3 +645,4 @@ export class GVGHandler {
         return resResult(STATUS.SUCCESS, { result });
     }
 }
+

game-server/app/servers/guild/handler/gvgManageHandler.ts

@@ -1,24 +1,24 @@
-import { Application, BackendSession, ChannelService, HandlerService } from "pinus";
+import { Application, BackendSession, ChannelService, HandlerService } from "pinus";
 import { CHANNEL_PREFIX, GUILD_AUTH, GVG_APPLY_TYPE, GVG_PERIOD, GVG_SERVER_TYPE, LEAGUE_AUTH, LEAGUE_MANAGE_TYPE, MAIL_TYPE, MSG_SOURCE, MSG_TYPE, PUSH_ROUTE, REDIS_KEY, STATUS } from "../../../consts";
-import { resResult } from "../../../pubUtils/util";
+import { resResult } from "@pubUtils/util";
-import { GuildModel, GuildType } from "../../../db/Guild";
+import { GuildModel, GuildType } from "@db/Guild";
-import { GVGLeagueModel, GVGLeagueType } from "../../../db/GVGLeague";
+import { GVGLeagueModel, GVGLeagueType } from "@db/GVGLeague";
-import { GVGLeagueApplyModel } from "../../../db/GVGLeagueApply";
+import { GVGLeagueApplyModel } from "@db/GVGLeagueApply";
 import { calLeagueCe, getGroupKey, getGVGConfig, getGVGPeriodData, getGVGServerType } from "../../../services/gvg/gvgService";
 import { checkCanManage, checkGuildLeader, checkLeagueAuth, createLeague, getLeagueApplyData, getLeagueInviteData, getMyAuth, joinGuildToLeague, updateGVGBattleLeagueInfo } from "../../../services/gvg/gvgTeamService";
-import { LeagueGuildInfo, LeagueListInfo, LeagueMemberListInfo, LeagueSimpleInfo } from "../../../domain/gvgField/returnData";
+import { LeagueGuildInfo, LeagueListInfo, LeagueMemberListInfo, LeagueSimpleInfo } from "@domain/gvgField/returnData";
 import { getAllServerName, getServerName, isRoleOnline, updateUserInfo } from "../../../services/redisService";
-import { GVG } from "../../../pubUtils/dicParam";
+import { GVG } from "@pubUtils/dicParam";
-import { RoleModel, RoleType } from "../../../db/Role";
+import { RoleModel, RoleType } from "@db/Role";
-import { GVGUserDataModel } from "../../../db/GVGUserData";
+import { GVGUserDataModel } from "@db/GVGUserData";
 import { sendMessageToGuildWithSuc, sendMessageToUserWithSuc } from "../../../services/pushService";
-import { GVGLeaguePrepareModel } from "../../../db/GVGLeaguePrepare";
+import { GVGLeaguePrepareModel } from "@db/GVGLeaguePrepare";
 import { createGroupMsg, pushGroupMsgToRoom } from "../../../services/chatService";
 import { sendMailByContent, sendMailToGuildByContent, sendMailToLeagueByContent } from "../../../services/mailService";
 import { getGVGCities } from "../../../services/gvg/gvgBattleService";
 import { addLeagueRenameRecord, changeNoticeMessage, guildQuitLeagueRecord } from "../../../services/gvg/gvgRecService";
-import { LeagueLeader } from "../../../domain/rank";
+import { LeagueLeader } from "@domain/rank";
-import GVGCity from "../../../db/GVGCity";
+import GVGCity from "@db/GVGCity";
 import { getGVGGroupIdOfServer, getGVGServersOfSameGroup } from "../../../services/serverService";
 
 export default function (app: Application) {
@@ -688,3 +688,4 @@ export class GVGManageHandler {
         return resResult(STATUS.SUCCESS, { isSuccess: true });
     }
 }
+

game-server/app/servers/guild/handler/gvgProduceHandler.ts

@@ -1,16 +1,16 @@
-import { Application, BackendSession, ChannelService, HandlerService } from "pinus";
+import { Application, BackendSession, ChannelService, HandlerService } from "pinus";
 import { GVG_ACTIVE_TYPE, GVG_ITEM, GVG_ITEM_TYPE, GVG_PERIOD, GVG_RESOURCE_TYPE, ITEM_CHANGE_REASON, MAIL_TYPE, STATUS, TASK_TYPE } from "../../../consts";
-import { GVGLeagueModel } from "../../../db/GVGLeague";
+import { GVGLeagueModel } from "@db/GVGLeague";
-import { GVGLeagueFarmModel, GVGLeagueFarmType } from "../../../db/GVGLeagueFarm";
+import { GVGLeagueFarmModel, GVGLeagueFarmType } from "@db/GVGLeagueFarm";
-import { GVGLeagueFarmRecModel } from "../../../db/GVGLeagueFarmRec";
+import { GVGLeagueFarmRecModel } from "@db/GVGLeagueFarmRec";
-import { GVGLeaguePrepareModel } from "../../../db/GVGLeaguePrepare";
+import { GVGLeaguePrepareModel } from "@db/GVGLeaguePrepare";
-import { GVGUserItemModel } from "../../../db/GVGUserItem";
+import { GVGUserItemModel } from "@db/GVGUserItem";
-import { RoleModel } from "../../../db/Role";
+import { RoleModel } from "@db/Role";
-import { LeagueFarmListInfo, LeagueFarmMember, LeagueField } from "../../../domain/gvgField/returnData";
+import { LeagueFarmListInfo, LeagueFarmMember, LeagueField } from "@domain/gvgField/returnData";
-import { gameData, getGVGResourceBasesByType } from "../../../pubUtils/data";
+import { gameData, getGVGResourceBasesByType } from "@pubUtils/data";
-import { ItemInter, RewardInter } from "../../../pubUtils/interface";
+import { ItemInter, RewardInter } from "@pubUtils/interface";
-import { nowSeconds } from "../../../pubUtils/timeUtil";
+import { nowSeconds } from "@pubUtils/timeUtil";
-import { resResult } from "../../../pubUtils/util";
+import { resResult } from "@pubUtils/util";
 import { getGVGCities } from "../../../services/gvg/gvgBattleService";
 import { addGVGReward, getProduceCoinCnt, handleGVGCost } from "../../../services/gvg/gvgItemService";
 import { addGVGActive, addResource, getCostSeedReward, getItemIdOfSeedType, getLeagueFarmShowResult, getLockFieldCnt, getmyContributeRank, rollbackUnPlantFields, lockField, calFarmOutput, sumOutputByResults, lockMineOrForestry, calMineOutput, calForestryOutput, checkItemCanUserInFarm, checkResourceAndLv } from "../../../services/gvg/gvgPrepareService";
@@ -557,3 +557,4 @@ export class GVGProduceHandler {
         return resResult(STATUS.SUCCESS);
     }
 }
+

game-server/app/servers/guild/handler/raceActivityHandler.ts

@@ -1,17 +1,17 @@
-import { Application, ChannelService, BackendSession, HandlerService, pinus, } from "pinus";
+import { Application, ChannelService, BackendSession, HandlerService, pinus, } from "pinus";
 import { GUILD_ACTIVITY_TYPE, STATUS, GUILD_ACTIVITY_STATUS, REDIS_KEY, TASK_TYPE, PUSH_ROUTE, DEBUG_MAGIC_WORD } from "../../../consts";
-import { genCode, resResult } from "../../../pubUtils/util";
+import { genCode, resResult } from "@pubUtils/util";
 import { getGuildActivityStatus, getWoodenHorseList, getGAIndexInPinus, getJoinIndex, leaveRaceActivity } from "../../../services/guildActivity/guildActivityService";
-import { UserGuildModel } from "../../../db/UserGuild";
+import { UserGuildModel } from "@db/UserGuild";
-import { GuildActivityRecordModel } from "../../../db/GuildActivityRec";
+import { GuildActivityRecordModel } from "@db/GuildActivityRec";
-import { UserGuildActivityRecModel } from "../../../db/UserGuildActivityRec";
+import { UserGuildActivityRecModel } from "@db/UserGuildActivityRec";
 import { Rank } from "../../../services/rankService";
 import { checkTask } from "../../../services/task/taskService";
-import { ServerRecordModel } from "../../../db/ServerRecords";
+import { ServerRecordModel } from "@db/ServerRecords";
 import { sendMessageToGuildWithSuc } from "../../../services/pushService";
-import { RaceActivityRankParam } from "../../../domain/battleField/guildActivity";
+import { RaceActivityRankParam } from "@domain/battleField/guildActivity";
-import { GuildRankInfo } from "../../../domain/rank";
+import { GuildRankInfo } from "@domain/rank";
-import { dispatch } from "../../../pubUtils/dispatcher";
+import { dispatch } from "@pubUtils/dispatcher";
 import { redisClient } from "../../../services/redisService";
 import { getRaceActivityObj } from "../../../services/memoryCache/guildActivityData";
 
@@ -267,3 +267,4 @@ export class RaceActivityHandler {
         return resResult(STATUS.SUCCESS);
     }
 }
+

game-server/app/servers/guild/handler/wishPoolHandler.ts

@@ -1,20 +1,20 @@
-import { Application, BackendSession } from 'pinus';
+import { Application, BackendSession } from 'pinus';
-import { UserGuildModel } from '../../../db/UserGuild';
+import { UserGuildModel } from '@db/UserGuild';
-import { GuildModel } from '../../../db/Guild';
+import { GuildModel } from '@db/Guild';
-import { WishPoolReportModel } from '../../../db/WishPoolReport';
+import { WishPoolReportModel } from '@db/WishPoolReport';
-import { resResult, genCode } from '../../../pubUtils/util';
+import { resResult, genCode } from '@pubUtils/util';
 import { ITEM_CHANGE_REASON, PUSH_ROUTE, STATUS } from '../../../consts';
-import { gameData, getGoodById, getWishPoolReward } from '../../../pubUtils/data';
+import { gameData, getGoodById, getWishPoolReward } from '@pubUtils/data';
 import { addItems, checkGoods, checkHeroEquips, checkHeroes, getHonourObject, handleCost } from '../../../services/role/rewardService';
-import { ITID, CONSUME_TYPE } from '../../../consts/constModules/itemConst';
+import { ITID, CONSUME_TYPE } from '@consts/constModules/itemConst';
-import { GUILD_POINT_WAYS, GUILD_STRUCTURE, WISH_POOL_TYPE } from '../../../consts/constModules/guildConst';
+import { GUILD_POINT_WAYS, GUILD_STRUCTURE, WISH_POOL_TYPE } from '@consts/constModules/guildConst';
 import { getWishPool, getUserGuildWithRefActive, addActive, canWishToday } from '../../../services/guildService';
 import { findIndex, findWhere } from 'underscore';
-import { RoleModel } from '../../../db/Role';
+import { RoleModel } from '@db/Role';
 import { getRoleOnlineInfo } from '../../../services/redisService';
-import { ARMY } from '../../../pubUtils/dicParam';
+import { ARMY } from '@pubUtils/dicParam';
-import { guildInter } from '../../../pubUtils/interface';
+import { guildInter } from '@pubUtils/interface';
-import { getSeconds, getZeroPoint, nowSeconds, isToday } from '../../../pubUtils/timeUtil';
+import { getSeconds, getZeroPoint, nowSeconds, isToday } from '@pubUtils/timeUtil';
 import { sendMessageToUserWithSuc } from '../../../services/pushService';
 import { isGoodsHidden } from '../../../services/dataService';
 export default function(app: Application) {
@@ -170,3 +170,4 @@ export class WishPoolHandler {
         return resResult(STATUS.SUCCESS, { reports });
     }
 } 
+

game-server/app/servers/guild/remote/guildActivityRemote.ts

@@ -1,7 +1,7 @@
-import { Application, ChannelService, HandlerService, } from 'pinus';
+import { Application, ChannelService, HandlerService, } from 'pinus';
 import { sendAllGuildRanks, calWoodenHorseAndSend, sendRaceStartMsg, setDicGuildActivity, setDicAuctionTime, settleGuildActivityReward, setGuildActivityIndexInPinus, guildActivityStart, debugSendGateHp, debugAddHorse, leaveRaceActivity, leaveRaceWhenQuitGuild, leaveRaceWhenDismiss } from '../../../services/guildActivity/guildActivityService';
-import { gameData } from '../../../pubUtils/data';
+import { gameData } from '@pubUtils/data';
-import { setWeek } from '../../../pubUtils/timeUtil';
+import { setWeek } from '@pubUtils/timeUtil';
 import { sendUngotDividend } from '../../../services/auctionService';
 import { errlogger } from '../../../util/logger';
 import { GUILD_ACTIVITY_TYPE } from '../../../consts';
@@ -239,3 +239,4 @@ export class GuildActivityRemote {
         }
     }
 }
+

game-server/app/servers/guild/remote/guildRemote.ts

@@ -1,19 +1,19 @@
-import { Application, ChannelService, HandlerService, } from 'pinus';
+import { Application, ChannelService, HandlerService, } from 'pinus';
-import { gameData, reloadResources } from '../../../pubUtils/data';
+import { gameData, reloadResources } from '@pubUtils/data';
 import { taflush, treatGuildName } from '../../../services/sdkService';
 import { getServerMainten, setServerMainten, stopServerMainten } from '../../../services/gmService';
 import { errlogger } from '../../../util/logger';
 import { setApiIsClose } from '../../../services/chatService';
 import { setKvToMemory } from '../../../services/pushService';
 import { getGVGConfig, setGVGConfig } from '../../../services/gvg/gvgService';
-import { GVGConfigType } from '../../../db/GVGConfig';
+import { GVGConfigType } from '@db/GVGConfig';
 import { catapultHurt, gvgBattleEnd, gvgBattleSeconds, gvgBattleStart, initCatapult, leaveCityMem } from '../../../services/gvg/gvgBattleService';
 import { clearBattleMemory } from '../../../services/memoryCache/gvgBattleData';
 import { updateLeagueNameMem, updateTeamRoleInfoMem } from '../../../services/gvg/gvgTeamService';
 import { resetPeriodTime, setPeriodTime } from '../../../services/gvg/gvgFightService';
 import { setServerGroup } from '../../../services/serverService';
 import { setHiddenData } from '../../../services/memoryCache/hiddenData';
-import * as dicParam from '../../../pubUtils/dicParam';
+import * as dicParam from '@pubUtils/dicParam';
 
 export default function (app: Application) {
     new HandlerService(app, {});
@@ -238,3 +238,4 @@ export class GuildRemote {
         } 
     }
 }
+

game-server/app/servers/order/handler/orderHandler.ts

@@ -1,8 +1,8 @@
-import { Application, BackendSession, HandlerService, } from 'pinus';
+import { Application, BackendSession, HandlerService, } from 'pinus';
-import { genCode, resResult } from '../../../pubUtils/util';
+import { genCode, resResult } from '@pubUtils/util';
 import { ACTIVITY_TYPE, CURRENCY, DEBUG_MAGIC_WORD, DEBUG_PRICE, ITEM_CHANGE_REASON, ORDER_STATE, PAY_TYPE, STATUS, TASK_TYPE, TA_EVENT } from '../../../consts';
-import { dicRMB } from '../../../pubUtils/dictionary/DicRMB';
+import { dicRMB } from '@pubUtils/dictionary/DicRMB';
-import { UserOrderModel } from '../../../db/UserOrder';
+import { UserOrderModel } from '@db/UserOrder';
 import _ = require('underscore');
 import { applyOrderWX } from '../../../services/pay/weixinPay';
 import { applyOrderALI } from '../../../services/pay/aliPay';
@@ -10,7 +10,7 @@ import { applyOrder37 } from '../../../services/pay/37Pay';
 import { checkOrderCanBuy, settleOrder, settleOrderAli, settleOrderFromHandler, settleOrderWx } from '../../../services/orderService';
 import { getActivityById } from '../../../services/activity/activityService';
 import { reportTAEvent } from '../../../services/sdkService';
-import { canPay, isDebugPay } from '../../../pubUtils/sdkUtil';
+import { canPay, isDebugPay } from '@pubUtils/sdkUtil';
 import { isDevelopEnv } from '../../../services/utilService';
 import { checkVoucherId, getVoucherCoinObject, getVoucherObject, handleCost } from '../../../services/role/rewardService';
 import { CheckMeterial } from '../../../services/role/checkMaterial';
@@ -313,3 +313,4 @@ export class orderHandler {
         return resResult(STATUS.SUCCESS, {...result, localOrderID});
     }
 }
+

game-server/app/servers/order/remote/orderRemote.ts

@@ -1,5 +1,5 @@
-import { Application, ChannelService, HandlerService, } from 'pinus';
+import { Application, ChannelService, HandlerService, } from 'pinus';
-import { gameData, reloadResources } from '../../../pubUtils/data';
+import { gameData, reloadResources } from '@pubUtils/data';
 import { refundOrderFromRedisPub, settleOrderFromRedisPub } from '../../../services/orderService';
 import { getServerMainten, setServerMainten, stopServerMainten } from '../../../services/gmService';
 import { taflush } from '../../../services/sdkService';
@@ -7,7 +7,7 @@ import { errlogger } from '../../../util/logger';
 import { setApiIsClose } from '../../../services/chatService';
 import { setKvToMemory } from '../../../services/pushService';
 import { setHiddenData } from '../../../services/memoryCache/hiddenData';
-import * as dicParam from '../../../pubUtils/dicParam';
+import * as dicParam from '@pubUtils/dicParam';
 
 export default function (app: Application) {
     new HandlerService(app, {});
@@ -131,3 +131,4 @@ export class OrderRemote {
         } 
     }
 }
+