From a2d0383b7a7f882c6f03fc9f3de2adc6e74559a7 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 24 七月 2024 18:52:35 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0
---
cloud-server-other/src/main/java/com/dsh/other/controller/GameController.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/cloud-server-other/src/main/java/com/dsh/other/controller/GameController.java b/cloud-server-other/src/main/java/com/dsh/other/controller/GameController.java
index bc18bca..bda7919 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/controller/GameController.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/controller/GameController.java
@@ -414,7 +414,7 @@
map.put("space_id", spaceId + "");
map.put("sutu_id", sutuId + "");
- String s = HttpRequestUtil.postRequest("https://try.daowepark.com/v7/user_api/general/gameStart", map);
+ String s = HttpRequestUtil.postRequest("https://port.daowepark.com/v7/user_api/general/gameStart", map);
JSONObject jsonObject = JSONObject.parseObject(s);
Object code = jsonObject.get("code");
if (String.valueOf(code) != null && "200".equals(String.valueOf(code))) {
@@ -433,13 +433,16 @@
map.put("api_url", "http://221.182.45.100:56666/communityWorldCup/base/worldCup/endWorldCupCallback");
map.put("custom", "{\"gameType\": 2}");
- String s = HttpRequestUtil.postRequest("https://try.daowepark.com/v7/user_api/general/quickStart", map);
+ String s = HttpRequestUtil.postRequest("https://port.daowepark.com/v7/user_api/general/quickStart", map);
JSONObject jsonObject = JSONObject.parseObject(s);
Integer code1 = jsonObject.getInteger("code");
String message = jsonObject.getString("message");
if (200 == code1) {
+ System.err.println("--------------启动了世界杯游戏");
+ System.err.println(s);
return 200;
} else {
+ System.err.println(message);
return 500;
}
}
@@ -468,7 +471,8 @@
String out_trade_no = map.get("out_trade_no");
String transaction_id = map.get("transaction_id");
String result = map.get("result");
- //String params = uid + "_" + gameId + "_" + spaceId + "_" + sutuId+"_"+code+"_"+configId;
+ //String params = uid + "_" + gameId + "_" + spaceId + "_" + sutuId+"_"+code+"_"+configId + "_" + gameType;
+ //Integer integer = startGame(uid, gameType, gameId, spaceId, sutuId);
String attach = map.get("attach");
List<TGameRecord> list = gameRecordService.list(new QueryWrapper<TGameRecord>().eq("number", out_trade_no).eq("payType", 1));
@@ -487,7 +491,7 @@
}
gameRecordService.updateBatchById(list);
String[] s = attach.split("_");
- Integer integer = startGame(Integer.valueOf(s[0]), Integer.valueOf(s[4]), Integer.valueOf(s[1]), Integer.valueOf(s[2]), Integer.valueOf(s[3]));
+ Integer integer = startGame(Integer.valueOf(s[0]), Integer.valueOf(s[6]), Integer.valueOf(s[1]), Integer.valueOf(s[2]), Integer.valueOf(s[3]));
PrintWriter out = null;
try {
@@ -508,7 +512,8 @@
if(null != map){
String out_trade_no = map.get("out_trade_no");
String transaction_id = map.get("trade_no");
- //String params = uid + "_" + gameId + "_" + spaceId + "_" + sutuId+"_"+code+"_"+configId;
+ //String params = uid + "_" + gameId + "_" + spaceId + "_" + sutuId+"_"+code+"_"+ configId + "_" + gameType;
+ //Integer integer = startGame(uid, gameType, gameId, spaceId, sutuId);
String attach = map.get("passback_params");
List<TGameRecord> list = gameRecordService.list(new QueryWrapper<TGameRecord>().eq("number", out_trade_no).eq("payType", 2));
@@ -527,7 +532,7 @@
}
gameRecordService.updateBatchById(list);
String[] s = attach.split("_");
- Integer integer = startGame(Integer.valueOf(s[0]), Integer.valueOf(s[4]), Integer.valueOf(s[1]), Integer.valueOf(s[2]), Integer.valueOf(s[3]));
+ Integer integer = startGame(Integer.valueOf(s[0]), Integer.valueOf(s[6]), Integer.valueOf(s[1]), Integer.valueOf(s[2]), Integer.valueOf(s[3]));
PrintWriter out = null;
try {
--
Gitblit v1.7.1