Merge branch 'master' of http://60.1.1.230/backend/jieling_server
commit
5217601d47
|
@ -89,7 +89,7 @@ public class GameApplication {
|
||||||
MapLogic.getInstance().init(configurableApplicationContext);
|
MapLogic.getInstance().init(configurableApplicationContext);
|
||||||
|
|
||||||
SensitivewordFilter.init();
|
SensitivewordFilter.init();
|
||||||
HttpPool.init();
|
// HttpPool.init();
|
||||||
|
|
||||||
// 加载lua文件
|
// 加载lua文件
|
||||||
CheckFight.getInstance().init("luafight/BattleMain.lua");
|
CheckFight.getInstance().init("luafight/BattleMain.lua");
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
package com.ljsd.jieling.handler;
|
package com.ljsd.jieling.handler;
|
||||||
|
|
||||||
|
import com.ljsd.GameApplication;
|
||||||
import com.ljsd.jieling.handler.map.MapLogic;
|
import com.ljsd.jieling.handler.map.MapLogic;
|
||||||
import com.ljsd.jieling.ktbeans.KTRequestBeans.LoginParamType;
|
import com.ljsd.jieling.ktbeans.KTRequestBeans.LoginParamType;
|
||||||
import com.ljsd.jieling.ktbeans.KtEventUtils;
|
import com.ljsd.jieling.ktbeans.KtEventUtils;
|
||||||
|
@ -60,11 +61,13 @@ public class LoginRequestHandler extends BaseHandler {
|
||||||
break;
|
break;
|
||||||
|
|
||||||
}
|
}
|
||||||
// ParamDataBean paramDataBean = new ParamDataBean();
|
ParamDataBean paramDataBean = new ParamDataBean();
|
||||||
// KTEnvironmentUtil.addUserEnviromentInfo(userId,paramEnvironmentBean);
|
paramDataBean.setChannel_s(loginRequest.getChannelS());
|
||||||
// KTEnvironmentUtil.addUserSimpleEnviromentInfo(userId,paramEnvironmentSimpleBean);
|
paramDataBean.setServer_s(String.valueOf(GameApplication.serverId));
|
||||||
// KTDataUtil.addUserDataInfo(userId,paramDataBean);
|
KTDataUtil.addUserDataInfo(userId,paramDataBean);
|
||||||
|
|
||||||
|
// KTEnvironmentUtil.addUserEnviromentInfo(userId,paramEnvironmentBean);
|
||||||
|
KTEnvironmentUtil.addUserSimpleEnviromentInfo(userId,paramEnvironmentSimpleBean);
|
||||||
KTEnvironmentUtil.addUserEnviromentInfo(userId,paramEnvironmentBean);
|
KTEnvironmentUtil.addUserEnviromentInfo(userId,paramEnvironmentBean);
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
package com.ljsd.jieling.ktbeans.BeanBuilder;
|
package com.ljsd.jieling.ktbeans.BeanBuilder;
|
||||||
|
|
||||||
import com.ljsd.jieling.ktbeans.*;
|
import com.ljsd.jieling.ktbeans.*;
|
||||||
|
import com.ljsd.jieling.ktbeans.KTRequestBeans.LoginParamType;
|
||||||
import com.ljsd.jieling.ktbeans.parmsBean.ParamEventBean;
|
import com.ljsd.jieling.ktbeans.parmsBean.ParamEventBean;
|
||||||
import com.ljsd.jieling.ktbeans.sendbeans.*;
|
import com.ljsd.jieling.ktbeans.sendbeans.*;
|
||||||
import com.ljsd.jieling.logic.dao.root.User;
|
import com.ljsd.jieling.logic.dao.root.User;
|
||||||
|
@ -17,6 +18,7 @@ public class ParamBuilder {
|
||||||
ktRoleActivity.setParam_user(KtEventUtils.userBuild(user));
|
ktRoleActivity.setParam_user(KtEventUtils.userBuild(user));
|
||||||
ktRoleActivity.setParam_role(KtEventUtils.roleBuild(user));
|
ktRoleActivity.setParam_role(KtEventUtils.roleBuild(user));
|
||||||
ktRoleActivity.setParam_event(paramEventBean);
|
ktRoleActivity.setParam_event(paramEventBean);
|
||||||
|
ktRoleActivity.getParam_data().setCategory_s(LoginParamType.DATA_CATEGORY_APP);
|
||||||
return ktRoleActivity;
|
return ktRoleActivity;
|
||||||
|
|
||||||
case ParamEventBean
|
case ParamEventBean
|
||||||
|
|
|
@ -11,4 +11,8 @@ public class LoginParamType {
|
||||||
|
|
||||||
public static final String NETWORK_WIFI="WIFI";
|
public static final String NETWORK_WIFI="WIFI";
|
||||||
|
|
||||||
|
public static final String DATA_CATEGORY_APP = "event_app";
|
||||||
|
|
||||||
|
public static final String DATA_CATEGORY_ROLE = "event_role";
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,5 +1,7 @@
|
||||||
package com.ljsd.jieling.ktbeans.parmsBean;
|
package com.ljsd.jieling.ktbeans.parmsBean;
|
||||||
|
|
||||||
|
import com.ljsd.jieling.ktbeans.KTRequestBeans.LoginParamType;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 数据参数
|
* 数据参数
|
||||||
*/
|
*/
|
||||||
|
@ -82,11 +84,11 @@ public class ParamDataBean {
|
||||||
|
|
||||||
public ParamDataBean(){
|
public ParamDataBean(){
|
||||||
this.app_id_s="game_skuld_01";
|
this.app_id_s="game_skuld_01";
|
||||||
this.category_s="event_role";
|
this.category_s=LoginParamType.DATA_CATEGORY_ROLE;
|
||||||
this.platform_s="ADR";
|
this.platform_s= LoginParamType.PLATFORM_ANDRIOD;
|
||||||
this.region_s="4";
|
this.region_s="1";
|
||||||
this.server_s="44";
|
this.server_s="44";
|
||||||
this.channel_s="4";
|
this.channel_s="";
|
||||||
this.data_unix=1511767867;
|
this.data_unix=(int)(System.currentTimeMillis()/1000L);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue