From 788f7a0c9679f963adf9393902f0ed47c2311c34 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Thu, 26 Dec 2019 11:08:38 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=80=E5=87=BA=E7=99=BB=E5=BD=95=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../elink/esua/epdc/controller/AuthController.java   |  2 +-
 .../esua/epdc/controller/ApiWorkUserController.java  | 12 +++++++-----
 .../com/elink/esua/epdc/service/WorkUserService.java |  4 +---
 .../esua/epdc/service/impl/WorkUserServiceImpl.java  |  8 +++-----
 4 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/controller/AuthController.java b/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/controller/AuthController.java
index ef2fd2e0d..85d316412 100644
--- a/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/controller/AuthController.java
+++ b/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/controller/AuthController.java
@@ -170,7 +170,7 @@ public class AuthController {
      * @return
      */
     @GetMapping("logoutUser/{userId}")
-    public Result logoutUser(@PathVariable("userId") String userId) {
+    public Result logoutUser(@PathVariable("userId") Long userId) {
 
         return authService.logoutUser(Long.parseLong(userId));
     }
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkUserController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkUserController.java
index 7c42de21c..5d88fe598 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkUserController.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkUserController.java
@@ -1,9 +1,9 @@
 package com.elink.esua.epdc.controller;
 
-import com.elink.esua.epdc.common.token.dto.TokenDto;
 import com.elink.esua.epdc.common.token.dto.WorkUserAuthorizationDTO;
 import com.elink.esua.epdc.common.token.dto.WorkUserLoginDTO;
-import com.elink.esua.epdc.commons.tools.annotation.LoginUser;
+import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
+import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
 import com.elink.esua.epdc.dto.epdc.form.*;
@@ -184,13 +184,15 @@ public class ApiWorkUserController {
 
     /**
      * 退出登录
-     * @param tokenDto
+     *
      * @return
      * @Author wanggongfeng
      * @Date 2019/12/25 10:17
      */
     @PostMapping("logout")
-    public Result logout(@LoginUser TokenDto tokenDto) {
-        return workUserService.logout(tokenDto);
+    public Result logout() {
+        UserDetail user = SecurityUser.getUser();
+        Long userId = user.getId();
+        return workUserService.logout(userId);
     }
 }
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/WorkUserService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/WorkUserService.java
index c1f9fd7cf..f3ff61fb5 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/WorkUserService.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/WorkUserService.java
@@ -1,6 +1,5 @@
 package com.elink.esua.epdc.service;
 
-import com.elink.esua.epdc.common.token.dto.TokenDto;
 import com.elink.esua.epdc.common.token.dto.WorkUserAuthorizationDTO;
 import com.elink.esua.epdc.common.token.dto.WorkUserLoginDTO;
 import com.elink.esua.epdc.commons.tools.utils.Result;
@@ -135,10 +134,9 @@ public interface WorkUserService {
     /**
      * 退出登录
      *
-     * @param tokenDto
      * @return com.elink.esua.epdc.commons.tools.utils.Result
      * @Author wanggongfeng
      * @Date 2019/12/25 10:17
      **/
-    Result logout(TokenDto tokenDto);
+    Result logout(Long userId);
 }
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkUserServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkUserServiceImpl.java
index c50f97558..06cd13867 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkUserServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkUserServiceImpl.java
@@ -2,7 +2,6 @@ package com.elink.esua.epdc.service.impl;
 
 import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
 import cn.hutool.core.collection.CollUtil;
-import com.elink.esua.epdc.common.token.dto.TokenDto;
 import com.elink.esua.epdc.common.token.dto.WorkUserAuthorizationDTO;
 import com.elink.esua.epdc.common.token.dto.WorkUserLoginDTO;
 import com.elink.esua.epdc.common.token.dto.WorkUserTokenFormDTO;
@@ -327,14 +326,13 @@ public class WorkUserServiceImpl implements WorkUserService {
     /**
      * 退出登录
      *
-     * @param tokenDto
+     * @param userId
      * @return com.elink.esua.epdc.commons.tools.utils.Result
      * @Author wanggongfeng
      * @Date 2019/12/25 10:17
      **/
     @Override
-    public Result logout(TokenDto tokenDto) {
-        String userId = tokenDto.getUserId();
-        return resourceFeignClient.logoutUser(userId);
+    public Result logout(Long userId) {
+        return resourceFeignClient.logoutUser(userId+"");
     }
 }