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

This commit is contained in:
yutou 2021-05-18 18:30:13 +08:00
commit ef602e52bc
3 changed files with 8 additions and 5 deletions

View File

@ -28,8 +28,9 @@ public class GoogleAccount {
* @param s window size - must be >=1 and <=17. Other values are ignored
*/
public void setWindowSize(int s) {
if (s >= 1 && s <= 17)
if (s >= 1 && s <= 17) {
window_size = s;
}
}
/**

View File

@ -5,10 +5,10 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
@SpringBootApplication
public class ToolsApplication {
public static final String version="1.1.0";
public static final String version="1.1.1";
public static void main(String[] args) {
System.out.println("当前版本号:" + version);
SpringApplication.run(ToolsApplication.class, args);
}
}
}

View File

@ -188,16 +188,18 @@ public class RedisTools {
private static boolean init = false;
public static void initRedisPoolSub() {
if (init)
if (init) {
return;
}
init = true;
System.out.println("初始化订阅");
new Thread(new Runnable() {
@Override
public void run() {
Jedis jedis = getPoolRedis();
if (jedis != null)
if (jedis != null) {
jedis.psubscribe(new Consumer(), "*");
}
}
}).start();