|
|
@@ -28,6 +28,8 @@ import com.adx.tencent.worker.ColdWorker;
|
|
|
import com.fasterxml.jackson.databind.ObjectMapper;
|
|
|
import com.zaxxer.hikari.HikariConfig;
|
|
|
import com.zaxxer.hikari.HikariDataSource;
|
|
|
+import io.lettuce.core.ClientOptions;
|
|
|
+import io.lettuce.core.SocketOptions;
|
|
|
import org.apache.ibatis.session.SqlSessionFactory;
|
|
|
import org.mybatis.spring.SqlSessionFactoryBean;
|
|
|
import org.slf4j.Logger;
|
|
|
@@ -87,6 +89,11 @@ public class AppConfiguration {
|
|
|
}
|
|
|
|
|
|
LettuceClientConfiguration clientCfg = LettuceClientConfiguration.builder()
|
|
|
+ .clientOptions(ClientOptions.builder()
|
|
|
+ .socketOptions(SocketOptions.builder()
|
|
|
+ .connectTimeout(props.getRedisConnectTimeout())
|
|
|
+ .build())
|
|
|
+ .build())
|
|
|
.commandTimeout(props.getRedisCommandTimeout())
|
|
|
.shutdownTimeout(props.getRedisShutdownTimeout())
|
|
|
.build();
|
|
|
@@ -94,7 +101,6 @@ public class AppConfiguration {
|
|
|
LettuceConnectionFactory factory = new LettuceConnectionFactory(cfg, clientCfg);
|
|
|
factory.setValidateConnection(props.isRedisValidateConnection());
|
|
|
factory.setShareNativeConnection(false);
|
|
|
- factory.setTimeout(props.getRedisConnectTimeout().toMillis());
|
|
|
return factory;
|
|
|
}
|
|
|
|