task.git - Gitblit

			@@ -6,10 +6,9 @@
			</artifacts-to-build>
			</component>
			<component name="ChangeListManager">
			<list default="true" id="59bc3ffe-0657-438a-9fae-fbbdeee84a24" name="Default" comment="test">
			<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/system/alarmLevels.json" afterPath="$PROJECT_DIR$/src/main/resources/system/alarmLevels.json" />
			<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/moral/monitor/controller/ScreenController.java" afterPath="$PROJECT_DIR$/src/main/java/com/moral/monitor/controller/ScreenController.java" />
			</list>
			<ignored path="$PROJECT_DIR$/out/" />
			<ignored path="$PROJECT_DIR$/target/" />
			@@ -25,13 +24,23 @@
			<file leaf-file-name="TaskListener.java" pinned="false" current-in-tab="true">
			<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="-216">
			<caret line="163" column="51" lean-forward="false" selection-start-line="163" selection-start-column="51" selection-end-line="163" selection-end-column="51" />
			<state relative-caret-position="1636">
			<caret line="166" column="9" lean-forward="false" selection-start-line="166" selection-start-column="9" selection-end-line="166" selection-end-column="9" />
			<folding>
			<element signature="e#6110#6128#0" expanded="true" />
			<marker date="1510728294396" expanded="false" signature="4922:4940" ph="<~>" />
			<marker date="1510728294396" expanded="false" signature="7587:7603" ph="<~>" />
			<element signature="e#3833#3842#0" expanded="true" />
			<element signature="e#6149#6167#0" expanded="true" />
			<element signature="e#7626#7642#0" expanded="true" />
			</folding>
			</state>
			</provider>
			</entry>
			</file>
			<file leaf-file-name="ScreenController.java" pinned="false" current-in-tab="false">
			<entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/controller/ScreenController.java">
			<provider selected="true" editor-type-id="text-editor">
			<state relative-caret-position="175">
			<caret line="168" column="13" lean-forward="true" selection-start-line="168" selection-start-column="13" selection-end-line="168" selection-end-column="13" />
			<folding />
			</state>
			</provider>
			</entry>
			@@ -145,6 +154,7 @@
			<option value="$PROJECT_DIR$/src/main/resources/redis/redis-config.properties" />
			<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/java/com/moral/monitor/controller/ScreenController.java" />
			</list>
			</option>
			</component>
			@@ -225,7 +235,14 @@
			<item name="main" type="462c0819:PsiDirectoryNode" />
			<item name="java" type="462c0819:PsiDirectoryNode" />
			<item name="monitor" type="462c0819:PsiDirectoryNode" />
			<item name="listener" type="462c0819:PsiDirectoryNode" />
			<item name="controller" 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 />
			@@ -539,14 +556,7 @@
			<workItem from="1510699262988" duration="857000" />
			<workItem from="1510700803433" duration="454000" />
			<workItem from="1510705763364" duration="3849000" />
			<workItem from="1510726840192" duration="1628000" />
			</task>
			<task id="LOCAL-00018" summary="数据库更新数据">
			<created>1509071255017</created>
			<option name="number" value="00018" />
			<option name="presentableId" value="LOCAL-00018" />
			<option name="project" value="LOCAL" />
			<updated>1509071255017</updated>
			<workItem from="1510726840192" duration="2067000" />
			</task>
			<task id="LOCAL-00019" summary="数据库更新数据">
			<created>1509083891003</created>
			@@ -884,11 +894,18 @@
			<option name="project" value="LOCAL" />
			<updated>1510675632207</updated>
			</task>
			<option name="localTasksCounter" value="67" />
			<task id="LOCAL-00067" summary="test">
			<created>1510728536875</created>
			<option name="number" value="00067" />
			<option name="presentableId" value="LOCAL-00067" />
			<option name="project" value="LOCAL" />
			<updated>1510728536876</updated>
			</task>
			<option name="localTasksCounter" value="68" />
			<servers />
			</component>
			<component name="TimeTrackingManager">
			<option name="totallyTimeSpent" value="148971000" />
			<option name="totallyTimeSpent" value="149410000" />
			</component>
			<component name="ToolWindowManager">
			<frame x="-1651" y="23" width="1405" height="877" extended-state="0" />
			@@ -911,7 +928,7 @@
			<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="false" 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.5153453" sideWeight="0.4632893" 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.5153453" 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="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25825384" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
			@@ -1031,7 +1048,6 @@
			<watches-manager />
			</component>
			<component name="editorHistoryManager">
			<entry file="file://$PROJECT_DIR$/src/main/resources/quartz.xml" />
			<entry file="file://$PROJECT_DIR$/src/main/resources/rabbitmq.xml" />
			<entry file="file://$PROJECT_DIR$/src/main/resources/application.xml" />
			<entry file="file://$PROJECT_DIR$/src/main/resources/log4j.properties" />
			@@ -1357,14 +1373,22 @@
			</state>
			</provider>
			</entry>
			<entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/controller/ScreenController.java">
			<provider selected="true" editor-type-id="text-editor">
			<state relative-caret-position="175">
			<caret line="168" column="13" lean-forward="true" selection-start-line="168" selection-start-column="13" selection-end-line="168" selection-end-column="13" />
			<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="-216">
			<caret line="163" column="51" lean-forward="false" selection-start-line="163" selection-start-column="51" selection-end-line="163" selection-end-column="51" />
			<state relative-caret-position="1636">
			<caret line="166" column="9" lean-forward="false" selection-start-line="166" selection-start-column="9" selection-end-line="166" selection-end-column="9" />
			<folding>
			<element signature="e#6110#6128#0" expanded="true" />
			<marker date="1510728294396" expanded="false" signature="4922:4940" ph="<~>" />
			<marker date="1510728294396" expanded="false" signature="7587:7603" ph="<~>" />
			<element signature="e#3833#3842#0" expanded="true" />
			<element signature="e#6149#6167#0" expanded="true" />
			<element signature="e#7626#7642#0" expanded="true" />
			</folding>
			</state>
			</provider>