From eec7e789a87863c25d92c10ad5dfc22ad80c448d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 14 七月 2020 12:36:48 +0800
Subject: [PATCH] 系统区分BUG修复
---
fanli/src/main/java/com/yeshi/fanli/aspect/H5SignValidateAspect.java | 29 +++++++++++++++++++++--------
1 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/aspect/H5SignValidateAspect.java b/fanli/src/main/java/com/yeshi/fanli/aspect/H5SignValidateAspect.java
index cd7d8f4..d100f1b 100644
--- a/fanli/src/main/java/com/yeshi/fanli/aspect/H5SignValidateAspect.java
+++ b/fanli/src/main/java/com/yeshi/fanli/aspect/H5SignValidateAspect.java
@@ -11,6 +11,8 @@
import javax.servlet.http.HttpServletRequest;
+import com.yeshi.fanli.entity.accept.AcceptData;
+import com.yeshi.fanli.util.SystemInfoUtil;
import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.Signature;
import org.aspectj.lang.annotation.Around;
@@ -26,6 +28,7 @@
import com.yeshi.fanli.util.annotation.RequestNoSignValidate;
import net.sf.json.JSONObject;
+import org.yeshi.utils.SystemUtil;
//瀹㈡埛绔帴鍙ｇ鍚嶉獙璇�
@Component
@@ -38,10 +41,19 @@
@Around(EDP)
public Object appH5Around(ProceedingJoinPoint joinPoint) throws IOException {
-
+ Object[] args = joinPoint.getArgs();
ServletRequestAttributes servletContainer = (ServletRequestAttributes) RequestContextHolder
.getRequestAttributes();
HttpServletRequest request = servletContainer.getRequest();
+
+ AcceptData acceptData = null;
+ for (Object obj : args) {
+ if (obj instanceof AcceptData) {
+ acceptData = (AcceptData) obj;
+ }
+ }
+
+
Signature signature = joinPoint.getSignature();
MethodSignature methodSignature = (MethodSignature) signature;
@@ -56,18 +68,16 @@
e2.printStackTrace();
}
- Object[] args = joinPoint.getArgs();
// 鍒ゆ柇鏄惁鏈夊拷鐣ラ獙璇佺殑娉ㄨВ
if (realMethod != null && realMethod.isAnnotationPresent(RequestNoSignValidate.class)) {
+ if(acceptData!=null){
+ acceptData.setSystem(SystemInfoUtil.getSystem(acceptData));
+ }
+
try {
return joinPoint.proceed(args);
} catch (Throwable e) {
- e.printStackTrace();
- try {
- LogHelper.errorDetailInfo(e, getHttpServletParams(request), request.getRequestURI().toString());
- } catch (Exception e1) {
- e1.printStackTrace();
- }
+ LogHelper.errorDetailInfo(e, getHttpServletParams(request), request.getRequestURI().toString());
}
}
@@ -86,6 +96,9 @@
// 绛惧悕鏄惁姝ｇ‘
if (isRight) {
+ if(acceptData!=null){
+ acceptData.setSystem(SystemInfoUtil.getSystem(acceptData));
+ }
Object obj = null;
try {
obj = joinPoint.proceed(args);
--
Gitblit v1.8.0