Merge remote-tracking branch 'origin/master' into rbac

TencentBlueKing · Aug 8, 2023 · 8dd3543 · 8dd3543
2 parents 5ab788f + 7ea10e4
commit 8dd3543
Show file tree

Hide file tree

Showing 6 changed files with 54 additions and 15 deletions.
diff --git a/.../core/store/api-store/src/main/kotlin/com/tencent/devops/store/api/atom/OpAtomResource.kt b/.../core/store/api-store/src/main/kotlin/com/tencent/devops/store/api/atom/OpAtomResource.kt
@@ -42,6 +42,7 @@ import com.tencent.devops.store.pojo.atom.AtomUpdateRequest
 import com.tencent.devops.store.pojo.atom.enums.AtomStatusEnum
 import com.tencent.devops.store.pojo.atom.enums.AtomTypeEnum
 import com.tencent.devops.store.pojo.atom.enums.OpSortTypeEnum
+import com.tencent.devops.store.pojo.common.enums.ReleaseTypeEnum
 import io.swagger.annotations.Api
 import io.swagger.annotations.ApiOperation
 import io.swagger.annotations.ApiParam
@@ -217,7 +218,16 @@ interface OpAtomResource {
         @FormDataParam("file")
         inputStream: InputStream,
         @FormDataParam("file")
-        disposition: FormDataContentDisposition
+        disposition: FormDataContentDisposition,
+        @ApiParam("发布者", required = false)
+        @QueryParam("publisher")
+        publisher: String? = null,
+        @ApiParam("发布类型", required = false)
+        @QueryParam("releaseType")
+        releaseType: ReleaseTypeEnum? = null,
+        @ApiParam("插件版本", required = false)
+        @QueryParam("version")
+        version: String? = null
     ): Result<Boolean>
 
     @ApiOperation("设置插件为默认插件")

diff --git a/...ci/core/store/api-store/src/main/kotlin/com/tencent/devops/store/pojo/atom/VersionInfo.kt b/...ci/core/store/api-store/src/main/kotlin/com/tencent/devops/store/pojo/atom/VersionInfo.kt
@@ -35,11 +35,11 @@ import io.swagger.annotations.ApiModelProperty
 @ApiModel("版本信息")
 data class VersionInfo(
     @ApiModelProperty("发布者", required = true)
-    val publisher: String,
+    var publisher: String,
     @ApiModelProperty("发布类型", required = true)
-    val releaseType: ReleaseTypeEnum,
+    var releaseType: ReleaseTypeEnum,
     @ApiModelProperty("插件版本", required = true)
-    val version: String,
+    var version: String,
     @ApiModelProperty("版本日志内容", required = true)
     @field:BkField(maxLength = 65535)
     val versionContent: String

diff --git a/...e/biz-store/src/main/kotlin/com/tencent/devops/store/resources/atom/OpAtomResourceImpl.kt b/...e/biz-store/src/main/kotlin/com/tencent/devops/store/resources/atom/OpAtomResourceImpl.kt
@@ -39,6 +39,7 @@ import com.tencent.devops.store.pojo.atom.AtomUpdateRequest
 import com.tencent.devops.store.pojo.atom.enums.AtomStatusEnum
 import com.tencent.devops.store.pojo.atom.enums.AtomTypeEnum
 import com.tencent.devops.store.pojo.atom.enums.OpSortTypeEnum
+import com.tencent.devops.store.pojo.common.enums.ReleaseTypeEnum
 import com.tencent.devops.store.service.atom.AtomReleaseService
 import com.tencent.devops.store.service.atom.AtomService
 import com.tencent.devops.store.service.atom.MarketAtomService
@@ -127,7 +128,10 @@ class OpAtomResourceImpl @Autowired constructor(
         userId: String,
         atomCode: String,
         inputStream: InputStream,
-        disposition: FormDataContentDisposition
+        disposition: FormDataContentDisposition,
+        publisher: String?,
+        releaseType: ReleaseTypeEnum?,
+        version: String?
     ): Result<Boolean> {
         return opAtomService.releaseAtom(
             userId = userId,

diff --git a/...re/store/biz-store/src/main/kotlin/com/tencent/devops/store/service/atom/OpAtomService.kt b/...re/store/biz-store/src/main/kotlin/com/tencent/devops/store/service/atom/OpAtomService.kt
@@ -34,6 +34,7 @@ import com.tencent.devops.store.pojo.atom.AtomResp
 import com.tencent.devops.store.pojo.atom.enums.AtomStatusEnum
 import com.tencent.devops.store.pojo.atom.enums.AtomTypeEnum
 import com.tencent.devops.store.pojo.atom.enums.OpSortTypeEnum
+import com.tencent.devops.store.pojo.common.enums.ReleaseTypeEnum
 import org.glassfish.jersey.media.multipart.FormDataContentDisposition
 import java.io.InputStream
 
@@ -79,7 +80,10 @@ interface OpAtomService {
         userId: String,
         atomCode: String,
         inputStream: InputStream,
-        disposition: FormDataContentDisposition
+        disposition: FormDataContentDisposition,
+        publisher: String? = null,
+        releaseType: ReleaseTypeEnum? = null,
+        version: String? = null
     ): Result<Boolean>
 
     /**

diff --git a/...biz-store/src/main/kotlin/com/tencent/devops/store/service/atom/impl/OpAtomServiceImpl.kt b/...biz-store/src/main/kotlin/com/tencent/devops/store/service/atom/impl/OpAtomServiceImpl.kt
@@ -364,7 +364,10 @@ class OpAtomServiceImpl @Autowired constructor(
         userId: String,
         atomCode: String,
         inputStream: InputStream,
-        disposition: FormDataContentDisposition
+        disposition: FormDataContentDisposition,
+        publisher: String?,
+        releaseType: ReleaseTypeEnum?,
+        version: String?
     ): Result<Boolean> {
         // 解压插件包到临时目录
         val fileName = disposition.fileName
@@ -401,7 +404,25 @@ class OpAtomServiceImpl @Autowired constructor(
                 language = I18nUtil.getLanguage(userId)
             )
         }
-        if (releaseInfo.versionInfo.releaseType == ReleaseTypeEnum.NEW) {
+        val versionInfo = releaseInfo.versionInfo
+        if (!publisher.isNullOrBlank()) {
+            // 如果接口query参数的发布者不为空，发布者以接口query参数的发布者为准
+            versionInfo.publisher = publisher
+        }
+        releaseType?.let {
+            // 如果接口query参数的发布类型不为空，发布类型以接口query参数的发布类型为准
+            versionInfo.releaseType = releaseType
+        }
+        if (!version.isNullOrBlank()) {
+            // 如果接口query参数的版本号不为空，发布者以接口query参数的版本号为准
+            versionInfo.version = version
+        }
+        if (versionInfo.releaseType == ReleaseTypeEnum.NEW && atomDao.getPipelineAtom(
+                dslContext = dslContext,
+                atomCode = atomCode,
+                version = INIT_VERSION
+            ) == null
+        ) {
             // 新增插件
             val addMarketAtomResult = atomReleaseService.addMarketAtom(
                 userId,
@@ -479,9 +500,9 @@ class OpAtomServiceImpl @Autowired constructor(
                     userId = userId,
                     projectCode = releaseInfo.projectId,
                     atomCode = atomCode,
-                    version = releaseInfo.versionInfo.version,
+                    version = versionInfo.version,
                     serviceUrlPrefix = client.getServiceUrl(ServiceArchiveAtomFileResource::class),
-                    releaseType = releaseInfo.versionInfo.releaseType.name,
+                    releaseType = versionInfo.releaseType.name,
                     file = file,
                     os = JsonUtil.toJson(releaseInfo.os)
                 )
@@ -518,10 +539,10 @@ class OpAtomServiceImpl @Autowired constructor(
                 os = releaseInfo.os,
                 summary = releaseInfo.summary,
                 description = releaseInfo.description,
-                version = releaseInfo.versionInfo.version,
-                releaseType = releaseInfo.versionInfo.releaseType,
-                versionContent = releaseInfo.versionInfo.versionContent,
-                publisher = releaseInfo.versionInfo.publisher,
+                version = versionInfo.version,
+                releaseType = versionInfo.releaseType,
+                versionContent = versionInfo.versionContent,
+                publisher = versionInfo.publisher,
                 labelIdList = labelIds,
                 frontendType = releaseInfo.configInfo.frontendType,
                 logoUrl = releaseInfo.logoUrl,

diff --git a/support-files/sql/5001_init_dml/5001_ci_project-init_dml_mysql.sql b/support-files/sql/5001_init_dml/5001_ci_project-init_dml_mysql.sql
@@ -13,7 +13,7 @@ INSERT IGNORE INTO `T_SERVICE` (`name`, `english_name`, `service_type_id`, `link
 INSERT IGNORE INTO `T_SERVICE` (`name`, `english_name`, `service_type_id`, `link`, `link_new`, `inject_type`, `iframe_url`, `css_url`, `js_url`, `show_project_list`, `show_nav`, `project_id_type`, `status`, `created_user`, `created_time`, `updated_user`, `updated_time`, `deleted`, `gray_css_url`, `gray_js_url`, `weight`, `logo_url`, `web_socket`) VALUES ('敏捷开发(Teamwork)', 'Teamwork', 1, '/teamwork/', '/teamwork/', 'amd', '', '/teamwork/teamwork.css', '/teamwork/teamwork.js', b'1', b'1', 'path', 'planning', 'system', '2019-06-05 17:12:48', 'system', '2019-06-05 17:12:48', b'1', '', '', 90, 'teamwork', '');
 INSERT IGNORE INTO `T_SERVICE` (`name`, `english_name`, `service_type_id`, `link`, `link_new`, `inject_type`, `iframe_url`, `css_url`, `js_url`, `show_project_list`, `show_nav`, `project_id_type`, `status`, `created_user`, `created_time`, `updated_user`, `updated_time`, `deleted`, `gray_css_url`, `gray_js_url`, `weight`, `logo_url`, `web_socket`) VALUES ('编译加速(Turbo)', 'Turbo', 2, '/turbo/', '/turbo/', 'amd', '', '', '', b'1', b'1', 'path', 'planning', 'system', '2019-06-05 17:12:47', NULL, '2019-06-05 17:12:47', b'1', NULL, NULL, 89, 'turbo', '');
 INSERT IGNORE INTO `T_SERVICE` (`name`, `english_name`, `service_type_id`, `link`, `link_new`, `inject_type`, `iframe_url`, `css_url`, `js_url`, `show_project_list`, `show_nav`, `project_id_type`, `status`, `created_user`, `created_time`, `updated_user`, `updated_time`, `deleted`, `gray_css_url`, `gray_js_url`, `weight`, `logo_url`, `web_socket`) VALUES ('Metrics 看板(Metrics)', 'Metrics', 8, '/metrics/', '/metrics/', 'iframe', '/metrics/', '', '', b'1', b'1', 'path', 'new', 'system', '2022-10-24 21:11:48', 'system', '2022-10-24 21:11:48', b'0', '', '', 99, 'metrics', '');
-INSERT IGNORE INTO `T_SERVICE` (`name`, `english_name`, `service_type_id`, `link`, `link_new`, `inject_type`, `iframe_url`, `css_url`, `js_url`, `show_project_list`, `show_nav`, `project_id_type`, `status`, `created_user`, `created_time`, `updated_user`, `updated_time`, `deleted`, `gray_css_url`, `gray_js_url`, `weight`, `logo_url`, `web_socket`) VALUES ('项目管理(manage)', 'Project', 8, '/manage/', '/manage/', 'iframe', '/manage/', '', '', b'1', b'1', 'path', 'planning', 'system', '2023-04-06 11:13:26', 'system', '2023-04-06 11:13:26', b'0', '', '', 97, 'project', '');
+INSERT IGNORE INTO `T_SERVICE` (`name`, `english_name`, `service_type_id`, `link`, `link_new`, `inject_type`, `iframe_url`, `css_url`, `js_url`, `show_project_list`, `show_nav`, `project_id_type`, `status`, `created_user`, `created_time`, `updated_user`, `updated_time`, `deleted`, `gray_css_url`, `gray_js_url`, `weight`, `logo_url`, `web_socket`) VALUES ('项目管理(manage)', 'Project', 8, '/manage/', '/manage/', 'iframe', '/manage/', '', '', b'0', b'1', 'path', 'planning', 'system', '2023-04-06 11:13:26', 'system', '2023-04-06 11:13:26', b'0', '', '', 97, 'project', '');
 INSERT IGNORE INTO `T_SERVICE` (`name`, `english_name`, `service_type_id`, `link`, `link_new`, `inject_type`, `iframe_url`, `css_url`, `js_url`, `show_project_list`, `show_nav`, `project_id_type`, `status`, `created_user`, `created_time`, `updated_user`, `updated_time`, `deleted`, `gray_css_url`, `gray_js_url`, `weight`, `logo_url`, `web_socket`) VALUES ('权限管理(permission)', 'Permission', 8, '/permission/', '/permission/', 'iframe', '/permission/', '', '', b'0', b'1', 'path', 'ok', 'system', '2023-04-06 11:13:26', 'system', '2023-04-06 11:13:26', b'0', '', '', 97, 'perm', '');
 INSERT IGNORE INTO `T_SERVICE` (`name`, `english_name`, `service_type_id`, `link`, `link_new`, `inject_type`, `iframe_url`, `css_url`, `js_url`, `show_project_list`, `show_nav`, `project_id_type`, `status`, `created_user`, `created_time`, `updated_user`, `updated_time`, `deleted`, `gray_css_url`, `gray_js_url`, `weight`, `logo_url`, `web_socket`) VALUES ('制品库(Repo)', 'Repo', 2, '/repo/', '/repo/', 'iframe', 'https://bkrepo.yourdomain.com/ui/', '', '', b'1', b'1', 'path', 'planning', 'system', '2021-06-17 10:58:25', 'system', '2021-06-17 10:58:25', b'1', '', '', 96, 'artifactory', '');