Merge remote-tracking branch 'origin/div' into div

admin

2020-04-28 061e912ff3cec51f8f8dcb4e6336bcd2fc03c164

 fanli/src/main/java/com/yeshi/fanli/aspect/ActiveUserAspect.java

@@ -98,7 +98,7 @@
                     String key = "useractive-" + uidStr;

                     Jedis jedis = jedisPool.getResource();

                     try {

                        if (!StringUtil.isNullOrEmpty(jedis.set(key, "1", new SetParams().nx().ex(300)))) {

                        if (!StringUtil.isNullOrEmpty(jedis.set(key, "1", new SetParams().nx().ex(Constant.IS_TEST?10:300)))) {

                           try {

                              Long uid = Long.parseLong(uidStr);

//                              if (!Constant.IS_TEST) { // 活跃通知