From b6cf1fcd9187e81b48a1806e4dede902244d192b Mon Sep 17 00:00:00 2001
From: LSZ <zhao@idsmanager.com>
Date: Sat, 23 Jul 2016 00:21:48 +0800
Subject: [PATCH] =?UTF-8?q?(151)=20-=20=E6=95=B0=E6=8D=AE=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0Ehcache=E7=BC=93=E5=AD=98=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sos/infrastructure/jdbc/OauthRepositoryJdbc.java      | 8 +++++---
 .../sos/infrastructure/jdbc/UserRepositoryJdbc.java       | 8 +++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/monkeyk/sos/infrastructure/jdbc/OauthRepositoryJdbc.java b/src/main/java/com/monkeyk/sos/infrastructure/jdbc/OauthRepositoryJdbc.java
index 39f78e0..535af13 100644
--- a/src/main/java/com/monkeyk/sos/infrastructure/jdbc/OauthRepositoryJdbc.java
+++ b/src/main/java/com/monkeyk/sos/infrastructure/jdbc/OauthRepositoryJdbc.java
@@ -13,7 +13,9 @@ package com.monkeyk.sos.infrastructure.jdbc;
 
 import com.monkeyk.sos.domain.oauth.OauthClientDetails;
 import com.monkeyk.sos.domain.oauth.OauthRepository;
-import com.monkeyk.sos.infrastructure.CacheConstants;
+
+import static com.monkeyk.sos.infrastructure.CacheConstants.*;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;
@@ -39,7 +41,7 @@ public class OauthRepositoryJdbc implements OauthRepository {
 
 
     @Override
-    @Cacheable(value = CacheConstants.CLIENT_DETAILS_CACHE, key = "#clientId")
+    @Cacheable(value = CLIENT_DETAILS_CACHE, key = "#clientId")
     public OauthClientDetails findOauthClientDetails(String clientId) {
         final String sql = " select * from oauth_client_details where  client_id = ? ";
         final List<OauthClientDetails> list = this.jdbcTemplate.query(sql, new Object[]{clientId}, oauthClientDetailsRowMapper);
@@ -53,7 +55,7 @@ public class OauthRepositoryJdbc implements OauthRepository {
     }
 
     @Override
-    @CacheEvict(value = CacheConstants.CLIENT_DETAILS_CACHE, key = "#clientId")
+    @CacheEvict(value = CLIENT_DETAILS_CACHE, key = "#clientId")
     public void updateOauthClientDetailsArchive(String clientId, boolean archive) {
         final String sql = " update oauth_client_details set archived = ? where client_id = ? ";
         this.jdbcTemplate.update(sql, archive, clientId);
diff --git a/src/main/java/com/monkeyk/sos/infrastructure/jdbc/UserRepositoryJdbc.java b/src/main/java/com/monkeyk/sos/infrastructure/jdbc/UserRepositoryJdbc.java
index a263268..db9c8a3 100644
--- a/src/main/java/com/monkeyk/sos/infrastructure/jdbc/UserRepositoryJdbc.java
+++ b/src/main/java/com/monkeyk/sos/infrastructure/jdbc/UserRepositoryJdbc.java
@@ -14,7 +14,9 @@ package com.monkeyk.sos.infrastructure.jdbc;
 import com.monkeyk.sos.domain.user.Privilege;
 import com.monkeyk.sos.domain.user.User;
 import com.monkeyk.sos.domain.user.UserRepository;
-import com.monkeyk.sos.infrastructure.CacheConstants;
+
+import static com.monkeyk.sos.infrastructure.CacheConstants.*;
+
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.CacheEvict;
@@ -96,7 +98,7 @@ public class UserRepositoryJdbc implements UserRepository {
     }
 
     @Override
-    @CacheEvict(value = CacheConstants.USER_CACHE, key = "#user.username()")
+    @CacheEvict(value = USER_CACHE, key = "#user.username()")
     public void updateUser(final User user) {
         final String sql = " update user_ set username = ?, password = ?, phone = ?,email = ? where guid = ? ";
         this.jdbcTemplate.update(sql, ps -> {
@@ -111,7 +113,7 @@ public class UserRepositoryJdbc implements UserRepository {
     }
 
     @Override
-    @Cacheable(value = CacheConstants.USER_CACHE, key = "#username")
+    @Cacheable(value = USER_CACHE, key = "#username")
     public User findByUsername(String username) {
         final String sql = " select * from user_ where username = ? and archived = 0 ";
         final List<User> list = this.jdbcTemplate.query(sql, new Object[]{username}, userRowMapper);