From c0ef58918786e76806d09158bd3b38df84854711 Mon Sep 17 00:00:00 2001 From: fs-danaus <danaus314@qq.com> Date: 星期六, 06 三月 2021 13:56:24 +0800 Subject: [PATCH] update workspace.xml --- .idea/workspace.xml | 473 ++++++++++++++++++++++++++++++++++++++++++++--------------- 1 files changed, 352 insertions(+), 121 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 971d199..fddf5ab 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -15,111 +15,50 @@ <select> <path> <item name="ROOT" type="e8cecc67:BranchNodeDescriptor" /> - <item name="REMOTE_ROOT" type="e8cecc67:BranchNodeDescriptor" /> + <item name="LOCAL_ROOT" type="e8cecc67:BranchNodeDescriptor" /> + <item name="BRANCH:master" type="e8cecc67:BranchNodeDescriptor" /> </path> </select> </component> <component name="ChangeListManager"> - <list default="true" id="9c4496af-e851-4971-8a3c-8b9bb7d671cb" name="Default Changelist" comment=""> - <change afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/.idea/libraries/lib1.xml" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/.name" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/MyBatisCodeHelperDatasource.xml" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/artifacts/eCoworksV3_dev.xml" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/codeStyles/codeStyleConfig.xml" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/copyright/danaus.xml" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/dataSources.local.xml" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/dataSources.xml" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/dataSources/0c0d141a-87e2-40b2-a4ec-8661cea2eb5e.xml" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/dataSources/0c0d141a-87e2-40b2-a4ec-8661cea2eb5e/storage_v2/_src_/database/OnBus.AUiMBA.meta" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/dataSources/0c0d141a-87e2-40b2-a4ec-8661cea2eb5e/storage_v2/_src_/database/OnBus.AUiMBA/schema/INFORMATION_SCHEMA.NBgcMw.meta" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/dataSources/0c0d141a-87e2-40b2-a4ec-8661cea2eb5e/storage_v2/_src_/database/OnBus.AUiMBA/schema/dbo.sYMBAA.meta" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/dataSources/0c0d141a-87e2-40b2-a4ec-8661cea2eb5e/storage_v2/_src_/database/OnBus.AUiMBA/schema/dbo.sYMBAA.zip" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/dataSources/0c0d141a-87e2-40b2-a4ec-8661cea2eb5e/storage_v2/_src_/database/OnBus.AUiMBA/schema/sys.zb4BAA.meta" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/dataSources/0c0d141a-87e2-40b2-a4ec-8661cea2eb5e/storage_v2/_src_/database/master.YiqNvw.meta" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/dataSources/0c0d141a-87e2-40b2-a4ec-8661cea2eb5e/storage_v2/_src_/database/master.YiqNvw/schema/dbo.sYMBAA.meta" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/dataSources/0c0d141a-87e2-40b2-a4ec-8661cea2eb5e/storage_v2/_src_/database/master.YiqNvw/schema/dbo.sYMBAA.zip" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/dataSources/20a5e6de-97cf-40f8-9b7a-5b3bfdbd69e9.xml" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/dataSources/20a5e6de-97cf-40f8-9b7a-5b3bfdbd69e9/storage_v2/_src_/database/DongShengJianCai.msmlxQ.meta" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/dataSources/20a5e6de-97cf-40f8-9b7a-5b3bfdbd69e9/storage_v2/_src_/database/DongShengJianCai.msmlxQ/schema/INFORMATION_SCHEMA.NBgcMw.meta" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/dataSources/20a5e6de-97cf-40f8-9b7a-5b3bfdbd69e9/storage_v2/_src_/database/DongShengJianCai.msmlxQ/schema/dbo.sYMBAA.meta" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/dataSources/20a5e6de-97cf-40f8-9b7a-5b3bfdbd69e9/storage_v2/_src_/database/DongShengJianCai.msmlxQ/schema/dbo.sYMBAA.zip" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/dataSources/20a5e6de-97cf-40f8-9b7a-5b3bfdbd69e9/storage_v2/_src_/database/DongShengJianCai.msmlxQ/schema/sys.zb4BAA.meta" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/dataSources/20a5e6de-97cf-40f8-9b7a-5b3bfdbd69e9/storage_v2/_src_/database/Icc_NingHai.Rjk1qA.meta" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/dataSources/20a5e6de-97cf-40f8-9b7a-5b3bfdbd69e9/storage_v2/_src_/database/Icc_NingHai.Rjk1qA/schema/INFORMATION_SCHEMA.NBgcMw.meta" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/dataSources/20a5e6de-97cf-40f8-9b7a-5b3bfdbd69e9/storage_v2/_src_/database/Icc_NingHai.Rjk1qA/schema/dbo.sYMBAA.meta" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/dataSources/20a5e6de-97cf-40f8-9b7a-5b3bfdbd69e9/storage_v2/_src_/database/Icc_NingHai.Rjk1qA/schema/dbo.sYMBAA.zip" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/dataSources/20a5e6de-97cf-40f8-9b7a-5b3bfdbd69e9/storage_v2/_src_/database/Icc_NingHai.Rjk1qA/schema/sys.zb4BAA.meta" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/dataSources/20a5e6de-97cf-40f8-9b7a-5b3bfdbd69e9/storage_v2/_src_/database/LuJiangNan.qcddrg.meta" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/dataSources/20a5e6de-97cf-40f8-9b7a-5b3bfdbd69e9/storage_v2/_src_/database/LuJiangNan.qcddrg/schema/INFORMATION_SCHEMA.NBgcMw.meta" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/dataSources/20a5e6de-97cf-40f8-9b7a-5b3bfdbd69e9/storage_v2/_src_/database/LuJiangNan.qcddrg/schema/dbo.sYMBAA.meta" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/dataSources/20a5e6de-97cf-40f8-9b7a-5b3bfdbd69e9/storage_v2/_src_/database/LuJiangNan.qcddrg/schema/dbo.sYMBAA.zip" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/dataSources/20a5e6de-97cf-40f8-9b7a-5b3bfdbd69e9/storage_v2/_src_/database/LuJiangNan.qcddrg/schema/sys.zb4BAA.meta" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/dataSources/20a5e6de-97cf-40f8-9b7a-5b3bfdbd69e9/storage_v2/_src_/database/master.YiqNvw.meta" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/dataSources/20a5e6de-97cf-40f8-9b7a-5b3bfdbd69e9/storage_v2/_src_/database/master.YiqNvw/schema/dbo.sYMBAA.meta" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/dictionaries/123.xml" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/encodings.xml" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/httpRequests/2021-02-01T042257.200.json" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/httpRequests/2021-02-01T042809.200.json" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/httpRequests/2021-02-01T042841.200.json" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/httpRequests/2021-02-01T045014.200.json" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/httpRequests/2021-02-01T045036.200.json" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/httpRequests/2021-02-01T045309.200.json" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/httpRequests/2021-02-01T045605.200.json" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/httpRequests/2021-02-01T045729.200.json" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/httpRequests/2021-02-01T050120.200.json" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/httpRequests/2021-02-01T050254.200.json" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/httpRequests/2021-02-01T051836.200.json" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/httpRequests/2021-02-01T054328.200.json" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/httpRequests/2021-02-01T054521.200.json" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/httpRequests/2021-02-01T055143.200.json" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/httpRequests/2021-02-01T055429.200.json" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/httpRequests/2021-02-01T055539.200.json" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/httpRequests/2021-02-01T060445.200.json" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/httpRequests/2021-02-01T060606.200.json" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/httpRequests/2021-02-02T085721.200.json" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/httpRequests/2021-02-02T090053.200.json" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/httpRequests/2021-02-02T090112.200.json" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/httpRequests/2021-02-02T090219.200.json" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/httpRequests/2021-02-02T090252.200.json" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/httpRequests/2021-02-02T090341.200.json" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/httpRequests/2021-02-02T090505.200.json" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/httpRequests/2021-02-02T090532.200.json" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/httpRequests/2021-02-02T090615.200.json" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/httpRequests/2021-02-02T094031.200.json" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/httpRequests/2021-02-05T093137.500.html" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/httpRequests/2021-02-05T093217.500.html" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/httpRequests/2021-02-05T093508.500.html" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/httpRequests/2021-02-05T093518.500.html" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/httpRequests/2021-02-05T093526.500.html" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/httpRequests/2021-02-06T051145.200.json" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/httpRequests/2021-02-24T024530.500.html" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/httpRequests/2021-02-24T024614.500.html" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/httpRequests/2021-02-24T024654.500.html" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/httpRequests/2021-02-24T024806.500.html" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/httpRequests/2021-02-24T025022.500.html" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/httpRequests/2021-02-24T025048.500.html" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/httpRequests/2021-02-24T025437.200.html" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/httpRequests/2021-03-02T023252.500.html" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/httpRequests/2021-03-02T023651.500.html" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/httpRequests/2021-03-02T033245.200.json" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/httpRequests/2021-03-02T034704.200.json" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/httpRequests/2021-03-02T034857.200.json" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/httpRequests/2021-03-02T103833.500.html" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/httpRequests/2021-03-02T103946.500.html" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/httpRequests/2021-03-02T104115.500.html" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/httpRequests/2021-03-02T104159.500.html" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/httpRequests/http-client.cookies" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/httpRequests/http-requests-log.http" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/inspectionProfiles/Project_Default.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/inspectionProfiles/Project_Default.xml" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/libraries/tomcatLib.xml" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/modules.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/modules.xml" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/sqldialects.xml" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/uiDesigner.xml" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/vcs.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" /> + <list default="true" id="9c4496af-e851-4971-8a3c-8b9bb7d671cb" name="Default Changelist" comment="閲嶆柊鏇存柊浠g爜"> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> + </list> + <list id="6f8820c5-c902-464e-9d2c-1f9480266210" name="tomcatLib" comment=""> + <change afterPath="$PROJECT_DIR$/WebRoot/WEB-INF/lib/annotations-api.jar" afterDir="false" /> + <change afterPath="$PROJECT_DIR$/WebRoot/WEB-INF/lib/catalina-ant.jar" afterDir="false" /> + <change afterPath="$PROJECT_DIR$/WebRoot/WEB-INF/lib/catalina-ha.jar" afterDir="false" /> + <change afterPath="$PROJECT_DIR$/WebRoot/WEB-INF/lib/catalina-ssi.jar" afterDir="false" /> + <change afterPath="$PROJECT_DIR$/WebRoot/WEB-INF/lib/catalina-storeconfig.jar" afterDir="false" /> + <change afterPath="$PROJECT_DIR$/WebRoot/WEB-INF/lib/catalina-tribes.jar" afterDir="false" /> + <change afterPath="$PROJECT_DIR$/WebRoot/WEB-INF/lib/catalina.jar" afterDir="false" /> + <change afterPath="$PROJECT_DIR$/WebRoot/WEB-INF/lib/ecj-4.17.jar" afterDir="false" /> + <change afterPath="$PROJECT_DIR$/WebRoot/WEB-INF/lib/el-api.jar" afterDir="false" /> + <change afterPath="$PROJECT_DIR$/WebRoot/WEB-INF/lib/jasper-el.jar" afterDir="false" /> + <change afterPath="$PROJECT_DIR$/WebRoot/WEB-INF/lib/jasper.jar" afterDir="false" /> + <change afterPath="$PROJECT_DIR$/WebRoot/WEB-INF/lib/jaspic-api.jar" afterDir="false" /> + <change afterPath="$PROJECT_DIR$/WebRoot/WEB-INF/lib/jsp-api.jar" afterDir="false" /> + <change afterPath="$PROJECT_DIR$/WebRoot/WEB-INF/lib/servlet-api.jar" afterDir="false" /> + <change afterPath="$PROJECT_DIR$/WebRoot/WEB-INF/lib/tomcat-api.jar" afterDir="false" /> + <change afterPath="$PROJECT_DIR$/WebRoot/WEB-INF/lib/tomcat-coyote.jar" afterDir="false" /> + <change afterPath="$PROJECT_DIR$/WebRoot/WEB-INF/lib/tomcat-dbcp.jar" afterDir="false" /> + <change afterPath="$PROJECT_DIR$/WebRoot/WEB-INF/lib/tomcat-i18n-cs.jar" afterDir="false" /> + <change afterPath="$PROJECT_DIR$/WebRoot/WEB-INF/lib/tomcat-i18n-de.jar" afterDir="false" /> + <change afterPath="$PROJECT_DIR$/WebRoot/WEB-INF/lib/tomcat-i18n-es.jar" afterDir="false" /> + <change afterPath="$PROJECT_DIR$/WebRoot/WEB-INF/lib/tomcat-i18n-fr.jar" afterDir="false" /> + <change afterPath="$PROJECT_DIR$/WebRoot/WEB-INF/lib/tomcat-i18n-ja.jar" afterDir="false" /> + <change afterPath="$PROJECT_DIR$/WebRoot/WEB-INF/lib/tomcat-i18n-ko.jar" afterDir="false" /> + <change afterPath="$PROJECT_DIR$/WebRoot/WEB-INF/lib/tomcat-i18n-pt-BR.jar" afterDir="false" /> + <change afterPath="$PROJECT_DIR$/WebRoot/WEB-INF/lib/tomcat-i18n-ru.jar" afterDir="false" /> + <change afterPath="$PROJECT_DIR$/WebRoot/WEB-INF/lib/tomcat-i18n-zh-CN.jar" afterDir="false" /> + <change afterPath="$PROJECT_DIR$/WebRoot/WEB-INF/lib/tomcat-jdbc.jar" afterDir="false" /> + <change afterPath="$PROJECT_DIR$/WebRoot/WEB-INF/lib/tomcat-jni.jar" afterDir="false" /> + <change afterPath="$PROJECT_DIR$/WebRoot/WEB-INF/lib/tomcat-util-scan.jar" afterDir="false" /> + <change afterPath="$PROJECT_DIR$/WebRoot/WEB-INF/lib/tomcat-util.jar" afterDir="false" /> + <change afterPath="$PROJECT_DIR$/WebRoot/WEB-INF/lib/tomcat-websocket.jar" afterDir="false" /> + <change afterPath="$PROJECT_DIR$/WebRoot/WEB-INF/lib/websocket-api.jar" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/.idea/libraries/lib1.xml" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/eCoWorksV3.iml" beforeDir="false" afterPath="$PROJECT_DIR$/eCoWorksV3.iml" afterDir="false" /> </list> <option name="SHOW_DIALOG" value="false" /> @@ -133,6 +72,13 @@ </component> <component name="Git.Settings"> <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> + </component> + <component name="LogFilters"> + <option name="FILTER_ERRORS" value="false" /> + <option name="FILTER_WARNINGS" value="false" /> + <option name="FILTER_INFO" value="true" /> + <option name="FILTER_DEBUG" value="true" /> + <option name="CUSTOM_FILTER" /> </component> <component name="MavenImportPreferences"> <option name="generalSettings"> @@ -149,15 +95,17 @@ <component name="PropertiesComponent"> <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" /> <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" /> + <property name="ToolWindowCommit.ShowToolbar" value="false" /> <property name="WebServerToolWindowFactoryState" value="false" /> + <property name="add_unversioned_files" value="true" /> <property name="aspect.path.notification.shown" value="true" /> - <property name="last_opened_file_path" value="$PROJECT_DIR$/../../apache-tomcat-9.0.40/lib" /> + <property name="last_opened_file_path" value="$PROJECT_DIR$/WebRoot" /> <property name="nodejs_interpreter_path.stuck_in_default_project" value="$PROJECT_DIR$/../../Program Files/nodejs/node" /> <property name="nodejs_npm_path_reset_for_default_project" value="true" /> <property name="project.structure.last.edited" value="Libraries" /> <property name="project.structure.proportion" value="0.15" /> - <property name="project.structure.side.proportion" value="0.43678162" /> - <property name="settings.editor.selected.configurable" value="AndroidSdkUpdater" /> + <property name="project.structure.side.proportion" value="0.24856046" /> + <property name="settings.editor.selected.configurable" value="project.propCompiler" /> </component> <component name="RunManager"> <configuration default="true" type="Applet"> @@ -172,15 +120,13 @@ <option name="Make" enabled="true" /> </method> </configuration> - <configuration default="true" type="ArquillianTestNG" factoryName="" nameIsGenerated="true"> + <configuration default="true" type="ArquillianJUnit" factoryName="" nameIsGenerated="true"> <option name="arquillianRunConfiguration"> <value> <option name="containerStateName" value="" /> </value> </option> - <option name="TEST_OBJECT" value="CLASS" /> - <properties /> - <listeners /> + <option name="TEST_OBJECT" value="class" /> <method v="2"> <option name="Make" enabled="true" /> </method> @@ -201,17 +147,111 @@ <option name="Make" enabled="true" /> </method> </configuration> + <configuration name="Tomcat 9.0.40" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 9.0.40" ALTERNATIVE_JRE_ENABLED="false" nameIsGenerated="true"> + <option name="OPEN_IN_BROWSER" value="false" /> + <option name="COMMON_VM_ARGUMENTS" value="-Dfile.encoding=UTF-8" /> + <deployment> + <artifact name="eCoWorksV3"> + <settings> + <option name="CONTEXT_PATH" value="/" /> + </settings> + </artifact> + </deployment> + <server-settings> + <option name="BASE_DIRECTORY_NAME" value="Unnamed_eCoWorksV3" /> + <option name="HTTP_PORT" value="9001" /> + </server-settings> + <predefined_log_file enabled="true" id="Tomcat" /> + <predefined_log_file enabled="true" id="Tomcat Catalina" /> + <predefined_log_file id="Tomcat Manager" /> + <predefined_log_file id="Tomcat Host Manager" /> + <predefined_log_file id="Tomcat Localhost Access" /> + <RunnerSettings RunnerId="Debug"> + <option name="DEBUG_PORT" value="50967" /> + </RunnerSettings> + <RunnerSettings RunnerId="JProfiler"> + <option name="jreHome" value="$PROJECT_DIR$/../../Java/jdk8/x64" /> + </RunnerSettings> + <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Cover"> + <option name="USE_ENV_VARIABLES" value="true" /> + <STARTUP> + <option name="USE_DEFAULT" value="true" /> + <option name="SCRIPT" value="" /> + <option name="VM_PARAMETERS" value="" /> + <option name="PROGRAM_PARAMETERS" value="" /> + </STARTUP> + <SHUTDOWN> + <option name="USE_DEFAULT" value="true" /> + <option name="SCRIPT" value="" /> + <option name="VM_PARAMETERS" value="" /> + <option name="PROGRAM_PARAMETERS" value="" /> + </SHUTDOWN> + </ConfigurationWrapper> + <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Debug"> + <option name="USE_ENV_VARIABLES" value="true" /> + <STARTUP> + <option name="USE_DEFAULT" value="true" /> + <option name="SCRIPT" value="" /> + <option name="VM_PARAMETERS" value="" /> + <option name="PROGRAM_PARAMETERS" value="" /> + </STARTUP> + <SHUTDOWN> + <option name="USE_DEFAULT" value="true" /> + <option name="SCRIPT" value="" /> + <option name="VM_PARAMETERS" value="" /> + <option name="PROGRAM_PARAMETERS" value="" /> + </SHUTDOWN> + </ConfigurationWrapper> + <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="JProfiler"> + <option name="USE_ENV_VARIABLES" value="true" /> + <STARTUP> + <option name="USE_DEFAULT" value="true" /> + <option name="SCRIPT" value="" /> + <option name="VM_PARAMETERS" value="" /> + <option name="PROGRAM_PARAMETERS" value="" /> + </STARTUP> + <SHUTDOWN> + <option name="USE_DEFAULT" value="true" /> + <option name="SCRIPT" value="" /> + <option name="VM_PARAMETERS" value="" /> + <option name="PROGRAM_PARAMETERS" value="" /> + </SHUTDOWN> + </ConfigurationWrapper> + <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Run"> + <option name="USE_ENV_VARIABLES" value="true" /> + <STARTUP> + <option name="USE_DEFAULT" value="true" /> + <option name="SCRIPT" value="" /> + <option name="VM_PARAMETERS" value="" /> + <option name="PROGRAM_PARAMETERS" value="" /> + </STARTUP> + <SHUTDOWN> + <option name="USE_DEFAULT" value="true" /> + <option name="SCRIPT" value="" /> + <option name="VM_PARAMETERS" value="" /> + <option name="PROGRAM_PARAMETERS" value="" /> + </SHUTDOWN> + </ConfigurationWrapper> + <method v="2"> + <option name="Make" enabled="true" /> + <option name="BuildArtifacts" enabled="true"> + <artifact name="eCoWorksV3" /> + </option> + </method> + </configuration> </component> <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" /> <component name="TaskManager"> <task active="true" id="Default" summary="Default task"> <changelist id="9c4496af-e851-4971-8a3c-8b9bb7d671cb" name="Default Changelist" comment="" /> + <changelist id="6f8820c5-c902-464e-9d2c-1f9480266210" name="tomcatLib" comment="" /> <created>1614929101249</created> <option name="number" value="Default" /> <option name="presentableId" value="Default" /> <updated>1614929101249</updated> <workItem from="1614929107433" duration="1368000" /> - <workItem from="1614931924252" duration="2167000" /> + <workItem from="1614931924252" duration="4089000" /> + <workItem from="1614936877490" duration="10276000" /> </task> <task id="LOCAL-00001" summary="鍘婚櫎閲戝眿v1鐗堟帹閫�"> <created>1614932602147</created> @@ -220,7 +260,49 @@ <option name="project" value="LOCAL" /> <updated>1614932602147</updated> </task> - <option name="localTasksCounter" value="2" /> + <task id="LOCAL-00002" summary="鏇存柊9646,9545閿欒娌″脊鍑烘樉绀洪棶棰�"> + <created>1614996317582</created> + <option name="number" value="00002" /> + <option name="presentableId" value="LOCAL-00002" /> + <option name="project" value="LOCAL" /> + <updated>1614996317582</updated> + </task> + <task id="LOCAL-00003" summary="鏇存柊9646鏄剧ず闂"> + <created>1614999290113</created> + <option name="number" value="00003" /> + <option name="presentableId" value="LOCAL-00003" /> + <option name="project" value="LOCAL" /> + <updated>1614999290113</updated> + </task> + <task id="LOCAL-00004" summary="鏇存柊9646checkbox鏄剧ず闂"> + <created>1615000645752</created> + <option name="number" value="00004" /> + <option name="presentableId" value="LOCAL-00004" /> + <option name="project" value="LOCAL" /> + <updated>1615000645752</updated> + </task> + <task id="LOCAL-00005" summary="鏇存柊9646checkbox鏄剧ず闂"> + <created>1615001847310</created> + <option name="number" value="00005" /> + <option name="presentableId" value="LOCAL-00005" /> + <option name="project" value="LOCAL" /> + <updated>1615001847311</updated> + </task> + <task id="LOCAL-00006" summary="鏇存柊9646checkbox鏄剧ず闂"> + <created>1615002877099</created> + <option name="number" value="00006" /> + <option name="presentableId" value="LOCAL-00006" /> + <option name="project" value="LOCAL" /> + <updated>1615002877099</updated> + </task> + <task id="LOCAL-00007" summary="閲嶆柊鏇存柊浠g爜"> + <created>1615009716584</created> + <option name="number" value="00007" /> + <option name="presentableId" value="LOCAL-00007" /> + <option name="project" value="LOCAL" /> + <updated>1615009716584</updated> + </task> + <option name="localTasksCounter" value="8" /> <servers /> </component> <component name="TypeScriptGeneratedFilesManager"> @@ -231,7 +313,19 @@ <map> <entry key="MAIN"> <value> - <State /> + <State> + <option name="FILTERS"> + <map> + <entry key="branch"> + <value> + <list> + <option value="master" /> + </list> + </value> + </entry> + </map> + </option> + </State> </value> </entry> </map> @@ -239,35 +333,172 @@ <option name="oldMeFiltersMigrated" value="true" /> </component> <component name="VcsManagerConfiguration"> + <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" /> <option name="CHECK_NEW_TODO" value="false" /> <MESSAGE value="鍘婚櫎閲戝眿v1鐗堟帹閫�" /> - <option name="LAST_COMMIT_MESSAGE" value="鍘婚櫎閲戝眿v1鐗堟帹閫�" /> + <MESSAGE value="鏇存柊9646,9545閿欒娌″脊鍑烘樉绀洪棶棰�" /> + <MESSAGE value="鏇存柊9646鏄剧ず闂" /> + <MESSAGE value="鏇存柊9646checkbox鏄剧ず闂" /> + <MESSAGE value="閲嶆柊鏇存柊浠g爜" /> + <option name="LAST_COMMIT_MESSAGE" value="閲嶆柊鏇存柊浠g爜" /> </component> <component name="WindowStateProjectService"> - <state x="432" y="87" key="#Project_Structure" timestamp="1614929851954"> + <state x="305" y="169" width="1243" height="852" key="#Project_Structure" timestamp="1614995897611"> <screen x="0" y="0" width="1920" height="1040" /> </state> - <state x="432" y="87" key="#Project_Structure/0.0.1920.1040@0.0.1920.1040" timestamp="1614929851954" /> - <state x="494" y="30" key="CommitChangelistDialog2" timestamp="1614932597806"> + <state x="305" y="169" width="1243" height="852" key="#Project_Structure/0.0.1920.1040@0.0.1920.1040" timestamp="1614995897611" /> + <state x="419" y="123" width="1092" height="829" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1614937707158"> <screen x="0" y="0" width="1920" height="1040" /> </state> - <state x="494" y="30" key="CommitChangelistDialog2/0.0.1920.1040@0.0.1920.1040" timestamp="1614932597806" /> - <state x="92" y="92" width="1736" height="856" key="DiffContextDialog" timestamp="1614933589804"> + <state x="419" y="123" width="1092" height="829" key="#com.intellij.execution.impl.EditConfigurationsDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1614937707158" /> + <state x="586" y="131" key="CommitChangelistDialog2" timestamp="1615009560454"> <screen x="0" y="0" width="1920" height="1040" /> </state> - <state x="92" y="92" width="1736" height="856" key="DiffContextDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1614933589804" /> - <state x="576" y="226" key="FileChooserDialogImpl" timestamp="1614929847255"> + <state x="586" y="131" key="CommitChangelistDialog2/0.0.1920.1040@0.0.1920.1040" timestamp="1615009560454" /> + <state x="92" y="92" width="1736" height="856" key="DiffContextDialog" timestamp="1615000212485"> <screen x="0" y="0" width="1920" height="1040" /> </state> - <state x="576" y="226" key="FileChooserDialogImpl/0.0.1920.1040@0.0.1920.1040" timestamp="1614929847255" /> + <state x="92" y="92" width="1736" height="856" key="DiffContextDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1615000212485" /> + <state x="576" y="226" key="FileChooserDialogImpl" timestamp="1614934818407"> + <screen x="0" y="0" width="1920" height="1040" /> + </state> + <state x="576" y="226" key="FileChooserDialogImpl/0.0.1920.1040@0.0.1920.1040" timestamp="1614934818407" /> + <state width="1533" height="207" key="GridCell.Tab.0.bottom" timestamp="1614992355709"> + <screen x="0" y="0" width="1920" height="1040" /> + </state> + <state width="1533" height="207" key="GridCell.Tab.0.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1614992355709" /> + <state width="1533" height="207" key="GridCell.Tab.0.center" timestamp="1614992355709"> + <screen x="0" y="0" width="1920" height="1040" /> + </state> + <state width="1533" height="207" key="GridCell.Tab.0.center/0.0.1920.1040@0.0.1920.1040" timestamp="1614992355709" /> + <state width="1533" height="207" key="GridCell.Tab.0.left" timestamp="1614992355709"> + <screen x="0" y="0" width="1920" height="1040" /> + </state> + <state width="1533" height="207" key="GridCell.Tab.0.left/0.0.1920.1040@0.0.1920.1040" timestamp="1614992355709" /> + <state width="1533" height="207" key="GridCell.Tab.0.right" timestamp="1614992355709"> + <screen x="0" y="0" width="1920" height="1040" /> + </state> + <state width="1533" height="207" key="GridCell.Tab.0.right/0.0.1920.1040@0.0.1920.1040" timestamp="1614992355709" /> + <state width="1533" height="207" key="GridCell.Tab.1.bottom" timestamp="1614992355710"> + <screen x="0" y="0" width="1920" height="1040" /> + </state> + <state width="1533" height="207" key="GridCell.Tab.1.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1614992355710" /> + <state width="1533" height="207" key="GridCell.Tab.1.center" timestamp="1614992355709"> + <screen x="0" y="0" width="1920" height="1040" /> + </state> + <state width="1533" height="207" key="GridCell.Tab.1.center/0.0.1920.1040@0.0.1920.1040" timestamp="1614992355709" /> + <state width="1533" height="207" key="GridCell.Tab.1.left" timestamp="1614992355709"> + <screen x="0" y="0" width="1920" height="1040" /> + </state> + <state width="1533" height="207" key="GridCell.Tab.1.left/0.0.1920.1040@0.0.1920.1040" timestamp="1614992355709" /> + <state width="1533" height="207" key="GridCell.Tab.1.right" timestamp="1614992355710"> + <screen x="0" y="0" width="1920" height="1040" /> + </state> + <state width="1533" height="207" key="GridCell.Tab.1.right/0.0.1920.1040@0.0.1920.1040" timestamp="1614992355710" /> + <state width="1533" height="207" key="GridCell.Tab.2.bottom" timestamp="1614992355710"> + <screen x="0" y="0" width="1920" height="1040" /> + </state> + <state width="1533" height="207" key="GridCell.Tab.2.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1614992355710" /> + <state width="1533" height="207" key="GridCell.Tab.2.center" timestamp="1614992355710"> + <screen x="0" y="0" width="1920" height="1040" /> + </state> + <state width="1533" height="207" key="GridCell.Tab.2.center/0.0.1920.1040@0.0.1920.1040" timestamp="1614992355710" /> + <state width="1533" height="207" key="GridCell.Tab.2.left" timestamp="1614992355710"> + <screen x="0" y="0" width="1920" height="1040" /> + </state> + <state width="1533" height="207" key="GridCell.Tab.2.left/0.0.1920.1040@0.0.1920.1040" timestamp="1614992355710" /> + <state width="1533" height="207" key="GridCell.Tab.2.right" timestamp="1614992355710"> + <screen x="0" y="0" width="1920" height="1040" /> + </state> + <state width="1533" height="207" key="GridCell.Tab.2.right/0.0.1920.1040@0.0.1920.1040" timestamp="1614992355710" /> + <state width="1533" height="207" key="GridCell.Tab.3.bottom" timestamp="1614992355710"> + <screen x="0" y="0" width="1920" height="1040" /> + </state> + <state width="1533" height="207" key="GridCell.Tab.3.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1614992355710" /> + <state width="1533" height="207" key="GridCell.Tab.3.center" timestamp="1614992355710"> + <screen x="0" y="0" width="1920" height="1040" /> + </state> + <state width="1533" height="207" key="GridCell.Tab.3.center/0.0.1920.1040@0.0.1920.1040" timestamp="1614992355710" /> + <state width="1533" height="207" key="GridCell.Tab.3.left" timestamp="1614992355710"> + <screen x="0" y="0" width="1920" height="1040" /> + </state> + <state width="1533" height="207" key="GridCell.Tab.3.left/0.0.1920.1040@0.0.1920.1040" timestamp="1614992355710" /> + <state width="1533" height="207" key="GridCell.Tab.3.right" timestamp="1614992355710"> + <screen x="0" y="0" width="1920" height="1040" /> + </state> + <state width="1533" height="207" key="GridCell.Tab.3.right/0.0.1920.1040@0.0.1920.1040" timestamp="1614992355710" /> + <state width="1533" height="207" key="GridCell.Tab.4.bottom" timestamp="1614992355710"> + <screen x="0" y="0" width="1920" height="1040" /> + </state> + <state width="1533" height="207" key="GridCell.Tab.4.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1614992355710" /> + <state width="1533" height="207" key="GridCell.Tab.4.center" timestamp="1614992355710"> + <screen x="0" y="0" width="1920" height="1040" /> + </state> + <state width="1533" height="207" key="GridCell.Tab.4.center/0.0.1920.1040@0.0.1920.1040" timestamp="1614992355710" /> + <state width="1533" height="207" key="GridCell.Tab.4.left" timestamp="1614992355710"> + <screen x="0" y="0" width="1920" height="1040" /> + </state> + <state width="1533" height="207" key="GridCell.Tab.4.left/0.0.1920.1040@0.0.1920.1040" timestamp="1614992355710" /> + <state width="1533" height="207" key="GridCell.Tab.4.right" timestamp="1614992355710"> + <screen x="0" y="0" width="1920" height="1040" /> + </state> + <state width="1533" height="207" key="GridCell.Tab.4.right/0.0.1920.1040@0.0.1920.1040" timestamp="1614992355710" /> + <state width="1533" height="207" key="GridCell.Tab.5.bottom" timestamp="1614992355711"> + <screen x="0" y="0" width="1920" height="1040" /> + </state> + <state width="1533" height="207" key="GridCell.Tab.5.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1614992355711" /> + <state width="1533" height="207" key="GridCell.Tab.5.center" timestamp="1614992355711"> + <screen x="0" y="0" width="1920" height="1040" /> + </state> + <state width="1533" height="207" key="GridCell.Tab.5.center/0.0.1920.1040@0.0.1920.1040" timestamp="1614992355711" /> + <state width="1533" height="207" key="GridCell.Tab.5.left" timestamp="1614992355711"> + <screen x="0" y="0" width="1920" height="1040" /> + </state> + <state width="1533" height="207" key="GridCell.Tab.5.left/0.0.1920.1040@0.0.1920.1040" timestamp="1614992355711" /> + <state width="1533" height="207" key="GridCell.Tab.5.right" timestamp="1614992355711"> + <screen x="0" y="0" width="1920" height="1040" /> + </state> + <state width="1533" height="207" key="GridCell.Tab.5.right/0.0.1920.1040@0.0.1920.1040" timestamp="1614992355711" /> + <state width="1533" height="207" key="GridCell.Tab.6.bottom" timestamp="1614992355711"> + <screen x="0" y="0" width="1920" height="1040" /> + </state> + <state width="1533" height="207" key="GridCell.Tab.6.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1614992355711" /> + <state width="1533" height="207" key="GridCell.Tab.6.center" timestamp="1614992355711"> + <screen x="0" y="0" width="1920" height="1040" /> + </state> + <state width="1533" height="207" key="GridCell.Tab.6.center/0.0.1920.1040@0.0.1920.1040" timestamp="1614992355711" /> + <state width="1533" height="207" key="GridCell.Tab.6.left" timestamp="1614992355711"> + <screen x="0" y="0" width="1920" height="1040" /> + </state> + <state width="1533" height="207" key="GridCell.Tab.6.left/0.0.1920.1040@0.0.1920.1040" timestamp="1614992355711" /> + <state width="1533" height="207" key="GridCell.Tab.6.right" timestamp="1614992355711"> + <screen x="0" y="0" width="1920" height="1040" /> + </state> + <state width="1533" height="207" key="GridCell.Tab.6.right/0.0.1920.1040@0.0.1920.1040" timestamp="1614992355711" /> <state x="540" y="253" key="IDE.errors.dialog" timestamp="1614932977860"> <screen x="0" y="0" width="1920" height="1040" /> </state> <state x="540" y="253" key="IDE.errors.dialog/0.0.1920.1040@0.0.1920.1040" timestamp="1614932977860" /> - <state x="804" y="431" key="VCS.ChangelistChooser" timestamp="1614932057856"> + <state x="341" y="115" key="SettingsEditor" timestamp="1614936888747"> <screen x="0" y="0" width="1920" height="1040" /> </state> - <state x="804" y="431" key="VCS.ChangelistChooser/0.0.1920.1040@0.0.1920.1040" timestamp="1614932057856" /> + <state x="341" y="115" key="SettingsEditor/0.0.1920.1040@0.0.1920.1040" timestamp="1614936888747" /> + <state x="804" y="431" key="VCS.ChangelistChooser" timestamp="1615001737987"> + <screen x="0" y="0" width="1920" height="1040" /> + </state> + <state x="804" y="431" key="VCS.ChangelistChooser/0.0.1920.1040@0.0.1920.1040" timestamp="1615001737987" /> + <state x="833" y="432" key="VCS.EditChangelistDialog" timestamp="1614996123190"> + <screen x="0" y="0" width="1920" height="1040" /> + </state> + <state x="833" y="432" key="VCS.EditChangelistDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1614996123190" /> + <state x="531" y="249" key="Vcs.Push.Dialog.v2" timestamp="1615009831142"> + <screen x="0" y="0" width="1920" height="1040" /> + </state> + <state x="531" y="249" key="Vcs.Push.Dialog.v2/0.0.1920.1040@0.0.1920.1040" timestamp="1615009831142" /> + <state x="662" y="251" width="596" height="538" key="find.popup" timestamp="1614937015094"> + <screen x="0" y="0" width="1920" height="1040" /> + </state> + <state x="662" y="251" width="596" height="538" key="find.popup/0.0.1920.1040@0.0.1920.1040" timestamp="1614937015094" /> <state x="690" y="417" key="git4idea.remote.GitConfigureRemotesDialog" timestamp="1614929382828"> <screen x="0" y="0" width="1920" height="1040" /> </state> -- Gitblit v1.8.0