From dd5b15229cb15459fa7c31ccea77dac28cbfafbd Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 13 四月 2020 10:04:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/aspect/ActiveUserAspect.java | 8 ++++----
1 files changed, 4 insertions(+), 4 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 1ad960c..fc389d2 100644
--- a/fanli/src/main/java/com/yeshi/fanli/aspect/ActiveUserAspect.java
+++ b/fanli/src/main/java/com/yeshi/fanli/aspect/ActiveUserAspect.java
@@ -19,15 +19,16 @@
import org.yeshi.utils.NumberUtil;
import com.yeshi.fanli.entity.bus.user.UserInfoExtra;
-import com.yeshi.fanli.service.inter.integral.IntegralGetService;
import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
import com.yeshi.fanli.service.inter.user.UserInfoModifyRecordService;
+import com.yeshi.fanli.service.inter.user.integral.IntegralGetService;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.ThreadUtil;
import com.yeshi.fanli.util.annotation.UserActive;
import redis.clients.jedis.Jedis;
import redis.clients.jedis.JedisPool;
+import redis.clients.jedis.params.SetParams;
/**
* 娲昏穬鐢ㄦ埛澶勭悊
@@ -86,8 +87,7 @@
String key = "useractive-" + uidStr;
Jedis jedis = jedisPool.getResource();
try {
- if (jedis.setnx(key, "1") > 0) {
- jedis.expire(key, 60 * 5);// 5鍒嗛挓鍐呬笉澶勭悊
+ if (!StringUtil.isNullOrEmpty(jedis.set(key, "1", new SetParams().nx().ex(300)))) {
try {
// TODO 鐢ㄦ埛娲昏穬澶勭悊
Long uid = Long.parseLong(uidStr);
@@ -99,7 +99,7 @@
}
}
} finally {
- jedisPool.returnResource(jedis);
+ jedis.close();
}
}
});
--
Gitblit v1.8.0