From c24520b6d2d5c36d6590e152d2ad6b9c73bd628d Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 14 五月 2019 11:26:04 +0800
Subject: [PATCH] 合并
---
fanli/src/main/java/com/yeshi/fanli/aspect/SignValidateAspect.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/aspect/SignValidateAspect.java b/fanli/src/main/java/com/yeshi/fanli/aspect/SignValidateAspect.java
index 7b0439b..de97d29 100644
--- a/fanli/src/main/java/com/yeshi/fanli/aspect/SignValidateAspect.java
+++ b/fanli/src/main/java/com/yeshi/fanli/aspect/SignValidateAspect.java
@@ -14,6 +14,7 @@
import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.annotation.Around;
import org.aspectj.lang.annotation.Aspect;
+import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Component;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
@@ -29,6 +30,7 @@
//瀹㈡埛绔帴鍙ｇ鍚嶉獙璇�
@Component
@Aspect
+@Order(2)
public class SignValidateAspect {
public static final String EDP = "execution(* com.yeshi.fanli.controller.client.*.*(..))";
@@ -52,6 +54,8 @@
for (Object obj : args) {
if (obj instanceof AcceptData) {
acceptData = (AcceptData) obj;
+ } else if (obj instanceof HttpServletRequest) {
+ request = (HttpServletRequest) obj;
}
}
boolean isRight = true;
@@ -64,8 +68,8 @@
if ((acceptData.getPlatform() != null && acceptData.getPlatform().equalsIgnoreCase("android")
&& acceptData.getVersion() != null && Integer.parseInt(acceptData.getVersion()) > 21)
- || (acceptData.getPlatform()!=null&&acceptData.getPlatform().equalsIgnoreCase("ios") && acceptData.getVersion() != null
- && Integer.parseInt(acceptData.getVersion()) > 24)) {
+ || (acceptData.getPlatform() != null && acceptData.getPlatform().equalsIgnoreCase("ios")
+ && acceptData.getVersion() != null && Integer.parseInt(acceptData.getVersion()) > 24)) {
isRight = signIsRight(request);
} else if (acceptData.getPackages().startsWith("com.haicaojie")) {
isRight = signIsRight(request);
@@ -90,8 +94,7 @@
// out.close();
// return null;
// }
- //uid
-
+ // uid
Object obj = null;
try {
--
Gitblit v1.8.0