From 755c161563d4573586b8a3dc1639302ac5f24d52 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Sun, 29 Oct 2017 16:25:55 +0800
Subject: [PATCH] 代码更新
---
.idea/workspace.xml | 62 +++++++++++++++++--------------
src/main/resources/rabbitmq.xml | 4 +-
2 files changed, 36 insertions(+), 30 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 0be2399..58d15f2 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,9 +6,8 @@
</artifacts-to-build>
</component>
<component name="ChangeListManager">
- <list default="true" id="59bc3ffe-0657-438a-9fae-fbbdeee84a24" name="Default" comment="���������������������������">
+ <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/rabbitmq.xml" afterPath="$PROJECT_DIR$/src/main/resources/rabbitmq.xml" />
</list>
<ignored path="$PROJECT_DIR$/out/" />
@@ -22,7 +21,7 @@
</component>
<component name="FileEditorManager">
<leaf>
- <file leaf-file-name="TaskListener.java" pinned="false" current-in-tab="true">
+ <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="211">
@@ -32,11 +31,11 @@
</provider>
</entry>
</file>
- <file leaf-file-name="rabbitmq.xml" pinned="false" current-in-tab="false">
+ <file leaf-file-name="rabbitmq.xml" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/resources/rabbitmq.xml">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="147">
- <caret line="18" column="0" lean-forward="true" selection-start-line="18" selection-start-column="0" selection-end-line="18" selection-end-column="0" />
+ <state relative-caret-position="435">
+ <caret line="29" column="79" lean-forward="false" selection-start-line="29" selection-start-column="74" selection-end-line="29" selection-end-column="79" />
<folding />
</state>
</provider>
@@ -128,11 +127,11 @@
<option name="FILTER_DEBUG" value="true" />
<option name="CUSTOM_FILTER" />
</component>
- <component name="ProjectFrameBounds" extendedState="6">
- <option name="x" value="682" />
- <option name="y" value="30" />
- <option name="width" value="1402" />
- <option name="height" value="877" />
+ <component name="ProjectFrameBounds">
+ <option name="x" value="-1445" />
+ <option name="y" value="36" />
+ <option name="width" value="1920" />
+ <option name="height" value="1057" />
</component>
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
<component name="ProjectView">
@@ -401,7 +400,7 @@
<workItem from="1509068025499" duration="9340000" />
<workItem from="1509085973276" duration="5136000" />
<workItem from="1509095479339" duration="556000" />
- <workItem from="1509260666213" duration="2978000" />
+ <workItem from="1509260666213" duration="3472000" />
</task>
<task id="LOCAL-00001" summary="updates">
<created>1508484578874</created>
@@ -557,17 +556,24 @@
<option name="project" value="LOCAL" />
<updated>1509091232558</updated>
</task>
- <option name="localTasksCounter" value="23" />
+ <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>
+ <option name="localTasksCounter" value="24" />
<servers />
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="71074000" />
+ <option name="totallyTimeSpent" value="71568000" />
</component>
<component name="ToolWindowManager">
- <frame x="3" y="23" width="1402" height="877" extended-state="6" />
+ <frame x="-1445" y="36" width="1920" height="1057" 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.7378517" sideWeight="0.51468426" order="8" side_tool="true" content_ui="tabs" />
+ <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.6023018" sideWeight="0.5176471" 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" />
@@ -584,10 +590,10 @@
<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="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="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.60358053" sideWeight="0.4853157" order="3" 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.28690228" sideWeight="0.48235294" 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.22132353" 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.16027689" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="true" content_ui="tabs" />
<window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="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" />
@@ -647,12 +653,12 @@
<MESSAGE value="BUG-058" />
<MESSAGE value="������������������" />
<MESSAGE value="updates" />
- <MESSAGE value="������������" />
<MESSAGE value="RabbitMQ & Redis ������" />
<MESSAGE value="������������" />
<MESSAGE value="���������������������" />
<MESSAGE value="���������������������������" />
- <option name="LAST_COMMIT_MESSAGE" value="���������������������������" />
+ <MESSAGE value="������������" />
+ <option name="LAST_COMMIT_MESSAGE" value="������������" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
@@ -986,14 +992,6 @@
</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="147">
- <caret line="18" column="0" lean-forward="true" selection-start-line="18" selection-start-column="0" selection-end-line="18" selection-end-column="0" />
- <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="211">
@@ -1002,6 +1000,14 @@
</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="435">
+ <caret line="29" column="79" lean-forward="false" selection-start-line="29" selection-start-column="74" selection-end-line="29" selection-end-column="79" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
</component>
<component name="masterDetails">
<states>
diff --git a/src/main/resources/rabbitmq.xml b/src/main/resources/rabbitmq.xml
index 254554b..7382869 100644
--- a/src/main/resources/rabbitmq.xml
+++ b/src/main/resources/rabbitmq.xml
@@ -35,13 +35,13 @@
<rabbit:listener queues="devices_storage_data" ref="amqpMsgListener" />
</rabbit:listener-container>
- <rabbit:fanout-exchange name="monitors_data2" durable="true" auto-delete="true">
+ <rabbit:fanout-exchange name="monitors_data2" durable="false" auto-delete="true">
<rabbit:bindings>
<rabbit:binding queue="monitors_storage_data2"></rabbit:binding>
</rabbit:bindings>
</rabbit:fanout-exchange>
- <rabbit:queue name="monitors_storage_data2" durable="true" auto-delete="true" exclusive="false" />
+ <rabbit:queue name="monitors_storage_data2" durable="false" auto-delete="true" exclusive="false" />
<!--http://blog.csdn.net/u012204058/article/details/54292888-->
<!--http://blog.csdn.net/itmrchen/article/details/53285648-->
--
Gitblit v1.8.0