优化代码

java110-core/src/main/java/com/java110/core/context/CmdContextUtils.java

@@ -152,5 +152,18 @@ public class CmdContextUtils {
     }
 
 
+    public static String getTokenId(ICmdDataFlowContext context) {
 
+
+        if (context == null) {
+            return "";
+        }
+
+        Map<String, String> headers = context.getReqHeaders();
+
+        if (headers.containsKey(CommonConstant.COOKIE_AUTH_TOKEN)) {
+            return headers.get(CommonConstant.COOKIE_AUTH_TOKEN);
+        }
+        return "";
+    }
 }

service-api/src/main/java/com/java110/api/aop/PageProcessAspect.java

@@ -133,7 +133,7 @@ public class PageProcessAspect {
             headers.put(headerName.toLowerCase(), request.getHeader(headerName));
         }
         //pd = PageData.newInstance().builder(userId, userName, this.getToken(request), reqData, componentCode, componentMethod, url, sessionId, appId, headers);
-        headers.put("_java110_token",this.getToken(request));
+        headers.put(CommonConstant.COOKIE_AUTH_TOKEN,this.getToken(request));
         pd = PageData.newInstance().builder(userId, userName, "", reqData, componentCode, componentMethod, url, sessionId, appId, headers);
         pd.setMethod(request.getMethod().equals("GET") ? HttpMethod.GET : HttpMethod.POST);
 

service-user/src/main/java/com/java110/user/cmd/user/UserLogoutServiceCmd.java

@@ -2,6 +2,7 @@ package com.java110.user.cmd.user;
 
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.annotation.Java110Cmd;
+import com.java110.core.context.CmdContextUtils;
 import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
@@ -20,9 +21,10 @@ public class UserLogoutServiceCmd  extends Cmd {
     @Override
     public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
         ResponseEntity responseEntity= null;
+        String token = CmdContextUtils.getTokenId(context);
         try {
             //删除 token 信息
-            AuthenticationFactory.deleteToken(reqJson.getString("token"));
+            AuthenticationFactory.deleteToken(token);
             responseEntity = new ResponseEntity<String>("退出登录成功", HttpStatus.OK);
         } catch (Exception e) {
             //Invalid signature/claims

springboot/src/main/java/com/java110/boot/aop/PageProcessAspect.java

@@ -133,7 +133,7 @@ public class PageProcessAspect {
             headers.put(headerName.toLowerCase(), request.getHeader(headerName));
         }
         //pd = PageData.newInstance().builder(userId, userName, this.getToken(request), reqData, componentCode, componentMethod, url, sessionId, appId, headers);
-        headers.put("_java110_token",this.getToken(request));
+        headers.put(CommonConstant.COOKIE_AUTH_TOKEN,this.getToken(request));
         pd = PageData.newInstance().builder(userId, userName, "", reqData, componentCode, componentMethod, url, sessionId, appId, headers);
         pd.setMethod(request.getMethod().equals("GET") ? HttpMethod.GET : HttpMethod.POST);