Commit bf1fbe83 authored by data爬虫-冯 军凯's avatar data爬虫-冯 军凯

每日定时任务改为异步

parent 4660e2d1
...@@ -256,11 +256,13 @@ ...@@ -256,11 +256,13 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.quantgroup</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>csource-fastfds-client-java</artifactId> <artifactId>spring-boot-starter-redis</artifactId>
<version>20180928-Release</version> <version>1.4.6.RELEASE</version>
</dependency> </dependency>
<!--SpringBoot, Cloud基础的依赖--> <!--SpringBoot, Cloud基础的依赖-->
<dependency> <dependency>
<groupId>cn.quantgroup</groupId> <groupId>cn.quantgroup</groupId>
......
package cn.quantgroup.qgblservice.config.redis;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.cache.CacheManager;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.data.redis.cache.RedisCacheManager;
import org.springframework.data.redis.connection.RedisConnectionFactory;
import org.springframework.data.redis.connection.RedisNode;
import org.springframework.data.redis.connection.RedisSentinelConfiguration;
import org.springframework.data.redis.connection.jedis.JedisConnectionFactory;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.data.redis.serializer.JdkSerializationRedisSerializer;
import org.springframework.data.redis.serializer.StringRedisSerializer;
import redis.clients.jedis.JedisPoolConfig;
import java.util.HashSet;
import java.util.Set;
/**
* @Author fengjunkai
* @Date 2019-08-16 19:01
*/
@Configuration
public class RedisConfig {
@Value("${blacklist.data.redis.defaultExpiration}")
private Long defaultExpiration;
@Value("${blacklist.redis.master.host}")
private String masterHost;
@Value("${blacklist.redis.master.port}")
private int masterPort;
@Value("${blacklist.redis.master.name}")
private String masterName;
@Value("${blacklist.redis.sentinel1.host}")
private String sentinel1Host;
@Value("${blacklist.redis.sentinel1.port}")
private int sentinel1port;
@Value("${blacklist.redis.sentinel2.host}")
private String sentinel2Host;
@Value("${blacklist.redis.sentinel2.port}")
private int sentinel2port;
@Value("${blacklist.redis.sentinel3.host}")
private String sentinel3Host;
@Value("${blacklist.redis.sentinel3.port}")
private int sentinel3port;
private RedisConnectionFactory generateDevConnectionFactory() {
JedisConnectionFactory factory = new JedisConnectionFactory();
factory.setHostName(masterHost);
factory.setPort(masterPort);
factory.setUsePool(true);
factory.setConvertPipelineAndTxResults(true);
JedisPoolConfig poolConfig = generatePoolConfig();
factory.setPoolConfig(poolConfig);
factory.afterPropertiesSet();
return factory;
}
private RedisConnectionFactory generateReleaseConnectionFactory() {
RedisSentinelConfiguration sentinelConfiguration = new RedisSentinelConfiguration();
RedisNode master = new RedisNode(masterHost, masterPort);
master.setName(masterName);
Set<RedisNode> sentinels = new HashSet<>();
RedisNode sentinel1 = new RedisNode(sentinel1Host, sentinel1port);
RedisNode sentinel2 = new RedisNode(sentinel2Host, sentinel2port);
RedisNode sentinel3 = new RedisNode(sentinel3Host, sentinel3port);
sentinels.add(sentinel1);
sentinels.add(sentinel2);
sentinels.add(sentinel3);
sentinelConfiguration.setMaster(master);
sentinelConfiguration.setSentinels(sentinels);
JedisPoolConfig poolConfig = generatePoolConfig();
JedisConnectionFactory factory = new JedisConnectionFactory(sentinelConfiguration, poolConfig);
factory.setHostName(masterHost);
factory.setPort(masterPort);
factory.setTimeout(10000);
factory.setUsePool(true);
factory.setConvertPipelineAndTxResults(true);
factory.afterPropertiesSet();
return factory;
}
private JedisPoolConfig generatePoolConfig() {
JedisPoolConfig poolConfig = new JedisPoolConfig();
poolConfig.setMinIdle(20);
poolConfig.setMaxTotal(300);
poolConfig.setMaxWaitMillis(5000);
poolConfig.setTestOnBorrow(true);
return poolConfig;
}
@Bean(name = "redisConnectionFactory")
RedisConnectionFactory factory() {
if (StringUtils.isEmpty(masterName)) {
return generateDevConnectionFactory();
} else {
return generateReleaseConnectionFactory();
}
}
@Bean(name = "redisTemplate")
public RedisTemplate<String, Object> redisTemplate(
RedisConnectionFactory factory) {
final RedisTemplate<String, Object> template = new RedisTemplate<>();
StringRedisSerializer stringRedisSerializer = new StringRedisSerializer();
JdkSerializationRedisSerializer jdkSerializationRedisSerializer =
new JdkSerializationRedisSerializer();
template.setEnableTransactionSupport(false);
template.setKeySerializer(stringRedisSerializer);
template.setHashKeySerializer(stringRedisSerializer);
template.setValueSerializer(jdkSerializationRedisSerializer);
template.setDefaultSerializer(jdkSerializationRedisSerializer);
template.setConnectionFactory(factory);
return template;
}
@Bean(name = "stringRedisTemplate")
public RedisTemplate<String, String> stringRedisTemplate(
RedisConnectionFactory factory) {
final RedisTemplate<String, String> template = new RedisTemplate<>();
StringRedisSerializer stringRedisSerializer = new StringRedisSerializer();
template.setEnableTransactionSupport(false);
template.setKeySerializer(stringRedisSerializer);
template.setHashKeySerializer(stringRedisSerializer);
template.setValueSerializer(stringRedisSerializer);
template.setDefaultSerializer(stringRedisSerializer);
template.setConnectionFactory(factory);
return template;
}
@Bean(name = "cacheManager")
public CacheManager cacheManager(RedisTemplate<String, Object> redisTemplate) {
RedisCacheManager cacheManager = new RedisCacheManager(redisTemplate);
cacheManager.setDefaultExpiration(defaultExpiration);
cacheManager.setUsePrefix(true);
return cacheManager;
}
}
...@@ -58,4 +58,8 @@ public class Constant { ...@@ -58,4 +58,8 @@ public class Constant {
public static final String YYYY_MM_DD_HH_MM_SS = "yyyy-MM-dd HH:mm:ss"; public static final String YYYY_MM_DD_HH_MM_SS = "yyyy-MM-dd HH:mm:ss";
} }
public static class REDIS_KEY{
public static final String BLACK_LSIT_JOB_INCREMENT_KEY = "BLACK_LSIT_JOB_INCREMENT_KEY";
}
} }
package cn.quantgroup.qgblservice.job.blimport; package cn.quantgroup.qgblservice.job.blimport;
import cn.quantgroup.qgblservice.constant.Constant;
import cn.quantgroup.qgblservice.service.IBlackListManagerService; import cn.quantgroup.qgblservice.service.IBlackListManagerService;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.scheduling.annotation.Scheduled; import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.util.concurrent.TimeUnit;
/** /**
* 量化派黑名单导入整理至新表任务 * 量化派黑名单导入整理至新表任务
* *
...@@ -16,6 +20,9 @@ import org.springframework.stereotype.Component; ...@@ -16,6 +20,9 @@ import org.springframework.stereotype.Component;
@Component @Component
public class BlackListImportManagerJob { public class BlackListImportManagerJob {
@Autowired
private RedisTemplate<String,String> redisTemplate;
@Autowired @Autowired
private IBlackListManagerService iBlackListManagerService; private IBlackListManagerService iBlackListManagerService;
...@@ -24,7 +31,11 @@ public class BlackListImportManagerJob { ...@@ -24,7 +31,11 @@ public class BlackListImportManagerJob {
try { try {
iBlackListManagerService.blackListRealTimeManagerByDay(); if(increment()){
redisTemplate.expire(Constant.REDIS_KEY.BLACK_LSIT_JOB_INCREMENT_KEY, 10, TimeUnit.SECONDS);
iBlackListManagerService.blackListRealTimeManagerByDay();
}
} catch (Exception e) { } catch (Exception e) {
log.error("每天导入近5天逾期(15+)用户黑名单异常", e); log.error("每天导入近5天逾期(15+)用户黑名单异常", e);
...@@ -32,4 +43,12 @@ public class BlackListImportManagerJob { ...@@ -32,4 +43,12 @@ public class BlackListImportManagerJob {
} }
public Boolean increment(){
Long increment = redisTemplate.opsForValue().increment(Constant.REDIS_KEY.BLACK_LSIT_JOB_INCREMENT_KEY, 1);
return increment <= 1;
}
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment