Browse Source

修改 网关逻辑

guoenzhou 2 years ago
parent
commit
0bb76fadf5

+ 0 - 13
base-modules/service-system/service-system-biz/src/main/java/com/usky/system/controller/web/SysUserOnlineController.java

@@ -22,23 +22,10 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-//import com.ruoyi.common.core.constant.CacheConstants;
-//import com.ruoyi.common.core.utils.StringUtils;
-//import com.ruoyi.common.core.web.controller.BaseController;
-//import com.ruoyi.common.core.web.domain.AjaxResult;
-//import com.ruoyi.common.core.web.page.TableDataInfo;
-//import com.ruoyi.common.log.annotation.Log;
-//import com.ruoyi.common.log.enums.BusinessType;
-//import com.ruoyi.common.redis.service.RedisService;
-//import com.ruoyi.common.security.annotation.RequiresPermissions;
-//import com.ruoyi.system.api.model.LoginUser;
-//import com.ruoyi.system.domain.SysUserOnline;
-//import com.ruoyi.system.service.ISysUserOnlineService;
 
 /**
  * 在线用户监控
  *
- * @author ruoyi
  */
 @RestController
 @RequestMapping("/online")

+ 0 - 8
base-modules/service-system/service-system-biz/src/main/java/com/usky/system/controller/web/TokenController.java

@@ -49,14 +49,6 @@ public class TokenController
         return ApiResult.success(tokenService.createToken(userInfo));
     }
 
-    @PostMapping("login1")
-    public ApiResult<?> login1(@RequestBody LoginBody form)
-    {
-        // 用户登录
-        LoginUser userInfo = sysLoginService.login(form.getUsername(), form.getPassword(), form.getTenantId());
-        // 获取登录token
-        return ApiResult.success(tokenService.createToken(userInfo));
-    }
 
     @DeleteMapping("logout")
     public ApiResult<?> logout(HttpServletRequest request)

+ 1 - 1
usky-common/usky-common-core/src/main/java/com/usky/common/core/constants/CacheConstants.java

@@ -10,7 +10,7 @@ public class CacheConstants
     /**
      * 缓存有效期,默认720(分钟)
      */
-    public final static long EXPIRATION = 7200;
+    public final static long EXPIRATION = 720;
 
     /**
      * 缓存刷新时间,默认120(分钟)

+ 3 - 1
usky-common/usky-common-security/src/main/java/com/usky/common/security/interceptor/HeaderInterceptor.java

@@ -9,6 +9,7 @@ import com.usky.common.security.auth.AuthUtil;
 import com.usky.common.security.utils.SecurityUtils;
 import com.usky.system.model.LoginUser;
 import io.jsonwebtoken.Claims;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.method.HandlerMethod;
 import org.springframework.web.servlet.AsyncHandlerInterceptor;
 
@@ -22,6 +23,7 @@ import java.util.Objects;
  *
  * @author ruoyi
  */
+@Slf4j
 public class HeaderInterceptor implements AsyncHandlerInterceptor
 {
     @Override
@@ -31,7 +33,7 @@ public class HeaderInterceptor implements AsyncHandlerInterceptor
         {
             return true;
         }
-
+        log.info("uri:{}",request.getRequestURL());
         SecurityContextHolder.setUserId(ServletUtils.getHeader(request, SecurityConstants.DETAILS_USER_ID));
         SecurityContextHolder.setUserName(ServletUtils.getHeader(request, SecurityConstants.DETAILS_USERNAME));
         SecurityContextHolder.setUserKey(ServletUtils.getHeader(request, SecurityConstants.USER_KEY));