From a96e0fe63ebb45425ed8d799213b3b8795cf8e92 Mon Sep 17 00:00:00 2001 From: zacYL <100330102+zacYL@users.noreply.github.com> Date: Fri, 1 Nov 2024 18:08:05 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E5=A4=8D=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E9=A1=BA=E5=BA=8F=E5=8F=98=E6=9B=B4=E5=AF=BC=E8=87=B4=E7=B4=A2?= =?UTF-8?q?=E5=BC=95=E6=9B=B4=E6=96=B0=E5=A4=B1=E8=B4=A5=E9=97=AE=E9=A2=98?= =?UTF-8?q?#2725?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rpm/artifact/repository/RpmLocalRepository.kt | 4 ++-- .../tencent/bkrepo/rpm/util/rpm/RpmMetadataUtils.kt | 2 +- .../bkrepo/rpm/util/xStream/pojo/RpmMetadata.kt | 12 ++++++------ .../rpm/util/xStream/pojo/RpmMetadataChangeLog.kt | 7 +++---- .../rpm/util/xStream/pojo/RpmMetadataFileList.kt | 7 +++---- 5 files changed, 15 insertions(+), 17 deletions(-) diff --git a/src/backend/rpm/biz-rpm/src/main/kotlin/com/tencent/bkrepo/rpm/artifact/repository/RpmLocalRepository.kt b/src/backend/rpm/biz-rpm/src/main/kotlin/com/tencent/bkrepo/rpm/artifact/repository/RpmLocalRepository.kt index 7eeb794d74..2439905e6d 100644 --- a/src/backend/rpm/biz-rpm/src/main/kotlin/com/tencent/bkrepo/rpm/artifact/repository/RpmLocalRepository.kt +++ b/src/backend/rpm/biz-rpm/src/main/kotlin/com/tencent/bkrepo/rpm/artifact/repository/RpmLocalRepository.kt @@ -239,7 +239,7 @@ class RpmLocalRepository( rpmMetadata.packages[0].format.changeLogs ) ), - 1L + packageNum = 1L ) stopWatch.start("storeOthers") storeIndexMarkFile( @@ -256,7 +256,7 @@ class RpmLocalRepository( rpmMetadata.packages[0].format.files ) ), - 1L + packageNum = 1L ) stopWatch.start("storeFilelists") storeIndexMarkFile( diff --git a/src/backend/rpm/biz-rpm/src/main/kotlin/com/tencent/bkrepo/rpm/util/rpm/RpmMetadataUtils.kt b/src/backend/rpm/biz-rpm/src/main/kotlin/com/tencent/bkrepo/rpm/util/rpm/RpmMetadataUtils.kt index 9d6643287c..66a40e5a63 100644 --- a/src/backend/rpm/biz-rpm/src/main/kotlin/com/tencent/bkrepo/rpm/util/rpm/RpmMetadataUtils.kt +++ b/src/backend/rpm/biz-rpm/src/main/kotlin/com/tencent/bkrepo/rpm/util/rpm/RpmMetadataUtils.kt @@ -113,7 +113,7 @@ object RpmMetadataUtils { ) ) ), - 1L + packageNum = 1L ) } diff --git a/src/backend/rpm/biz-rpm/src/main/kotlin/com/tencent/bkrepo/rpm/util/xStream/pojo/RpmMetadata.kt b/src/backend/rpm/biz-rpm/src/main/kotlin/com/tencent/bkrepo/rpm/util/xStream/pojo/RpmMetadata.kt index aff92c6597..340bb8ce88 100644 --- a/src/backend/rpm/biz-rpm/src/main/kotlin/com/tencent/bkrepo/rpm/util/xStream/pojo/RpmMetadata.kt +++ b/src/backend/rpm/biz-rpm/src/main/kotlin/com/tencent/bkrepo/rpm/util/xStream/pojo/RpmMetadata.kt @@ -40,14 +40,14 @@ class RpmMetadata( @XStreamImplicit(itemFieldName = "package") override val packages: List, @XStreamAsAttribute - @XStreamAlias("packages") - override var packageNum: Long -) : RpmXmlMetadata(packages, packageNum) { - @XStreamAsAttribute - val xmlns: String = "http://linux.duke.edu/metadata/common" + val xmlns: String = "http://linux.duke.edu/metadata/common", @XStreamAsAttribute @XStreamAlias("xmlns:rpm") - val rpm: String = "http://linux.duke.edu/metadata/rpm" + val rpm: String = "http://linux.duke.edu/metadata/rpm", + @XStreamAsAttribute + @XStreamAlias("packages") + override var packageNum: Long, +) : RpmXmlMetadata(packages, packageNum) { fun filterRpmFileLists() { packages[0].format.files = packages[0].format.files.filter { diff --git a/src/backend/rpm/biz-rpm/src/main/kotlin/com/tencent/bkrepo/rpm/util/xStream/pojo/RpmMetadataChangeLog.kt b/src/backend/rpm/biz-rpm/src/main/kotlin/com/tencent/bkrepo/rpm/util/xStream/pojo/RpmMetadataChangeLog.kt index 7555364c59..31cefef05d 100644 --- a/src/backend/rpm/biz-rpm/src/main/kotlin/com/tencent/bkrepo/rpm/util/xStream/pojo/RpmMetadataChangeLog.kt +++ b/src/backend/rpm/biz-rpm/src/main/kotlin/com/tencent/bkrepo/rpm/util/xStream/pojo/RpmMetadataChangeLog.kt @@ -40,9 +40,8 @@ class RpmMetadataChangeLog( @XStreamImplicit(itemFieldName = "package") override val packages: List, @XStreamAsAttribute + val xmlns: String = "http://linux.duke.edu/metadata/other", + @XStreamAsAttribute @XStreamAlias("packages") override var packageNum: Long -) : RpmXmlMetadata(packages, packageNum) { - @XStreamAsAttribute - val xmlns: String = "http://linux.duke.edu/metadata/other" -} +) : RpmXmlMetadata(packages, packageNum) diff --git a/src/backend/rpm/biz-rpm/src/main/kotlin/com/tencent/bkrepo/rpm/util/xStream/pojo/RpmMetadataFileList.kt b/src/backend/rpm/biz-rpm/src/main/kotlin/com/tencent/bkrepo/rpm/util/xStream/pojo/RpmMetadataFileList.kt index 5e3ceb6cf6..e263d81a2e 100644 --- a/src/backend/rpm/biz-rpm/src/main/kotlin/com/tencent/bkrepo/rpm/util/xStream/pojo/RpmMetadataFileList.kt +++ b/src/backend/rpm/biz-rpm/src/main/kotlin/com/tencent/bkrepo/rpm/util/xStream/pojo/RpmMetadataFileList.kt @@ -40,9 +40,8 @@ class RpmMetadataFileList( @XStreamImplicit(itemFieldName = "package") override val packages: List, @XStreamAsAttribute + val xmlns: String = "http://linux.duke.edu/metadata/filelists", + @XStreamAsAttribute @XStreamAlias("packages") override var packageNum: Long -) : RpmXmlMetadata(packages, packageNum) { - @XStreamAsAttribute - val xmlns: String = "http://linux.duke.edu/metadata/filelists" -} +) : RpmXmlMetadata(packages, packageNum)