Merge remote-tracking branch 'origin/master'

boot-web/src/main/java/com/xwbing/configuration/DispatcherServletConfig.java

@@ -44,11 +44,11 @@ public class DispatcherServletConfig extends WebMvcConfigurerAdapter {
 
     /**
      * 配置静态访问资源
-     * 默认:
+     * 默认:优先级
+     * classpath:/META-INF/resources
+     * classpath:/resources
      * classpath:/static
      * classpath:/public
-     * classpath:/resources
-     * classpath:/META-INF/resources
      *
      * @param registry
      */

boot-web/src/main/java/com/xwbing/configuration/ServletConfig.java

@@ -1,6 +1,6 @@
 package com.xwbing.configuration;
 
-import com.xwbing.util.captcah.CaptchaServlet;
+import com.xwbing.util.captcha.CaptchaServlet;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.web.servlet.ServletRegistrationBean;
@@ -27,7 +27,7 @@ public class ServletConfig {
         logger.info("注册验证码servlet ======================= ");
         ServletRegistrationBean registration = new ServletRegistrationBean(captchaServlet);
         registration.setEnabled(true);
-        registration.addUrlMappings("/servlet/captchaCode");
+        registration.addUrlMappings("/servlet/captcha");
         return registration;
     }
     /********************************************/

boot-web/src/main/java/com/xwbing/handler/LoginInterceptor.java

@@ -27,7 +27,7 @@ public class LoginInterceptor extends HandlerInterceptorAdapter {
 
     static {
         //验证码
-        set.add("/servlet/captchaCode");
+        set.add("/servlet/captcha");
         //swagger
         set.add("/v2/api-docs");
         set.add("/swagger-resources");
@@ -38,7 +38,6 @@ public class LoginInterceptor extends HandlerInterceptorAdapter {
 
     @Override
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
-
         String servletPath = request.getServletPath();
         if (!set.contains(servletPath) && !servletPath.contains("login")) {
 //            HttpSession session = request.getSession();
@@ -56,6 +55,8 @@ public class LoginInterceptor extends HandlerInterceptorAdapter {
                 restMessage.setMessage("请先登录");
                 outputStream.write(JSON.toJSONString(restMessage).getBytes("utf-8"));
                 outputStream.close();
+                //未登录，重定向到登录页面
+//                response.sendRedirect("/login.html");
                 return false;
             }
         }

boot-web/src/main/resources/static/js/baseValue.js

@@ -0,0 +1 @@
+var basePath="http://127.0.0.1:8080/";