From 5917401893232d1ec1eb3b3f9fd8d491a0c31fd4 Mon Sep 17 00:00:00 2001 From: gaojie Date: Sat, 2 Mar 2019 18:29:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=85=E5=80=BC=E5=8F=91=E8=B4=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/jmfy/controller/RechargeController.java | 2 +- src/main/java/com/jmfy/controller/UserController.java | 2 +- src/main/resources/application.properties | 3 ++- src/main/thrift/idl/core.thrift | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/jmfy/controller/RechargeController.java b/src/main/java/com/jmfy/controller/RechargeController.java index 4e187ea..20cbcc4 100644 --- a/src/main/java/com/jmfy/controller/RechargeController.java +++ b/src/main/java/com/jmfy/controller/RechargeController.java @@ -92,7 +92,7 @@ public class RechargeController { LOGGER.info("serviceKey : " + serviceKey); try { rPCClient = ClientAdapterPo.getClientAdapterPo(serviceKey); - result = rPCClient.getClient().deliveryRecharge(Integer.parseInt(creditId), payitem,productId, Integer.parseInt(stone)); + result = rPCClient.getClient().deliveryRecharge(Integer.parseInt(creditId), payitem,productId, Double.parseDouble(amount)); } catch (Exception e) { e.printStackTrace(); } diff --git a/src/main/java/com/jmfy/controller/UserController.java b/src/main/java/com/jmfy/controller/UserController.java index 988e265..7df4619 100644 --- a/src/main/java/com/jmfy/controller/UserController.java +++ b/src/main/java/com/jmfy/controller/UserController.java @@ -52,7 +52,7 @@ public class UserController { } public static void main (String [] args){ - String s = MD5Util.encrypByMd5(YsjConstant.TW_GameKey + "111112" + 10074); + String s = MD5Util.encrypByMd5(YsjConstant.TW_GameKey + "9000709253" + 10074); System.out.println(s); } } diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index b689adf..fc9b5bf 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -4,7 +4,8 @@ server.port=9991 server.context-path=/delivery server.deliveryAddress=60.1.1.12:9991 # redis config -spring.redis.host = 150.116.94.74 +#spring.redis.host = 150.116.94.74 +spring.redis.host = 60.1.1.14 spring.redis.port = 6379 spring.redis.password = redis.ljsd.COM@ spring.redis.expireTime = -1 diff --git a/src/main/thrift/idl/core.thrift b/src/main/thrift/idl/core.thrift index 8d804b0..1218808 100644 --- a/src/main/thrift/idl/core.thrift +++ b/src/main/thrift/idl/core.thrift @@ -16,6 +16,6 @@ service RPCRequestIFace{ Result testdeliveryGood(1:i32 userId, 2:string payitem) throws (1:common.InvalidOperException ouch); - Result deliveryRecharge(1:i32 userId, 2:string rewardItems,3: string productId,4: i32 stone) throws (1:common.InvalidOperException ouch); + Result deliveryRecharge(1:i32 userId, 2:string rewardItems,3: string productId,4: double amount) throws (1:common.InvalidOperException ouch); Result sendMail(1:i32 userId, 2:string rewardItems,3:string title,4:string content) throws (1:common.InvalidOperException ouch); } \ No newline at end of file