Merge branch 'master' of http://60.1.1.230/backend/jieling_server
commit
2dd2a38fe0
|
@ -48,40 +48,40 @@ public class LoginRequestHandler extends BaseHandler<PlayerInfoProto.LoginReques
|
|||
return;
|
||||
}
|
||||
ReportUtil.saveBaseInfo(userId,loginRequest);
|
||||
ParamEnvironmentBean paramEnvironmentBean = new ParamEnvironmentBean();
|
||||
paramEnvironmentBean.setDevice_id_s(loginRequest.getDeviceIdS());
|
||||
paramEnvironmentBean.setIp_s(loginRequest.getIpS());
|
||||
ParamEnvironmentSimpleBean paramEnvironmentSimpleBean = new ParamEnvironmentSimpleBean("",
|
||||
"",
|
||||
loginRequest.getDeviceIdS(),
|
||||
loginRequest.getBrandS(),
|
||||
loginRequest.getDpiS(),
|
||||
loginRequest.getOperatorS(),
|
||||
loginRequest.getOsVersionS(),
|
||||
LoginParamType.NETWORK_WIFI.equals(loginRequest.getNetworkS()));
|
||||
switch (loginRequest.getPlatformS()){
|
||||
case LoginParamType.PLATFORM_ANDRIOD:
|
||||
paramEnvironmentSimpleBean.setImei_s(loginRequest.getIdfaSOrImeiS());
|
||||
break;
|
||||
case LoginParamType.PLATFORM_IOS:
|
||||
paramEnvironmentSimpleBean.setIdfa_s(loginRequest.getIdfaSOrImeiS());
|
||||
break;
|
||||
case LoginParamType.PLATFORM_IOS_YY:
|
||||
paramEnvironmentSimpleBean.setIdfa_s(loginRequest.getIdfaSOrImeiS());
|
||||
break;
|
||||
case LoginParamType.PLATFORM_PC:
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
|
||||
}
|
||||
ParamDataBean paramDataBean = new ParamDataBean();
|
||||
paramDataBean.setChannel_s(loginRequest.getChannelS());
|
||||
KTDataUtil.addUserDataInfo(userId,paramDataBean);
|
||||
|
||||
// ParamEnvironmentBean paramEnvironmentBean = new ParamEnvironmentBean();
|
||||
// paramEnvironmentBean.setDevice_id_s(loginRequest.getDeviceIdS());
|
||||
// paramEnvironmentBean.setIp_s(loginRequest.getIpS());
|
||||
// ParamEnvironmentSimpleBean paramEnvironmentSimpleBean = new ParamEnvironmentSimpleBean("",
|
||||
// "",
|
||||
// loginRequest.getDeviceIdS(),
|
||||
// loginRequest.getBrandS(),
|
||||
// loginRequest.getDpiS(),
|
||||
// loginRequest.getOperatorS(),
|
||||
// loginRequest.getOsVersionS(),
|
||||
// LoginParamType.NETWORK_WIFI.equals(loginRequest.getNetworkS()));
|
||||
// switch (loginRequest.getPlatformS()){
|
||||
// case LoginParamType.PLATFORM_ANDRIOD:
|
||||
// paramEnvironmentSimpleBean.setImei_s(loginRequest.getIdfaSOrImeiS());
|
||||
// break;
|
||||
// case LoginParamType.PLATFORM_IOS:
|
||||
// paramEnvironmentSimpleBean.setIdfa_s(loginRequest.getIdfaSOrImeiS());
|
||||
// break;
|
||||
// case LoginParamType.PLATFORM_IOS_YY:
|
||||
// paramEnvironmentSimpleBean.setIdfa_s(loginRequest.getIdfaSOrImeiS());
|
||||
// break;
|
||||
// case LoginParamType.PLATFORM_PC:
|
||||
// break;
|
||||
// default:
|
||||
// break;
|
||||
//
|
||||
// }
|
||||
// ParamDataBean paramDataBean = new ParamDataBean();
|
||||
// paramDataBean.setChannel_s(loginRequest.getChannelS());
|
||||
// KTDataUtil.addUserDataInfo(userId,paramDataBean);
|
||||
//
|
||||
//// KTEnvironmentUtil.addUserEnviromentInfo(userId,paramEnvironmentBean);
|
||||
// KTEnvironmentUtil.addUserSimpleEnviromentInfo(userId,paramEnvironmentSimpleBean);
|
||||
// KTEnvironmentUtil.addUserEnviromentInfo(userId,paramEnvironmentBean);
|
||||
KTEnvironmentUtil.addUserSimpleEnviromentInfo(userId,paramEnvironmentSimpleBean);
|
||||
KTEnvironmentUtil.addUserEnviromentInfo(userId,paramEnvironmentBean);
|
||||
|
||||
int pid = 0;
|
||||
int gid = 0;
|
||||
|
@ -101,19 +101,19 @@ public class LoginRequestHandler extends BaseHandler<PlayerInfoProto.LoginReques
|
|||
}
|
||||
|
||||
//临时代码 等前端出新包后删除2019 11 29
|
||||
if(gid==0){
|
||||
try {
|
||||
String value =( (String) RedisUtil.getInstence().get(RedisUtil.getInstence().getKey(RedisKey.PIDGIDTEMP, Integer.toString(userId)))).replace("\"", "");
|
||||
LOGGER.info("the value={}",value);
|
||||
String[] splitvalue = value.split("#");
|
||||
if (splitvalue.length==2){
|
||||
pid = Integer.valueOf(splitvalue[0]);
|
||||
gid = Integer.valueOf(splitvalue[1]);
|
||||
}
|
||||
}catch (Exception e){
|
||||
e.getMessage();
|
||||
}
|
||||
}
|
||||
// if(gid==0){
|
||||
// try {
|
||||
// String value =( (String) RedisUtil.getInstence().get(RedisUtil.getInstence().getKey(RedisKey.PIDGIDTEMP, Integer.toString(userId)))).replace("\"", "");
|
||||
// LOGGER.info("the value={}",value);
|
||||
// String[] splitvalue = value.split("#");
|
||||
// if (splitvalue.length==2){
|
||||
// pid = Integer.valueOf(splitvalue[0]);
|
||||
// gid = Integer.valueOf(splitvalue[1]);
|
||||
// }
|
||||
// }catch (Exception e){
|
||||
// e.getMessage();
|
||||
// }
|
||||
// }
|
||||
|
||||
LOGGER.info("the uid={},the pid={},the gid={},",userId,pid,gid);
|
||||
//登陆注册入内存
|
||||
|
|
|
@ -41,95 +41,95 @@ public class KtEventUtils {
|
|||
|
||||
|
||||
public static void onKtEvent(User user,int eventType,Object ...parm){
|
||||
ParamEventBean paramEventBean = new ParamEventBean(eventType);
|
||||
switch (eventType){
|
||||
case ParamEventBean.UserActivityEvent:
|
||||
int activityId = (int)parm[0];
|
||||
SGlobalActivity sGlobalActivity = SGlobalActivity.getsGlobalActivityMap().get(activityId);
|
||||
paramEventBean.add(sGlobalActivity.getSesc());
|
||||
paramEventBean.add(sGlobalActivity.getSesc());
|
||||
paramEventBean.add(parm[1].toString());
|
||||
paramEventBean.add("COMPLETE");
|
||||
break;
|
||||
case ParamEventBean.UserItemEvent:
|
||||
case ParamEventBean.UserCurrencyEvent:
|
||||
int useReson = (int)parm[0];
|
||||
int useType = (int)parm[1];
|
||||
int itemId = (int)parm[2];
|
||||
int itemNum = (int)parm[3];
|
||||
int itemTotalNum = (int)parm[4];
|
||||
paramEventBean.add(itemUseType[useType]);
|
||||
paramEventBean.add(String.valueOf(useReson));
|
||||
if(currencyMap.containsKey(itemId)){
|
||||
paramEventBean.add(currencyMap.get(itemId));
|
||||
}else{
|
||||
paramEventBean.add(String.valueOf(itemId));
|
||||
}
|
||||
paramEventBean.add(String.valueOf(itemNum));
|
||||
PlayerManager playerInfoManager = user.getPlayerInfoManager();
|
||||
ItemLogic.getInstance().addItemLog(new ItemLog(user.getId(),useType,String.valueOf(TimeUtils.now()),useReson,itemId,itemNum,itemTotalNum));
|
||||
|
||||
if(parm.length==6){
|
||||
String sbReson = String.valueOf(parm[5]);
|
||||
BILog.info("itemflow {}|{}|{}|{}|{}|{}|{}|{}|{}",user.getId(), playerInfoManager.getLevel(), playerInfoManager.getVipLevel(),useType,useReson,itemId,itemNum,itemTotalNum,sbReson);
|
||||
}else {
|
||||
BILog.info("itemflow {}|{}|{}|{}|{}|{}|{}|{}",user.getId(), playerInfoManager.getLevel(), playerInfoManager.getVipLevel(),useType,useReson,itemId,itemNum,itemTotalNum);
|
||||
}
|
||||
|
||||
break;
|
||||
case ParamEventBean.UserLoginOutEvent:
|
||||
case ParamEventBean.UserLogin:
|
||||
int loginType = (int)parm[0];
|
||||
paramEventBean.add(userloginType[loginType]);
|
||||
break;
|
||||
case ParamEventBean.UserStoreEvent:
|
||||
int storeId = (int)parm[0];
|
||||
int buyItemId = (int)parm[1];
|
||||
int goldType = (int)parm[2];
|
||||
int buyTimes = (int)parm[3];
|
||||
int costTotal = (int)parm[4];
|
||||
paramEventBean.add(String.valueOf(storeId));
|
||||
paramEventBean.add(String.valueOf(buyItemId));
|
||||
if(currencyMap.containsKey(goldType)){
|
||||
paramEventBean.add(currencyMap.get(goldType));
|
||||
}else{
|
||||
paramEventBean.add(Integer.toString(goldType));
|
||||
}
|
||||
paramEventBean.add(String.valueOf(buyTimes));
|
||||
paramEventBean.add(String.valueOf(costTotal/buyTimes));
|
||||
paramEventBean.add(String.valueOf(costTotal));
|
||||
break;
|
||||
case ParamEventBean.UserPayEvent:
|
||||
int goodsId = (int)parm[0];
|
||||
String orderId = (String)parm[1];
|
||||
String payValid = payResult[(int)parm[2]];
|
||||
String amount = String.valueOf( ((int)parm[3]));
|
||||
SRechargeCommodityConfig sRechargeCommodityConfig = SRechargeCommodityConfig.rechargeCommodityConfigMap.get(goodsId);
|
||||
paramEventBean.add(sRechargeCommodityConfig.getName());
|
||||
paramEventBean.add(orderId);
|
||||
paramEventBean.add(payValid);
|
||||
paramEventBean.add(amount);
|
||||
break;
|
||||
case ParamEventBean.UserRegister:
|
||||
break;
|
||||
case ParamEventBean.UserTaskEvent:
|
||||
int misionType = (int)parm[0];
|
||||
int misionId = (int)parm[1];
|
||||
paramEventBean.add(misionType+"_"+misionId);
|
||||
paramEventBean.add("COMPLETE");
|
||||
break;
|
||||
case ParamEventBean.UserGameType:
|
||||
paramEventBean.add("玩法");
|
||||
String type = KTGameType.getName((int) parm[0]);
|
||||
paramEventBean.add(String.valueOf(type));
|
||||
paramEventBean.add(String.valueOf(parm[1]));
|
||||
paramEventBean.add("COMPLETE");
|
||||
eventType = ParamEventBean.UserActivityEvent;
|
||||
break;
|
||||
}
|
||||
|
||||
KTParam ktParam = ParamBuilder.paramBuild(user, eventType, paramEventBean);
|
||||
DataMessageUtils.addLogQueue(ktParam);
|
||||
// ParamEventBean paramEventBean = new ParamEventBean(eventType);
|
||||
// switch (eventType){
|
||||
// case ParamEventBean.UserActivityEvent:
|
||||
// int activityId = (int)parm[0];
|
||||
// SGlobalActivity sGlobalActivity = SGlobalActivity.getsGlobalActivityMap().get(activityId);
|
||||
// paramEventBean.add(sGlobalActivity.getSesc());
|
||||
// paramEventBean.add(sGlobalActivity.getSesc());
|
||||
// paramEventBean.add(parm[1].toString());
|
||||
// paramEventBean.add("COMPLETE");
|
||||
// break;
|
||||
// case ParamEventBean.UserItemEvent:
|
||||
// case ParamEventBean.UserCurrencyEvent:
|
||||
// int useReson = (int)parm[0];
|
||||
// int useType = (int)parm[1];
|
||||
// int itemId = (int)parm[2];
|
||||
// int itemNum = (int)parm[3];
|
||||
// int itemTotalNum = (int)parm[4];
|
||||
// paramEventBean.add(itemUseType[useType]);
|
||||
// paramEventBean.add(String.valueOf(useReson));
|
||||
// if(currencyMap.containsKey(itemId)){
|
||||
// paramEventBean.add(currencyMap.get(itemId));
|
||||
// }else{
|
||||
// paramEventBean.add(String.valueOf(itemId));
|
||||
// }
|
||||
// paramEventBean.add(String.valueOf(itemNum));
|
||||
// PlayerManager playerInfoManager = user.getPlayerInfoManager();
|
||||
// ItemLogic.getInstance().addItemLog(new ItemLog(user.getId(),useType,String.valueOf(TimeUtils.now()),useReson,itemId,itemNum,itemTotalNum));
|
||||
//
|
||||
// if(parm.length==6){
|
||||
// String sbReson = String.valueOf(parm[5]);
|
||||
// BILog.info("itemflow {}|{}|{}|{}|{}|{}|{}|{}|{}",user.getId(), playerInfoManager.getLevel(), playerInfoManager.getVipLevel(),useType,useReson,itemId,itemNum,itemTotalNum,sbReson);
|
||||
// }else {
|
||||
// BILog.info("itemflow {}|{}|{}|{}|{}|{}|{}|{}",user.getId(), playerInfoManager.getLevel(), playerInfoManager.getVipLevel(),useType,useReson,itemId,itemNum,itemTotalNum);
|
||||
// }
|
||||
//
|
||||
// break;
|
||||
// case ParamEventBean.UserLoginOutEvent:
|
||||
// case ParamEventBean.UserLogin:
|
||||
// int loginType = (int)parm[0];
|
||||
// paramEventBean.add(userloginType[loginType]);
|
||||
// break;
|
||||
// case ParamEventBean.UserStoreEvent:
|
||||
// int storeId = (int)parm[0];
|
||||
// int buyItemId = (int)parm[1];
|
||||
// int goldType = (int)parm[2];
|
||||
// int buyTimes = (int)parm[3];
|
||||
// int costTotal = (int)parm[4];
|
||||
// paramEventBean.add(String.valueOf(storeId));
|
||||
// paramEventBean.add(String.valueOf(buyItemId));
|
||||
// if(currencyMap.containsKey(goldType)){
|
||||
// paramEventBean.add(currencyMap.get(goldType));
|
||||
// }else{
|
||||
// paramEventBean.add(Integer.toString(goldType));
|
||||
// }
|
||||
// paramEventBean.add(String.valueOf(buyTimes));
|
||||
// paramEventBean.add(String.valueOf(costTotal/buyTimes));
|
||||
// paramEventBean.add(String.valueOf(costTotal));
|
||||
// break;
|
||||
// case ParamEventBean.UserPayEvent:
|
||||
// int goodsId = (int)parm[0];
|
||||
// String orderId = (String)parm[1];
|
||||
// String payValid = payResult[(int)parm[2]];
|
||||
// String amount = String.valueOf( ((int)parm[3]));
|
||||
// SRechargeCommodityConfig sRechargeCommodityConfig = SRechargeCommodityConfig.rechargeCommodityConfigMap.get(goodsId);
|
||||
// paramEventBean.add(sRechargeCommodityConfig.getName());
|
||||
// paramEventBean.add(orderId);
|
||||
// paramEventBean.add(payValid);
|
||||
// paramEventBean.add(amount);
|
||||
// break;
|
||||
// case ParamEventBean.UserRegister:
|
||||
// break;
|
||||
// case ParamEventBean.UserTaskEvent:
|
||||
// int misionType = (int)parm[0];
|
||||
// int misionId = (int)parm[1];
|
||||
// paramEventBean.add(misionType+"_"+misionId);
|
||||
// paramEventBean.add("COMPLETE");
|
||||
// break;
|
||||
// case ParamEventBean.UserGameType:
|
||||
// paramEventBean.add("玩法");
|
||||
// String type = KTGameType.getName((int) parm[0]);
|
||||
// paramEventBean.add(String.valueOf(type));
|
||||
// paramEventBean.add(String.valueOf(parm[1]));
|
||||
// paramEventBean.add("COMPLETE");
|
||||
// eventType = ParamEventBean.UserActivityEvent;
|
||||
// break;
|
||||
// }
|
||||
//
|
||||
// KTParam ktParam = ParamBuilder.paramBuild(user, eventType, paramEventBean);
|
||||
// DataMessageUtils.addLogQueue(ktParam);
|
||||
// LOGGER.info("ktparm -- > {}",gson.toJson(ktParam));
|
||||
}
|
||||
public static ParamEnvironmentBean enviromentBuild(int uid){
|
||||
|
|
Loading…
Reference in New Issue