Merge pull request TencentBlueKing#2663 from wangyu096/issue_2643

feature: 轻量化部署优化 TencentBlueKing#2643
wangyu096 · Feb 2, 2024 · e1e13c1 · e1e13c1
2 parents dbc08fd + c63bb5f
commit e1e13c1
Show file tree

Hide file tree

Showing 43 changed files with 124 additions and 113 deletions.
diff --git a/...s/common-iam/src/main/java/com/tencent/bk/job/common/iam/aspect/IamAppTransferAspect.java b/...s/common-iam/src/main/java/com/tencent/bk/job/common/iam/aspect/IamAppTransferAspect.java
@@ -24,15 +24,18 @@ public IamAppTransferAspect(AppScopeMappingService appScopeMappingService) {
         this.appScopeMappingService = appScopeMappingService;
     }
 
-    @Pointcut("execution (* com.tencent.bk.job.common.iam.service.impl.BusinessAuthServiceImpl.auth*(..))")
+    @Pointcut("within(com.tencent.bk.job.common.iam.service.impl.BusinessAuthServiceImpl) " +
+        "&& execution (* com.tencent.bk.job.common.iam.service.impl.BusinessAuthServiceImpl.auth*(..))")
     public void processAuthBusinessAction() {
     }
 
-    @Pointcut("execution (* com.tencent.bk.job.*.auth..impl.*.auth*(..))")
+    @Pointcut("within(com.tencent.bk.job..*) " +
+        "&& execution (* com.tencent.bk.job.*.auth..impl.*.auth*(..))")
     public void processAuthResourceAction() {
     }
 
-    @Pointcut("execution (* com.tencent.bk.job.*.auth..impl.*.batchAuth*(..))")
+    @Pointcut("within(com.tencent.bk.job..*) " +
+        "&& execution (* com.tencent.bk.job.*.auth..impl.*.batchAuth*(..))")
     public void processBatchAuthResourceAction() {
     }
 

diff --git a/...mons/common-iam/src/main/java/com/tencent/bk/job/common/iam/aspect/IamCallbackAspect.java b/...mons/common-iam/src/main/java/com/tencent/bk/job/common/iam/aspect/IamCallbackAspect.java
@@ -15,7 +15,7 @@ public class IamCallbackAspect {
     public IamCallbackAspect() {
     }
 
-    @Pointcut("execution (* com.tencent.bk.job.*.api.iam.impl.*.callback(..))")
+    @Pointcut("within(com.tencent.bk.job..*) && execution (* com.tencent.bk.job.*.api.iam.impl.*.callback(..))")
     public void processCallbackRequest() {
     }
 

diff --git a/...mmon-iam/src/main/java/com/tencent/bk/job/common/iam/aspect/IamExceptionHandleAspect.java b/...mmon-iam/src/main/java/com/tencent/bk/job/common/iam/aspect/IamExceptionHandleAspect.java
@@ -17,11 +17,13 @@
 @Aspect
 public class IamExceptionHandleAspect {
 
-    @Pointcut("execution (* com.tencent.bk.sdk.iam.service.impl.PolicyServiceImpl.*(..))")
+    @Pointcut("within(com.tencent.bk.sdk.iam.service.impl.PolicyServiceImpl) " +
+        "&& execution (* com.tencent.bk.sdk.iam.service.impl.PolicyServiceImpl.*(..))")
     public void processPolicyServiceAction() {
     }
 
-    @Pointcut("execution (* com.tencent.bk.sdk.iam.helper.AuthHelper.isAllowed(..))")
+    @Pointcut("within(com.tencent.bk.sdk.iam.helper.AuthHelper) " +
+        "&& execution (* com.tencent.bk.sdk.iam.helper.AuthHelper.isAllowed(..))")
     public void processIsAllowedAction() {
     }
 

diff --git a/...sql/config/JobMySQLAutoConfiguration.java → ...bk/job/common/mysql/JobTransactional.java b/...sql/config/JobMySQLAutoConfiguration.java → ...bk/job/common/mysql/JobTransactional.java
@@ -22,18 +22,23 @@
  * IN THE SOFTWARE.
  */
 
-package com.tencent.bk.job.common.mysql.config;
+package com.tencent.bk.job.common.mysql;
 
-import org.jooq.DSLContext;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.context.annotation.Configuration;
+import org.springframework.core.annotation.AliasFor;
+import org.springframework.transaction.TransactionDefinition;
+import org.springframework.transaction.annotation.Transactional;
 
-import javax.sql.DataSource;
+/**
+ * Job 自定义事务注解
+ */
+@Transactional
+public @interface JobTransactional {
+    @AliasFor(annotation = Transactional.class)
+    String transactionManager();
 
-@Configuration(proxyBeanMethods = false)
-@ConditionalOnClass(DSLContext.class)
-@ConditionalOnBean(DataSource.class)
-public class JobMySQLAutoConfiguration {
+    @AliasFor(annotation = Transactional.class)
+    Class<? extends Throwable>[] rollbackFor() default {Throwable.class};
 
+    @AliasFor(annotation = Transactional.class)
+    int timeout() default TransactionDefinition.TIMEOUT_DEFAULT;
 }
diff --git a/src/backend/commons/common-mysql/src/main/resources/META-INF/spring.factories b/src/backend/commons/common-mysql/src/main/resources/META-INF/spring.factories
diff --git a/...web/src/main/java/com/tencent/bk/job/common/web/aspects/EsbAppResourceScopeReqAspect.java b/...web/src/main/java/com/tencent/bk/job/common/web/aspects/EsbAppResourceScopeReqAspect.java
@@ -43,7 +43,7 @@ public EsbAppResourceScopeReqAspect(AppScopeMappingService appScopeMappingServic
         this.appScopeMappingService = appScopeMappingService;
     }
 
-    @Before("execution(* com.tencent.bk.job.*.api.esb..*.*(..)))")
+    @Before("within(com.tencent.bk.job..*) && execution(* com.tencent.bk.job.*.api.esb..*.*(..)))")
     public void handleAppScopeReq(JoinPoint joinPoint) {
         Object[] args = joinPoint.getArgs();
         for (Object arg : args) {

diff --git a/...ommons/esb-sdk/src/main/java/com/tencent/bk/job/common/esb/metrics/EsbApiTimedAspect.java b/...ommons/esb-sdk/src/main/java/com/tencent/bk/job/common/esb/metrics/EsbApiTimedAspect.java
@@ -63,7 +63,7 @@ public static Tag exception(Throwable exception) {
         return EXCEPTION_NONE;
     }
 
-    @Around("execution (@com.tencent.bk.job.common.esb.metrics.EsbApiTimed * *.*(..))")
+    @Around("within(com.tencent.bk.job..*) && execution (@com.tencent.bk.job.common.esb.metrics.EsbApiTimed * *.*(..))")
     public Object timedMethod(ProceedingJoinPoint pjp) throws Throwable {
         RequestAttributes requestAttributes = RequestContextHolder.getRequestAttributes();
         HttpServletRequest request = null;

diff --git a/src/backend/job-crontab/service-job-crontab/build.gradle b/src/backend/job-crontab/service-job-crontab/build.gradle
@@ -28,6 +28,7 @@ dependencies {
     api project(":commons:common-redis")
     api project(":commons:common-web")
     api project(':commons:common-security')
+    api project(':commons:common-mysql')
     api project(":job-execute:api-job-execute")
     api project(":job-manage:api-job-manage")
     api project(":job-crontab:api-job-crontab")

diff --git a/...b/src/main/java/com/tencent/bk/job/crontab/api/inner/impl/ServiceCronJobResourceImpl.java b/...b/src/main/java/com/tencent/bk/job/crontab/api/inner/impl/ServiceCronJobResourceImpl.java
@@ -28,6 +28,7 @@
 import com.tencent.bk.job.common.exception.InvalidParamException;
 import com.tencent.bk.job.common.model.BaseSearchCondition;
 import com.tencent.bk.job.common.model.InternalResponse;
+import com.tencent.bk.job.common.mysql.JobTransactional;
 import com.tencent.bk.job.common.util.JobContextUtil;
 import com.tencent.bk.job.common.util.date.DateUtils;
 import com.tencent.bk.job.common.util.json.JsonUtils;
@@ -43,7 +44,6 @@
 import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.HashMap;
@@ -116,7 +116,7 @@ public InternalResponse<Map<Long, List<CronJobVO>>> batchListCronJobByPlanIds(Lo
     }
 
     @Override
-    @Transactional(value = "jobCrontabTransactionManager", rollbackFor = {Throwable.class})
+    @JobTransactional(transactionManager = "jobCrontabTransactionManager")
     public InternalResponse<Long> saveCronJobWithId(String username, Long appId, Long cronJobId, Long createTime,
                                                     Long lastModifyTime, String lastModifyUser,
                                                     CronJobCreateUpdateReq cronJobCreateUpdateReq) {

diff --git a/...ab/src/main/java/com/tencent/bk/job/crontab/service/impl/CronJobBatchLoadServiceImpl.java b/...ab/src/main/java/com/tencent/bk/job/crontab/service/impl/CronJobBatchLoadServiceImpl.java
@@ -24,14 +24,14 @@
 
 package com.tencent.bk.job.crontab.service.impl;
 
+import com.tencent.bk.job.common.mysql.JobTransactional;
 import com.tencent.bk.job.crontab.model.dto.CronJobBasicInfoDTO;
 import com.tencent.bk.job.crontab.service.CronJobBatchLoadService;
 import com.tencent.bk.job.crontab.service.CronJobService;
 import lombok.extern.slf4j.Slf4j;
 import org.slf4j.helpers.MessageFormatter;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -48,7 +48,7 @@ public CronJobBatchLoadServiceImpl(CronJobService cronJobService) {
     }
 
     @Override
-    @Transactional(rollbackFor = {Exception.class, Error.class}, timeout = 30)
+    @JobTransactional(transactionManager = "jobCrontabTransactionManager", timeout = 30)
     public CronLoadResult batchLoadCronToQuartz(int start, int limit) {
         int successNum = 0;
         int failedNum = 0;

diff --git a/...job-crontab/src/main/java/com/tencent/bk/job/crontab/service/impl/CronJobServiceImpl.java b/...job-crontab/src/main/java/com/tencent/bk/job/crontab/service/impl/CronJobServiceImpl.java
@@ -42,6 +42,7 @@
 import com.tencent.bk.job.common.model.PageData;
 import com.tencent.bk.job.common.model.dto.AppResourceScope;
 import com.tencent.bk.job.common.model.dto.HostDTO;
+import com.tencent.bk.job.common.mysql.JobTransactional;
 import com.tencent.bk.job.common.util.JobContextUtil;
 import com.tencent.bk.job.common.util.date.DateUtils;
 import com.tencent.bk.job.common.util.json.JsonUtils;
@@ -84,7 +85,6 @@
 import org.slf4j.helpers.MessageFormatter;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.sql.Date;
 import java.time.Instant;
@@ -200,7 +200,7 @@ public boolean updateCronJobErrorById(CronJobInfoDTO cronJobErrorInfo) {
     }
 
     @Override
-    @Transactional(value = "jobCrontabTransactionManager", rollbackFor = {Exception.class, Error.class})
+    @JobTransactional(transactionManager = "jobCrontabTransactionManager")
     @ActionAuditRecord(
         actionId = ActionId.CREATE_CRON,
         instance = @AuditInstanceRecord(
@@ -227,7 +227,7 @@ public CronJobInfoDTO createCronJobInfo(String username, CronJobInfoDTO cronJobI
     }
 
     @Override
-    @Transactional(rollbackFor = {Exception.class, Error.class})
+    @JobTransactional(transactionManager = "jobCrontabTransactionManager")
     @ActionAuditRecord(
         actionId = ActionId.MANAGE_CRON,
         instance = @AuditInstanceRecord(
@@ -393,7 +393,7 @@ public Boolean deleteCronJobInfo(String username, Long appId, Long cronJobId) {
     }
 
     @Override
-    @Transactional(value = "jobCrontabTransactionManager", rollbackFor = {Exception.class, Error.class})
+    @JobTransactional(transactionManager = "jobCrontabTransactionManager")
     @ActionAuditRecord(
         actionId = ActionId.MANAGE_CRON,
         instance = @AuditInstanceRecord(
@@ -452,7 +452,7 @@ public Boolean changeCronJobEnableStatus(String username, Long appId, Long cronJ
     }
 
     @Override
-    @Transactional(value = "jobCrontabTransactionManager", rollbackFor = {Exception.class, Error.class})
+    @JobTransactional(transactionManager = "jobCrontabTransactionManager")
     public Boolean disableExpiredCronJob(Long appId, Long cronJobId, String lastModifyUser, Long lastModifyTime) {
         CronJobInfoDTO cronJobInfo = new CronJobInfoDTO();
         cronJobInfo.setAppId(appId);
@@ -508,7 +508,7 @@ public Map<Long, List<CronJobInfoDTO>> listCronJobByPlanIds(Long appId, List<Lon
     }
 
     @Override
-    @Transactional(value = "jobCrontabTransactionManager", rollbackFor = {Error.class, Exception.class})
+    @JobTransactional(transactionManager = "jobCrontabTransactionManager")
     public Boolean addInnerJob(ServiceAddInnerCronJobRequestDTO request) {
         if (!request.validate()) {
             return false;
@@ -600,7 +600,7 @@ public Boolean deleteInnerCronJob(String systemId, String jobKey) {
     }
 
     @Override
-    @Transactional(value = "jobCrontabTransactionManager", rollbackFor = {Exception.class, Error.class})
+    @JobTransactional(transactionManager = "jobCrontabTransactionManager")
     @ActionAuditRecord(
         actionId = ActionId.MANAGE_CRON,
         instance = @AuditInstanceRecord(

diff --git a/...e-job-execute/src/main/java/com/tencent/bk/job/execute/api/esb/common/ConfigFileUtil.java b/...e-job-execute/src/main/java/com/tencent/bk/job/execute/api/esb/common/ConfigFileUtil.java
@@ -26,8 +26,8 @@
 
 import com.tencent.bk.job.common.constant.ErrorCode;
 import com.tencent.bk.job.common.exception.InternalException;
-import com.tencent.bk.job.common.util.file.FileUtil;
 import com.tencent.bk.job.common.util.JobUUID;
+import com.tencent.bk.job.common.util.file.FileUtil;
 import com.tencent.bk.job.execute.engine.consts.FileDirTypeConf;
 import com.tencent.bk.job.execute.engine.util.NFSUtils;
 

diff --git a/.../src/main/java/com/tencent/bk/job/execute/engine/prepare/local/LocalFileDownloadTask.java b/.../src/main/java/com/tencent/bk/job/execute/engine/prepare/local/LocalFileDownloadTask.java
@@ -26,8 +26,8 @@
 
 import com.tencent.bk.job.common.artifactory.model.dto.NodeDTO;
 import com.tencent.bk.job.common.artifactory.sdk.ArtifactoryClient;
-import com.tencent.bk.job.common.util.file.FileUtil;
 import com.tencent.bk.job.common.util.TimeUtil;
+import com.tencent.bk.job.common.util.file.FileUtil;
 import com.tencent.bk.job.common.util.file.PathUtil;
 import com.tencent.bk.job.execute.constants.Consts;
 import com.tencent.bk.job.execute.model.FileDetailDTO;

diff --git a/src/backend/job-file-gateway/service-job-file-gateway/build.gradle b/src/backend/job-file-gateway/service-job-file-gateway/build.gradle
@@ -25,6 +25,7 @@
 dependencies {
     api project(":commons:common-web")
     api project(":commons:common-redis")
+    api project(":commons:common-mysql")
     api project(":job-manage:api-job-manage")
     api project(":job-file-worker-sdk:api-job-file-worker-sdk")
     api project(":job-file-gateway:api-job-file-gateway")

diff --git a/...src/main/java/com/tencent/bk/job/file_gateway/service/impl/FileSourceTaskServiceImpl.java b/...src/main/java/com/tencent/bk/job/file_gateway/service/impl/FileSourceTaskServiceImpl.java
@@ -30,6 +30,7 @@
 import com.tencent.bk.job.common.exception.ServiceException;
 import com.tencent.bk.job.common.model.Response;
 import com.tencent.bk.job.common.model.http.HttpReq;
+import com.tencent.bk.job.common.mysql.JobTransactional;
 import com.tencent.bk.job.common.util.http.JobHttpClient;
 import com.tencent.bk.job.common.util.json.JsonUtils;
 import com.tencent.bk.job.file_gateway.consts.TaskCommandEnum;
@@ -56,7 +57,6 @@
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -110,7 +110,7 @@ public TaskInfoDTO startFileSourceDownloadTask(String username, Long appId, Long
             fileSourceId, filePathList, null);
     }
 
-    @Transactional(value = "jobFileGatewayTransactionManager", rollbackFor = {Throwable.class})
+    @JobTransactional(transactionManager = "jobFileGatewayTransactionManager")
     public TaskInfoDTO startFileSourceDownloadTaskWithId(String username, Long appId, Long stepInstanceId,
                                                          Integer executeCount, String batchTaskId,
                                                          Integer fileSourceId, List<String> filePathList,

diff --git a/...in/java/com/tencent/bk/job/file_gateway/service/impl/FileSourceTaskUpdateServiceImpl.java b/...in/java/com/tencent/bk/job/file_gateway/service/impl/FileSourceTaskUpdateServiceImpl.java
@@ -26,6 +26,7 @@
 
 import com.tencent.bk.job.common.constant.ErrorCode;
 import com.tencent.bk.job.common.exception.NotFoundException;
+import com.tencent.bk.job.common.mysql.JobTransactional;
 import com.tencent.bk.job.common.util.ArrayUtil;
 import com.tencent.bk.job.common.util.file.FileSizeUtil;
 import com.tencent.bk.job.common.util.file.PathUtil;
@@ -53,7 +54,6 @@
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -95,7 +95,7 @@ public void addFileTaskStatusChangeListener(FileTaskStatusChangeListener listene
     }
 
     @Override
-    @Transactional(value = "jobFileGatewayTransactionManager", rollbackFor = {Throwable.class})
+    @JobTransactional(transactionManager = "jobFileGatewayTransactionManager")
     public String updateFileSourceTask(String batchTaskId,
                                        String fileSourceTaskId,
                                        Long fileTaskId,

diff --git a/...way/src/main/java/com/tencent/bk/job/file_gateway/service/impl/FileWorkerServiceImpl.java b/...way/src/main/java/com/tencent/bk/job/file_gateway/service/impl/FileWorkerServiceImpl.java
@@ -25,6 +25,7 @@
 package com.tencent.bk.job.file_gateway.service.impl;
 
 import com.fasterxml.jackson.core.type.TypeReference;
+import com.tencent.bk.job.common.mysql.JobTransactional;
 import com.tencent.bk.job.common.util.json.JsonUtils;
 import com.tencent.bk.job.file_gateway.config.FileGatewayConfig;
 import com.tencent.bk.job.file_gateway.consts.WorkerSelectScopeEnum;
@@ -41,7 +42,6 @@
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -71,7 +71,7 @@ public FileWorkerServiceImpl(FileWorkerDAO fileWorkerDAO,
     }
 
     @Override
-    @Transactional(value = "jobFileGatewayTransactionManager", rollbackFor = Throwable.class)
+    @JobTransactional(transactionManager = "jobFileGatewayTransactionManager")
     public Long heartBeat(FileWorkerDTO fileWorkerDTO) {
         Long id;
         String configStr = fileWorkerDTO.getConfigStr();

diff --git a/src/backend/job-manage/service-job-manage/build.gradle b/src/backend/job-manage/service-job-manage/build.gradle
@@ -39,6 +39,7 @@ dependencies {
     api project(":commons:esb-sdk")
     api project(":commons:gse-sdk")
     api project(":commons:cmdb-sdk")
+    api project(":commons:common-mysql")
     implementation "org.springframework.boot:spring-boot-starter-web"
     implementation "org.springframework.boot:spring-boot-starter-jdbc"
     implementation "org.springframework.boot:spring-boot-starter-jooq"

diff --git a/...ge/src/main/java/com/tencent/bk/job/manage/api/inner/impl/ServiceAccountResourceImpl.java b/...ge/src/main/java/com/tencent/bk/job/manage/api/inner/impl/ServiceAccountResourceImpl.java
@@ -33,6 +33,7 @@
 import com.tencent.bk.job.common.model.InternalResponse;
 import com.tencent.bk.job.common.model.Response;
 import com.tencent.bk.job.common.model.dto.AppResourceScope;
+import com.tencent.bk.job.common.mysql.JobTransactional;
 import com.tencent.bk.job.common.service.AppScopeMappingService;
 import com.tencent.bk.job.common.util.ArrayUtil;
 import com.tencent.bk.job.common.util.date.DateUtils;
@@ -45,7 +46,6 @@
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.ArrayList;
@@ -135,7 +135,7 @@ private ServiceAccountDTO toServiceAccountDTO(AccountDTO accountDTO) {
     }
 
     @Override
-    @Transactional(value = "jobManageTransactionManager", rollbackFor = {Throwable.class})
+    @JobTransactional(transactionManager = "jobManageTransactionManager")
     public InternalResponse<ServiceAccountDTO> saveOrGetAccount(String username, Long createTime, Long lastModifyTime,
                                                                 String lastModifyUser, Long appId,
                                                                 AccountCreateUpdateReq accountCreateUpdateReq) {

diff --git a/...age/src/main/java/com/tencent/bk/job/manage/api/inner/impl/ServiceScriptResourceImpl.java b/...age/src/main/java/com/tencent/bk/job/manage/api/inner/impl/ServiceScriptResourceImpl.java
@@ -29,6 +29,7 @@
 import com.tencent.bk.job.common.exception.NotFoundException;
 import com.tencent.bk.job.common.i18n.service.MessageI18nService;
 import com.tencent.bk.job.common.model.InternalResponse;
+import com.tencent.bk.job.common.mysql.JobTransactional;
 import com.tencent.bk.job.common.util.ArrayUtil;
 import com.tencent.bk.job.manage.api.common.ScriptDTOBuilder;
 import com.tencent.bk.job.manage.api.inner.ServiceScriptResource;
@@ -41,7 +42,6 @@
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.tuple.Pair;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
@@ -99,7 +99,7 @@ public InternalResponse<ServiceScriptDTO> getScriptByScriptVersionId(Long script
     }
 
     @Override
-    @Transactional(value = "jobManageTransactionManager", rollbackFor = {Throwable.class})
+    @JobTransactional(transactionManager = "jobManageTransactionManager")
     public InternalResponse<Pair<String, Long>> createScriptWithVersionId(String username, Long createTime,
                                                                           Long lastModifyTime, String lastModifyUser,
                                                                           Integer scriptStatus, Long appId,