diff --git a/caesar-ldap/src/main/java/com/baiyi/caesar/ldap/handler/LdapHandler.java b/caesar-ldap/src/main/java/com/baiyi/caesar/ldap/handler/LdapHandler.java index 3d3f226..92a5425 100644 --- a/caesar-ldap/src/main/java/com/baiyi/caesar/ldap/handler/LdapHandler.java +++ b/caesar-ldap/src/main/java/com/baiyi/caesar/ldap/handler/LdapHandler.java @@ -231,7 +231,7 @@ public boolean checkPersonInLdap(String username) { DirContextAdapter adapter = (DirContextAdapter) ldapTemplate.lookup(ldapConfig.buildUserDN(username)); String cn = adapter.getStringAttribute(ldapConfig.getCustomByKey(LdapConfig.Attributes.USER_ID)); if (username.equalsIgnoreCase(cn)) return true; - } catch (Exception e) { + } catch (Exception ignored) { } return false; } diff --git a/caesar-manage/src/main/java/com/baiyi/caesar/factory/jenkins/impl/build/AndroidBuildJobHandler.java b/caesar-manage/src/main/java/com/baiyi/caesar/factory/jenkins/impl/build/AndroidBuildJobHandler.java index 65cb2d0..4f6a90b 100644 --- a/caesar-manage/src/main/java/com/baiyi/caesar/factory/jenkins/impl/build/AndroidBuildJobHandler.java +++ b/caesar-manage/src/main/java/com/baiyi/caesar/factory/jenkins/impl/build/AndroidBuildJobHandler.java @@ -33,10 +33,10 @@ protected JobParametersContext buildJobParametersContext(CsApplication csApplica JobParametersContext context = super.buildJobParametersContext(csApplication, csCiJob, buildParam); JenkinsJobParamsMap jenkinsJobParamsMap = JenkinsJobParamsBuilder.newBuilder() - .paramEntry(BUILD_TYPE,buildParam) - .paramEntry(PRODUCT_FLAVOR,buildParam) + .paramEntry(BUILD_TYPE, buildParam) + .paramEntry(PRODUCT_FLAVOR, buildParam) .paramEntry(JOB_BUILD_NUMBER, String.valueOf(csCiJob.getJobBuildNumber())) - .paramEntry(OSS_JOB_URL,JobParamUtils.getOssJobUrl(csCiJob.getJobBuildNumber(), context)) + .paramEntry(OSS_JOB_URL, JobParamUtils.getOssJobUrl(csCiJob.getJobBuildNumber(), context)) .build(); context.putParams(jenkinsJobParamsMap.getParams()); diff --git a/caesar-manage/src/main/java/com/baiyi/caesar/factory/jenkins/impl/build/BaseBuildJobHandler.java b/caesar-manage/src/main/java/com/baiyi/caesar/factory/jenkins/impl/build/BaseBuildJobHandler.java index 2c87204..4ba764a 100644 --- a/caesar-manage/src/main/java/com/baiyi/caesar/factory/jenkins/impl/build/BaseBuildJobHandler.java +++ b/caesar-manage/src/main/java/com/baiyi/caesar/factory/jenkins/impl/build/BaseBuildJobHandler.java @@ -101,7 +101,7 @@ public abstract class BaseBuildJobHandler implements IBuildJobHandler, Initializ private EnvFacade envFacade; @Resource - private TaskEngineCenter jobEngineCenter; + private TaskEngineCenter taskEngineCenter; public static final boolean SEND_DINGTALK_MESSAGE = false; @@ -197,7 +197,7 @@ private BusinessWrapper build(CsCiJob csCiJob, CsApplication csApplicat .jobParamDetail(parametersContext) .build(); buildStartNotify(context); // 通知 - jobEngineCenter.trackBuildTask(context); // 追踪任务 + taskEngineCenter.trackBuildTask(context); // 追踪任务 } catch (Exception e) { e.printStackTrace(); } @@ -241,7 +241,6 @@ private CsGitlabProject acqGitlabProjectByScmMemberId(int scmMemberId) { return csGitlabProjectService.queryCsGitlabProjectById(csApplicationScmMember.getScmId()); } - private void buildStartNotify(BuildJobContext context) { if (context.getJobBuild().getIsSilence()) // 消息静默 return; diff --git a/caesar-manage/src/main/java/com/baiyi/caesar/factory/jenkins/impl/build/IOSBuildJobHandler.java b/caesar-manage/src/main/java/com/baiyi/caesar/factory/jenkins/impl/build/IOSBuildJobHandler.java index 620eafa..84e3f87 100644 --- a/caesar-manage/src/main/java/com/baiyi/caesar/factory/jenkins/impl/build/IOSBuildJobHandler.java +++ b/caesar-manage/src/main/java/com/baiyi/caesar/factory/jenkins/impl/build/IOSBuildJobHandler.java @@ -36,7 +36,7 @@ protected JobParametersContext buildJobParametersContext(CsApplication csApplica .paramEntry(POD_UPDATE, buildParam) .paramEntry(PUB_GET, buildParam) .paramEntry(JOB_BUILD_NUMBER, String.valueOf(csCiJob.getJobBuildNumber())) - .paramEntry(OSS_JOB_URL,JobParamUtils.getOssJobUrl(csCiJob.getJobBuildNumber(), context)) + .paramEntry(OSS_JOB_URL, JobParamUtils.getOssJobUrl(csCiJob.getJobBuildNumber(), context)) .build(); context.putParams(jenkinsJobParamsMap.getParams()); diff --git a/caesar-manage/src/main/java/com/baiyi/caesar/factory/jenkins/impl/deployment/JavaDeployJobHandler.java b/caesar-manage/src/main/java/com/baiyi/caesar/factory/jenkins/impl/deployment/JavaDeployJobHandler.java index a3f065b..74f14d9 100644 --- a/caesar-manage/src/main/java/com/baiyi/caesar/factory/jenkins/impl/deployment/JavaDeployJobHandler.java +++ b/caesar-manage/src/main/java/com/baiyi/caesar/factory/jenkins/impl/deployment/JavaDeployJobHandler.java @@ -70,9 +70,6 @@ protected JobParametersContext acqBaseBuildParams(CsApplication csApplication, C .paramEntry(OSS_JOB_URL,JobParamUtils.getOssJobUrl(csCdJob.getJobBuildNumber(), jobParamDetail)) .build(); jobParamDetail.putParams(jenkinsJobParamsMap.getParams()); - - - return jobParamDetail; } diff --git a/caesar-manage/src/main/resources/application-open.yml b/caesar-manage/src/main/resources/application-open.yml index 4550a9b..d3f4ce4 100644 --- a/caesar-manage/src/main/resources/application-open.yml +++ b/caesar-manage/src/main/resources/application-open.yml @@ -12,7 +12,7 @@ white: caesar: version: 1.0.0 openTask: true - url: https://caesar.ops.yangege.cn + url: https://caesar.xinc818.com spring: profiles: diff --git a/caesar-manage/src/main/resources/application-pre.yml b/caesar-manage/src/main/resources/application-pre.yml index 4d3f71c..a692014 100644 --- a/caesar-manage/src/main/resources/application-pre.yml +++ b/caesar-manage/src/main/resources/application-pre.yml @@ -12,7 +12,7 @@ white: caesar: version: 1.0.0 openTask: true - url: https://caesar.ops.yangege.cn + url: https://caesar.xinc818.com spring: profiles: diff --git a/caesar-manage/src/main/resources/application-prod.yml b/caesar-manage/src/main/resources/application-prod.yml index c8fd5f7..bb8c9a5 100644 --- a/caesar-manage/src/main/resources/application-prod.yml +++ b/caesar-manage/src/main/resources/application-prod.yml @@ -10,9 +10,9 @@ white: urls: /*.js;/*.css;/*.jpg;/swagger-resources/*;/error;/webjars/*;/swagger-ui/*;v2/*; caesar: - version: 1.0.0 + version: 1.0.1 openTask: true - url: https://caesar.ops.yangege.cn + url: https://caesar.xinc818.com spring: profiles: