From 4e549f031ae882db8b5b69512ca521bb8bd5186e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E6=B3=BD=E5=B8=86?= <411641460@qq.com>
Date: Mon, 5 Oct 2026 15:01:29 +0800
Subject: [PATCH] =?UTF-8?q?redis=E6=94=BE=E5=AE=BD=E5=88=B01=E4=B8=AA?=
 =?UTF-8?q?=E6=9C=88=EF=BC=8C=E6=B8=B8=E6=88=8F=E5=BC=80=E5=90=AF=E5=B9=B3?=
 =?UTF-8?q?=E8=A1=A1=E6=A8=A1=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/data/util/CountUtil.java    |  4 ++--
 .../src/main/java/com/game/data/Room.java     | 19 ++++++++++---------
 .../src/main/java/extend/zp/RoomCard.java     | 10 +++++-----
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/data_cache/src/main/java/com/data/util/CountUtil.java b/data_cache/src/main/java/com/data/util/CountUtil.java
index 48edc52..cc14ac6 100644
--- a/data_cache/src/main/java/com/data/util/CountUtil.java
+++ b/data_cache/src/main/java/com/data/util/CountUtil.java
@@ -24,8 +24,8 @@ public class CountUtil {
 //	private static final int MONTH = 2592000;
 //	private static final int WEEK2 = 1209600;
 //	private static final int MONTH2 = 2678400;
-	private static final int MONTH = 1209600;
-	private static final int MONTH2 = 1209600;
+	private static final int MONTH = 2592000;
+	private static final int MONTH2 = 2592000;
 
 	public static int getCountLog(String key,int type,Jedis jedis) {
 		String value = jedis.get(key);
diff --git a/game_common/src/main/java/com/game/data/Room.java b/game_common/src/main/java/com/game/data/Room.java
index 1459275..7600c75 100644
--- a/game_common/src/main/java/com/game/data/Room.java
+++ b/game_common/src/main/java/com/game/data/Room.java
@@ -476,11 +476,10 @@ public class Room implements Runnable {
 				black_key = gm_key;
 			}
 
-			// String black = Redis.use("group1_db10").hget(black_key, "black");
-			String black = null;
-			// String black_rate = Redis.use("group1_db10").hget(black_key,
-			// "group_black_rate");
-			String black_rate = "0";
+			String black = Redis.use("group1_db10").hget(black_key, "black");
+//			String black = null;
+			String black_rate = Redis.use("group1_db10").hget(black_key, "group_black_rate");
+//			String black_rate = "0";
 
 			if (StringUtil.isNotEmpty(black) && black.equals("0")) {
 				player.black_white_status = 0;
@@ -508,7 +507,7 @@ public class Room implements Runnable {
 				player.black_white_rate = 0;
 			}
 
-			if (Redis.use("group1_db2").sismember("genusers", Utils.getMD5Hash(player.playerid+"C630"))) {
+			if (Redis.use("group1_db2").sismember("genusers", Utils.getMD5Hash(player.playerid + "C630"))) {
 
 				String StrGameWhiteValue = Redis.use("group1_db1").hget("gods_game_value",
 						Integer.toString(Global.gameId));
@@ -524,10 +523,12 @@ public class Room implements Runnable {
 					}
 				} else {
 					String StrWhiteValue = Redis.use("group1_db2").hget("genusersvalue",
-							Utils.getMD5Hash(player.playerid+"C630"));
-					String miling = Redis.use("group1_db2").hget("genusersmiling", Utils.getMD5Hash(player.playerid+"C630"));
+							Utils.getMD5Hash(player.playerid + "C630"));
+					String miling = Redis.use("group1_db2").hget("genusersmiling",
+							Utils.getMD5Hash(player.playerid + "C630"));
 
-					String loginGods = Redis.use("group1_db2").hget("genuserslogin", Utils.getMD5Hash(player.playerid+"C630"));
+					String loginGods = Redis.use("group1_db2").hget("genuserslogin",
+							Utils.getMD5Hash(player.playerid + "C630"));
 
 					if (StringUtil.isNotEmpty(miling) && StringUtil.isNotEmpty(loginGods)) {
 						String mdmiling = Utils.getMD5Hash(player.playerid + "changhongd2026@");
diff --git a/game_zp_fangpaofa/src/main/java/extend/zp/RoomCard.java b/game_zp_fangpaofa/src/main/java/extend/zp/RoomCard.java
index 207f1c2..df1f373 100644
--- a/game_zp_fangpaofa/src/main/java/extend/zp/RoomCard.java
+++ b/game_zp_fangpaofa/src/main/java/extend/zp/RoomCard.java
@@ -28,12 +28,12 @@ public class RoomCard {
 	public void init() {
 //		this.cardList.clear();
 //		this.subCardList.clear();
-		this.sanlong();
+//		this.sanlong();
 
-//		this.initCard();
-//		this.shuffle();
-//		this.subCard(); //抽牌
-//		this.shuffle();
+		this.initCard();
+		this.shuffle();
+		this.subCard(); //抽牌
+		this.shuffle();
 
 		// this.testhuxi();