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

yun-zuoyi
汪云昊 5 years ago
commit 0dd43b89e9

@ -696,12 +696,12 @@ public class SysTaskPlanController extends CoreBaseController {
} }
private void putTaskPlanCache(SysTaskPlan plan){ private void putTaskPlanCache(SysTaskPlan plan){
String redisKey = CommonConstWords.REDIS_PREFIX_TASK_LOG_LEVEL + ":" + plan.getGroupName() + "." + plan.getName(); String redisKey = CommonConstWords.REDIS_PREFIX_TASK_LOG_LEVEL + ":" + plan.getName() + "." + plan.getGroupName();
redisRes.putObject(redisKey, plan.getLogLevelVal(), -1); redisRes.putObject(redisKey, plan.getLogLevelVal(), -1);
} }
private void removeTaskPlanCache(SysTaskPlan plan){ private void removeTaskPlanCache(SysTaskPlan plan){
String redisKey = CommonConstWords.REDIS_PREFIX_TASK_LOG_LEVEL + ":" + plan.getGroupName() + "." + plan.getName(); String redisKey = CommonConstWords.REDIS_PREFIX_TASK_LOG_LEVEL + ":" + plan.getName() + "." + plan.getGroupName();
redisRes.deleteKey(redisKey); redisRes.deleteKey(redisKey);
} }

@ -430,7 +430,7 @@ public class SystemInitService implements ISystemInitService {
List<SysTaskPlan> sysTaskPlanList = sysTaskPlanService.listSysTaskPlan(); List<SysTaskPlan> sysTaskPlanList = sysTaskPlanService.listSysTaskPlan();
if (CollectionUtils.isNotEmpty(sysTaskPlanList)){ if (CollectionUtils.isNotEmpty(sysTaskPlanList)){
for (SysTaskPlan plan : sysTaskPlanList) { for (SysTaskPlan plan : sysTaskPlanList) {
String redisKey =CommonConstWords.REDIS_PREFIX_TASK_LOG_LEVEL + ":" + plan.getGroupName() + "." + plan.getName(); String redisKey = CommonConstWords.REDIS_PREFIX_TASK_LOG_LEVEL + ":" + plan.getName() + "." + plan.getGroupName();
redisRes.putObject(redisKey, plan.getLogLevelVal(), -1); redisRes.putObject(redisKey, plan.getLogLevelVal(), -1);
} }
} }

Loading…
Cancel
Save