From 6f805a716f248af6e061ff00ab330aa156d4302c Mon Sep 17 00:00:00 2001 From: duhui Date: Fri, 8 Apr 2022 10:56:41 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=8F=E8=AE=AE=E5=8E=BB=E9=99=A4=E6=97=A0?= =?UTF-8?q?=E7=94=A8=E5=8F=82=E6=95=B0?= 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 +- .../com/ljsd/jieling/kefu/Cmd_support.java | 2 +- .../jieling/logic/store/BuyGoodsNewLogic.java | 4 +- .../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 +- 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 +- 57 files changed, 87 insertions(+), 305 deletions(-) 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 20a1e1b0f..ce967acd0 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-4-7") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-8") 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 b4cb48783..40cdf5bec 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-4-7") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-8") 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 821503543..0bef56a9c 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-4-7") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-8") 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 20a1e1b0f..ce967acd0 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-4-7") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-8") 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 b4cb48783..40cdf5bec 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-4-7") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-8") 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 821503543..0bef56a9c 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-4-7") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-8") 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 c9aaed01d..cf37f0093 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, String ext) { + public Result deliveryRecharge(int uid, String goodsId, String openId, String orderId, long orderTime, int amount) { try { LOGGER.info("deliveryRecharge start",uid ); - return BuyGoodsNewLogic.sendGoods(uid, goodsId, openId, orderId, orderTime, amount, ext); + return BuyGoodsNewLogic.sendGoods(uid, goodsId, openId, orderId, orderTime, amount); } catch (Exception e) { User user = UserManager.getUserInMem(uid); Result result = new Result(); 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 bd0b3db6f..05c18d5a8 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/store/BuyGoodsNewLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java index 0b5035570..8f72bd050 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,7 +146,7 @@ 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]); @@ -165,7 +165,7 @@ public class BuyGoodsNewLogic { * @return * @throws Exception */ - public static Result sendGoods(int uid, String sdkGoodsId, String openId, String orderId, long orderTime, int amount, String ext) throws Exception { + public static Result sendGoods(int uid, String sdkGoodsId, String openId, String orderId, long orderTime, int amount) 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); 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 1d1fed778..f8a75f9db 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-4-7") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-8") 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 1de9a133a..2425c2fe3 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-4-7") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-8") 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 dd5b36b2d..bc9c88a04 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-4-7") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-8") 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 23d559ec3..1f77b45f7 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-4-7") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-8") 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 fe1f39edc..adb560304 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-4-7") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-8") 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 b7328d5d5..f93620718 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-4-7") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-8") 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 874348bca..0de5e9096 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-4-7") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-8") 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 28c01db60..41c452d10 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-4-7") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-8") 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 d28923f26..fb9c450eb 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-4-7") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-8") public class RPCRequestIFace { public interface Iface { - public Result deliveryRecharge(int uid, String goodsId, String openId, String orderId, long orderTime, int amount, String ext) throws InvalidOperException, org.apache.thrift.TException; + public Result deliveryRecharge(int uid, String goodsId, String openId, String orderId, long orderTime, int amount) 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, String ext, 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, 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, String ext) throws InvalidOperException, org.apache.thrift.TException + public Result deliveryRecharge(int uid, String goodsId, String openId, String orderId, long orderTime, int amount) throws InvalidOperException, org.apache.thrift.TException { - send_deliveryRecharge(uid, goodsId, openId, orderId, orderTime, amount, ext); + send_deliveryRecharge(uid, goodsId, openId, orderId, orderTime, amount); return recv_deliveryRecharge(); } - public void send_deliveryRecharge(int uid, String goodsId, String openId, String orderId, long orderTime, int amount, String ext) throws org.apache.thrift.TException + public void send_deliveryRecharge(int uid, String goodsId, String openId, String orderId, long orderTime, int amount) throws org.apache.thrift.TException { deliveryRecharge_args args = new deliveryRecharge_args(); args.setUid(uid); @@ -112,7 +112,6 @@ public class RPCRequestIFace { args.setOrderId(orderId); args.setOrderTime(orderTime); args.setAmount(amount); - args.setExt(ext); sendBase("deliveryRecharge", args); } @@ -309,9 +308,9 @@ public class RPCRequestIFace { super(protocolFactory, clientManager, transport); } - 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 deliveryRecharge(int uid, String goodsId, String openId, String orderId, long orderTime, int amount, 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, ext, resultHandler, this, ___protocolFactory, ___transport); + deliveryRecharge_call method_call = new deliveryRecharge_call(uid, goodsId, openId, orderId, orderTime, amount, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } @@ -323,8 +322,7 @@ public class RPCRequestIFace { private String orderId; private long orderTime; private int amount; - 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 { + 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 { super(client, protocolFactory, transport, resultHandler, false); this.uid = uid; this.goodsId = goodsId; @@ -332,7 +330,6 @@ 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 { @@ -344,7 +341,6 @@ public class RPCRequestIFace { args.setOrderId(orderId); args.setOrderTime(orderTime); args.setAmount(amount); - args.setExt(ext); args.write(prot); prot.writeMessageEnd(); } @@ -635,7 +631,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, args.ext); + result.success = iface.deliveryRecharge(args.uid, args.goodsId, args.openId, args.orderId, args.orderTime, args.amount); } catch (InvalidOperException ouch) { result.ouch = ouch; } @@ -862,7 +858,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, args.ext,resultHandler); + iface.deliveryRecharge(args.uid, args.goodsId, args.openId, args.orderId, args.orderTime, args.amount,resultHandler); } } @@ -1235,7 +1231,6 @@ 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 { @@ -1249,7 +1244,6 @@ 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 { @@ -1258,8 +1252,7 @@ public class RPCRequestIFace { OPEN_ID((short)3, "openId"), ORDER_ID((short)4, "orderId"), ORDER_TIME((short)5, "orderTime"), - AMOUNT((short)6, "amount"), - EXT((short)7, "ext"); + AMOUNT((short)6, "amount"); private static final Map byName = new HashMap(); @@ -1286,8 +1279,6 @@ public class RPCRequestIFace { return ORDER_TIME; case 6: // AMOUNT return AMOUNT; - case 7: // EXT - return EXT; default: return null; } @@ -1347,8 +1338,6 @@ 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); } @@ -1362,8 +1351,7 @@ public class RPCRequestIFace { String openId, String orderId, long orderTime, - int amount, - String ext) + int amount) { this(); this.uid = uid; @@ -1375,7 +1363,6 @@ public class RPCRequestIFace { setOrderTimeIsSet(true); this.amount = amount; setAmountIsSet(true); - this.ext = ext; } /** @@ -1395,9 +1382,6 @@ public class RPCRequestIFace { } this.orderTime = other.orderTime; this.amount = other.amount; - if (other.isSetExt()) { - this.ext = other.ext; - } } public deliveryRecharge_args deepCopy() { @@ -1415,7 +1399,6 @@ public class RPCRequestIFace { this.orderTime = 0; setAmountIsSet(false); this.amount = 0; - this.ext = null; } public int getUid() { @@ -1559,30 +1542,6 @@ 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: @@ -1633,14 +1592,6 @@ public class RPCRequestIFace { } break; - case EXT: - if (value == null) { - unsetExt(); - } else { - setExt((String)value); - } - break; - } } @@ -1664,9 +1615,6 @@ public class RPCRequestIFace { case AMOUNT: return Integer.valueOf(getAmount()); - case EXT: - return getExt(); - } throw new IllegalStateException(); } @@ -1690,8 +1638,6 @@ public class RPCRequestIFace { return isSetOrderTime(); case AMOUNT: return isSetAmount(); - case EXT: - return isSetExt(); } throw new IllegalStateException(); } @@ -1763,15 +1709,6 @@ 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; } @@ -1809,11 +1746,6 @@ 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(); } @@ -1885,16 +1817,6 @@ 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; } @@ -1950,14 +1872,6 @@ 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(); } @@ -2051,14 +1965,6 @@ 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); } @@ -2098,11 +2004,6 @@ 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(); } @@ -2139,10 +2040,7 @@ public class RPCRequestIFace { if (struct.isSetAmount()) { optionals.set(5); } - if (struct.isSetExt()) { - optionals.set(6); - } - oprot.writeBitSet(optionals, 7); + oprot.writeBitSet(optionals, 6); if (struct.isSetUid()) { oprot.writeI32(struct.uid); } @@ -2161,15 +2059,12 @@ 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(7); + BitSet incoming = iprot.readBitSet(6); if (incoming.get(0)) { struct.uid = iprot.readI32(); struct.setUidIsSet(true); @@ -2194,10 +2089,6 @@ 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 06cd46bb6..0e85ec312 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-4-7") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-8") 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 b9f095976..d7abd57df 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-4-7") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-8") 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 22083d7a6..d1b06ca98 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-4-7") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-8") 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 b4b6a4704..6620a3cb0 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-4-7") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-8") 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 960531639..5a15922f8 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-4-7") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-8") 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 0f54b06ee..5d71c77a0 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-4-7") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-8") 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 1e7b5df1d..459602ef2 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-4-7") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-8") 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/world/thrift/idl/InnerInvalidOperException.java b/serverlogic/src/main/java/com/world/thrift/idl/InnerInvalidOperException.java index b12fad212..90500b237 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-4-7") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-8") 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 ee2d27f38..01b9d9543 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-4-7") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-8") 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 94edc9306..1af692be8 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-4-7") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-8") 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 d6f5a86d2..e0efdac3e 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-4-7") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-8") 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 2eb0eaf62..652bf9569 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, 7:string ext) throws (1:InvalidOperException ouch); + Result deliveryRecharge(1:i32 uid, 2:string goodsId,3: string openId,4: string orderId,5: i64 orderTime, 6:i32 amount) 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 20a1e1b0f..ce967acd0 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-4-7") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-8") 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 b4cb48783..40cdf5bec 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-4-7") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-8") 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 821503543..0bef56a9c 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-4-7") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-8") 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 1d1fed778..f8a75f9db 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-4-7") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-8") 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 1de9a133a..2425c2fe3 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-4-7") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-8") 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 dd5b36b2d..bc9c88a04 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-4-7") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-8") 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 23d559ec3..1f77b45f7 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-4-7") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-8") 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 fe1f39edc..adb560304 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-4-7") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-8") 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 b7328d5d5..f93620718 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-4-7") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-8") 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 874348bca..0de5e9096 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-4-7") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-8") 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 28c01db60..41c452d10 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-4-7") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-8") 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 d28923f26..fb9c450eb 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-4-7") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-8") public class RPCRequestIFace { public interface Iface { - public Result deliveryRecharge(int uid, String goodsId, String openId, String orderId, long orderTime, int amount, String ext) throws InvalidOperException, org.apache.thrift.TException; + public Result deliveryRecharge(int uid, String goodsId, String openId, String orderId, long orderTime, int amount) 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, String ext, 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, 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, String ext) throws InvalidOperException, org.apache.thrift.TException + public Result deliveryRecharge(int uid, String goodsId, String openId, String orderId, long orderTime, int amount) throws InvalidOperException, org.apache.thrift.TException { - send_deliveryRecharge(uid, goodsId, openId, orderId, orderTime, amount, ext); + send_deliveryRecharge(uid, goodsId, openId, orderId, orderTime, amount); return recv_deliveryRecharge(); } - public void send_deliveryRecharge(int uid, String goodsId, String openId, String orderId, long orderTime, int amount, String ext) throws org.apache.thrift.TException + public void send_deliveryRecharge(int uid, String goodsId, String openId, String orderId, long orderTime, int amount) throws org.apache.thrift.TException { deliveryRecharge_args args = new deliveryRecharge_args(); args.setUid(uid); @@ -112,7 +112,6 @@ public class RPCRequestIFace { args.setOrderId(orderId); args.setOrderTime(orderTime); args.setAmount(amount); - args.setExt(ext); sendBase("deliveryRecharge", args); } @@ -309,9 +308,9 @@ public class RPCRequestIFace { super(protocolFactory, clientManager, transport); } - 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 deliveryRecharge(int uid, String goodsId, String openId, String orderId, long orderTime, int amount, 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, ext, resultHandler, this, ___protocolFactory, ___transport); + deliveryRecharge_call method_call = new deliveryRecharge_call(uid, goodsId, openId, orderId, orderTime, amount, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } @@ -323,8 +322,7 @@ public class RPCRequestIFace { private String orderId; private long orderTime; private int amount; - 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 { + 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 { super(client, protocolFactory, transport, resultHandler, false); this.uid = uid; this.goodsId = goodsId; @@ -332,7 +330,6 @@ 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 { @@ -344,7 +341,6 @@ public class RPCRequestIFace { args.setOrderId(orderId); args.setOrderTime(orderTime); args.setAmount(amount); - args.setExt(ext); args.write(prot); prot.writeMessageEnd(); } @@ -635,7 +631,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, args.ext); + result.success = iface.deliveryRecharge(args.uid, args.goodsId, args.openId, args.orderId, args.orderTime, args.amount); } catch (InvalidOperException ouch) { result.ouch = ouch; } @@ -862,7 +858,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, args.ext,resultHandler); + iface.deliveryRecharge(args.uid, args.goodsId, args.openId, args.orderId, args.orderTime, args.amount,resultHandler); } } @@ -1235,7 +1231,6 @@ 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 { @@ -1249,7 +1244,6 @@ 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 { @@ -1258,8 +1252,7 @@ public class RPCRequestIFace { OPEN_ID((short)3, "openId"), ORDER_ID((short)4, "orderId"), ORDER_TIME((short)5, "orderTime"), - AMOUNT((short)6, "amount"), - EXT((short)7, "ext"); + AMOUNT((short)6, "amount"); private static final Map byName = new HashMap(); @@ -1286,8 +1279,6 @@ public class RPCRequestIFace { return ORDER_TIME; case 6: // AMOUNT return AMOUNT; - case 7: // EXT - return EXT; default: return null; } @@ -1347,8 +1338,6 @@ 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); } @@ -1362,8 +1351,7 @@ public class RPCRequestIFace { String openId, String orderId, long orderTime, - int amount, - String ext) + int amount) { this(); this.uid = uid; @@ -1375,7 +1363,6 @@ public class RPCRequestIFace { setOrderTimeIsSet(true); this.amount = amount; setAmountIsSet(true); - this.ext = ext; } /** @@ -1395,9 +1382,6 @@ public class RPCRequestIFace { } this.orderTime = other.orderTime; this.amount = other.amount; - if (other.isSetExt()) { - this.ext = other.ext; - } } public deliveryRecharge_args deepCopy() { @@ -1415,7 +1399,6 @@ public class RPCRequestIFace { this.orderTime = 0; setAmountIsSet(false); this.amount = 0; - this.ext = null; } public int getUid() { @@ -1559,30 +1542,6 @@ 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: @@ -1633,14 +1592,6 @@ public class RPCRequestIFace { } break; - case EXT: - if (value == null) { - unsetExt(); - } else { - setExt((String)value); - } - break; - } } @@ -1664,9 +1615,6 @@ public class RPCRequestIFace { case AMOUNT: return Integer.valueOf(getAmount()); - case EXT: - return getExt(); - } throw new IllegalStateException(); } @@ -1690,8 +1638,6 @@ public class RPCRequestIFace { return isSetOrderTime(); case AMOUNT: return isSetAmount(); - case EXT: - return isSetExt(); } throw new IllegalStateException(); } @@ -1763,15 +1709,6 @@ 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; } @@ -1809,11 +1746,6 @@ 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(); } @@ -1885,16 +1817,6 @@ 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; } @@ -1950,14 +1872,6 @@ 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(); } @@ -2051,14 +1965,6 @@ 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); } @@ -2098,11 +2004,6 @@ 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(); } @@ -2139,10 +2040,7 @@ public class RPCRequestIFace { if (struct.isSetAmount()) { optionals.set(5); } - if (struct.isSetExt()) { - optionals.set(6); - } - oprot.writeBitSet(optionals, 7); + oprot.writeBitSet(optionals, 6); if (struct.isSetUid()) { oprot.writeI32(struct.uid); } @@ -2161,15 +2059,12 @@ 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(7); + BitSet incoming = iprot.readBitSet(6); if (incoming.get(0)) { struct.uid = iprot.readI32(); struct.setUidIsSet(true); @@ -2194,10 +2089,6 @@ 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 06cd46bb6..0e85ec312 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-4-7") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-8") 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 b9f095976..d7abd57df 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-4-7") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-8") 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 22083d7a6..d1b06ca98 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-4-7") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-8") 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 b4b6a4704..6620a3cb0 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-4-7") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-8") 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 960531639..5a15922f8 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-4-7") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-8") 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 0f54b06ee..5d71c77a0 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-4-7") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-8") 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 1e7b5df1d..459602ef2 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-4-7") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-8") 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 b12fad212..90500b237 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-4-7") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-8") 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 ee2d27f38..01b9d9543 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-4-7") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-8") 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 94edc9306..1af692be8 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-4-7") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-8") 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 d6f5a86d2..e0efdac3e 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-4-7") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-8") 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 b12fad212..90500b237 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-4-7") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-8") 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 ee2d27f38..01b9d9543 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-4-7") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-8") 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 94edc9306..1af692be8 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-4-7") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-8") 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 d6f5a86d2..e0efdac3e 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-4-7") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2022-4-8") public class RPCwTgRequestIFace { public interface Iface {