Merge branch 'master' into div

yujian

2019-07-16 a503900f405a39f3aa30a8663ca661cf3c6b55ea

 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());

         }

      }