diff --git a/game_web/web_group/.idea/workspace.xml b/game_web/web_group/.idea/workspace.xml
index 70e48c3..84fa6b1 100644
--- a/game_web/web_group/.idea/workspace.xml
+++ b/game_web/web_group/.idea/workspace.xml
@@ -5,182 +5,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -249,7 +74,7 @@
1770034638903
-
+
diff --git a/game_web/web_group/src/main/java/com/group/job/UpdatePlayRoomJob.java b/game_web/web_group/src/main/java/com/group/job/UpdatePlayRoomJob.java
index a8be7c1..87154a0 100644
--- a/game_web/web_group/src/main/java/com/group/job/UpdatePlayRoomJob.java
+++ b/game_web/web_group/src/main/java/com/group/job/UpdatePlayRoomJob.java
@@ -81,6 +81,7 @@ public class UpdatePlayRoomJob implements Job{
int max_value = pid * 10000 + 9999;
String grooms_key = GroupCache.genRoomsKey(groupId);
rooms = jedis.zrevrangeByScore(grooms_key, max_value, min_value);
+ int qfroomnum = 0;
for (String room : rooms) {
List room_list = Redis.use("group1_db0").hmget(room, "fake", "status", "round", "id", "times", "players");
@@ -88,6 +89,7 @@ public class UpdatePlayRoomJob implements Job{
if (fake_json == null) {
continue;
}
+ qfroomnum++;
String status = room_list.get(1);
if (StringUtil.isEmpty(status)) {
@@ -112,7 +114,7 @@ public class UpdatePlayRoomJob implements Job{
}
}
- if (rooms.size() >= gpb.robot_room || rooms.size() >= 20)
+ if (qfroomnum >= gpb.robot_room || rooms.size() >= 20)
{
continue;
}
@@ -121,6 +123,7 @@ public class UpdatePlayRoomJob implements Job{
if (StringUtil.isNotEmpty(exist))
{
createGroupRoom(groupId, pid);
+
}
}finally {
jedis.close();
@@ -219,12 +222,22 @@ public class UpdatePlayRoomJob implements Job{
for (String room : rooms) {
List room_list = Redis.use("group1_db0").hmget(room, "fake", "status", "round", "id", "times", "players", "create_time", "fake_existTime");
-
-
String roomId = room_list.get(3);
+ String createtime = room_list.get(6);
+
+
+ /*if (StringUtil.isEmpty(room_list.get(5))&&Integer.parseInt((System.currentTimeMillis() + "").substring(0, 10))>Integer.parseInt(createtime)+30) {
+ GroupPublisherService.delRoomEvt(groupId, roomId);
+ jedis.zrem(grooms_key, room);
+ Redis.use().hset(room, "status", 3 + "");
+ Redis.use().hincrBy(room, "cache_ver", 1);
+ Redis.use().expire(room, 20);
+ logger.error("del 空 room:" + roomId + " player:"+room_list.get(5) + " fake_json:");
+ continue;
+ }*/
ITArray players = TArray.newFromJsonData(room_list.get(5));
- if(players.size()==0) {
+ /*if(players.size()==0) {
//清理空桌
GroupPublisherService.delRoomEvt(groupId, roomId);
jedis.zrem(grooms_key, room);
@@ -233,7 +246,7 @@ public class UpdatePlayRoomJob implements Job{
Redis.use().expire(room, 20);
logger.error("del 空 room:" + roomId + " player:"+room_list.get(5) + " fake_json:");
continue;
- }
+ }*/
String fake_json = room_list.get(0);
if (fake_json == null)
diff --git a/game_web/web_group/target/ROOT.war b/game_web/web_group/target/ROOT.war
index a90fb32..1e53ccb 100644
Binary files a/game_web/web_group/target/ROOT.war and b/game_web/web_group/target/ROOT.war differ
diff --git a/game_web/web_group/target/ROOT/WEB-INF/classes/com/group/job/UpdatePlayRoomJob.class b/game_web/web_group/target/ROOT/WEB-INF/classes/com/group/job/UpdatePlayRoomJob.class
index 3f135dd..17070cc 100644
Binary files a/game_web/web_group/target/ROOT/WEB-INF/classes/com/group/job/UpdatePlayRoomJob.class and b/game_web/web_group/target/ROOT/WEB-INF/classes/com/group/job/UpdatePlayRoomJob.class differ
diff --git a/game_web/web_group/target/ROOT/WEB-INF/classes/com/group/service/GroupService.class b/game_web/web_group/target/ROOT/WEB-INF/classes/com/group/service/GroupService.class
index 5ad5460..91ec05e 100644
Binary files a/game_web/web_group/target/ROOT/WEB-INF/classes/com/group/service/GroupService.class and b/game_web/web_group/target/ROOT/WEB-INF/classes/com/group/service/GroupService.class differ
diff --git a/game_web/web_group/target/classes/com/group/job/UpdatePlayRoomJob.class b/game_web/web_group/target/classes/com/group/job/UpdatePlayRoomJob.class
index 3f135dd..17070cc 100644
Binary files a/game_web/web_group/target/classes/com/group/job/UpdatePlayRoomJob.class and b/game_web/web_group/target/classes/com/group/job/UpdatePlayRoomJob.class differ
diff --git a/game_web/web_group/target/classes/com/group/service/GroupService.class b/game_web/web_group/target/classes/com/group/service/GroupService.class
index 5ad5460..91ec05e 100644
Binary files a/game_web/web_group/target/classes/com/group/service/GroupService.class and b/game_web/web_group/target/classes/com/group/service/GroupService.class differ