From 28c643cc4d3142503dfa5234777399586e8364e9 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期六, 30 三月 2019 11:41:36 +0800
Subject: [PATCH] 添加员工服务端bug修复
---
java110-service/src/main/java/com/java110/service/aop/PageProcessAspect.java | 106 +++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 83 insertions(+), 23 deletions(-)
diff --git a/java110-service/src/main/java/com/java110/service/aop/PageProcessAspect.java b/java110-service/src/main/java/com/java110/service/aop/PageProcessAspect.java
index 26b0b19..241eed0 100644
--- a/java110-service/src/main/java/com/java110/service/aop/PageProcessAspect.java
+++ b/java110-service/src/main/java/com/java110/service/aop/PageProcessAspect.java
@@ -2,14 +2,19 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.common.constant.CommonConstant;
+import com.java110.common.constant.ResponseConstant;
+import com.java110.common.exception.FilterException;
+import com.java110.core.context.IPageData;
import com.java110.core.factory.PageDataFactory;
import com.java110.common.util.Assert;
-import com.java110.common.util.SequenceUtil;
+import com.java110.core.factory.GenerateCodeFactory;
import com.java110.common.util.StringUtil;
-import com.java110.entity.service.PageData;
+import com.java110.core.context.PageData;
import org.aspectj.lang.JoinPoint;
import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.annotation.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
@@ -30,6 +35,9 @@
@Aspect
@Component
public class PageProcessAspect {
+
+ private final static Logger logger = LoggerFactory.getLogger(PageProcessAspect.class);
+
@Pointcut("execution(public * com.java110..*.*Controller.*(..)) || execution(public * com.java110..*.*Rest.*(..))")
public void dataProcess(){}
@@ -45,8 +53,11 @@
ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
HttpServletRequest request = attributes.getRequest();
- PageData pd = null;
- if("POST".equals(request.getMethod())){
+ IPageData pd = null;
+ String reqData = "";
+ String userId = "";
+ String sessionId = request.getSession().getId();
+ if("POST,PUT".contains(request.getMethod())){
InputStream in = request.getInputStream();
BufferedReader reader = new BufferedReader(new InputStreamReader(in));
//reader.
@@ -55,14 +66,11 @@
while ((str = reader.readLine()) != null) {
sb.append(str);
}
- str = sb.toString();
- if(Assert.isPageJsonObject(str)){
- pd = PageDataFactory.newInstance().builder(str).setTransactionId(SequenceUtil.getPageTransactionId());
- }
+ reqData = sb.toString();
+
}
//瀵� get鎯呭喌涓嬬殑鍙傛暟杩涜灏佽
- if(pd == null){
- pd = PageDataFactory.newInstance().setTransactionId(SequenceUtil.getPageTransactionId());
+ else{
Map<String,String[]> params = request.getParameterMap();
if(params != null && !params.isEmpty()) {
JSONObject paramObj = new JSONObject();
@@ -77,18 +85,37 @@
}
continue;
}
- pd.setParam(paramObj);
+ reqData = paramObj.toJSONString();
}
}
-
+ // 鑾峰彇 userId
if(request.getAttribute("claims") != null && request.getAttribute("claims") instanceof Map){
Map<String,String> userInfo = (Map<String,String>)request.getAttribute("claims");
if(userInfo.containsKey(CommonConstant.LOGIN_USER_ID)){
- pd.setUserId(userInfo.get(CommonConstant.LOGIN_USER_ID));
+ userId = userInfo.get(CommonConstant.LOGIN_USER_ID);
}
- pd.setUserInfo(userInfo);
-
}
+
+ // 鑾峰彇缁勪欢鍚嶇О 鍜屾柟娉曞悕绉�
+ String url = request.getRequestURL()!=null?request.getRequestURL().toString():"";
+ String componentCode = "";
+ String componentMethod = "";
+ if(url.contains("callComponent")){ //缁勪欢澶勭悊
+ String []urls = url.split("/");
+
+ if(urls.length == 6){
+ componentCode = urls[4];
+ componentMethod = urls[5];
+ }
+ }else if(url.contains("flow")){ //娴佺▼澶勭悊
+ String []urls = url.split("/");
+
+ if(urls.length == 5){
+ componentCode = urls[4];
+ }
+ }
+
+ pd = PageData.newInstance().builder(userId,this.getToken(request),reqData,componentCode,componentMethod,url,sessionId);
request.setAttribute(CommonConstant.CONTEXT_PAGE_DATA,pd);
}
@@ -116,14 +143,8 @@
return ;
}
- if(!StringUtil.isNullOrNone(pd.getToken())) {
- HttpServletResponse response = attributes.getResponse();
- Cookie cookie = new Cookie(CommonConstant.COOKIE_AUTH_TOKEN, pd.getToken());
- cookie.setHttpOnly(true);
- cookie.setPath("/");
- response.addCookie(cookie);
- response.flushBuffer();
- }
+ //鍐檆ookies淇℃伅
+ writeCookieInfo(pd,attributes);
}
@@ -138,4 +159,43 @@
return null;
}
}
+
+
+ /**
+ * 鑾峰彇TOKEN
+ * @param request
+ * @return
+ */
+ private String getToken(HttpServletRequest request) throws FilterException {
+ String token = "";
+ if(request.getCookies() == null || request.getCookies().length == 0){
+ return token;
+ }
+ for (Cookie cookie : request.getCookies()) {
+ if (CommonConstant.COOKIE_AUTH_TOKEN.equals(cookie.getName())) {
+ token = cookie.getValue();
+ }
+ }
+ return token;
+ }
+
+
+ /**
+ * 鍐檆ookie 淇℃伅
+ * @param pd 椤甸潰灏佽淇℃伅
+ * @param attributes
+ * @throws IOException
+ */
+ private void writeCookieInfo(IPageData pd,ServletRequestAttributes attributes) throws IOException {
+ // 杩欓噷鐩墠鍙啓鍒扮粍浠剁骇鍒紝濡傛灉闇�瑕� 鍐欐垚鏂规硶绾у埆
+ if(!StringUtil.isNullOrNone(pd.getToken()) && "login".equals(pd.getComponentCode())) {
+ HttpServletResponse response = attributes.getResponse();
+ Cookie cookie = new Cookie(CommonConstant.COOKIE_AUTH_TOKEN, pd.getToken());
+ cookie.setHttpOnly(true);
+ cookie.setPath("/");
+ response.addCookie(cookie);
+ response.flushBuffer();
+ }
+
+ }
}
--
Gitblit v1.8.0