From 79c53c201b41dd3563721684cbe923e47334a561 Mon Sep 17 00:00:00 2001 From: carlyin <449036249@qq.com> Date: Thu, 10 Feb 2022 16:00:48 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E6=94=AF=E6=8C=81=E8=80=81=E6=8F=92?= =?UTF-8?q?=E4=BB=B6=E7=9A=84=E5=89=8D=E7=AB=AF=E4=BD=BF=E7=94=A8=E6=96=B0?= =?UTF-8?q?=E6=8F=92=E4=BB=B6=E7=9A=84=E6=B8=B2=E6=9F=93=E6=96=B9=E5=BC=8F?= =?UTF-8?q?=20#6111?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../store/service/atom/impl/MarketAtomEnvServiceImpl.kt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/backend/ci/core/store/biz-store/src/main/kotlin/com/tencent/devops/store/service/atom/impl/MarketAtomEnvServiceImpl.kt b/src/backend/ci/core/store/biz-store/src/main/kotlin/com/tencent/devops/store/service/atom/impl/MarketAtomEnvServiceImpl.kt index 7be9f369e63..2adc3033249 100644 --- a/src/backend/ci/core/store/biz-store/src/main/kotlin/com/tencent/devops/store/service/atom/impl/MarketAtomEnvServiceImpl.kt +++ b/src/backend/ci/core/store/biz-store/src/main/kotlin/com/tencent/devops/store/service/atom/impl/MarketAtomEnvServiceImpl.kt @@ -35,6 +35,8 @@ import com.tencent.devops.common.api.exception.ErrorCodeException import com.tencent.devops.common.api.pojo.Result import com.tencent.devops.common.api.util.JsonUtil import com.tencent.devops.common.api.util.timestampmilli +import com.tencent.devops.common.pipeline.pojo.element.market.MarketBuildAtomElement +import com.tencent.devops.common.pipeline.pojo.element.market.MarketBuildLessAtomElement import com.tencent.devops.common.redis.RedisOperation import com.tencent.devops.common.service.utils.MessageCodeUtil import com.tencent.devops.store.constant.StoreMessageCode @@ -318,7 +320,10 @@ class MarketAtomEnvServiceImpl @Autowired constructor( return Result(atomResult.status, atomResult.message ?: "") } val atom = atomResult.data ?: return Result(data = null) - if (atom.htmlTemplateVersion == FrontendTypeEnum.HISTORY.typeVersion) { + val classType = atom.classType + if (atom.htmlTemplateVersion == FrontendTypeEnum.HISTORY.typeVersion || + (classType != MarketBuildAtomElement.classType && classType != MarketBuildLessAtomElement.classType) + ) { // 如果是历史老插件则直接返回环境信息 return Result( AtomEnv(