Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
tangcongfa_v@didichuxing.com
2021-05-18 16:07:40 +08:00
39 changed files with 264 additions and 119 deletions

View File

@@ -86,8 +86,8 @@ public class GatewayConfigServiceImpl implements GatewayConfigService {
GatewayConfigDO configDO = null;
try {
configDO = gatewayConfigDao.getByConfigTypeAndName(
GatewayConfigKeyEnum.SD_APP_ID_RATE.getConfigType(),
GatewayConfigKeyEnum.SD_APP_ID_RATE.getConfigName()
GatewayConfigKeyEnum.SD_APP_RATE.getConfigType(),
GatewayConfigKeyEnum.SD_APP_RATE.getConfigName()
);
if (ValidateUtils.isNull(configDO) || configDO.getVersion() <= requestVersion) {
return new AppRateConfig(Long.MIN_VALUE, null);

View File

@@ -91,7 +91,7 @@ public class BrokerServiceImpl implements BrokerService {
for (BrokerDO brokerDO : brokerDOList) {
PeakFlowStatusEnum peakFlowStatus = getPeakFlowStatus(brokerDO.getMaxAvgBytesIn(), peakFlow);
peakFlowStatusMap.put(
peakFlowStatus.code,
peakFlowStatus.getCode(),
peakFlowStatusMap.getOrDefault(peakFlowStatus.getCode(), 0) + 1
);
}