From 19e9cac3bf76a376f3553f9463c02cac2ff54e8f Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期六, 08 十月 2022 14:29:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

---
 flower_city/src/main/java/com/dg/core/interceptor/AuthorizationInterceptor.java |   40 +++++++++++++++++++++-------------------
 1 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/flower_city/src/main/java/com/dg/core/interceptor/AuthorizationInterceptor.java b/flower_city/src/main/java/com/dg/core/interceptor/AuthorizationInterceptor.java
index 2ec7af8..101050c 100644
--- a/flower_city/src/main/java/com/dg/core/interceptor/AuthorizationInterceptor.java
+++ b/flower_city/src/main/java/com/dg/core/interceptor/AuthorizationInterceptor.java
@@ -31,7 +31,6 @@
     @Autowired
     private TokenManager manager;
 
-
     @Autowired
     com.dg.core.service.ISysUserService IUserService;
 
@@ -53,26 +52,29 @@
 
         if(StringUtils.isEmpty(token))
         {
-            if(StringUtils.isEmpty(HCtoken))
-            {
-                String reponse = "{\"result\": 448, \"message\": \"token not is null \"}";
-                response.setStatus(200);
-                response.setCharacterEncoding(StandardCharsets.UTF_8.toString());
-                ResponseFacade facade = (ResponseFacade) response;
-                facade.setContentLength(reponse.getBytes(StandardCharsets.UTF_8).length);
-                facade.getWriter().write(reponse);
-                return false;
-            }
-            else
-            {
-                //花城e+   token
-                if (manager.checkHCToken(HCtoken)) {
-                    //如果token验证成功,权限检查通过,将token对应的用户id存在request中,便于之后注入
-                    request.setAttribute(Constant.CURRENT_USER_ID, manager.getHCUserId(HCtoken));
+//            if(StringUtils.isEmpty(HCtoken))
+//            {
+//                String reponse = "{\"result\": 448, \"message\": \"token not is null \"}";
+//                response.setStatus(200);
+//                response.setCharacterEncoding(StandardCharsets.UTF_8.toString());
+//                ResponseFacade facade = (ResponseFacade) response;
+//                facade.setContentLength(reponse.getBytes(StandardCharsets.UTF_8).length);
+//                facade.getWriter().write(reponse);
+//                return false;
+//            }
+//            else
+//            {
+//
+//            }
+
+            //花城e+   token
+            if (manager.checkHCToken(HCtoken)) {
+                //如果token验证成功,权限检查通过,将token对应的用户id存在request中,便于之后注入
+                request.setAttribute(Constant.CURRENT_USER_ID, manager.getHCUserId(HCtoken));
 //            SysUser ss = IUserService.selectData(manager.getHCUserId(HCtoken)+"");
-                    return true;
-                }
+                return true;
             }
+
         }
         else
         {

--
Gitblit v1.7.1