Merge pull request #5043 from royalhuang/issue_4885

feat: 签名模块后台逻辑优化 #4885

src/backend/ci/core/sign/api-sign/src/main/kotlin/com/tencent/devops/sign/api/constant/SignMessageCode.kt

@@ -64,4 +64,5 @@ object SignMessageCode {
     const val ERROR_NOT_AUTH_UPLOAD = "2122016" // 无发起iOS重签名权限
     const val ERROR_UPLOAD_TOKEN_INVALID = "2122017" // 上传IPA使用的token不存在
     const val ERROR_UPLOAD_TOKEN_EXPIRED = "2122018" // 上传IPA使用的token已过期
+    const val ERROR_MP_PARSE_ERROR = "2122019" // 描述文件不存在
 }

src/backend/ci/core/sign/api-sign/src/main/kotlin/com/tencent/devops/sign/api/pojo/IpaSignInfo.kt

@@ -71,5 +71,7 @@ data class IpaSignInfo(
     @ApiModelProperty("拓展应用名和对应的描述文件ID", required = false)
     var appexSignInfo: List<AppexSignInfo>? = null,
     @ApiModelProperty("待替换的plist信息", required = false)
-    var replaceKeyList: Map<String, String>? = null
+    var replaceKeyList: Map<String, String>? = null,
+    @ApiModelProperty("指定xcode签名工具版本", required = false)
+    var codeSignVersion: String? = null
 )

src/backend/ci/core/sign/biz-sign-sample/src/main/kotlin/com/tencent/devops/sign/service/impl/ArchiveServiceImpl.kt

@@ -91,8 +91,8 @@ class ArchiveServiceImpl @Autowired constructor(
                     return false
                 }
             }
-        } catch (e: Exception) {
-            logger.error("artifactory upload file with error. url:$url", e)
+        } catch (ignore: Throwable) {
+            logger.error("artifactory upload file with error. url:$url", ignore)
             return false
         }
         return true

src/backend/ci/core/sign/biz-sign/src/main/kotlin/com/tencent/devops/sign/config/SignExecutorConfig.kt

@@ -36,23 +36,30 @@ import java.util.concurrent.ThreadPoolExecutor.CallerRunsPolicy
 
 @Configuration
 @EnableAsync
-@Suppress("ALL")
 class SignExecutorConfig {
 
     @Bean(name = ["asyncSignExecutor"])
     fun asyncExecutor(): Executor {
         val executor = ThreadPoolTaskExecutor()
-        executor.corePoolSize = 10
-        executor.maxPoolSize = 15
-        executor.setQueueCapacity(25)
-        executor.keepAliveSeconds = 200
+        executor.corePoolSize = CORE_POOL_SIZE
+        executor.maxPoolSize = MAX_POOL_SIZE
+        executor.setQueueCapacity(QUEUE_CAPACITY_SIZE)
+        executor.keepAliveSeconds = KEEP_ALIVE_SECONDS
         executor.threadNamePrefix = "asyncSign-"
         executor.setRejectedExecutionHandler(CallerRunsPolicy())
         // 等待所有任务都完成再继续销毁其他的Bean
         executor.setWaitForTasksToCompleteOnShutdown(true)
         // 线程池中任务的等待时间，如果超过这个时候还没有销毁就强制销毁，以确保应用最后能够被关闭，而不是阻塞住
-        executor.setAwaitTerminationSeconds(60)
+        executor.setAwaitTerminationSeconds(TERMINATION_SECONDS)
         executor.initialize()
         return executor
     }
+
+    companion object {
+        const val CORE_POOL_SIZE = 10
+        const val MAX_POOL_SIZE = 15
+        const val QUEUE_CAPACITY_SIZE = 25
+        const val KEEP_ALIVE_SECONDS = 200
+        const val TERMINATION_SECONDS = 60
+    }
 }

src/backend/ci/core/sign/biz-sign/src/main/kotlin/com/tencent/devops/sign/dao/IpaUploadDao.kt

@@ -34,9 +34,9 @@ import org.springframework.stereotype.Repository
 import java.time.LocalDateTime
 
 @Repository
-@Suppress("ALL")
 class IpaUploadDao {
 
+    @Suppress("LongParameterList")
     fun save(
         dslContext: DSLContext,
         userId: String,

src/backend/ci/core/sign/biz-sign/src/main/kotlin/com/tencent/devops/sign/dao/SignHistoryDao.kt

@@ -35,9 +35,9 @@ import org.springframework.stereotype.Repository
 import java.time.LocalDateTime
 
 @Repository
-@Suppress("ALL")
 class SignHistoryDao {
 
+    @Suppress("LongParameterList")
     fun initHistory(
         dslContext: DSLContext,
         resignId: String,

src/backend/ci/core/sign/biz-sign/src/main/kotlin/com/tencent/devops/sign/dao/SignIpaInfoDao.kt

@@ -36,7 +36,6 @@ import org.springframework.stereotype.Repository
 import com.fasterxml.jackson.module.kotlin.readValue
 
 @Repository
-@Suppress("ALL")
 class SignIpaInfoDao {
 
     fun saveSignInfo(
@@ -129,16 +128,4 @@ class SignIpaInfoDao {
             )
         }
     }
-
-    fun getSignInfoContent(
-        dslContext: DSLContext,
-        resignId: String
-    ): String? {
-        with(TSignIpaInfo.T_SIGN_IPA_INFO) {
-            val record = dslContext.selectFrom(this)
-                .where(RESIGN_ID.eq(resignId))
-                .fetchOne()
-            return record?.requestContent
-        }
-    }
 }

src/backend/ci/core/sign/biz-sign/src/main/kotlin/com/tencent/devops/sign/impl/FileServiceImpl.kt

@@ -40,7 +40,6 @@ import java.io.File
 import java.io.InputStream
 
 @Service
-@Suppress("ALL")
 class FileServiceImpl : FileService {
 
     @Value("\${bkci.sign.tmpDir:/data/enterprise_sign_tmp}")
@@ -111,6 +110,7 @@ class FileServiceImpl : FileService {
         ipaSignInfo: IpaSignInfo,
         resignId: String?
     ): File {
-        return File("$tmpDir/${ipaSignInfo.projectId}/${ipaSignInfo.pipelineId}/${ipaSignInfo.buildId}/$resignId/")
+        return File("$tmpDir/${ipaSignInfo.projectId}/${ipaSignInfo.pipelineId}" +
+            "/${ipaSignInfo.buildId}/$resignId/")
     }
 }