优化提交时间字段

src/main/java/cn/qg/holmes/service/gitlab/impl/PipelineServiceImpl.java

@@ -10,9 +10,12 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jayway.jsonpath.JsonPath;
 import lombok.extern.slf4j.Slf4j;
+import org.joda.time.DateTime;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.text.SimpleDateFormat;
+
 @Slf4j
 @Service
 public class PipelineServiceImpl extends ServiceImpl<PipelineMapper, Pipeline> implements PipelineService {
@@ -31,6 +34,7 @@ public class PipelineServiceImpl extends ServiceImpl<PipelineMapper, Pipeline> i
      */
     @Override
     public void buildPipelineJob(String gitlabData) {
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         String projectName = JsonPath.read(gitlabData, "$.project.name");
         String branch = JsonPath.read(gitlabData, "$.ref").toString().split("/")[2];
         Integer totalCommitCount = JsonPath.read(gitlabData, "$.total_commits_count");
@@ -39,7 +43,8 @@ public class PipelineServiceImpl extends ServiceImpl<PipelineMapper, Pipeline> i
         }
         String message = JsonPath.read(gitlabData, "$.commits[-1].message");
         String author = JsonPath.read(gitlabData, "$.user_username");
-        String commitDate = JsonPath.read(gitlabData, "$.commits[-1].timestamp");
+        // push event给过来的日期为带T的，需要进行转换
+        String commitDate = simpleDateFormat.format(DateTime.parse(JsonPath.read(gitlabData, "$.commits[-1].timestamp")).toDate());
         QueryWrapper<Pipeline> pipelineQueryWrapper = new QueryWrapper<>();
         pipelineQueryWrapper.eq("service_name", projectName);
         pipelineQueryWrapper.eq("service_branch", branch);

src/main/java/cn/qg/holmes/utils/DingdingUtils.java

@@ -2,7 +2,9 @@ package cn.qg.holmes.utils;
 
 import com.alibaba.fastjson.JSON;
 import com.atlassian.jira.rest.client.api.domain.Issue;
+import com.jayway.jsonpath.JsonPath;
 import lombok.extern.slf4j.Slf4j;
+import org.joda.time.DateTime;
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
@@ -178,7 +180,11 @@ public class DingdingUtils {
 
     public static void main(String[] args) {
 //        String markdown = buildMarkdownMsg("YXM-1499", "【羊小咩v7.6.00】【VCC首次交易率提升专题】巴拉巴拉", "黎博", "于巧玲", "p1", "kddsp");
-        String markdown = buildPipelineMarkdownMsg("holmes", "master", "bo.li", "测试", "2021-06-03 14:59:45", "fe");
-        sendToDingding(markdown, "https://oapi.dingtalk.com/robot/send?access_token=835663338d638e40daaf3ab358af741ef0680a826a962c91bedc53b149d85ee1");
+//        String markdown = buildPipelineMarkdownMsg("holmes", "master", "bo.li", "测试", "2021-06-03 14:59:45", "fe");
+//        sendToDingding(markdown, "https://oapi.dingtalk.com/robot/send?access_token=835663338d638e40daaf3ab358af741ef0680a826a962c91bedc53b149d85ee1");
+        String str = "2021-06-03T09:23:00Z";
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        String commitDate = simpleDateFormat.format(DateTime.parse(str).toDate());
+        System.out.println(commitDate);
     }
 }