From 39c387dbed3017049a48b8ec2a23cb13be296d13 Mon Sep 17 00:00:00 2001
From: zhangqinbin <181961702@qq.com>
Date: Tue, 13 Apr 2021 09:49:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=88=B3=E6=9C=8D=E5=8A=A1BU?=
 =?UTF-8?q?G=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../timeService/TimeServiceConstant.java      | 21 ++++++++++++++-----
 .../controller/TimeServiceController.java     |  8 +++----
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/timeService/TimeServiceConstant.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/timeService/TimeServiceConstant.java
index 3f300f2..bfd086d 100644
--- a/src/main/java/com/chinaunicom/mall/ebtp/extend/timeService/TimeServiceConstant.java
+++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/timeService/TimeServiceConstant.java
@@ -64,7 +64,21 @@ public class TimeServiceConstant {
      * @param timestamp 时间戳加密原文
      * @return 时间戳对象
      */
-    public TSAVerifyResult verifyTimeStamp(String timestamp){
+    public TtsAgent.TtsParseResult verifyTimeStamp2(String timestamp){
+        try{
+            log.info("timestamp -->"+timestamp);
+            TSAVerifyResult verifyResult = this.verifyTimeStamp(timestamp);
+            String time = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(verifyResult.getSignedTime());
+            TtsAgent.TtsParseResult ttsParseResult = new TtsAgent.TtsParseResult(time, HelperUtil.bytesToHexString(verifyResult.getData()),
+                    verifyResult.getSignerSubject());
+            return ttsParseResult;
+        }catch (Exception e){
+            log.error("解析时间戳", e);
+        }
+        return null;
+    }
+
+    private TSAVerifyResult verifyTimeStamp(String timestamp){
         try{
             log.info("timestamp -->"+timestamp);
             TSAVerifyResult verifyResult = client.verifyTimeStamp(Base64.decodeBase64(timestamp));
@@ -83,10 +97,7 @@ public class TimeServiceConstant {
     public TtsAgent.TtsParseResult getServiceTimeObj(String data){
         try{
             String timestamp = this.signTimeStamp(data);
-            TSAVerifyResult verifyResult = this.verifyTimeStamp(timestamp);
-            String time = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(verifyResult.getSignedTime());
-            TtsAgent.TtsParseResult ttsParseResult = new TtsAgent.TtsParseResult(time, HelperUtil.bytesToHexString(verifyResult.getData()),
-                    verifyResult.getSignerSubject());
+            TtsAgent.TtsParseResult ttsParseResult = this.verifyTimeStamp2(timestamp);
             return ttsParseResult;
         }catch (Exception e){
             log.error("获取时间戳异常", e);
diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/timeService/controller/TimeServiceController.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/timeService/controller/TimeServiceController.java
index d2e8503..3720306 100644
--- a/src/main/java/com/chinaunicom/mall/ebtp/extend/timeService/controller/TimeServiceController.java
+++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/timeService/controller/TimeServiceController.java
@@ -39,10 +39,10 @@ public class TimeServiceController {
      * @return 时间戳对象
      */
     @ApiOperation("解析时间戳加密原文")
-    @GetMapping(value = "/verifyTimeStamp")
-    public BaseResponse<TSAVerifyResult> verifyTimeStamp(@ApiParam(value = "时间戳加密原文", required = true) @RequestBody String timestamp) {
+    @PostMapping(value = "/verifyTimeStamp")
+    public BaseResponse<TtsAgent.TtsParseResult> verifyTimeStamp(@ApiParam(value = "时间戳加密原文", required = true) @RequestBody String timestamp) {
         TimeServiceConstant constant = new TimeServiceConstant();
-        return BaseResponse.success(constant.verifyTimeStamp(timestamp));
+        return BaseResponse.success(constant.verifyTimeStamp2(timestamp));
     }
 
     /**
@@ -51,7 +51,7 @@ public class TimeServiceController {
      * @return 时间戳对象
      */
     @ApiOperation("直接获取时间戳对象（内涵日期）")
-    @PostMapping(value = "/getServiceTimeObj")
+    @GetMapping(value = "/getServiceTimeObj")
     public BaseResponse<TtsAgent.TtsParseResult> getServiceTimeObj(@ApiParam(value = "待申请时间戳的原文", required = false) @RequestParam(name = "data",required = false) String data) {
         TimeServiceConstant constant = new TimeServiceConstant();
         return BaseResponse.success(constant.getServiceTimeObj(data));