diff --git a/boot-service/src/main/java/com/xwbing/service/sys/SysUserService.java b/boot-service/src/main/java/com/xwbing/service/sys/SysUserService.java index 4cde20d..891a18f 100644 --- a/boot-service/src/main/java/com/xwbing/service/sys/SysUserService.java +++ b/boot-service/src/main/java/com/xwbing/service/sys/SysUserService.java @@ -313,7 +313,7 @@ public class SysUserService { List sysRoles = sysRoleService.listByUserIdEnable(userId, enable); if (CollectionUtils.isEmpty(sysRoles)) return list; - //遍获取每个角色拥有的权限,并去重 + //遍历获取每个角色拥有的权限,并去重 List temp; for (SysRole sysRole : sysRoles) { temp = sysAuthorityService.listByRoleIdEnable(sysRole.getId(), enable); diff --git a/boot-service/src/main/java/com/xwbing/util/captcah/CaptchaException.java b/boot-service/src/main/java/com/xwbing/util/captcha/CaptchaException.java similarity index 93% rename from boot-service/src/main/java/com/xwbing/util/captcah/CaptchaException.java rename to boot-service/src/main/java/com/xwbing/util/captcha/CaptchaException.java index 0b91313..761999e 100644 --- a/boot-service/src/main/java/com/xwbing/util/captcah/CaptchaException.java +++ b/boot-service/src/main/java/com/xwbing/util/captcha/CaptchaException.java @@ -1,4 +1,4 @@ -package com.xwbing.util.captcah; +package com.xwbing.util.captcha; /** * 说明:创建验证码异常类 diff --git a/boot-service/src/main/java/com/xwbing/util/captcah/CaptchaServlet.java b/boot-service/src/main/java/com/xwbing/util/captcha/CaptchaServlet.java similarity index 98% rename from boot-service/src/main/java/com/xwbing/util/captcah/CaptchaServlet.java rename to boot-service/src/main/java/com/xwbing/util/captcha/CaptchaServlet.java index c337abc..9c44002 100644 --- a/boot-service/src/main/java/com/xwbing/util/captcah/CaptchaServlet.java +++ b/boot-service/src/main/java/com/xwbing/util/captcha/CaptchaServlet.java @@ -1,4 +1,4 @@ -package com.xwbing.util.captcah; +package com.xwbing.util.captcha; import com.xwbing.constant.CommonConstant; import com.xwbing.util.CommonDataUtil; diff --git a/boot-service/src/main/java/com/xwbing/util/captcah/CaptchaUtil.java b/boot-service/src/main/java/com/xwbing/util/captcha/CaptchaUtil.java similarity index 98% rename from boot-service/src/main/java/com/xwbing/util/captcah/CaptchaUtil.java rename to boot-service/src/main/java/com/xwbing/util/captcha/CaptchaUtil.java index eef8934..68ed64b 100644 --- a/boot-service/src/main/java/com/xwbing/util/captcah/CaptchaUtil.java +++ b/boot-service/src/main/java/com/xwbing/util/captcha/CaptchaUtil.java @@ -1,4 +1,4 @@ -package com.xwbing.util.captcah; +package com.xwbing.util.captcha; import javax.imageio.ImageIO; import java.awt.*; diff --git a/boot-web/pom.xml b/boot-web/pom.xml index fa86c72..7c9b457 100644 --- a/boot-web/pom.xml +++ b/boot-web/pom.xml @@ -56,11 +56,6 @@ spring-boot-starter-test test - - - org.springframework.boot - spring-boot-devtools - org.springframework.boot diff --git a/boot-web/src/main/java/com/xwbing/configuration/DispatcherServletConfig.java b/boot-web/src/main/java/com/xwbing/configuration/DispatcherServletConfig.java index 51b2072..b8e6505 100644 --- a/boot-web/src/main/java/com/xwbing/configuration/DispatcherServletConfig.java +++ b/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 */ diff --git a/boot-web/src/main/java/com/xwbing/configuration/ServletConfig.java b/boot-web/src/main/java/com/xwbing/configuration/ServletConfig.java index 5dcb175..698014c 100644 --- a/boot-web/src/main/java/com/xwbing/configuration/ServletConfig.java +++ b/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; } /********************************************/ diff --git a/boot-web/src/main/java/com/xwbing/handler/LoginInterceptor.java b/boot-web/src/main/java/com/xwbing/handler/LoginInterceptor.java index 38c68e6..c354513 100644 --- a/boot-web/src/main/java/com/xwbing/handler/LoginInterceptor.java +++ b/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; } } diff --git a/boot-web/src/main/resources/static/js/baseValue.js b/boot-web/src/main/resources/static/js/baseValue.js new file mode 100644 index 0000000..d38ef1a --- /dev/null +++ b/boot-web/src/main/resources/static/js/baseValue.js @@ -0,0 +1 @@ +var basePath="http://127.0.0.1:8080/"; \ No newline at end of file diff --git a/boot-web/src/main/resources/static/login.html b/boot-web/src/main/resources/static/login.html new file mode 100644 index 0000000..e69de29