diff --git a/web_group/.idea/.gitignore b/web_group/.idea/.gitignore new file mode 100644 index 0000000..b6b1ecf --- /dev/null +++ b/web_group/.idea/.gitignore @@ -0,0 +1,10 @@ +# 默认忽略的文件 +/shelf/ +/workspace.xml +# 已忽略包含查询文件的默认文件夹 +/queries/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml +# 基于编辑器的 HTTP 客户端请求 +/httpRequests/ diff --git a/web_group/.idea/compiler.xml b/web_group/.idea/compiler.xml new file mode 100644 index 0000000..4a6d16d --- /dev/null +++ b/web_group/.idea/compiler.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/web_group/.idea/encodings.xml b/web_group/.idea/encodings.xml new file mode 100644 index 0000000..aa00ffa --- /dev/null +++ b/web_group/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/web_group/.idea/jarRepositories.xml b/web_group/.idea/jarRepositories.xml new file mode 100644 index 0000000..57d58a3 --- /dev/null +++ b/web_group/.idea/jarRepositories.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/web_group/.idea/misc.xml b/web_group/.idea/misc.xml new file mode 100644 index 0000000..b784bbc --- /dev/null +++ b/web_group/.idea/misc.xml @@ -0,0 +1,12 @@ + + + + + + + + \ No newline at end of file diff --git a/web_group/.idea/vcs.xml b/web_group/.idea/vcs.xml new file mode 100644 index 0000000..6c0b863 --- /dev/null +++ b/web_group/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/web_group/src/main/webapp/config/log4j.properties b/web_group/src/main/webapp/config/log4j.properties new file mode 100644 index 0000000..6786dba --- /dev/null +++ b/web_group/src/main/webapp/config/log4j.properties @@ -0,0 +1,20 @@ + +log4j.rootLogger = INFO,consoleAppender,fileAppender + +# ConsoleAppender +log4j.appender.consoleAppender=org.apache.log4j.ConsoleAppender +log4j.appender.consoleAppender.layout=org.apache.log4j.PatternLayout +log4j.appender.consoleAppender.layout.ConversionPattern=%d{HH:mm:ss,SSS} %-5p [%t] %c{2} %3x - %m%n + + +# Regular FileAppender +log4j.appender.fileAppender=org.apache.log4j.DailyRollingFileAppender +log4j.appender.fileAppender.layout=org.apache.log4j.PatternLayout +log4j.appender.fileAppender.File=${WORKDIR}/logs/web_main.log +log4j.appender.fileAppender.layout.ConversionPattern=%d{dd MMM yyyy | HH:mm:ss,SSS} | %-5p | %t | %c{3} | %3x | %m%n +log4j.appender.fileAppender.Encoding=UTF-8 +log4j.appender.fileAppender.DatePattern='.'yyyy-MM-dd +log4j.appender.dailyFile.Append=true + +# The file is rolled over very day +log4j.appender.fileAppender.DatePattern ='.'yyyy-MM-dd \ No newline at end of file diff --git a/web_group/src/main/webapp/config/taurus-core.xml b/web_group/src/main/webapp/config/taurus-core.xml index 6f0b48d..3231273 100644 --- a/web_group/src/main/webapp/config/taurus-core.xml +++ b/web_group/src/main/webapp/config/taurus-core.xml @@ -43,9 +43,9 @@ db1 com.mysql.cj.jdbc.Driver - jdbc:mysql://8.134.123.86:8060/wb_game + jdbc:mysql://127.0.0.1:8060/wb_game root - root + e04e7aff87727e14 diff --git a/web_group/src/main/webapp/logs/web_main.log b/web_group/src/main/webapp/logs/web_main.log new file mode 100644 index 0000000..e69de29 diff --git a/web_group/target/ROOT.war b/web_group/target/ROOT.war index 8e97d2c..4275eac 100644 Binary files a/web_group/target/ROOT.war and b/web_group/target/ROOT.war differ diff --git a/web_group/target/ROOT/WEB-INF/classes/com/group/controller/GroupRoomController.class b/web_group/target/ROOT/WEB-INF/classes/com/group/controller/GroupRoomController.class index fbb4d46..03949e5 100644 Binary files a/web_group/target/ROOT/WEB-INF/classes/com/group/controller/GroupRoomController.class and b/web_group/target/ROOT/WEB-INF/classes/com/group/controller/GroupRoomController.class differ diff --git a/web_group/target/ROOT/WEB-INF/classes/com/group/service/GroupLogService.class b/web_group/target/ROOT/WEB-INF/classes/com/group/service/GroupLogService.class index ff2742a..926357e 100644 Binary files a/web_group/target/ROOT/WEB-INF/classes/com/group/service/GroupLogService.class and b/web_group/target/ROOT/WEB-INF/classes/com/group/service/GroupLogService.class differ diff --git a/web_group/target/ROOT/WEB-INF/classes/com/group/service/GroupRoomService.class b/web_group/target/ROOT/WEB-INF/classes/com/group/service/GroupRoomService.class index d1cd9f5..b355156 100644 Binary files a/web_group/target/ROOT/WEB-INF/classes/com/group/service/GroupRoomService.class and b/web_group/target/ROOT/WEB-INF/classes/com/group/service/GroupRoomService.class differ diff --git a/web_group/target/ROOT/WEB-INF/classes/com/group/service/GroupService.class b/web_group/target/ROOT/WEB-INF/classes/com/group/service/GroupService.class index c56bb12..47f3358 100644 Binary files a/web_group/target/ROOT/WEB-INF/classes/com/group/service/GroupService.class and b/web_group/target/ROOT/WEB-INF/classes/com/group/service/GroupService.class differ diff --git a/web_group/target/ROOT/WEB-INF/lib/data_cache-1.0.1.jar b/web_group/target/ROOT/WEB-INF/lib/data_cache-1.0.1.jar index 880a688..c02b8ab 100644 Binary files a/web_group/target/ROOT/WEB-INF/lib/data_cache-1.0.1.jar and b/web_group/target/ROOT/WEB-INF/lib/data_cache-1.0.1.jar differ diff --git a/web_group/target/ROOT/WEB-INF/lib/taurus-core-1.0.1.jar b/web_group/target/ROOT/WEB-INF/lib/taurus-core-1.0.1.jar index 41b6c73..dce887b 100644 Binary files a/web_group/target/ROOT/WEB-INF/lib/taurus-core-1.0.1.jar and b/web_group/target/ROOT/WEB-INF/lib/taurus-core-1.0.1.jar differ diff --git a/web_group/target/ROOT/WEB-INF/lib/taurus-web-1.0.1.jar b/web_group/target/ROOT/WEB-INF/lib/taurus-web-1.0.1.jar index 19fd6a0..9cdcedc 100644 Binary files a/web_group/target/ROOT/WEB-INF/lib/taurus-web-1.0.1.jar and b/web_group/target/ROOT/WEB-INF/lib/taurus-web-1.0.1.jar differ diff --git a/web_group/target/classes/com/group/controller/GroupRoomController.class b/web_group/target/classes/com/group/controller/GroupRoomController.class index fbb4d46..03949e5 100644 Binary files a/web_group/target/classes/com/group/controller/GroupRoomController.class and b/web_group/target/classes/com/group/controller/GroupRoomController.class differ diff --git a/web_group/target/classes/com/group/service/GroupLogService.class b/web_group/target/classes/com/group/service/GroupLogService.class index ff2742a..926357e 100644 Binary files a/web_group/target/classes/com/group/service/GroupLogService.class and b/web_group/target/classes/com/group/service/GroupLogService.class differ diff --git a/web_group/target/classes/com/group/service/GroupRoomService.class b/web_group/target/classes/com/group/service/GroupRoomService.class index d1cd9f5..b355156 100644 Binary files a/web_group/target/classes/com/group/service/GroupRoomService.class and b/web_group/target/classes/com/group/service/GroupRoomService.class differ diff --git a/web_group/target/classes/com/group/service/GroupService.class b/web_group/target/classes/com/group/service/GroupService.class index c56bb12..47f3358 100644 Binary files a/web_group/target/classes/com/group/service/GroupService.class and b/web_group/target/classes/com/group/service/GroupService.class differ diff --git a/web_group/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/web_group/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst index 643b752..bcd64b7 100644 --- a/web_group/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ b/web_group/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -1,8 +1,6 @@ com\group\controller\GroupLogController.class -com\group\service\GroupRoomService.class com\group\controller\GroupController.class com\group\Protocol.class -com\group\job\UpdatePlayRoomJob.class com\group\controller\GroupRoomController.class com\group\MainServer.class com\group\service\GroupLogService.class @@ -10,4 +8,3 @@ com\group\WebInterceptor.class com\group\service\RSAUtils.class com\group\MainServer$1.class com\group\service\GroupService.class -com\group\service\GroupPublisherService.class diff --git a/web_group/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/web_group/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst index b619c3e..50184c3 100644 --- a/web_group/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ b/web_group/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -1,12 +1,12 @@ -D:\cuican\server\web_group\src\main\java\com\group\WebInterceptor.java -D:\cuican\server\web_group\src\main\java\com\group\service\GroupService.java -D:\cuican\server\web_group\src\main\java\com\group\service\RSAUtils.java -D:\cuican\server\web_group\src\main\java\com\group\service\GroupLogService.java -D:\cuican\server\web_group\src\main\java\com\group\service\GroupRoomService.java -D:\cuican\server\web_group\src\main\java\com\group\job\UpdatePlayRoomJob.java -D:\cuican\server\web_group\src\main\java\com\group\Protocol.java -D:\cuican\server\web_group\src\main\java\com\group\MainServer.java -D:\cuican\server\web_group\src\main\java\com\group\service\GroupPublisherService.java -D:\cuican\server\web_group\src\main\java\com\group\controller\GroupLogController.java -D:\cuican\server\web_group\src\main\java\com\group\controller\GroupController.java -D:\cuican\server\web_group\src\main\java\com\group\controller\GroupRoomController.java +D:\project\changhong\changhongserver\web_group\src\main\java\com\group\controller\GroupController.java +D:\project\changhong\changhongserver\web_group\src\main\java\com\group\controller\GroupLogController.java +D:\project\changhong\changhongserver\web_group\src\main\java\com\group\controller\GroupRoomController.java +D:\project\changhong\changhongserver\web_group\src\main\java\com\group\job\UpdatePlayRoomJob.java +D:\project\changhong\changhongserver\web_group\src\main\java\com\group\MainServer.java +D:\project\changhong\changhongserver\web_group\src\main\java\com\group\Protocol.java +D:\project\changhong\changhongserver\web_group\src\main\java\com\group\service\GroupLogService.java +D:\project\changhong\changhongserver\web_group\src\main\java\com\group\service\GroupPublisherService.java +D:\project\changhong\changhongserver\web_group\src\main\java\com\group\service\GroupRoomService.java +D:\project\changhong\changhongserver\web_group\src\main\java\com\group\service\GroupService.java +D:\project\changhong\changhongserver\web_group\src\main\java\com\group\service\RSAUtils.java +D:\project\changhong\changhongserver\web_group\src\main\java\com\group\WebInterceptor.java diff --git a/web_group/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst b/web_group/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst index 913e06f..5c881e2 100644 --- a/web_group/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst +++ b/web_group/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst @@ -1,2 +1,2 @@ -D:\cuican\server\web_group\src\test\java\web_group\DataClearUtils.java -D:\cuican\server\web_group\src\test\java\web_group\Main.java +D:\project\changhong\changhongserver\web_group\src\test\java\web_group\DataClearUtils.java +D:\project\changhong\changhongserver\web_group\src\test\java\web_group\Main.java