From 174ce09fe8297b9283ba5be138245fea886d9e2a Mon Sep 17 00:00:00 2001 From: 沈斌 <bluelazysb@hotmail.com> Date: Sun, 12 Nov 2017 19:52:18 +0800 Subject: [PATCH] test --- src/main/resources/spring/application.xml | 1 src/main/resources/rabbitmq/rabbit-config.properties | 5 .idea/workspace.xml | 343 +++++++++++++++++++++++++++++++++++--------------------- src/main/resources/spring/rabbitmq.xml | 10 4 files changed, 223 insertions(+), 136 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index e1bfc53..aa6dda7 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -7,8 +7,10 @@ </component> <component name="ChangeListManager"> <list default="true" id="59bc3ffe-0657-438a-9fae-fbbdeee84a24" name="Default" comment=""> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/resources/rabbitmq/rabbit-config.properties" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources/mongodb/mongodb-config.properties" afterPath="$PROJECT_DIR$/src/main/resources/mongodb/mongodb-config.properties" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources/spring/application.xml" afterPath="$PROJECT_DIR$/src/main/resources/spring/application.xml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources/spring/rabbitmq.xml" afterPath="$PROJECT_DIR$/src/main/resources/spring/rabbitmq.xml" /> </list> <ignored path="$PROJECT_DIR$/out/" /> <ignored path="$PROJECT_DIR$/target/" /> @@ -21,21 +23,83 @@ </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"> + <file leaf-file-name="redis-config.properties" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/main/resources/redis/redis-config.properties"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="180"> - <caret line="96" column="16" lean-forward="true" selection-start-line="96" selection-start-column="16" selection-end-line="96" selection-end-column="16" /> + <state relative-caret-position="45"> + <caret line="3" column="26" lean-forward="false" selection-start-line="3" selection-start-column="11" selection-end-line="3" selection-end-column="26" /> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="mongodb-config.properties" pinned="false" current-in-tab="true"> + <file leaf-file-name="database.xml" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/main/resources/spring/database.xml"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="135"> + <caret line="9" column="47" lean-forward="true" selection-start-line="9" selection-start-column="47" selection-end-line="9" selection-end-column="47" /> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="quartz.xml" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/main/resources/spring/quartz.xml"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="1200"> + <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> + </file> + <file leaf-file-name="rabbitmq.xml" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/main/resources/spring/rabbitmq.xml"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="210"> + <caret line="14" column="24" lean-forward="false" selection-start-line="14" selection-start-column="24" selection-end-line="14" selection-end-column="24" /> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="application.xml" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/main/resources/spring/application.xml"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="270"> + <caret line="18" column="35" lean-forward="false" selection-start-line="18" selection-start-column="35" selection-end-line="18" selection-end-column="35" /> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="rabbit-config.properties" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/main/resources/rabbitmq/rabbit-config.properties"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="0"> + <caret line="0" column="13" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="13" /> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="redis.xml" pinned="false" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/src/main/resources/spring/redis.xml"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="180"> + <caret line="12" column="56" lean-forward="false" selection-start-line="12" selection-start-column="40" selection-end-line="12" selection-end-column="56" /> + <folding> + <element signature="e#804#822#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="mongodb-config.properties" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/src/main/resources/mongodb/mongodb-config.properties"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="15"> - <caret line="1" column="23" lean-forward="false" selection-start-line="1" selection-start-column="23" selection-end-line="1" selection-end-column="23" /> + <state relative-caret-position="0"> + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="15" selection-end-column="24" /> <folding /> </state> </provider> @@ -128,10 +192,12 @@ <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/redis/redis-config.properties" /> <option value="$PROJECT_DIR$/src/main/resources/spring/database.xml" /> <option value="$PROJECT_DIR$/src/main/resources/mongodb/mongodb-config.properties" /> + <option value="$PROJECT_DIR$/src/main/resources/rabbitmq/rabbit-config.properties" /> + <option value="$PROJECT_DIR$/src/main/resources/spring/rabbitmq.xml" /> + <option value="$PROJECT_DIR$/src/main/resources/spring/application.xml" /> </list> </option> </component> @@ -149,6 +215,7 @@ <option name="CUSTOM_FILTER" /> </component> <component name="ProjectFrameBounds"> + <option name="x" value="-25" /> <option name="y" value="23" /> <option name="width" value="1404" /> <option name="height" value="877" /> @@ -169,7 +236,6 @@ <foldersAlwaysOnTop value="true" /> </navigator> <panes> - <pane id="PackagesPane" /> <pane id="ProjectPane"> <subPane> <expand> @@ -208,15 +274,56 @@ <item name="src" type="462c0819:PsiDirectoryNode" /> <item name="main" type="462c0819:PsiDirectoryNode" /> <item name="resources" type="462c0819:PsiDirectoryNode" /> + <item name="log4j" type="462c0819:PsiDirectoryNode" /> + </path> + <path> + <item name="task" type="b2602c69:ProjectViewProjectNode" /> + <item name="task" type="462c0819:PsiDirectoryNode" /> + <item name="src" type="462c0819:PsiDirectoryNode" /> + <item name="main" type="462c0819:PsiDirectoryNode" /> + <item name="resources" type="462c0819:PsiDirectoryNode" /> <item name="mongodb" type="462c0819:PsiDirectoryNode" /> + </path> + <path> + <item name="task" type="b2602c69:ProjectViewProjectNode" /> + <item name="task" type="462c0819:PsiDirectoryNode" /> + <item name="src" type="462c0819:PsiDirectoryNode" /> + <item name="main" type="462c0819:PsiDirectoryNode" /> + <item name="resources" type="462c0819:PsiDirectoryNode" /> + <item name="mybatis" type="462c0819:PsiDirectoryNode" /> + </path> + <path> + <item name="task" type="b2602c69:ProjectViewProjectNode" /> + <item name="task" type="462c0819:PsiDirectoryNode" /> + <item name="src" type="462c0819:PsiDirectoryNode" /> + <item name="main" type="462c0819:PsiDirectoryNode" /> + <item name="resources" type="462c0819:PsiDirectoryNode" /> + <item name="rabbitmq" type="462c0819:PsiDirectoryNode" /> + </path> + <path> + <item name="task" type="b2602c69:ProjectViewProjectNode" /> + <item name="task" type="462c0819:PsiDirectoryNode" /> + <item name="src" type="462c0819:PsiDirectoryNode" /> + <item name="main" type="462c0819:PsiDirectoryNode" /> + <item name="resources" type="462c0819:PsiDirectoryNode" /> + <item name="redis" type="462c0819:PsiDirectoryNode" /> + </path> + <path> + <item name="task" type="b2602c69:ProjectViewProjectNode" /> + <item name="task" type="462c0819:PsiDirectoryNode" /> + <item name="src" type="462c0819:PsiDirectoryNode" /> + <item name="main" type="462c0819:PsiDirectoryNode" /> + <item name="resources" type="462c0819:PsiDirectoryNode" /> + <item name="spring" type="462c0819:PsiDirectoryNode" /> </path> </expand> <select /> </subPane> </pane> + <pane id="PackagesPane" /> <pane id="Scope" /> - <pane id="AndroidView" /> <pane id="Scratches" /> + <pane id="AndroidView" /> </panes> </component> <component name="PropertiesComponent"> @@ -508,14 +615,8 @@ <workItem from="1510363585918" duration="933000" /> <workItem from="1510377433075" duration="1355000" /> <workItem from="1510382937212" duration="1021000" /> - <workItem from="1510386169863" duration="51000" /> - </task> - <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>1508920155177</updated> + <workItem from="1510386169863" duration="182000" /> + <workItem from="1510486709328" duration="798000" /> </task> <task id="LOCAL-00014" summary="updates"> <created>1508920429528</created> @@ -853,80 +954,54 @@ <option name="project" value="LOCAL" /> <updated>1510382975798</updated> </task> - <option name="localTasksCounter" value="62" /> + <task id="LOCAL-00062" summary="test"> + <created>1510386227263</created> + <option name="number" value="00062" /> + <option name="presentableId" value="LOCAL-00062" /> + <option name="project" value="LOCAL" /> + <updated>1510386227264</updated> + </task> + <option name="localTasksCounter" value="63" /> <servers /> </component> <component name="TimeTrackingManager"> - <option name="totallyTimeSpent" value="128250000" /> + <option name="totallyTimeSpent" value="129179000" /> </component> <component name="ToolWindowManager"> - <frame x="0" y="23" width="1404" height="877" extended-state="0" /> + <frame x="-25" 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.5639386" sideWeight="0.52643174" order="8" side_tool="true" content_ui="tabs" /> + <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3286445" sideWeight="0.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="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="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="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.37595907" sideWeight="0.52349484" 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="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.5639386" sideWeight="0.47650513" 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.5639386" sideWeight="0.4735683" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.40537083" sideWeight="0.4632893" 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.22613803" 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="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="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="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="false" show_stripe_button="true" weight="0.37595907" sideWeight="0.52349484" 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.0" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> - <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> - <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> - <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.39897698" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> - <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.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="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.4632893" 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.5639386" sideWeight="0.47650513" 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="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.22320117" 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" /> - </layout-to-restore> </component> <component name="TypeScriptGeneratedFilesManager"> <option name="version" value="1" /> @@ -1000,13 +1075,6 @@ <watches-manager /> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/.idea/compiler.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/java/com/moral/monitor/entity/History.java"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="210"> @@ -1078,13 +1146,6 @@ </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/java/com/moral/monitor/dao/LoggerMapper.java"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="60"> @@ -1092,22 +1153,7 @@ </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/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"> @@ -1214,14 +1260,6 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/resources/spring/rabbitmq.xml"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="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$/src/main/java/com/moral/monitor/dao/AccountEntityMapper.java"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="60"> @@ -1240,29 +1278,6 @@ <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" /> - </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="150"> - <caret line="10" column="45" lean-forward="true" selection-start-line="10" selection-start-column="45" selection-end-line="10" selection-end-column="45" /> - <folding /> - </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="283"> - <caret line="60" column="22" lean-forward="false" selection-start-line="60" selection-start-column="22" selection-end-line="60" selection-end-column="22" /> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/resources/redis/redis-config.properties"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="45"> - <caret line="3" column="26" lean-forward="false" selection-start-line="3" selection-start-column="11" selection-end-line="3" selection-end-column="26" /> </state> </provider> </entry> @@ -1298,20 +1313,86 @@ </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="180"> - <caret line="96" column="16" lean-forward="true" selection-start-line="96" selection-start-column="16" selection-end-line="96" selection-end-column="16" /> + <state relative-caret-position="15"> + <caret line="96" column="16" lean-forward="false" selection-start-line="96" selection-start-column="16" selection-end-line="96" selection-end-column="16" /> + <folding /> + </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" /> <folding /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/main/resources/mongodb/mongodb-config.properties"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="15"> - <caret line="1" column="23" lean-forward="false" selection-start-line="1" selection-start-column="23" selection-end-line="1" selection-end-column="23" /> + <state relative-caret-position="0"> + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="15" selection-end-column="24" /> <folding /> </state> </provider> </entry> + <entry file="file://$PROJECT_DIR$/src/main/resources/rabbitmq/rabbit-config.properties"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="0"> + <caret line="0" column="13" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="13" /> + <folding /> + </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="270"> + <caret line="18" column="35" lean-forward="false" selection-start-line="18" selection-start-column="35" selection-end-line="18" selection-end-column="35" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/resources/spring/rabbitmq.xml"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="210"> + <caret line="14" column="24" lean-forward="false" selection-start-line="14" selection-start-column="24" selection-end-line="14" selection-end-column="24" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/resources/spring/quartz.xml"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="1200"> + <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/spring/database.xml"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="135"> + <caret line="9" column="47" lean-forward="true" selection-start-line="9" selection-start-column="47" selection-end-line="9" selection-end-column="47" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/resources/redis/redis-config.properties"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="45"> + <caret line="3" column="26" lean-forward="false" selection-start-line="3" selection-start-column="11" selection-end-line="3" selection-end-column="26" /> + <folding /> + </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="180"> + <caret line="12" column="56" lean-forward="false" selection-start-line="12" selection-start-column="40" selection-end-line="12" selection-end-column="56" /> + <folding> + <element signature="e#804#822#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> </component> <component name="masterDetails"> <states> diff --git a/src/main/resources/rabbitmq/rabbit-config.properties b/src/main/resources/rabbitmq/rabbit-config.properties new file mode 100644 index 0000000..30e4507 --- /dev/null +++ b/src/main/resources/rabbitmq/rabbit-config.properties @@ -0,0 +1,5 @@ +rabbitmq.host=116.62.12.115 +rabbitmq.port=5672 +rabbitmq.username=guest +rabbitmq.password=guest_pass +rabbitmq.channelCacheSize=8 diff --git a/src/main/resources/spring/application.xml b/src/main/resources/spring/application.xml index 4f65681..95d9a9a 100644 --- a/src/main/resources/spring/application.xml +++ b/src/main/resources/spring/application.xml @@ -21,6 +21,7 @@ <value>classpath:log4j/log4j.properties</value> <value>classpath:redis/redis-config.properties</value> <value>classpath:mongodb/mongodb-config.properties</value> + <value>classpath:rabbitmq/rabbit-config.properties</value> </list> </property> </bean> diff --git a/src/main/resources/spring/rabbitmq.xml b/src/main/resources/spring/rabbitmq.xml index 55fe160..3eefb5f 100644 --- a/src/main/resources/spring/rabbitmq.xml +++ b/src/main/resources/spring/rabbitmq.xml @@ -8,11 +8,11 @@ <!-- rabbitMQ������ --> <bean id="rabbitConnectionFactory" class="org.springframework.amqp.rabbit.connection.CachingConnectionFactory"> - <constructor-arg value="116.62.12.115"/> - <property name="username" value="guest"/> - <property name="password" value="guest_pass"/> - <property name="channelCacheSize" value="8"/> - <property name="port" value="5672"/> + <constructor-arg value="${rabbitmq.host}"/> + <property name="username" value="${rabbitmq.username}"/> + <property name="password" value="${rabbitmq.password}"/> + <property name="channelCacheSize" value="${rabbitmq.channelCacheSize}"/> + <property name="port" value="${rabbitmq.port}"/> </bean> <rabbit:admin connection-factory="rabbitConnectionFactory"/> -- Gitblit v1.8.0