Merge branch 'mater-1.6.0' into div

admin

2019-08-23 91526d285399c7bf93588b6be910c3b849cab7e3

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

@@ -62,12 +62,7 @@
         try {

            return joinPoint.proceed(args);

         } catch (Throwable e) {

            e.printStackTrace();

            try {

               LogHelper.errorDetailInfo(e, getHttpServletParams(request), request.getRequestURI().toString());

            } catch (Exception e1) {

               e1.printStackTrace();

            }

            LogHelper.errorDetailInfo(e, getHttpServletParams(request), request.getRequestURI().toString());

         }

      }