From f97c24cdc8467409fd44e5b70064df1159c3448a Mon Sep 17 00:00:00 2001
From: rays <1615175118@qq.com>
Date: Fri, 21 Jan 2022 11:26:16 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=907.1.6=E3=80=91=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E8=B5=84=E6=BA=90=E6=B1=87=E6=8A=A5token=E6=9C=89=E6=95=88?=
 =?UTF-8?q?=E6=9C=9F=E6=97=B6=E9=97=B4=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scanner/api/pojo/devops/DevOpsReportProperties.java      | 5 +++++
 .../resource/service/impl/SysResourceServiceImpl.java        | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/kernel-d-scanner/scanner-api/src/main/java/cn/stylefeng/roses/kernel/scanner/api/pojo/devops/DevOpsReportProperties.java b/kernel-d-scanner/scanner-api/src/main/java/cn/stylefeng/roses/kernel/scanner/api/pojo/devops/DevOpsReportProperties.java
index 5d4d8b2f9..1128ddb88 100644
--- a/kernel-d-scanner/scanner-api/src/main/java/cn/stylefeng/roses/kernel/scanner/api/pojo/devops/DevOpsReportProperties.java
+++ b/kernel-d-scanner/scanner-api/src/main/java/cn/stylefeng/roses/kernel/scanner/api/pojo/devops/DevOpsReportProperties.java
@@ -27,6 +27,11 @@ public class DevOpsReportProperties {
      */
     private String projectInteractionSecretKey;
 
+    /**
+     * Token的有效期
+     */
+    private Long tokenValidityPeriodSeconds;
+
     /**
      * FieldMetadata类的全路径
      * <p>
diff --git a/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/service/impl/SysResourceServiceImpl.java b/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/service/impl/SysResourceServiceImpl.java
index 007e9ecbe..2dfa2279d 100644
--- a/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/service/impl/SysResourceServiceImpl.java
+++ b/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/service/impl/SysResourceServiceImpl.java
@@ -287,7 +287,6 @@ public class SysResourceServiceImpl extends ServiceImpl<SysResourceMapper, SysRe
         this.remove(wrapper);
     }
 
-
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void reportResources(@RequestBody ReportResourceParam reportResourceReq) {
@@ -414,9 +413,10 @@ public class SysResourceServiceImpl extends ServiceImpl<SysResourceMapper, SysRe
 
         // jwt token生成
         String projectInteractionSecretKey = devOpsReportProperties.getProjectInteractionSecretKey();
+        Long tokenValidityPeriodSeconds = devOpsReportProperties.getTokenValidityPeriodSeconds();
         JwtConfig jwtConfig = new JwtConfig();
         jwtConfig.setJwtSecret(projectInteractionSecretKey);
-        jwtConfig.setExpiredSeconds(DEVOPS_REPORT_TIMEOUT_SECONDS);
+        jwtConfig.setExpiredSeconds(ObjectUtil.isNotEmpty(tokenValidityPeriodSeconds) ? tokenValidityPeriodSeconds : DEVOPS_REPORT_TIMEOUT_SECONDS);
         JwtTokenOperator jwtTokenOperator = new JwtTokenOperator(jwtConfig);
         String jwtToken = jwtTokenOperator.generateToken(new HashMap<>());