Merge remote-tracking branch 'origin/master'

admin

2019-04-29 884196860ac5970eb1ac33386c65378284df4679

 fanli/src/main/java/com/yeshi/fanli/util/RedisManager.java

@@ -114,7 +114,7 @@
   public void expire(String key,int seconds) {

      Jedis jedis = jedisPool.getResource();

      try {

         jedis.expire(key, 15);

         jedis.expire(key, seconds);

      } finally {

         jedisPool.returnResource(jedis);

      }