diff --git a/docus-client-interface/src/main/java/com/docus/server/api/recovery/RcvSysUserApi.java b/docus-client-interface/src/main/java/com/docus/server/api/recovery/RcvSysUserApi.java index 42f0de0..6b4702c 100644 --- a/docus-client-interface/src/main/java/com/docus/server/api/recovery/RcvSysUserApi.java +++ b/docus-client-interface/src/main/java/com/docus/server/api/recovery/RcvSysUserApi.java @@ -44,7 +44,7 @@ public interface RcvSysUserApi { * 退出登录 */ @GetMapping("/logout") - void logout(@RequestParam("token") String token); + void logout(); /** * 按主键查询 diff --git a/docus-recovery/src/main/java/com/docus/server/controller/RcvSysUserController.java b/docus-recovery/src/main/java/com/docus/server/controller/RcvSysUserController.java index 7603980..005b53c 100644 --- a/docus-recovery/src/main/java/com/docus/server/controller/RcvSysUserController.java +++ b/docus-recovery/src/main/java/com/docus/server/controller/RcvSysUserController.java @@ -44,8 +44,8 @@ public class RcvSysUserController implements RcvSysUserApi { @ApiOperation("退出登录") @Override @IgnoreValidate - public void logout(String token) { - iRcvSysUserService.logout(token); + public void logout() { + iRcvSysUserService.logout(); } /** diff --git a/docus-recovery/src/main/java/com/docus/server/service/IRcvSysUserService.java b/docus-recovery/src/main/java/com/docus/server/service/IRcvSysUserService.java index fb4c378..b49880b 100644 --- a/docus-recovery/src/main/java/com/docus/server/service/IRcvSysUserService.java +++ b/docus-recovery/src/main/java/com/docus/server/service/IRcvSysUserService.java @@ -186,5 +186,5 @@ public interface IRcvSysUserService { String doLogin(String userName, String userPwd); - void logout(String token); + void logout(); } diff --git a/docus-recovery/src/main/java/com/docus/server/service/impl/RcvSysUserServiceImpl.java b/docus-recovery/src/main/java/com/docus/server/service/impl/RcvSysUserServiceImpl.java index 810ff4a..04174c9 100644 --- a/docus-recovery/src/main/java/com/docus/server/service/impl/RcvSysUserServiceImpl.java +++ b/docus-recovery/src/main/java/com/docus/server/service/impl/RcvSysUserServiceImpl.java @@ -23,8 +23,11 @@ import com.docus.server.vo.recovery.rcvsysuser.RcvSysUserVO; import org.apache.commons.lang.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; import java.io.Serializable; import java.util.Collection; import java.util.List; @@ -362,7 +365,10 @@ public class RcvSysUserServiceImpl implements IRcvSysUserService { } @Override - public void logout(String token) { + public void logout() { + ServletRequestAttributes servletRequestAttributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); + HttpServletRequest request = servletRequestAttributes.getRequest(); + String token = request.getHeader(BusinessConstant.HEADER_API_TOKEN); redisStringService.delete(BusinessConstant.REDIS_KEY_USER_TOKEN_PREFIX + token); }