瀏覽代碼

Merge remote-tracking branch 'origin/v2.1.1' into v2.1.1

miaolijing 3 年之前
父節點
當前提交
fe4999e291

+ 1 - 1
src/main/java/com/persagy/apm/diagnose/config/RedisConfig.java

@@ -103,7 +103,7 @@ public class RedisConfig {
 	/**
 	 * 索引1
 	 */
-	@Value("${spring.redis.database.ten}")
+	@Value("${spring.redis.database.fourteen:14}")
 	private Integer databaseOne;
 
 	@Value("${integrated.redisson.password}")

+ 0 - 2
src/main/java/com/persagy/apm/diagnose/indicatorrecord/service/impl/MonitorIndicatorRecordServiceImpl.java

@@ -393,8 +393,6 @@ public class MonitorIndicatorRecordServiceImpl implements IMonitorIndicatorRecor
             }
             JSONArray sendArray = CollectDataUtil.batchBuildSendJsonParam(sendTimeKeyAndDataList, alarmItemCode);
             rabbitConfig.sendMsg(sendArray);
-            //          String sentValue = CollectDataUtil.batchBuildSendParam(sendTimeKeyAndDataList,alarmItemCode);
-            //AlarmWebSocketServer.sendMsgToClients(projectDTO.getProjectId(), sentValue);
             log.error("指标发送报表服务数据:" + projectDTO.getProjectId() + ";" + sendArray);
             configItemSendTimeDTO.setLastSendTime(endTime);
             configItemSendTimeDTO.setUpdateTime(new Date());