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 | 11 ++++++++--- 1 files changed, 8 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 e61fa4e..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,21 +14,23 @@ 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; +import org.yeshi.utils.JsonUtil; import com.yeshi.fanli.entity.accept.AcceptData; import com.yeshi.fanli.log.LogHelper; import com.yeshi.fanli.util.Constant; import com.yeshi.fanli.util.StringUtil; -import org.yeshi.utils.JsonUtil; import net.sf.json.JSONObject; //瀹㈡埛绔帴鍙g鍚嶉獙璇� @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().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,6 +94,7 @@ // out.close(); // return null; // } + // uid Object obj = null; try { -- Gitblit v1.8.0