From bdab25470f7752a2be4e3f0769503cab38626232 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 17 八月 2021 10:48:40 +0800
Subject: [PATCH] 优化 返回格式
---
service-front/src/main/java/com/java110/front/aop/PageProcessAspect.java | 33 ++++++++++++++++++++++++---------
1 files changed, 24 insertions(+), 9 deletions(-)
diff --git a/service-front/src/main/java/com/java110/front/aop/PageProcessAspect.java b/service-front/src/main/java/com/java110/front/aop/PageProcessAspect.java
old mode 100644
new mode 100755
index e1f56b1..5d0626d
--- a/service-front/src/main/java/com/java110/front/aop/PageProcessAspect.java
+++ b/service-front/src/main/java/com/java110/front/aop/PageProcessAspect.java
@@ -1,18 +1,25 @@
package com.java110.front.aop;
import com.alibaba.fastjson.JSONObject;
+import com.java110.core.context.IPageData;
+import com.java110.core.context.PageData;
import com.java110.utils.constant.CommonConstant;
import com.java110.utils.exception.FilterException;
-import com.java110.core.context.IPageData;
import com.java110.utils.util.StringUtil;
-import com.java110.core.context.PageData;
import org.aspectj.lang.JoinPoint;
import org.aspectj.lang.ProceedingJoinPoint;
-import org.aspectj.lang.annotation.*;
+import org.aspectj.lang.annotation.After;
+import org.aspectj.lang.annotation.AfterReturning;
+import org.aspectj.lang.annotation.AfterThrowing;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Before;
+import org.aspectj.lang.annotation.Pointcut;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpMethod;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Component;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
@@ -24,6 +31,8 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
+import java.util.Enumeration;
+import java.util.HashMap;
import java.util.Map;
/**
@@ -59,7 +68,7 @@
String appId = "";
String sessionId = request.getSession().getId();
appId = request.getHeader("APP_ID");
- if(StringUtil.isEmpty(appId)){
+ if (StringUtil.isEmpty(appId)) {
appId = request.getHeader("APP-ID");
}
logger.debug("璇锋眰澶翠俊鎭細" + request.getHeaderNames());
@@ -84,7 +93,7 @@
if (params.get(key).length > 0) {
String value = "";
for (int paramIndex = 0; paramIndex < params.get(key).length; paramIndex++) {
- value = params.get(key)[paramIndex] + ",";
+ value += (params.get(key)[paramIndex] + ",");
}
value = value.endsWith(",") ? value.substring(0, value.length() - 1) : value;
paramObj.put(key, value);
@@ -124,7 +133,13 @@
componentCode = urls[4];
}
}
- pd = PageData.newInstance().builder(userId, userName, this.getToken(request), reqData, componentCode, componentMethod, url, sessionId, appId);
+ Map<String, Object> headers = new HashMap<>();
+ Enumeration reqHeaderEnum = request.getHeaderNames();
+ while (reqHeaderEnum.hasMoreElements()) {
+ String headerName = (String) reqHeaderEnum.nextElement();
+ headers.put(headerName.toLowerCase(), request.getHeader(headerName));
+ }
+ pd = PageData.newInstance().builder(userId, userName, this.getToken(request), reqData, componentCode, componentMethod, url, sessionId, appId, headers);
pd.setMethod(request.getMethod().equals("GET") ? HttpMethod.GET : HttpMethod.POST);
request.setAttribute(CommonConstant.CONTEXT_PAGE_DATA, pd);
}
@@ -164,8 +179,8 @@
Object o = pjp.proceed();
return o;
} catch (Throwable e) {
- e.printStackTrace();
- return null;
+ logger.error("鎵ц鏂规硶寮傚父", e);
+ return new ResponseEntity("鍐呴儴寮傚父" + e.getLocalizedMessage(), HttpStatus.BAD_REQUEST);
}
}
--
Gitblit v1.8.0