From bec6f7988cf5245afbb5a1f53ed5d607ffb864d0 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 13 三月 2019 12:16:51 +0800
Subject: [PATCH] 冲突解决
---
fanli/src/main/java/com/yeshi/fanli/aspect/H5SignValidateAspect.java | 3 ++-
1 files changed, 2 insertions(+), 1 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 c1cf1c2..cd7d8f4 100644
--- a/fanli/src/main/java/com/yeshi/fanli/aspect/H5SignValidateAspect.java
+++ b/fanli/src/main/java/com/yeshi/fanli/aspect/H5SignValidateAspect.java
@@ -13,6 +13,7 @@
import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.Signature;
+import org.aspectj.lang.annotation.Around;
import org.aspectj.lang.annotation.Aspect;
import org.aspectj.lang.reflect.MethodSignature;
import org.springframework.stereotype.Component;
@@ -35,7 +36,7 @@
public static String KEY = "thisWarning";
- // @Around(EDP)
+ @Around(EDP)
public Object appH5Around(ProceedingJoinPoint joinPoint) throws IOException {
ServletRequestAttributes servletContainer = (ServletRequestAttributes) RequestContextHolder
--
Gitblit v1.8.0