diff --git a/src/backend/job-analysis/service-job-analysis/src/main/java/com/tencent/bk/job/analysis/task/statistics/StatisticsTaskScheduler.java b/src/backend/job-analysis/service-job-analysis/src/main/java/com/tencent/bk/job/analysis/task/statistics/StatisticsTaskScheduler.java index 1c401300b8..57e839652a 100644 --- a/src/backend/job-analysis/service-job-analysis/src/main/java/com/tencent/bk/job/analysis/task/statistics/StatisticsTaskScheduler.java +++ b/src/backend/job-analysis/service-job-analysis/src/main/java/com/tencent/bk/job/analysis/task/statistics/StatisticsTaskScheduler.java @@ -446,7 +446,7 @@ public void schedule() { findStatisticsTask(); } //根据任务各自周期进行调度 - stopWatch.start("currentAuditContext all statistic tasks time consuming"); + stopWatch.start("current all statistic tasks time consuming"); //调度新线程跑分析任务 for (IStatisticsTask iStatisticsTask : statisticsTaskList) { String taskName = diff --git a/src/backend/job-analysis/service-job-analysis/src/main/java/com/tencent/bk/job/analysis/task/statistics/task/PastStatisticsMakeupTask.java b/src/backend/job-analysis/service-job-analysis/src/main/java/com/tencent/bk/job/analysis/task/statistics/task/PastStatisticsMakeupTask.java index a851724dad..6476095249 100644 --- a/src/backend/job-analysis/service-job-analysis/src/main/java/com/tencent/bk/job/analysis/task/statistics/task/PastStatisticsMakeupTask.java +++ b/src/backend/job-analysis/service-job-analysis/src/main/java/com/tencent/bk/job/analysis/task/statistics/task/PastStatisticsMakeupTask.java @@ -156,7 +156,7 @@ public void run() { } } } else { - log.info("Use currentAuditContext single thread to run makeup tasks"); + log.info("Use current single thread to run makeup tasks"); for (WatchableTask callable : callableList) { try { pastStatisticTaskFutureMap.put( diff --git a/src/backend/job-execute/service-job-execute/src/main/java/com/tencent/bk/job/execute/config/ExecutorConfiguration.java b/src/backend/job-execute/service-job-execute/src/main/java/com/tencent/bk/job/execute/config/ExecutorConfiguration.java index ee3f96a6b1..85c9aea919 100644 --- a/src/backend/job-execute/service-job-execute/src/main/java/com/tencent/bk/job/execute/config/ExecutorConfiguration.java +++ b/src/backend/job-execute/service-job-execute/src/main/java/com/tencent/bk/job/execute/config/ExecutorConfiguration.java @@ -84,7 +84,7 @@ public ThreadPoolExecutor localFilePrepareExecutor(LocalFileConfigForExecute loc //使用请求的线程直接拉取数据 log.error( "download localupload file from artifactory runnable rejected," + - " use currentAuditContext thread({}), plz add more threads", + " use current thread({}), plz add more threads", Thread.currentThread().getName()); r.run(); } diff --git a/src/backend/job-execute/service-job-execute/src/main/java/com/tencent/bk/job/execute/engine/listener/GseStepEventHandler.java b/src/backend/job-execute/service-job-execute/src/main/java/com/tencent/bk/job/execute/engine/listener/GseStepEventHandler.java index 509e03757f..a8dcd04723 100644 --- a/src/backend/job-execute/service-job-execute/src/main/java/com/tencent/bk/job/execute/engine/listener/GseStepEventHandler.java +++ b/src/backend/job-execute/service-job-execute/src/main/java/com/tencent/bk/job/execute/engine/listener/GseStepEventHandler.java @@ -414,7 +414,7 @@ private void skipStep(StepInstanceDTO stepInstance) { TaskInstanceDTO taskInstance = taskInstanceService.getTaskInstance(stepInstance.getTaskInstanceId()); if (!(taskInstance.getCurrentStepInstanceId() == stepInstanceId)) { - log.warn("Only currentAuditContext running step is support for skipping, stepInstanceId={}", stepInstanceId); + log.warn("Only current running step is support for skipping, stepInstanceId={}", stepInstanceId); return; } diff --git a/src/backend/job-file-gateway/service-job-file-gateway/src/main/java/com/tencent/bk/job/file_gateway/api/web/WebFileSourceResourceImpl.java b/src/backend/job-file-gateway/service-job-file-gateway/src/main/java/com/tencent/bk/job/file_gateway/api/web/WebFileSourceResourceImpl.java index c473ade42e..e5f4dd95fb 100644 --- a/src/backend/job-file-gateway/service-job-file-gateway/src/main/java/com/tencent/bk/job/file_gateway/api/web/WebFileSourceResourceImpl.java +++ b/src/backend/job-file-gateway/service-job-file-gateway/src/main/java/com/tencent/bk/job/file_gateway/api/web/WebFileSourceResourceImpl.java @@ -126,11 +126,12 @@ public Response checkAlias(String username, @Override @AuditEntry(actionId = ActionId.CREATE_FILE_SOURCE) - public Response saveFileSource(String username, - AppResourceScope appResourceScope, - String scopeType, - String scopeId, - @AuditRequestBody FileSourceCreateUpdateReq fileSourceCreateUpdateReq) { + public Response saveFileSource( + String username, + AppResourceScope appResourceScope, + String scopeType, + String scopeId, + @AuditRequestBody FileSourceCreateUpdateReq fileSourceCreateUpdateReq) { try { Long appId = appResourceScope.getAppId(); checkParam(appId, fileSourceCreateUpdateReq, true); @@ -150,11 +151,12 @@ public Response saveFileSource(String username, @Override @AuditEntry(actionId = ActionId.MANAGE_FILE_SOURCE) - public Response updateFileSource(String username, - AppResourceScope appResourceScope, - String scopeType, - String scopeId, - @AuditRequestBody FileSourceCreateUpdateReq fileSourceCreateUpdateReq) { + public Response updateFileSource( + String username, + AppResourceScope appResourceScope, + String scopeType, + String scopeId, + @AuditRequestBody FileSourceCreateUpdateReq fileSourceCreateUpdateReq) { Long appId = appResourceScope.getAppId(); log.info("Input=({},{},{})", username, appId, fileSourceCreateUpdateReq); FileSourceDTO fileSourceDTO = buildFileSourceDTO(username, appId, fileSourceCreateUpdateReq); diff --git a/src/backend/job-manage/boot-job-manage/src/test/java/com/tencent/bk/job/manage/dao/TagDAOIntegrationTest.java b/src/backend/job-manage/boot-job-manage/src/test/java/com/tencent/bk/job/manage/dao/TagDAOIntegrationTest.java index eb4eb380b2..76cdcfeb7c 100644 --- a/src/backend/job-manage/boot-job-manage/src/test/java/com/tencent/bk/job/manage/dao/TagDAOIntegrationTest.java +++ b/src/backend/job-manage/boot-job-manage/src/test/java/com/tencent/bk/job/manage/dao/TagDAOIntegrationTest.java @@ -151,7 +151,7 @@ public void updateTagById() { assertThat(result.getDescription()).isEqualTo(updateTag.getDescription()); - // Tag not exist in currentAuditContext application + // Tag not exist in current application updateTag.setAppId(1L); assertThat(tagDAO.updateTagById(updateTag)).isFalse(); // Tag Not exist diff --git a/src/backend/job-manage/service-job-manage/src/main/java/com/tencent/bk/job/manage/common/TopologyHelper.java b/src/backend/job-manage/service-job-manage/src/main/java/com/tencent/bk/job/manage/common/TopologyHelper.java index 86445e7e18..6726223beb 100644 --- a/src/backend/job-manage/service-job-manage/src/main/java/com/tencent/bk/job/manage/common/TopologyHelper.java +++ b/src/backend/job-manage/service-job-manage/src/main/java/com/tencent/bk/job/manage/common/TopologyHelper.java @@ -313,7 +313,7 @@ private void processTopologyNodeName( if (nodeTypeNameMap == null) { throw new RuntimeException("Uninitialized node type name map!"); } - // Check and init node name map for currentAuditContext type + // Check and init node name map for current type Map nodeNameMap = nodeTypeNameMap.get(topology.getObjectId()); if (nodeNameMap == null) { nodeNameMap = new ConcurrentHashMap<>(1); diff --git a/src/backend/job-manage/service-job-manage/src/main/java/com/tencent/bk/job/manage/service/impl/AccountServiceImpl.java b/src/backend/job-manage/service-job-manage/src/main/java/com/tencent/bk/job/manage/service/impl/AccountServiceImpl.java index 8f65a3d906..ac16970457 100644 --- a/src/backend/job-manage/service-job-manage/src/main/java/com/tencent/bk/job/manage/service/impl/AccountServiceImpl.java +++ b/src/backend/job-manage/service-job-manage/src/main/java/com/tencent/bk/job/manage/service/impl/AccountServiceImpl.java @@ -115,7 +115,7 @@ public AccountDTO createAccount(AccountDTO account) throws ServiceException { throw new NotFoundException(ErrorCode.DB_SYSTEM_ACCOUNT_IS_INVALID); } if (!dbSystemAccount.getAppId().equals(account.getAppId())) { - log.warn("DB related system account is not in currentAuditContext app, systemAccountId={}, " + + log.warn("DB related system account is not in current app, systemAccountId={}, " + "systemAccountAppId={}" , account.getDbSystemAccountId(), dbSystemAccount.getAppId()); throw new NotFoundException(ErrorCode.DB_SYSTEM_ACCOUNT_IS_INVALID); @@ -235,7 +235,8 @@ public AccountDTO updateAccount(String username, AccountDTO updateAccount) throw if (StringUtils.isNotEmpty(updateAccount.getPassword())) { updateAccount.setPassword(encryptor.encrypt(updateAccount.getPassword())); } - if (updateAccount.getCategory() == AccountCategoryEnum.DB && StringUtils.isNotEmpty(updateAccount.getDbPassword())) { + if (updateAccount.getCategory() == AccountCategoryEnum.DB + && StringUtils.isNotEmpty(updateAccount.getDbPassword())) { updateAccount.setDbPassword(encryptor.encrypt(updateAccount.getPassword())); } // 账号用途、账号类型、账号名称不允许修改 diff --git a/src/backend/job-manage/service-job-manage/src/main/java/com/tencent/bk/job/manage/service/impl/DangerousRuleServiceImpl.java b/src/backend/job-manage/service-job-manage/src/main/java/com/tencent/bk/job/manage/service/impl/DangerousRuleServiceImpl.java index 05a5c81243..931e2347e6 100644 --- a/src/backend/job-manage/service-job-manage/src/main/java/com/tencent/bk/job/manage/service/impl/DangerousRuleServiceImpl.java +++ b/src/backend/job-manage/service-job-manage/src/main/java/com/tencent/bk/job/manage/service/impl/DangerousRuleServiceImpl.java @@ -78,7 +78,7 @@ public DangerousRuleDTO getDangerousRuleById(Long id) { public DangerousRuleDTO createDangerousRule(String username, AddOrUpdateDangerousRuleReq req) { int scriptType = DangerousRuleDTO.encodeScriptType(req.getScriptTypeList()); int maxPriority = dangerousRuleDAO.getMaxPriority(); - log.info(String.format("currentAuditContext maxPriority:%d", maxPriority)); + log.info(String.format("current maxPriority:%d", maxPriority)); long id = dangerousRuleDAO.insertDangerousRule(new DangerousRuleDTO(null, req.getExpression(), req.getDescription(), maxPriority + 1, scriptType, username, System.currentTimeMillis(), username, System.currentTimeMillis(), req.getAction(), EnableStatusEnum.DISABLED.getValue())); diff --git a/src/backend/job-manage/service-job-manage/src/main/java/com/tencent/bk/job/manage/service/impl/ScriptManagerImpl.java b/src/backend/job-manage/service-job-manage/src/main/java/com/tencent/bk/job/manage/service/impl/ScriptManagerImpl.java index 81833b809a..a3fc54f196 100644 --- a/src/backend/job-manage/service-job-manage/src/main/java/com/tencent/bk/job/manage/service/impl/ScriptManagerImpl.java +++ b/src/backend/job-manage/service-job-manage/src/main/java/com/tencent/bk/job/manage/service/impl/ScriptManagerImpl.java @@ -556,7 +556,7 @@ public void publishScript(Long appId, ScriptDTO scriptVersionToBePublished = null; for (ScriptDTO scriptVersion : scriptVersions) { if (!isPublicScript && !scriptVersion.getAppId().equals(targetAppId)) { - log.warn("Publish script, script:{} is not in currentAuditContext app:{}", scriptId, targetAppId); + log.warn("Publish script, script:{} is not in current app:{}", scriptId, targetAppId); throw new NotFoundException(ErrorCode.SCRIPT_NOT_IN_APP); } if (scriptVersion.getScriptVersionId().equals(scriptVersionId)) { @@ -616,7 +616,7 @@ public void disableScript(Long appId, ScriptDTO scriptVersionToBeDisabled = null; for (ScriptDTO scriptVersion : scriptVersions) { if (!scriptVersion.getAppId().equals(targetAppId)) { - log.warn("Disable script, script:{} is not in currentAuditContext app:{}", scriptId, targetAppId); + log.warn("Disable script, script:{} is not in current app:{}", scriptId, targetAppId); throw new NotFoundException(ErrorCode.SCRIPT_NOT_IN_APP); } if (scriptVersion.getScriptVersionId().equals(scriptVersionId)) { @@ -668,7 +668,7 @@ private void checkScriptInApp(long appId, ScriptDTO script) { } if (!script.isPublicScript()) { if (!script.getAppId().equals(appId)) { - log.warn("Script:{} is not in currentAuditContext app:{}", script.getId(), appId); + log.warn("Script:{} is not in current app:{}", script.getId(), appId); throw new NotFoundException(ErrorCode.SCRIPT_NOT_IN_APP); } } diff --git a/src/backend/job-manage/service-job-manage/src/main/java/com/tencent/bk/job/manage/service/template/impl/TaskTemplateServiceImpl.java b/src/backend/job-manage/service-job-manage/src/main/java/com/tencent/bk/job/manage/service/template/impl/TaskTemplateServiceImpl.java index d1e97c8942..7bd67ea2e7 100644 --- a/src/backend/job-manage/service-job-manage/src/main/java/com/tencent/bk/job/manage/service/template/impl/TaskTemplateServiceImpl.java +++ b/src/backend/job-manage/service-job-manage/src/main/java/com/tencent/bk/job/manage/service/template/impl/TaskTemplateServiceImpl.java @@ -836,7 +836,7 @@ public void processTemplateStep(TaskTemplateInfoDTO taskTemplateInfo) { taskStepService.deleteStepById(taskStep.getTemplateId(), taskStep.getId()); stepIterator.remove(); } else { - // Update previous step info on currentAuditContext step + // Update previous step info on current step if (previousStep == null) { taskStep.setPreviousStepId(0L); } else { @@ -851,13 +851,13 @@ public void processTemplateStep(TaskTemplateInfoDTO taskTemplateInfo) { taskStep.setId(taskStepService.insertStep(taskStep)); } - // update previous step to point to currentAuditContext step + // update previous step to point to current step if (previousStep != null) { previousStep.setNextStepId(taskStep.getId()); taskStepService.updateStepById(previousStep); } - // make previous currentAuditContext + // make previous current previousStep = taskStep; if (firstStepId == 0) { firstStepId = taskStep.getId();