From 300ee9914056f68609c556d41fa1384045fe5667 Mon Sep 17 00:00:00 2001 From: renkaige Date: Mon, 15 Oct 2018 17:43:52 +0800 Subject: [PATCH] =?UTF-8?q?1:=E8=A7=A3=E5=86=B33a=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E4=B8=AD=E7=A9=BA=E6=8C=87=E9=92=88=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=202:=E8=A7=A3=E5=86=B3=E5=90=91minio=E4=B8=AD?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6=E6=97=B6=E4=BC=A0=E5=85=A5?= =?UTF-8?q?=E7=9A=84content-type=E4=B8=BA=E6=96=87=E4=BB=B6=E5=90=8E?= =?UTF-8?q?=E7=BC=80=E5=90=8D=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../restful/ConfigSourcesController.java | 4 +-- .../java/com/nis/web/dao/DfLogSearchDao.xml | 2 +- .../com/nis/web/task/SyncRedisToCluster.java | 28 +++++++++++-------- 3 files changed, 19 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/nis/web/controller/restful/ConfigSourcesController.java b/src/main/java/com/nis/web/controller/restful/ConfigSourcesController.java index 7bbd1bb..21d3944 100644 --- a/src/main/java/com/nis/web/controller/restful/ConfigSourcesController.java +++ b/src/main/java/com/nis/web/controller/restful/ConfigSourcesController.java @@ -292,7 +292,7 @@ public class ConfigSourcesController extends BaseRestController { String ext = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".") + 1); logger.info("-----------------调用接口上传文件---------------"); if(Constants.IS_USE_MINIO){ - filePath = MinioUtil.uploadFile(file.getInputStream(), file.getOriginalFilename(), ext); + filePath = MinioUtil.uploadFile(file.getInputStream(), file.getOriginalFilename(), file.getContentType()); }else{ FastDFSFile fdsfile = new FastDFSFile(file.getBytes(), file.getOriginalFilename(), ext); // NameValuePair[] meta_list = new NameValuePair[5]; @@ -361,7 +361,7 @@ public class ConfigSourcesController extends BaseRestController { String ext = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".") + 1); logger.info("-----------------调用接口上传文件---------------"); if(Constants.IS_USE_MINIO){ - filePath = MinioUtil.uploadFile(file.getInputStream(), file.getOriginalFilename(), ext); + filePath = MinioUtil.uploadFile(file.getInputStream(), file.getOriginalFilename(), file.getContentType()); }else{ FastDFSFile fdsfile = new FastDFSFile(file.getBytes(), file.getOriginalFilename(), ext); // NameValuePair[] meta_list = new NameValuePair[5]; diff --git a/src/main/java/com/nis/web/dao/DfLogSearchDao.xml b/src/main/java/com/nis/web/dao/DfLogSearchDao.xml index c2c847d..de4a2e1 100644 --- a/src/main/java/com/nis/web/dao/DfLogSearchDao.xml +++ b/src/main/java/com/nis/web/dao/DfLogSearchDao.xml @@ -1165,7 +1165,7 @@ - + diff --git a/src/main/java/com/nis/web/task/SyncRedisToCluster.java b/src/main/java/com/nis/web/task/SyncRedisToCluster.java index 9fcbf5c..f189669 100644 --- a/src/main/java/com/nis/web/task/SyncRedisToCluster.java +++ b/src/main/java/com/nis/web/task/SyncRedisToCluster.java @@ -45,17 +45,21 @@ public class SyncRedisToCluster { String clusterMaatVersionStr = jedisCluster.get("MAAT_VERSION"); String redisMaatVersionStr = JedisUtils.get("MAAT_VERSION", redisStatisticsRealDBIndex); if (clusterMaatVersionStr != null && !clusterMaatVersionStr.trim().equals("")) { - Integer clusterMaatVersion = Integer.valueOf(clusterMaatVersionStr); - Integer redisMaatVersion = Integer.valueOf(redisMaatVersionStr); - if (redisMaatVersion < clusterMaatVersion) {// 如果主从库比集群库的版本号小则下发全量 - logger.info("redis集群中的MAAT_VERSION为大于配置库中的MAAT_VERSION,开始执行全量同步"); - syncAllData(redisMaatVersionStr); - } else if (redisMaatVersion > clusterMaatVersion) {// 获取增量的数据 - logger.info("redis集群中的MAAT_VERSION为小于配置库中的MAAT_VERSION,开始执行增量同步,score是{}-{}", clusterMaatVersion, - +redisMaatVersion); - syncData(clusterMaatVersion.doubleValue(), redisMaatVersion.doubleValue(), redisMaatVersionStr); + if (redisMaatVersionStr != null && !redisMaatVersionStr.trim().equals("")) { + Integer clusterMaatVersion = Integer.valueOf(clusterMaatVersionStr); + Integer redisMaatVersion = Integer.valueOf(redisMaatVersionStr); + if (redisMaatVersion < clusterMaatVersion) {// 如果主从库比集群库的版本号小则下发全量 + logger.info("redis集群中的MAAT_VERSION为大于配置库中的MAAT_VERSION,开始执行全量同步"); + syncAllData(redisMaatVersionStr); + } else if (redisMaatVersion > clusterMaatVersion) {// 获取增量的数据 + logger.info("redis集群中的MAAT_VERSION为小于配置库中的MAAT_VERSION,开始执行增量同步,score是{}-{}", + clusterMaatVersion, +redisMaatVersion); + syncData(clusterMaatVersion.doubleValue(), redisMaatVersion.doubleValue(), redisMaatVersionStr); + } else { + logger.info("redis集群中的MAAT_VERSION与配置库中的MAAT_VERSION相等,暂不执行配置同步操作"); + } } else { - logger.info("redis集群中的MAAT_VERSION与配置库中的MAAT_VERSION相等,暂不执行配置同步操作"); + logger.info("redis-{}号库中MAAT_VERSION为null,说明没有配置,暂时不执行配置同步",redisStatisticsRealDBIndex); } } else { logger.info("redis集群中的MAAT_VERSION为null,开始执行全量同步"); @@ -70,7 +74,7 @@ public class SyncRedisToCluster { try { Map clusterNodes = jedisCluster.getClusterNodes(); for (Map.Entry entry : clusterNodes.entrySet()) { - + Jedis jedis = entry.getValue().getResource(); // 判断非从节点(因为若主从复制，从节点会跟随主节点的变化而变化) if (!jedis.info("replication").contains("role:slave")) { @@ -95,7 +99,7 @@ public class SyncRedisToCluster { .toArray(new String[integerListEntry.getValue().size()])); // jedisCluster.del(integerListEntry.getValue() // .toArray(new String[integerListEntry.getValue().size()])); - logger.debug("从redis集群{}删除key={},成功", entry.getKey(),integerListEntry.getValue()); + logger.debug("从redis集群{}删除key={},成功", entry.getKey(), integerListEntry.getValue()); } } }