From 241ee0aff8163df6b4f90b04cbb52363cc87f0bb Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Sat, 11 Nov 2017 07:37:44 +0800
Subject: [PATCH] test
---
.idea/workspace.xml | 62 +++++++++++++++---------------
src/main/resources/redis/redis-config.properties | 4 +-
2 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 77737ab..fe6a901 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,7 +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/resources/spring/database.xml" afterPath="$PROJECT_DIR$/src/main/resources/spring/database.xml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources/redis/redis-config.properties" afterPath="$PROJECT_DIR$/src/main/resources/redis/redis-config.properties" />
</list>
<ignored path="$PROJECT_DIR$/out/" />
<ignored path="$PROJECT_DIR$/target/" />
@@ -20,12 +20,12 @@
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="FileEditorManager">
- <leaf>
- <file leaf-file-name="database.xml" pinned="false" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/src/main/resources/spring/database.xml">
+ <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
+ <file leaf-file-name="redis-config.properties" pinned="false" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/src/main/resources/redis/redis-config.properties">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="90">
- <caret line="6" column="62" lean-forward="false" selection-start-line="6" selection-start-column="62" selection-end-line="6" selection-end-column="62" />
+ <state relative-caret-position="45">
+ <caret line="3" column="26" lean-forward="false" selection-start-line="3" selection-start-column="26" selection-end-line="3" selection-end-column="26" />
<folding />
</state>
</provider>
@@ -120,6 +120,7 @@
<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/spring/database.xml" />
+ <option value="$PROJECT_DIR$/src/main/resources/redis/redis-config.properties" />
</list>
</option>
</component>
@@ -157,7 +158,9 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
+ <pane id="Scratches" />
<pane id="AndroidView" />
+ <pane id="PackagesPane" />
<pane id="ProjectPane">
<subPane>
<expand>
@@ -189,15 +192,13 @@
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="resources" type="462c0819:PsiDirectoryNode" />
- <item name="spring" type="462c0819:PsiDirectoryNode" />
+ <item name="redis" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
</subPane>
</pane>
- <pane id="Scratches" />
<pane id="Scope" />
- <pane id="PackagesPane" />
</panes>
</component>
<component name="PropertiesComponent">
@@ -484,14 +485,8 @@
<workItem from="1510038694334" duration="1652000" />
<workItem from="1510054681942" duration="14000" />
<workItem from="1510054700592" duration="54000" />
- <workItem from="1510055174810" duration="631000" />
- </task>
- <task id="LOCAL-00008" summary="updates">
- <created>1508815251640</created>
- <option name="number" value="00008" />
- <option name="presentableId" value="LOCAL-00008" />
- <option name="project" value="LOCAL" />
- <updated>1508815251640</updated>
+ <workItem from="1510055174810" duration="971000" />
+ <workItem from="1510356986240" duration="68000" />
</task>
<task id="LOCAL-00009" summary="updates">
<created>1508815333934</created>
@@ -829,11 +824,18 @@
<option name="project" value="LOCAL" />
<updated>1510041490411</updated>
</task>
- <option name="localTasksCounter" value="57" />
+ <task id="LOCAL-00057" summary="test">
+ <created>1510063453289</created>
+ <option name="number" value="00057" />
+ <option name="presentableId" value="LOCAL-00057" />
+ <option name="project" value="LOCAL" />
+ <updated>1510063453290</updated>
+ </task>
+ <option name="localTasksCounter" value="58" />
<servers />
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="123494000" />
+ <option name="totallyTimeSpent" value="123902000" />
</component>
<component name="ToolWindowManager">
<frame x="0" y="23" width="1404" height="877" extended-state="0" />
@@ -853,7 +855,7 @@
<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.21145375" 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.2143906" 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" />
@@ -1096,13 +1098,6 @@
</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="60">
- <caret line="4" column="10" lean-forward="false" selection-start-line="4" selection-start-column="10" selection-end-line="4" selection-end-column="10" />
- </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">
@@ -1258,7 +1253,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="60">
<caret line="5" column="17" lean-forward="false" selection-start-line="5" selection-start-column="17" selection-end-line="5" selection-end-column="17" />
- <folding />
</state>
</provider>
</entry>
@@ -1266,7 +1260,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="120">
<caret line="14" column="17" lean-forward="false" selection-start-line="14" selection-start-column="17" selection-end-line="14" selection-end-column="17" />
- <folding />
</state>
</provider>
</entry>
@@ -1274,14 +1267,21 @@
<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" />
- <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="90">
- <caret line="6" column="62" lean-forward="false" selection-start-line="6" selection-start-column="62" selection-end-line="6" selection-end-column="62" />
+ <caret line="6" column="62" lean-forward="false" selection-start-line="6" selection-start-column="49" selection-end-line="6" selection-end-column="62" />
+ <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="26" selection-end-line="3" selection-end-column="26" />
<folding />
</state>
</provider>
diff --git a/src/main/resources/redis/redis-config.properties b/src/main/resources/redis/redis-config.properties
index 9557285..3744f86 100644
--- a/src/main/resources/redis/redis-config.properties
+++ b/src/main/resources/redis/redis-config.properties
@@ -1,7 +1,7 @@
# Redis settings
-redis.host=101.37.22.173
+redis.host=r-bp1672d21a422a14.redis.rds.aliyuncs.com
redis.port=6379
-redis.pass=redis_pass
+redis.pass=KtElFcI1sYm9NP3
redis.database=0
redis.maxIdle=300
redis.maxWait=3000
--
Gitblit v1.8.0