From 4a05f1c9c508ab7f10c5eae22a5c716f5454ca02 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 12 三月 2019 16:29:55 +0800
Subject: [PATCH] 冲突提交
---
fanli/src/main/java/com/yeshi/fanli/aspect/ActiveUserAspect.java | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/aspect/ActiveUserAspect.java b/fanli/src/main/java/com/yeshi/fanli/aspect/ActiveUserAspect.java
index ca1eaef..5c9d268 100644
--- a/fanli/src/main/java/com/yeshi/fanli/aspect/ActiveUserAspect.java
+++ b/fanli/src/main/java/com/yeshi/fanli/aspect/ActiveUserAspect.java
@@ -38,7 +38,7 @@
public static final String EDP = "execution(* com.yeshi.fanli.controller.client.*.*(..))";
-// @Around(EDP)
+ @Around(EDP)
public Object activeAround(ProceedingJoinPoint joinPoint) throws Throwable {
Long uid = null;
@@ -63,18 +63,18 @@
return;
}
- // 缂撳瓨uid鐨凨ey
- String key = "activeUid_" + uuid;
-
- // 缂撳瓨涓槸鍚﹀瓨鍦╱id
- String cacheValue = redisManager.getCommonString(key);
- if (cacheValue != null && cacheValue.trim().length() > 0) {
- return;
- }
-
- // 鍔犲叆缂撳瓨 20鍒嗛挓
- redisManager.cacheCommonString("activeUid_" + uuid, uuid.toString(), 60 * 20);
-
+// // 缂撳瓨uid鐨凨ey
+// String key = "activeUid_" + uuid;
+//
+// // 缂撳瓨涓槸鍚﹀瓨鍦╱id
+// String cacheValue = redisManager.getCommonString(key);
+// if (cacheValue != null && cacheValue.trim().length() > 0) {
+// return;
+// }
+//
+// // 鍔犲叆缂撳瓨 20鍒嗛挓
+// redisManager.cacheCommonString("activeUid_" + uuid, uuid.toString(), 60 * 20);
+//
// 鎺ユ敹鍒�
try {
--
Gitblit v1.8.0