From 16a1f881dd56836c11e9fb5edc91c34e36bce257 Mon Sep 17 00:00:00 2001 From: duhui Date: Fri, 8 Apr 2022 10:45:13 +0800 Subject: [PATCH] =?UTF-8?q?=E7=88=B1=E7=8E=A9=E4=BF=A1=E6=81=AF=E4=B8=8A?= =?UTF-8?q?=E6=8A=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../thrift/idl/InnerInvalidOperException.java | 2 +- .../com/global/thrift/idl/InnerResult.java | 2 +- .../global/thrift/idl/RPCgTGRequestIFace.java | 2 +- .../thrift/idl/InnerInvalidOperException.java | 2 +- .../com/global/thrift/idl/InnerResult.java | 2 +- .../global/thrift/idl/RPCgTGRequestIFace.java | 2 +- .../src/main/java/com/ljsd/CoreService.java | 4 +- .../jieling/handler/GetPlayerInfoHandler.java | 4 + .../ljsd/jieling/handler/map/MapLogic.java | 3 + .../com/ljsd/jieling/kefu/Cmd_support.java | 2 +- .../jieling/logic/AiWanPlayerInfoUpload.java | 89 +++++++++++ .../crossService/CrossServiceLogic.java | 2 +- .../jieling/logic/store/BuyGoodsNewLogic.java | 99 ++++++++----- .../ljsd/jieling/thrift/idl/ArenaOfHero.java | 2 +- .../jieling/thrift/idl/CrossArenaManager.java | 2 +- .../thrift/idl/InvalidOperException.java | 2 +- .../ljsd/jieling/thrift/idl/LifeGridInfo.java | 2 +- .../com/ljsd/jieling/thrift/idl/Pokemon.java | 2 +- .../ljsd/jieling/thrift/idl/PropertyItem.java | 2 +- .../jieling/thrift/idl/PurpleMansionSeal.java | 2 +- .../thrift/idl/RPCMatchRequestIFace.java | 2 +- .../jieling/thrift/idl/RPCRequestIFace.java | 139 ++++++++++++++++-- .../jieling/thrift/idl/RechargeResult.java | 2 +- .../com/ljsd/jieling/thrift/idl/Result.java | 2 +- .../jieling/thrift/idl/SixiangxinfaInfo.java | 2 +- .../thrift/idl/SixiangxinfaPropertyInfo.java | 2 +- .../jieling/thrift/idl/TeamPosHeroInfo.java | 2 +- .../thrift/idl/TransformationCardInfo.java | 2 +- .../jieling/thrift/idl/UserMountInfo.java | 2 +- .../java/com/ljsd/jieling/util/ItemUtil.java | 1 + .../thrift/idl/InnerInvalidOperException.java | 2 +- .../com/world/thrift/idl/InnerResult.java | 2 +- .../world/thrift/idl/RPCgTwRequestIFace.java | 2 +- .../world/thrift/idl/RPCwTgRequestIFace.java | 2 +- serverlogic/src/main/thrift/idl/core.thrift | 2 +- .../thrift/idl/InnerInvalidOperException.java | 2 +- .../com/global/thrift/idl/InnerResult.java | 2 +- .../global/thrift/idl/RPCgTGRequestIFace.java | 2 +- .../ljsd/jieling/thrift/idl/ArenaOfHero.java | 2 +- .../jieling/thrift/idl/CrossArenaManager.java | 2 +- .../thrift/idl/InvalidOperException.java | 2 +- .../ljsd/jieling/thrift/idl/LifeGridInfo.java | 2 +- .../com/ljsd/jieling/thrift/idl/Pokemon.java | 2 +- .../ljsd/jieling/thrift/idl/PropertyItem.java | 2 +- .../jieling/thrift/idl/PurpleMansionSeal.java | 2 +- .../thrift/idl/RPCMatchRequestIFace.java | 2 +- .../jieling/thrift/idl/RPCRequestIFace.java | 139 ++++++++++++++++-- .../jieling/thrift/idl/RechargeResult.java | 2 +- .../com/ljsd/jieling/thrift/idl/Result.java | 2 +- .../jieling/thrift/idl/SixiangxinfaInfo.java | 2 +- .../thrift/idl/SixiangxinfaPropertyInfo.java | 2 +- .../jieling/thrift/idl/TeamPosHeroInfo.java | 2 +- .../thrift/idl/TransformationCardInfo.java | 2 +- .../jieling/thrift/idl/UserMountInfo.java | 2 +- .../thrift/idl/InnerInvalidOperException.java | 2 +- .../com/world/thrift/idl/InnerResult.java | 2 +- .../world/thrift/idl/RPCgTwRequestIFace.java | 2 +- .../world/thrift/idl/RPCwTgRequestIFace.java | 2 +- .../thrift/idl/InnerInvalidOperException.java | 2 +- .../com/world/thrift/idl/InnerResult.java | 2 +- .../world/thrift/idl/RPCgTwRequestIFace.java | 2 +- .../world/thrift/idl/RPCwTgRequestIFace.java | 2 +- 62 files changed, 461 insertions(+), 125 deletions(-) create mode 100644 serverlogic/src/main/java/com/ljsd/jieling/logic/AiWanPlayerInfoUpload.java diff --git a/globalidserver/src/main/java/com/global/thrift/idl/InnerInvalidOperException.java b/globalidserver/src/main/java/com/global/thrift/idl/InnerInvalidOperException.java index 51a8aab8a..20a1e1b0f 100644 --- a/globalidserver/src/main/java/com/global/thrift/idl/InnerInvalidOperException.java +++ b/globalidserver/src/main/java/com/global/thrift/idl/InnerInvalidOperException.java @@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory; /** * Structs can also be exceptions, if they are nasty. */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-1-15") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-7") public class InnerInvalidOperException extends TException implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InnerInvalidOperException"); diff --git a/globalidserver/src/main/java/com/global/thrift/idl/InnerResult.java b/globalidserver/src/main/java/com/global/thrift/idl/InnerResult.java index cc9d4efa1..b4cb48783 100644 --- a/globalidserver/src/main/java/com/global/thrift/idl/InnerResult.java +++ b/globalidserver/src/main/java/com/global/thrift/idl/InnerResult.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-1-15") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-7") public class InnerResult implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InnerResult"); diff --git a/globalidserver/src/main/java/com/global/thrift/idl/RPCgTGRequestIFace.java b/globalidserver/src/main/java/com/global/thrift/idl/RPCgTGRequestIFace.java index 7d315ccb8..821503543 100644 --- a/globalidserver/src/main/java/com/global/thrift/idl/RPCgTGRequestIFace.java +++ b/globalidserver/src/main/java/com/global/thrift/idl/RPCgTGRequestIFace.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-1-15") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-7") public class RPCgTGRequestIFace { public interface Iface { diff --git a/serverlogic/src/main/java/com/global/thrift/idl/InnerInvalidOperException.java b/serverlogic/src/main/java/com/global/thrift/idl/InnerInvalidOperException.java index 51a8aab8a..20a1e1b0f 100644 --- a/serverlogic/src/main/java/com/global/thrift/idl/InnerInvalidOperException.java +++ b/serverlogic/src/main/java/com/global/thrift/idl/InnerInvalidOperException.java @@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory; /** * Structs can also be exceptions, if they are nasty. */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-1-15") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-7") public class InnerInvalidOperException extends TException implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InnerInvalidOperException"); diff --git a/serverlogic/src/main/java/com/global/thrift/idl/InnerResult.java b/serverlogic/src/main/java/com/global/thrift/idl/InnerResult.java index cc9d4efa1..b4cb48783 100644 --- a/serverlogic/src/main/java/com/global/thrift/idl/InnerResult.java +++ b/serverlogic/src/main/java/com/global/thrift/idl/InnerResult.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-1-15") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-7") public class InnerResult implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InnerResult"); diff --git a/serverlogic/src/main/java/com/global/thrift/idl/RPCgTGRequestIFace.java b/serverlogic/src/main/java/com/global/thrift/idl/RPCgTGRequestIFace.java index 7d315ccb8..821503543 100644 --- a/serverlogic/src/main/java/com/global/thrift/idl/RPCgTGRequestIFace.java +++ b/serverlogic/src/main/java/com/global/thrift/idl/RPCgTGRequestIFace.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-1-15") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-7") public class RPCgTGRequestIFace { public interface Iface { diff --git a/serverlogic/src/main/java/com/ljsd/CoreService.java b/serverlogic/src/main/java/com/ljsd/CoreService.java index cf37f0093..c9aaed01d 100644 --- a/serverlogic/src/main/java/com/ljsd/CoreService.java +++ b/serverlogic/src/main/java/com/ljsd/CoreService.java @@ -38,10 +38,10 @@ public class CoreService implements RPCRequestIFace.Iface { private static final Logger LOGGER = LoggerFactory.getLogger(CoreService.class); @Override - public Result deliveryRecharge(int uid, String goodsId, String openId, String orderId, long orderTime, int amount) { + public Result deliveryRecharge(int uid, String goodsId, String openId, String orderId, long orderTime, int amount, String ext) { try { LOGGER.info("deliveryRecharge start",uid ); - return BuyGoodsNewLogic.sendGoods(uid, goodsId, openId, orderId, orderTime, amount); + return BuyGoodsNewLogic.sendGoods(uid, goodsId, openId, orderId, orderTime, amount, ext); } catch (Exception e) { User user = UserManager.getUserInMem(uid); Result result = new Result(); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java index b90601eec..99d639cb6 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java @@ -10,6 +10,7 @@ import com.ljsd.jieling.handler.map.MapManager; import com.ljsd.jieling.jbean.ActivityMission; import com.ljsd.jieling.ktbeans.ReportEventEnum; import com.ljsd.jieling.ktbeans.ReportUtil; +import com.ljsd.jieling.logic.AiWanPlayerInfoUpload; import com.ljsd.jieling.logic.GlobalDataManaager; import com.ljsd.jieling.logic.GlobleSystemLogic; import com.ljsd.jieling.logic.activity.ActivityLogic; @@ -344,6 +345,9 @@ public class GetPlayerInfoHandler extends BaseHandler{ MessageUtil.sendIndicationMessage(iSession, 1, MessageTypeProto.MessageType.WorldLevelIndication_VALUE, PlayerInfoProto.WorldLevelIndication.newBuilder().setWorldLeve(GlobleSystemLogic.getGlobalWorldLevelCache()).build(), true); MessageUtil.sendMessage(iSession, 1, MessageTypeProto.MessageType.GET_PLAYERINFO_RESPONSE_VALUE, getPlayerInfoResponse, true); + // 爱玩信息上报 + AiWanPlayerInfoUpload.getInstance().upload(user,AiWanPlayerInfoUpload.entersvr); + if(playerInfoManager.getIsdayFirst()==0){ playerInfoManager.setIsdayFirst(1); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java index b200cbc09..78c9f708d 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java @@ -25,6 +25,7 @@ import com.ljsd.jieling.ktbeans.KtEventUtils; import com.ljsd.jieling.ktbeans.ReportEventEnum; import com.ljsd.jieling.ktbeans.ReportUtil; import com.ljsd.jieling.ktbeans.parmsBean.ParamEventBean; +import com.ljsd.jieling.logic.AiWanPlayerInfoUpload; import com.ljsd.jieling.logic.GlobalDataManaager; import com.ljsd.jieling.logic.OnlineUserManager; import com.ljsd.jieling.logic.activity.ActivityLogic; @@ -2293,6 +2294,8 @@ public class MapLogic { Poster.getPoster().dispatchEvent(new FightMainEvent(user.getId(), fightId)); Poster.getPoster().dispatchEvent(new NewWelfareEvent(user, NewWelfareTypeEnum.LEVEL_FIGHT.getType(), fightId)); user.getMainLevelManager().updateFight(updateFightId, state); + // 爱玩信息上报 + AiWanPlayerInfoUpload.getInstance().upload(user,AiWanPlayerInfoUpload.levelup); BuyGoodsNewLogic.openPush(session, user, PushRechargeType.main_line.getType(), fightId, 0); if (state == -1) { //删除为0的 diff --git a/serverlogic/src/main/java/com/ljsd/jieling/kefu/Cmd_support.java b/serverlogic/src/main/java/com/ljsd/jieling/kefu/Cmd_support.java index 05c18d5a8..bd0b3db6f 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/kefu/Cmd_support.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/kefu/Cmd_support.java @@ -26,7 +26,7 @@ public class Cmd_support extends GmRoleAbstract { String[] item = reward.split("#"); for (int i = 0; i < Integer.parseInt(item[1]); i++) { // 发送充值礼包 - BuyGoodsNewLogic.sendGoods(user.getId(), item[0], user.getPlayerInfoManager().getOpenId(), orderId, TimeUtils.now(), price); + BuyGoodsNewLogic.sendGoods(user.getId(), item[0], user.getPlayerInfoManager().getOpenId(), orderId, TimeUtils.now(), price, ""); } } return true; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/AiWanPlayerInfoUpload.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/AiWanPlayerInfoUpload.java new file mode 100644 index 000000000..3dc68ef53 --- /dev/null +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/AiWanPlayerInfoUpload.java @@ -0,0 +1,89 @@ +package com.ljsd.jieling.logic; + +import com.ljsd.GameApplication; +import com.ljsd.jieling.config.reportData.DataMessageUtils; +import com.ljsd.jieling.logic.dao.PlayerManager; +import com.ljsd.jieling.logic.dao.root.User; +import com.ljsd.jieling.util.http.HttpPool; +import org.apache.commons.codec.digest.DigestUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import util.TimeUtils; + +import java.util.Map; +import java.util.SortedMap; +import java.util.TreeMap; + +/** + * 爱玩玩家信息上报 + */ +public class AiWanPlayerInfoUpload { + private static final Logger LOGGER = LoggerFactory.getLogger(AiWanPlayerInfoUpload.class); + + private AiWanPlayerInfoUpload(){} + + public static class Instance { + public final static AiWanPlayerInfoUpload instance = new AiWanPlayerInfoUpload(); + } + + public static AiWanPlayerInfoUpload getInstance() { + return AiWanPlayerInfoUpload.Instance.instance; + } + + /** + * 上报类型 + */ + public static final String entersvr = "entersvr"; + public static final String levelup = "levelup"; + public static final String custom = "custom"; + + public static final String app_id = "lbqitk9b39vk9ee5"; + public static final String app_key = "FKzLkGPIyMwYjXhRYfMWBsqikOfSPLkX"; + + public static final String url = "https://cpl-api.jxywl.cn/game/userdata/v2"; + + /** + * 玩家信息上报 + * @param user + * @param type + */ + public void upload(User user, String type){ + // 只有爱玩的服务器需要上报 + if (!GameApplication.serverProperties.getAppId().equals(app_id)){ + return; + } + PlayerManager playerInfoManager = user.getPlayerInfoManager(); + int nowInt = TimeUtils.nowInt(); + SortedMap map = new TreeMap<>(); + map.put("eventtype",type); + map.put("appid",app_id); + map.put("serverid",String.valueOf(GameApplication.serverId)); + map.put("openid", playerInfoManager.getOpenId()); + map.put("roleid",String.valueOf(user.getId())); + map.put("nickname",playerInfoManager.getNickName()); + map.put("regtime",String.valueOf(Long.valueOf(playerInfoManager.getCreateTime())/1000)); + map.put("posttime",String.valueOf(nowInt)); + map.put("level",String.valueOf(user.getMainLevelManager().getFightId()));//关卡 + map.put("ext",""); + String sign = getSign(map); + map.put("sign",sign); + String result = HttpPool.sendPost2(url, DataMessageUtils.gson.toJson(map)); + LOGGER.info("爱玩玩家信息上报 uid={}, 返回结果={}, 参数={}", user.getId(), result, map); + } + + private static String getSign(Map map){ + if (map == null || map.isEmpty()) { + return null; + } + StringBuilder builder = new StringBuilder(); + for (Map.Entry entry : map.entrySet()) { + builder.append(entry.getKey()).append("=").append(entry.getValue()).append("&"); + } + String substring = builder.substring(0, builder.length() - 1); + LOGGER.info("AiWan参数拼装sign(未加密):" + substring + app_key); + String md5Hex = DigestUtils.md5Hex(substring + app_key); + LOGGER.info("AiWan参数拼装sign(加密后):" + md5Hex); + return md5Hex; + } + +} diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/crossService/CrossServiceLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/crossService/CrossServiceLogic.java index 1b65506ec..435bc209d 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/crossService/CrossServiceLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/crossService/CrossServiceLogic.java @@ -35,7 +35,7 @@ import java.util.concurrent.ConcurrentHashMap; * @Version 1.0 */ public class CrossServiceLogic { - private static final Logger LOGGER = LoggerFactory.getLogger(ArenaLogic.class); + private static final Logger LOGGER = LoggerFactory.getLogger(CrossServiceLogic.class); private CrossServiceLogic(){} /** diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java index 74640cc50..0b5035570 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java @@ -146,14 +146,26 @@ public class BuyGoodsNewLogic { price= (int)sRechargeCommodityConfig.getPrice() *100; } MessageUtil.sendMessage(session,1, MessageTypeProto.MessageType.TEST_BUY_GIGT_GOODS_RESPONSE_VALUE,null,true); - sendGoods(uid, goodsId, openId, orderId,System.currentTimeMillis(), price); + sendGoods(uid, goodsId, openId, orderId,System.currentTimeMillis(), price, ""); // List itemList = new ArrayList<>(); // for(int[] item:sRechargeCommodityConfig.getBaseReward()){ // itemList.add(item[0]); // } } - public static Result sendGoods(int uid, String sdkGoodsId, String openId, String orderId, long orderTime, int amount) throws Exception { + /** + * 礼包发送接口 + * @param uid + * @param sdkGoodsId + * @param openId + * @param orderId + * @param orderTime + * @param amount + * @param ext 扩展参数,用作部分渠道上传信息 + * @return + * @throws Exception + */ + public static Result sendGoods(int uid, String sdkGoodsId, String openId, String orderId, long orderTime, int amount, String ext) throws Exception { Result resultRes = new Result(); ISession session = OnlineUserManager.getSessionByUid(uid); LOGGER.info("sendGoods to uid={},the goods={},openID={},orderId={},orderTime={},amount={}",uid,sdkGoodsId,openId,orderId,orderTime,amount); @@ -251,50 +263,59 @@ public class BuyGoodsNewLogic { // 更新入库 MongoUtil.getLjsdMongoTemplate().lastUpdate(); // 扶持订单不需要上报 - if(price>0 && !orderId.equals("support-order")){ + if(price>0 && !orderId.equals("support-order")) { + MessageUtil.sendIndicationMessage(session, 1, MessageTypeProto.MessageType.RECHARGE_SUCCESS_INDICATION_VALUE, + PlayerInfoProto.RechargeSuccessIndication.newBuilder().setOrderId(orderId).build(), true); // 以下为充值上报 Map mapReward = ItemUtil.arrayToMap(dropByBag); - MessageUtil.sendIndicationMessage(session,1, - MessageTypeProto.MessageType.RECHARGE_SUCCESS_INDICATION_VALUE, - PlayerInfoProto.RechargeSuccessIndication.newBuilder().setOrderId(orderId).build(),true); - ReportUtil.onReportEvent(user, ReportEventEnum.ORDER_COMPLETE.getType(),orderId,price, - user.getPlayerInfoManager().getBundle_id(),user.getPlayerInfoManager().getChannel_id(), - String.valueOf(GameApplication.serverId),String.valueOf(goodsId),config.getName(), - new ArrayList<>(mapReward.keySet()),new ArrayList<>(mapReward.values()),new Date(), - user.getPlayerInfoManager().getLastDeviceId()==null? - "DEFAULT_DEVICE":user.getPlayerInfoManager().getLastDeviceId()); - onChargeSuccess(user,price,0,orderId,cfgType);//充值成功上报 + ReportUtil.onReportEvent(user, ReportEventEnum.ORDER_COMPLETE.getType(), orderId, price, + user.getPlayerInfoManager().getBundle_id(), + user.getPlayerInfoManager().getChannel_id(), + String.valueOf(GameApplication.serverId), + String.valueOf(goodsId), config.getName(), + new ArrayList<>(mapReward.keySet()), + new ArrayList<>(mapReward.values()), new Date(), + user.getPlayerInfoManager().getLastDeviceId() == null ? "DEFAULT_DEVICE" : user.getPlayerInfoManager().getLastDeviceId()); + onChargeSuccess(user, price, 0, orderId, cfgType);//充值成功上报 - // 如果是开天,增加REST付费上报 - if ("bgsdh87l31909mvu".equals(GameApplication.serverProperties.getAppId())) { - JSONObject jsonObject = new JSONObject(); - jsonObject.put("appid", "e7ba14d6442b0ec225289bc846826092"); - jsonObject.put("who", user.getPlayerInfoManager().getOpenId()); - ReportBaseBean reportBaseBean = ReportUtil.baseBeanMap.get(uid); - String deviceid = (reportBaseBean != null && reportBaseBean.getIdfa_sOr_imei_s() != null && !reportBaseBean.getIdfa_sOr_imei_s().isEmpty()) ? - reportBaseBean.getIdfa_sOr_imei_s() : "DEFAULT_deviceid"; - JSONObject jsonObject2 = new JSONObject(); - jsonObject2.put("_deviceid", deviceid); - jsonObject2.put("_transactionid", orderId); - jsonObject2.put("_paymenttype", "alipay"); - jsonObject2.put("_currencytype", "CNY"); - jsonObject2.put("_currencyamount", Double.toString(price)); - jsonObject2.put("_ip", reportBaseBean != null ? reportBaseBean.getIp() : ""); - jsonObject2.put("_tz", "+8"); - jsonObject2.put("_ryos", "Android"); - jsonObject2.put("_imei", deviceid); - jsonObject2.put("_androidid", reportBaseBean != null ? reportBaseBean.get_androidid() : "DEFAULT_androidid"); - jsonObject2.put("_oaid", deviceid); - jsonObject2.put("_mac", reportBaseBean != null ? reportBaseBean.getNetwork_s() : ""); - jsonObject.put("context", jsonObject2); - String result = HttpPool.sendPost2(DataMessageUtils.restURL, DataMessageUtils.gson.toJson(jsonObject)); - LOGGER.info("onChargeSuccess uid={} REST付费上报={} 参数={}", user.getId(), result, jsonObject); - } + kaikianUploadPayInfo(user,orderId,price); } - return resultRes; } + /** + * 如果是开天,增加REST付费上报 + * @param user + * @param orderId + * @param price + */ + private static void kaikianUploadPayInfo(User user,String orderId,double price){ + if ("bgsdh87l31909mvu".equals(GameApplication.serverProperties.getAppId())) { + JSONObject jsonObject = new JSONObject(); + jsonObject.put("appid", "e7ba14d6442b0ec225289bc846826092"); + jsonObject.put("who", user.getPlayerInfoManager().getOpenId()); + ReportBaseBean reportBaseBean = ReportUtil.baseBeanMap.get(user.getId()); + String deviceid = (reportBaseBean != null && reportBaseBean.getIdfa_sOr_imei_s() != null && !reportBaseBean.getIdfa_sOr_imei_s().isEmpty()) ? + reportBaseBean.getIdfa_sOr_imei_s() : "DEFAULT_deviceid"; + JSONObject jsonObject2 = new JSONObject(); + jsonObject2.put("_deviceid", deviceid); + jsonObject2.put("_transactionid", orderId); + jsonObject2.put("_paymenttype", "alipay"); + jsonObject2.put("_currencytype", "CNY"); + jsonObject2.put("_currencyamount", Double.toString(price)); + jsonObject2.put("_ip", reportBaseBean != null ? reportBaseBean.getIp() : ""); + jsonObject2.put("_tz", "+8"); + jsonObject2.put("_ryos", "Android"); + jsonObject2.put("_imei", deviceid); + jsonObject2.put("_androidid", reportBaseBean != null ? reportBaseBean.get_androidid() : "DEFAULT_androidid"); + jsonObject2.put("_oaid", deviceid); + jsonObject2.put("_mac", reportBaseBean != null ? reportBaseBean.getNetwork_s() : ""); + jsonObject.put("context", jsonObject2); + String result = HttpPool.sendPost2(DataMessageUtils.restURL, DataMessageUtils.gson.toJson(jsonObject)); + LOGGER.info("onChargeSuccess uid={} REST付费上报={} 参数={}", user.getId(), result, jsonObject); + } + } + /** * 通知前端充值成功 */ diff --git a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/ArenaOfHero.java b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/ArenaOfHero.java index 9dc3ac467..1d1fed778 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/ArenaOfHero.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/ArenaOfHero.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-3-18") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-7") public class ArenaOfHero implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ArenaOfHero"); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/CrossArenaManager.java b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/CrossArenaManager.java index 558676b9a..1de9a133a 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/CrossArenaManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/CrossArenaManager.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-1-15") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-7") public class CrossArenaManager implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CrossArenaManager"); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/InvalidOperException.java b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/InvalidOperException.java index 741061aa3..dd5b36b2d 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/InvalidOperException.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/InvalidOperException.java @@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory; /** * Structs can also be exceptions, if they are nasty. */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-1-15") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-7") public class InvalidOperException extends TException implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InvalidOperException"); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/LifeGridInfo.java b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/LifeGridInfo.java index 2dec5086e..23d559ec3 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/LifeGridInfo.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/LifeGridInfo.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-1-15") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-7") public class LifeGridInfo implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("LifeGridInfo"); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/Pokemon.java b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/Pokemon.java index d4cb247b9..fe1f39edc 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/Pokemon.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/Pokemon.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-1-15") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-7") public class Pokemon implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Pokemon"); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/PropertyItem.java b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/PropertyItem.java index 0b5426d16..b7328d5d5 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/PropertyItem.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/PropertyItem.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-1-15") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-7") public class PropertyItem implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("PropertyItem"); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/PurpleMansionSeal.java b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/PurpleMansionSeal.java index 00d8a55e0..874348bca 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/PurpleMansionSeal.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/PurpleMansionSeal.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-1-15") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-7") public class PurpleMansionSeal implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("PurpleMansionSeal"); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/RPCMatchRequestIFace.java b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/RPCMatchRequestIFace.java index 971ba2b77..28c01db60 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/RPCMatchRequestIFace.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/RPCMatchRequestIFace.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-1-15") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-7") public class RPCMatchRequestIFace { public interface Iface { diff --git a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/RPCRequestIFace.java b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/RPCRequestIFace.java index 898cacf97..d28923f26 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/RPCRequestIFace.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/RPCRequestIFace.java @@ -34,12 +34,12 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-1-15") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-7") public class RPCRequestIFace { public interface Iface { - public Result deliveryRecharge(int uid, String goodsId, String openId, String orderId, long orderTime, int amount) throws InvalidOperException, org.apache.thrift.TException; + public Result deliveryRecharge(int uid, String goodsId, String openId, String orderId, long orderTime, int amount, String ext) throws InvalidOperException, org.apache.thrift.TException; public RechargeResult getRecharge(int uid) throws org.apache.thrift.TException; @@ -59,7 +59,7 @@ public class RPCRequestIFace { public interface AsyncIface { - public void deliveryRecharge(int uid, String goodsId, String openId, String orderId, long orderTime, int amount, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void deliveryRecharge(int uid, String goodsId, String openId, String orderId, long orderTime, int amount, String ext, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; public void getRecharge(int uid, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; @@ -97,13 +97,13 @@ public class RPCRequestIFace { super(iprot, oprot); } - public Result deliveryRecharge(int uid, String goodsId, String openId, String orderId, long orderTime, int amount) throws InvalidOperException, org.apache.thrift.TException + public Result deliveryRecharge(int uid, String goodsId, String openId, String orderId, long orderTime, int amount, String ext) throws InvalidOperException, org.apache.thrift.TException { - send_deliveryRecharge(uid, goodsId, openId, orderId, orderTime, amount); + send_deliveryRecharge(uid, goodsId, openId, orderId, orderTime, amount, ext); return recv_deliveryRecharge(); } - public void send_deliveryRecharge(int uid, String goodsId, String openId, String orderId, long orderTime, int amount) throws org.apache.thrift.TException + public void send_deliveryRecharge(int uid, String goodsId, String openId, String orderId, long orderTime, int amount, String ext) throws org.apache.thrift.TException { deliveryRecharge_args args = new deliveryRecharge_args(); args.setUid(uid); @@ -112,6 +112,7 @@ public class RPCRequestIFace { args.setOrderId(orderId); args.setOrderTime(orderTime); args.setAmount(amount); + args.setExt(ext); sendBase("deliveryRecharge", args); } @@ -308,9 +309,9 @@ public class RPCRequestIFace { super(protocolFactory, clientManager, transport); } - public void deliveryRecharge(int uid, String goodsId, String openId, String orderId, long orderTime, int amount, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void deliveryRecharge(int uid, String goodsId, String openId, String orderId, long orderTime, int amount, String ext, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - deliveryRecharge_call method_call = new deliveryRecharge_call(uid, goodsId, openId, orderId, orderTime, amount, resultHandler, this, ___protocolFactory, ___transport); + deliveryRecharge_call method_call = new deliveryRecharge_call(uid, goodsId, openId, orderId, orderTime, amount, ext, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } @@ -322,7 +323,8 @@ public class RPCRequestIFace { private String orderId; private long orderTime; private int amount; - public deliveryRecharge_call(int uid, String goodsId, String openId, String orderId, long orderTime, int amount, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + private String ext; + public deliveryRecharge_call(int uid, String goodsId, String openId, String orderId, long orderTime, int amount, String ext, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); this.uid = uid; this.goodsId = goodsId; @@ -330,6 +332,7 @@ public class RPCRequestIFace { this.orderId = orderId; this.orderTime = orderTime; this.amount = amount; + this.ext = ext; } public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { @@ -341,6 +344,7 @@ public class RPCRequestIFace { args.setOrderId(orderId); args.setOrderTime(orderTime); args.setAmount(amount); + args.setExt(ext); args.write(prot); prot.writeMessageEnd(); } @@ -631,7 +635,7 @@ public class RPCRequestIFace { public deliveryRecharge_result getResult(I iface, deliveryRecharge_args args) throws org.apache.thrift.TException { deliveryRecharge_result result = new deliveryRecharge_result(); try { - result.success = iface.deliveryRecharge(args.uid, args.goodsId, args.openId, args.orderId, args.orderTime, args.amount); + result.success = iface.deliveryRecharge(args.uid, args.goodsId, args.openId, args.orderId, args.orderTime, args.amount, args.ext); } catch (InvalidOperException ouch) { result.ouch = ouch; } @@ -858,7 +862,7 @@ public class RPCRequestIFace { } public void start(I iface, deliveryRecharge_args args, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws TException { - iface.deliveryRecharge(args.uid, args.goodsId, args.openId, args.orderId, args.orderTime, args.amount,resultHandler); + iface.deliveryRecharge(args.uid, args.goodsId, args.openId, args.orderId, args.orderTime, args.amount, args.ext,resultHandler); } } @@ -1231,6 +1235,7 @@ public class RPCRequestIFace { private static final org.apache.thrift.protocol.TField ORDER_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("orderId", org.apache.thrift.protocol.TType.STRING, (short)4); private static final org.apache.thrift.protocol.TField ORDER_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("orderTime", org.apache.thrift.protocol.TType.I64, (short)5); private static final org.apache.thrift.protocol.TField AMOUNT_FIELD_DESC = new org.apache.thrift.protocol.TField("amount", org.apache.thrift.protocol.TType.I32, (short)6); + private static final org.apache.thrift.protocol.TField EXT_FIELD_DESC = new org.apache.thrift.protocol.TField("ext", org.apache.thrift.protocol.TType.STRING, (short)7); private static final Map, SchemeFactory> schemes = new HashMap, SchemeFactory>(); static { @@ -1244,6 +1249,7 @@ public class RPCRequestIFace { public String orderId; // required public long orderTime; // required public int amount; // required + public String ext; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -1252,7 +1258,8 @@ public class RPCRequestIFace { OPEN_ID((short)3, "openId"), ORDER_ID((short)4, "orderId"), ORDER_TIME((short)5, "orderTime"), - AMOUNT((short)6, "amount"); + AMOUNT((short)6, "amount"), + EXT((short)7, "ext"); private static final Map byName = new HashMap(); @@ -1279,6 +1286,8 @@ public class RPCRequestIFace { return ORDER_TIME; case 6: // AMOUNT return AMOUNT; + case 7: // EXT + return EXT; default: return null; } @@ -1338,6 +1347,8 @@ public class RPCRequestIFace { new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))); tmpMap.put(_Fields.AMOUNT, new org.apache.thrift.meta_data.FieldMetaData("amount", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); + tmpMap.put(_Fields.EXT, new org.apache.thrift.meta_data.FieldMetaData("ext", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(deliveryRecharge_args.class, metaDataMap); } @@ -1351,7 +1362,8 @@ public class RPCRequestIFace { String openId, String orderId, long orderTime, - int amount) + int amount, + String ext) { this(); this.uid = uid; @@ -1363,6 +1375,7 @@ public class RPCRequestIFace { setOrderTimeIsSet(true); this.amount = amount; setAmountIsSet(true); + this.ext = ext; } /** @@ -1382,6 +1395,9 @@ public class RPCRequestIFace { } this.orderTime = other.orderTime; this.amount = other.amount; + if (other.isSetExt()) { + this.ext = other.ext; + } } public deliveryRecharge_args deepCopy() { @@ -1399,6 +1415,7 @@ public class RPCRequestIFace { this.orderTime = 0; setAmountIsSet(false); this.amount = 0; + this.ext = null; } public int getUid() { @@ -1542,6 +1559,30 @@ public class RPCRequestIFace { __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __AMOUNT_ISSET_ID, value); } + public String getExt() { + return this.ext; + } + + public deliveryRecharge_args setExt(String ext) { + this.ext = ext; + return this; + } + + public void unsetExt() { + this.ext = null; + } + + /** Returns true if field ext is set (has been assigned a value) and false otherwise */ + public boolean isSetExt() { + return this.ext != null; + } + + public void setExtIsSet(boolean value) { + if (!value) { + this.ext = null; + } + } + public void setFieldValue(_Fields field, Object value) { switch (field) { case UID: @@ -1592,6 +1633,14 @@ public class RPCRequestIFace { } break; + case EXT: + if (value == null) { + unsetExt(); + } else { + setExt((String)value); + } + break; + } } @@ -1615,6 +1664,9 @@ public class RPCRequestIFace { case AMOUNT: return Integer.valueOf(getAmount()); + case EXT: + return getExt(); + } throw new IllegalStateException(); } @@ -1638,6 +1690,8 @@ public class RPCRequestIFace { return isSetOrderTime(); case AMOUNT: return isSetAmount(); + case EXT: + return isSetExt(); } throw new IllegalStateException(); } @@ -1709,6 +1763,15 @@ public class RPCRequestIFace { return false; } + boolean this_present_ext = true && this.isSetExt(); + boolean that_present_ext = true && that.isSetExt(); + if (this_present_ext || that_present_ext) { + if (!(this_present_ext && that_present_ext)) + return false; + if (!this.ext.equals(that.ext)) + return false; + } + return true; } @@ -1746,6 +1809,11 @@ public class RPCRequestIFace { if (present_amount) list.add(amount); + boolean present_ext = true && (isSetExt()); + list.add(present_ext); + if (present_ext) + list.add(ext); + return list.hashCode(); } @@ -1817,6 +1885,16 @@ public class RPCRequestIFace { return lastComparison; } } + lastComparison = Boolean.valueOf(isSetExt()).compareTo(other.isSetExt()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetExt()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ext, other.ext); + if (lastComparison != 0) { + return lastComparison; + } + } return 0; } @@ -1872,6 +1950,14 @@ public class RPCRequestIFace { sb.append("amount:"); sb.append(this.amount); first = false; + if (!first) sb.append(", "); + sb.append("ext:"); + if (this.ext == null) { + sb.append("null"); + } else { + sb.append(this.ext); + } + first = false; sb.append(")"); return sb.toString(); } @@ -1965,6 +2051,14 @@ public class RPCRequestIFace { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; + case 7: // EXT + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.ext = iprot.readString(); + struct.setExtIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -2004,6 +2098,11 @@ public class RPCRequestIFace { oprot.writeFieldBegin(AMOUNT_FIELD_DESC); oprot.writeI32(struct.amount); oprot.writeFieldEnd(); + if (struct.ext != null) { + oprot.writeFieldBegin(EXT_FIELD_DESC); + oprot.writeString(struct.ext); + oprot.writeFieldEnd(); + } oprot.writeFieldStop(); oprot.writeStructEnd(); } @@ -2040,7 +2139,10 @@ public class RPCRequestIFace { if (struct.isSetAmount()) { optionals.set(5); } - oprot.writeBitSet(optionals, 6); + if (struct.isSetExt()) { + optionals.set(6); + } + oprot.writeBitSet(optionals, 7); if (struct.isSetUid()) { oprot.writeI32(struct.uid); } @@ -2059,12 +2161,15 @@ public class RPCRequestIFace { if (struct.isSetAmount()) { oprot.writeI32(struct.amount); } + if (struct.isSetExt()) { + oprot.writeString(struct.ext); + } } @Override public void read(org.apache.thrift.protocol.TProtocol prot, deliveryRecharge_args struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(6); + BitSet incoming = iprot.readBitSet(7); if (incoming.get(0)) { struct.uid = iprot.readI32(); struct.setUidIsSet(true); @@ -2089,6 +2194,10 @@ public class RPCRequestIFace { struct.amount = iprot.readI32(); struct.setAmountIsSet(true); } + if (incoming.get(6)) { + struct.ext = iprot.readString(); + struct.setExtIsSet(true); + } } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/RechargeResult.java b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/RechargeResult.java index 05fa2db14..06cd46bb6 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/RechargeResult.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/RechargeResult.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-1-15") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-7") public class RechargeResult implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("RechargeResult"); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/Result.java b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/Result.java index 9e9bb761d..b9f095976 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/Result.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/Result.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-1-15") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-7") public class Result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Result"); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/SixiangxinfaInfo.java b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/SixiangxinfaInfo.java index f7a4756cd..22083d7a6 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/SixiangxinfaInfo.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/SixiangxinfaInfo.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-1-15") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-7") public class SixiangxinfaInfo implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SixiangxinfaInfo"); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/SixiangxinfaPropertyInfo.java b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/SixiangxinfaPropertyInfo.java index b5880ce07..b4b6a4704 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/SixiangxinfaPropertyInfo.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/SixiangxinfaPropertyInfo.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-1-15") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-7") public class SixiangxinfaPropertyInfo implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SixiangxinfaPropertyInfo"); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/TeamPosHeroInfo.java b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/TeamPosHeroInfo.java index 027a17238..960531639 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/TeamPosHeroInfo.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/TeamPosHeroInfo.java @@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory; /** * ArenaOfHeroManager 结构体 */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-1-15") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-7") public class TeamPosHeroInfo implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TeamPosHeroInfo"); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/TransformationCardInfo.java b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/TransformationCardInfo.java index 8b548d7e1..0f54b06ee 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/TransformationCardInfo.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/TransformationCardInfo.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-1-15") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-7") public class TransformationCardInfo implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TransformationCardInfo"); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/UserMountInfo.java b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/UserMountInfo.java index 0c67bf5b2..1e7b5df1d 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/UserMountInfo.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/UserMountInfo.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-1-15") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-7") public class UserMountInfo implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("UserMountInfo"); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java index 33451ebda..58d9981b8 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java @@ -17,6 +17,7 @@ import com.ljsd.jieling.ktbeans.KtEventUtils; import com.ljsd.jieling.ktbeans.ReportEventEnum; import com.ljsd.jieling.ktbeans.ReportUtil; import com.ljsd.jieling.ktbeans.parmsBean.ParamEventBean; +import com.ljsd.jieling.logic.AiWanPlayerInfoUpload; import com.ljsd.jieling.logic.OnlineUserManager; import com.ljsd.jieling.logic.activity.ActivityType; import com.ljsd.jieling.logic.activity.event.*; diff --git a/serverlogic/src/main/java/com/world/thrift/idl/InnerInvalidOperException.java b/serverlogic/src/main/java/com/world/thrift/idl/InnerInvalidOperException.java index cd30cea7f..b12fad212 100644 --- a/serverlogic/src/main/java/com/world/thrift/idl/InnerInvalidOperException.java +++ b/serverlogic/src/main/java/com/world/thrift/idl/InnerInvalidOperException.java @@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory; /** * Structs can also be exceptions, if they are nasty. */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-1-15") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-7") public class InnerInvalidOperException extends TException implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InnerInvalidOperException"); diff --git a/serverlogic/src/main/java/com/world/thrift/idl/InnerResult.java b/serverlogic/src/main/java/com/world/thrift/idl/InnerResult.java index f32b7f18f..ee2d27f38 100644 --- a/serverlogic/src/main/java/com/world/thrift/idl/InnerResult.java +++ b/serverlogic/src/main/java/com/world/thrift/idl/InnerResult.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-1-15") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-7") public class InnerResult implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InnerResult"); diff --git a/serverlogic/src/main/java/com/world/thrift/idl/RPCgTwRequestIFace.java b/serverlogic/src/main/java/com/world/thrift/idl/RPCgTwRequestIFace.java index 89fcdcf50..94edc9306 100644 --- a/serverlogic/src/main/java/com/world/thrift/idl/RPCgTwRequestIFace.java +++ b/serverlogic/src/main/java/com/world/thrift/idl/RPCgTwRequestIFace.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-1-15") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-7") public class RPCgTwRequestIFace { public interface Iface { diff --git a/serverlogic/src/main/java/com/world/thrift/idl/RPCwTgRequestIFace.java b/serverlogic/src/main/java/com/world/thrift/idl/RPCwTgRequestIFace.java index 6609cbf9a..d6f5a86d2 100644 --- a/serverlogic/src/main/java/com/world/thrift/idl/RPCwTgRequestIFace.java +++ b/serverlogic/src/main/java/com/world/thrift/idl/RPCwTgRequestIFace.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-1-15") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-7") public class RPCwTgRequestIFace { public interface Iface { diff --git a/serverlogic/src/main/thrift/idl/core.thrift b/serverlogic/src/main/thrift/idl/core.thrift index 652bf9569..2eb0eaf62 100644 --- a/serverlogic/src/main/thrift/idl/core.thrift +++ b/serverlogic/src/main/thrift/idl/core.thrift @@ -135,7 +135,7 @@ struct CrossArenaManager{ } service RPCRequestIFace{ - Result deliveryRecharge(1:i32 uid, 2:string goodsId,3: string openId,4: string orderId,5: i64 orderTime, 6:i32 amount) throws (1:InvalidOperException ouch); + Result deliveryRecharge(1:i32 uid, 2:string goodsId,3: string openId,4: string orderId,5: i64 orderTime, 6:i32 amount, 7:string ext) throws (1:InvalidOperException ouch); RechargeResult getRecharge(1:i32 uid); void mathcRoomAdressInfo(1:i32 uid,2:i32 type,3:string address); CrossArenaManager getHeroManagerInfo(1:i32 uid); diff --git a/serverlogic/src/main/thrift/idl/gen-java/com/global/thrift/idl/InnerInvalidOperException.java b/serverlogic/src/main/thrift/idl/gen-java/com/global/thrift/idl/InnerInvalidOperException.java index 51a8aab8a..20a1e1b0f 100644 --- a/serverlogic/src/main/thrift/idl/gen-java/com/global/thrift/idl/InnerInvalidOperException.java +++ b/serverlogic/src/main/thrift/idl/gen-java/com/global/thrift/idl/InnerInvalidOperException.java @@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory; /** * Structs can also be exceptions, if they are nasty. */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-1-15") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-7") public class InnerInvalidOperException extends TException implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InnerInvalidOperException"); diff --git a/serverlogic/src/main/thrift/idl/gen-java/com/global/thrift/idl/InnerResult.java b/serverlogic/src/main/thrift/idl/gen-java/com/global/thrift/idl/InnerResult.java index cc9d4efa1..b4cb48783 100644 --- a/serverlogic/src/main/thrift/idl/gen-java/com/global/thrift/idl/InnerResult.java +++ b/serverlogic/src/main/thrift/idl/gen-java/com/global/thrift/idl/InnerResult.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-1-15") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-7") public class InnerResult implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InnerResult"); diff --git a/serverlogic/src/main/thrift/idl/gen-java/com/global/thrift/idl/RPCgTGRequestIFace.java b/serverlogic/src/main/thrift/idl/gen-java/com/global/thrift/idl/RPCgTGRequestIFace.java index 7d315ccb8..821503543 100644 --- a/serverlogic/src/main/thrift/idl/gen-java/com/global/thrift/idl/RPCgTGRequestIFace.java +++ b/serverlogic/src/main/thrift/idl/gen-java/com/global/thrift/idl/RPCgTGRequestIFace.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-1-15") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-7") public class RPCgTGRequestIFace { public interface Iface { diff --git a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/ArenaOfHero.java b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/ArenaOfHero.java index 9dc3ac467..1d1fed778 100644 --- a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/ArenaOfHero.java +++ b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/ArenaOfHero.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-3-18") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-7") public class ArenaOfHero implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ArenaOfHero"); diff --git a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/CrossArenaManager.java b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/CrossArenaManager.java index 558676b9a..1de9a133a 100644 --- a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/CrossArenaManager.java +++ b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/CrossArenaManager.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-1-15") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-7") public class CrossArenaManager implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CrossArenaManager"); diff --git a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/InvalidOperException.java b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/InvalidOperException.java index 741061aa3..dd5b36b2d 100644 --- a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/InvalidOperException.java +++ b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/InvalidOperException.java @@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory; /** * Structs can also be exceptions, if they are nasty. */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-1-15") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-7") public class InvalidOperException extends TException implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InvalidOperException"); diff --git a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/LifeGridInfo.java b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/LifeGridInfo.java index 2dec5086e..23d559ec3 100644 --- a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/LifeGridInfo.java +++ b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/LifeGridInfo.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-1-15") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-7") public class LifeGridInfo implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("LifeGridInfo"); diff --git a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/Pokemon.java b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/Pokemon.java index d4cb247b9..fe1f39edc 100644 --- a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/Pokemon.java +++ b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/Pokemon.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-1-15") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-7") public class Pokemon implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Pokemon"); diff --git a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/PropertyItem.java b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/PropertyItem.java index 0b5426d16..b7328d5d5 100644 --- a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/PropertyItem.java +++ b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/PropertyItem.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-1-15") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-7") public class PropertyItem implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("PropertyItem"); diff --git a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/PurpleMansionSeal.java b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/PurpleMansionSeal.java index 00d8a55e0..874348bca 100644 --- a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/PurpleMansionSeal.java +++ b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/PurpleMansionSeal.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-1-15") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-7") public class PurpleMansionSeal implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("PurpleMansionSeal"); diff --git a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/RPCMatchRequestIFace.java b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/RPCMatchRequestIFace.java index 971ba2b77..28c01db60 100644 --- a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/RPCMatchRequestIFace.java +++ b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/RPCMatchRequestIFace.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-1-15") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-7") public class RPCMatchRequestIFace { public interface Iface { diff --git a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/RPCRequestIFace.java b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/RPCRequestIFace.java index 898cacf97..d28923f26 100644 --- a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/RPCRequestIFace.java +++ b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/RPCRequestIFace.java @@ -34,12 +34,12 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-1-15") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-7") public class RPCRequestIFace { public interface Iface { - public Result deliveryRecharge(int uid, String goodsId, String openId, String orderId, long orderTime, int amount) throws InvalidOperException, org.apache.thrift.TException; + public Result deliveryRecharge(int uid, String goodsId, String openId, String orderId, long orderTime, int amount, String ext) throws InvalidOperException, org.apache.thrift.TException; public RechargeResult getRecharge(int uid) throws org.apache.thrift.TException; @@ -59,7 +59,7 @@ public class RPCRequestIFace { public interface AsyncIface { - public void deliveryRecharge(int uid, String goodsId, String openId, String orderId, long orderTime, int amount, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void deliveryRecharge(int uid, String goodsId, String openId, String orderId, long orderTime, int amount, String ext, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; public void getRecharge(int uid, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; @@ -97,13 +97,13 @@ public class RPCRequestIFace { super(iprot, oprot); } - public Result deliveryRecharge(int uid, String goodsId, String openId, String orderId, long orderTime, int amount) throws InvalidOperException, org.apache.thrift.TException + public Result deliveryRecharge(int uid, String goodsId, String openId, String orderId, long orderTime, int amount, String ext) throws InvalidOperException, org.apache.thrift.TException { - send_deliveryRecharge(uid, goodsId, openId, orderId, orderTime, amount); + send_deliveryRecharge(uid, goodsId, openId, orderId, orderTime, amount, ext); return recv_deliveryRecharge(); } - public void send_deliveryRecharge(int uid, String goodsId, String openId, String orderId, long orderTime, int amount) throws org.apache.thrift.TException + public void send_deliveryRecharge(int uid, String goodsId, String openId, String orderId, long orderTime, int amount, String ext) throws org.apache.thrift.TException { deliveryRecharge_args args = new deliveryRecharge_args(); args.setUid(uid); @@ -112,6 +112,7 @@ public class RPCRequestIFace { args.setOrderId(orderId); args.setOrderTime(orderTime); args.setAmount(amount); + args.setExt(ext); sendBase("deliveryRecharge", args); } @@ -308,9 +309,9 @@ public class RPCRequestIFace { super(protocolFactory, clientManager, transport); } - public void deliveryRecharge(int uid, String goodsId, String openId, String orderId, long orderTime, int amount, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void deliveryRecharge(int uid, String goodsId, String openId, String orderId, long orderTime, int amount, String ext, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - deliveryRecharge_call method_call = new deliveryRecharge_call(uid, goodsId, openId, orderId, orderTime, amount, resultHandler, this, ___protocolFactory, ___transport); + deliveryRecharge_call method_call = new deliveryRecharge_call(uid, goodsId, openId, orderId, orderTime, amount, ext, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } @@ -322,7 +323,8 @@ public class RPCRequestIFace { private String orderId; private long orderTime; private int amount; - public deliveryRecharge_call(int uid, String goodsId, String openId, String orderId, long orderTime, int amount, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + private String ext; + public deliveryRecharge_call(int uid, String goodsId, String openId, String orderId, long orderTime, int amount, String ext, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); this.uid = uid; this.goodsId = goodsId; @@ -330,6 +332,7 @@ public class RPCRequestIFace { this.orderId = orderId; this.orderTime = orderTime; this.amount = amount; + this.ext = ext; } public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { @@ -341,6 +344,7 @@ public class RPCRequestIFace { args.setOrderId(orderId); args.setOrderTime(orderTime); args.setAmount(amount); + args.setExt(ext); args.write(prot); prot.writeMessageEnd(); } @@ -631,7 +635,7 @@ public class RPCRequestIFace { public deliveryRecharge_result getResult(I iface, deliveryRecharge_args args) throws org.apache.thrift.TException { deliveryRecharge_result result = new deliveryRecharge_result(); try { - result.success = iface.deliveryRecharge(args.uid, args.goodsId, args.openId, args.orderId, args.orderTime, args.amount); + result.success = iface.deliveryRecharge(args.uid, args.goodsId, args.openId, args.orderId, args.orderTime, args.amount, args.ext); } catch (InvalidOperException ouch) { result.ouch = ouch; } @@ -858,7 +862,7 @@ public class RPCRequestIFace { } public void start(I iface, deliveryRecharge_args args, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws TException { - iface.deliveryRecharge(args.uid, args.goodsId, args.openId, args.orderId, args.orderTime, args.amount,resultHandler); + iface.deliveryRecharge(args.uid, args.goodsId, args.openId, args.orderId, args.orderTime, args.amount, args.ext,resultHandler); } } @@ -1231,6 +1235,7 @@ public class RPCRequestIFace { private static final org.apache.thrift.protocol.TField ORDER_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("orderId", org.apache.thrift.protocol.TType.STRING, (short)4); private static final org.apache.thrift.protocol.TField ORDER_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("orderTime", org.apache.thrift.protocol.TType.I64, (short)5); private static final org.apache.thrift.protocol.TField AMOUNT_FIELD_DESC = new org.apache.thrift.protocol.TField("amount", org.apache.thrift.protocol.TType.I32, (short)6); + private static final org.apache.thrift.protocol.TField EXT_FIELD_DESC = new org.apache.thrift.protocol.TField("ext", org.apache.thrift.protocol.TType.STRING, (short)7); private static final Map, SchemeFactory> schemes = new HashMap, SchemeFactory>(); static { @@ -1244,6 +1249,7 @@ public class RPCRequestIFace { public String orderId; // required public long orderTime; // required public int amount; // required + public String ext; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -1252,7 +1258,8 @@ public class RPCRequestIFace { OPEN_ID((short)3, "openId"), ORDER_ID((short)4, "orderId"), ORDER_TIME((short)5, "orderTime"), - AMOUNT((short)6, "amount"); + AMOUNT((short)6, "amount"), + EXT((short)7, "ext"); private static final Map byName = new HashMap(); @@ -1279,6 +1286,8 @@ public class RPCRequestIFace { return ORDER_TIME; case 6: // AMOUNT return AMOUNT; + case 7: // EXT + return EXT; default: return null; } @@ -1338,6 +1347,8 @@ public class RPCRequestIFace { new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))); tmpMap.put(_Fields.AMOUNT, new org.apache.thrift.meta_data.FieldMetaData("amount", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); + tmpMap.put(_Fields.EXT, new org.apache.thrift.meta_data.FieldMetaData("ext", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(deliveryRecharge_args.class, metaDataMap); } @@ -1351,7 +1362,8 @@ public class RPCRequestIFace { String openId, String orderId, long orderTime, - int amount) + int amount, + String ext) { this(); this.uid = uid; @@ -1363,6 +1375,7 @@ public class RPCRequestIFace { setOrderTimeIsSet(true); this.amount = amount; setAmountIsSet(true); + this.ext = ext; } /** @@ -1382,6 +1395,9 @@ public class RPCRequestIFace { } this.orderTime = other.orderTime; this.amount = other.amount; + if (other.isSetExt()) { + this.ext = other.ext; + } } public deliveryRecharge_args deepCopy() { @@ -1399,6 +1415,7 @@ public class RPCRequestIFace { this.orderTime = 0; setAmountIsSet(false); this.amount = 0; + this.ext = null; } public int getUid() { @@ -1542,6 +1559,30 @@ public class RPCRequestIFace { __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __AMOUNT_ISSET_ID, value); } + public String getExt() { + return this.ext; + } + + public deliveryRecharge_args setExt(String ext) { + this.ext = ext; + return this; + } + + public void unsetExt() { + this.ext = null; + } + + /** Returns true if field ext is set (has been assigned a value) and false otherwise */ + public boolean isSetExt() { + return this.ext != null; + } + + public void setExtIsSet(boolean value) { + if (!value) { + this.ext = null; + } + } + public void setFieldValue(_Fields field, Object value) { switch (field) { case UID: @@ -1592,6 +1633,14 @@ public class RPCRequestIFace { } break; + case EXT: + if (value == null) { + unsetExt(); + } else { + setExt((String)value); + } + break; + } } @@ -1615,6 +1664,9 @@ public class RPCRequestIFace { case AMOUNT: return Integer.valueOf(getAmount()); + case EXT: + return getExt(); + } throw new IllegalStateException(); } @@ -1638,6 +1690,8 @@ public class RPCRequestIFace { return isSetOrderTime(); case AMOUNT: return isSetAmount(); + case EXT: + return isSetExt(); } throw new IllegalStateException(); } @@ -1709,6 +1763,15 @@ public class RPCRequestIFace { return false; } + boolean this_present_ext = true && this.isSetExt(); + boolean that_present_ext = true && that.isSetExt(); + if (this_present_ext || that_present_ext) { + if (!(this_present_ext && that_present_ext)) + return false; + if (!this.ext.equals(that.ext)) + return false; + } + return true; } @@ -1746,6 +1809,11 @@ public class RPCRequestIFace { if (present_amount) list.add(amount); + boolean present_ext = true && (isSetExt()); + list.add(present_ext); + if (present_ext) + list.add(ext); + return list.hashCode(); } @@ -1817,6 +1885,16 @@ public class RPCRequestIFace { return lastComparison; } } + lastComparison = Boolean.valueOf(isSetExt()).compareTo(other.isSetExt()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetExt()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ext, other.ext); + if (lastComparison != 0) { + return lastComparison; + } + } return 0; } @@ -1872,6 +1950,14 @@ public class RPCRequestIFace { sb.append("amount:"); sb.append(this.amount); first = false; + if (!first) sb.append(", "); + sb.append("ext:"); + if (this.ext == null) { + sb.append("null"); + } else { + sb.append(this.ext); + } + first = false; sb.append(")"); return sb.toString(); } @@ -1965,6 +2051,14 @@ public class RPCRequestIFace { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; + case 7: // EXT + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.ext = iprot.readString(); + struct.setExtIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -2004,6 +2098,11 @@ public class RPCRequestIFace { oprot.writeFieldBegin(AMOUNT_FIELD_DESC); oprot.writeI32(struct.amount); oprot.writeFieldEnd(); + if (struct.ext != null) { + oprot.writeFieldBegin(EXT_FIELD_DESC); + oprot.writeString(struct.ext); + oprot.writeFieldEnd(); + } oprot.writeFieldStop(); oprot.writeStructEnd(); } @@ -2040,7 +2139,10 @@ public class RPCRequestIFace { if (struct.isSetAmount()) { optionals.set(5); } - oprot.writeBitSet(optionals, 6); + if (struct.isSetExt()) { + optionals.set(6); + } + oprot.writeBitSet(optionals, 7); if (struct.isSetUid()) { oprot.writeI32(struct.uid); } @@ -2059,12 +2161,15 @@ public class RPCRequestIFace { if (struct.isSetAmount()) { oprot.writeI32(struct.amount); } + if (struct.isSetExt()) { + oprot.writeString(struct.ext); + } } @Override public void read(org.apache.thrift.protocol.TProtocol prot, deliveryRecharge_args struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(6); + BitSet incoming = iprot.readBitSet(7); if (incoming.get(0)) { struct.uid = iprot.readI32(); struct.setUidIsSet(true); @@ -2089,6 +2194,10 @@ public class RPCRequestIFace { struct.amount = iprot.readI32(); struct.setAmountIsSet(true); } + if (incoming.get(6)) { + struct.ext = iprot.readString(); + struct.setExtIsSet(true); + } } } diff --git a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/RechargeResult.java b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/RechargeResult.java index 05fa2db14..06cd46bb6 100644 --- a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/RechargeResult.java +++ b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/RechargeResult.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-1-15") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-7") public class RechargeResult implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("RechargeResult"); diff --git a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/Result.java b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/Result.java index 9e9bb761d..b9f095976 100644 --- a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/Result.java +++ b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/Result.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-1-15") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-7") public class Result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Result"); diff --git a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/SixiangxinfaInfo.java b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/SixiangxinfaInfo.java index f7a4756cd..22083d7a6 100644 --- a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/SixiangxinfaInfo.java +++ b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/SixiangxinfaInfo.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-1-15") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-7") public class SixiangxinfaInfo implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SixiangxinfaInfo"); diff --git a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/SixiangxinfaPropertyInfo.java b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/SixiangxinfaPropertyInfo.java index b5880ce07..b4b6a4704 100644 --- a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/SixiangxinfaPropertyInfo.java +++ b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/SixiangxinfaPropertyInfo.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-1-15") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-7") public class SixiangxinfaPropertyInfo implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SixiangxinfaPropertyInfo"); diff --git a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/TeamPosHeroInfo.java b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/TeamPosHeroInfo.java index 027a17238..960531639 100644 --- a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/TeamPosHeroInfo.java +++ b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/TeamPosHeroInfo.java @@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory; /** * ArenaOfHeroManager 结构体 */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-1-15") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-7") public class TeamPosHeroInfo implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TeamPosHeroInfo"); diff --git a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/TransformationCardInfo.java b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/TransformationCardInfo.java index 8b548d7e1..0f54b06ee 100644 --- a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/TransformationCardInfo.java +++ b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/TransformationCardInfo.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-1-15") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-7") public class TransformationCardInfo implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TransformationCardInfo"); diff --git a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/UserMountInfo.java b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/UserMountInfo.java index 0c67bf5b2..1e7b5df1d 100644 --- a/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/UserMountInfo.java +++ b/serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/UserMountInfo.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-1-15") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-7") public class UserMountInfo implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("UserMountInfo"); diff --git a/serverlogic/src/main/thrift/idl/gen-java/com/world/thrift/idl/InnerInvalidOperException.java b/serverlogic/src/main/thrift/idl/gen-java/com/world/thrift/idl/InnerInvalidOperException.java index cd30cea7f..b12fad212 100644 --- a/serverlogic/src/main/thrift/idl/gen-java/com/world/thrift/idl/InnerInvalidOperException.java +++ b/serverlogic/src/main/thrift/idl/gen-java/com/world/thrift/idl/InnerInvalidOperException.java @@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory; /** * Structs can also be exceptions, if they are nasty. */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-1-15") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-7") public class InnerInvalidOperException extends TException implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InnerInvalidOperException"); diff --git a/serverlogic/src/main/thrift/idl/gen-java/com/world/thrift/idl/InnerResult.java b/serverlogic/src/main/thrift/idl/gen-java/com/world/thrift/idl/InnerResult.java index f32b7f18f..ee2d27f38 100644 --- a/serverlogic/src/main/thrift/idl/gen-java/com/world/thrift/idl/InnerResult.java +++ b/serverlogic/src/main/thrift/idl/gen-java/com/world/thrift/idl/InnerResult.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-1-15") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-7") public class InnerResult implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InnerResult"); diff --git a/serverlogic/src/main/thrift/idl/gen-java/com/world/thrift/idl/RPCgTwRequestIFace.java b/serverlogic/src/main/thrift/idl/gen-java/com/world/thrift/idl/RPCgTwRequestIFace.java index 89fcdcf50..94edc9306 100644 --- a/serverlogic/src/main/thrift/idl/gen-java/com/world/thrift/idl/RPCgTwRequestIFace.java +++ b/serverlogic/src/main/thrift/idl/gen-java/com/world/thrift/idl/RPCgTwRequestIFace.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-1-15") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-7") public class RPCgTwRequestIFace { public interface Iface { diff --git a/serverlogic/src/main/thrift/idl/gen-java/com/world/thrift/idl/RPCwTgRequestIFace.java b/serverlogic/src/main/thrift/idl/gen-java/com/world/thrift/idl/RPCwTgRequestIFace.java index 6609cbf9a..d6f5a86d2 100644 --- a/serverlogic/src/main/thrift/idl/gen-java/com/world/thrift/idl/RPCwTgRequestIFace.java +++ b/serverlogic/src/main/thrift/idl/gen-java/com/world/thrift/idl/RPCwTgRequestIFace.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-1-15") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-7") public class RPCwTgRequestIFace { public interface Iface { diff --git a/worldserver/src/main/java/com/world/thrift/idl/InnerInvalidOperException.java b/worldserver/src/main/java/com/world/thrift/idl/InnerInvalidOperException.java index cd30cea7f..b12fad212 100644 --- a/worldserver/src/main/java/com/world/thrift/idl/InnerInvalidOperException.java +++ b/worldserver/src/main/java/com/world/thrift/idl/InnerInvalidOperException.java @@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory; /** * Structs can also be exceptions, if they are nasty. */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-1-15") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-7") public class InnerInvalidOperException extends TException implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InnerInvalidOperException"); diff --git a/worldserver/src/main/java/com/world/thrift/idl/InnerResult.java b/worldserver/src/main/java/com/world/thrift/idl/InnerResult.java index f32b7f18f..ee2d27f38 100644 --- a/worldserver/src/main/java/com/world/thrift/idl/InnerResult.java +++ b/worldserver/src/main/java/com/world/thrift/idl/InnerResult.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-1-15") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-7") public class InnerResult implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InnerResult"); diff --git a/worldserver/src/main/java/com/world/thrift/idl/RPCgTwRequestIFace.java b/worldserver/src/main/java/com/world/thrift/idl/RPCgTwRequestIFace.java index 89fcdcf50..94edc9306 100644 --- a/worldserver/src/main/java/com/world/thrift/idl/RPCgTwRequestIFace.java +++ b/worldserver/src/main/java/com/world/thrift/idl/RPCgTwRequestIFace.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-1-15") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-7") public class RPCgTwRequestIFace { public interface Iface { diff --git a/worldserver/src/main/java/com/world/thrift/idl/RPCwTgRequestIFace.java b/worldserver/src/main/java/com/world/thrift/idl/RPCwTgRequestIFace.java index 6609cbf9a..d6f5a86d2 100644 --- a/worldserver/src/main/java/com/world/thrift/idl/RPCwTgRequestIFace.java +++ b/worldserver/src/main/java/com/world/thrift/idl/RPCwTgRequestIFace.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-1-15") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-7") public class RPCwTgRequestIFace { public interface Iface {