From e606ce895a18f6971604c49fc3e2415f23e3804e Mon Sep 17 00:00:00 2001
From: guoyuqi <xiaomeinvG@126.com>
Date: Tue, 15 Feb 2022 18:21:32 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E9=A1=B9=E7=9B=AE=E8=AE=BE=E7=BD=AE):=20?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=AF=94=E8=BE=83=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--user=郭雨琦 时间比较修改
---
 .../io/metersphere/api/service/ShareInfoService.java |  4 ++--
 .../io/metersphere/api/service/utils/ShareUtill.java | 12 ++++++------
 .../resources/db/migration/V107__v1.18_release.sql   | 11 +++++++++++
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/service/ShareInfoService.java b/backend/src/main/java/io/metersphere/api/service/ShareInfoService.java
index 5519485b37..91a9d074c4 100644
--- a/backend/src/main/java/io/metersphere/api/service/ShareInfoService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ShareInfoService.java
@@ -534,14 +534,14 @@ public class ShareInfoService {
                 millisCheck(shareInfo,1000 * 60 * 60 * 24);
             }else {
                 String expr= projectApplication.getShareReportExpr();
-                long timeMills = getTimeMills(expr);
+                long timeMills = getTimeMills(shareInfo.getUpdateTime(),expr);
                 millisCheck(shareInfo,timeMills);
             }
         }
     }
 
     private void millisCheck(ShareInfo shareInfo, long millis) {
-        if (System.currentTimeMillis() - shareInfo.getUpdateTime() > millis) {
+        if (shareInfo.getUpdateTime()<millis) {
             shareInfoMapper.deleteByPrimaryKey(shareInfo.getId());
             MSException.throwException("连接已失效，请重新获取!");
         }
diff --git a/backend/src/main/java/io/metersphere/api/service/utils/ShareUtill.java b/backend/src/main/java/io/metersphere/api/service/utils/ShareUtill.java
index d1ab6aa11d..16cc933f27 100644
--- a/backend/src/main/java/io/metersphere/api/service/utils/ShareUtill.java
+++ b/backend/src/main/java/io/metersphere/api/service/utils/ShareUtill.java
@@ -1,10 +1,8 @@
 package io.metersphere.api.service.utils;
 
 import org.apache.commons.lang3.StringUtils;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.time.ZoneId;
+
+import java.time.*;
 
 public class ShareUtill {
 
@@ -13,8 +11,10 @@ public class ShareUtill {
     private static final String UNIT_MONTH = "M";
     private static final String UNIT_YEAR = "Y";
 
-    public static long getTimeMills(String expr) {
-        LocalDateTime localDateTime  = LocalDateTime.of(LocalDate.now(), LocalTime.now().withMinute(0).withSecond(0).withNano(0));
+    public static long getTimeMills(long time,String expr) {
+        Instant instant = Instant.ofEpochMilli(time);
+        ZoneId zone = ZoneId.systemDefault();
+        LocalDateTime localDateTime = LocalDateTime.ofInstant(instant, zone);
         long timeMills = 0;
         LocalDateTime date = exprToLocalDateTime(localDateTime, expr);
         if (date != null) {
diff --git a/backend/src/main/resources/db/migration/V107__v1.18_release.sql b/backend/src/main/resources/db/migration/V107__v1.18_release.sql
index bb5f0375cd..4c4464a3b2 100644
--- a/backend/src/main/resources/db/migration/V107__v1.18_release.sql
+++ b/backend/src/main/resources/db/migration/V107__v1.18_release.sql
@@ -10,6 +10,17 @@ CREATE TABLE `operating_log_resource`
  KEY `source_id_index` (`source_id`)
 ) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4 COLLATE utf8mb4_general_ci;
 
+CREATE TABLE IF NOT EXISTS `project_application`
+(
+    `project_id` varchar(50) DEFAULT NULL,
+    `type` varchar(50) DEFAULT NULL,
+    `share_report_expr`varchar(50) NOT NULL DEFAULT '24H',
+    UNIQUE KEY `project_application_pk` (`project_id`, `type`),
+    KEY `project_application_project_id_index` (`project_id`),
+    KEY `project_application_type` (`type`)
+) ENGINE = InnoDB
+  DEFAULT CHARSET = utf8mb4 COLLATE utf8mb4_general_ci;
+
 -- permission
 DROP PROCEDURE IF EXISTS test_personal;
 DELIMITER //