Merge branch 'refs/heads/huangqizheng/feature-20250704135104-bug修改' into milestone-20250702-金币重构一期

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
+
+### 正式：
+
+
+
+
+
+
 

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);
         }
     }
-}
+}

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