From 5e19afab7ccd8a6aeee2001a4f8f8ccd20c3d89b Mon Sep 17 00:00:00 2001 From: xiangwbs Date: Sun, 19 Nov 2017 15:29:46 +0800 Subject: [PATCH 1/6] merge --- .../src/main/java/com/xwbing/service/sys/SysUserService.java | 2 +- .../xwbing/util/{captcah => captcha}/CaptchaException.java | 2 +- .../com/xwbing/util/{captcah => captcha}/CaptchaServlet.java | 2 +- .../com/xwbing/util/{captcah => captcha}/CaptchaUtil.java | 2 +- .../src/main/java/com/xwbing/configuration/ServletConfig.java | 4 ++-- .../src/main/java/com/xwbing/handler/LoginInterceptor.java | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) rename boot-service/src/main/java/com/xwbing/util/{captcah => captcha}/CaptchaException.java (93%) rename boot-service/src/main/java/com/xwbing/util/{captcah => captcha}/CaptchaServlet.java (98%) rename boot-service/src/main/java/com/xwbing/util/{captcah => captcha}/CaptchaUtil.java (98%) 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/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..1124db6 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"); From 4214352f2e0ebc3fd01aeb8d722a7aaa704a5743 Mon Sep 17 00:00:00 2001 From: xiangwbs Date: Sun, 19 Nov 2017 15:38:34 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=9D=99=E6=80=81?= =?UTF-8?q?=E8=B5=84=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xwbing/configuration/DispatcherServletConfig.java | 6 +++--- boot-web/src/main/resources/static/js/route.js | 1 + boot-web/src/main/resources/static/login.html | 0 3 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 boot-web/src/main/resources/static/js/route.js create mode 100644 boot-web/src/main/resources/static/login.html 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/resources/static/js/route.js b/boot-web/src/main/resources/static/js/route.js new file mode 100644 index 0000000..7277d66 --- /dev/null +++ b/boot-web/src/main/resources/static/js/route.js @@ -0,0 +1 @@ +var base_path="http://localhost: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 From 81003f064ee694fb0a1fccabad2b33d3c04ba7d4 Mon Sep 17 00:00:00 2001 From: xiangwbs Date: Sun, 19 Nov 2017 18:14:11 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=9D=99=E6=80=81?= =?UTF-8?q?=E8=B5=84=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- boot-web/src/main/resources/static/js/{route.js => base_value.js} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename boot-web/src/main/resources/static/js/{route.js => base_value.js} (100%) diff --git a/boot-web/src/main/resources/static/js/route.js b/boot-web/src/main/resources/static/js/base_value.js similarity index 100% rename from boot-web/src/main/resources/static/js/route.js rename to boot-web/src/main/resources/static/js/base_value.js From 570cc7da173882ad1e99058664fdb9d9db7786a0 Mon Sep 17 00:00:00 2001 From: xiangwbs Date: Sun, 19 Nov 2017 18:16:04 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E7=83=AD=E9=83=A8?= =?UTF-8?q?=E7=BD=B2=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- boot-web/pom.xml | 5 ----- 1 file changed, 5 deletions(-) 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 From 87ba1332562ee0ac76dd9ba34a921414044067ff Mon Sep 17 00:00:00 2001 From: xiangwbs Date: Sun, 19 Nov 2017 19:03:05 +0800 Subject: [PATCH 5/6] merge --- .../src/main/java/com/xwbing/handler/LoginInterceptor.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 1124db6..c354513 100644 --- a/boot-web/src/main/java/com/xwbing/handler/LoginInterceptor.java +++ b/boot-web/src/main/java/com/xwbing/handler/LoginInterceptor.java @@ -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; } } From b55ab9fafd50b99d5bec9b2cc465174a92ed0b0e Mon Sep 17 00:00:00 2001 From: xiangwbs Date: Sun, 19 Nov 2017 19:07:04 +0800 Subject: [PATCH 6/6] merge --- boot-web/src/main/resources/static/js/baseValue.js | 1 + boot-web/src/main/resources/static/js/base_value.js | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 boot-web/src/main/resources/static/js/baseValue.js delete mode 100644 boot-web/src/main/resources/static/js/base_value.js 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/js/base_value.js b/boot-web/src/main/resources/static/js/base_value.js deleted file mode 100644 index 7277d66..0000000 --- a/boot-web/src/main/resources/static/js/base_value.js +++ /dev/null @@ -1 +0,0 @@ -var base_path="http://localhost:8080/"; \ No newline at end of file