记得上下班打卡 | git大法好,push需谨慎

Commit dc55598f authored by 胡佳晨's avatar 胡佳晨

修改 redis配置

修改配置文件指向 新db mongo redis
parent 3ecc4311
...@@ -39,6 +39,8 @@ public abstract class AbstractRedisConfig { ...@@ -39,6 +39,8 @@ public abstract class AbstractRedisConfig {
public Map<Integer, RedisTemplate<String, Object>> redisTemplateMap = new HashMap<>(); public Map<Integer, RedisTemplate<String, Object>> redisTemplateMap = new HashMap<>();
private StringRedisTemplate stringRedisTemplate = new StringRedisTemplate();
abstract String getHost(); abstract String getHost();
abstract int getPort(); abstract int getPort();
abstract String getPassword(); abstract String getPassword();
...@@ -51,7 +53,7 @@ public abstract class AbstractRedisConfig { ...@@ -51,7 +53,7 @@ public abstract class AbstractRedisConfig {
@PostConstruct @PostConstruct
public void initRedisTemp() throws Exception { public void initRedisTemp() throws Exception {
log.info("############################################################"); log.info("############################################################");
log.info("###### START 初始化 Redis "+this.getClass().getSimpleName()+"连接池 START ######"); log.info("###### START 初始化 Redis{} "+this.getClass().getSimpleName()+"连接池 START ######", this.getHost());
if(StringUtils.isEmpty(getHost())||getHost().equalsIgnoreCase("null")){ if(StringUtils.isEmpty(getHost())||getHost().equalsIgnoreCase("null")){
log.info("无配置,不需要初始化!"); log.info("无配置,不需要初始化!");
return; return;
...@@ -69,6 +71,21 @@ public abstract class AbstractRedisConfig { ...@@ -69,6 +71,21 @@ public abstract class AbstractRedisConfig {
redisTemplateMap.put(defaultDb, getRedisTemplate(defaultDb)); redisTemplateMap.put(defaultDb, getRedisTemplate(defaultDb));
} }
log.info("###### END 初始化 Redis 连接池 END ######"); log.info("###### END 初始化 Redis 连接池 END ######");
log.info("###### START 初始化 Redis-queue{} "+this.getClass().getSimpleName()+"连接池 START ######", this.getHost());
//初始化队列
LettuceConnectionFactory factory = null;
if(totalDbs==1){
log.info("###### 正在加载Redis-queue-db-" + defaultDb + " ######");
factory = getDbFactory(defaultDb);
}else{
log.info("###### 正在加载Redis-queue-db-" + (totalDbs-1) + " ######");
factory = getDbFactory(totalDbs-1);
}
stringRedisTemplate.setConnectionFactory(factory);
stringRedisTemplate.afterPropertiesSet();
log.info("###### END 初始化 Redis-queue 连接池 END ######");
} }
private RedisTemplate<String, Object> getRedisTemplate(int dbNo) { private RedisTemplate<String, Object> getRedisTemplate(int dbNo) {
...@@ -127,6 +144,10 @@ public abstract class AbstractRedisConfig { ...@@ -127,6 +144,10 @@ public abstract class AbstractRedisConfig {
// } // }
public StringRedisTemplate getStringRedisTemplate(){ public StringRedisTemplate getStringRedisTemplate(){
return stringRedisTemplate;
}
public StringRedisTemplate getDefaultStringRedisTemplate(){
if(StringUtils.isEmpty(getHost())||getHost().equalsIgnoreCase("null")){ if(StringUtils.isEmpty(getHost())||getHost().equalsIgnoreCase("null")){
log.info("无配置,不需要初始化!"); log.info("无配置,不需要初始化!");
return null; return null;
...@@ -137,10 +158,10 @@ public abstract class AbstractRedisConfig { ...@@ -137,10 +158,10 @@ public abstract class AbstractRedisConfig {
}else{ }else{
factory = getDbFactory(totalDbs-1); factory = getDbFactory(totalDbs-1);
} }
StringRedisTemplate redisTemplate = new StringRedisTemplate(); StringRedisTemplate stringRedisTemplate = new StringRedisTemplate();
redisTemplate.setConnectionFactory(factory); stringRedisTemplate.setConnectionFactory(factory);
redisTemplate.afterPropertiesSet(); stringRedisTemplate.afterPropertiesSet();
return redisTemplate; return stringRedisTemplate;
} }
private void setSerializer(RedisTemplate<String, Object> template) { private void setSerializer(RedisTemplate<String, Object> template) {
......
...@@ -42,7 +42,7 @@ public class RedisConfig extends AbstractRedisConfig{ ...@@ -42,7 +42,7 @@ public class RedisConfig extends AbstractRedisConfig{
@Bean @Bean
public StringRedisTemplate stringRedisTemplate() { public StringRedisTemplate stringRedisTemplate() {
return this.getStringRedisTemplate(); return this.getDefaultStringRedisTemplate();
} }
String getHost(){ String getHost(){
......
...@@ -4,6 +4,7 @@ import com.liquidnet.common.cache.redis.config.AbstractRedisConfig; ...@@ -4,6 +4,7 @@ import com.liquidnet.common.cache.redis.config.AbstractRedisConfig;
import com.liquidnet.common.cache.redis.config.RedisAdamConfig; import com.liquidnet.common.cache.redis.config.RedisAdamConfig;
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.beans.factory.annotation.Value;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
/** /**
...@@ -20,10 +21,17 @@ import org.springframework.stereotype.Component; ...@@ -20,10 +21,17 @@ import org.springframework.stereotype.Component;
public final class RedisAdamUtil extends AbstractRedisUtil{ public final class RedisAdamUtil extends AbstractRedisUtil{
@Autowired @Autowired
private RedisAdamConfig redisConfig; private RedisAdamConfig redisConfig;
@Value("${spring.profiles.active:prod}")
private String prefix;
@Override
public String fillingKey(String key) {
return prefix.equals("prod") ? key : prefix.concat(":").concat(key);
}
@Override @Override
public int getDbs() { public int getDbs() {
log.info("redisAdamUtil.totalDbs===",redisConfig.totalDbs); log.info("redisAdamUtil.totalDbs:{},prefix:{}===", redisConfig.totalDbs, prefix);
return redisConfig.totalDbs; return redisConfig.totalDbs;
} }
......
...@@ -4,6 +4,7 @@ import com.liquidnet.common.cache.redis.config.AbstractRedisConfig; ...@@ -4,6 +4,7 @@ import com.liquidnet.common.cache.redis.config.AbstractRedisConfig;
import com.liquidnet.common.cache.redis.config.RedisCandyConfig; import com.liquidnet.common.cache.redis.config.RedisCandyConfig;
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.beans.factory.annotation.Value;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
/** /**
...@@ -19,10 +20,17 @@ import org.springframework.stereotype.Component; ...@@ -19,10 +20,17 @@ import org.springframework.stereotype.Component;
public final class RedisCandyUtil extends AbstractRedisUtil{ public final class RedisCandyUtil extends AbstractRedisUtil{
@Autowired @Autowired
private RedisCandyConfig redisConfig; private RedisCandyConfig redisConfig;
@Value("${spring.profiles.active:prod}")
private String prefix;
@Override
public String fillingKey(String key) {
return prefix.equals("prod") ? key : prefix.concat(":").concat(key);
}
@Override @Override
public int getDbs() { public int getDbs() {
log.info("redisCandyUtil.totalDbs===",redisConfig.totalDbs); log.info("redisCandyUtil.totalDbs:{},prefix:{}===", redisConfig.totalDbs, prefix);
return redisConfig.totalDbs; return redisConfig.totalDbs;
} }
......
...@@ -4,6 +4,7 @@ import com.liquidnet.common.cache.redis.config.AbstractRedisConfig; ...@@ -4,6 +4,7 @@ import com.liquidnet.common.cache.redis.config.AbstractRedisConfig;
import com.liquidnet.common.cache.redis.config.RedisDragonConfig; import com.liquidnet.common.cache.redis.config.RedisDragonConfig;
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.beans.factory.annotation.Value;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
/** /**
...@@ -20,15 +21,20 @@ import org.springframework.stereotype.Component; ...@@ -20,15 +21,20 @@ import org.springframework.stereotype.Component;
public final class RedisDragonUtil extends AbstractRedisUtil{ public final class RedisDragonUtil extends AbstractRedisUtil{
@Autowired @Autowired
private RedisDragonConfig redisConfig; private RedisDragonConfig redisConfig;
@Value("${spring.profiles.active:prod}")
private String prefix;
@Override
public String fillingKey(String key) {
return prefix.equals("prod") ? key : prefix.concat(":").concat(key);
}
@Override @Override
public int getDbs() { public int getDbs() {
log.info("redisDragonUtil.totalDbs===",redisConfig.totalDbs); log.info("redisDragonUtil.totalDbs:{},prefix:{}===", redisConfig.totalDbs, prefix);
return redisConfig.totalDbs; return redisConfig.totalDbs;
} }
@Override @Override
AbstractRedisConfig getRedisConfig() { AbstractRedisConfig getRedisConfig() {
return this.redisConfig; return this.redisConfig;
......
...@@ -4,6 +4,7 @@ import com.liquidnet.common.cache.redis.config.AbstractRedisConfig; ...@@ -4,6 +4,7 @@ import com.liquidnet.common.cache.redis.config.AbstractRedisConfig;
import com.liquidnet.common.cache.redis.config.RedisGalaxyConfig; import com.liquidnet.common.cache.redis.config.RedisGalaxyConfig;
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.beans.factory.annotation.Value;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
/** /**
...@@ -20,10 +21,17 @@ import org.springframework.stereotype.Component; ...@@ -20,10 +21,17 @@ import org.springframework.stereotype.Component;
public final class RedisGalaxyUtil extends AbstractRedisUtil{ public final class RedisGalaxyUtil extends AbstractRedisUtil{
@Autowired @Autowired
private RedisGalaxyConfig redisConfig; private RedisGalaxyConfig redisConfig;
@Value("${spring.profiles.active:prod}")
private String prefix;
@Override
public String fillingKey(String key) {
return prefix.equals("prod") ? key : prefix.concat(":").concat(key);
}
@Override @Override
public int getDbs() { public int getDbs() {
log.info("RedisGalaxyUtil.totalDbs===",redisConfig.totalDbs); log.info("RedisGalaxyUtil.totalDbs:{},prefix:{}===", redisConfig.totalDbs, prefix);
return redisConfig.totalDbs; return redisConfig.totalDbs;
} }
......
package com.liquidnet.common.cache.redis.util; package com.liquidnet.common.cache.redis.util;
import com.liquidnet.common.cache.redis.config.AbstractRedisConfig; import com.liquidnet.common.cache.redis.config.AbstractRedisConfig;
import com.liquidnet.common.cache.redis.config.RedisAdamConfig;
import com.liquidnet.common.cache.redis.config.RedisGoblinConfig; import com.liquidnet.common.cache.redis.config.RedisGoblinConfig;
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.beans.factory.annotation.Value;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
/** /**
...@@ -21,10 +21,17 @@ import org.springframework.stereotype.Component; ...@@ -21,10 +21,17 @@ import org.springframework.stereotype.Component;
public final class RedisGoblinUtil extends AbstractRedisUtil { public final class RedisGoblinUtil extends AbstractRedisUtil {
@Autowired @Autowired
private RedisGoblinConfig redisConfig; private RedisGoblinConfig redisConfig;
@Value("${spring.profiles.active:prod}")
private String prefix;
@Override
public String fillingKey(String key) {
return prefix.equals("prod") ? key : prefix.concat(":").concat(key);
}
@Override @Override
public int getDbs() { public int getDbs() {
log.info("redisAdamUtil.totalDbs===", redisConfig.totalDbs); log.info("redisAdamUtil.totalDbs:{},prefix:{}===", redisConfig.totalDbs, prefix);
return redisConfig.totalDbs; return redisConfig.totalDbs;
} }
......
...@@ -4,6 +4,7 @@ import com.liquidnet.common.cache.redis.config.AbstractRedisConfig; ...@@ -4,6 +4,7 @@ import com.liquidnet.common.cache.redis.config.AbstractRedisConfig;
import com.liquidnet.common.cache.redis.config.RedisKylinConfig; import com.liquidnet.common.cache.redis.config.RedisKylinConfig;
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.beans.factory.annotation.Value;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
/** /**
...@@ -20,15 +21,20 @@ import org.springframework.stereotype.Component; ...@@ -20,15 +21,20 @@ import org.springframework.stereotype.Component;
public final class RedisKylinUtil extends AbstractRedisUtil{ public final class RedisKylinUtil extends AbstractRedisUtil{
@Autowired @Autowired
private RedisKylinConfig redisConfig; private RedisKylinConfig redisConfig;
@Value("${spring.profiles.active:prod}")
private String prefix;
@Override
public String fillingKey(String key) {
return prefix.equals("prod") ? key : prefix.concat(":").concat(key);
}
@Override @Override
public int getDbs() { public int getDbs() {
log.info("redisKylinUtil.totalDbs===",redisConfig.totalDbs); log.info("redisKylinUtil.totalDbs:{},prefix:{}===", redisConfig.totalDbs, prefix);
return redisConfig.totalDbs; return redisConfig.totalDbs;
} }
@Override @Override
AbstractRedisConfig getRedisConfig() { AbstractRedisConfig getRedisConfig() {
return this.redisConfig; return this.redisConfig;
......
...@@ -4,6 +4,7 @@ import com.liquidnet.common.cache.redis.config.AbstractRedisConfig; ...@@ -4,6 +4,7 @@ import com.liquidnet.common.cache.redis.config.AbstractRedisConfig;
import com.liquidnet.common.cache.redis.config.RedisSweetConfig; import com.liquidnet.common.cache.redis.config.RedisSweetConfig;
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.beans.factory.annotation.Value;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
/** /**
...@@ -20,10 +21,17 @@ import org.springframework.stereotype.Component; ...@@ -20,10 +21,17 @@ import org.springframework.stereotype.Component;
public final class RedisSweetUtil extends AbstractRedisUtil{ public final class RedisSweetUtil extends AbstractRedisUtil{
@Autowired @Autowired
private RedisSweetConfig redisConfig; private RedisSweetConfig redisConfig;
@Value("${spring.profiles.active:prod}")
private String prefix;
@Override
public String fillingKey(String key) {
return prefix.equals("prod") ? key : prefix.concat(":").concat(key);
}
@Override @Override
public int getDbs() { public int getDbs() {
log.info("redisSweetUtil.totalDbs===",redisConfig.totalDbs); log.info("redisSweetUtil.totalDbs:{},prefix:{}===", redisConfig.totalDbs, prefix);
return redisConfig.totalDbs; return redisConfig.totalDbs;
} }
......
...@@ -13,8 +13,8 @@ liquidnet: ...@@ -13,8 +13,8 @@ liquidnet:
refresh-ttl: 525600 refresh-ttl: 525600
blacklist_grace_period: 5 blacklist_grace_period: 5
mysql: mysql:
urlHostAndPort: 39.107.71.112:3308 urlHostAndPort: java-test.mysql.polardb.rds.aliyuncs.com:3306
username: root username: zhengzai
password: Zhengzai@rd2U# password: Zhengzai@rd2U#
# rabbitmq: # rabbitmq:
# host: rabbitmq.zhengzai.tv # host: rabbitmq.zhengzai.tv
...@@ -32,52 +32,52 @@ liquidnet: ...@@ -32,52 +32,52 @@ liquidnet:
disable: false disable: false
redis: redis:
kylin: kylin:
dbs: 0,16 database: 255
database: 15 dbs: 0,256
host: 39.107.71.112 host: r-2zeucai3yj2t0f4nmzpd.redis.rds.aliyuncs.com
port: 6379 port: 6380
password: 3Xa%8p password: 7eoK2XehKqF1
goblin: goblin:
dbs: 0,16 database: 255
database: 15 dbs: 0,256
host: 39.107.71.112 host: r-2zeucai3yj2t0f4nmzpd.redis.rds.aliyuncs.com
port: 6379 port: 6380
password: 3Xa%8p password: 7eoK2XehKqF1
slime: slime:
dbs: 0,16 database: 255
database: 15 dbs: 0,256
host: 39.107.71.112 host: r-2zeucai3yj2t0f4nmzpd.redis.rds.aliyuncs.com
port: 6379 port: 6380
password: 3Xa%8p password: 7eoK2XehKqF1
dragon: dragon:
dbs: 0,16 database: 255
database: 15 dbs: 0,256
host: 39.107.71.112 host: r-2zeucai3yj2t0f4nmzpd.redis.rds.aliyuncs.com
port: 6379 port: 6380
password: 3Xa%8p password: 7eoK2XehKqF1
sweet: sweet:
dbs: 0,16 database: 255
database: 15 dbs: 0,256
host: 39.107.71.112 host: r-2zeucai3yj2t0f4nmzpd.redis.rds.aliyuncs.com
port: 6379 port: 6380
password: 3Xa%8p password: 7eoK2XehKqF1
adam: adam:
dbs: 0,16 database: 255
database: 15 dbs: 0,256
host: 39.107.71.112 host: r-2zeucai3yj2t0f4nmzpd.redis.rds.aliyuncs.com
port: 6379 port: 6380
password: 3Xa%8p password: 7eoK2XehKqF1
candy: candy:
dbs: 0,16 database: 255
database: 15 dbs: 0,256
host: 39.107.71.112 host: r-2zeucai3yj2t0f4nmzpd.redis.rds.aliyuncs.com
port: 6379 port: 6380
password: 3Xa%8p password: 7eoK2XehKqF1
mongodb: mongodb:
host: 39.107.71.112:27017 host: dds-2ze23697d93111041932-pub.mongodb.rds.aliyuncs.com:3717,dds-2ze23697d93111042720-pub.mongodb.rds.aliyuncs.com:3717
port: 27017 port: 3717
user: admin user: root
pwd: S&y$6d*JwJ pwd: Sy6d*JwJ
service: service:
adam: adam:
url-pay: url-pay:
......
...@@ -32,52 +32,52 @@ liquidnet: ...@@ -32,52 +32,52 @@ liquidnet:
disable: false disable: false
redis: redis:
kylin: kylin:
database: 255 database: 251
dbs: 0,256 dbs: 0,256
host: r-2zeucai3yj2t0f4nmz.redis.rds.aliyuncs.com host: r-2zeucai3yj2t0f4nmzpd.redis.rds.aliyuncs.com
port: 6380 port: 6380
password: 7eoK2XehKqF1 password: 7eoK2XehKqF1
goblin: goblin:
database: 255 database: 251
dbs: 0,256 dbs: 0,256
host: r-2zeucai3yj2t0f4nmz.redis.rds.aliyuncs.com host: r-2zeucai3yj2t0f4nmzpd.redis.rds.aliyuncs.com
port: 6380 port: 6380
password: 7eoK2XehKqF1 password: 7eoK2XehKqF1
slime: slime:
database: 255 database: 251
dbs: 0,256 dbs: 0,256
host: r-2zeucai3yj2t0f4nmz.redis.rds.aliyuncs.com host: r-2zeucai3yj2t0f4nmzpd.redis.rds.aliyuncs.com
port: 6380 port: 6380
password: 7eoK2XehKqF1 password: 7eoK2XehKqF1
dragon: dragon:
database: 255 database: 251
dbs: 0,256 dbs: 0,256
host: r-2zeucai3yj2t0f4nmz.redis.rds.aliyuncs.com host: r-2zeucai3yj2t0f4nmzpd.redis.rds.aliyuncs.com
port: 6380 port: 6380
password: 7eoK2XehKqF1 password: 7eoK2XehKqF1
sweet: sweet:
database: 255 database: 251
dbs: 0,256 dbs: 0,256
host: r-2zeucai3yj2t0f4nmz.redis.rds.aliyuncs.com host: r-2zeucai3yj2t0f4nmzpd.redis.rds.aliyuncs.com
port: 6380 port: 6380
password: 7eoK2XehKqF1 password: 7eoK2XehKqF1
adam: adam:
database: 255 database: 251
dbs: 0,256 dbs: 0,256
host: r-2zeucai3yj2t0f4nmz.redis.rds.aliyuncs.com host: r-2zeucai3yj2t0f4nmzpd.redis.rds.aliyuncs.com
port: 6380 port: 6380
password: 7eoK2XehKqF1 password: 7eoK2XehKqF1
candy: candy:
database: 255 database: 251
dbs: 0,256 dbs: 0,256
host: r-2zeucai3yj2t0f4nmz.redis.rds.aliyuncs.com host: r-2zeucai3yj2t0f4nmzpd.redis.rds.aliyuncs.com
port: 6380 port: 6380
password: 7eoK2XehKqF1 password: 7eoK2XehKqF1
mongodb: mongodb:
host: 39.107.71.112:27017 host: dds-2ze23697d93111041932-pub.mongodb.rds.aliyuncs.com:3717,dds-2ze23697d93111042720-pub.mongodb.rds.aliyuncs.com:3717
port: 27017 port: 3717
user: admin user: root
pwd: S&y$6d*JwJ pwd: Sy6d*JwJ
service: service:
adam: adam:
url-pay: url-pay:
......
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