网关过滤已完成

dq-financial-hrms/target/classes/mapper/hrms/EmployeeDao.xml

@@ -65,7 +65,8 @@
     </select>
 
     <select id="pageByCondition" resultMap="employeeMap">
-        SELECT e.id eid,e.name emp_name,d.name dept_name,u.account,e.job_number,u.create_time,p.name pos_name
+        SELECT e.id eid,e.name emp_name,d.name
+        ,u.account,e.job_number,u.create_time,p.name pos_name
         FROM hrms_employee e
         LEFT JOIN hrms_employee_dept ed ON e.id = ed.employee_id
         LEFT JOIN hrms_dept d ON d.id = ed.dept_id

dq-govern-gateway/src/main/java/com/daqing/financial/gateway/config/ApiGlobalFilter.java

@@ -18,7 +18,6 @@ import org.springframework.web.server.ServerWebExchange;
 import reactor.core.publisher.Mono;
 
 import java.nio.charset.StandardCharsets;
-import java.util.Enumeration;
 import java.util.List;
 
 @Component
@@ -40,17 +39,16 @@ public class ApiGlobalFilter implements GlobalFilter, Ordered {
     @Override
     public Mono<Void> filter(ServerWebExchange exchange, GatewayFilterChain chain) {
         String requestUrl = exchange.getRequest().getPath().toString();
-        boolean status = CollectionUtils.contains((Enumeration<?>) ignoreUrl, requestUrl);
+
+        boolean status = CollectionUtils.contains(ignoreUrl.iterator(), requestUrl);
         if (!status){
             String token = exchange.getRequest().getHeaders().getFirst("token");
-            //type用于区分不同的端，在做校验token时需要
-            String type= exchange.getRequest().getHeaders().getFirst("type");
             ServerHttpResponse response = exchange.getResponse();
             //没有数据
-            if (StringUtils.isBlank(token) || StringUtils.isBlank(type)) {
+            if (StringUtils.isBlank(token)) {
                 JSONObject message = new JSONObject();
-                message.put("code", "");
-                message.put("message", "鉴权失败，无token或类型");
+                message.put("code", "401");
+                message.put("message", "请先登录");
                 byte[] bits = message.toString().getBytes(StandardCharsets.UTF_8);
                 DataBuffer buffer = response.bufferFactory().wrap(bits);
                 response.setStatusCode(HttpStatus.UNAUTHORIZED);
@@ -58,13 +56,12 @@ public class ApiGlobalFilter implements GlobalFilter, Ordered {
                 return response.writeWith(Mono.just(buffer));
                 //有数据
             }else {
-                String prefix = this.getPrefix(type);
                 //校验token
-                Long userId = verifyJWT(token ,prefix);
+                Long userId = verifyJWT(token);
                 if (userId == null){
                     JSONObject message = new JSONObject();
-                    message.put("message", "token错误");
-                    message.put("code", "");
+                    message.put("message", "请重新登录");
+                    message.put("code", "401");
                     byte[] bits = message.toString().getBytes(StandardCharsets.UTF_8);
                     DataBuffer buffer = response.bufferFactory().wrap(bits);
                     response.setStatusCode(HttpStatus.UNAUTHORIZED);
@@ -85,27 +82,10 @@ public class ApiGlobalFilter implements GlobalFilter, Ordered {
      * @param token
      * @return userPhone
      */
-    private Long verifyJWT(String token, String prefix){
+    private Long verifyJWT(String token){
         return JwtUtil.verifyToken(token);
     }
 
-    /**
-     * 根据type获取前缀
-     * @param type
-     * @return
-     */
-    private String getPrefix(String type){
-        String prefix = null;
-        if ("1".equals(type)){
-            prefix = "OPERATE";
-        }else if ("2".equals(type)){
-            prefix = "USER";
-        }else if ("3".equals(type)){
-            prefix = "WX";
-        }
-        return prefix;
-    }
-
     @Override
     public int getOrder() {
         return -200;

dq-govern-gateway/src/main/java/com/daqing/financial/gateway/exception/DqException.java

@@ -1,15 +1,16 @@
-package com.daqing.financial.gateway.util;
+package com.daqing.financial.gateway.exception;
 
+import com.daqing.financial.gateway.util.ResultCodeEnum;
 import lombok.Data;
 
 @Data
-public class OdcException extends RuntimeException {
+public class DqException extends RuntimeException {
 
     private int code;
 
     private ResultCodeEnum resultCodeEnum;
 
-    public OdcException(ResultCodeEnum codeEnum) {
+    public DqException(ResultCodeEnum codeEnum) {
         super(codeEnum.getRemark());
         code = codeEnum.getCode();
     }

dq-govern-gateway/src/main/java/com/daqing/financial/gateway/util/JwtUtil.java

@@ -4,6 +4,7 @@ import com.auth0.jwt.JWT;
 import com.auth0.jwt.algorithms.Algorithm;
 
 import com.daqing.financial.gateway.SpringContextHolder;
+import com.daqing.financial.gateway.exception.DqException;
 
 import java.util.Date;
 import java.util.Set;
@@ -48,9 +49,9 @@ public class JwtUtil {
                 return userId;
             }
         } catch (Exception e) {
-            throw new OdcException(ResultCodeEnum.UN_AUTHORIZATION);
+            throw new DqException(ResultCodeEnum.UN_AUTHORIZATION);
         }
-        throw new OdcException(ResultCodeEnum.UN_AUTHORIZATION);
+        throw new DqException(ResultCodeEnum.UN_AUTHORIZATION);
     }
 
     public static String getRedisKey(Long userId, String token) {

dq-govern-gateway/src/main/resources/application.yml

@@ -15,6 +15,6 @@ spring:
         - id: hrms_route
           uri: lb://dq-financial-hrms
           predicates:
-            - Path=/api/hrms/**
+            - Path=/api/**
           filters:
             - RewritePath=/api/(?<segment>.*),/ $\{segment}

dq-govern-gateway/src/main/resources/jwt.properties

@@ -1 +1 @@
-jwt.ignoreUrlList=/route-api/login,/route-api/refresh
+jwt.ignoreUrlList=/api/hrms/employee/list,/route-api/refresh