Merge branch 'master' into feature/backend

# Conflicts:
#	game-server/app/servers/connector/handler/entryHandler.ts
#	game-server/app/servers/role/handler/itemHandler.ts
#	shared/consts/constModules/sysConst.ts
#	shared/pubUtils/util.ts
#	web-server/app.ts
#	web-server/app/service/Auth.ts

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

@@ -7,7 +7,7 @@ import { Application, HandlerService, pinus, } from 'pinus';
 import { FrontendSession } from 'pinus';
 import { HeroModel } from './../../../db/Hero';
 import { 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 } from '../../../consts';
+import { COM_BTL_QUALITY, HERO_SELECT, DEBUG_MAGIC_WORD, REDIS_KEY, TASK_TYPE, ENTERY_ROLE_PICK, COUNTER, DEFAULT_LV, TA_USERSET_TYPE } from '../../../consts';
 import { getAp } from '../../../services/actionPointService';
 import { ItemModel } from '../../../db/Item';
 import { SkinModel } from '../../../db/Skin';
@@ -24,6 +24,7 @@ import { pick } from 'lodash';
 import { setComBtlOnUserLeave } from '../../../services/comBattleService';
 import Counter from '../../../db/Counter';
 import { getExpByLv } from '../../../pubUtils/data';
+import { reportTAUserSet } from '../../../services/sdkService';
 
 export default function (app: Application) {
     new HandlerService(app, {});
@@ -98,7 +99,8 @@ export class EntryHandler {
         role['equips'] = equips;
         role['consumeGoods'] = items;
         role['skins'] = skins;
-        let apJson = await getAp(role.roleId, role.lv);
+        let ip = session.remoteAddress.ip.replace('::ffff:', '');
+        let apJson = await getAp(role.roleId, ip, role.lv);
         role['apJson'] = apJson;
 
         if (!role.showLineup) role.showLineup = role.topLineup.map(cur => cur.hid);
@@ -128,6 +130,7 @@ export class EntryHandler {
         session.set('roleId', role.roleId);
         let updatedMailAt = role.updatedMailAt ? role.updatedMailAt : 0;
         session.set('updatedMailAt', updatedMailAt);
+        session.set('loginTime', role.loginTime);
         session.set('roleName', role.roleName);
         session.set('eventStatus', role.eventStatus);
         session.set('blockType', role.blockType);
@@ -142,6 +145,7 @@ export class EntryHandler {
         session.push('eventStatus', () => { });
         session.push('serverId', () => { });
         session.push('updatedMailAt', () => { });
+        session.push('loginTime', () => { });
         session.push('guildCode', () => { });
         session.push('blockType', () => { });
         session.push('ip', () => { });
@@ -197,6 +201,7 @@ export class EntryHandler {
         let roleId = session.get('roleId');
         let sid = session.get('sid');
         let serverId = session.get('serverId');
+        let loginTime = session.get('loginTime');
         const guildCode = session.get('guildCode');
         const teamCode: string = session.get('teamCode');
         roleLeave(roleId).then(function (roleInfo) {
@@ -204,6 +209,7 @@ export class EntryHandler {
                 savePlayTime(roleInfo.userCode);
             }
         });
+        reportTAUserSet(TA_USERSET_TYPE.ADD, roleId, nowSeconds() - loginTime);
         rmRoleFromQueue(roleId, sid, COM_BTL_QUALITY, null); // 删除redis中寻宝的匹配记录
         let channelService = this.app.get('channelService');
         let channel = channelService.getChannel(roleId, true);