From 03cdc1111aa07041d635840eb30433cbb980accf Mon Sep 17 00:00:00 2001 From: 沈斌 <bluelazysb@hotmail.com> Date: Wed, 28 Feb 2018 16:44:48 +0800 Subject: [PATCH] test --- .idea/workspace.xml | 1369 ++++++++++++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 1,154 insertions(+), 215 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 0c6e458..3924e51 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,73 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> <project version="4"> + <component name="ArtifactsWorkspaceSettings"> + <artifacts-to-build> + <artifact name="task:war exploded" /> + </artifacts-to-build> + </component> <component name="ChangeListManager"> - <list default="true" id="59bc3ffe-0657-438a-9fae-fbbdeee84a24" name="Default" comment=""> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__javax_servlet_jsp_javax_servlet_jsp_api_2_3_1.xml" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/copyright/profiles_settings.xml" afterPath="" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/encodings.xml" afterPath="" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_all_4_1_6_Final.xml" afterPath="" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/uiDesigner.xml" afterPath="" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/workspace-������-a.xml" afterPath="" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/workspace-������9408-a.xml" afterPath="" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/artifacts/task_war.xml" afterPath="$PROJECT_DIR$/.idea/artifacts/task_war.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/artifacts/task_war_exploded.xml" afterPath="$PROJECT_DIR$/.idea/artifacts/task_war_exploded.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__c3p0_c3p0_0_9_1_1.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__c3p0_c3p0_0_9_1_1.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__cn_jpush_api_jiguang_common_1_0_3.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__cn_jpush_api_jiguang_common_1_0_3.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__cn_jpush_api_jpush_client_3_2_17.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__cn_jpush_api_jpush_client_3_2_17.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_alibaba_druid_1_0_18.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_alibaba_druid_1_0_18.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_alibaba_fastjson_1_2_7.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_alibaba_fastjson_1_2_7.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_5_0.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_5_0.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_5_1.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_5_1.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_5_1.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_5_1.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_code_gson_gson_2_3.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_code_gson_gson_2_3.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_rabbitmq_amqp_client_3_3_5.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_rabbitmq_amqp_client_3_3_5.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_rabbitmq_http_client_1_0_0_RELEASE.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_rabbitmq_http_client_1_0_0_RELEASE.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_squareup_okhttp3_okhttp_3_3_1.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_squareup_okhttp3_okhttp_3_3_1.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_squareup_okio_okio_1_8_0.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_squareup_okio_okio_1_8_0.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_3.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_3.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_codec_commons_codec_1_6.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_codec_commons_codec_1_6.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_lang_commons_lang_2_5.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_lang_commons_lang_2_5.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_logging_commons_logging_1_2.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_logging_commons_logging_1_2.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_all_4_1_7_Final.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_all_4_1_7_Final.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__javax_activation_activation_1_1.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__javax_activation_activation_1_1.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__javax_mail_mail_1_4.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__javax_mail_mail_1_4.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__javax_servlet_servlet_api_2_5.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__javax_servlet_servlet_api_2_5.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__junit_junit_4_11.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__junit_junit_4_11.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__log4j_log4j_1_2_16.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__log4j_log4j_1_2_16.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_30.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_30.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__net_sf_ezmorph_ezmorph_1_0_6.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__net_sf_ezmorph_ezmorph_1_0_6.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__net_sf_json_lib_json_lib_jdk15_2_4.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__net_sf_json_lib_json_lib_jdk15_2_4.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_collections4_4_1.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_collections4_4_1.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_5.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_5.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_3_6.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_3_6.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_3_3.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_3_3.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_json_json_20160810.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_json_json_20160810.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_mybatis_3_4_1.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_mybatis_3_4_1.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_mybatis_spring_1_3_0.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_mybatis_spring_1_3_0.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_quartz_scheduler_quartz_2_2_1.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_quartz_scheduler_quartz_2_2_1.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_5.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_5.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_slf4j_log4j12_1_7_5.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_slf4j_log4j12_1_7_5.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_amqp_spring_amqp_1_6_3_RELEASE.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_amqp_spring_amqp_1_6_3_RELEASE.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_amqp_spring_rabbit_1_6_3_RELEASE.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_amqp_spring_rabbit_1_6_3_RELEASE.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_retry_spring_retry_1_1_3_RELEASE.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_retry_spring_retry_1_1_3_RELEASE.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_aop_4_3_7_RELEASE.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_aop_4_3_7_RELEASE.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_beans_4_3_7_RELEASE.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_beans_4_3_7_RELEASE.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_context_4_3_7_RELEASE.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_context_4_3_7_RELEASE.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_context_support_4_3_7_RELEASE.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_context_support_4_3_7_RELEASE.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_core_4_3_7_RELEASE.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_core_4_3_7_RELEASE.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_expression_4_3_7_RELEASE.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_expression_4_3_7_RELEASE.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_jdbc_4_3_7_RELEASE.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_jdbc_4_3_7_RELEASE.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_messaging_4_2_7_RELEASE.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_messaging_4_2_7_RELEASE.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_tx_4_3_7_RELEASE.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_tx_4_3_7_RELEASE.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_web_4_3_7_RELEASE.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_web_4_3_7_RELEASE.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_webmvc_4_3_7_RELEASE.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_webmvc_4_3_7_RELEASE.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/misc.xml" afterPath="$PROJECT_DIR$/.idea/misc.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/modules.xml" afterPath="$PROJECT_DIR$/.idea/modules.xml" /> + <list default="true" id="59bc3ffe-0657-438a-9fae-fbbdeee84a24" name="Default" comment="test"> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/task.iml" afterPath="$PROJECT_DIR$/task.iml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/TaskListener.java" afterPath="$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/TaskListener.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources/spring/rabbitmq.xml" afterPath="$PROJECT_DIR$/src/main/resources/spring/rabbitmq.xml" /> </list> <ignored path="$PROJECT_DIR$/out/" /> <ignored path="$PROJECT_DIR$/target/" /> @@ -79,11 +21,82 @@ <option name="LAST_RESOLUTION" value="IGNORE" /> </component> <component name="FileEditorManager"> - <leaf SIDE_TABS_SIZE_LIMIT_KEY="300" /> + <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> + <file leaf-file-name="TaskListener.java" pinned="false" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/TaskListener.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="405"> + <caret line="128" column="12" lean-forward="false" selection-start-line="128" selection-start-column="12" selection-end-line="128" selection-end-column="12" /> + <folding> + <marker date="1511823786459" expanded="false" signature="6186:6204" ph="<~>" /> + <marker date="1511823786459" expanded="false" signature="7663:7679" ph="<~>" /> + </folding> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="rabbitmq.xml" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/main/resources/spring/rabbitmq.xml"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="765"> + <caret line="55" column="0" lean-forward="false" selection-start-line="55" selection-start-column="0" selection-end-line="55" selection-end-column="0" /> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="redis-config.properties" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/main/resources/redis/redis-config.properties"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="15"> + <caret line="1" column="23" lean-forward="true" selection-start-line="1" selection-start-column="11" selection-end-line="1" selection-end-column="23" /> + <folding /> + </state> + </provider> + </entry> + </file> + </leaf> + </component> + <component name="FileTemplateManagerImpl"> + <option name="RECENT_TEMPLATES"> + <list> + <option value="Interface" /> + <option value="Class" /> + </list> + </option> </component> <component name="FindInProjectRecents"> <findStrings> - <find>javax.servlet</find> + <find>updateFromequipmentBymac</find> + <find>jedis</find> + <find>Monitorpoint</find> + <find>sysConfig.properties</find> + <find>resultMap</find> + <find>monitors_storage_data</find> + <find>findcritical</find> + <find>updateequipmentstate</find> + <find>insertTostate</find> + <find>selectFromsensorByver</find> + <find>insertTologger</find> + <find>logger</find> + <find>MethodInvokingJobDetailFactoryBean</find> + <find>findAdjustByMac</find> + <find>RedisUtil</find> + <find>adjust_key</find> + <find>mongo-client</find> + <find>mongo</find> + <find>monitors_storage_data2</find> + <find>System.out</find> + <find>getLoggerByMac</find> + <find>getEquStateKey</find> + <find>alarmLevels.json</find> + <find>sysConfig</find> + <find>setAlarmLevles</find> + <find>detEquState</find> + <find>getAllEquipment</find> + <find>setEquState</find> + <find>findEquWithAdjustsByMac</find> + <find>47.96.171.62</find> </findStrings> </component> <component name="Git.Settings"> @@ -97,7 +110,53 @@ <component name="IdeDocumentHistory"> <option name="CHANGED_PATHS"> <list> + <option value="$PROJECT_DIR$/src/main/java/com/moral/monitor/service/LoginService.java" /> + <option value="$PROJECT_DIR$/src/main/java/com/moral/monitor/service/ApiService.java" /> + <option value="$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/message/Captcha.java" /> + <option value="$PROJECT_DIR$/src/main/java/com/moral/monitor/controller/ApiController.java" /> + <option value="$PROJECT_DIR$/src/main/resources/database.xml" /> + <option value="$PROJECT_DIR$/src/main/resources/mybatis.xml" /> + <option value="$PROJECT_DIR$/src/main/java/com/moral/monitor/entity/MonitorPoint.java" /> + <option value="$PROJECT_DIR$/src/main/java/com/moral/monitor/service/impl/MonitorpointServiceImpl.java" /> + <option value="$PROJECT_DIR$/src/main/java/com/moral/monitor/util/RedisManager.java" /> + <option value="$PROJECT_DIR$/src/main/java/com/moral/monitor/controller/TestController.java" /> + <option value="$PROJECT_DIR$/src/main/resources/redis-config.properties" /> + <option value="$PROJECT_DIR$/src/main/java/com/moral/monitor/entity/job/Adjust.java" /> + <option value="$PROJECT_DIR$/src/main/java/com/moral/monitor/Test.java" /> + <option value="$PROJECT_DIR$/src/main/java/com/moral/monitor/entity/Sensor.java" /> + <option value="$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/MonitorListener.java" /> + <option value="$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/Listener.java" /> + <option value="$PROJECT_DIR$/src/main/java/com/moral/monitor/controller/Dashboard.java" /> + <option value="$PROJECT_DIR$/src/main/java/com/moral/monitor/entity/History.java" /> + <option value="$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/quartz/StateCheck.java" /> + <option value="$PROJECT_DIR$/src/main/resources/quartz.xml" /> + <option value="$PROJECT_DIR$/src/main/java/com/moral/monitor/dao/JobDao.java" /> + <option value="$PROJECT_DIR$/src/main/resources/alarmLevles.json" /> <option value="$PROJECT_DIR$/pom.xml" /> + <option value="$PROJECT_DIR$/src/main/resources/mongodb-config.properties" /> + <option value="$PROJECT_DIR$/src/main/resources/application.xml" /> + <option value="$PROJECT_DIR$/src/main/resources/mongodb.xml" /> + <option value="$PROJECT_DIR$/src/main/resources/redis.xml" /> + <option value="$PROJECT_DIR$/src/main/resources/rabbitmq.xml" /> + <option value="$PROJECT_DIR$/src/main/resources/log4j.properties" /> + <option value="$PROJECT_DIR$/src/main/resources/mapper/JobDao.xml" /> + <option value="$PROJECT_DIR$/src/main/resources/mybatis/mybatis.xml" /> + <option value="$PROJECT_DIR$/src/main/resources/spring/application.xml" /> + <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" /> + <option value="$PROJECT_DIR$/src/main/java/com/moral/monitor/util/RedisUtil.java" /> + <option value="$PROJECT_DIR$/src/test/java/Test.java" /> + <option value="$PROJECT_DIR$/src/main/resources/system/alarmLevels.json" /> + <option value="$PROJECT_DIR$/src/main/java/com/moral/monitor/controller/ScreenController.java" /> + <option value="$PROJECT_DIR$/src/main/java/com/moral/monitor/service/impl/RedisServiceImpl.java" /> + <option value="$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/quartz/StopStateCheck.java" /> + <option value="$PROJECT_DIR$/src/main/resources/spring/quartz.xml" /> + <option value="$PROJECT_DIR$/src/main/resources/spring/mongodb.xml" /> + <option value="$PROJECT_DIR$/src/main/resources/spring/rabbitmq.xml" /> + <option value="$PROJECT_DIR$/src/main/resources/mongodb/mongodb-config.properties" /> + <option value="$PROJECT_DIR$/src/main/resources/rabbitmq/rabbit-config.properties" /> + <option value="$PROJECT_DIR$/src/main/resources/redis/redis-config.properties" /> + <option value="$PROJECT_DIR$/src/main/resources/spring/database.xml" /> + <option value="$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/TaskListener.java" /> </list> </option> </component> @@ -107,9 +166,16 @@ <detection-done>true</detection-done> <sorting>DEFINITION_ORDER</sorting> </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="ProjectFrameBounds"> <option name="y" value="23" /> - <option name="width" value="1404" /> + <option name="width" value="1406" /> <option name="height" value="877" /> </component> <component name="ProjectLevelVcsManager" settingsEditedManually="true" /> @@ -128,8 +194,8 @@ <foldersAlwaysOnTop value="true" /> </navigator> <panes> - <pane id="Scratches" /> <pane id="AndroidView" /> + <pane id="Scope" /> <pane id="ProjectPane"> <subPane> <expand> @@ -137,18 +203,77 @@ <item name="task" type="b2602c69:ProjectViewProjectNode" /> <item name="task" type="462c0819:PsiDirectoryNode" /> </path> + <path> + <item name="task" type="b2602c69:ProjectViewProjectNode" /> + <item name="task" type="462c0819:PsiDirectoryNode" /> + <item name="src" type="462c0819:PsiDirectoryNode" /> + </path> + <path> + <item name="task" type="b2602c69:ProjectViewProjectNode" /> + <item name="task" type="462c0819:PsiDirectoryNode" /> + <item name="src" type="462c0819:PsiDirectoryNode" /> + <item name="main" type="462c0819:PsiDirectoryNode" /> + </path> + <path> + <item name="task" type="b2602c69:ProjectViewProjectNode" /> + <item name="task" type="462c0819:PsiDirectoryNode" /> + <item name="src" type="462c0819:PsiDirectoryNode" /> + <item name="main" type="462c0819:PsiDirectoryNode" /> + <item name="java" type="462c0819:PsiDirectoryNode" /> + </path> + <path> + <item name="task" type="b2602c69:ProjectViewProjectNode" /> + <item name="task" type="462c0819:PsiDirectoryNode" /> + <item name="src" type="462c0819:PsiDirectoryNode" /> + <item name="main" type="462c0819:PsiDirectoryNode" /> + <item name="java" type="462c0819:PsiDirectoryNode" /> + <item name="monitor" type="462c0819:PsiDirectoryNode" /> + </path> + <path> + <item name="task" type="b2602c69:ProjectViewProjectNode" /> + <item name="task" type="462c0819:PsiDirectoryNode" /> + <item name="src" type="462c0819:PsiDirectoryNode" /> + <item name="main" type="462c0819:PsiDirectoryNode" /> + <item name="java" type="462c0819:PsiDirectoryNode" /> + <item name="monitor" type="462c0819:PsiDirectoryNode" /> + <item name="listener" type="462c0819:PsiDirectoryNode" /> + </path> + <path> + <item name="task" type="b2602c69:ProjectViewProjectNode" /> + <item name="task" type="462c0819:PsiDirectoryNode" /> + <item name="src" type="462c0819:PsiDirectoryNode" /> + <item name="main" type="462c0819:PsiDirectoryNode" /> + <item name="resources" type="462c0819:PsiDirectoryNode" /> + </path> + <path> + <item name="task" type="b2602c69:ProjectViewProjectNode" /> + <item name="task" type="462c0819:PsiDirectoryNode" /> + <item name="src" type="462c0819:PsiDirectoryNode" /> + <item name="main" type="462c0819:PsiDirectoryNode" /> + <item name="resources" type="462c0819:PsiDirectoryNode" /> + <item name="redis" type="462c0819:PsiDirectoryNode" /> + </path> </expand> <select /> </subPane> </pane> <pane id="PackagesPane" /> - <pane id="Scope" /> + <pane id="Scratches" /> </panes> </component> <component name="PropertiesComponent"> <property name="nodejs_interpreter_path" value="/usr/local/bin/node" /> <property name="WebServerToolWindowFactoryState" value="false" /> <property name="aspect.path.notification.shown" value="true" /> + <property name="project.structure.last.edited" value="Modules" /> + <property name="project.structure.proportion" value="0.0" /> + <property name="project.structure.side.proportion" value="0.0" /> + <property name="settings.editor.selected.configurable" value="configurable.group.editor" /> + </component> + <component name="RecentsManager"> + <key name="CopyClassDialog.RECENTS_KEY"> + <recent name="com.moral.monitor.util" /> + </key> </component> <component name="RunDashboard"> <option name="ruleStates"> @@ -162,7 +287,21 @@ </list> </option> </component> - <component name="RunManager"> + <component name="RunManager" selected="Tomcat Server.task"> + <configuration name="Test" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true"> + <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> + <option name="MAIN_CLASS_NAME" value="Test" /> + <option name="VM_PARAMETERS" /> + <option name="PROGRAM_PARAMETERS" /> + <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" /> + <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> + <option name="ALTERNATIVE_JRE_PATH" /> + <option name="ENABLE_SWING_INSPECTOR" value="false" /> + <option name="ENV_VARIABLES" /> + <option name="PASS_PARENT_ENVS" value="true" /> + <module name="task" /> + <envs /> + </configuration> <configuration default="true" type="Applet" factoryName="Applet"> <option name="WIDTH" value="400" /> <option name="HEIGHT" value="300" /> @@ -243,6 +382,97 @@ <properties /> <listeners /> </configuration> + <configuration name="task" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.6" ALTERNATIVE_JRE_ENABLED="false"> + <option name="UPDATING_POLICY" value="restart-server" /> + <deployment> + <artifact name="task:war exploded"> + <settings> + <option name="CONTEXT_PATH" value="/" /> + </settings> + </artifact> + </deployment> + <server-settings> + <option name="BASE_DIRECTORY_NAME" value="Unnamed_task" /> + </server-settings> + <predefined_log_file id="Tomcat" enabled="true" /> + <predefined_log_file id="Tomcat Catalina" enabled="true" /> + <predefined_log_file id="Tomcat Manager" enabled="false" /> + <predefined_log_file id="Tomcat Host Manager" enabled="false" /> + <predefined_log_file id="Tomcat Localhost Access" enabled="false" /> + <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> + <RunnerSettings RunnerId="Debug"> + <option name="DEBUG_PORT" value="55330" /> + </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="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> + <option name="BuildArtifacts" enabled="true"> + <artifact name="task:war exploded" /> + </option> + </method> + </configuration> + <list size="2"> + <item index="0" class="java.lang.String" itemvalue="Tomcat Server.task" /> + <item index="1" class="java.lang.String" itemvalue="Application.Test" /> + </list> + <recent_temporary> + <list size="1"> + <item index="0" class="java.lang.String" itemvalue="Application.Test" /> + </list> + </recent_temporary> + </component> + <component name="SbtLocalSettings"> + <option name="modificationStamps"> + <map> + <entry key="$USER_HOME$/IdeaProjects/play2" value="1478179325000" /> + </map> + </option> + <option name="externalProjectsViewState"> + <projects_view /> + </option> </component> <component name="ShelveChangesManager" show_recycled="false"> <option name="remove_strategy" value="false" /> @@ -260,50 +490,519 @@ <workItem from="1507702190599" duration="37000" /> <workItem from="1507709128468" duration="662000" /> <workItem from="1507714331193" duration="27000" /> - <workItem from="1508484396389" duration="157000" /> + <workItem from="1508484396389" duration="3821000" /> + <workItem from="1508491332601" duration="106000" /> + <workItem from="1508811045436" duration="651000" /> + <workItem from="1508811839440" duration="1908000" /> + <workItem from="1508814020720" duration="1887000" /> + <workItem from="1508824129641" duration="250000" /> + <workItem from="1508824729673" duration="781000" /> + <workItem from="1508900264535" duration="3612000" /> + <workItem from="1508911116546" duration="7028000" /> + <workItem from="1508977804904" duration="22579000" /> + <workItem from="1509026048007" duration="2710000" /> + <workItem from="1509030446574" duration="3006000" /> + <workItem from="1509056858319" duration="2984000" /> + <workItem from="1509068025499" duration="9340000" /> + <workItem from="1509085973276" duration="5136000" /> + <workItem from="1509095479339" duration="556000" /> + <workItem from="1509260666213" duration="7007000" /> + <workItem from="1509323536772" duration="246000" /> + <workItem from="1509324410295" duration="1870000" /> + <workItem from="1509333094656" duration="2064000" /> + <workItem from="1509340273222" duration="289000" /> + <workItem from="1509342471423" duration="606000" /> + <workItem from="1509345416231" duration="1279000" /> + <workItem from="1509347613575" duration="862000" /> + <workItem from="1509350802361" duration="22000" /> + <workItem from="1509354408888" duration="659000" /> + <workItem from="1509413389170" duration="529000" /> + <workItem from="1509419050523" duration="504000" /> + <workItem from="1509419662964" duration="551000" /> + <workItem from="1509421142471" duration="5126000" /> + <workItem from="1509503776436" duration="416000" /> + <workItem from="1509507731791" duration="3149000" /> + <workItem from="1509542138760" duration="1615000" /> + <workItem from="1509568770062" duration="2165000" /> + <workItem from="1509578672500" duration="448000" /> + <workItem from="1509583522110" duration="175000" /> + <workItem from="1509584069292" duration="553000" /> + <workItem from="1509592515461" duration="995000" /> + <workItem from="1509613222546" duration="807000" /> + <workItem from="1509623854080" duration="601000" /> + <workItem from="1509673349569" duration="600000" /> + <workItem from="1509719493079" duration="6000" /> + <workItem from="1509720997599" duration="669000" /> + <workItem from="1509791348403" duration="5998000" /> + <workItem from="1509805487051" duration="2556000" /> + <workItem from="1509851437762" duration="657000" /> + <workItem from="1509938642246" duration="726000" /> + <workItem from="1509946269191" duration="522000" /> + <workItem from="1509957226710" duration="251000" /> + <workItem from="1509957794827" duration="173000" /> + <workItem from="1510014788172" duration="2297000" /> + <workItem from="1510018622224" duration="6054000" /> + <workItem from="1510038694334" duration="1652000" /> + <workItem from="1510054681942" duration="14000" /> + <workItem from="1510054700592" duration="54000" /> + <workItem from="1510055174810" duration="971000" /> + <workItem from="1510356986240" duration="1056000" /> + <workItem from="1510363585918" duration="933000" /> + <workItem from="1510377433075" duration="1355000" /> + <workItem from="1510382937212" duration="1021000" /> + <workItem from="1510386169863" duration="182000" /> + <workItem from="1510486709328" duration="2035000" /> + <workItem from="1510539375498" duration="756000" /> + <workItem from="1510581822672" duration="239000" /> + <workItem from="1510585111681" duration="3229000" /> + <workItem from="1510627531530" duration="208000" /> + <workItem from="1510627773177" duration="2490000" /> + <workItem from="1510646592713" duration="793000" /> + <workItem from="1510666571633" duration="425000" /> + <workItem from="1510672132218" duration="3163000" /> + <workItem from="1510675574562" duration="286000" /> + <workItem from="1510676496066" duration="178000" /> + <workItem from="1510699262988" duration="857000" /> + <workItem from="1510700803433" duration="454000" /> + <workItem from="1510705763364" duration="3849000" /> + <workItem from="1510726840192" duration="2659000" /> + <workItem from="1510754613409" duration="2630000" /> + <workItem from="1510794824346" duration="614000" /> + <workItem from="1510822653893" duration="248000" /> + <workItem from="1510823493365" duration="884000" /> + <workItem from="1510844683201" duration="944000" /> + <workItem from="1510890176891" duration="1154000" /> + <workItem from="1510898440875" duration="5299000" /> + <workItem from="1510968780568" duration="298000" /> + <workItem from="1511011596133" duration="682000" /> + <workItem from="1511146341390" duration="1604000" /> + <workItem from="1511193300540" duration="211000" /> + <workItem from="1511277768228" duration="1928000" /> + <workItem from="1511305802999" duration="640000" /> + <workItem from="1511316811454" duration="335000" /> + <workItem from="1511422805600" duration="24000" /> + <workItem from="1511424509789" duration="3000" /> + <workItem from="1511446704507" duration="554000" /> + <workItem from="1511503116140" duration="1046000" /> + <workItem from="1511568690181" duration="1006000" /> + <workItem from="1511617949269" duration="3557000" /> + <workItem from="1511652670098" duration="3838000" /> + <workItem from="1511668390906" duration="361000" /> + <workItem from="1511670013521" duration="814000" /> + <workItem from="1511675331985" duration="113000" /> + <workItem from="1511675782359" duration="207000" /> + <workItem from="1511750156694" duration="8000" /> + <workItem from="1511787903160" duration="1736000" /> + <workItem from="1511802046145" duration="1014000" /> + <workItem from="1511821626992" duration="488000" /> + <workItem from="1511822418618" duration="999000" /> </task> + <task id="LOCAL-00026" summary="������������"> + <created>1509265945799</created> + <option name="number" value="00026" /> + <option name="presentableId" value="LOCAL-00026" /> + <option name="project" value="LOCAL" /> + <updated>1509265945799</updated> + </task> + <task id="LOCAL-00027" summary="������������"> + <created>1509269196884</created> + <option name="number" value="00027" /> + <option name="presentableId" value="LOCAL-00027" /> + <option name="project" value="LOCAL" /> + <updated>1509269196884</updated> + </task> + <task id="LOCAL-00028" summary="������������"> + <created>1509343407506</created> + <option name="number" value="00028" /> + <option name="presentableId" value="LOCAL-00028" /> + <option name="project" value="LOCAL" /> + <updated>1509343407506</updated> + </task> + <task id="LOCAL-00029" summary="������������"> + <created>1509346782831</created> + <option name="number" value="00029" /> + <option name="presentableId" value="LOCAL-00029" /> + <option name="project" value="LOCAL" /> + <updated>1509346782831</updated> + </task> + <task id="LOCAL-00030" summary="������������"> + <created>1509347681702</created> + <option name="number" value="00030" /> + <option name="presentableId" value="LOCAL-00030" /> + <option name="project" value="LOCAL" /> + <updated>1509347681702</updated> + </task> + <task id="LOCAL-00031" summary="������������"> + <created>1509347817107</created> + <option name="number" value="00031" /> + <option name="presentableId" value="LOCAL-00031" /> + <option name="project" value="LOCAL" /> + <updated>1509347817107</updated> + </task> + <task id="LOCAL-00032" summary="������������������������"> + <created>1509503829871</created> + <option name="number" value="00032" /> + <option name="presentableId" value="LOCAL-00032" /> + <option name="project" value="LOCAL" /> + <updated>1509503829871</updated> + </task> + <task id="LOCAL-00033" summary="������������������"> + <created>1509507788985</created> + <option name="number" value="00033" /> + <option name="presentableId" value="LOCAL-00033" /> + <option name="project" value="LOCAL" /> + <updated>1509507788985</updated> + </task> + <task id="LOCAL-00034" summary="������������������"> + <created>1509517348407</created> + <option name="number" value="00034" /> + <option name="presentableId" value="LOCAL-00034" /> + <option name="project" value="LOCAL" /> + <updated>1509517348407</updated> + </task> + <task id="LOCAL-00035" summary="���������������������mongodb"> + <created>1509570832801</created> + <option name="number" value="00035" /> + <option name="presentableId" value="LOCAL-00035" /> + <option name="project" value="LOCAL" /> + <updated>1509570832801</updated> + </task> + <task id="LOCAL-00036" summary="updates"> + <created>1509578813467</created> + <option name="number" value="00036" /> + <option name="presentableId" value="LOCAL-00036" /> + <option name="project" value="LOCAL" /> + <updated>1509578813467</updated> + </task> + <task id="LOCAL-00037" summary="updates"> + <created>1509579020352</created> + <option name="number" value="00037" /> + <option name="presentableId" value="LOCAL-00037" /> + <option name="project" value="LOCAL" /> + <updated>1509579020352</updated> + </task> + <task id="LOCAL-00038" summary="������log"> + <created>1509583681609</created> + <option name="number" value="00038" /> + <option name="presentableId" value="LOCAL-00038" /> + <option name="project" value="LOCAL" /> + <updated>1509583681610</updated> + </task> + <task id="LOCAL-00039" summary="������log"> + <created>1509584703267</created> + <option name="number" value="00039" /> + <option name="presentableId" value="LOCAL-00039" /> + <option name="project" value="LOCAL" /> + <updated>1509584703267</updated> + </task> + <task id="LOCAL-00040" summary="������������"> + <created>1509593022986</created> + <option name="number" value="00040" /> + <option name="presentableId" value="LOCAL-00040" /> + <option name="project" value="LOCAL" /> + <updated>1509593022986</updated> + </task> + <task id="LOCAL-00041" summary="������������"> + <created>1509613556708</created> + <option name="number" value="00041" /> + <option name="presentableId" value="LOCAL-00041" /> + <option name="project" value="LOCAL" /> + <updated>1509613556708</updated> + </task> + <task id="LOCAL-00042" summary="������������"> + <created>1509613600724</created> + <option name="number" value="00042" /> + <option name="presentableId" value="LOCAL-00042" /> + <option name="project" value="LOCAL" /> + <updated>1509613600724</updated> + </task> + <task id="LOCAL-00043" summary="������������"> + <created>1509851579748</created> + <option name="number" value="00043" /> + <option name="presentableId" value="LOCAL-00043" /> + <option name="project" value="LOCAL" /> + <updated>1509851579748</updated> + </task> + <task id="LOCAL-00044" summary="������������"> + <created>1509946762076</created> + <option name="number" value="00044" /> + <option name="presentableId" value="LOCAL-00044" /> + <option name="project" value="LOCAL" /> + <updated>1509946762076</updated> + </task> + <task id="LOCAL-00045" summary="������MQ������������"> + <created>1509957305739</created> + <option name="number" value="00045" /> + <option name="presentableId" value="LOCAL-00045" /> + <option name="project" value="LOCAL" /> + <updated>1509957305739</updated> + </task> + <task id="LOCAL-00046" summary="test ack flag"> + <created>1509957820879</created> + <option name="number" value="00046" /> + <option name="presentableId" value="LOCAL-00046" /> + <option name="project" value="LOCAL" /> + <updated>1509957820879</updated> + </task> + <task id="LOCAL-00047" summary="insert hostory data to mongo"> + <created>1510015691670</created> + <option name="number" value="00047" /> + <option name="presentableId" value="LOCAL-00047" /> + <option name="project" value="LOCAL" /> + <updated>1510015691671</updated> + </task> + <task id="LOCAL-00048" summary="insert hostory data to mongo"> + <created>1510016141890</created> + <option name="number" value="00048" /> + <option name="presentableId" value="LOCAL-00048" /> + <option name="project" value="LOCAL" /> + <updated>1510016141890</updated> + </task> + <task id="LOCAL-00049" summary="test"> + <created>1510019044081</created> + <option name="number" value="00049" /> + <option name="presentableId" value="LOCAL-00049" /> + <option name="project" value="LOCAL" /> + <updated>1510019044081</updated> + </task> + <task id="LOCAL-00050" summary="test"> + <created>1510019276270</created> + <option name="number" value="00050" /> + <option name="presentableId" value="LOCAL-00050" /> + <option name="project" value="LOCAL" /> + <updated>1510019276271</updated> + </task> + <task id="LOCAL-00051" summary="test"> + <created>1510021702176</created> + <option name="number" value="00051" /> + <option name="presentableId" value="LOCAL-00051" /> + <option name="project" value="LOCAL" /> + <updated>1510021702176</updated> + </task> + <task id="LOCAL-00052" summary="test"> + <created>1510022297677</created> + <option name="number" value="00052" /> + <option name="presentableId" value="LOCAL-00052" /> + <option name="project" value="LOCAL" /> + <updated>1510022297677</updated> + </task> + <task id="LOCAL-00053" summary="test"> + <created>1510025258846</created> + <option name="number" value="00053" /> + <option name="presentableId" value="LOCAL-00053" /> + <option name="project" value="LOCAL" /> + <updated>1510025258846</updated> + </task> + <task id="LOCAL-00054" summary="test"> + <created>1510029566919</created> + <option name="number" value="00054" /> + <option name="presentableId" value="LOCAL-00054" /> + <option name="project" value="LOCAL" /> + <updated>1510029566919</updated> + </task> + <task id="LOCAL-00055" summary="test"> + <created>1510039215409</created> + <option name="number" value="00055" /> + <option name="presentableId" value="LOCAL-00055" /> + <option name="project" value="LOCAL" /> + <updated>1510039215409</updated> + </task> + <task id="LOCAL-00056" summary="test"> + <created>1510041490410</created> + <option name="number" value="00056" /> + <option name="presentableId" value="LOCAL-00056" /> + <option name="project" value="LOCAL" /> + <updated>1510041490411</updated> + </task> + <task id="LOCAL-00057" summary="test"> + <created>1510063453289</created> + <option name="number" value="00057" /> + <option name="presentableId" value="LOCAL-00057" /> + <option name="project" value="LOCAL" /> + <updated>1510063453290</updated> + </task> + <task id="LOCAL-00058" summary="test"> + <created>1510357064207</created> + <option name="number" value="00058" /> + <option name="presentableId" value="LOCAL-00058" /> + <option name="project" value="LOCAL" /> + <updated>1510357064208</updated> + </task> + <task id="LOCAL-00059" summary="test"> + <created>1510358637727</created> + <option name="number" value="00059" /> + <option name="presentableId" value="LOCAL-00059" /> + <option name="project" value="LOCAL" /> + <updated>1510358637728</updated> + </task> + <task id="LOCAL-00060" summary="test"> + <created>1510377149731</created> + <option name="number" value="00060" /> + <option name="presentableId" value="LOCAL-00060" /> + <option name="project" value="LOCAL" /> + <updated>1510377149732</updated> + </task> + <task id="LOCAL-00061" summary="test"> + <created>1510382975797</created> + <option name="number" value="00061" /> + <option name="presentableId" value="LOCAL-00061" /> + <option name="project" value="LOCAL" /> + <updated>1510382975798</updated> + </task> + <task id="LOCAL-00062" summary="test"> + <created>1510386227263</created> + <option name="number" value="00062" /> + <option name="presentableId" value="LOCAL-00062" /> + <option name="project" value="LOCAL" /> + <updated>1510386227264</updated> + </task> + <task id="LOCAL-00063" summary="test"> + <created>1510487538140</created> + <option name="number" value="00063" /> + <option name="presentableId" value="LOCAL-00063" /> + <option name="project" value="LOCAL" /> + <updated>1510487538141</updated> + </task> + <task id="LOCAL-00064" summary="test"> + <created>1510492960788</created> + <option name="number" value="00064" /> + <option name="presentableId" value="LOCAL-00064" /> + <option name="project" value="LOCAL" /> + <updated>1510492960788</updated> + </task> + <task id="LOCAL-00065" summary="test"> + <created>1510666790661</created> + <option name="number" value="00065" /> + <option name="presentableId" value="LOCAL-00065" /> + <option name="project" value="LOCAL" /> + <updated>1510666790662</updated> + </task> + <task id="LOCAL-00066" summary="test"> + <created>1510675632206</created> + <option name="number" value="00066" /> + <option name="presentableId" value="LOCAL-00066" /> + <option name="project" value="LOCAL" /> + <updated>1510675632207</updated> + </task> + <task id="LOCAL-00067" summary="test"> + <created>1510728536875</created> + <option name="number" value="00067" /> + <option name="presentableId" value="LOCAL-00067" /> + <option name="project" value="LOCAL" /> + <updated>1510728536876</updated> + </task> + <task id="LOCAL-00068" summary="test"> + <created>1510729131836</created> + <option name="number" value="00068" /> + <option name="presentableId" value="LOCAL-00068" /> + <option name="project" value="LOCAL" /> + <updated>1510729131836</updated> + </task> + <task id="LOCAL-00069" summary="test"> + <created>1510754750467</created> + <option name="number" value="00069" /> + <option name="presentableId" value="LOCAL-00069" /> + <option name="project" value="LOCAL" /> + <updated>1510754750468</updated> + </task> + <task id="LOCAL-00070" summary="test"> + <created>1510757487933</created> + <option name="number" value="00070" /> + <option name="presentableId" value="LOCAL-00070" /> + <option name="project" value="LOCAL" /> + <updated>1510757487933</updated> + </task> + <task id="LOCAL-00071" summary="test"> + <created>1510757829759</created> + <option name="number" value="00071" /> + <option name="presentableId" value="LOCAL-00071" /> + <option name="project" value="LOCAL" /> + <updated>1510757829759</updated> + </task> + <task id="LOCAL-00072" summary="test"> + <created>1510758484524</created> + <option name="number" value="00072" /> + <option name="presentableId" value="LOCAL-00072" /> + <option name="project" value="LOCAL" /> + <updated>1510758484524</updated> + </task> + <task id="LOCAL-00073" summary="test"> + <created>1511153345415</created> + <option name="number" value="00073" /> + <option name="presentableId" value="LOCAL-00073" /> + <option name="project" value="LOCAL" /> + <updated>1511153345416</updated> + </task> + <task id="LOCAL-00074" summary="test"> + <created>1511821838306</created> + <option name="number" value="00074" /> + <option name="presentableId" value="LOCAL-00074" /> + <option name="project" value="LOCAL" /> + <updated>1511821838307</updated> + </task> + <option name="localTasksCounter" value="75" /> <servers /> </component> <component name="TimeTrackingManager"> - <option name="totallyTimeSpent" value="1898000" /> + <option name="totallyTimeSpent" value="183241000" /> + </component> + <component name="TodoView"> + <todo-panel id="selected-file"> + <is-autoscroll-to-source value="true" /> + </todo-panel> + <todo-panel id="all"> + <are-packages-shown value="true" /> + <is-autoscroll-to-source value="true" /> + </todo-panel> </component> <component name="ToolWindowManager"> - <frame x="0" y="23" width="1404" height="877" extended-state="0" /> + <frame x="0" y="23" width="1406" height="877" extended-state="0" /> <layout> <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> - <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" /> - <window_info id="Palette	" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" /> - <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> - <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" /> - <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> - <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32992327" sideWeight="0.51762116" order="7" side_tool="true" content_ui="tabs" /> + <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3286445" sideWeight="0.51466274" order="8" side_tool="true" content_ui="tabs" /> + <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3286445" sideWeight="0.48533726" order="0" side_tool="false" content_ui="tabs" /> <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> - <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> - <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32992327" sideWeight="0.48237884" order="9" side_tool="false" content_ui="tabs" /> - <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" /> - <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" /> <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> - <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.26431718" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> - <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="true" content_ui="tabs" /> <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> - <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> + <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.0" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> + <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.39897698" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> + <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32992327" sideWeight="0.49120235" order="9" side_tool="false" content_ui="tabs" /> + <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32992327" sideWeight="0.49706313" order="1" side_tool="false" content_ui="tabs" /> + <window_info id="Palette	" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" /> + <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> + <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32992327" sideWeight="0.49706745" order="13" side_tool="false" content_ui="tabs" /> + <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> + <window_info id="Run" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.09335038" sideWeight="0.4735683" order="3" side_tool="false" content_ui="tabs" /> + <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.37340152" sideWeight="0.45674488" order="10" side_tool="false" content_ui="tabs" /> + <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32992327" sideWeight="0.49120235" order="11" side_tool="false" content_ui="tabs" /> + <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32992327" sideWeight="0.4941349" order="12" side_tool="false" content_ui="tabs" /> + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.29252198" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> + <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="true" content_ui="tabs" /> <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> - <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="true" content_ui="tabs" /> - <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> - <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> + <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> + <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" /> - <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> - <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> - <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> + <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> + <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32992327" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> </layout> </component> <component name="TypeScriptGeneratedFilesManager"> <option name="version" value="1" /> + </component> + <component name="Vcs.Log.History.Properties"> + <option name="COLUMN_ORDER"> + <list> + <option value="0" /> + <option value="2" /> + <option value="3" /> + <option value="1" /> + </list> + </option> </component> <component name="Vcs.Log.Tabs.Properties"> <option name="TAB_STATES"> @@ -334,60 +1033,58 @@ <component name="VcsContentAnnotationSettings"> <option name="myLimit" value="2678400000" /> </component> + <component name="VcsManagerConfiguration"> + <MESSAGE value="������task������������" /> + <MESSAGE value="������app������������������" /> + <MESSAGE value="BUG-058" /> + <MESSAGE value="������������������" /> + <MESSAGE value="RabbitMQ & Redis ������" /> + <MESSAGE value="������������" /> + <MESSAGE value="���������������������" /> + <MESSAGE value="���������������������������" /> + <MESSAGE value="������������" /> + <MESSAGE value="������������������������" /> + <MESSAGE value="������������������" /> + <MESSAGE value="������������������" /> + <MESSAGE value="���������������������mongodb" /> + <MESSAGE value="updates" /> + <MESSAGE value="������log" /> + <MESSAGE value="������������" /> + <MESSAGE value="������MQ������������" /> + <MESSAGE value="test ack flag" /> + <MESSAGE value="insert hostory data to mongo" /> + <MESSAGE value="test" /> + <option name="LAST_COMMIT_MESSAGE" value="test" /> + </component> <component name="XDebuggerManager"> - <breakpoint-manager /> + <breakpoint-manager> + <option name="time" value="3" /> + </breakpoint-manager> <watches-manager /> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/controller/ApiController.java"> + <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/service/RedisService.java"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="0"> - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> - <folding> - <element signature="imports" expanded="true" /> - </folding> + <state relative-caret-position="225"> + <caret line="15" column="29" lean-forward="false" selection-start-line="15" selection-start-column="29" selection-end-line="15" selection-end-column="29" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/controller/ApiController.java"> + <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/dao/JobDao.java"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="1380"> - <caret line="113" column="41" lean-forward="false" selection-start-line="113" selection-start-column="34" selection-end-line="113" selection-end-column="41" /> - <folding> - <element signature="imports" expanded="true" /> - </folding> + <state relative-caret-position="105"> + <caret line="14" column="53" lean-forward="false" selection-start-line="14" selection-start-column="30" selection-end-line="14" selection-end-column="53" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/controller/VerificationCodeController.java"> + <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/util/Crypto.java"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="0"> - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> + <state relative-caret-position="240"> + <caret line="20" column="25" lean-forward="false" selection-start-line="20" selection-start-column="12" selection-end-line="20" selection-end-column="25" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/entity/apientity/ApiEquipment.java"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="75"> - <caret line="5" column="13" lean-forward="false" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/dao/ApiDao.java"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="120"> - <caret line="14" column="17" lean-forward="false" selection-start-line="14" selection-start-column="17" selection-end-line="14" selection-end-column="17" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/quartz/EquipmentCheck.java"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="104"> - <caret line="24" column="13" lean-forward="false" selection-start-line="24" selection-start-column="13" selection-end-line="24" selection-end-column="13" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/webapp/bootbox/bootbox.min.js"> + <entry file="file://$PROJECT_DIR$/src/main/webapp/index.html"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="0"> <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> @@ -396,151 +1093,269 @@ </entry> <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/ApiDao.xml"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="-1052"> + <state relative-caret-position="-1299"> + <caret line="4" column="20" lean-forward="true" selection-start-line="4" selection-start-column="20" selection-end-line="4" selection-end-column="20" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/EquipmentMapper.xml"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="-5015"> <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/LoginDao.xml"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="0"> + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/MgrDao.xml"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="-325"> + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/OrganizationMapper.xml"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="-4017"> + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/ScreenApiDao.xml"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="351"> + <caret line="40" column="20" lean-forward="true" selection-start-line="33" selection-start-column="12" selection-end-line="40" selection-end-column="20" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/dao/LoginDao.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="105"> + <caret line="7" column="17" lean-forward="false" selection-start-line="7" selection-start-column="17" selection-end-line="7" selection-end-column="17" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/dao/MgrDao.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="270"> + <caret line="22" column="0" lean-forward="false" selection-start-line="22" selection-start-column="0" selection-end-line="26" selection-end-column="1" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/dao/LoggerMapper.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="285"> + <caret line="22" column="39" lean-forward="false" selection-start-line="22" selection-start-column="34" selection-end-line="22" selection-end-column="39" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/MonitorPointDao.xml"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="0"> + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/TaskDao.xml"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="0"> + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/SqlDao.xml"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="0"> + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/UserDao.xml"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="0"> + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/WeChatDao.xml"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="0"> + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/HistoryEntityMapper.xml"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="2415"> + <caret line="161" column="10" lean-forward="false" selection-start-line="161" selection-start-column="10" selection-end-line="161" selection-end-column="10" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/DashboardDao.xml"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="-2"> - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> + <state relative-caret-position="1694"> + <caret line="155" column="0" lean-forward="true" selection-start-line="155" selection-start-column="0" selection-end-line="155" selection-end-column="0" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/resources/application.xml"> + <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/dao/ApiDao.java"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="-210"> - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> - <folding /> + <state relative-caret-position="208"> + <caret line="22" column="25" lean-forward="false" selection-start-line="22" selection-start-column="16" selection-end-line="22" selection-end-column="25" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/resources/database.xml"> + <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/dao/AccountEntityMapper.java"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="0"> - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> - <folding /> + <state relative-caret-position="60"> + <caret line="5" column="17" lean-forward="false" selection-start-line="5" selection-start-column="17" selection-end-line="5" selection-end-column="17" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/resources/log4j.properties"> + <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/dao/BaseDao.java"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="0"> - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> + <state relative-caret-position="60"> + <caret line="8" column="17" lean-forward="false" selection-start-line="8" selection-start-column="17" selection-end-line="8" selection-end-column="17" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis.xml"> + <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/dao/DashboardDao.java"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="0"> - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> + <state relative-caret-position="120"> + <caret line="11" column="17" lean-forward="false" selection-start-line="11" selection-start-column="17" selection-end-line="11" selection-end-column="17" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/resources/sysConfig.properties"> + <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/dao/EquDao.java"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="0"> - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> + <state relative-caret-position="120"> + <caret line="14" column="17" lean-forward="false" selection-start-line="14" selection-start-column="17" selection-end-line="14" selection-end-column="17" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/test/java/EchoServerHandler.java"> + <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/dao/EquipmentMapper.java"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="75"> - <caret line="8" column="13" lean-forward="false" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="13" /> + <state relative-caret-position="60"> + <caret line="7" column="17" lean-forward="false" selection-start-line="7" selection-start-column="17" selection-end-line="7" selection-end-column="17" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/test/java/EchoServer.java"> + <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/dao/HistoryEntityMapper.java"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="75"> - <caret line="11" column="13" lean-forward="false" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="13" /> + <state relative-caret-position="60"> + <caret line="8" column="17" lean-forward="false" selection-start-line="8" selection-start-column="17" selection-end-line="8" selection-end-column="17" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/test/java/EchoClientHandler.java"> + <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/JobDao.xml"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="75"> - <caret line="12" column="13" lean-forward="false" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" /> + <state relative-caret-position="320"> + <caret line="55" column="13" lean-forward="true" selection-start-line="53" selection-start-column="4" selection-end-line="55" selection-end-column="13" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/test/java/EchoClient.java"> + <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/util/RedisUtil.java"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="75"> - <caret line="13" column="13" lean-forward="false" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/controller/Login.java"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="15"> - <caret line="34" column="46" lean-forward="false" selection-start-line="34" selection-start-column="46" selection-end-line="34" selection-end-column="46" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/controller/MonitorPointController.java"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="394"> - <caret line="100" column="5" lean-forward="true" selection-start-line="100" selection-start-column="5" selection-end-line="100" selection-end-column="5" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/controller/ScreenApiController.java"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="780"> - <caret line="62" column="38" lean-forward="false" selection-start-line="62" selection-start-column="38" selection-end-line="62" selection-end-column="38" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/controller/UserController.java"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="270"> - <caret line="18" column="31" lean-forward="true" selection-start-line="18" selection-start-column="31" selection-end-line="18" selection-end-column="31" /> + <state relative-caret-position="240"> + <caret line="23" column="23" lean-forward="false" selection-start-line="23" selection-start-column="23" selection-end-line="23" selection-end-column="23" /> <folding> - <element signature="imports" expanded="true" /> + <element signature="e#854#855#0" expanded="false" /> + <element signature="e#893#894#0" expanded="false" /> </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/pom.xml"> + <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/quartz/StopStateCheck.java"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="952"> - <caret line="183" column="17" lean-forward="true" selection-start-line="183" selection-start-column="17" selection-end-line="183" selection-end-column="17" /> + <state relative-caret-position="702"> + <caret line="72" column="0" lean-forward="false" selection-start-line="72" selection-start-column="0" selection-end-line="72" selection-end-column="0" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/mybatis.xml"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="0"> + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/resources/spring/application.xml"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="0"> + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/controller/VerificationCodeController.java"> + <entry file="file://$PROJECT_DIR$/src/main/resources/log4j/log4j.properties"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="-209"> - <caret line="22" column="13" lean-forward="false" selection-start-line="22" selection-start-column="13" selection-end-line="22" selection-end-column="13" /> + <state relative-caret-position="0"> + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/controller/MgrController.java"> + <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/AccountEntityMapper.xml"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="120"> - <caret line="20" column="13" lean-forward="false" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" /> + <state relative-caret-position="0"> + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/controller/Go.java"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="144"> - <caret line="14" column="41" lean-forward="false" selection-start-line="14" selection-start-column="23" selection-end-line="14" selection-end-column="41" /> + <state relative-caret-position="120"> + <caret line="12" column="13" lean-forward="false" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/controller/Login.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="135"> + <caret line="27" column="13" lean-forward="false" selection-start-line="27" selection-start-column="13" selection-end-line="27" selection-end-column="13" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/controller/MgrController.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="210"> + <caret line="25" column="17" lean-forward="false" selection-start-line="25" selection-start-column="5" selection-end-line="25" selection-end-column="17" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/controller/Dashboard.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="135"> + <caret line="22" column="13" lean-forward="false" selection-start-line="22" selection-start-column="13" selection-end-line="22" selection-end-column="13" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/controller/EquController.java"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="118"> + <state relative-caret-position="120"> <caret line="24" column="13" lean-forward="false" selection-start-line="24" selection-start-column="13" selection-end-line="24" selection-end-column="13" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/resources/quartz.xml"> + <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/controller/TestController.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="330"> + <caret line="27" column="69" lean-forward="false" selection-start-line="27" selection-start-column="55" selection-end-line="27" selection-end-column="69" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/controller/ApiController.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="135"> + <caret line="48" column="13" lean-forward="false" selection-start-line="48" selection-start-column="13" selection-end-line="48" selection-end-column="13" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/resources/spring/redis.xml"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="0"> <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> @@ -548,28 +1363,77 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/resources/rabbitmq.xml"> + <entry file="file://$PROJECT_DIR$/src/main/resources/spring/quartz.xml"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="-127"> - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> + <state relative-caret-position="167"> + <caret line="78" column="35" lean-forward="false" selection-start-line="78" selection-start-column="14" selection-end-line="78" selection-end-column="35" /> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/test/java/Tmap.java"> + <entry file="file://$PROJECT_DIR$/src/main/resources/spring/mongodb.xml"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="210"> - <caret line="20" column="0" lean-forward="true" selection-start-line="20" selection-start-column="0" selection-end-line="20" selection-end-column="0" /> + <caret line="14" column="0" lean-forward="false" selection-start-line="14" selection-start-column="0" selection-end-line="14" selection-end-column="0" /> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/controller/ApiController.java"> + <entry file="file://$PROJECT_DIR$/src/main/resources/spring/database.xml"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="1695"> - <caret line="113" column="41" lean-forward="false" selection-start-line="113" selection-start-column="34" selection-end-line="113" selection-end-column="41" /> + <state relative-caret-position="90"> + <caret line="6" column="61" lean-forward="false" selection-start-line="6" selection-start-column="61" selection-end-line="6" selection-end-column="61" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/resources/rabbitmq/rabbit-config.properties"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="0"> + <caret line="0" column="26" lean-forward="false" selection-start-line="0" selection-start-column="14" selection-end-line="0" selection-end-column="26" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/resources/mongodb/mongodb-config.properties"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="15"> + <caret line="1" column="23" lean-forward="false" selection-start-line="1" selection-start-column="23" selection-end-line="1" selection-end-column="23" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/service/impl/RedisServiceImpl.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="268"> + <caret line="62" column="21" lean-forward="false" selection-start-line="62" selection-start-column="21" selection-end-line="62" selection-end-column="21" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/resources/spring/rabbitmq.xml"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="765"> + <caret line="55" column="0" lean-forward="false" selection-start-line="55" selection-start-column="0" selection-end-line="55" selection-end-column="0" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/resources/redis/redis-config.properties"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="15"> + <caret line="1" column="23" lean-forward="true" selection-start-line="1" selection-start-column="11" selection-end-line="1" selection-end-column="23" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/TaskListener.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="405"> + <caret line="128" column="12" lean-forward="false" selection-start-line="128" selection-start-column="12" selection-end-line="128" selection-end-column="12" /> <folding> - <element signature="imports" expanded="true" /> + <marker date="1511823786459" expanded="false" signature="6186:6204" ph="<~>" /> + <marker date="1511823786459" expanded="false" signature="7663:7679" ph="<~>" /> </folding> </state> </provider> @@ -577,6 +1441,69 @@ </component> <component name="masterDetails"> <states> + <state key="ArtifactsStructureConfigurable.UI"> + <settings> + <artifact-editor /> + <last-edited>task:war</last-edited> + <splitter-proportions> + <option name="proportions"> + <list> + <option value="0.2" /> + <option value="0.5" /> + </list> + </option> + </splitter-proportions> + </settings> + </state> + <state key="FacetStructureConfigurable.UI"> + <settings> + <last-edited>Spring</last-edited> + <splitter-proportions> + <option name="proportions"> + <list> + <option value="0.2" /> + </list> + </option> + </splitter-proportions> + </settings> + </state> + <state key="GlobalLibrariesConfigurable.UI"> + <settings> + <last-edited>scala-sdk-2.11.8</last-edited> + <splitter-proportions> + <option name="proportions"> + <list> + <option value="0.2" /> + </list> + </option> + </splitter-proportions> + </settings> + </state> + <state key="JdkListConfigurable.UI"> + <settings> + <last-edited>1.8</last-edited> + <splitter-proportions> + <option name="proportions"> + <list> + <option value="0.2" /> + </list> + </option> + </splitter-proportions> + </settings> + </state> + <state key="ModuleStructureConfigurable.UI"> + <settings> + <last-edited>task</last-edited> + <splitter-proportions> + <option name="proportions"> + <list> + <option value="0.17633136" /> + <option value="0.6" /> + </list> + </option> + </splitter-proportions> + </settings> + </state> <state key="ProjectJDKs.UI"> <settings> <last-edited>1.8</last-edited> @@ -589,6 +1516,18 @@ </splitter-proportions> </settings> </state> + <state key="ProjectLibrariesConfigurable.UI"> + <settings> + <last-edited>lib</last-edited> + <splitter-proportions> + <option name="proportions"> + <list> + <option value="0.2" /> + </list> + </option> + </splitter-proportions> + </settings> + </state> </states> </component> </project> \ No newline at end of file -- Gitblit v1.8.0