From 35e139d63ad2351f63547d68fc88b54de51c5e9c Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Mon, 30 Oct 2017 14:59:42 +0800
Subject: [PATCH] 代码更新
---
src/main/resources/alarmLevles.json | 154 +++++++++++++++---------------
.idea/workspace.xml | 142 +++++++++++++---------------
2 files changed, 143 insertions(+), 153 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 40294e8..5dd0ad2 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,8 +8,7 @@
<component name="ChangeListManager">
<list default="true" id="59bc3ffe-0657-438a-9fae-fbbdeee84a24" name="Default" comment="������������">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/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/redis.xml" afterPath="$PROJECT_DIR$/src/main/resources/redis.xml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources/alarmLevles.json" afterPath="$PROJECT_DIR$/src/main/resources/alarmLevles.json" />
</list>
<ignored path="$PROJECT_DIR$/out/" />
<ignored path="$PROJECT_DIR$/target/" />
@@ -25,18 +24,38 @@
<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="315">
- <caret line="61" column="36" lean-forward="false" selection-start-line="61" selection-start-column="29" selection-end-line="61" selection-end-column="36" />
+ <state relative-caret-position="373">
+ <caret line="70" column="53" lean-forward="false" selection-start-line="70" selection-start-column="53" selection-end-line="70" selection-end-column="53" />
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="redis.xml" pinned="false" current-in-tab="true">
+ <file leaf-file-name="RedisUtil.java" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/util/RedisUtil.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="150">
+ <caret line="10" column="0" lean-forward="true" selection-start-line="10" selection-start-column="0" selection-end-line="10" selection-end-column="0" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="alarmLevles.json" pinned="false" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/src/main/resources/alarmLevles.json">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="1320">
+ <caret line="88" column="20" lean-forward="true" selection-start-line="88" selection-start-column="20" selection-end-line="88" selection-end-column="20" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <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="435">
- <caret line="29" column="70" lean-forward="false" selection-start-line="29" selection-start-column="70" selection-end-line="29" selection-end-column="70" />
+ <state relative-caret-position="495">
+ <caret line="33" column="8" lean-forward="false" selection-start-line="33" selection-start-column="8" selection-end-line="33" selection-end-column="8" />
<folding />
</state>
</provider>
@@ -73,6 +92,8 @@
<find>MethodInvokingJobDetailFactoryBean</find>
<find>getLoggerByMac</find>
<find>findAdjustByMac</find>
+ <find>RedisUtil</find>
+ <find>adjust_key</find>
</findStrings>
</component>
<component name="Git.Settings">
@@ -117,6 +138,7 @@
<option value="$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/quartz/StopStateCheck.java" />
<option value="$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/TaskListener.java" />
<option value="$PROJECT_DIR$/src/main/resources/redis.xml" />
+ <option value="$PROJECT_DIR$/src/main/resources/alarmLevles.json" />
</list>
</option>
</component>
@@ -154,6 +176,9 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
+ <pane id="AndroidView" />
+ <pane id="PackagesPane" />
+ <pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<expand>
@@ -161,56 +186,11 @@
<item name="task" type="b2602c69:ProjectViewProjectNode" />
<item name="task" type="462c0819:PsiDirectoryNode" />
</path>
- <path>
- <item name="task" type="b2602c69:ProjectViewProjectNode" />
- <item name="task" type="462c0819:PsiDirectoryNode" />
- <item name="src" type="462c0819:PsiDirectoryNode" />
- </path>
- <path>
- <item name="task" type="b2602c69:ProjectViewProjectNode" />
- <item name="task" type="462c0819:PsiDirectoryNode" />
- <item name="src" type="462c0819:PsiDirectoryNode" />
- <item name="main" type="462c0819:PsiDirectoryNode" />
- </path>
- <path>
- <item name="task" type="b2602c69:ProjectViewProjectNode" />
- <item name="task" type="462c0819:PsiDirectoryNode" />
- <item name="src" type="462c0819:PsiDirectoryNode" />
- <item name="main" type="462c0819:PsiDirectoryNode" />
- <item name="java" type="462c0819:PsiDirectoryNode" />
- </path>
- <path>
- <item name="task" type="b2602c69:ProjectViewProjectNode" />
- <item name="task" type="462c0819:PsiDirectoryNode" />
- <item name="src" type="462c0819:PsiDirectoryNode" />
- <item name="main" type="462c0819:PsiDirectoryNode" />
- <item name="java" type="462c0819:PsiDirectoryNode" />
- <item name="monitor" type="462c0819:PsiDirectoryNode" />
- </path>
- <path>
- <item name="task" type="b2602c69:ProjectViewProjectNode" />
- <item name="task" type="462c0819:PsiDirectoryNode" />
- <item name="src" type="462c0819:PsiDirectoryNode" />
- <item name="main" type="462c0819:PsiDirectoryNode" />
- <item name="java" type="462c0819:PsiDirectoryNode" />
- <item name="monitor" type="462c0819:PsiDirectoryNode" />
- <item name="listener" type="462c0819:PsiDirectoryNode" />
- </path>
- <path>
- <item name="task" type="b2602c69:ProjectViewProjectNode" />
- <item name="task" type="462c0819:PsiDirectoryNode" />
- <item name="src" type="462c0819:PsiDirectoryNode" />
- <item name="main" type="462c0819:PsiDirectoryNode" />
- <item name="resources" type="462c0819:PsiDirectoryNode" />
- </path>
</expand>
<select />
</subPane>
</pane>
- <pane id="PackagesPane" />
<pane id="Scratches" />
- <pane id="AndroidView" />
- <pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
@@ -452,7 +432,8 @@
<workItem from="1509324410295" duration="1870000" />
<workItem from="1509333094656" duration="2064000" />
<workItem from="1509340273222" duration="289000" />
- <workItem from="1509342471423" duration="347000" />
+ <workItem from="1509342471423" duration="606000" />
+ <workItem from="1509345416231" duration="1222000" />
</task>
<task id="LOCAL-00001" summary="updates">
<created>1508484578874</created>
@@ -643,11 +624,18 @@
<option name="project" value="LOCAL" />
<updated>1509269196884</updated>
</task>
- <option name="localTasksCounter" value="28" />
+ <task id="LOCAL-00028" summary="������������">
+ <created>1509343407506</created>
+ <option name="number" value="00028" />
+ <option name="presentableId" value="LOCAL-00028" />
+ <option name="project" value="LOCAL" />
+ <updated>1509343407506</updated>
+ </task>
+ <option name="localTasksCounter" value="29" />
<servers />
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="79919000" />
+ <option name="totallyTimeSpent" value="81400000" />
</component>
<component name="ToolWindowManager">
<frame x="0" y="23" width="1404" height="877" extended-state="0" />
@@ -662,7 +650,7 @@
<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.471867" sideWeight="0.48235294" 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="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32992327" sideWeight="0.48237884" 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" />
@@ -747,13 +735,6 @@
<watches-manager />
</component>
<component name="editorHistoryManager">
- <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">
@@ -835,13 +816,6 @@
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/Test.java" />
- <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/util/RedisUtil.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="75">
- <caret line="5" column="0" lean-forward="false" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="0" />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/message/Tomq.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="345">
@@ -1075,18 +1049,34 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/TaskListener.java">
+ <entry file="file://$PROJECT_DIR$/src/main/resources/redis.xml">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="315">
- <caret line="61" column="36" lean-forward="false" selection-start-line="61" selection-start-column="29" selection-end-line="61" selection-end-column="36" />
+ <state relative-caret-position="495">
+ <caret line="33" column="8" lean-forward="false" selection-start-line="33" selection-start-column="8" selection-end-line="33" selection-end-column="8" />
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/resources/redis.xml">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/util/RedisUtil.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="435">
- <caret line="29" column="70" lean-forward="false" selection-start-line="29" selection-start-column="70" selection-end-line="29" selection-end-column="70" />
+ <state relative-caret-position="150">
+ <caret line="10" column="0" lean-forward="true" selection-start-line="10" selection-start-column="0" selection-end-line="10" 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="373">
+ <caret line="70" column="53" lean-forward="false" selection-start-line="70" selection-start-column="53" selection-end-line="70" selection-end-column="53" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/resources/alarmLevles.json">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="1320">
+ <caret line="88" column="20" lean-forward="true" selection-start-line="88" selection-start-column="20" selection-end-line="88" selection-end-column="20" />
<folding />
</state>
</provider>
diff --git a/src/main/resources/alarmLevles.json b/src/main/resources/alarmLevles.json
index d270c5f..4c22080 100644
--- a/src/main/resources/alarmLevles.json
+++ b/src/main/resources/alarmLevles.json
@@ -1,97 +1,97 @@
{
- e1:{
- level1:10,
- level2:20,
- level3:30
+ "e1":{
+ "level1":10,
+ "level2":20,
+ "level3":30
},
- e2:{
- level1:10,
- level2:20,
- level3:30
+ "e2":{
+ "level1":10,
+ "level2":20,
+ "level3":30
},
- e3:{
- level1:10,
- level2:20,
- level3:30
+ "e3":{
+ "level1":10,
+ "level2":20,
+ "level3":30
},
- e4:{
- level1:10,
- level2:20,
- level3:30
+ "e4":{
+ "level1":10,
+ "level2":20,
+ "level3":30
},
- e5:{
- level1:10,
- level2:20,
- level3:30
+ "e5":{
+ "level1":10,
+ "level2":20,
+ "level3":30
},
- e6:{
- level1:10,
- level2:20,
- level3:30
+ "e6":{
+ "level1":10,
+ "level2":20,
+ "level3":30
},
- e7:{
- level1:10,
- level2:20,
- level3:30
+ "e7":{
+ "level1":10,
+ "level2":20,
+ "level3":30
},
- e8:{
- level1:10,
- level2:20,
- level3:30
+ "e8":{
+ "level1":10,
+ "level2":20,
+ "level3":30
},
- e9:{
- level1:10,
- level2:20,
- level3:30
+ "e9":{
+ "level1":10,
+ "level2":20,
+ "level3":30
},
- e10:{
- level1:10,
- level2:20,
- level3:30
+ "e10":{
+ "level1":10,
+ "level2":20,
+ "level3":30
},
- e11:{
- level1:10,
- level2:20,
- level3:30
+ "e11":{
+ "level1":10,
+ "level2":20,
+ "level3":30
},
- e12:{
- level1:10,
- level2:20,
- level3:30
+ "e12":{
+ "level1":10,
+ "level2":20,
+ "level3":30
},
- e13:{
- level1:10,
- level2:20,
- level3:30
+ "e13":{
+ "level1":10,
+ "level2":20,
+ "level3":30
},
- e14:{
- level1:10,
- level2:20,
- level3:30
+ "e14":{
+ "level1":10,
+ "level2":20,
+ "level3":30
},
- e15:{
- level1:10,
- level2:20,
- level3:30
+ "e15":{
+ "level1":10,
+ "level2":20,
+ "level3":30
},
- e16:{
- level1:10,
- level2:20,
- level3:30
- } ,
- e17:{
- level1:10,
- level2:20,
- level3:30
+ "e16":{
+ "level1":10,
+ "level2":20,
+ "level3":30
},
- e18:{
- level1:10,
- level2:20,
- level3:30
+ "e17":{
+ "level1":10,
+ "level2":20,
+ "level3":30
},
- e19:{
- level1:10,
- level2:20,
- level3:30
+ "e18":{
+ "level1":10,
+ "level2":20,
+ "level3":30
+ },
+ "e19":{
+ "level1":10,
+ "level2":20,
+ "level3":30
}
}
\ No newline at end of file
--
Gitblit v1.8.0