From 67f1141a12744226c1d0645da9068ad7c668dfc9 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Thu, 26 Oct 2017 11:03:58 +0800
Subject: [PATCH] 代码更新
---
src/main/resources/redis.xml | 31 +++
task.iml | 4
.idea/workspace.xml | 409 ++++++++++++++++++--------------------------
src/main/java/com/moral/monitor/controller/TestController.java | 38 ++++
.idea/compiler.xml | 2
.idea/libraries/Maven__io_netty_netty_all_4_1_7_Final.xml | 13 +
.idea/artifacts/task_war_exploded.xml | 6
src/main/resources/application.xml | 1
src/main/resources/redis-config.properties | 8
9 files changed, 267 insertions(+), 245 deletions(-)
diff --git a/.idea/artifacts/task_war_exploded.xml b/.idea/artifacts/task_war_exploded.xml
index 8bace23..fbae2ee 100644
--- a/.idea/artifacts/task_war_exploded.xml
+++ b/.idea/artifacts/task_war_exploded.xml
@@ -1,6 +1,6 @@
<component name="ArtifactManager">
<artifact type="exploded-war" name="task:war exploded">
- <output-path>$PROJECT_DIR$/target/task</output-path>
+ <output-path>$PROJECT_DIR$/src/main/webapp</output-path>
<root id="root">
<element id="directory" name="WEB-INF">
<element id="directory" name="classes">
@@ -55,8 +55,8 @@
<element id="library" level="project" name="Maven: cn.jpush.api:jiguang-common:1.0.3" />
<element id="library" level="project" name="Maven: com.squareup.okhttp3:okhttp:3.3.1" />
<element id="library" level="project" name="Maven: com.squareup.okio:okio:1.8.0" />
- <element id="library" level="project" name="Maven: io.netty:netty-all:4.1.6.Final" />
<element id="library" level="project" name="Maven: com.google.code.gson:gson:2.3" />
+ <element id="library" level="project" name="Maven: io.netty:netty-all:4.1.7.Final" />
<element id="library" level="project" name="Maven: org.springframework.data:spring-data-redis:1.8.7.RELEASE" />
<element id="library" level="project" name="Maven: org.springframework.data:spring-data-keyvalue:1.2.7.RELEASE" />
<element id="library" level="project" name="Maven: org.springframework.data:spring-data-commons:1.13.7.RELEASE" />
@@ -67,7 +67,7 @@
</element>
</element>
<element id="directory" name="META-INF">
- <element id="file-copy" path="$PROJECT_DIR$/target/task/META-INF/MANIFEST.MF" />
+ <element id="file-copy" path="$PROJECT_DIR$/src/main/webapp/META-INF/MANIFEST.MF" />
</element>
<element id="javaee-facet-resources" facet="task/web/Web" />
</root>
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 4663736..16e59b0 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -10,7 +10,7 @@
</profile>
</annotationProcessing>
<bytecodeTargetLevel>
- <module name="task" target="1.5" />
+ <module name="task" target="1.6" />
</bytecodeTargetLevel>
</component>
</project>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_netty_netty_all_4_1_7_Final.xml b/.idea/libraries/Maven__io_netty_netty_all_4_1_7_Final.xml
new file mode 100644
index 0000000..6dd2da4
--- /dev/null
+++ b/.idea/libraries/Maven__io_netty_netty_all_4_1_7_Final.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: io.netty:netty-all:4.1.7.Final">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-all/4.1.7.Final/netty-all-4.1.7.Final.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-all/4.1.7.Final/netty-all-4.1.7.Final-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-all/4.1.7.Final/netty-all-4.1.7.Final-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 17facc7..ea3929d 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,17 +7,16 @@
</component>
<component name="ChangeListManager">
<list default="true" id="59bc3ffe-0657-438a-9fae-fbbdeee84a24" name="Default" comment="">
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/uiDesigner.xml" />
- <change type="MOVED" beforePath="$PROJECT_DIR$/src/main/java/com/moral/monitor/entity/Monitorpoint.java" afterPath="$PROJECT_DIR$/src/main/java/com/moral/monitor/entity/MonitorPoint.java" />
- <change type="MOVED" beforePath="$PROJECT_DIR$/src/main/java/com/moral/monitor/entity/MonitorpointExample.java" afterPath="$PROJECT_DIR$/src/main/java/com/moral/monitor/entity/MonitorPointExample.java" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_all_4_1_7_Final.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/moral/monitor/controller/TestController.java" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/resources/redis-config.properties" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/resources/redis.xml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/artifacts/task_war_exploded.xml" afterPath="$PROJECT_DIR$/.idea/artifacts/task_war_exploded.xml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/compiler.xml" afterPath="$PROJECT_DIR$/.idea/compiler.xml" />
<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/controller/MgrController.java" afterPath="$PROJECT_DIR$/src/main/java/com/moral/monitor/controller/MgrController.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/moral/monitor/controller/MonitorPointController.java" afterPath="$PROJECT_DIR$/src/main/java/com/moral/monitor/controller/MonitorPointController.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/moral/monitor/dao/MgrDao.java" afterPath="$PROJECT_DIR$/src/main/java/com/moral/monitor/dao/MgrDao.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/moral/monitor/dao/MonitorpointDao.java" afterPath="$PROJECT_DIR$/src/main/java/com/moral/monitor/dao/MonitorpointDao.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/moral/monitor/service/MgrService.java" afterPath="$PROJECT_DIR$/src/main/java/com/moral/monitor/service/MgrService.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/moral/monitor/service/MonitorpointService.java" afterPath="$PROJECT_DIR$/src/main/java/com/moral/monitor/service/MonitorpointService.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/moral/monitor/service/impl/MonitorpointServiceImpl.java" afterPath="$PROJECT_DIR$/src/main/java/com/moral/monitor/service/impl/MonitorpointServiceImpl.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/Listener.java" afterPath="$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/Listener.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources/application.xml" afterPath="$PROJECT_DIR$/src/main/resources/application.xml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/task.iml" afterPath="$PROJECT_DIR$/task.iml" />
</list>
<ignored path="$PROJECT_DIR$/out/" />
<ignored path="$PROJECT_DIR$/target/" />
@@ -30,102 +29,21 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
- <file leaf-file-name="Listener.java" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/Listener.java">
+ <file leaf-file-name="redis.xml" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/resources/redis.xml">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="158">
- <caret line="48" column="56" lean-forward="false" selection-start-line="48" selection-start-column="56" selection-end-line="48" selection-end-column="56" />
- <folding>
- <element signature="imports" expanded="true" />
- <element signature="e#2778#2796#0" expanded="true" />
- <element signature="e#3024#3033#0" expanded="true" />
- <element signature="e#6674#6690#0" expanded="true" />
- <element signature="e#8171#8187#0" expanded="true" />
- <element signature="e#8732#8748#0" expanded="true" />
- <element signature="e#10372#10388#0" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="Sensor.java" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/entity/Sensor.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="102">
- <caret line="11" column="25" lean-forward="false" selection-start-line="11" selection-start-column="19" selection-end-line="11" selection-end-column="25" />
+ <state relative-caret-position="345">
+ <caret line="23" column="36" lean-forward="false" selection-start-line="23" selection-start-column="14" selection-end-line="23" selection-end-column="36" />
<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/quartz.xml">
+ <file leaf-file-name="redis-config.properties" pinned="false" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/src/main/resources/redis-config.properties">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="835">
- <caret line="75" column="21" lean-forward="false" selection-start-line="75" selection-start-column="21" selection-end-line="75" selection-end-column="21" />
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="MonitorPoint.java" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/entity/MonitorPoint.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="479">
- <caret line="36" column="0" lean-forward="false" selection-start-line="36" selection-start-column="0" selection-end-line="36" selection-end-column="0" />
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="MonitorpointServiceImpl.java" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/service/impl/MonitorpointServiceImpl.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="135">
- <caret line="17" column="8" lean-forward="false" selection-start-line="17" selection-start-column="8" selection-end-line="17" selection-end-column="8" />
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="MgrService.java" pinned="false" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/service/MgrService.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="180">
- <caret line="17" column="28" lean-forward="false" selection-start-line="17" selection-start-column="16" selection-end-line="17" selection-end-column="28" />
- <folding>
- <element signature="e#362#363#0" expanded="true" />
- <element signature="e#404#405#0" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="pom.xml" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/pom.xml">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="203">
- <caret line="183" column="18" lean-forward="false" selection-start-line="183" selection-start-column="18" selection-end-line="183" selection-end-column="18" />
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="MonitorListener.java" pinned="false" current-in-tab="false">
- <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="135">
- <caret line="23" column="75" lean-forward="false" selection-start-line="23" selection-start-column="75" selection-end-line="23" selection-end-column="75" />
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="MessageNotice.java" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/quartz/MessageNotice.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="160">
- <caret line="20" column="60" lean-forward="false" selection-start-line="20" selection-start-column="38" selection-end-line="20" selection-end-column="60" />
+ <state relative-caret-position="120">
+ <caret line="8" column="0" lean-forward="true" selection-start-line="8" selection-start-column="0" selection-end-line="8" selection-end-column="0" />
<folding />
</state>
</provider>
@@ -149,6 +67,7 @@
<find>updateFromequipmentBymac</find>
<find>jedis</find>
<find>Monitorpoint</find>
+ <find>sysConfig.properties</find>
</findStrings>
</component>
<component name="Git.Settings">
@@ -171,12 +90,16 @@
<option value="$PROJECT_DIR$/src/main/resources/rabbitmq.xml" />
<option value="$PROJECT_DIR$/src/main/resources/database.xml" />
<option value="$PROJECT_DIR$/src/main/resources/mybatis.xml" />
- <option value="$PROJECT_DIR$/src/main/resources/application.xml" />
<option value="$PROJECT_DIR$/src/main/resources/quartz.xml" />
<option value="$PROJECT_DIR$/pom.xml" />
- <option value="$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/Listener.java" />
<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/listener/Listener.java" />
+ <option value="$PROJECT_DIR$/src/main/resources/application.xml" />
+ <option value="$PROJECT_DIR$/src/main/java/com/moral/monitor/controller/TestController.java" />
+ <option value="$PROJECT_DIR$/src/main/resources/redis.xml" />
+ <option value="$PROJECT_DIR$/src/main/resources/redis-config.properties" />
</list>
</option>
</component>
@@ -193,9 +116,9 @@
<option name="FILTER_DEBUG" value="true" />
<option name="CUSTOM_FILTER" />
</component>
- <component name="ProjectFrameBounds" extendedState="6">
+ <component name="ProjectFrameBounds">
<option name="y" value="23" />
- <option name="width" value="1404" />
+ <option name="width" value="1406" />
<option name="height" value="877" />
</component>
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
@@ -214,7 +137,10 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
+ <pane id="PackagesPane" />
<pane id="Scratches" />
+ <pane id="AndroidView" />
+ <pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<expand>
@@ -222,13 +148,28 @@
<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="resources" type="462c0819:PsiDirectoryNode" />
+ </path>
</expand>
<select />
</subPane>
</pane>
- <pane id="AndroidView" />
- <pane id="PackagesPane" />
- <pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
@@ -454,7 +395,8 @@
<workItem from="1508824129641" duration="250000" />
<workItem from="1508824729673" duration="781000" />
<workItem from="1508900264535" duration="3612000" />
- <workItem from="1508911116546" duration="4544000" />
+ <workItem from="1508911116546" duration="7028000" />
+ <workItem from="1508977804904" duration="5414000" />
</task>
<task id="LOCAL-00001" summary="updates">
<created>1508484578874</created>
@@ -554,18 +496,25 @@
<option name="project" value="LOCAL" />
<updated>1508920429528</updated>
</task>
- <option name="localTasksCounter" value="15" />
+ <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>
+ <option name="localTasksCounter" value="16" />
<servers />
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="19301000" />
+ <option name="totallyTimeSpent" value="27199000" />
</component>
<component name="ToolWindowManager">
- <frame x="0" y="23" width="1404" height="877" extended-state="6" />
+ <frame x="0" y="23" width="1406" height="877" extended-state="0" />
<layout>
<window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
- <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.685422" sideWeight="0.50587374" 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="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.45140666" sideWeight="0.50587374" 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" />
@@ -580,13 +529,13 @@
<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.45140666" sideWeight="0.4941263" 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="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.45268542" sideWeight="0.4941263" 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.23348017" 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.24486804" 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.33" sideWeight="0.5" order="5" 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" />
<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" />
@@ -644,7 +593,8 @@
<MESSAGE value="BUG-058" />
<MESSAGE value="������������������" />
<MESSAGE value="updates" />
- <option name="LAST_COMMIT_MESSAGE" value="updates" />
+ <MESSAGE value="������������" />
+ <option name="LAST_COMMIT_MESSAGE" value="������������" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
@@ -653,41 +603,6 @@
<watches-manager />
</component>
<component name="editorHistoryManager">
- <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/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">
@@ -751,13 +666,6 @@
</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" />
- </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="-3">
@@ -813,21 +721,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="104">
<caret line="26" column="19" lean-forward="false" selection-start-line="26" selection-start-column="12" selection-end-line="26" selection-end-column="19" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/service/DashboardService.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="107">
- <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/service/ApiService.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="81">
- <caret line="16" column="25" lean-forward="true" selection-start-line="16" selection-start-column="25" selection-end-line="16" selection-end-column="25" />
</state>
</provider>
</entry>
@@ -835,13 +728,6 @@
<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/util/ApiData.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>
@@ -881,29 +767,6 @@
</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="510">
- <caret line="34" column="4" lean-forward="false" selection-start-line="34" selection-start-column="4" selection-end-line="34" selection-end-column="4" />
- <folding />
- </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/main/resources/application.xml">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="627">
- <caret line="50" column="35" lean-forward="false" selection-start-line="50" selection-start-column="35" selection-end-line="50" selection-end-column="35" />
- <folding />
- </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">
@@ -922,7 +785,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="134">
<caret line="13" column="34" lean-forward="true" selection-start-line="13" selection-start-column="34" selection-end-line="13" selection-end-column="34" />
- <folding />
</state>
</provider>
</entry>
@@ -937,7 +799,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="309">
<caret line="100" column="5" lean-forward="true" selection-start-line="100" selection-start-column="5" selection-end-line="100" selection-end-column="5" />
- <folding />
</state>
</provider>
</entry>
@@ -945,7 +806,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="390">
<caret line="32" column="11" lean-forward="false" selection-start-line="32" selection-start-column="11" selection-end-line="32" selection-end-column="11" />
- <folding />
</state>
</provider>
</entry>
@@ -961,7 +821,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="105">
<caret line="13" column="17" lean-forward="false" selection-start-line="13" selection-start-column="17" selection-end-line="13" selection-end-column="17" />
- <folding />
</state>
</provider>
</entry>
@@ -969,7 +828,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="160">
<caret line="20" column="60" lean-forward="false" selection-start-line="20" selection-start-column="38" selection-end-line="20" selection-end-column="60" />
- <folding />
</state>
</provider>
</entry>
@@ -985,7 +843,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="102">
<caret line="11" column="25" lean-forward="false" selection-start-line="11" selection-start-column="19" selection-end-line="11" selection-end-column="25" />
- <folding />
</state>
</provider>
</entry>
@@ -997,43 +854,24 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/Listener.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="158">
- <caret line="48" column="56" lean-forward="false" selection-start-line="48" selection-start-column="56" selection-end-line="48" selection-end-column="56" />
- <folding>
- <element signature="imports" expanded="true" />
- <element signature="e#2778#2796#0" expanded="true" />
- <element signature="e#3024#3033#0" expanded="true" />
- <element signature="e#6674#6690#0" expanded="true" />
- <element signature="e#8171#8187#0" expanded="true" />
- <element signature="e#8732#8748#0" expanded="true" />
- <element signature="e#10372#10388#0" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
<entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context/4.3.7.RELEASE/spring-context-4.3.7.RELEASE.jar!/org/springframework/context/annotation/CommonAnnotationBeanPostProcessor.class">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="68">
<caret line="145" column="0" lean-forward="false" selection-start-line="145" selection-start-column="0" selection-end-line="145" selection-end-column="0" />
- <folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/resources/quartz.xml">
+ <entry file="file://$PROJECT_DIR$/src/main/resources/sysConfig.properties">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="835">
- <caret line="75" column="21" lean-forward="false" selection-start-line="75" selection-start-column="21" selection-end-line="75" selection-end-column="21" />
- <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/entity/MonitorPoint.java">
+ <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="479">
- <caret line="36" column="0" lean-forward="false" selection-start-line="36" selection-start-column="0" selection-end-line="36" selection-end-column="0" />
- <folding />
+ <state relative-caret-position="80">
+ <caret line="16" column="25" lean-forward="true" selection-start-line="16" selection-start-column="25" selection-end-line="16" selection-end-column="25" />
</state>
</provider>
</entry>
@@ -1041,21 +879,114 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="135">
<caret line="17" column="8" lean-forward="false" selection-start-line="17" selection-start-column="8" selection-end-line="17" selection-end-column="8" />
- <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/entity/MonitorPoint.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="479">
+ <caret line="36" column="0" lean-forward="false" selection-start-line="36" selection-start-column="0" selection-end-line="36" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/service/MgrService.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="180">
- <caret line="17" column="28" lean-forward="false" selection-start-line="17" selection-start-column="16" selection-end-line="17" selection-end-column="28" />
+ <state relative-caret-position="96">
+ <caret line="13" column="25" lean-forward="true" selection-start-line="13" selection-start-column="25" selection-end-line="13" selection-end-column="25" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/util/ApiData.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/service/DashboardService.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="57">
+ <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/dao/RedisDao.java" />
+ <entry file="file://$PROJECT_DIR$/src/main/resources/quartz.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="465">
+ <caret line="31" column="25" lean-forward="false" selection-start-line="31" selection-start-column="25" selection-end-line="31" selection-end-column="25" />
+ <folding />
+ </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="567">
+ <caret line="49" column="35" lean-forward="true" selection-start-line="49" selection-start-column="35" selection-end-line="49" selection-end-column="35" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/util/RedisManager.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="90">
+ <caret line="6" column="0" lean-forward="false" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" />
+ <folding />
+ </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="32">
+ <caret line="8" column="57" lean-forward="false" selection-start-line="8" selection-start-column="41" selection-end-line="8" selection-end-column="57" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/Listener.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="229">
+ <caret line="60" column="19" lean-forward="true" selection-start-line="60" selection-start-column="19" selection-end-line="60" selection-end-column="19" />
<folding>
- <element signature="e#362#363#0" expanded="true" />
- <element signature="e#404#405#0" expanded="true" />
+ <element signature="imports" expanded="false" />
</folding>
</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/java/com/moral/monitor/controller/TestController.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="570">
+ <caret line="38" column="0" lean-forward="true" selection-start-line="38" selection-start-column="0" selection-end-line="38" selection-end-column="0" />
+ <folding>
+ <element signature="imports" expanded="false" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/resources/redis.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="345">
+ <caret line="23" column="36" lean-forward="false" selection-start-line="23" selection-start-column="14" selection-end-line="23" selection-end-column="36" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/resources/redis-config.properties">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="120">
+ <caret line="8" column="0" lean-forward="true" selection-start-line="8" selection-start-column="0" selection-end-line="8" selection-end-column="0" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
</component>
<component name="masterDetails">
<states>
diff --git a/src/main/java/com/moral/monitor/controller/TestController.java b/src/main/java/com/moral/monitor/controller/TestController.java
new file mode 100644
index 0000000..3d74a82
--- /dev/null
+++ b/src/main/java/com/moral/monitor/controller/TestController.java
@@ -0,0 +1,38 @@
+package com.moral.monitor.controller;
+
+import org.springframework.amqp.rabbit.core.RabbitTemplate;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+@RestController
+public class TestController {
+
+ @Resource
+ RabbitTemplate rabbitTemplate;
+
+ @Resource
+ RedisTemplate<String, String> redisTemplate;
+
+ @RequestMapping("/test/hello")
+ public String hello() {
+
+ return "123";
+ }
+
+ @RequestMapping("/test/set")
+ public String set() {
+
+ redisTemplate.opsForValue().set("1234567890", "xxxxxxxxxxx123#");
+
+ return "123";
+ }
+
+ @RequestMapping("/test/get")
+ public String get() {
+
+ return redisTemplate.opsForValue().get("1234567890");
+ }
+}
diff --git a/src/main/resources/application.xml b/src/main/resources/application.xml
index fb6c70f..0439a87 100644
--- a/src/main/resources/application.xml
+++ b/src/main/resources/application.xml
@@ -46,6 +46,7 @@
<property name="queueCapacity" value="1000000"/>
</bean>-->
+ <import resource="redis.xml"/>
<import resource="database.xml"/>
<import resource="rabbitmq.xml"/>
<!--
diff --git a/src/main/resources/redis-config.properties b/src/main/resources/redis-config.properties
new file mode 100644
index 0000000..9557285
--- /dev/null
+++ b/src/main/resources/redis-config.properties
@@ -0,0 +1,8 @@
+# Redis settings
+redis.host=101.37.22.173
+redis.port=6379
+redis.pass=redis_pass
+redis.database=0
+redis.maxIdle=300
+redis.maxWait=3000
+redis.testOnBorrow=true
\ No newline at end of file
diff --git a/src/main/resources/redis.xml b/src/main/resources/redis.xml
new file mode 100644
index 0000000..ff4f41b
--- /dev/null
+++ b/src/main/resources/redis.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
+ xmlns:context="http://www.springframework.org/schema/context"
+ xmlns:mvc="http://www.springframework.org/schema/mvc"
+ xmlns:cache="http://www.springframework.org/schema/cache"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans-4.2.xsd
+ http://www.springframework.org/schema/context
+ http://www.springframework.org/schema/context/spring-context-4.2.xsd
+ http://www.springframework.org/schema/mvc
+ http://www.springframework.org/schema/mvc/spring-mvc-4.2.xsd
+ http://www.springframework.org/schema/cache
+ http://www.springframework.org/schema/cache/spring-cache-4.2.xsd">
+
+ <context:property-placeholder location="classpath:redis-config.properties" />
+
+ <bean id="poolConfig" class="redis.clients.jedis.JedisPoolConfig">
+ <property name="maxIdle" value="${redis.maxIdle}" />
+ <property name="maxWaitMillis" value="${redis.maxWait}" />
+ <property name="testOnBorrow" value="${redis.testOnBorrow}" />
+ </bean>
+
+ <bean id="JedisConnectionFactory" class="org.springframework.data.redis.connection.jedis.JedisConnectionFactory"
+ p:host-name="${redis.host}" p:port="${redis.port}" p:password="${redis.pass}" p:pool-config-ref="poolConfig"/>
+
+ <bean id="redisTemplate" class="org.springframework.data.redis.core.RedisTemplate">
+ <property name="connectionFactory" ref="JedisConnectionFactory" />
+ </bean>
+
+</beans>
\ No newline at end of file
diff --git a/task.iml b/task.iml
index 432be53..e080e04 100644
--- a/task.iml
+++ b/task.iml
@@ -19,7 +19,7 @@
</configuration>
</facet>
</component>
- <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5">
+ <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
@@ -108,8 +108,8 @@
<orderEntry type="library" name="Maven: cn.jpush.api:jiguang-common:1.0.3" level="project" />
<orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.3.1" level="project" />
<orderEntry type="library" name="Maven: com.squareup.okio:okio:1.8.0" level="project" />
- <orderEntry type="library" name="Maven: io.netty:netty-all:4.1.6.Final" level="project" />
<orderEntry type="library" name="Maven: com.google.code.gson:gson:2.3" level="project" />
+ <orderEntry type="library" name="Maven: io.netty:netty-all:4.1.7.Final" level="project" />
<orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:1.8.7.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:1.2.7.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:1.13.7.RELEASE" level="project" />
--
Gitblit v1.8.0