From 8160efc981394d242b15892e0743541b52a321d8 Mon Sep 17 00:00:00 2001
From: huangqizhen <15552608129@163.com>
Date: Sun, 6 Jul 2025 09:53:25 +0800
Subject: [PATCH] =?UTF-8?q?7.6token=E6=8F=90=E5=8F=96=E7=94=A8=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                          | 24 +++++++++++++++++++++-
 .../example/demo/controller/ExportController.java  | 18 ++++++++--------
 src/main/resources/mapper/PermissionMapper.xml     |  1 +
 3 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index bd427c9..ae69c0b 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,24 @@
-# gold-java
+# Gold项目
+
+## springBoot：3.3.6
+
+## java ：JDK21
+
+## Maven：3.9.8
+
+## Mysql：5.7.44        地址端口号：18.143.76.3:3306
+
+### 测试 ：数据库：正式 hwgold aDiw7MERSATdfGta 测试 hwgoldc zB48T55wCsHC8KPz
+
+## 域名
+
+### 测试：hwjb.homilychart.com
+
+### 正式：
+
+
+
+
+
+
 
diff --git a/src/main/java/com/example/demo/controller/ExportController.java b/src/main/java/com/example/demo/controller/ExportController.java
index b773b02..f4f4408 100644
--- a/src/main/java/com/example/demo/controller/ExportController.java
+++ b/src/main/java/com/example/demo/controller/ExportController.java
@@ -1,10 +1,12 @@
 package com.example.demo.controller;
 
 import com.example.demo.Util.BusinessException;
+import com.example.demo.Util.JWTUtil;
 import com.example.demo.Util.RedisLockUtil;
 import com.example.demo.domain.DTO.ConsumeDTO;
 import com.example.demo.domain.DTO.RechargeDTO;
 import com.example.demo.domain.DTO.RefundDTO;
+import com.example.demo.domain.entity.Admin;
 import com.example.demo.domain.entity.Export;
 import com.example.demo.domain.vo.Result;
 import com.example.demo.service.ExportExcelService;
@@ -14,6 +16,7 @@ import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -42,12 +45,14 @@ public class ExportController {
     @Autowired
     private ExportService exportService;
     @PostMapping("/export")
-    public Result export(@RequestBody Export Export)throws  Exception{
+    public Result export(@Valid @RequestBody Export export, @RequestHeader("token") String token) throws Exception {
         try {
-            return Result.success(exportExcelService.getExcel(Export));
+            UserDetails token1= JWTUtil.getUserDetailsList(String.valueOf(token), Admin.class);
+            export.setAccount(Integer.valueOf(token1.getUsername()));
+            return Result.success(exportExcelService.getExcel(export));
         } catch (Exception e) {
             log.error("导出失败", e.getMessage());
-            return Result.error("导出失败"+e.getMessage());
+            return Result.error("导出失败" + e.getMessage());
         }
     }
     @PostMapping("/exportRecharge")
@@ -90,15 +95,10 @@ public class ExportController {
         String requestId = UUID.randomUUID().toString();  // 请求 ID（防止误删锁）
         long expireTime = 5000; // 锁过期时间（5秒）s
         try {
-            // 尝试获取锁
-            if (!redisLockUtil.tryLock(lockKey, requestId, expireTime)) {
-                throw new BusinessException("操作太频繁，请稍后重试");
-            }
-            // 执行业务逻辑
             return exportService.addExportConsume(dto);
         } finally {
             // 释放锁
             redisLockUtil.unlock(lockKey, requestId);
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/resources/mapper/PermissionMapper.xml b/src/main/resources/mapper/PermissionMapper.xml
index f8379ae..3f2b03e 100644
--- a/src/main/resources/mapper/PermissionMapper.xml
+++ b/src/main/resources/mapper/PermissionMapper.xml
@@ -56,6 +56,7 @@
                 admin.postiton=#{postiton}
             </if>
         </where>
+        order by admin.admin_status desc
     </select>
     <select id="getRole" resultType="com.example.demo.domain.entity.Role">
         select * from role