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

Skip to content

L
liquidnet-bus-v1
Commit dc55598f authored by 胡佳晨's avatar 胡佳晨
Browse files
Options

修改 redis配置 

修改配置文件指向 新db mongo redis
parent 3ecc4311
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 211 additions and 171 deletions
liquidnet-bus-common/liquidnet-common-cache/liquidnet-common-cache-redis/src/main/java/com.liquidnet.common.cache/redis/config/AbstractRedisConfig.java
View file @ dc55598f
......@@ -39,6 +39,8 @@ public abstract class AbstractRedisConfig {
public Map<Integer, RedisTemplate<String, Object>> redisTemplateMap = new HashMap<>();
private StringRedisTemplate stringRedisTemplate = new StringRedisTemplate();
abstract String getHost();
abstract int getPort();
abstract String getPassword();
......@@ -51,7 +53,7 @@ public abstract class AbstractRedisConfig {
@PostConstruct
public void initRedisTemp() throws Exception {
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")){
log.info("无配置，不需要初始化！");
return;
......@@ -69,6 +71,21 @@ public abstract class AbstractRedisConfig {
redisTemplateMap.put(defaultDb, getRedisTemplate(defaultDb));
}
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) {
......@@ -127,6 +144,10 @@ public abstract class AbstractRedisConfig {
// }
public StringRedisTemplate getStringRedisTemplate(){
return stringRedisTemplate;
}
public StringRedisTemplate getDefaultStringRedisTemplate(){
if(StringUtils.isEmpty(getHost())||getHost().equalsIgnoreCase("null")){
log.info("无配置，不需要初始化！");
return null;
......@@ -137,10 +158,10 @@ public abstract class AbstractRedisConfig {
}else{
factory = getDbFactory(totalDbs-1);
}
StringRedisTemplate redisTemplate = new StringRedisTemplate();
redisTemplate.setConnectionFactory(factory);
redisTemplate.afterPropertiesSet();
return redisTemplate;
StringRedisTemplate stringRedisTemplate = new StringRedisTemplate();
stringRedisTemplate.setConnectionFactory(factory);
stringRedisTemplate.afterPropertiesSet();
return stringRedisTemplate;
}
private void setSerializer(RedisTemplate<String, Object> template) {
......
liquidnet-bus-common/liquidnet-common-cache/liquidnet-common-cache-redis/src/main/java/com.liquidnet.common.cache/redis/config/RedisConfig.java
View file @ dc55598f
......@@ -42,7 +42,7 @@ public class RedisConfig extends AbstractRedisConfig{
@Bean
public StringRedisTemplate stringRedisTemplate() {
return this.getStringRedisTemplate();
return this.getDefaultStringRedisTemplate();
}
String getHost(){
......
liquidnet-bus-common/liquidnet-common-cache/liquidnet-common-cache-redis/src/main/java/com.liquidnet.common.cache/redis/util/RedisAdamUtil.java
View file @ dc55598f
......@@ -4,6 +4,7 @@ import com.liquidnet.common.cache.redis.config.AbstractRedisConfig;
import com.liquidnet.common.cache.redis.config.RedisAdamConfig;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
/**
......@@ -20,10 +21,17 @@ import org.springframework.stereotype.Component;
public final class RedisAdamUtil extends AbstractRedisUtil{
@Autowired
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
public int getDbs() {
log.info("redisAdamUtil.totalDbs===",redisConfig.totalDbs);
log.info("redisAdamUtil.totalDbs:{},prefix:{}===", redisConfig.totalDbs, prefix);
return redisConfig.totalDbs;
}
......
liquidnet-bus-common/liquidnet-common-cache/liquidnet-common-cache-redis/src/main/java/com.liquidnet.common.cache/redis/util/RedisCandyUtil.java
View file @ dc55598f
......@@ -4,6 +4,7 @@ import com.liquidnet.common.cache.redis.config.AbstractRedisConfig;
import com.liquidnet.common.cache.redis.config.RedisCandyConfig;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
/**
......@@ -19,10 +20,17 @@ import org.springframework.stereotype.Component;
public final class RedisCandyUtil extends AbstractRedisUtil{
@Autowired
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
public int getDbs() {
log.info("redisCandyUtil.totalDbs===",redisConfig.totalDbs);
log.info("redisCandyUtil.totalDbs:{},prefix:{}===", redisConfig.totalDbs, prefix);
return redisConfig.totalDbs;
}
......
liquidnet-bus-common/liquidnet-common-cache/liquidnet-common-cache-redis/src/main/java/com.liquidnet.common.cache/redis/util/RedisDragonUtil.java
View file @ dc55598f
......@@ -4,6 +4,7 @@ import com.liquidnet.common.cache.redis.config.AbstractRedisConfig;
import com.liquidnet.common.cache.redis.config.RedisDragonConfig;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
/**
......@@ -20,15 +21,20 @@ import org.springframework.stereotype.Component;
public final class RedisDragonUtil extends AbstractRedisUtil{
@Autowired
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
public int getDbs() {
log.info("redisDragonUtil.totalDbs===",redisConfig.totalDbs);
log.info("redisDragonUtil.totalDbs:{},prefix:{}===", redisConfig.totalDbs, prefix);
return redisConfig.totalDbs;
}
@Override
AbstractRedisConfig getRedisConfig() {
return this.redisConfig;
......
liquidnet-bus-common/liquidnet-common-cache/liquidnet-common-cache-redis/src/main/java/com.liquidnet.common.cache/redis/util/RedisGalaxyUtil.java
View file @ dc55598f
......@@ -4,6 +4,7 @@ import com.liquidnet.common.cache.redis.config.AbstractRedisConfig;
import com.liquidnet.common.cache.redis.config.RedisGalaxyConfig;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
/**
......@@ -20,10 +21,17 @@ import org.springframework.stereotype.Component;
public final class RedisGalaxyUtil extends AbstractRedisUtil{
@Autowired
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
public int getDbs() {
log.info("RedisGalaxyUtil.totalDbs===",redisConfig.totalDbs);
log.info("RedisGalaxyUtil.totalDbs:{},prefix:{}===", redisConfig.totalDbs, prefix);
return redisConfig.totalDbs;
}
......
liquidnet-bus-common/liquidnet-common-cache/liquidnet-common-cache-redis/src/main/java/com.liquidnet.common.cache/redis/util/RedisGoblinUtil.java
View file @ dc55598f
package com.liquidnet.common.cache.redis.util;
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 lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
/**
......@@ -21,10 +21,17 @@ import org.springframework.stereotype.Component;
public final class RedisGoblinUtil extends AbstractRedisUtil {
@Autowired
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
public int getDbs() {
log.info("redisAdamUtil.totalDbs===", redisConfig.totalDbs);
log.info("redisAdamUtil.totalDbs:{},prefix:{}===", redisConfig.totalDbs, prefix);
return redisConfig.totalDbs;
}
......
liquidnet-bus-common/liquidnet-common-cache/liquidnet-common-cache-redis/src/main/java/com.liquidnet.common.cache/redis/util/RedisKylinUtil.java
View file @ dc55598f
......@@ -4,6 +4,7 @@ import com.liquidnet.common.cache.redis.config.AbstractRedisConfig;
import com.liquidnet.common.cache.redis.config.RedisKylinConfig;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
/**
......@@ -20,15 +21,20 @@ import org.springframework.stereotype.Component;
public final class RedisKylinUtil extends AbstractRedisUtil{
@Autowired
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
public int getDbs() {
log.info("redisKylinUtil.totalDbs===",redisConfig.totalDbs);
log.info("redisKylinUtil.totalDbs:{},prefix:{}===", redisConfig.totalDbs, prefix);
return redisConfig.totalDbs;
}
@Override
AbstractRedisConfig getRedisConfig() {
return this.redisConfig;
......
liquidnet-bus-common/liquidnet-common-cache/liquidnet-common-cache-redis/src/main/java/com.liquidnet.common.cache/redis/util/RedisSweetUtil.java
View file @ dc55598f
......@@ -4,6 +4,7 @@ import com.liquidnet.common.cache.redis.config.AbstractRedisConfig;
import com.liquidnet.common.cache.redis.config.RedisSweetConfig;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
/**
......@@ -20,10 +21,17 @@ import org.springframework.stereotype.Component;
public final class RedisSweetUtil extends AbstractRedisUtil{
@Autowired
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
public int getDbs() {
log.info("redisSweetUtil.totalDbs===",redisConfig.totalDbs);
log.info("redisSweetUtil.totalDbs:{},prefix:{}===", redisConfig.totalDbs, prefix);
return redisConfig.totalDbs;
}
......
liquidnet-bus-config/liquidnet-config/application-dev.yml
View file @ dc55598f
......@@ -13,8 +13,8 @@ liquidnet:
refresh-ttl: 525600
blacklist_grace_period: 5
mysql:
urlHostAndPort: 39.107.71.112:3308
username: root
urlHostAndPort: java-test.mysql.polardb.rds.aliyuncs.com:3306
username: zhengzai
password: Zhengzai@rd2U#
# rabbitmq:
# host: rabbitmq.zhengzai.tv
......@@ -32,52 +32,52 @@ liquidnet:
disable: false
redis:
kylin:
dbs: 0,16
database: 15
host: 39.107.71.112
port: 6379
password: 3Xa%8p
database: 255
dbs: 0,256
host: r-2zeucai3yj2t0f4nmzpd.redis.rds.aliyuncs.com
port: 6380
password: 7eoK2XehKqF1
goblin:
dbs: 0,16
database: 15
host: 39.107.71.112
port: 6379
password: 3Xa%8p
database: 255
dbs: 0,256
host: r-2zeucai3yj2t0f4nmzpd.redis.rds.aliyuncs.com
port: 6380
password: 7eoK2XehKqF1
slime:
dbs: 0,16
database: 15
host: 39.107.71.112
port: 6379
password: 3Xa%8p
database: 255
dbs: 0,256
host: r-2zeucai3yj2t0f4nmzpd.redis.rds.aliyuncs.com
port: 6380
password: 7eoK2XehKqF1
dragon:
dbs: 0,16
database: 15
host: 39.107.71.112
port: 6379
password: 3Xa%8p
database: 255
dbs: 0,256
host: r-2zeucai3yj2t0f4nmzpd.redis.rds.aliyuncs.com
port: 6380
password: 7eoK2XehKqF1
sweet:
dbs: 0,16
database: 15
host: 39.107.71.112
port: 6379
password: 3Xa%8p
database: 255
dbs: 0,256
host: r-2zeucai3yj2t0f4nmzpd.redis.rds.aliyuncs.com
port: 6380
password: 7eoK2XehKqF1
adam:
dbs: 0,16
database: 15
host: 39.107.71.112
port: 6379
password: 3Xa%8p
database: 255
dbs: 0,256
host: r-2zeucai3yj2t0f4nmzpd.redis.rds.aliyuncs.com
port: 6380
password: 7eoK2XehKqF1
candy:
dbs: 0,16
database: 15
host: 39.107.71.112
port: 6379
password: 3Xa%8p
database: 255
dbs: 0,256
host: r-2zeucai3yj2t0f4nmzpd.redis.rds.aliyuncs.com
port: 6380
password: 7eoK2XehKqF1
mongodb:
host: 39.107.71.112:27017
port: 27017
user: admin
pwd: S&y$6d*JwJ
host: dds-2ze23697d93111041932-pub.mongodb.rds.aliyuncs.com:3717,dds-2ze23697d93111042720-pub.mongodb.rds.aliyuncs.com:3717
port: 3717
user: root
pwd: Sy6d*JwJ
service:
adam:
url-pay:
......
liquidnet-bus-config/liquidnet-config/application-test.yml
View file @ dc55598f
......@@ -32,52 +32,52 @@ liquidnet:
disable: false
redis:
kylin:
database: 255
database: 251
dbs: 0,256
host: r-2zeucai3yj2t0f4nmz.redis.rds.aliyuncs.com
host: r-2zeucai3yj2t0f4nmzpd.redis.rds.aliyuncs.com
port: 6380
password: 7eoK2XehKqF1
goblin:
database: 255
database: 251
dbs: 0,256
host: r-2zeucai3yj2t0f4nmz.redis.rds.aliyuncs.com
host: r-2zeucai3yj2t0f4nmzpd.redis.rds.aliyuncs.com
port: 6380
password: 7eoK2XehKqF1
slime:
database: 255
database: 251
dbs: 0,256
host: r-2zeucai3yj2t0f4nmz.redis.rds.aliyuncs.com
host: r-2zeucai3yj2t0f4nmzpd.redis.rds.aliyuncs.com
port: 6380
password: 7eoK2XehKqF1
dragon:
database: 255
database: 251
dbs: 0,256
host: r-2zeucai3yj2t0f4nmz.redis.rds.aliyuncs.com
host: r-2zeucai3yj2t0f4nmzpd.redis.rds.aliyuncs.com
port: 6380
password: 7eoK2XehKqF1
sweet:
database: 255
database: 251
dbs: 0,256
host: r-2zeucai3yj2t0f4nmz.redis.rds.aliyuncs.com
host: r-2zeucai3yj2t0f4nmzpd.redis.rds.aliyuncs.com
port: 6380
password: 7eoK2XehKqF1
adam:
database: 255
database: 251
dbs: 0,256
host: r-2zeucai3yj2t0f4nmz.redis.rds.aliyuncs.com
host: r-2zeucai3yj2t0f4nmzpd.redis.rds.aliyuncs.com
port: 6380
password: 7eoK2XehKqF1
candy:
database: 255
database: 251
dbs: 0,256
host: r-2zeucai3yj2t0f4nmz.redis.rds.aliyuncs.com
host: r-2zeucai3yj2t0f4nmzpd.redis.rds.aliyuncs.com
port: 6380
password: 7eoK2XehKqF1
mongodb:
host: 39.107.71.112:27017
port: 27017
user: admin
pwd: S&y$6d*JwJ
mongodb:
host: dds-2ze23697d93111041932-pub.mongodb.rds.aliyuncs.com:3717,dds-2ze23697d93111042720-pub.mongodb.rds.aliyuncs.com:3717
port: 3717
user: root
pwd: Sy6d*JwJ
service:
adam:
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