fanli/src/main/java/com/yeshi/fanli/aspect/ActiveUserAspect.java
@@ -5,6 +5,7 @@ import javax.annotation.Resource; import com.yeshi.fanli.util.RedisManager; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.Signature; import org.aspectj.lang.annotation.Aspect; @@ -47,17 +48,7 @@ @Aspect public class ActiveUserAspect { @Resource private JedisPool jedisPool; @Resource private UserInfoModifyRecordService userInfoModifyRecordService; @Resource private UserInfoExtraService userInfoExtraService; @Resource private IntegralGetService integralGetService; private RedisManager redisManager; private ExpressionParser parser = new SpelExpressionParser(); @@ -93,7 +84,7 @@ @Override public void run() { String key = "useractive-" + uidStr; Jedis jedis = jedisPool.getResource(); Jedis jedis =redisManager.getJedis(); try { if (!StringUtil.isNullOrEmpty(jedis.set(key, "1", new SetParams().nx().ex(Constant.IS_TEST?10:300)))) { try { fanli/src/main/java/com/yeshi/fanli/aspect/RequestSerializableAspect.java
@@ -7,6 +7,7 @@ import javax.annotation.Resource; import com.yeshi.fanli.util.RedisManager; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.Signature; import org.aspectj.lang.annotation.Around; @@ -36,7 +37,7 @@ @Order(4) public class RequestSerializableAspect { @Resource private JedisPool jedisPool; private RedisManager redisManager; private ExpressionParser parser = new SpelExpressionParser(); @@ -95,7 +96,7 @@ String cacheAlias = cacheKey; cacheKey = "rs-" + StringUtil.Md5(cacheKey); // jiedis原子性做拦截 Jedis jedis = jedisPool.getResource(); Jedis jedis = redisManager.getJedis(); long threadId = Thread.currentThread().getId(); try { Constant.waitingThreadSet.add(threadId); fanli/src/main/java/com/yeshi/fanli/aspect/RequestSerializableServiceAspect.java
@@ -4,6 +4,7 @@ import javax.annotation.Resource; import com.yeshi.fanli.util.RedisManager; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.Signature; import org.aspectj.lang.annotation.Around; @@ -30,7 +31,7 @@ public class RequestSerializableServiceAspect { @Resource private JedisPool jedisPool; private RedisManager redisManager; private ExpressionParser parser = new SpelExpressionParser(); @@ -67,7 +68,7 @@ + cacheKey; cacheKey = "service-" + StringUtil.Md5(cacheKey); // jiedis原子性做拦截 Jedis jedis = jedisPool.getResource(); Jedis jedis = redisManager.getJedis(); try { Constant.waitingThreadSet.add(Thread.currentThread().getId()); String result = null; fanli/src/main/java/com/yeshi/fanli/aspect/integral/IntegralGetFrequencyLimitAspect.java
@@ -4,6 +4,7 @@ import javax.annotation.Resource; import com.yeshi.fanli.util.RedisManager; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.Signature; import org.aspectj.lang.annotation.Around; @@ -28,7 +29,7 @@ public class IntegralGetFrequencyLimitAspect { @Resource private JedisPool jedisPool; private RedisManager redisManager; private ExpressionParser parser = new SpelExpressionParser(); @@ -61,7 +62,7 @@ String catchKey = "integral-get-frequency-" + StringUtil.Md5(generateKeyBySpEL(key, joinPoint)); Jedis jedis = jedisPool.getResource(); Jedis jedis =redisManager.getJedis(); try { if (jedis.setnx(catchKey, "1") > 0) { jedis.expire(catchKey, timeS); fanli/src/main/java/com/yeshi/fanli/controller/TestController.java
@@ -330,7 +330,7 @@ @RequestMapping(value = "getBinFaRedisKey") public void getPinFaRedisKey(PrintWriter out) { JSONArray array = new JSONArray(); Jedis jedis = jedisPool.getResource(); Jedis jedis = redisManager.getJedis(); try { Set<String> sets = jedis.keys("rs-*"); for (Iterator<String> its = sets.iterator(); its.hasNext();) fanli/src/main/java/com/yeshi/fanli/manager/util/AtomMethodCallManager.java
@@ -2,6 +2,7 @@ import javax.annotation.Resource; import com.yeshi.fanli.util.RedisManager; import org.springframework.stereotype.Component; import com.yeshi.fanli.util.StringUtil; @@ -14,7 +15,7 @@ public class AtomMethodCallManager { @Resource private JedisPool jedisPool; private RedisManager redisManager; /** * 事件执行 @@ -25,7 +26,7 @@ */ public void excute(String key, AtomMethodCallInterface call) { String redisKey = "atom-" + StringUtil.Md5(key); Jedis jedis = jedisPool.getResource(); Jedis jedis = redisManager.getJedis(); try { if (StringUtil.isNullOrEmpty(jedis.set(redisKey, "1", new SetParams().nx().ex(60)))) { System.out.println("请稍后再试"); fanli/src/main/java/com/yeshi/fanli/service/impl/order/msg/MsgOrderDetailServiceImpl.java
@@ -5,6 +5,7 @@ import javax.annotation.Resource; import com.yeshi.fanli.util.RedisManager; import org.springframework.stereotype.Service; import com.yeshi.fanli.dao.mybatis.msg.MsgOrderDetailMapper; @@ -32,7 +33,7 @@ private UserMsgReadStateService userMsgReadStateService; @Resource private JedisPool jedisPool; private RedisManager redisManager; @Resource private MsgExtraService msgExtraService; @@ -55,7 +56,7 @@ // 锁住订单号 Jedis jedis = jedisPool.getResource(); Jedis jedis = redisManager.getJedis(); try { String key = "rs-order-" + detail.getOrderId(); if (jedis.setnx(key, "1") > 0) { fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserAccountServiceImpl.java
@@ -846,7 +846,7 @@ // 采用redis事务防止一个手机号多次注册问题 String watchKey = StringUtil.Md5("REGISTER:" + phone); Jedis jedis = jedisPool.getResource(); Jedis jedis = redisManager.getJedis(); try { jedis.watch(watchKey); if (jedis.get(watchKey) != null && Integer.parseInt(jedis.get(watchKey)) > 1) @@ -944,7 +944,7 @@ // 采用redis事务防止一个手机号多次注册问题 String watchKey = StringUtil.Md5("REGISTER:" + phone); Jedis jedis = jedisPool.getResource(); Jedis jedis = redisManager.getJedis(); try { jedis.watch(watchKey); if (jedis.get(watchKey) != null && Integer.parseInt(jedis.get(watchKey)) > 1) @@ -1007,7 +1007,7 @@ // 采用redis事务防止一个微信号多次注册问题 String watchKey = StringUtil.Md5("REGISTER:" + weiXinUser.getUnionid()); Jedis jedis = jedisPool.getResource(); Jedis jedis = redisManager.getJedis(); try { jedis.watch(watchKey); if (jedis.get(watchKey) != null && Integer.parseInt(jedis.get(watchKey)) > 1) @@ -1424,7 +1424,7 @@ // 采用redis事务防止一个微信号多次注册问题 String watchKey = StringUtil.Md5("REGISTER:" + weiXinUser.getUnionid()); Jedis jedis = jedisPool.getResource(); Jedis jedis = redisManager.getJedis(); try { jedis.watch(watchKey); if (jedis.get(watchKey) != null && Integer.parseInt(jedis.get(watchKey)) > 1) fanli/src/main/java/com/yeshi/fanli/util/RedisManager.java
@@ -50,6 +50,11 @@ @Resource private ConfigService configService; public Jedis getJedis() { Jedis jedis = jedisPool.getResource(); return jedis; } /** * 缓存字符串 * @@ -57,7 +62,7 @@ * @param value */ private void setString(String key, String value) { Jedis jedis = jedisPool.getResource(); Jedis jedis = getJedis(); SetParams params=new SetParams().nx().ex(60); jedis.set(key, value, params); try { @@ -75,7 +80,7 @@ * @param value */ private void removeKey(String key) { Jedis jedis = jedisPool.getResource(); Jedis jedis = getJedis(); try { jedis.del(key); } finally { @@ -89,11 +94,10 @@ * * @param key * @param value * @param seconds * -缓存时间(s) * @param seconds -缓存时间(s) */ private void setString(String key, String value, int seconds) { Jedis jedis = jedisPool.getResource(); Jedis jedis = getJedis(); try { jedis.setex(key, seconds, value); } finally { @@ -102,7 +106,7 @@ } private String getString(String key) { Jedis jedis = jedisPool.getResource(); Jedis jedis = getJedis(); try { return jedis.get(key); } finally { @@ -111,7 +115,7 @@ } public void increase(String key) { Jedis jedis = jedisPool.getResource(); Jedis jedis = getJedis(); try { jedis.incr(key); } finally { @@ -120,7 +124,7 @@ } public void expire(String key, int seconds) { Jedis jedis = jedisPool.getResource(); Jedis jedis = getJedis(); try { jedis.expire(key, seconds); } finally { @@ -256,7 +260,7 @@ */ public boolean ipFrequencyLimit(String ip, String apiName) { String key = RedisKeyEnum.getRedisKey(RedisKeyEnum.emptyKey, ip + "-" + StringUtil.Md5(apiName)); Jedis jedis = jedisPool.getResource(); Jedis jedis = getJedis(); try { long count = jedis.incr(key); if (count == 1) @@ -272,7 +276,7 @@ public boolean frequencyLimit(String key, int timeS, int num) { key = RedisKeyEnum.getRedisKey(RedisKeyEnum.frequencyLimit, key); Jedis jedis = jedisPool.getResource(); Jedis jedis = getJedis(); try { long count = jedis.incr(key); if (count == 1) @@ -414,7 +418,6 @@ } /** * * @param phone * @param type * @return fanli/src/main/resource/env-dev/redis.properties
@@ -8,4 +8,5 @@ redis.max_idle=200 redis.max_wait=10000 redis.timeout=5000 redis.database=0 redis.test_on_borrow=true fanli/src/main/resource/env-pro-by/redis.properties
@@ -6,3 +6,4 @@ redis.max_wait=10000 redis.timeout=5000 redis.test_on_borrow=true redis.database=0 fanli/src/main/resource/env-pro-job/redis.properties
@@ -6,3 +6,4 @@ redis.max_wait=10000 redis.timeout=5000 redis.test_on_borrow=true redis.database=1 fanli/src/main/resource/env-pro/redis.properties
@@ -6,3 +6,4 @@ redis.max_wait=10000 redis.timeout=5000 redis.test_on_borrow=true redis.database=0 fanli/src/main/resource/env-sandbox/redis.properties
@@ -7,3 +7,4 @@ redis.max_wait=10000 redis.timeout=5000 redis.test_on_borrow=true redis.database=0 fanli/src/main/resource/spring.xml
@@ -247,6 +247,8 @@ <constructor-arg name="port" value="${redis.port}"></constructor-arg> <constructor-arg name="timeout" value="${redis.timeout}"></constructor-arg> <constructor-arg name="password" value="${redis.auth}"></constructor-arg> <constructor-arg name="database" value="${redis.database}"></constructor-arg> </bean>