解决冲突
This commit is contained in:
RenKaiGe-Office
@@ -270,7 +270,7 @@ public class ConfigJedisServiceimpl implements ConfigRedisService {
|
|||||||
&& redisStatisticsRealDBIndex < Configurations.getIntProperty("maxRedisDBIndex", 16)) {
|
&& redisStatisticsRealDBIndex < Configurations.getIntProperty("maxRedisDBIndex", 16)) {
|
||||||
List<MaatConfig> list = configMap.get(redisDBIndex);
|
List<MaatConfig> list = configMap.get(redisDBIndex);
|
||||||
if (list != null && list.size() > 0) {
|
if (list != null && list.size() > 0) {
|
||||||
transaction.select(redisStatisticsRealDBIndex);
|
transaction.select(redisStatisticsRealDBIndex);//选择实时统计库
|
||||||
String redisStatisticsReal = Configurations.getStringProperty("redis-statisticsReal",
|
String redisStatisticsReal = Configurations.getStringProperty("redis-statisticsReal",
|
||||||
"[COMPILE_ID];\t;[SERVICE];\t;[ACTION];\t;[CONT_TYPE];\t;[ATTR_TYPE];\t;[CONT_LABEL];\t;[TASK_ID];\t;[AFFAIR_ID];\t;[DO_BLACKLIST];\t;[DO_LOG];\t;[EFFECTIVE_RANGE];\t;[START_TIME];\t;[END_TIME];\t;[USER_REGION];\t;[IS_VALID];\t;[GROUP_NUM];\t;[FATHER_CFG_ID];\t;[OP_TIME]");
|
"[COMPILE_ID];\t;[SERVICE];\t;[ACTION];\t;[CONT_TYPE];\t;[ATTR_TYPE];\t;[CONT_LABEL];\t;[TASK_ID];\t;[AFFAIR_ID];\t;[DO_BLACKLIST];\t;[DO_LOG];\t;[EFFECTIVE_RANGE];\t;[START_TIME];\t;[END_TIME];\t;[USER_REGION];\t;[IS_VALID];\t;[GROUP_NUM];\t;[FATHER_CFG_ID];\t;[OP_TIME]");
|
||||||
String[] redisStatisticsRealArr = redisStatisticsReal.split(";");
|
String[] redisStatisticsRealArr = redisStatisticsReal.split(";");
|
||||||
|
|||||||
@@ -1,158 +1,158 @@
|
|||||||
#==========日志库 Mysql=======================
|
#==========日志库 Mysql=======================
|
||||||
jdbc.log.driver=com.mysql.jdbc.Driver
|
jdbc.log.driver=com.mysql.jdbc.Driver
|
||||||
#元辰鑫内网
|
#元辰鑫内网
|
||||||
jdbc.log.url=jdbc:mysql://10.0.6.249:3306/galaxy?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull
|
jdbc.log.url=jdbc:mysql://10.0.6.249:3306/galaxy?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull
|
||||||
#华严
|
#华严
|
||||||
#jdbc.log.url=jdbc:mysql://192.168.11.242:3306/galaxy?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull
|
#jdbc.log.url=jdbc:mysql://192.168.11.242:3306/galaxy?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull
|
||||||
#元辰鑫外网
|
#元辰鑫外网
|
||||||
#jdbc.log.url=jdbc:mysql://192.168.10.204:3306/galaxy?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull
|
#jdbc.log.url=jdbc:mysql://192.168.10.204:3306/galaxy?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull
|
||||||
#亦庄测试环境
|
#亦庄测试环境
|
||||||
#jdbc.log.url=jdbc:mysql://192.168.10.212:3306/galaxy?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull
|
#jdbc.log.url=jdbc:mysql://192.168.10.212:3306/galaxy?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull
|
||||||
#亦庄演示环境
|
#亦庄演示环境
|
||||||
#jdbc.log.url=jdbc:mysql://10.3.48.5:3306/galaxy?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull
|
#jdbc.log.url=jdbc:mysql://10.3.48.5:3306/galaxy?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull
|
||||||
jdbc.log.username=root
|
jdbc.log.username=root
|
||||||
jdbc.log.key=9Pjh5K20Sho0lnWMClUXYA==
|
jdbc.log.key=9Pjh5K20Sho0lnWMClUXYA==
|
||||||
jdbc.log.password=D3ptWYX8vx/GoEXaSrJycQ==
|
jdbc.log.password=D3ptWYX8vx/GoEXaSrJycQ==
|
||||||
|
|
||||||
#==========================================
|
#==========================================
|
||||||
|
|
||||||
#==========日志库 Oracle ======================
|
#==========日志库 Oracle ======================
|
||||||
##jdbc.log.driver=oracle.jdbc.driver.OracleDriver
|
##jdbc.log.driver=oracle.jdbc.driver.OracleDriver
|
||||||
##jdbc.log.url=jdbc:oracle:thin:@10.0.6.104:1521:orcl
|
##jdbc.log.url=jdbc:oracle:thin:@10.0.6.104:1521:orcl
|
||||||
#jdbc.log.url=jdbc:oracle:thin:@10.174.196.22:1521:orcl
|
#jdbc.log.url=jdbc:oracle:thin:@10.174.196.22:1521:orcl
|
||||||
##jdbc.log.username=zdx
|
##jdbc.log.username=zdx
|
||||||
#jdbc.log.username=z2_5x9logb
|
#jdbc.log.username=z2_5x9logb
|
||||||
##jdbc.log.key=pHl+0udycGQWNZcN68Sv9A==
|
##jdbc.log.key=pHl+0udycGQWNZcN68Sv9A==
|
||||||
##jdbc.log.password=Z/pVMDXcWNxzVGAX0yRp3Q==
|
##jdbc.log.password=Z/pVMDXcWNxzVGAX0yRp3Q==
|
||||||
#============================================
|
#============================================
|
||||||
bonecp.idleMaxAgeInMinutes=60
|
bonecp.idleMaxAgeInMinutes=60
|
||||||
bonecp.idleConnectionTestPeriodInMinutes=240
|
bonecp.idleConnectionTestPeriodInMinutes=240
|
||||||
bonecp.maxConnectionsPerPartition=50
|
bonecp.maxConnectionsPerPartition=50
|
||||||
bonecp.minConnectionsPerPartition=10
|
bonecp.minConnectionsPerPartition=10
|
||||||
bonecp.partitionCount=3
|
bonecp.partitionCount=3
|
||||||
bonecp.acquireIncrement=5
|
bonecp.acquireIncrement=5
|
||||||
bonecp.statementsCacheSize=100
|
bonecp.statementsCacheSize=100
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
############################################################################################################################################
|
############################################################################################################################################
|
||||||
#数据中心hive接口配置
|
#数据中心hive接口配置
|
||||||
############################################################################################################################################
|
############################################################################################################################################
|
||||||
|
|
||||||
#A版日志库
|
#A版日志库
|
||||||
jdbc.hive.driver=org.apache.hive.jdbc.HiveDriver
|
jdbc.hive.driver=org.apache.hive.jdbc.HiveDriver
|
||||||
#元辰鑫内网
|
#元辰鑫内网
|
||||||
jdbc.hive.url=jdbc:hive2://10.0.6.202:10000/maat
|
jdbc.hive.url=jdbc:hive2://10.0.6.202:10000/maat
|
||||||
#华严
|
#华严
|
||||||
#jdbc.hive.url=jdbc:hive2://192.168.11.243:2181,192.168.10.76:2181,192.168.10.77:2181/maat;serviceDiscoveryMode=zooKeeper;zooKeeperNamespace=hiveserver2
|
#jdbc.hive.url=jdbc:hive2://192.168.11.243:2181,192.168.10.76:2181,192.168.10.77:2181/maat;serviceDiscoveryMode=zooKeeper;zooKeeperNamespace=hiveserver2
|
||||||
#元辰鑫外网
|
#元辰鑫外网
|
||||||
#jdbc.hive.url=jdbc:hive2://192.168.10.22:10000/maat
|
#jdbc.hive.url=jdbc:hive2://192.168.10.22:10000/maat
|
||||||
#亦庄测试环境
|
#亦庄测试环境
|
||||||
#jdbc.hive.url=jdbc:hive2://192.168.10.216:10000/maat
|
#jdbc.hive.url=jdbc:hive2://192.168.10.216:10000/maat
|
||||||
#亦庄测试环境高可用集群连接,注意使用此种方法需要配置hosts,主机名与ip的对应关系
|
#亦庄测试环境高可用集群连接,注意使用此种方法需要配置hosts,主机名与ip的对应关系
|
||||||
#jdbc.hive.url=jdbc:hive2://192.168.10.216:2181,192.168.10.217:2181,192.168.10.218:2181/maat;serviceDiscoveryMode=zooKeeper;zooKeeperNamespace=hiveserver2
|
#jdbc.hive.url=jdbc:hive2://192.168.10.216:2181,192.168.10.217:2181,192.168.10.218:2181/maat;serviceDiscoveryMode=zooKeeper;zooKeeperNamespace=hiveserver2
|
||||||
#亦庄演示环境高可用集群连接,注意使用此种方法需要配置hosts,主机名与ip的对应关系
|
#亦庄演示环境高可用集群连接,注意使用此种方法需要配置hosts,主机名与ip的对应关系
|
||||||
#jdbc.hive.url=jdbc:hive2://10.3.48.2:2181,10.3.48.3:2181,10.3.48.4:2181/maat;serviceDiscoveryMode=zooKeeper;zooKeeperNamespace=hiveserver2
|
#jdbc.hive.url=jdbc:hive2://10.3.48.2:2181,10.3.48.3:2181,10.3.48.4:2181/maat;serviceDiscoveryMode=zooKeeper;zooKeeperNamespace=hiveserver2
|
||||||
jdbc.hive.username=xa_z2_mesa
|
jdbc.hive.username=xa_z2_mesa
|
||||||
jdbc.hive.key=aC/8fTC9vfPVhCk+CDzbAQ==
|
jdbc.hive.key=aC/8fTC9vfPVhCk+CDzbAQ==
|
||||||
#加密后密码
|
#加密后密码
|
||||||
jdbc.hive.password=V3GyFlG8Mg01bTt8ykFVaA==
|
jdbc.hive.password=V3GyFlG8Mg01bTt8ykFVaA==
|
||||||
#实际密码
|
#实际密码
|
||||||
#jdbc.hiveA.password=123!@#qwe
|
#jdbc.hiveA.password=123!@#qwe
|
||||||
|
|
||||||
bonecp.hive.idleMaxAgeInMinutes=60
|
bonecp.hive.idleMaxAgeInMinutes=60
|
||||||
bonecp.hive.idleConnectionTestPeriodInMinutes=240
|
bonecp.hive.idleConnectionTestPeriodInMinutes=240
|
||||||
bonecp.hive.maxConnectionsPerPartition=20
|
bonecp.hive.maxConnectionsPerPartition=20
|
||||||
bonecp.hive.minConnectionsPerPartition=10
|
bonecp.hive.minConnectionsPerPartition=10
|
||||||
bonecp.hive.partitionCount=3
|
bonecp.hive.partitionCount=3
|
||||||
bonecp.hive.acquireIncrement=5
|
bonecp.hive.acquireIncrement=5
|
||||||
bonecp.hive.statementsCacheSize=100
|
bonecp.hive.statementsCacheSize=100
|
||||||
|
|
||||||
|
|
||||||
#################日志查询clickhouse数据源信息#############
|
#################日志查询clickhouse数据源信息#############
|
||||||
|
|
||||||
jdbc.clickhouse.driver=ru.yandex.clickhouse.ClickHouseDriver
|
jdbc.clickhouse.driver=ru.yandex.clickhouse.ClickHouseDriver
|
||||||
#域名测试环境
|
#域名测试环境
|
||||||
jdbc.clickhouse.url=jdbc:clickhouse://clickhouse.baifendian.com:80/k18_ods
|
jdbc.clickhouse.url=jdbc:clickhouse://clickhouse.baifendian.com:80/k18_ods
|
||||||
#亦庄演示环境
|
#亦庄演示环境
|
||||||
#jdbc.clickhouse.url=jdbc:clickhouse://10.3.45.5:8123/k18_ods
|
#jdbc.clickhouse.url=jdbc:clickhouse://10.3.45.5:8123/k18_ods
|
||||||
jdbc.clickhouse.username=
|
jdbc.clickhouse.username=
|
||||||
jdbc.clickhouse.key=
|
jdbc.clickhouse.key=
|
||||||
jdbc.clickhouse.password=
|
jdbc.clickhouse.password=
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#########################配置日志查询使用druid连接池#########################################
|
#########################配置日志查询使用druid连接池#########################################
|
||||||
#配置初始化连接池数量
|
#配置初始化连接池数量
|
||||||
druid.log.initialSize=5
|
druid.log.initialSize=5
|
||||||
#配置最小连接池数量
|
#配置最小连接池数量
|
||||||
druid.log.minIdle=1
|
druid.log.minIdle=1
|
||||||
#配置最大连接池数量
|
#配置最大连接池数量
|
||||||
druid.log.maxActive=200
|
druid.log.maxActive=200
|
||||||
# 配置获取连接等待超时的时间 单位毫秒
|
# 配置获取连接等待超时的时间 单位毫秒
|
||||||
druid.log.maxWait=600000
|
druid.log.maxWait=600000
|
||||||
#使用非公平锁
|
#使用非公平锁
|
||||||
druid.log.useUnfairLock=true
|
druid.log.useUnfairLock=true
|
||||||
#配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
|
#配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
|
||||||
druid.log.timeBetweenEvictionRunsMillis=60000
|
druid.log.timeBetweenEvictionRunsMillis=60000
|
||||||
#配置一个连接在池中最小生存的时间，单位是毫秒
|
#配置一个连接在池中最小生存的时间，单位是毫秒
|
||||||
druid.log.minEvictableIdleTimeMillis=300000
|
druid.log.minEvictableIdleTimeMillis=300000
|
||||||
#用来检测连接是否有效的sql，要求是一个查询语句,下面是hive的
|
#用来检测连接是否有效的sql，要求是一个查询语句,下面是hive的
|
||||||
druid.log.hive.validationQuery=select unix_timestamp()
|
druid.log.hive.validationQuery=select unix_timestamp()
|
||||||
#用来检测连接是否有效的sql，要求是一个查询语句,下面是clickhouse的
|
#用来检测连接是否有效的sql，要求是一个查询语句,下面是clickhouse的
|
||||||
druid.log.clickHouse.validationQuery=show tables
|
druid.log.clickHouse.validationQuery=show tables
|
||||||
#申请连接的时候检测，如果空闲时间大于timeBetweenEvictionRunsMillis，执行validationQuery检测连接是否有效
|
#申请连接的时候检测，如果空闲时间大于timeBetweenEvictionRunsMillis，执行validationQuery检测连接是否有效
|
||||||
druid.log.testWhileIdle=true
|
druid.log.testWhileIdle=true
|
||||||
#申请连接时执行validationQuery检测连接是否有效
|
#申请连接时执行validationQuery检测连接是否有效
|
||||||
druid.log.testOnBorrow=true
|
druid.log.testOnBorrow=true
|
||||||
#归还连接时执行validationQuery检测连接是否有效
|
#归还连接时执行validationQuery检测连接是否有效
|
||||||
druid.log.testOnReturn=false
|
druid.log.testOnReturn=false
|
||||||
#打开PSCache，并且指定每个连接上PSCache的大小
|
#打开PSCache，并且指定每个连接上PSCache的大小
|
||||||
druid.log.poolPreparedStatements=true
|
druid.log.poolPreparedStatements=true
|
||||||
#要启用PSCache，必须配置大于0，当大于0时，poolPreparedStatements自动触发修改为true。在Druid中，不会存在Oracle下PSCache占用内存过多的问题，可以把这个数值配置大一些，比如说100
|
#要启用PSCache，必须配置大于0，当大于0时，poolPreparedStatements自动触发修改为true。在Druid中，不会存在Oracle下PSCache占用内存过多的问题，可以把这个数值配置大一些，比如说100
|
||||||
druid.log.maxOpenPreparedStatements=100
|
druid.log.maxOpenPreparedStatements=100
|
||||||
#配置监控统计拦截的filters，去掉后监控界面sql无法统计
|
#配置监控统计拦截的filters，去掉后监控界面sql无法统计
|
||||||
druid.log.filters=stat
|
druid.log.filters=stat
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#####################################################################################################################################
|
#####################################################################################################################################
|
||||||
##redis连接
|
##redis连接
|
||||||
#####################################################################################################################################
|
#####################################################################################################################################
|
||||||
#元辰鑫内网
|
#元辰鑫内网
|
||||||
redis.host=10.0.6.249
|
redis.host=10.0.6.249
|
||||||
#华严
|
#华严
|
||||||
#redis.host=192.168.11.243
|
#redis.host=192.168.11.243
|
||||||
#元辰鑫外网
|
#元辰鑫外网
|
||||||
#redis.host=192.168.10.205
|
#redis.host=192.168.10.205
|
||||||
#亦庄测试环境
|
#亦庄测试环境
|
||||||
#redis.host=192.168.10.215
|
#redis.host=192.168.10.215
|
||||||
#亦庄演示环境
|
#亦庄演示环境
|
||||||
#redis.host=10.3.34.1
|
#redis.host=10.3.34.1
|
||||||
redis.port=6379
|
redis.port=6379
|
||||||
redis.pass=
|
redis.pass=
|
||||||
redis.maxIdle=5
|
redis.maxIdle=5
|
||||||
redis.maxTotal=250
|
redis.maxTotal=250
|
||||||
redis.maxWaitMillis=100000
|
redis.maxWaitMillis=100000
|
||||||
redis.testOnBorrow=true
|
redis.testOnBorrow=true
|
||||||
redis.testOnReturn=true
|
redis.testOnReturn=true
|
||||||
#客户端超时时间单位是毫秒
|
#客户端超时时间单位是毫秒
|
||||||
redis.timeout=100000
|
redis.timeout=100000
|
||||||
#用于 redis.clients.jedis.JedisCluster.JedisCluster(Set<HostAndPort>, int, int, GenericObjectPoolConfig) 第三个参数 maxRedirections
|
#用于 redis.clients.jedis.JedisCluster.JedisCluster(Set<HostAndPort>, int, int, GenericObjectPoolConfig) 第三个参数 maxRedirections
|
||||||
#默认值是5
|
#默认值是5
|
||||||
#一般当此值设置过大时，容易报：Too many Cluster redirections
|
#一般当此值设置过大时，容易报：Too many Cluster redirections
|
||||||
redis.maxRedirects=3
|
redis.maxRedirects=3
|
||||||
|
|
||||||
|
|
||||||
cluster1.host.port=192.168.10.205:7031
|
cluster1.host.port=192.168.10.205:7031
|
||||||
cluster2.host.port=192.168.10.205:7032
|
cluster2.host.port=192.168.10.205:7032
|
||||||
cluster3.host.port=192.168.10.205:7033
|
cluster3.host.port=192.168.10.205:7033
|
||||||
cluster4.host.port=192.168.10.205:7034
|
cluster4.host.port=192.168.10.205:7034
|
||||||
cluster5.host.port=192.168.10.205:7035
|
cluster5.host.port=192.168.10.205:7035
|
||||||
Reference in New Issue
Block a user