add
parent
17a1dfc557
commit
582ed95eaf
|
|
@ -5,182 +5,7 @@
|
||||||
</component>
|
</component>
|
||||||
<component name="ChangeListManager">
|
<component name="ChangeListManager">
|
||||||
<list default="true" id="0b5e96d5-7630-407a-8e4f-0ff0311ccd8b" name="Changes" comment="">
|
<list default="true" id="0b5e96d5-7630-407a-8e4f-0ff0311ccd8b" name="Changes" comment="">
|
||||||
<change beforePath="$PROJECT_DIR$/../../.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../../.idea/compiler.xml" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/../../.idea/encodings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../../.idea/encodings.xml" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../../.idea/misc.xml" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/.idea/.gitignore" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/.idea/kotlinc.xml" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/build/pro/taurus-core.xml" beforeDir="false" afterPath="$PROJECT_DIR$/build/pro/taurus-core.xml" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/group/MainServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/group/MainServer.java" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/group/controller/GroupController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/group/controller/GroupController.java" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/group/job/UpdatePlayRoomJob.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/group/job/UpdatePlayRoomJob.java" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/group/service/GroupService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/group/service/GroupService.java" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/main/webapp/config/taurus-core.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/config/taurus-core.xml" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/main/webapp/logs/web_main.log" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/main/webapp/logs/web_main.log.2026-01-01" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/main/webapp/logs/web_main.log.2026-01-02" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/main/webapp/logs/web_main.log.2026-01-03" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/main/webapp/logs/web_main.log.2026-01-04" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/main/webapp/logs/web_main.log.2026-01-05" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/main/webapp/logs/web_main.log.2026-01-21" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/main/webapp/logs/web_main.log.2026-01-24" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/target/ROOT.war" beforeDir="false" afterPath="$PROJECT_DIR$/target/ROOT.war" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/target/ROOT/WEB-INF/classes/com/group/MainServer$1.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/ROOT/WEB-INF/classes/com/group/MainServer$1.class" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/target/ROOT/WEB-INF/classes/com/group/MainServer$2.class" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/target/ROOT/WEB-INF/classes/com/group/MainServer.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/ROOT/WEB-INF/classes/com/group/MainServer.class" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/target/ROOT/WEB-INF/classes/com/group/controller/GroupController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/ROOT/WEB-INF/classes/com/group/controller/GroupController.class" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/target/ROOT/WEB-INF/classes/com/group/job/UpdatePlayRoomJob.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/ROOT/WEB-INF/classes/com/group/job/UpdatePlayRoomJob.class" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/target/ROOT/WEB-INF/classes/com/group/service/GroupService.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/ROOT/WEB-INF/classes/com/group/service/GroupService.class" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/target/ROOT/WEB-INF/lib/annotations-13.0.jar" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/target/ROOT/WEB-INF/lib/data_cache-1.0.1.jar" beforeDir="false" afterPath="$PROJECT_DIR$/target/ROOT/WEB-INF/lib/data_cache-1.0.1.jar" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/target/ROOT/WEB-INF/lib/game_common-1.0.0.jar" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/target/ROOT/WEB-INF/lib/gson-2.10.1.jar" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/target/ROOT/WEB-INF/lib/jboss-logging-3.3.2.Final.jar" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/target/ROOT/WEB-INF/lib/kotlin-stdlib-1.5.10.jar" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/target/ROOT/WEB-INF/lib/kotlin-stdlib-common-1.5.10.jar" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/target/ROOT/WEB-INF/lib/kotlin-stdlib-jdk7-1.5.10.jar" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/target/ROOT/WEB-INF/lib/kotlin-stdlib-jdk8-1.5.10.jar" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/target/ROOT/WEB-INF/lib/robot_common-1.0.8.jar" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/target/ROOT/WEB-INF/lib/taurus-core-1.0.1.jar" beforeDir="false" afterPath="$PROJECT_DIR$/target/ROOT/WEB-INF/lib/taurus-core-1.0.1.jar" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/target/ROOT/WEB-INF/lib/taurus-permanent-1.0.1.jar" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/target/ROOT/WEB-INF/lib/taurus-web-1.0.1.jar" beforeDir="false" afterPath="$PROJECT_DIR$/target/ROOT/WEB-INF/lib/taurus-web-1.0.1.jar" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/target/ROOT/WEB-INF/lib/undertow-core-2.0.16.Final.jar" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/target/ROOT/WEB-INF/lib/xnio-api-3.3.8.Final.jar" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/target/ROOT/WEB-INF/lib/xnio-nio-3.3.8.Final.jar" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/target/ROOT/config/taurus-core.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/ROOT/config/taurus-core.xml" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/target/classes/com/group/MainServer$1.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/group/MainServer$1.class" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/target/classes/com/group/MainServer$2.class" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/target/classes/com/group/MainServer.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/group/MainServer.class" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/target/classes/com/group/controller/GroupController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/group/controller/GroupController.class" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/target/classes/com/group/job/UpdatePlayRoomJob.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/group/job/UpdatePlayRoomJob.class" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/target/classes/com/group/service/GroupService.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/group/service/GroupService.class" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/compile/createdFiles.lst" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/compile/inputFiles.lst" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/testCompile/testCompile/createdFiles.lst" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/testCompile/testCompile/inputFiles.lst" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/target/test-classes/web_group/Main.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/test-classes/web_group/Main.class" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../web_login20/src/main/java/com/mjlogin/service/AccountService.java" beforeDir="false" afterPath="$PROJECT_DIR$/../web_login20/src/main/java/com/mjlogin/service/AccountService.java" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../web_login20/target/ROOT.war" beforeDir="false" afterPath="$PROJECT_DIR$/../web_login20/target/ROOT.war" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../web_login20/target/ROOT/WEB-INF/classes/com/mjlogin/service/AccountService.class" beforeDir="false" afterPath="$PROJECT_DIR$/../web_login20/target/ROOT/WEB-INF/classes/com/mjlogin/service/AccountService.class" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../web_login20/target/ROOT/WEB-INF/lib/data_cache-1.0.1.jar" beforeDir="false" afterPath="$PROJECT_DIR$/../web_login20/target/ROOT/WEB-INF/lib/data_cache-1.0.1.jar" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../web_login20/target/ROOT/WEB-INF/lib/taurus-core-1.0.1.jar" beforeDir="false" afterPath="$PROJECT_DIR$/../web_login20/target/ROOT/WEB-INF/lib/taurus-core-1.0.1.jar" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../web_login20/target/ROOT/WEB-INF/lib/taurus-web-1.0.1.jar" beforeDir="false" afterPath="$PROJECT_DIR$/../web_login20/target/ROOT/WEB-INF/lib/taurus-web-1.0.1.jar" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../web_login20/target/classes/com/mjlogin/service/AccountService.class" beforeDir="false" afterPath="$PROJECT_DIR$/../web_login20/target/classes/com/mjlogin/service/AccountService.class" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../web_login20/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/../web_login20/target/maven-archiver/pom.properties" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../web_login20/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/../web_login20/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../web_login20/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/../web_login20/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../web_login20/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/../web_login20/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../web_login20/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/../web_login20/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../libs/data_cache/target/data_cache.jar" beforeDir="false" afterPath="$PROJECT_DIR$/../../libs/data_cache/target/data_cache.jar" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../libs/data_cache/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/../../libs/data_cache/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../libs/game_common/target/game_common-1.0.0.jar" beforeDir="false" afterPath="$PROJECT_DIR$/../../libs/game_common/target/game_common-1.0.0.jar" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../libs/game_common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/../../libs/game_common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../libs/robot_common/.classpath" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../libs/robot_common/.gitignore" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../libs/robot_common/.idea/.gitignore" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../libs/robot_common/.idea/compiler.xml" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../libs/robot_common/.idea/encodings.xml" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../libs/robot_common/.idea/jarRepositories.xml" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../libs/robot_common/.idea/kotlinc.xml" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../libs/robot_common/.idea/misc.xml" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../libs/robot_common/.idea/vcs.xml" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../libs/robot_common/.project" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../libs/robot_common/.settings/org.eclipse.core.resources.prefs" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../libs/robot_common/.settings/org.eclipse.jdt.apt.core.prefs" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../libs/robot_common/.settings/org.eclipse.jdt.core.prefs" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../libs/robot_common/.settings/org.eclipse.m2e.core.prefs" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../libs/robot_common/config/log4j.properties" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../libs/robot_common/config/taurus-core.xml" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../libs/robot_common/pom.xml" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../libs/robot_common/src/main/java/hunan/DoTest.java" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../libs/robot_common/src/main/java/hunan/HandAnalysis.java" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../libs/robot_common/src/main/java/hunan/HuNanChangSha.java" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../libs/robot_common/src/main/java/hunan/HuNanFangPaoFa.java" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../libs/robot_common/src/main/java/hunan/HuNanHongZhong.java" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../libs/robot_common/src/main/java/hunan/HuNanPaoDeKuai.java" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../libs/robot_common/src/main/java/hunan/HuNanZhuanZhuan.java" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../libs/robot_common/src/main/java/hunan/JiQiRens.java" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../libs/robot_common/src/main/java/taurus/client/HttpClient.java" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../libs/robot_common/src/main/java/taurus/client/ISocketLayer.java" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../libs/robot_common/src/main/java/taurus/client/Message.java" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../libs/robot_common/src/main/java/taurus/client/MessageResponse.java" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../libs/robot_common/src/main/java/taurus/client/NetManager.java" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../libs/robot_common/src/main/java/taurus/client/SocketCode.java" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../libs/robot_common/src/main/java/taurus/client/TaurusClient.java" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../libs/robot_common/src/main/java/taurus/client/ThreadManager.java" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../libs/robot_common/src/main/java/taurus/client/business/AccountBusiness.java" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../libs/robot_common/src/main/java/taurus/client/business/GroupRoomBusiness.java" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../libs/robot_common/src/main/java/taurus/client/business/RoomBusiness.java" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../libs/robot_common/src/main/java/taurus/client/io/IOHandler.java" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../libs/robot_common/src/main/java/taurus/client/io/ISocket.java" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../libs/robot_common/src/main/java/taurus/client/io/LagMonitor.java" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../libs/robot_common/src/main/java/taurus/client/io/Packet.java" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../libs/robot_common/src/main/java/taurus/client/io/SocketEngine.java" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../libs/robot_common/src/main/java/taurus/client/io/SocketState.java" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../libs/robot_common/src/main/java/taurus/client/io/SocketTcp.java" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../libs/robot_common/src/main/java/taurus/client/io/SystemController.java" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../libs/robot_common/src/main/java/taurus/client/io/TSocketException.java" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../libs/robot_common/src/main/java/taurus/newRobot/AddRedisRobot.java" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../libs/robot_common/src/main/java/taurus/newRobot/AddRoomRobot.java" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../libs/robot_common/src/main/java/taurus/newRobot/jiqiren.java" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../libs/robot_common/src/main/java/taurus/newRobot/lianjiejiqiren.java" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../libs/robot_common/src/main/java/taurus/util/CardConfig.java" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../libs/robot_common/src/main/java/taurus/util/CardGroup.java" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../libs/robot_common/src/main/java/taurus/util/CardObj.java" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../libs/robot_common/src/main/java/taurus/util/CardUtil.java" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../libs/robot_common/src/main/java/taurus/util/ChangShaSuanFaTest.java" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../libs/robot_common/src/main/java/taurus/util/ChangshaMahjongAI.java" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../libs/robot_common/src/main/java/taurus/util/ChangshaWinSplitCard.java" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../libs/robot_common/src/main/java/taurus/util/Config.java" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../libs/robot_common/src/main/java/taurus/util/GroupDatas.java" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../libs/robot_common/src/main/java/taurus/util/HongZhongSuanFaTest.java" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../libs/robot_common/src/main/java/taurus/util/NewChangshaSuanFaTest.java" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../libs/robot_common/src/main/java/taurus/util/Paixing.java" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../libs/robot_common/src/main/java/taurus/util/PaoDeKuaiSuanFaTest.java" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../libs/robot_common/src/main/java/taurus/util/PlayerState.java" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../libs/robot_common/src/main/java/taurus/util/TinHuChi.java" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../libs/robot_common/src/main/java/taurus/util/TinHuGang.java" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../libs/robot_common/src/main/java/taurus/util/TinHuPeng.java" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../libs/robot_common/src/main/java/taurus/util/TingPaiChecker.java" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../libs/robot_common/src/main/java/taurus/util/TryPutCard.java" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../libs/robot_common/src/main/java/taurus/util/WinCard.java" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../libs/robot_common/src/main/java/taurus/util/WinCardType.java" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../libs/robot_common/src/main/java/taurus/util/ZhuanZhuanSuanFaTest.java" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../libs/robot_common/src/main/java/taurus/util/ai.java" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../libs/robot_common/src/main/java/taurus/util/test.java" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../libs/robot_common/src/main/java/taurus/util/test1.java" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../libs/robot_common/src/main/java/taurus/util/test99.java" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../libs/robot_common/src/main/java/taurus/util/zuixin.java" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../libs/robot_common/src/test/java/Test.java" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../libs/robot_common/src/test/java/Test2.java" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../libs/robot_common/src/test/java/test6.java" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../libs/robot_common/src/test/java/test7.java" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../libs/taurus-server/taurus-core/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/../../libs/taurus-server/taurus-core/target/maven-archiver/pom.properties" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../libs/taurus-server/taurus-core/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/../../libs/taurus-server/taurus-core/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../libs/taurus-server/taurus-core/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/../../libs/taurus-server/taurus-core/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../libs/taurus-server/taurus-core/target/surefire-reports/2026-01-01T08-00-11_978.dumpstream" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../libs/taurus-server/taurus-core/target/surefire-reports/TEST-Test.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../../libs/taurus-server/taurus-core/target/surefire-reports/TEST-Test.xml" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../libs/taurus-server/taurus-core/target/taurus-core-1.0.1-sources.jar" beforeDir="false" afterPath="$PROJECT_DIR$/../../libs/taurus-server/taurus-core/target/taurus-core-1.0.1-sources.jar" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../libs/taurus-server/taurus-core/target/taurus-core-1.0.1.jar" beforeDir="false" afterPath="$PROJECT_DIR$/../../libs/taurus-server/taurus-core/target/taurus-core-1.0.1.jar" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../libs/taurus-server/taurus-permanent/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/../../libs/taurus-server/taurus-permanent/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../libs/taurus-server/taurus-permanent/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/../../libs/taurus-server/taurus-permanent/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../libs/taurus-server/taurus-permanent/target/surefire-reports/2026-01-01T08-00-11_978.dumpstream" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../libs/taurus-server/taurus-permanent/target/surefire-reports/TEST-com.taurus.TestExtension.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../../libs/taurus-server/taurus-permanent/target/surefire-reports/TEST-com.taurus.TestExtension.xml" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../libs/taurus-server/taurus-permanent/target/surefire-reports/com.taurus.TestExtension.txt" beforeDir="false" afterPath="$PROJECT_DIR$/../../libs/taurus-server/taurus-permanent/target/surefire-reports/com.taurus.TestExtension.txt" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../libs/taurus-server/taurus-permanent/target/taurus-permanent-1.0.1.jar" beforeDir="false" afterPath="$PROJECT_DIR$/../../libs/taurus-server/taurus-permanent/target/taurus-permanent-1.0.1.jar" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../libs/taurus-server/taurus-server.iml" beforeDir="false" afterPath="$PROJECT_DIR$/../../libs/taurus-server/taurus-server.iml" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../libs/taurus-server/taurus-web/src/main/java/com/taurus/web/WebFilter.java" beforeDir="false" afterPath="$PROJECT_DIR$/../../libs/taurus-server/taurus-web/src/main/java/com/taurus/web/WebFilter.java" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../libs/taurus-server/taurus-web/target/classes/com/taurus/web/WebFilter.class" beforeDir="false" afterPath="$PROJECT_DIR$/../../libs/taurus-server/taurus-web/target/classes/com/taurus/web/WebFilter.class" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../libs/taurus-server/taurus-web/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/../../libs/taurus-server/taurus-web/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../libs/taurus-server/taurus-web/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/../../libs/taurus-server/taurus-web/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../libs/taurus-server/taurus-web/target/surefire-reports/2026-01-01T08-00-11_978.dumpstream" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../libs/taurus-server/taurus-web/target/surefire-reports/TEST-com.taurus.Test.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../../libs/taurus-server/taurus-web/target/surefire-reports/TEST-com.taurus.Test.xml" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../libs/taurus-server/taurus-web/target/surefire-reports/com.taurus.Test.txt" beforeDir="false" afterPath="$PROJECT_DIR$/../../libs/taurus-server/taurus-web/target/surefire-reports/com.taurus.Test.txt" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../libs/taurus-server/taurus-web/target/taurus-web-1.0.1.jar" beforeDir="false" afterPath="$PROJECT_DIR$/../../libs/taurus-server/taurus-web/target/taurus-web-1.0.1.jar" afterDir="false" />
|
|
||||||
</list>
|
</list>
|
||||||
<option name="SHOW_DIALOG" value="false" />
|
<option name="SHOW_DIALOG" value="false" />
|
||||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||||
|
|
@ -249,7 +74,7 @@
|
||||||
<option name="number" value="Default" />
|
<option name="number" value="Default" />
|
||||||
<option name="presentableId" value="Default" />
|
<option name="presentableId" value="Default" />
|
||||||
<updated>1770034638903</updated>
|
<updated>1770034638903</updated>
|
||||||
<workItem from="1770034639979" duration="755000" />
|
<workItem from="1770034639979" duration="1384000" />
|
||||||
</task>
|
</task>
|
||||||
<servers />
|
<servers />
|
||||||
</component>
|
</component>
|
||||||
|
|
|
||||||
|
|
@ -81,6 +81,7 @@ public class UpdatePlayRoomJob implements Job{
|
||||||
int max_value = pid * 10000 + 9999;
|
int max_value = pid * 10000 + 9999;
|
||||||
String grooms_key = GroupCache.genRoomsKey(groupId);
|
String grooms_key = GroupCache.genRoomsKey(groupId);
|
||||||
rooms = jedis.zrevrangeByScore(grooms_key, max_value, min_value);
|
rooms = jedis.zrevrangeByScore(grooms_key, max_value, min_value);
|
||||||
|
int qfroomnum = 0;
|
||||||
for (String room : rooms) {
|
for (String room : rooms) {
|
||||||
List<String> room_list = Redis.use("group1_db0").hmget(room, "fake", "status", "round", "id", "times", "players");
|
List<String> 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) {
|
if (fake_json == null) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
qfroomnum++;
|
||||||
|
|
||||||
String status = room_list.get(1);
|
String status = room_list.get(1);
|
||||||
if (StringUtil.isEmpty(status)) {
|
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;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
@ -121,6 +123,7 @@ public class UpdatePlayRoomJob implements Job{
|
||||||
if (StringUtil.isNotEmpty(exist))
|
if (StringUtil.isNotEmpty(exist))
|
||||||
{
|
{
|
||||||
createGroupRoom(groupId, pid);
|
createGroupRoom(groupId, pid);
|
||||||
|
|
||||||
}
|
}
|
||||||
}finally {
|
}finally {
|
||||||
jedis.close();
|
jedis.close();
|
||||||
|
|
@ -219,12 +222,22 @@ public class UpdatePlayRoomJob implements Job{
|
||||||
for (String room : rooms) {
|
for (String room : rooms) {
|
||||||
List<String> room_list = Redis.use("group1_db0").hmget(room, "fake", "status", "round", "id", "times", "players", "create_time", "fake_existTime");
|
List<String> 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 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));
|
ITArray players = TArray.newFromJsonData(room_list.get(5));
|
||||||
|
|
||||||
if(players.size()==0) {
|
/*if(players.size()==0) {
|
||||||
//清理空桌
|
//清理空桌
|
||||||
GroupPublisherService.delRoomEvt(groupId, roomId);
|
GroupPublisherService.delRoomEvt(groupId, roomId);
|
||||||
jedis.zrem(grooms_key, room);
|
jedis.zrem(grooms_key, room);
|
||||||
|
|
@ -233,7 +246,7 @@ public class UpdatePlayRoomJob implements Job{
|
||||||
Redis.use().expire(room, 20);
|
Redis.use().expire(room, 20);
|
||||||
logger.error("del 空 room:" + roomId + " player:"+room_list.get(5) + " fake_json:");
|
logger.error("del 空 room:" + roomId + " player:"+room_list.get(5) + " fake_json:");
|
||||||
continue;
|
continue;
|
||||||
}
|
}*/
|
||||||
|
|
||||||
String fake_json = room_list.get(0);
|
String fake_json = room_list.get(0);
|
||||||
if (fake_json == null)
|
if (fake_json == null)
|
||||||
|
|
|
||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue