Merge branch 'master' into div

yujian

2019-07-12 b6f6df531ab4fdaf2b800f67eb116323e07797e4

 fanli/src/main/java/com/yeshi/fanli/aspect/SignValidateAspect.java

@@ -33,7 +33,7 @@
@Aspect

@Order(2)

public class SignValidateAspect {

   public static final String EDP = "execution(* com.yeshi.fanli.controller.client.v1.*.*(..))";

   public static final String EDP = "execution(* com.yeshi.fanli.controller.client.*.*.*(..))";



   public static String KEY = "";



@@ -41,7 +41,7 @@
      KEY = Constant.systemCommonConfig.getSignKey();

   }



   @Around(EDP)

//   @Around(EDP)

   public Object testAround(ProceedingJoinPoint joinPoint) throws IOException {

      Object[] args = joinPoint.getArgs();

      PrintWriter out = null;