From a76e2318dd2731ff713df6e262396a9175d029f7 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 13 二月 2026 09:18:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/dmmall_web/src/main/java/com/doumee/api/web/ApiController.java |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/server/dmmall_web/src/main/java/com/doumee/api/web/ApiController.java b/server/dmmall_web/src/main/java/com/doumee/api/web/ApiController.java
index 8ab6bf6..9dcb8c5 100644
--- a/server/dmmall_web/src/main/java/com/doumee/api/web/ApiController.java
+++ b/server/dmmall_web/src/main/java/com/doumee/api/web/ApiController.java
@@ -57,6 +57,9 @@
     public GoodsorderService goodsorderService;
 
     @Autowired
+    public SearchHistoryService searchHistoryService;
+
+    @Autowired
     public ShopService shopService;
 
     @Autowired
@@ -158,6 +161,14 @@
         HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
         return request;
     }
+
+    protected String getToken() {
+        Object obj = this.getRequest().getAttribute(JwtTokenUtil.HEADER_KEY);
+        return obj != null ? (String) obj : null;
+    }
+
+
+
     /**
      * 鑾峰彇鐢ㄦ埛ID
      *

--
Gitblit v1.9.3