diff --git a/Common/build/classes/common/Config.class b/Common/build/classes/common/Config.class index 124f434..94fa2da 100644 Binary files a/Common/build/classes/common/Config.class and b/Common/build/classes/common/Config.class differ diff --git a/Common/build/classes/common/Const.class b/Common/build/classes/common/Const.class index c16b772..b12949b 100644 Binary files a/Common/build/classes/common/Const.class and b/Common/build/classes/common/Const.class differ diff --git a/Common/build/classes/common/LangSelector$PlaceHolder.class b/Common/build/classes/common/LangSelector$PlaceHolder.class index 38558ea..a2d5741 100644 Binary files a/Common/build/classes/common/LangSelector$PlaceHolder.class and b/Common/build/classes/common/LangSelector$PlaceHolder.class differ diff --git a/Common/build/classes/common/LangSelector.class b/Common/build/classes/common/LangSelector.class index 602e1b0..140dd0c 100644 Binary files a/Common/build/classes/common/LangSelector.class and b/Common/build/classes/common/LangSelector.class differ diff --git a/Common/build/classes/persistence/oj_beans/SolutionBean.class b/Common/build/classes/persistence/oj_beans/SolutionBean.class index af64195..397a7b0 100644 Binary files a/Common/build/classes/persistence/oj_beans/SolutionBean.class and b/Common/build/classes/persistence/oj_beans/SolutionBean.class differ diff --git a/Common/dist/Common.jar b/Common/dist/Common.jar index be2d03d..437ffc1 100644 Binary files a/Common/dist/Common.jar and b/Common/dist/Common.jar differ diff --git a/Common/log/log_2024043021.txt b/Common/log/log_2024043021.txt new file mode 100644 index 0000000..ccfb390 --- /dev/null +++ b/Common/log/log_2024043021.txt @@ -0,0 +1,10 @@ +2024-04-30 21:19:22[INFO]Log message 0 +2024-04-30 21:19:22[INFO]Log message 1 +2024-04-30 21:19:22[INFO]Log message 2 +2024-04-30 21:19:22[INFO]Log message 3 +2024-04-30 21:19:22[INFO]Log message 4 +2024-04-30 21:19:22[INFO]Log message 5 +2024-04-30 21:19:22[INFO]Log message 6 +2024-04-30 21:19:22[INFO]Log message 7 +2024-04-30 21:19:22[INFO]Log message 8 +2024-04-30 21:19:22[INFO]Log message 9 diff --git a/Common/log_2024043021.txt b/Common/log_2024043021.txt new file mode 100644 index 0000000..6210fa7 --- /dev/null +++ b/Common/log_2024043021.txt @@ -0,0 +1,32 @@ +2024-04-30 21:09:04[INFO]Log message 0 +2024-04-30 21:09:09[INFO]Log message 1 +2024-04-30 21:09:14[INFO]Log message 2 +2024-04-30 21:09:19[INFO]Log message 3 +2024-04-30 21:09:24[INFO]Log message 4 +2024-04-30 21:09:29[INFO]Log message 5 +2024-04-30 21:09:34[INFO]Log message 6 +2024-04-30 21:09:39[INFO]Log message 7 +2024-04-30 21:09:44[INFO]Log message 8 +2024-04-30 21:09:49[INFO]Log message 9 +2024-04-30 21:11:19[INFO]Log message 0 +2024-04-30 21:11:26[INFO]Log message 1 +2024-04-30 21:11:38[INFO]Log message 0 +2024-04-30 21:11:38[INFO]Log message 1 +2024-04-30 21:11:38[INFO]Log message 2 +2024-04-30 21:11:38[INFO]Log message 3 +2024-04-30 21:11:38[INFO]Log message 4 +2024-04-30 21:11:38[INFO]Log message 5 +2024-04-30 21:11:38[INFO]Log message 6 +2024-04-30 21:11:38[INFO]Log message 7 +2024-04-30 21:11:38[INFO]Log message 8 +2024-04-30 21:11:38[INFO]Log message 9 +2024-04-30 21:13:00[INFO]Log message 0 +2024-04-30 21:13:00[INFO]Log message 1 +2024-04-30 21:13:00[INFO]Log message 2 +2024-04-30 21:13:00[INFO]Log message 3 +2024-04-30 21:13:00[INFO]Log message 4 +2024-04-30 21:13:00[INFO]Log message 5 +2024-04-30 21:13:00[INFO]Log message 6 +2024-04-30 21:13:00[INFO]Log message 7 +2024-04-30 21:13:00[INFO]Log message 8 +2024-04-30 21:13:00[INFO]Log message 9 diff --git a/Common/nbproject/private/private.xml b/Common/nbproject/private/private.xml index 087b6dd..eb1fa70 100644 --- a/Common/nbproject/private/private.xml +++ b/Common/nbproject/private/private.xml @@ -4,10 +4,15 @@ - file:/K:/OJ/Common/test/common/LangSelectorTest.java - file:/K:/OJ/Common/src/common/Const.java + file:/K:/OJ/Common/src/common/EscapeXml.java + file:/K:/OJ/Common/src/log/Log.java file:/K:/OJ/Common/src/common/Config.java + file:/K:/OJ/Common/src/common/DBConfig.java + file:/K:/OJ/Common/src/persistence/oj_beans/ProblemTestCaseBean.java file:/K:/OJ/Common/src/common/FileFinder.java + file:/K:/OJ/Common/src/common/LogLevel.java + file:/K:/OJ/Common/src/common/TimeTool.java + file:/K:/OJ/Common/src/common/Logger.java file:/K:/OJ/Common/src/common/LangSelector.java diff --git a/Common/src/common/EscapeXml.java b/Common/src/common/EscapeXml.java new file mode 100644 index 0000000..69c8f1d --- /dev/null +++ b/Common/src/common/EscapeXml.java @@ -0,0 +1,34 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package common; + +/** + * + * @author tange + */ +public class EscapeXml { + // 手动转义特殊字符为 XML 实体 + public static String escapeXml(String input) { + if(input.length()>1000) + input=input.substring(0,1000); + StringBuilder builder = new StringBuilder(); + for (char c : input.toCharArray()) { + switch (c) { + case '<': + builder.append("<"); + break; + case '>': + builder.append(">"); + break; + + default: + builder.append(c); + break; + } + } + return builder.toString(); + } +} diff --git a/JuderUI/Main.obj b/JuderUI/Main.obj new file mode 100644 index 0000000..58792c2 Binary files /dev/null and b/JuderUI/Main.obj differ diff --git a/JuderUI/build/built-jar.properties b/JuderUI/build/built-jar.properties index c8cc883..69f7c42 100644 --- a/JuderUI/build/built-jar.properties +++ b/JuderUI/build/built-jar.properties @@ -1,4 +1,4 @@ -#Sat, 13 Jan 2024 20:50:26 +0800 +#Sat, 18 May 2024 23:00:00 +0800 K\:\\OJ\\JuderUI= diff --git a/JuderUI/build/classes/META-INF/jax-ws-catalog.xml b/JuderUI/build/classes/META-INF/jax-ws-catalog.xml index c090d75..ced1306 100644 --- a/JuderUI/build/classes/META-INF/jax-ws-catalog.xml +++ b/JuderUI/build/classes/META-INF/jax-ws-catalog.xml @@ -3,4 +3,6 @@ + + \ No newline at end of file diff --git a/JuderUI/build/classes/data/JudgeFromQueue.class b/JuderUI/build/classes/data/JudgeFromQueue.class index 0135869..a1aa812 100644 Binary files a/JuderUI/build/classes/data/JudgeFromQueue.class and b/JuderUI/build/classes/data/JudgeFromQueue.class differ diff --git a/JuderUI/build/classes/data/MainForNet.class b/JuderUI/build/classes/data/MainForNet.class index 6ad9155..30424fc 100644 Binary files a/JuderUI/build/classes/data/MainForNet.class and b/JuderUI/build/classes/data/MainForNet.class differ diff --git a/JuderUI/build/classes/edu/dhu/ws/OJWS_Service.class b/JuderUI/build/classes/edu/dhu/ws/OJWS_Service.class index e20dcd0..a8eec9d 100644 Binary files a/JuderUI/build/classes/edu/dhu/ws/OJWS_Service.class and b/JuderUI/build/classes/edu/dhu/ws/OJWS_Service.class differ diff --git a/JuderUI/build/classes/gui/Control.class b/JuderUI/build/classes/gui/Control.class index cce18d6..9d24493 100644 Binary files a/JuderUI/build/classes/gui/Control.class and b/JuderUI/build/classes/gui/Control.class differ diff --git a/JuderUI/build/classes/gui/MainFrame$1.class b/JuderUI/build/classes/gui/MainFrame$1.class index c183ce0..ea4a1f2 100644 Binary files a/JuderUI/build/classes/gui/MainFrame$1.class and b/JuderUI/build/classes/gui/MainFrame$1.class differ diff --git a/JuderUI/build/classes/gui/MainFrame$10.class b/JuderUI/build/classes/gui/MainFrame$10.class index 53914ca..ec21dae 100644 Binary files a/JuderUI/build/classes/gui/MainFrame$10.class and b/JuderUI/build/classes/gui/MainFrame$10.class differ diff --git a/JuderUI/build/classes/gui/MainFrame$11.class b/JuderUI/build/classes/gui/MainFrame$11.class index 3dca7b2..6a470ac 100644 Binary files a/JuderUI/build/classes/gui/MainFrame$11.class and b/JuderUI/build/classes/gui/MainFrame$11.class differ diff --git a/JuderUI/build/classes/gui/MainFrame$12.class b/JuderUI/build/classes/gui/MainFrame$12.class index 48583e6..6a21bb1 100644 Binary files a/JuderUI/build/classes/gui/MainFrame$12.class and b/JuderUI/build/classes/gui/MainFrame$12.class differ diff --git a/JuderUI/build/classes/gui/MainFrame$2.class b/JuderUI/build/classes/gui/MainFrame$2.class index a69c4ee..465fcb8 100644 Binary files a/JuderUI/build/classes/gui/MainFrame$2.class and b/JuderUI/build/classes/gui/MainFrame$2.class differ diff --git a/JuderUI/build/classes/gui/MainFrame$3.class b/JuderUI/build/classes/gui/MainFrame$3.class index e780999..c3e8b90 100644 Binary files a/JuderUI/build/classes/gui/MainFrame$3.class and b/JuderUI/build/classes/gui/MainFrame$3.class differ diff --git a/JuderUI/build/classes/gui/MainFrame$4.class b/JuderUI/build/classes/gui/MainFrame$4.class index f88e55e..0fc0c2f 100644 Binary files a/JuderUI/build/classes/gui/MainFrame$4.class and b/JuderUI/build/classes/gui/MainFrame$4.class differ diff --git a/JuderUI/build/classes/gui/MainFrame$5.class b/JuderUI/build/classes/gui/MainFrame$5.class index 07637a7..2e3a23c 100644 Binary files a/JuderUI/build/classes/gui/MainFrame$5.class and b/JuderUI/build/classes/gui/MainFrame$5.class differ diff --git a/JuderUI/build/classes/gui/MainFrame$6.class b/JuderUI/build/classes/gui/MainFrame$6.class index e12d9a0..590a057 100644 Binary files a/JuderUI/build/classes/gui/MainFrame$6.class and b/JuderUI/build/classes/gui/MainFrame$6.class differ diff --git a/JuderUI/build/classes/gui/MainFrame$7.class b/JuderUI/build/classes/gui/MainFrame$7.class index bdc10ca..320aa36 100644 Binary files a/JuderUI/build/classes/gui/MainFrame$7.class and b/JuderUI/build/classes/gui/MainFrame$7.class differ diff --git a/JuderUI/build/classes/gui/MainFrame$8.class b/JuderUI/build/classes/gui/MainFrame$8.class index e16d3a9..636bb50 100644 Binary files a/JuderUI/build/classes/gui/MainFrame$8.class and b/JuderUI/build/classes/gui/MainFrame$8.class differ diff --git a/JuderUI/build/classes/gui/MainFrame$9.class b/JuderUI/build/classes/gui/MainFrame$9.class index 83f10f4..533369c 100644 Binary files a/JuderUI/build/classes/gui/MainFrame$9.class and b/JuderUI/build/classes/gui/MainFrame$9.class differ diff --git a/JuderUI/build/classes/gui/MainFrame.class b/JuderUI/build/classes/gui/MainFrame.class index 514ef80..2c6483f 100644 Binary files a/JuderUI/build/classes/gui/MainFrame.class and b/JuderUI/build/classes/gui/MainFrame.class differ diff --git a/JuderUI/build/classes/myjdom/AnswerToXml.class b/JuderUI/build/classes/myjdom/AnswerToXml.class index 9275340..b5a9f26 100644 Binary files a/JuderUI/build/classes/myjdom/AnswerToXml.class and b/JuderUI/build/classes/myjdom/AnswerToXml.class differ diff --git a/JuderUI/build/classes/myjdom/XmlToProblemBean.class b/JuderUI/build/classes/myjdom/XmlToProblemBean.class index db74c0e..0daed29 100644 Binary files a/JuderUI/build/classes/myjdom/XmlToProblemBean.class and b/JuderUI/build/classes/myjdom/XmlToProblemBean.class differ diff --git a/JuderUI/build/classes/myjdom/XmlToSolution.class b/JuderUI/build/classes/myjdom/XmlToSolution.class index 4821b21..333d5a3 100644 Binary files a/JuderUI/build/classes/myjdom/XmlToSolution.class and b/JuderUI/build/classes/myjdom/XmlToSolution.class differ diff --git a/JuderUI/build/classes/myjdom/model/Solution.class b/JuderUI/build/classes/myjdom/model/Solution.class index a2376a3..fc2b5d2 100644 Binary files a/JuderUI/build/classes/myjdom/model/Solution.class and b/JuderUI/build/classes/myjdom/model/Solution.class differ diff --git a/JuderUI/build/classes/swingworker/MySwingWorker.class b/JuderUI/build/classes/swingworker/MySwingWorker.class index aefcfc4..0300731 100644 Binary files a/JuderUI/build/classes/swingworker/MySwingWorker.class and b/JuderUI/build/classes/swingworker/MySwingWorker.class differ diff --git a/JuderUI/build/classes/web/Webservice.class b/JuderUI/build/classes/web/Webservice.class index a76431c..0a4d55a 100644 Binary files a/JuderUI/build/classes/web/Webservice.class and b/JuderUI/build/classes/web/Webservice.class differ diff --git a/JuderUI/config/Config.properties b/JuderUI/config/Config.properties index 4023faf..dd8ccec 100644 --- a/JuderUI/config/Config.properties +++ b/JuderUI/config/Config.properties @@ -1,16 +1,16 @@ #update config.properties -#Sat Jan 13 20:50:27 CST 2024 +#Wed May 08 22:08:03 CST 2024 srcDir=G\:\\org\\JuderUI\\test isCppRelative=true relativeJavaCompilerDir=C\:\\Program Files\\Java\\jdk1.8.0_40\\bin Username=felix cCompilerDir=C\:\\\u65B0\u5EFA\u6587\u4EF6\u5939 ThreadNumber=1 -distributorPort=80 +distributorPort=8080 exeDir=G\:\\org\\JuderUI\\TMP MinGWDir=C\:\\MinGW\\bin relativeCCompilerDir=\\MinGW\\bin -distributorIP=106.15.36.190 +distributorIP=192.168.5.1 JavaRelative=3 >>>>>>>=.r76 isJavaRelative=true @@ -21,6 +21,6 @@ javaCompilerDir=\\\\vmware-host\\Shared Folders\\\u6587\u7A3F\\NetBeansProjects\ JavaCompileDir=C\:\\Program Files\\Java\\jdk1.8.0_121\\bin Debug=1 URLaddress=10.202.40.190 -StartThreadAuto=true +StartThreadAuto=false =\=\=\=\=\=\= cppCompilerDir=\\\\vmware-host\\Shared Folders\\\u6587\u7A3F\\NetBeansProjects\\oj\\client\\MinGW\\bin diff --git a/JuderUI/dist.zip b/JuderUI/dist.zip index b7a75f7..342467a 100644 Binary files a/JuderUI/dist.zip and b/JuderUI/dist.zip differ diff --git a/JuderUI/dist/JuderUI.jar b/JuderUI/dist/JuderUI.jar index 1cb903f..c82e2be 100644 Binary files a/JuderUI/dist/JuderUI.jar and b/JuderUI/dist/JuderUI.jar differ diff --git a/JuderUI/dist/dist.zip b/JuderUI/dist/dist.zip deleted file mode 100644 index ecf00bf..0000000 Binary files a/JuderUI/dist/dist.zip and /dev/null differ diff --git a/JuderUI/dist/lib/Common.jar b/JuderUI/dist/lib/Common.jar index 8329a08..437ffc1 100644 Binary files a/JuderUI/dist/lib/Common.jar and b/JuderUI/dist/lib/Common.jar differ diff --git a/JuderUI/dist/lib/Judger.jar b/JuderUI/dist/lib/Judger.jar index d6260c0..f1ad509 100644 Binary files a/JuderUI/dist/lib/Judger.jar and b/JuderUI/dist/lib/Judger.jar differ diff --git a/JuderUI/dist/ICE_JNIRegistry.dll b/JuderUI/dlls/ICE_JNIRegistry.dll similarity index 100% rename from JuderUI/dist/ICE_JNIRegistry.dll rename to JuderUI/dlls/ICE_JNIRegistry.dll diff --git a/JuderUI/dist/libatomic-1.dll b/JuderUI/dlls/libatomic-1.dll similarity index 100% rename from JuderUI/dist/libatomic-1.dll rename to JuderUI/dlls/libatomic-1.dll diff --git a/JuderUI/dist/libcharset-1.dll b/JuderUI/dlls/libcharset-1.dll similarity index 100% rename from JuderUI/dist/libcharset-1.dll rename to JuderUI/dlls/libcharset-1.dll diff --git a/JuderUI/dist/libgcc_s_dw2-1.dll b/JuderUI/dlls/libgcc_s_dw2-1.dll similarity index 100% rename from JuderUI/dist/libgcc_s_dw2-1.dll rename to JuderUI/dlls/libgcc_s_dw2-1.dll diff --git a/JuderUI/dist/libgcc_s_sjlj-1.dll b/JuderUI/dlls/libgcc_s_sjlj-1.dll similarity index 100% rename from JuderUI/dist/libgcc_s_sjlj-1.dll rename to JuderUI/dlls/libgcc_s_sjlj-1.dll diff --git a/JuderUI/dist/libiconv-2.dll b/JuderUI/dlls/libiconv-2.dll similarity index 100% rename from JuderUI/dist/libiconv-2.dll rename to JuderUI/dlls/libiconv-2.dll diff --git a/JuderUI/dist/libintl-8.dll b/JuderUI/dlls/libintl-8.dll similarity index 100% rename from JuderUI/dist/libintl-8.dll rename to JuderUI/dlls/libintl-8.dll diff --git a/JuderUI/dist/libquadmath-0.dll b/JuderUI/dlls/libquadmath-0.dll similarity index 100% rename from JuderUI/dist/libquadmath-0.dll rename to JuderUI/dlls/libquadmath-0.dll diff --git a/JuderUI/dist/libssp-0.dll b/JuderUI/dlls/libssp-0.dll similarity index 100% rename from JuderUI/dist/libssp-0.dll rename to JuderUI/dlls/libssp-0.dll diff --git a/JuderUI/dist/libstdc++-6.dll b/JuderUI/dlls/libstdc++-6.dll similarity index 100% rename from JuderUI/dist/libstdc++-6.dll rename to JuderUI/dlls/libstdc++-6.dll diff --git a/JuderUI/dist/libvtv-0.dll b/JuderUI/dlls/libvtv-0.dll similarity index 100% rename from JuderUI/dist/libvtv-0.dll rename to JuderUI/dlls/libvtv-0.dll diff --git a/JuderUI/dist/libvtv_stubs-0.dll b/JuderUI/dlls/libvtv_stubs-0.dll similarity index 100% rename from JuderUI/dist/libvtv_stubs-0.dll rename to JuderUI/dlls/libvtv_stubs-0.dll diff --git a/JuderUI/dist/libwinpthread-1.dll b/JuderUI/dlls/libwinpthread-1.dll similarity index 100% rename from JuderUI/dist/libwinpthread-1.dll rename to JuderUI/dlls/libwinpthread-1.dll diff --git a/JuderUI/log/log_2024050822.txt b/JuderUI/log/log_2024050822.txt new file mode 100644 index 0000000..a4e4f4a --- /dev/null +++ b/JuderUI/log/log_2024050822.txt @@ -0,0 +1 @@ +2024-05-08 22:08:19[INFO]dubbo diff --git a/JuderUI/nbproject/jax-ws.xml b/JuderUI/nbproject/jax-ws.xml index 22de180..6853051 100644 --- a/JuderUI/nbproject/jax-ws.xml +++ b/JuderUI/nbproject/jax-ws.xml @@ -3,8 +3,8 @@ - http://106.15.36.190:80/oj/webservice/OJWS?wsdl - 106.15.36.190_80/oj/webservice/OJWS.wsdl + https://219.228.76.122:8080/oj/webservice/OJWS?wsdl + 219.228.76.122_8080/oj/webservice/OJWS.wsdl edu.dhu.ws catalog.xml @@ -22,7 +22,7 @@ wsdlLocation - http://106.15.36.190:80/oj/webservice/OJWS?wsdl + https://219.228.76.122:8080/oj/webservice/OJWS?wsdl xnocompile diff --git a/JuderUI/nbproject/jaxws-build.xml b/JuderUI/nbproject/jaxws-build.xml index f412a71..2537a8c 100644 --- a/JuderUI/nbproject/jaxws-build.xml +++ b/JuderUI/nbproject/jaxws-build.xml @@ -18,8 +18,8 @@ - - + + diff --git a/JuderUI/nbproject/private/private.xml b/JuderUI/nbproject/private/private.xml index 02bd7ea..d71b919 100644 --- a/JuderUI/nbproject/private/private.xml +++ b/JuderUI/nbproject/private/private.xml @@ -22,9 +22,15 @@ file:/E:/ojNew/JuderUI/src/data/MainForNet.java - file:/K:/OJ/JuderUI/src/cache/BaseCache.java + file:/K:/OJ/JuderUI/src/myjdom/model/ResultBean.java + file:/K:/OJ/JuderUI/src/data/MainForNet.java + file:/K:/OJ/JuderUI/src/myjdom/AnswerToXml.java + file:/K:/OJ/JuderUI/src/data/JudgeFromQueue.java + file:/K:/OJ/JuderUI/src/web/Dubboservice.java + file:/K:/OJ/JuderUI/src/web/Webservice.java + file:/K:/OJ/JuderUI/src/swingworker/MySwingWorker.java + file:/K:/OJ/JuderUI/src/gui/Control.java file:/K:/OJ/JuderUI/src/gui/MainFrame.java - file:/K:/OJ/JuderUI/src/cache/ProblemsCachManager.java diff --git a/JuderUI/nbproject/project.properties b/JuderUI/nbproject/project.properties index 1070184..7fb68f7 100644 --- a/JuderUI/nbproject/project.properties +++ b/JuderUI/nbproject/project.properties @@ -35,7 +35,22 @@ file.reference.cglib-nodep-2.1.3.jar=../Lib/cglib-nodep-2.1.3.jar file.reference.commons-collections-2.1.1.jar=../Lib/commons-collections-2.1.1.jar file.reference.commons-logging-1.0.4.jar=../Lib/commons-logging-1.0.4.jar file.reference.dom4j-1.6.jar=../Lib/dom4j-1.6.jar +file.reference.druid-1.1.6.jar=../Lib/alibaba/druid-1.1.6.jar +file.reference.dubbo-3.2.0-sources.jar=../Lib/dubbo/dubbo-3.2.0-sources.jar +file.reference.dubbo-3.2.0.jar=../Lib/dubbo/dubbo-3.2.0.jar +file.reference.dubbo-spring-boot-autoconfigure-3.2.0-sources.jar=../Lib/dubbo/dubbo-spring-boot-autoconfigure-3.2.0-sources.jar +file.reference.dubbo-spring-boot-autoconfigure-3.2.0.jar=../Lib/dubbo/dubbo-spring-boot-autoconfigure-3.2.0.jar +file.reference.dubbo-spring-boot-autoconfigure-compatible-3.2.0-sources.jar=../Lib/dubbo/dubbo-spring-boot-autoconfigure-compatible-3.2.0-sources.jar +file.reference.dubbo-spring-boot-autoconfigure-compatible-3.2.0.jar=../Lib/dubbo/dubbo-spring-boot-autoconfigure-compatible-3.2.0.jar +file.reference.dubbo-spring-boot-starter-3.2.0-sources.jar=../Lib/dubbo/dubbo-spring-boot-starter-3.2.0-sources.jar +file.reference.dubbo-spring-boot-starter-3.2.0.jar=../Lib/dubbo/dubbo-spring-boot-starter-3.2.0.jar +file.reference.fastjson-1.2.76.jar=../Lib/alibaba/fastjson-1.2.76.jar +file.reference.fastjson2-2.0.27-sources.jar=../Lib/alibaba/fastjson2-2.0.27-sources.jar +file.reference.fastjson2-2.0.27.jar=../Lib/alibaba/fastjson2-2.0.27.jar +file.reference.hessian-lite-3.2.13-sources.jar=../Lib/alibaba/hessian-lite-3.2.13-sources.jar +file.reference.hessian-lite-3.2.13.jar=../Lib/alibaba/hessian-lite-3.2.13.jar file.reference.hibernate3.jar=../Lib/hibernate3.jar +file.reference.javassist-3.29.2-GA.jar=../Lib/dubbo_related/javassist-3.29.2-GA.jar file.reference.jdom.jar=../Lib/jdom.jar file.reference.jdom2-2.0.5.jar=../Lib/jdom2-2.0.5.jar file.reference.jna-platform-4.4.0.jar=../Lib/jna-platform-4.4.0.jar @@ -43,8 +58,24 @@ file.reference.jna.jar=../Lib/jna.jar file.reference.jta.jar=../Lib/jta.jar file.reference.Judger.bak.jar=../Lib/Judger.bak.jar file.reference.mysql-connector-java-5.1.6-bin.jar=../Lib/mysql-connector-java-5.1.6-bin.jar +file.reference.netty-all-4.1.25.Final.jar=../Lib/dubbo_related/netty-all-4.1.25.Final.jar file.reference.oscache-2.4.1.jar=../Lib/oscache-2.4.1.jar file.reference.registry.jar=../Lib/registry.jar +file.reference.spring-boot-2.7.17-sources.jar=../Lib/spring-boot-2.7.17-sources.jar +file.reference.spring-boot-2.7.17.jar=../Lib/spring-boot-2.7.17.jar +file.reference.spring-boot-autoconfigure-1.5.10.RELEASE.jar=../Lib/spring-boot-autoconfigure-1.5.10.RELEASE.jar +file.reference.spring-boot-autoconfigure-2.7.16.jar=../Lib/spring-boot-autoconfigure-2.7.16.jar +file.reference.spring-boot-autoconfigure-2.7.17-sources.jar=../Lib/spring-boot-autoconfigure-2.7.17-sources.jar +file.reference.spring-boot-starter-2.7.17-sources.jar=../Lib/spring-boot-starter-2.7.17-sources.jar +file.reference.spring-boot-starter-2.7.17.jar=../Lib/spring-boot-starter-2.7.17.jar +file.reference.spring-context-3.0.7.RELEASE.jar=../Lib/spring-context-3.0.7.RELEASE.jar +file.reference.spring-context-support-1.0.11-sources.jar=../Lib/alibaba/spring-context-support-1.0.11-sources.jar +file.reference.spring-context-support-1.0.11.jar=../Lib/alibaba/spring-context-support-1.0.11.jar +file.reference.spring-core-3.0.7.RELEASE.jar=../Lib/spring-core-3.0.7.RELEASE.jar +file.reference.spring-expression-3.0.7.RELEASE.jar=../Lib/spring-expression-3.0.7.RELEASE.jar +file.reference.spring-jms-3.0.7.RELEASE.jar=../Lib/spring-jms-3.0.7.RELEASE.jar +file.reference.spring-tx-3.0.7.RELEASE.jar=../Lib/spring-tx-3.0.7.RELEASE.jar +file.reference.spring-web-3.0.7.RELEASE.jar=../Lib/spring-web-3.0.7.RELEASE.jar file.reference.swt.jar=../Lib/swt.jar includes=** jar.archive.disabled=${jnlp.enabled} @@ -69,7 +100,38 @@ javac.classpath=\ ${file.reference.jna.jar}:\ ${file.reference.jna-platform-4.4.0.jar}:\ ${file.reference.swt.jar}:\ - ${file.reference.Judger.bak.jar} + ${file.reference.Judger.bak.jar}:\ + ${file.reference.spring-boot-autoconfigure-2.7.17-sources.jar}:\ + ${file.reference.spring-boot-starter-2.7.17-sources.jar}:\ + ${file.reference.spring-boot-starter-2.7.17.jar}:\ + ${file.reference.spring-context-3.0.7.RELEASE.jar}:\ + ${file.reference.spring-core-3.0.7.RELEASE.jar}:\ + ${file.reference.spring-expression-3.0.7.RELEASE.jar}:\ + ${file.reference.spring-jms-3.0.7.RELEASE.jar}:\ + ${file.reference.spring-tx-3.0.7.RELEASE.jar}:\ + ${file.reference.spring-web-3.0.7.RELEASE.jar}:\ + ${file.reference.dubbo-3.2.0-sources.jar}:\ + ${file.reference.dubbo-3.2.0.jar}:\ + ${file.reference.dubbo-spring-boot-autoconfigure-3.2.0-sources.jar}:\ + ${file.reference.dubbo-spring-boot-autoconfigure-3.2.0.jar}:\ + ${file.reference.dubbo-spring-boot-autoconfigure-compatible-3.2.0-sources.jar}:\ + ${file.reference.dubbo-spring-boot-autoconfigure-compatible-3.2.0.jar}:\ + ${file.reference.dubbo-spring-boot-starter-3.2.0-sources.jar}:\ + ${file.reference.dubbo-spring-boot-starter-3.2.0.jar}:\ + ${file.reference.spring-boot-2.7.17-sources.jar}:\ + ${file.reference.spring-boot-2.7.17.jar}:\ + ${file.reference.spring-boot-autoconfigure-1.5.10.RELEASE.jar}:\ + ${file.reference.spring-boot-autoconfigure-2.7.16.jar}:\ + ${file.reference.druid-1.1.6.jar}:\ + ${file.reference.fastjson-1.2.76.jar}:\ + ${file.reference.fastjson2-2.0.27-sources.jar}:\ + ${file.reference.fastjson2-2.0.27.jar}:\ + ${file.reference.hessian-lite-3.2.13-sources.jar}:\ + ${file.reference.hessian-lite-3.2.13.jar}:\ + ${file.reference.spring-context-support-1.0.11-sources.jar}:\ + ${file.reference.spring-context-support-1.0.11.jar}:\ + ${file.reference.netty-all-4.1.25.Final.jar}:\ + ${file.reference.javassist-3.29.2-GA.jar} # Space-separated list of extra javac options javac.compilerargs= javac.deprecation=false diff --git a/JuderUI/run.bat b/JuderUI/run.bat new file mode 100644 index 0000000..7d9de0f --- /dev/null +++ b/JuderUI/run.bat @@ -0,0 +1 @@ +"%JAVA_HOME%\bin\javaw" -jar .\dist\JuderUI.jar \ No newline at end of file diff --git a/JuderUI/src/data/JudgeFromQueue.java b/JuderUI/src/data/JudgeFromQueue.java index 3eb9a42..d2fb84d 100644 --- a/JuderUI/src/data/JudgeFromQueue.java +++ b/JuderUI/src/data/JudgeFromQueue.java @@ -44,8 +44,9 @@ public class JudgeFromQueue extends Thread { private Map problemBeanMap = null; private Lock lock; private int threadNo; - + common.Logger logger; public JudgeFromQueue(int threadNo) { + logger = common.Logger.getInstance(); this.threadNo = threadNo; } @@ -184,9 +185,11 @@ public class JudgeFromQueue extends Thread { xtp.readXmlString(problem); problemBean = xtp.convertXML(); Control.addJudgeInfo(threadNo, "get problemId: " + problemId); + logger.log("get problemId: " + problemId, common.LogLevel.INFO); problemBeanMap.put(problemId, problemBean); }catch(Exception e){ Result.status = Const.SE; + logger.log("ĿϢʧܣ"+problemId+e.getMessage(), common.LogLevel.ERROR); CompileInfo.remark = "ĿϢʧܣϵԱϢ"+"problemId:"+problemId+e.getMessage(); e.printStackTrace(); EventQueue.invokeLater(() -> { @@ -236,6 +239,7 @@ public class JudgeFromQueue extends Thread { XmlToRequest xtr = new XmlToRequest(); xtr.readXmlString(request); Request req = xtr.convertXML(); + logger.log("ύ", common.LogLevel.INFO); System.out.println("ύ"); Control.addJudgeInfo(threadNo, "server result:" + req.getRspMsg()); // Control.addJudgeInfo("ok"); diff --git a/JuderUI/src/myjdom/AnswerToXml.java b/JuderUI/src/myjdom/AnswerToXml.java index b0b5c4f..2a2882e 100644 --- a/JuderUI/src/myjdom/AnswerToXml.java +++ b/JuderUI/src/myjdom/AnswerToXml.java @@ -53,7 +53,7 @@ public class AnswerToXml extends XmlToBase implements XmlConvert { Element remark = doc.createElement("remark"); solution.appendChild(remark); - remark.setTextContent(getResult().getRemark()); + remark.setTextContent(common.EscapeXml.escapeXml(getResult().getRemark())); Element wrongCases = doc.createElement("wrongCases"); solution.appendChild(wrongCases); @@ -66,7 +66,7 @@ public class AnswerToXml extends XmlToBase implements XmlConvert { caseId.setTextContent(String.valueOf(wrongList.get(i).getId())); Element output = doc.createElement("output"); tcase.appendChild(output); - output.setTextContent(wrongList.get(i).getOutput()); + output.setTextContent(common.EscapeXml.escapeXml(wrongList.get(i).getOutput())); } return XmlUtil.DocumentToString(doc, "GBK"); diff --git a/JuderUI/src/web/Webservice.java b/JuderUI/src/web/Webservice.java index d557a0c..000d1ca 100644 --- a/JuderUI/src/web/Webservice.java +++ b/JuderUI/src/web/Webservice.java @@ -11,6 +11,7 @@ import com.alibaba.dubbo.config.RegistryConfig; import util.Decrypt; import edu.dhu.ws.OJWS; import edu.dhu.ws.OJWS_Service; +import gui.Control; import static gui.Control.getDistributorField; import static gui.Control.getJudgeInfoEditorPane; import java.io.UnsupportedEncodingException; @@ -58,7 +59,7 @@ public class Webservice implements java.rmi.Remote{ reference.setApplication(application); reference.setInterface(OJWS.class); reference.setUrl(url); // Զ̷ URL - reference.setTimeout(3000); + reference.setTimeout(6000); // ʼ return reference.get(); } @@ -137,7 +138,7 @@ public class Webservice implements java.rmi.Remote{ } catch(Exception e){ JEditorPane infoPane=getJudgeInfoEditorPane(1); - infoPane.setText(infoPane.getText()+LocalTime.now().toString()+e.getMessage()+"\n"); + Control.addExceptionInfo(0, LocalTime.now().toString()+e.getMessage()+"\n"); } } else @@ -150,8 +151,7 @@ public class Webservice implements java.rmi.Remote{ } catch(Exception e){ logger.log(e.getMessage(), common.LogLevel.ERROR); - JEditorPane infoPane=getJudgeInfoEditorPane(1); - infoPane.setText(infoPane.getText()+LocalTime.now().toString()+e.getMessage()+"\n"); + Control.addExceptionInfo(1, LocalTime.now().toString()+e.getMessage()+"\n"); return ""; } } @@ -166,8 +166,7 @@ public class Webservice implements java.rmi.Remote{ catch(Exception e){ logger.log(e.getMessage(), common.LogLevel.ERROR); - JEditorPane infoPane=getJudgeInfoEditorPane(1); - infoPane.setText(infoPane.getText()+LocalTime.now().toString()+e.getMessage()+"\n"); + Control.addExceptionInfo(1, LocalTime.now().toString()+e.getMessage()+"\n"); return ""; } } @@ -178,12 +177,12 @@ public class Webservice implements java.rmi.Remote{ return s; } catch(Exception e){ - logger.log(e.getMessage(), common.LogLevel.ERROR); - JEditorPane infoPane=getJudgeInfoEditorPane(1); - infoPane.setText(infoPane.getText()+LocalTime.now().toString()+e.getMessage()+"\n"); + logger.log(e.getMessage()+"\nRaw Information:"+arg, common.LogLevel.ERROR); + Control.addExceptionInfo(1, LocalTime.now().toString()+e.getMessage()+"\n"); return ""; } } + private static String getGbkString(String string) { try { // Convert the string to byte array using GBK encoding diff --git a/JuderUI/test/output/Main.c b/JuderUI/test/output/Main.c index fdf35ba..5de002c 100644 --- a/JuderUI/test/output/Main.c +++ b/JuderUI/test/output/Main.c @@ -12,5 +12,6 @@ int main() else printf("error\n"); } + return 0; -} \ No newline at end of file +} \ No newline at end of file diff --git a/JuderUI/test/output/Main.exe b/JuderUI/test/output/Main.exe index 31e80b6..65f565d 100644 Binary files a/JuderUI/test/output/Main.exe and b/JuderUI/test/output/Main.exe differ diff --git a/JuderUI/test/output/Main.java b/JuderUI/test/output/Main.java new file mode 100644 index 0000000..0a2be1c --- /dev/null +++ b/JuderUI/test/output/Main.java @@ -0,0 +1,5 @@ +public class Main{ + public static void main(String[] args){ + System.out.println("Helloworld"); + } +} \ No newline at end of file diff --git a/JuderUI/test/output/Main.o b/JuderUI/test/output/Main.o index 987f313..afc9ddc 100644 Binary files a/JuderUI/test/output/Main.o and b/JuderUI/test/output/Main.o differ diff --git a/JuderUI/test/output/Main.obj b/JuderUI/test/output/Main.obj new file mode 100644 index 0000000..1e286b1 Binary files /dev/null and b/JuderUI/test/output/Main.obj differ diff --git a/JuderUI/test/output/Main.py b/JuderUI/test/output/Main.py new file mode 100644 index 0000000..52441d5 --- /dev/null +++ b/JuderUI/test/output/Main.py @@ -0,0 +1 @@ +print('helloworld') \ No newline at end of file diff --git a/JuderUI/test/output/Mainnull b/JuderUI/test/output/Mainnull new file mode 100644 index 0000000..52441d5 --- /dev/null +++ b/JuderUI/test/output/Mainnull @@ -0,0 +1 @@ +print('helloworld') \ No newline at end of file diff --git a/Judger/build/classes/kernel/ExeCommand$Kernel32.class b/Judger/build/classes/kernel/ExeCommand$Kernel32.class index a02dd88..4b4d939 100644 Binary files a/Judger/build/classes/kernel/ExeCommand$Kernel32.class and b/Judger/build/classes/kernel/ExeCommand$Kernel32.class differ diff --git a/Judger/build/classes/kernel/ExeCommand.class b/Judger/build/classes/kernel/ExeCommand.class index e9924ab..2c58164 100644 Binary files a/Judger/build/classes/kernel/ExeCommand.class and b/Judger/build/classes/kernel/ExeCommand.class differ diff --git a/Judger/build/classes/kernel/Judger.class b/Judger/build/classes/kernel/Judger.class index ca23e12..acb4665 100644 Binary files a/Judger/build/classes/kernel/Judger.class and b/Judger/build/classes/kernel/Judger.class differ diff --git a/Judger/build/classes/main/Process.class b/Judger/build/classes/main/Process.class index 0c86854..3d70aaa 100644 Binary files a/Judger/build/classes/main/Process.class and b/Judger/build/classes/main/Process.class differ diff --git a/Judger/build/classes/share/gui/NewCompileSetting.class b/Judger/build/classes/share/gui/NewCompileSetting.class index a05135f..96cfdef 100644 Binary files a/Judger/build/classes/share/gui/NewCompileSetting.class and b/Judger/build/classes/share/gui/NewCompileSetting.class differ diff --git a/Judger/dist/Judger.jar b/Judger/dist/Judger.jar index 0353106..f53166a 100644 Binary files a/Judger/dist/Judger.jar and b/Judger/dist/Judger.jar differ diff --git a/Judger/dist/lib/Common.jar b/Judger/dist/lib/Common.jar index 3a49e4a..437ffc1 100644 Binary files a/Judger/dist/lib/Common.jar and b/Judger/dist/lib/Common.jar differ diff --git a/Judger/nbproject/private/private.xml b/Judger/nbproject/private/private.xml index 027eaae..fbecc0e 100644 --- a/Judger/nbproject/private/private.xml +++ b/Judger/nbproject/private/private.xml @@ -9,9 +9,11 @@ + file:/K:/OJ/Judger/src/kernel/WriteInfo.java file:/K:/OJ/Judger/src/main/Answer.java + file:/K:/OJ/Judger/src/main/Process.java + file:/K:/OJ/Judger/src/kernel/ExeCommand.java file:/K:/OJ/Judger/src/kernel/Judger.java - file:/K:/OJ/Judger/src/share/gui/NewCompileSetting.java diff --git a/Judger/src/kernel/ExeCommand.java b/Judger/src/kernel/ExeCommand.java index 3acfb4b..fbfd0bd 100644 --- a/Judger/src/kernel/ExeCommand.java +++ b/Judger/src/kernel/ExeCommand.java @@ -76,7 +76,7 @@ public class ExeCommand { CompileInfo.remark = "볬ʱ,ԣ" + CompileInfo.errorInfo; } else if (result != 0) { Result.status = Const.CE; - CompileInfo.remark = CompileInfo.errorInfo; + CompileInfo.remark = CompileInfo.errorInfo; } else { CompileInfo.remark = ""; } @@ -100,7 +100,7 @@ public class ExeCommand { CompileInfo.exitValue = result; CompileInfo.info += "\n" + JudgerInfo.info; - CompileInfo.errorInfo += "\n" + JudgerInfo.errorInfo; + CompileInfo.errorInfo += "\n" + CompileInfo.errorInfo; if (Result.status == Const.SE) { @@ -108,7 +108,9 @@ public class ExeCommand { } else if (result != 0) { Result.status = Const.CE; - CompileInfo.remark = CompileInfo.errorInfo; + + CompileInfo.remark = CompileInfo.errorInfo; + } else { CompileInfo.remark = ""; } diff --git a/ce_dbg.txt b/ce_dbg.txt new file mode 100644 index 0000000..d1d666f --- /dev/null +++ b/ce_dbg.txt @@ -0,0 +1,323 @@ +#include +int main(){} +class Solution { +public: + int solve(string s) { + int score; + stringstream ss; + if (s[0] != '-') { + ss << s; + ss >> score; + } + else { + ss << s.substr(1); + ss >> score; + score = score * (-1); + } + return score; + } + int calPoints(vector& ops) { + int sum = 0; + int n = ops.size(); + vector v; + for (int i = 0; i < n; i++) { + if (ops[i] == "+") { //这次得分是前两次分数之和 + v.push_back(v[v.size() - 1] + v[v.size() - 2]); + } + else if (ops[i] == "C") { //移除上一次分数 + v.pop_back(); + } + else if (ops[i] == "D") { //这次得分是上一次分数的两倍 + v.push_back(2 * v[v.size() - 1]); + } + else { + v.push_back(solve(ops[i])); + } + } + for (int i = 0; i < v.size(); i++)sum += v[i]; + int ouo; + for (ouo = 1; ouo < 9; ++ouo); + { + int uou = 0; + uou = uou + 1; + } + for (ouo = 1; ouo < 9; ++ouo); + { + int uou = 0; + + uou = uou + 1; + } + + for (ouo = 1; ouo < 9; ++ouo); + { + int uou = 0; + uou = uou + 1; + } + + for (ouo = 1; ouo < 9; ++ouo); + { + int uou = 0; + uou = uou + 1; + } + + for (ouo = 1; ouo < 9; ++ouo); + { + int uou = 0; + uou = uou + 1; + }for (ouo = 1; ouo < 9; ++ouo); + { + int uou = 0; + + uou = uou + 1; + } + + for (ouo = 1; ouo < 9; ++ouo); + { + int uou = 0; + uou = uou + 1; + } + + for (ouo = 1; ouo < 9; ++ouo); + { + int uou = 0; + uou = uou + 1; + } + + for (ouo = 1; ouo < 9; ++ouo); + { + int uou = 0; + uou = uou + 1; + }for (ouo = 1; ouo < 9; ++ouo); + { + int uou = 0; + + uou = uou + 1; + } + + for (ouo = 1; ouo < 9; ++ouo); + { + int uou = 0; + uou = uou + 1; + } + + for (ouo = 1; ouo < 9; ++ouo); + { + int uou = 0; + uou = uou + 1; + } + + for (ouo = 1; ouo < 9; ++ouo); + { + int uou = 0; + uou = uou + 1; + }for (ouo = 1; ouo < 9; ++ouo); + { + int uou = 0; + + uou = uou + 1; + } + + for (ouo = 1; ouo < 9; ++ouo); + { + int uou = 0; + uou = uou + 1; + } + + for (ouo = 1; ouo < 9; ++ouo); + { + int uou = 0; + uou = uou + 1; + } + + for (ouo = 1; ouo < 9; ++ouo); + { + int uou = 0; + uou = uou + 1; + }for (ouo = 1; ouo < 9; ++ouo); + { + int uou = 0; + + uou = uou + 1; + } + + for (ouo = 1; ouo < 9; ++ouo); + { + int uou = 0; + uou = uou + 1; + } + + for (ouo = 1; ouo < 9; ++ouo); + { + int uou = 0; + uou = uou + 1; + } + + for (ouo = 1; ouo < 9; ++ouo); + { + int uou = 0; + uou = uou + 1; + }for (ouo = 1; ouo < 9; ++ouo); + { + int uou = 0; + + uou = uou + 1; + } + + for (ouo = 1; ouo < 9; ++ouo); + { + int uou = 0; + uou = uou + 1; + } + + for (ouo = 1; ouo < 9; ++ouo); + { + int uou = 0; + uou = uou + 1; + } + + for (ouo = 1; ouo < 9; ++ouo); + { + int uou = 0; + uou = uou + 1; + }for (ouo = 1; ouo < 9; ++ouo); + { + int uou = 0; + + uou = uou + 1; + } + + for (ouo = 1; ouo < 9; ++ouo); + { + int uou = 0; + uou = uou + 1; + } + + for (ouo = 1; ouo < 9; ++ouo); + { + int uou = 0; + uou = uou + 1; + } + + for (ouo = 1; ouo < 9; ++ouo); + { + int uou = 0; + uou = uou + 1; + }for (ouo = 1; ouo < 9; ++ouo); + { + int uou = 0; + + uou = uou + 1; + } + + for (ouo = 1; ouo < 9; ++ouo); + { + int uou = 0; + uou = uou + 1; + } + + for (ouo = 1; ouo < 9; ++ouo); + { + int uou = 0; + uou = uou + 1; + } + + for (ouo = 1; ouo < 9; ++ouo); + { + int uou = 0; + uou = uou + 1; + }for (ouo = 1; ouo < 9; ++ouo); + { + int uou = 0; + + uou = uou + 1; + } + + for (ouo = 1; ouo < 9; ++ouo); + { + int uou = 0; + uou = uou + 1; + } + + for (ouo = 1; ouo < 9; ++ouo); + { + int uou = 0; + uou = uou + 1; + } + + for (ouo = 1; ouo < 9; ++ouo); + { + int uou = 0; + uou = uou + 1; + }for (ouo = 1; ouo < 9; ++ouo); + { + int uou = 0; + + uou = uou + 1; + } + + for (ouo = 1; ouo < 9; ++ouo); + { + int uou = 0; + uou = uou + 1; + } + + for (ouo = 1; ouo < 9; ++ouo); + { + int uou = 0; + uou = uou + 1; + } + + for (ouo = 1; ouo < 9; ++ouo); + { + int uou = 0; + uou = uou + 1; + }for (ouo = 1; ouo < 9; ++ouo); + { + int uou = 0; + + uou = uou + 1; + } + + for (ouo = 1; ouo < 9; ++ouo); + { + int uou = 0; + uou = uou + 1; + } + + for (ouo = 1; ouo < 9; ++ouo); + { + int uou = 0; + uou = uou + 1; + } + + for (ouo = 1; ouo < 9; ++ouo); + { + int uou = 0; + uou = uou + 1; + }for (ouo = 1; ouo < 9; ++ouo); + { + int uou = 0; + + uou = uou + 1; + } + + for (ouo = 1; ouo < 9; ++ouo); + { + int uou = 0; + uou = uou + 1; + } + + for (ouo = 1; ouo < 9; ++ouo); + { + int uou = 0; + uou = uou + 1; + } + + for (ouo = 1; ouo < 9; ++ouo); + { + int uou = 0; + uou = uou + 1; + } + return sum; + } +}; diff --git a/client/build/built-jar.properties b/client/build/built-jar.properties index 67599aa..9885919 100644 --- a/client/build/built-jar.properties +++ b/client/build/built-jar.properties @@ -1,8 +1,4 @@ -<<<<<<< Updated upstream -#Sat, 13 Jan 2024 21:07:07 +0800 -======= -#Sat, 13 Jan 2024 20:52:16 +0800 ->>>>>>> Stashed changes +#Fri, 08 Mar 2024 23:27:32 +0800 K\:\\OJ\\client= diff --git a/client/catalog.xml b/client/catalog.xml index f1ec77b..6df472b 100644 --- a/client/catalog.xml +++ b/client/catalog.xml @@ -2,5 +2,7 @@ + + \ No newline at end of file diff --git a/client/config/Config.properties b/client/config/Config.properties index dfc4c7a..ab95294 100644 --- a/client/config/Config.properties +++ b/client/config/Config.properties @@ -4,7 +4,7 @@ isCppRelative=true isJavaRelative=true Username=felix MinGWDir=D\:\\SchoolStudy\\OJ_netbeans\\OJ\\client\\MinGW\\bin -URLip=106.15.36.190 +URLip=219.228.76.122 relativeCCompilerDir=\\MinGW\\bin JavaRelative=-1 JavaCompileDir= diff --git a/client/nbproject/build-impl.xml b/client/nbproject/build-impl.xml index 36b1ddc..7d2e89c 100644 --- a/client/nbproject/build-impl.xml +++ b/client/nbproject/build-impl.xml @@ -19,7 +19,7 @@ is divided into following sections: - cleanup --> - + @@ -47,14 +47,79 @@ is divided into following sections: - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -77,7 +142,9 @@ is divided into following sections: - + + + @@ -88,15 +155,6 @@ is divided into following sections: - - - - - - - - - @@ -157,6 +215,7 @@ is divided into following sections: + @@ -192,7 +251,12 @@ is divided into following sections: - + + + + + + @@ -218,6 +282,7 @@ is divided into following sections: + @@ -244,11 +309,80 @@ is divided into following sections: - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -285,11 +419,13 @@ is divided into following sections: - + + + @@ -318,7 +454,7 @@ is divided into following sections: - + @@ -373,30 +509,59 @@ is divided into following sections: - - + + - - - + - + + + + + + + - + + - + + + + + + + + + + + + + + + + + + + + + + + + + @@ -404,25 +569,36 @@ is divided into following sections: - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -450,6 +626,10 @@ is divided into following sections: + + + + @@ -504,10 +684,6 @@ is divided into following sections: - - - - @@ -515,74 +691,20 @@ is divided into following sections: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - - - + + + + + + @@ -601,14 +723,14 @@ is divided into following sections: - + - + @@ -635,14 +757,10 @@ is divided into following sections: - - - - - + - + @@ -694,7 +812,7 @@ is divided into following sections: - + @@ -722,10 +840,14 @@ is divided into following sections: + + + + @@ -744,18 +866,6 @@ is divided into following sections: - - - - - - - - - - - - @@ -765,38 +875,98 @@ is divided into following sections: + + - + - - - - - - - - - - - - - - - - - + + + + + + - + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -814,6 +984,7 @@ is divided into following sections: + @@ -835,7 +1006,7 @@ is divided into following sections: - + @@ -847,7 +1018,7 @@ is divided into following sections: - + @@ -904,6 +1075,7 @@ is divided into following sections: + @@ -912,6 +1084,7 @@ is divided into following sections: + @@ -920,6 +1093,7 @@ is divided into following sections: + @@ -927,7 +1101,9 @@ is divided into following sections: - + + + @@ -968,7 +1144,7 @@ is divided into following sections: Must select some files in the IDE or set javac.includes - + @@ -988,21 +1164,40 @@ is divided into following sections: + + + + + + + + + + + + + + + + + + + - + - + - + @@ -1010,25 +1205,65 @@ is divided into following sections: - + - + + + + + + + + + + + + + + + To run this application from the command line without Ant, try: java -jar "${dist.jar.resolved}" - + + + + + + + + + - + + + + + + + + + + + + + + + + + + + @@ -1047,8 +1282,73 @@ is divided into following sections: - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + @@ -1286,10 +1641,14 @@ is divided into following sections: - + Must select some files in the IDE or set javac.includes - + + + + + @@ -1307,7 +1666,7 @@ is divided into following sections: - + @@ -1319,14 +1678,14 @@ is divided into following sections: - + Must select some files in the IDE or set test.includes Some tests failed; see details above. - + Must select some files in the IDE or set test.class Must select some method in the IDE or set test.method @@ -1335,7 +1694,7 @@ is divided into following sections: Some tests failed; see details above. - +