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:静态资源文件的url地址域名支持适配特定环境遗漏点修复 #9581 #9582

Merged
merged 1 commit into from
Oct 19, 2023
Merged

bug:静态资源文件的url地址域名支持适配特定环境遗漏点修复 #9581 #9582

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion .../core/store/biz-store/src/main/kotlin/com/tencent/devops/store/dao/common/StoreLogoDao.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ import com.tencent.devops.model.store.tables.TLogo
import com.tencent.devops.model.store.tables.records.TLogoRecord
import com.tencent.devops.store.pojo.common.Logo
import com.tencent.devops.store.pojo.common.StoreLogoReq
import com.tencent.devops.store.service.common.action.StoreDecorateFactory
import org.jooq.DSLContext
import org.jooq.Result
import org.springframework.stereotype.Repository
Expand Down Expand Up @@ -107,7 +108,9 @@ class StoreLogoDao {
with(record) {
return Logo(
id = id,
logoUrl = logoUrl,
logoUrl = logoUrl?.let {
StoreDecorateFactory.get(StoreDecorateFactory.Kind.HOST)?.decorate(it) as? String
} ?: "",
logoType = type,
order = order,
link = link,
Expand Down
5 changes: 4 additions & 1 deletion .../store/biz-store/src/main/kotlin/com/tencent/devops/store/dao/common/StoreMediaInfoDao.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ import com.tencent.devops.model.store.tables.TStoreMediaInfo
import com.tencent.devops.model.store.tables.records.TStoreMediaInfoRecord
import com.tencent.devops.store.pojo.common.StoreMediaInfo
import com.tencent.devops.store.pojo.common.StoreMediaInfoRequest
import com.tencent.devops.store.service.common.action.StoreDecorateFactory
import org.jooq.DSLContext
import org.jooq.Result
import org.springframework.stereotype.Repository
Expand Down Expand Up @@ -110,7 +111,9 @@ class StoreMediaInfoDao {
return StoreMediaInfo(
id = id,
storeCode = storeCode,
mediaUrl = mediaUrl,
mediaUrl = mediaUrl?.let {
StoreDecorateFactory.get(StoreDecorateFactory.Kind.HOST)?.decorate(it) as? String
} ?: "",
mediaType = mediaType,
create = creator,
modifier = modifier,
Expand Down