From 90ebdde86eea9405847a1a5c6e5c041e695b4bf0 Mon Sep 17 00:00:00 2001
From: zhangdaiscott <zhangdaiscott@163.com>
Date: Wed, 18 Aug 2021 10:41:31 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89TOKEN=E9=89=B4?=
 =?UTF-8?q?=E6=9D=83=E7=A4=BA=E4=BE=8B=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/JimuReportTokenService.java            | 41 -------------------
 .../config/JimuReportTokenService.java        | 23 ++++++++++-
 2 files changed, 22 insertions(+), 42 deletions(-)
 delete mode 100644 config/JimuReportTokenService.java

diff --git a/config/JimuReportTokenService.java b/config/JimuReportTokenService.java
deleted file mode 100644
index a59a0cc..0000000
--- a/config/JimuReportTokenService.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package org.jeecg.config.jimureport;
-
-import org.jeecg.common.system.api.ISysBaseAPI;
-import org.jeecg.common.system.util.JwtUtil;
-import org.jeecg.common.util.RedisUtil;
-import org.jeecg.common.util.TokenUtils;
-import org.jeecg.modules.jmreport.api.JmReportTokenServiceI;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.stereotype.Component;
-
-import javax.servlet.http.HttpServletRequest;
-
-/**
-* 自定义积木报表鉴权(如果不进行自定义，则所有请求不做权限控制)
- * 1.自定义获取登录token
- * 2.自定义获取登录用户
-*/
-@Component
-class JimuReportTokenService implements JmReportTokenServiceI {
-    @Autowired
-    private ISysBaseAPI sysBaseAPI;
-    @Autowired
-    @Lazy
-    private RedisUtil redisUtil;
-
-    @Override
-    public String getToken(HttpServletRequest request) {
-        return TokenUtils.getTokenByRequest(request);
-    }
-
-    @Override
-    public String getUsername(String token) {
-        return JwtUtil.getUsername(token);
-    }
-
-    @Override
-    public Boolean verifyToken(String token) {
-        return TokenUtils.verifyToken(token, sysBaseAPI, redisUtil);
-    }
-}
diff --git a/jimureport-example/src/main/java/org/jeecg/modules/jmreport/config/JimuReportTokenService.java b/jimureport-example/src/main/java/org/jeecg/modules/jmreport/config/JimuReportTokenService.java
index 3946f7d..a24c8b1 100644
--- a/jimureport-example/src/main/java/org/jeecg/modules/jmreport/config/JimuReportTokenService.java
+++ b/jimureport-example/src/main/java/org/jeecg/modules/jmreport/config/JimuReportTokenService.java
@@ -14,22 +14,43 @@ import javax.servlet.http.HttpServletRequest;
 @Component
 public class JimuReportTokenService implements JmReportTokenServiceI {
 
+    /**
+     * 通过请求获取Token
+     * @param request
+     * @return
+     */
     @Override
     public String getToken(HttpServletRequest request) {
+        //return TokenUtils.getTokenByRequest(request);
         return "123456";
     }
 
+    /**
+     * 通过Token获取登录人用户名
+     * @param token
+     * @return
+     */
     @Override
     public String getUsername(String token) {
+        // return JwtUtil.getUsername(token);
         return "admin";
     }
 
+    /**
+     * Token校验
+     * @param token
+     * @return
+     */
     @Override
     public Boolean verifyToken(String token) {
-        //token校验，默认返回true，需自己实现
+        //return TokenUtils.verifyToken(token, sysBaseAPI, redisUtil);
         return true;
     }
 
+    /**
+     *  自定义请求头
+     * @return
+     */
     @Override
     public HttpHeaders customApiHeader() {
         HttpHeaders header = new HttpHeaders();