From 1b690930edcb3a2c1a0fc7de3fff1b352ca4597c Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Mon, 30 Oct 2017 15:16:57 +0800
Subject: [PATCH] 代码更新
---
src/main/resources/redis.xml | 16 ++++------------
.idea/workspace.xml | 33 ++++++++++++++++-----------------
2 files changed, 20 insertions(+), 29 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 9302022..94cef82 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -24,8 +24,8 @@
<file leaf-file-name="redis.xml" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/resources/redis.xml">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="450">
- <caret line="30" column="71" lean-forward="false" selection-start-line="30" selection-start-column="43" selection-end-line="30" selection-end-column="71" />
+ <state relative-caret-position="144">
+ <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>
@@ -179,15 +179,6 @@
<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" />
@@ -446,7 +437,7 @@
<workItem from="1509340273222" duration="289000" />
<workItem from="1509342471423" duration="606000" />
<workItem from="1509345416231" duration="1279000" />
- <workItem from="1509347613575" duration="63000" />
+ <workItem from="1509347613575" duration="196000" />
</task>
<task id="LOCAL-00001" summary="updates">
<created>1508484578874</created>
@@ -651,14 +642,22 @@
<option name="project" value="LOCAL" />
<updated>1509346782831</updated>
</task>
- <option name="localTasksCounter" value="30" />
+ <task id="LOCAL-00030" summary="������������">
+ <created>1509347681702</created>
+ <option name="number" value="00030" />
+ <option name="presentableId" value="LOCAL-00030" />
+ <option name="project" value="LOCAL" />
+ <updated>1509347681702</updated>
+ </task>
+ <option name="localTasksCounter" value="31" />
<servers />
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="81520000" />
+ <option name="totallyTimeSpent" value="81653000" />
</component>
<component name="ToolWindowManager">
<frame x="0" y="23" width="1404" height="877" extended-state="0" />
+ <editor active="true" />
<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="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" />
@@ -675,7 +674,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.3010279" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+ <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.3010279" 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" />
@@ -1095,8 +1094,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/redis.xml">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="450">
- <caret line="30" column="71" lean-forward="false" selection-start-line="30" selection-start-column="43" selection-end-line="30" selection-end-column="71" />
+ <state relative-caret-position="144">
+ <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>
diff --git a/src/main/resources/redis.xml b/src/main/resources/redis.xml
index 2db0476..b162028 100644
--- a/src/main/resources/redis.xml
+++ b/src/main/resources/redis.xml
@@ -30,18 +30,10 @@
<property name="connectionFactory" ref="jedisConnectionFactory" />
<property name="defaultSerializer" ref="stringRedisSerializer" />
- <property name="keySerializer">
- <bean class="org.springframework.data.redis.serializer.StringRedisSerializer" />
- </property>
- <property name="valueSerializer">
- <bean class="org.springframework.data.redis.serializer.StringRedisSerializer" />
- </property>
- <property name="hashKeySerializer">
- <bean class="org.springframework.data.redis.serializer.StringRedisSerializer" />
- </property>
- <property name="hashValueSerializer">
- <bean class="org.springframework.data.redis.serializer.StringRedisSerializer" />
- </property>
+ <property name="keySerializer" ref="stringRedisSerializer" />
+ <property name="valueSerializer" ref="stringRedisSerializer" />
+ <property name="hashKeySerializer" ref="stringRedisSerializer" />
+ <property name="hashValueSerializer" ref="stringRedisSerializer" />
</bean>
</beans>
\ No newline at end of file
--
Gitblit v1.8.0