From f0aa3d758d72891edb08f8e3ac14ffcd95fbb30c Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Tue, 07 Nov 2017 09:47:56 +0800
Subject: [PATCH] test
---
.idea/workspace.xml | 208 +++++++++++++++++++++++++++++++++++++--------------
1 files changed, 149 insertions(+), 59 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 3b43021..8605633 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,8 +6,9 @@
</artifacts-to-build>
</component>
<component name="ChangeListManager">
- <list default="true" id="59bc3ffe-0657-438a-9fae-fbbdeee84a24" name="Default" comment="������MQ������������">
+ <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$/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/" />
@@ -20,25 +21,26 @@
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="FileEditorManager">
- <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
- <file leaf-file-name="TaskListener.java" pinned="false" current-in-tab="false">
- <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="990">
- <caret line="66" column="24" lean-forward="false" selection-start-line="66" selection-start-column="24" selection-end-line="66" selection-end-column="24" />
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- </file>
+ <leaf>
<file leaf-file-name="rabbitmq.xml" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/resources/spring/rabbitmq.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="495">
<caret line="33" column="93" lean-forward="false" selection-start-line="33" selection-start-column="93" selection-end-line="33" selection-end-column="93" />
<folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="TaskListener.java" pinned="false" current-in-tab="false">
+ <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="533">
+ <caret line="97" column="2" lean-forward="false" selection-start-line="97" selection-start-column="2" selection-end-line="97" selection-end-column="2" />
+ <folding>
+ <element signature="imports" expanded="true" />
+ <marker date="1510019181000" expanded="false" signature="5505:5523" ph="<~>" />
+ </folding>
</state>
</provider>
</entry>
@@ -169,7 +171,6 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
- <pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<expand>
@@ -177,12 +178,62 @@
<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="webapp" type="462c0819:PsiDirectoryNode" />
+ </path>
</expand>
<select />
</subPane>
</pane>
- <pane id="PackagesPane" />
<pane id="Scratches" />
+ <pane id="Scope" />
+ <pane id="PackagesPane" />
<pane id="AndroidView" />
</panes>
</component>
@@ -464,7 +515,9 @@
<workItem from="1509938642246" duration="726000" />
<workItem from="1509946269191" duration="522000" />
<workItem from="1509957226710" duration="251000" />
- <workItem from="1509957794827" duration="14000" />
+ <workItem from="1509957794827" duration="173000" />
+ <workItem from="1510014788172" duration="2297000" />
+ <workItem from="1510018622224" duration="553000" />
</task>
<task id="LOCAL-00001" summary="updates">
<created>1508484578874</created>
@@ -781,11 +834,39 @@
<option name="project" value="LOCAL" />
<updated>1509957305739</updated>
</task>
- <option name="localTasksCounter" value="46" />
+ <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>
+ <option name="localTasksCounter" value="50" />
<servers />
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="112633000" />
+ <option name="totallyTimeSpent" value="115642000" />
</component>
<component name="ToolWindowManager">
<frame x="0" y="23" width="1404" height="877" extended-state="0" />
@@ -800,12 +881,12 @@
<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="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.54092073" sideWeight="0.479442" 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="true" show_stripe_button="true" weight="0.40537083" sideWeight="0.48091042" order="10" 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.48091042" 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.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.2444934" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+ <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.24816446" 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" />
@@ -883,7 +964,10 @@
<MESSAGE value="������log" />
<MESSAGE value="������������" />
<MESSAGE value="������MQ������������" />
- <option name="LAST_COMMIT_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>
@@ -892,34 +976,6 @@
<watches-manager />
</component>
<component name="editorHistoryManager">
- <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="135">
- <caret line="34" column="25" lean-forward="true" selection-start-line="34" selection-start-column="4" selection-end-line="34" selection-end-column="25" />
- </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="59">
- <caret line="4" column="30" lean-forward="false" selection-start-line="4" selection-start-column="16" selection-end-line="4" selection-end-column="30" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/entity/QueryHelper.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/entity/Equipment.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="60">
- <caret line="4" column="13" lean-forward="false" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" />
- </state>
- </provider>
- </entry>
<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="120">
@@ -1156,13 +1212,6 @@
</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="90">
- <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/resources/spring/mongodb.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="270">
@@ -1171,12 +1220,53 @@
</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" />
+ <folding />
+ </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" />
+ <folding />
+ </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" />
+ <folding />
+ </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" />
+ <folding />
+ </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" />
+ <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="990">
- <caret line="66" column="24" lean-forward="false" selection-start-line="66" selection-start-column="24" selection-end-line="66" selection-end-column="24" />
+ <state relative-caret-position="533">
+ <caret line="97" column="2" lean-forward="false" selection-start-line="97" selection-start-column="2" selection-end-line="97" selection-end-column="2" />
<folding>
<element signature="imports" expanded="true" />
+ <marker date="1510019181000" expanded="false" signature="5505:5523" ph="<~>" />
</folding>
</state>
</provider>
--
Gitblit v1.8.0