From d07ca3c2c178bccf9816a0a4d46f5492ffc78d52 Mon Sep 17 00:00:00 2001
From: fengxiang <fengxiang@blit.7drlb>
Date: Fri, 10 Nov 2017 14:22:21 +0800
Subject: [PATCH] 更新校正值
---
.idea/workspace.xml | 1318 +++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 879 insertions(+), 439 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 2809531..77737ab 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,13 +2,13 @@
<project version="4">
<component name="ArtifactsWorkspaceSettings">
<artifacts-to-build>
- <artifact name="task:war" />
+ <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="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pom.xml" afterPath="$PROJECT_DIR$/pom.xml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources/spring/database.xml" afterPath="$PROJECT_DIR$/src/main/resources/spring/database.xml" />
</list>
<ignored path="$PROJECT_DIR$/out/" />
<ignored path="$PROJECT_DIR$/target/" />
@@ -20,54 +20,12 @@
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="FileEditorManager">
- <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
- <file leaf-file-name="ApiController.java" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/controller/ApiController.java">
+ <leaf>
+ <file leaf-file-name="database.xml" pinned="false" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/src/main/resources/spring/database.xml">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="340">
- <caret line="168" column="34" lean-forward="false" selection-start-line="168" selection-start-column="34" selection-end-line="168" selection-end-column="34" />
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="Test.java" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/test/java/Test.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="150">
- <caret line="10" column="0" lean-forward="false" selection-start-line="10" selection-start-column="0" selection-end-line="10" selection-end-column="0" />
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="Captcha.java" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/message/Captcha.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="345">
- <caret line="30" column="44" lean-forward="false" selection-start-line="30" selection-start-column="44" selection-end-line="30" selection-end-column="44" />
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="web.xml" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="202">
- <caret line="37" column="20" lean-forward="false" selection-start-line="37" selection-start-column="20" selection-end-line="37" selection-end-column="20" />
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="pom.xml" pinned="false" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/pom.xml">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="138">
- <caret line="13" column="37" lean-forward="false" selection-start-line="13" selection-start-column="37" selection-end-line="13" selection-end-column="37" />
+ <state relative-caret-position="90">
+ <caret line="6" column="62" lean-forward="false" selection-start-line="6" selection-start-column="62" selection-end-line="6" selection-end-column="62" />
<folding />
</state>
</provider>
@@ -78,6 +36,7 @@
<component name="FileTemplateManagerImpl">
<option name="RECENT_TEMPLATES">
<list>
+ <option value="Interface" />
<option value="Class" />
</list>
</option>
@@ -86,6 +45,29 @@
<findStrings>
<find>javax.servlet</find>
<find>monitor</find>
+ <find>selectFromequipmentByinstaller</find>
+ <find>insertIntoequipment</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>
</findStrings>
</component>
<component name="Git.Settings">
@@ -101,11 +83,43 @@
<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/controller/ApiController.java" />
- <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" />
- <option value="$PROJECT_DIR$/src/test/java/Test.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/util/RedisUtil.java" />
+ <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/test/java/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/java/com/moral/monitor/listener/quartz/StopStateCheck.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/webapp/WEB-INF/web.xml" />
+ <option value="$PROJECT_DIR$/src/main/resources/mybatis/mybatis.xml" />
+ <option value="$PROJECT_DIR$/src/main/resources/system/alarmLevels.json" />
+ <option value="$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/TaskListener.java" />
+ <option value="$PROJECT_DIR$/src/main/resources/spring/rabbitmq.xml" />
+ <option value="$PROJECT_DIR$/src/main/resources/spring/database.xml" />
</list>
</option>
</component>
@@ -123,7 +137,6 @@
<option name="CUSTOM_FILTER" />
</component>
<component name="ProjectFrameBounds">
- <option name="x" value="-1720" />
<option name="y" value="23" />
<option name="width" value="1404" />
<option name="height" value="877" />
@@ -144,8 +157,7 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
- <pane id="Scratches" />
- <pane id="PackagesPane" />
+ <pane id="AndroidView" />
<pane id="ProjectPane">
<subPane>
<expand>
@@ -169,59 +181,33 @@
<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="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="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="controller" 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="util" 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="test" 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="test" type="462c0819:PsiDirectoryNode" />
- <item name="java" type="462c0819:PsiDirectoryNode" />
+ <item name="resources" type="462c0819:PsiDirectoryNode" />
+ <item name="spring" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
</subPane>
</pane>
+ <pane id="Scratches" />
<pane id="Scope" />
- <pane id="AndroidView" />
+ <pane id="PackagesPane" />
</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">
@@ -240,7 +226,7 @@
</list>
</option>
</component>
- <component name="RunManager" selected="Application.Test">
+ <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" />
@@ -417,6 +403,16 @@
</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" />
</component>
@@ -437,94 +433,489 @@
<workItem from="1508491332601" duration="106000" />
<workItem from="1508811045436" duration="651000" />
<workItem from="1508811839440" duration="1908000" />
- <workItem from="1508814020720" duration="965000" />
+ <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="631000" />
</task>
- <task id="LOCAL-00001" summary="updates">
- <created>1508484578874</created>
- <option name="number" value="00001" />
- <option name="presentableId" value="LOCAL-00001" />
+ <task id="LOCAL-00008" summary="updates">
+ <created>1508815251640</created>
+ <option name="number" value="00008" />
+ <option name="presentableId" value="LOCAL-00008" />
<option name="project" value="LOCAL" />
- <updated>1508484578874</updated>
+ <updated>1508815251640</updated>
</task>
- <task id="LOCAL-00002" summary="������task������������">
- <created>1508485049474</created>
- <option name="number" value="00002" />
- <option name="presentableId" value="LOCAL-00002" />
+ <task id="LOCAL-00009" summary="updates">
+ <created>1508815333934</created>
+ <option name="number" value="00009" />
+ <option name="presentableId" value="LOCAL-00009" />
<option name="project" value="LOCAL" />
- <updated>1508485049474</updated>
+ <updated>1508815333934</updated>
</task>
- <task id="LOCAL-00003" summary="������app������������������">
- <created>1508490813600</created>
- <option name="number" value="00003" />
- <option name="presentableId" value="LOCAL-00003" />
+ <task id="LOCAL-00010" summary="updates">
+ <created>1508816385719</created>
+ <option name="number" value="00010" />
+ <option name="presentableId" value="LOCAL-00010" />
<option name="project" value="LOCAL" />
- <updated>1508490813600</updated>
+ <updated>1508816385719</updated>
</task>
- <task id="LOCAL-00004" summary="updates">
- <created>1508811869390</created>
- <option name="number" value="00004" />
- <option name="presentableId" value="LOCAL-00004" />
+ <task id="LOCAL-00011" summary="BUG-058">
+ <created>1508825226306</created>
+ <option name="number" value="00011" />
+ <option name="presentableId" value="LOCAL-00011" />
<option name="project" value="LOCAL" />
- <updated>1508811869390</updated>
+ <updated>1508825226306</updated>
</task>
- <task id="LOCAL-00005" summary="updates">
- <created>1508812121965</created>
- <option name="number" value="00005" />
- <option name="presentableId" value="LOCAL-00005" />
+ <task id="LOCAL-00012" summary="������������������">
+ <created>1508902617619</created>
+ <option name="number" value="00012" />
+ <option name="presentableId" value="LOCAL-00012" />
<option name="project" value="LOCAL" />
- <updated>1508812121965</updated>
+ <updated>1508902617619</updated>
</task>
- <task id="LOCAL-00006" summary="updates">
- <created>1508814407295</created>
- <option name="number" value="00006" />
- <option name="presentableId" value="LOCAL-00006" />
+ <task id="LOCAL-00013" summary="������������������">
+ <created>1508920155176</created>
+ <option name="number" value="00013" />
+ <option name="presentableId" value="LOCAL-00013" />
<option name="project" value="LOCAL" />
- <updated>1508814407295</updated>
+ <updated>1508920155177</updated>
</task>
- <option name="localTasksCounter" value="7" />
+ <task id="LOCAL-00014" summary="updates">
+ <created>1508920429528</created>
+ <option name="number" value="00014" />
+ <option name="presentableId" value="LOCAL-00014" />
+ <option name="project" value="LOCAL" />
+ <updated>1508920429528</updated>
+ </task>
+ <task id="LOCAL-00015" summary="������������">
+ <created>1508920850416</created>
+ <option name="number" value="00015" />
+ <option name="presentableId" value="LOCAL-00015" />
+ <option name="project" value="LOCAL" />
+ <updated>1508920850416</updated>
+ </task>
+ <task id="LOCAL-00016" summary="������������">
+ <created>1508987038075</created>
+ <option name="number" value="00016" />
+ <option name="presentableId" value="LOCAL-00016" />
+ <option name="project" value="LOCAL" />
+ <updated>1508987038075</updated>
+ </task>
+ <task id="LOCAL-00017" summary="RabbitMQ & Redis ������">
+ <created>1509061963499</created>
+ <option name="number" value="00017" />
+ <option name="presentableId" value="LOCAL-00017" />
+ <option name="project" value="LOCAL" />
+ <updated>1509061963500</updated>
+ </task>
+ <task id="LOCAL-00018" summary="���������������������">
+ <created>1509071255017</created>
+ <option name="number" value="00018" />
+ <option name="presentableId" value="LOCAL-00018" />
+ <option name="project" value="LOCAL" />
+ <updated>1509071255017</updated>
+ </task>
+ <task id="LOCAL-00019" summary="���������������������">
+ <created>1509083891003</created>
+ <option name="number" value="00019" />
+ <option name="presentableId" value="LOCAL-00019" />
+ <option name="project" value="LOCAL" />
+ <updated>1509083891003</updated>
+ </task>
+ <task id="LOCAL-00020" summary="���������������������">
+ <created>1509084804781</created>
+ <option name="number" value="00020" />
+ <option name="presentableId" value="LOCAL-00020" />
+ <option name="project" value="LOCAL" />
+ <updated>1509084804781</updated>
+ </task>
+ <task id="LOCAL-00021" summary="���������������������">
+ <created>1509088852950</created>
+ <option name="number" value="00021" />
+ <option name="presentableId" value="LOCAL-00021" />
+ <option name="project" value="LOCAL" />
+ <updated>1509088852950</updated>
+ </task>
+ <task id="LOCAL-00022" summary="���������������������������">
+ <created>1509091232558</created>
+ <option name="number" value="00022" />
+ <option name="presentableId" value="LOCAL-00022" />
+ <option name="project" value="LOCAL" />
+ <updated>1509091232558</updated>
+ </task>
+ <task id="LOCAL-00023" summary="������������">
+ <created>1509265063354</created>
+ <option name="number" value="00023" />
+ <option name="presentableId" value="LOCAL-00023" />
+ <option name="project" value="LOCAL" />
+ <updated>1509265063354</updated>
+ </task>
+ <task id="LOCAL-00024" summary="������������">
+ <created>1509265555027</created>
+ <option name="number" value="00024" />
+ <option name="presentableId" value="LOCAL-00024" />
+ <option name="project" value="LOCAL" />
+ <updated>1509265555027</updated>
+ </task>
+ <task id="LOCAL-00025" summary="������������">
+ <created>1509265660083</created>
+ <option name="number" value="00025" />
+ <option name="presentableId" value="LOCAL-00025" />
+ <option name="project" value="LOCAL" />
+ <updated>1509265660083</updated>
+ </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>
+ <option name="localTasksCounter" value="57" />
<servers />
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="9192000" />
+ <option name="totallyTimeSpent" value="123494000" />
</component>
<component name="ToolWindowManager">
- <frame x="-1720" y="23" width="1404" height="877" extended-state="0" />
+ <frame x="0" y="23" width="1404" 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="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32992327" sideWeight="0.50293684" 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.32992327" sideWeight="0.49706313" order="0" 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="9" 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="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="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.40537083" sideWeight="0.5220264" 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.32893288" sideWeight="0.49706313" 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="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.40537083" sideWeight="0.47797358" order="10" 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.37595907" sideWeight="0.479442" order="3" 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="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.33" sideWeight="0.5" order="12" 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.21145375" 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.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="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="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="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="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.32992327" sideWeight="0.49706313" order="1" 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>
+ <layout-to-restore>
+ <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="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="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.40537083" sideWeight="0.5220264" 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.32893288" sideWeight="0.49706313" 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="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="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="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.4" 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.33" sideWeight="0.5" 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.33" sideWeight="0.5" 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="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.6662404" sideWeight="0.49706313" 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.32992327" sideWeight="0.48237884" order="10" 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="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.40537083" sideWeight="0.47797358" order="10" 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.37595907" sideWeight="0.479442" order="3" 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="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.33" sideWeight="0.5" order="12" 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.18795888" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+ <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.20558003" 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="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" />
<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="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="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="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.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
- </layout>
+ </layout-to-restore>
</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">
@@ -558,274 +949,101 @@
<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" />
- <option name="LAST_COMMIT_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="1" />
+ </breakpoint-manager>
<watches-manager />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/message/Captcha.java">
+ <entry file="file://$PROJECT_DIR$/.idea/compiler.xml">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="150">
- <caret line="17" column="45" lean-forward="false" selection-start-line="17" selection-start-column="39" selection-end-line="17" selection-end-column="45" />
- <folding />
+ <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/ApiController.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/entity/History.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="2190">
- <caret line="168" column="36" lean-forward="false" selection-start-line="168" selection-start-column="36" selection-end-line="168" selection-end-column="36" />
- <folding />
+ <state relative-caret-position="210">
+ <caret line="14" column="26" lean-forward="false" selection-start-line="14" selection-start-column="26" selection-end-line="14" selection-end-column="26" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/service/impl/ScreenServiceImpl.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="555">
- <caret line="37" column="20" lean-forward="false" selection-start-line="37" selection-start-column="20" selection-end-line="37" selection-end-column="20" />
- <folding />
+ <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="176">
+ <caret line="219" column="18" lean-forward="true" selection-start-line="219" selection-start-column="18" selection-end-line="219" selection-end-column="18" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/service/impl/EquipmentServiceImpl.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>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pom.xml">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="2970">
- <caret line="198" column="38" lean-forward="true" selection-start-line="198" selection-start-column="38" selection-end-line="198" selection-end-column="38" />
- <folding />
+ <state relative-caret-position="115">
+ <caret line="220" column="24" lean-forward="false" selection-start-line="220" selection-start-column="21" selection-end-line="220" selection-end-column="24" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/controller/ApiController.java">
+ <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-mongodb/2.0.0.RELEASE/spring-data-mongodb-2.0.0.RELEASE.jar!/org/springframework/data/mongodb/config/spring-mongo-2.0.xsd">
<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="225">
+ <caret line="15" column="35" lean-forward="false" selection-start-line="15" selection-start-column="23" selection-end-line="15" selection-end-column="35" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/service/ApiService.java">
+ <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-mongodb/2.0.0.RELEASE/spring-data-mongodb-2.0.0.RELEASE.jar!/org/springframework/data/mongodb/core/MongoTemplate.class">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="480">
- <caret line="43" column="31" lean-forward="false" selection-start-line="43" selection-start-column="31" selection-end-line="43" selection-end-column="31" />
+ <state relative-caret-position="463">
+ <caret line="166" column="69" lean-forward="false" selection-start-line="166" selection-start-column="57" selection-end-line="166" selection-end-column="69" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/service/ApiService.java">
+ <entry file="file://$PROJECT_DIR$/src/main/resources/mongodb.xml" />
+ <entry file="file://$PROJECT_DIR$/src/main/resources/redis-config.properties" />
+ <entry file="file://$PROJECT_DIR$/src/main/resources/mongodb-config.properties" />
+ <entry file="file://$PROJECT_DIR$/src/main/resources/redis.xml" />
+ <entry file="file://$PROJECT_DIR$/src/main/resources/quartz.xml" />
+ <entry file="file://$PROJECT_DIR$/src/main/resources/rabbitmq.xml" />
+ <entry file="file://$PROJECT_DIR$/src/main/resources/application.xml" />
+ <entry file="file://$PROJECT_DIR$/src/main/resources/log4j.properties" />
+ <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="495">
- <caret line="43" column="31" lean-forward="false" selection-start-line="43" selection-start-column="31" selection-end-line="43" selection-end-column="31" />
- </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="3780">
- <caret line="274" column="36" lean-forward="true" selection-start-line="274" selection-start-column="36" selection-end-line="274" selection-end-column="36" />
- <folding />
- </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="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/ApiController.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 />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/controller/VerificationCodeController.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>
- </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">
- <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/ApiDao.xml">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-1052">
- <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/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>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/resources/application.xml">
- <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>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/resources/log4j.properties">
- <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/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/sysConfig.properties">
- <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/test/java/EchoServerHandler.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>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/test/java/EchoServer.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>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/test/java/EchoClientHandler.java">
- <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>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/test/java/EchoClient.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/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>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/controller/VerificationCodeController.java">
- <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>
- </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="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>
- </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>
- </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">
- <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">
- <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/resources/rabbitmq.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" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/test/java/Tmap.java">
- <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" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/webapp/login.jsp">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-297">
- <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="225">
+ <caret line="22" column="49" lean-forward="false" selection-start-line="22" selection-start-column="35" selection-end-line="22" selection-end-column="49" />
</state>
</provider>
</entry>
@@ -836,87 +1054,234 @@
</state>
</provider>
</entry>
- <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>
- </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="120">
- <caret line="8" column="24" lean-forward="false" selection-start-line="8" selection-start-column="19" selection-end-line="8" selection-end-column="24" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/service/LoginService.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="180">
- <caret line="17" column="59" lean-forward="false" selection-start-line="17" selection-start-column="59" selection-end-line="17" selection-end-column="59" />
- </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="354">
- <caret line="50" column="38" lean-forward="false" selection-start-line="50" selection-start-column="38" selection-end-line="50" selection-end-column="38" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/resources/database.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/service/ApiService.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="495">
- <caret line="43" column="31" lean-forward="false" selection-start-line="43" selection-start-column="31" selection-end-line="43" selection-end-column="31" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/message/Captcha.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="345">
- <caret line="30" column="44" lean-forward="false" selection-start-line="30" selection-start-column="44" selection-end-line="30" selection-end-column="44" />
- <folding />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="202">
- <caret line="37" column="20" lean-forward="false" selection-start-line="37" selection-start-column="20" selection-end-line="37" selection-end-column="20" />
+ <state relative-caret-position="619">
+ <caret line="85" column="25" lean-forward="false" selection-start-line="78" selection-start-column="8" selection-end-line="85" selection-end-column="25" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/resources/log4j/log4j.properties">
+ <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="900">
+ <caret line="60" column="22" lean-forward="false" selection-start-line="60" selection-start-column="22" selection-end-line="60" selection-end-column="22" />
+ </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="120">
+ <caret line="8" column="20" lean-forward="false" selection-start-line="7" selection-start-column="43" selection-end-line="7" selection-end-column="57" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/JobDao.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="240">
+ <caret line="16" column="34" lean-forward="false" selection-start-line="16" selection-start-column="34" selection-end-line="16" selection-end-column="34" />
+ </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="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/main/resources/redis/redis-config.properties">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="60">
+ <caret line="4" column="10" lean-forward="false" selection-start-line="4" selection-start-column="10" selection-end-line="4" selection-end-column="10" />
+ </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="300">
+ <caret line="20" column="107" lean-forward="false" selection-start-line="20" selection-start-column="86" selection-end-line="20" selection-end-column="107" />
+ </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="75">
+ <caret line="5" column="24" lean-forward="false" selection-start-line="5" selection-start-column="6" selection-end-line="5" selection-end-column="24" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/resources/alarmLevels.json" />
+ <entry file="file://$PROJECT_DIR$/src/main/resources/spring/quartz.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="499">
+ <caret line="80" column="8" lean-forward="false" selection-start-line="80" selection-start-column="8" selection-end-line="80" selection-end-column="74" />
<folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/resources/system/alarmLevels.json">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="642">
+ <caret line="96" column="1" lean-forward="false" selection-start-line="96" selection-start-column="1" selection-end-line="96" selection-end-column="1" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/.idea/workspace.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="jar://$MAVEN_REPOSITORY$/org/springframework/amqp/spring-rabbit/1.6.3.RELEASE/spring-rabbit-1.6.3.RELEASE.jar!/org/springframework/amqp/rabbit/connection/CachingConnectionFactory.class">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="78">
+ <caret line="56" column="13" lean-forward="false" selection-start-line="56" selection-start-column="13" selection-end-line="56" selection-end-column="13" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/amqp/spring-amqp/1.6.3.RELEASE/spring-amqp-1.6.3.RELEASE.jar!/org/springframework/amqp/core/MessageProperties.class">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="-129">
+ <caret line="15" column="13" lean-forward="false" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/amqp/spring-amqp/1.6.3.RELEASE/spring-amqp-1.6.3.RELEASE.jar!/org/springframework/amqp/core/Message.class">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="135">
+ <caret line="15" column="27" lean-forward="true" selection-start-line="15" selection-start-column="27" selection-end-line="15" selection-end-column="27" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/amqp/spring-rabbit/1.6.3.RELEASE/spring-rabbit-1.6.3.RELEASE.jar!/org/springframework/amqp/rabbit/core/RabbitTemplate.class">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="230">
+ <caret line="432" column="16" lean-forward="false" selection-start-line="432" selection-start-column="16" selection-end-line="432" selection-end-column="16" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/MonitorListener.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="691">
+ <caret line="94" column="55" lean-forward="true" selection-start-line="94" selection-start-column="55" selection-end-line="94" selection-end-column="55" />
+ </state>
+ </provider>
+ </entry>
+ <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="135">
+ <caret line="15" column="16" lean-forward="false" selection-start-line="15" selection-start-column="16" selection-end-line="15" selection-end-column="16" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/amqp/spring-rabbit/1.6.3.RELEASE/spring-rabbit-1.6.3.RELEASE.jar!/org/springframework/amqp/rabbit/config/spring-rabbit-1.0.xsd">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="148">
+ <caret line="149" column="4" lean-forward="false" selection-start-line="149" selection-start-column="4" selection-end-line="149" selection-end-column="4" />
</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="340">
- <caret line="168" column="34" lean-forward="false" selection-start-line="168" selection-start-column="34" selection-end-line="168" selection-end-column="34" />
+ <state relative-caret-position="180">
+ <caret line="51" column="25" lean-forward="false" selection-start-line="51" selection-start-column="15" selection-end-line="51" selection-end-column="25" />
+ </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="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/java/com/moral/monitor/controller/Go.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <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/ScreenApiController.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="135">
+ <caret line="19" column="13" lean-forward="false" selection-start-line="19" selection-start-column="13" selection-end-line="19" selection-end-column="13" />
+ </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="87">
+ <caret line="95" column="0" lean-forward="true" selection-start-line="95" selection-start-column="0" selection-end-line="95" selection-end-column="0" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/resources/spring/mongodb.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="270">
+ <caret line="18" column="46" lean-forward="false" selection-start-line="18" selection-start-column="46" selection-end-line="18" selection-end-column="46" />
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/test/java/Test.java">
+ <entry file="file://$PROJECT_DIR$/src/main/resources/spring/rabbitmq.xml">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="150">
- <caret line="10" column="0" lean-forward="false" selection-start-line="10" selection-start-column="0" selection-end-line="10" selection-end-column="0" />
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
+ <state relative-caret-position="177">
+ <caret line="22" column="0" lean-forward="true" selection-start-line="22" selection-start-column="0" selection-end-line="22" selection-end-column="0" />
+ <folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/pom.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="138">
- <caret line="13" column="37" lean-forward="false" selection-start-line="13" selection-start-column="37" selection-end-line="13" selection-end-column="37" />
+ <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" />
+ <folding />
+ </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" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <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="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" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/resources/spring/database.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="90">
+ <caret line="6" column="62" lean-forward="false" selection-start-line="6" selection-start-column="62" selection-end-line="6" selection-end-column="62" />
<folding />
</state>
</provider>
@@ -924,6 +1289,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>
@@ -936,6 +1364,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