From 50f3127f01a6036f9165cef333c8b28d7a050c4f Mon Sep 17 00:00:00 2001 From: lvxinran Date: Fri, 5 Jul 2019 15:00:11 +0800 Subject: [PATCH 1/2] =?UTF-8?q?Data=E5=8F=82=E6=95=B0=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ljsd/jieling/handler/LoginRequestHandler.java | 11 +++++++---- .../jieling/ktbeans/BeanBuilder/ParamBuilder.java | 2 ++ .../ktbeans/KTRequestBeans/LoginParamType.java | 4 ++++ .../jieling/ktbeans/parmsBean/ParamDataBean.java | 12 +++++++----- 4 files changed, 20 insertions(+), 9 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/LoginRequestHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/LoginRequestHandler.java index b6518fa9e..2eade296e 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/LoginRequestHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/LoginRequestHandler.java @@ -1,5 +1,6 @@ package com.ljsd.jieling.handler; +import com.ljsd.GameApplication; import com.ljsd.jieling.handler.map.MapLogic; import com.ljsd.jieling.ktbeans.KTRequestBeans.LoginParamType; import com.ljsd.jieling.ktbeans.KtEventUtils; @@ -60,11 +61,13 @@ public class LoginRequestHandler extends BaseHandler { break; } -// ParamDataBean paramDataBean = new ParamDataBean(); -// KTEnvironmentUtil.addUserEnviromentInfo(userId,paramEnvironmentBean); -// KTEnvironmentUtil.addUserSimpleEnviromentInfo(userId,paramEnvironmentSimpleBean); -// KTDataUtil.addUserDataInfo(userId,paramDataBean); + ParamDataBean paramDataBean = new ParamDataBean(); + paramDataBean.setChannel_s(loginRequest.getChannelS()); + paramDataBean.setServer_s(String.valueOf(GameApplication.serverId)); + KTDataUtil.addUserDataInfo(userId,paramDataBean); +// KTEnvironmentUtil.addUserEnviromentInfo(userId,paramEnvironmentBean); + KTEnvironmentUtil.addUserSimpleEnviromentInfo(userId,paramEnvironmentSimpleBean); KTEnvironmentUtil.addUserEnviromentInfo(userId,paramEnvironmentBean); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/ktbeans/BeanBuilder/ParamBuilder.java b/serverlogic/src/main/java/com/ljsd/jieling/ktbeans/BeanBuilder/ParamBuilder.java index 39b2813ee..e946f39cb 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/ktbeans/BeanBuilder/ParamBuilder.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/ktbeans/BeanBuilder/ParamBuilder.java @@ -1,6 +1,7 @@ package com.ljsd.jieling.ktbeans.BeanBuilder; import com.ljsd.jieling.ktbeans.*; +import com.ljsd.jieling.ktbeans.KTRequestBeans.LoginParamType; import com.ljsd.jieling.ktbeans.parmsBean.ParamEventBean; import com.ljsd.jieling.ktbeans.sendbeans.*; import com.ljsd.jieling.logic.dao.root.User; @@ -17,6 +18,7 @@ public class ParamBuilder { ktRoleActivity.setParam_user(KtEventUtils.userBuild(user)); ktRoleActivity.setParam_role(KtEventUtils.roleBuild(user)); ktRoleActivity.setParam_event(paramEventBean); + ktRoleActivity.getParam_data().setCategory_s(LoginParamType.DATA_CATEGORY_APP); return ktRoleActivity; case ParamEventBean diff --git a/serverlogic/src/main/java/com/ljsd/jieling/ktbeans/KTRequestBeans/LoginParamType.java b/serverlogic/src/main/java/com/ljsd/jieling/ktbeans/KTRequestBeans/LoginParamType.java index cfa66a08e..46fb12aa6 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/ktbeans/KTRequestBeans/LoginParamType.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/ktbeans/KTRequestBeans/LoginParamType.java @@ -11,4 +11,8 @@ public class LoginParamType { 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"; + } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/ktbeans/parmsBean/ParamDataBean.java b/serverlogic/src/main/java/com/ljsd/jieling/ktbeans/parmsBean/ParamDataBean.java index 338ccd9dc..28419eec6 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/ktbeans/parmsBean/ParamDataBean.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/ktbeans/parmsBean/ParamDataBean.java @@ -1,5 +1,7 @@ package com.ljsd.jieling.ktbeans.parmsBean; +import com.ljsd.jieling.ktbeans.KTRequestBeans.LoginParamType; + /** * 数据参数 */ @@ -82,11 +84,11 @@ public class ParamDataBean { public ParamDataBean(){ this.app_id_s="game_skuld_01"; - this.category_s="event_role"; - this.platform_s="ADR"; - this.region_s="4"; + this.category_s=LoginParamType.DATA_CATEGORY_ROLE; + this.platform_s= LoginParamType.PLATFORM_ANDRIOD; + this.region_s="1"; this.server_s="44"; - this.channel_s="4"; - this.data_unix=1511767867; + this.channel_s=""; + this.data_unix=(int)(System.currentTimeMillis()/1000L); } } From 9e2cf35c4e468231246daaab565ce30541ce08e9 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Fri, 5 Jul 2019 15:48:32 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=94=99=E8=AF=AF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- serverlogic/src/main/java/com/ljsd/GameApplication.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/serverlogic/src/main/java/com/ljsd/GameApplication.java b/serverlogic/src/main/java/com/ljsd/GameApplication.java index bb3098818..1aeeaa67b 100644 --- a/serverlogic/src/main/java/com/ljsd/GameApplication.java +++ b/serverlogic/src/main/java/com/ljsd/GameApplication.java @@ -89,7 +89,7 @@ public class GameApplication { MapLogic.getInstance().init(configurableApplicationContext); SensitivewordFilter.init(); - HttpPool.init(); +// HttpPool.init(); // 加载lua文件 CheckFight.getInstance().init("luafight/BattleMain.lua");