From 1f9660d7bdbf7e40124fffc689f563295e8eff3d Mon Sep 17 00:00:00 2001
From: wangfukang <15630117759@163.com>
Date: Tue, 5 Nov 2024 10:18:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E6=AC=BE=E7=A0=81=E9=87=8D=E5=AE=9A?=
 =?UTF-8?q?=E5=90=91=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hiver-admin/src/main/resources/application.yml   |  1 +
 hiver-admin/test-output/test-report.html         | 16 ++++++++--------
 .../hiver/mall/controller/OrderController.java   | 12 ++++++++++++
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/hiver-admin/src/main/resources/application.yml b/hiver-admin/src/main/resources/application.yml
index 4c6b3099..624d977c 100644
--- a/hiver-admin/src/main/resources/application.yml
+++ b/hiver-admin/src/main/resources/application.yml
@@ -347,6 +347,7 @@ ignored:
     - /hiver/app/dealingRecord/getDealingsRecordList
     - /hiver/app/customer/getCustomerData
     - /hiver/app/supplier/getSupplierData
+    - /hiver/order/redirect
 
     # 临时增加
     - /hiver/app/logisticsOrder/addLogisticsOrder
diff --git a/hiver-admin/test-output/test-report.html b/hiver-admin/test-output/test-report.html
index 04b00a53..dc777ae8 100644
--- a/hiver-admin/test-output/test-report.html
+++ b/hiver-admin/test-output/test-report.html
@@ -35,7 +35,7 @@
 <a href="#"><span class="badge badge-primary">Hiver</span></a>
 </li>
 <li class="m-r-10">
-<a href="#"><span class="badge badge-primary">ʮԠ26, 2024 01:12:03</span></a>
+<a href="#"><span class="badge badge-primary">ʮһÔ 04, 2024 16:58:16</span></a>
 </li>
 </ul>
 </div>
@@ -84,7 +84,7 @@
           <div class="test-detail">
             <span class="meta text-white badge badge-sm"></span>
             <p class="name">passTest</p>
-            <p class="text-sm"><span>01:12:03 ÉÏÎç</span> / <span>0.015 secs</span></p>
+            <p class="text-sm"><span>16:58:17 ÏÂÎç</span> / <span>0.017 secs</span></p>
           </div>
           <div class="test-contents d-none">
 <div class="detail-head">
@@ -92,9 +92,9 @@
 <div class="info">
 <div class='float-right'><span class='badge badge-default'>#test-id=1</span></div>
 <h5 class="test-status text-pass">passTest</h5>
-<span class='badge badge-success'>10.26.2024 01:12:03</span>
-<span class='badge badge-danger'>10.26.2024 01:12:03</span>
-<span class='badge badge-default'>0.015 secs</span>
+<span class='badge badge-success'>11.04.2024 16:58:17</span>
+<span class='badge badge-danger'>11.04.2024 16:58:17</span>
+<span class='badge badge-default'>0.017 secs</span>
 </div>
 <div class="m-t-10 m-l-5"></div>
 </div>
@@ -104,7 +104,7 @@
   <tbody>
       <tr class="event-row">
         <td><span class="badge log pass-bg">Pass</span></td>
-        <td>1:12:03</td>
+        <td>16:58:17</td>
         <td>
           Test passed
         </td>
@@ -128,13 +128,13 @@
 <div class="col-md-3">
 <div class="card"><div class="card-body">
 <p class="m-b-0">Started</p>
-<h3>ʮԠ26, 2024 01:12:03</h3>
+<h3>ʮһÔ 04, 2024 16:58:16</h3>
 </div></div>
 </div>
 <div class="col-md-3">
 <div class="card"><div class="card-body">
 <p class="m-b-0">Ended</p>
-<h3>ʮԠ26, 2024 01:12:03</h3>
+<h3>ʮһÔ 04, 2024 16:58:17</h3>
 </div></div>
 </div>
 <div class="col-md-3">
diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/OrderController.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/OrderController.java
index 357f8abc..e54fc2d4 100644
--- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/OrderController.java
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/OrderController.java
@@ -37,6 +37,9 @@ import org.springframework.cache.annotation.CacheConfig;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.dao.OptimisticLockingFailureException;
 import org.springframework.data.domain.Page;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -47,6 +50,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.net.HttpURLConnection;
+import java.net.URI;
 import java.net.URL;
 import java.util.Date;
 import java.util.List;
@@ -533,4 +537,12 @@ public class OrderController {
         }
         return null;
     }
+
+    @GetMapping("/redirect")
+    public ResponseEntity<Void> redirect() {
+        String url = "https://qr.95516.com/01020001/wcqr?f=ICBCqr&X=1&T=3&P=13&I=e03d925776684b4d&N=b4cbb142eeafe2bddce7a7878c57f5ca&L=3f7aafc9dbc03de742513fbb73a3380023c77748dbca0813d7a49f63159d542ed2f1e45fac242c519fb6c9a3a51a8caaa3b79f53b538a276";
+        HttpHeaders headers = new HttpHeaders();
+        headers.setLocation(URI.create(url));
+        return new ResponseEntity<>(headers, HttpStatus.FOUND);
+    }
 }