Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bug：多环境情况下流水线编辑页面插件logo缓存优化 #11380 #11381

Merged
merged 2 commits into from
Jan 8, 2025
Merged

bug：多环境情况下流水线编辑页面插件logo缓存优化 #11380 #11381

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d32edee
bug：多环境情况下流水线编辑页面插件logo缓存优化 #11380
carlyin0801 Jan 7, 2025
b7b7746
bug：多环境情况下流水线编辑页面插件logo缓存优化 #11380
carlyin0801 Jan 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions ...z-store/src/main/kotlin/com/tencent/devops/store/atom/service/impl/AtomPropServiceImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,19 +29,22 @@ package com.tencent.devops.store.atom.service.impl

import com.fasterxml.jackson.core.type.TypeReference
import com.github.benmanes.caffeine.cache.Caffeine
import com.tencent.devops.common.api.auth.REFERER
import com.tencent.devops.common.api.constant.CommonMessageCode
import com.tencent.devops.common.api.exception.ErrorCodeException
import com.tencent.devops.common.api.util.JsonUtil
import com.tencent.devops.common.api.util.ThreadLocalUtil
import com.tencent.devops.common.util.RegexUtils
import com.tencent.devops.common.web.utils.BkApiUtil
import com.tencent.devops.common.web.utils.I18nUtil
import com.tencent.devops.model.store.tables.TAtom
import com.tencent.devops.store.atom.dao.AtomDao
import com.tencent.devops.store.atom.dao.AtomPropDao
import com.tencent.devops.store.pojo.atom.AtomProp
import com.tencent.devops.store.atom.service.AtomPropService
import com.tencent.devops.store.common.service.StoreI18nMessageService
import com.tencent.devops.store.common.service.action.StoreDecorateFactory
import com.tencent.devops.store.common.utils.StoreUtils
import com.tencent.devops.store.pojo.atom.AtomProp
import com.tencent.devops.store.pojo.atom.enums.AtomStatusEnum
import com.tencent.devops.store.pojo.common.ATOM_OUTPUT
import com.tencent.devops.store.pojo.common.enums.StoreTypeEnum
Expand Down Expand Up @@ -81,8 +84,10 @@ class AtomPropServiceImpl @Autowired constructor(
var atomPropMap: MutableMap<String, AtomProp>? = null
// 从缓存中查找插件属性信息
var queryDbAtomCodes: MutableList<String>? = null
val referer = BkApiUtil.getHttpServletRequest()?.getHeader(REFERER) ?: ThreadLocalUtil.get(REFERER)?.toString()
val refererHost = referer?.let { RegexUtils.splitDomainContextPath("$referer/")?.first } ?: ""
atomCodes.forEach { atomCode ->
val atomProp = atomPropCache.getIfPresent(atomCode)
val atomProp = atomPropCache.getIfPresent("$refererHost:$atomCode")
if (atomProp != null) {
if (atomPropMap == null) {
atomPropMap = mutableMapOf()
Expand Down Expand Up @@ -124,7 +129,7 @@ class AtomPropServiceImpl @Autowired constructor(
)
atomPropMap!![atomCode] = atomProp
// 把数据放入缓存
atomPropCache.put(atomCode, atomProp)
atomPropCache.put("$refererHost:$atomCode", atomProp)
}
}
return atomPropMap
Expand Down