Merge remote-tracking branch 'origin/master'

admin

2019-03-14 eed607d87b2eee1f09b4a28da614f3ad0b46601d

 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.*.*(..))";



@@ -91,7 +93,6 @@
         // return null;

         // }

         //uid

			


         Object obj = null;

         try {