Merge remote-tracking branch 'origin/master'

yujian

2019-05-23 31a566a0f1e2d69662dfcbce8a1418c3cbe42ad3

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

@@ -110,12 +110,12 @@
         try {

            obj = joinPoint.proceed(args);

         } catch (Throwable e) {

            e.printStackTrace();

            try {

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

            } catch (Exception e1) {

               e1.printStackTrace();

            }

            out.print(JsonUtil.loadFalseResult(90009, "服务器内部错误"));

         }

         return obj;

      } else {