Merge branch 'feature' into 'dev'

升级es账号

See merge request !113

src/main/java/com/zhiwei/brandkbs2/dao/impl/EventDaoImpl.java

@@ -267,9 +267,6 @@ public class EventDaoImpl extends BaseMongoDaoImpl<Event> implements EventDao {
         }
         for (String eventId : eventDataDao.findEventIdsByChannelFid(channelIndex.getFid(), startTime, endTime)) {
             Event event = findOneById(eventId);
-            if (event == null) {
-                System.out.println("error:"+eventId);
-            }
             Long mapKey = Tools.truncDate(event.getStartTime(), pattern);
             res.putIfAbsent(mapKey,new ArrayList<>());
             res.get(mapKey).add(event);

src/main/resources/application-dev.properties

@@ -32,8 +32,10 @@ secondary.uri=mongodb://qbjcuser:qbjc1q2w3e4r@192.168.0.150:27017,192.168.0.151:
 es.clusterNodes=192.168.0.130:9200
 es.clusterName=zhiweidata-new-es
 es.httpClusterNodes=192.168.0.130:9200:qbjc-back:yuqing.zhiweidata.com,192.168.0.51:9400:elastic:qWxZRW42OHkuOhmF5AXX
-es.username=brandkbs2_test
-es.password=3vh65l$i6qQA
+#es.username=brandkbs2_test
+#es.password=3vh65l$i6qQA
+es.username=joker
+es.password=jokerdevops
 es.index.test = true
 
 #channel-index

src/main/resources/application-local.properties

@@ -34,8 +34,10 @@ secondary.uri=mongodb://qbjcuser:qbjc1q2w3e4r@202.107.192.94:17152/qbjc?authSour
 es.clusterNodes=202.107.192.94:1443
 es.clusterName=zhiweidata-new-es
 es.httpClusterNodes=202.107.192.94:1443:brandkbs2:3vh65l$i6qQA
-es.username=brandkbs2_test
-es.password=3vh65l$i6qQA
+#es.username=brandkbs2_test jokerdevops
+#es.password=3vh65l$i6qQA
+es.username=joker
+es.password=jokerdevops
 es.index.test = true
 
 #channel-index

src/main/resources/application-prod.properties

@@ -32,8 +32,10 @@ secondary.uri=mongodb://qbjcuser:qbjc1q2w3e4r@192.168.0.150:27017,192.168.0.151:
 es.clusterNodes=192.168.0.130:9200
 es.clusterName=zhiweidata-new-es
 es.httpClusterNodes=192.168.0.130:9200:qbjc-back:yuqing.zhiweidata.com,192.168.0.51:9400:elastic:qWxZRW42OHkuOhmF5AXX
-es.username=brandkbs2_test
-es.password=3vh65l$i6qQA
+#es.username=brandkbs2_test
+#es.password=3vh65l$i6qQA
+es.username=joker
+es.password=jokerdevops
 es.index.test = true
 
 #channel-index