From 45f35a348c6d19f954888bf3e595bdf9d6016bb8 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 12 四月 2019 16:00:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/aspect/SignValidateAspect.java | 8 +++++---
1 files changed, 5 insertions(+), 3 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 5b4b345..de97d29 100644
--- a/fanli/src/main/java/com/yeshi/fanli/aspect/SignValidateAspect.java
+++ b/fanli/src/main/java/com/yeshi/fanli/aspect/SignValidateAspect.java
@@ -54,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;
@@ -66,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);
@@ -92,7 +94,7 @@
// out.close();
// return null;
// }
- //uid
+ // uid
Object obj = null;
try {
--
Gitblit v1.8.0