Merge remote-tracking branch 'origin/div' into div

admin

2020-05-18 f5444c6b777ba9f1e0825066e9d12fb9ce4f9f72

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

@@ -96,9 +96,9 @@
               HttpServletResponse response = servletContainer.getResponse();
               String callback = request.getParameter("callback");
               if (StringUtil.isNullOrEmpty(callback)) {
                  response.getWriter().print(JsonUtil.loadFalseResult(1, "请先登录"));
                  response.getWriter().print(JsonUtil.loadFalseResult(10001, "请先登录"));
               } else {
                  response.getWriter().print(callback + "(" + JsonUtil.loadFalseResult(1, "请先登录") + ")");
                  response.getWriter().print(callback + "(" + JsonUtil.loadFalseResult(10001, "请先登录") + ")");
               }

               return null;