From 58c0a8ceb5ae61d8cfe1abd5836888f002892f2a Mon Sep 17 00:00:00 2001 From: hm-ssy Date: Fri, 6 Jul 2018 09:50:19 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E7=BC=BA=E7=9C=81=E7=9A=84=E9=9D=99?= =?UTF-8?q?=E6=80=81=E8=B5=84=E6=BA=90=E8=B7=AF=E5=BE=84=E4=B8=BA=EF=BC=9A?= =?UTF-8?q?static,resources?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jsCss/autoConfiguration/JsCssAutoConfiguration.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/v0.2.x/spring-boot-starter-js-css/src/main/java/top/hmtools/jsCss/autoConfiguration/JsCssAutoConfiguration.java b/v0.2.x/spring-boot-starter-js-css/src/main/java/top/hmtools/jsCss/autoConfiguration/JsCssAutoConfiguration.java index 80abc4c..a669fc1 100644 --- a/v0.2.x/spring-boot-starter-js-css/src/main/java/top/hmtools/jsCss/autoConfiguration/JsCssAutoConfiguration.java +++ b/v0.2.x/spring-boot-starter-js-css/src/main/java/top/hmtools/jsCss/autoConfiguration/JsCssAutoConfiguration.java @@ -92,6 +92,11 @@ private final Logger logger = LoggerFactory.getLogger(JsCssAutoConfiguration.cla */ public static final String src_uri = prefix+"src_uri"; + /** + * 缺省的静态资源路径集合 + */ + private static final String DEFAULT_STATIC_PATHS = "static,resources"; + /** * 通用获取静态资源请求uri * @return @@ -150,14 +155,14 @@ private final Logger logger = LoggerFactory.getLogger(JsCssAutoConfiguration.cla * @return the jsFilesPaths */ public String getJsFilesPaths() { - return this.getProperty(js_files_paths,""); + return this.getProperty(js_files_paths,DEFAULT_STATIC_PATHS); } /** * @return the cssFilesPaths */ public String getCssFilesPaths() { - return this.getProperty(css_files_paths,""); + return this.getProperty(css_files_paths,DEFAULT_STATIC_PATHS); } /** -- Gitee From bd76e14948cb11824c7c3935af8a20020df3982f Mon Sep 17 00:00:00 2001 From: hm-ssy Date: Fri, 6 Jul 2018 09:54:31 +0800 Subject: [PATCH 2/5] =?UTF-8?q?css=E7=9B=B8=E5=85=B3=E8=AF=B7=E6=B1=82?= =?UTF-8?q?=E5=A2=9Eget=E3=80=81post=E8=AF=B7=E6=B1=82=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/top/hmtools/jsCss/cssManager/CssController.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/v0.2.x/spring-boot-starter-js-css/src/main/java/top/hmtools/jsCss/cssManager/CssController.java b/v0.2.x/spring-boot-starter-js-css/src/main/java/top/hmtools/jsCss/cssManager/CssController.java index 1d66b6d..2b417be 100644 --- a/v0.2.x/spring-boot-starter-js-css/src/main/java/top/hmtools/jsCss/cssManager/CssController.java +++ b/v0.2.x/spring-boot-starter-js-css/src/main/java/top/hmtools/jsCss/cssManager/CssController.java @@ -14,6 +14,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; import top.hmtools.jsCss.IsEnableJsCss; import top.hmtools.jsCss.autoConfiguration.JsCssAutoConfiguration; @@ -47,7 +48,7 @@ public class CssController { *
void * */ - @RequestMapping("#{'${"+JsCssAutoConfiguration.css_uri+":}'?:'/css'}/{cssNames}") + @RequestMapping(value="#{'${"+JsCssAutoConfiguration.css_uri+":}'?:'/css'}/{cssNames}",method={RequestMethod.GET,RequestMethod.POST}) public void getCss(@PathVariable("cssNames") String cssNames,HttpServletRequest request,HttpServletResponse response){ this.getCss(cssNames, "UTF-8", request, response); } @@ -57,7 +58,7 @@ public class CssController { * @param request * @param response */ - @RequestMapping("#{'${"+JsCssAutoConfiguration.css_uri+":}'?:'/css'}/encoding/{encoding}/{cssNames}") + @RequestMapping(value="#{'${"+JsCssAutoConfiguration.css_uri+":}'?:'/css'}/encoding/{encoding}/{cssNames}",method={RequestMethod.GET,RequestMethod.POST}) public void getCss(@PathVariable("cssNames") String cssNames,@PathVariable("encoding")String encoding,HttpServletRequest request,HttpServletResponse response){ PrintWriter writer = null; try { @@ -91,7 +92,7 @@ public class CssController { * @param request * @param response */ - @RequestMapping("#{'${"+JsCssAutoConfiguration.refresh_css_uri+":}'?:'/refresh/css'}") + @RequestMapping(value="#{'${"+JsCssAutoConfiguration.refresh_css_uri+":}'?:'/refresh/css'}",method={RequestMethod.GET,RequestMethod.POST}) public void refreshCss(HttpServletRequest request,HttpServletResponse response){ PrintWriter writer = null; try { @@ -126,7 +127,7 @@ public class CssController { * @param request * @param response */ - @RequestMapping("#{'${"+JsCssAutoConfiguration.list_css_uri+":}'?:'/list/css'}") + @RequestMapping(value="#{'${"+JsCssAutoConfiguration.list_css_uri+":}'?:'/list/css'}",method={RequestMethod.GET,RequestMethod.POST}) public void listCssMenu(HttpServletRequest request,HttpServletResponse response){ PrintWriter writer = null; try { -- Gitee From e3d959a50a08bc1409517b713a37b7eb9f4b9c30 Mon Sep 17 00:00:00 2001 From: hm-ssy Date: Fri, 6 Jul 2018 09:56:35 +0800 Subject: [PATCH 3/5] =?UTF-8?q?js=E7=9B=B8=E5=85=B3=E8=AF=B7=E6=B1=82?= =?UTF-8?q?=E5=A2=9Eget=E3=80=81post=E8=AF=B7=E6=B1=82=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hmtools/jsCss/jsManager/JavascriptController.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/v0.2.x/spring-boot-starter-js-css/src/main/java/top/hmtools/jsCss/jsManager/JavascriptController.java b/v0.2.x/spring-boot-starter-js-css/src/main/java/top/hmtools/jsCss/jsManager/JavascriptController.java index 7829599..a855628 100644 --- a/v0.2.x/spring-boot-starter-js-css/src/main/java/top/hmtools/jsCss/jsManager/JavascriptController.java +++ b/v0.2.x/spring-boot-starter-js-css/src/main/java/top/hmtools/jsCss/jsManager/JavascriptController.java @@ -14,6 +14,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; import top.hmtools.jsCss.IsEnableJsCss; import top.hmtools.jsCss.autoConfiguration.JsCssAutoConfiguration; @@ -41,7 +42,7 @@ public class JavascriptController { * @param request * @param response */ - @RequestMapping("#{'${"+JsCssAutoConfiguration.js_uri+":}'?:'/js'}/{jsNames}") + @RequestMapping(value="#{'${"+JsCssAutoConfiguration.js_uri+":}'?:'/js'}/{jsNames}",method={RequestMethod.GET,RequestMethod.POST}) public void getJS(@PathVariable("jsNames")String jsNames,HttpServletRequest request,HttpServletResponse response){ this.getJS(jsNames, "UTF-8", request, response); } @@ -51,7 +52,7 @@ public class JavascriptController { * @param request * @param response */ - @RequestMapping("#{'${"+JsCssAutoConfiguration.js_uri+":}'?:'/js'}/encoding/{encoding}/{jsNames}") + @RequestMapping(value="#{'${"+JsCssAutoConfiguration.js_uri+":}'?:'/js'}/encoding/{encoding}/{jsNames}",method={RequestMethod.GET,RequestMethod.POST}) public void getJS(@PathVariable("jsNames")String jsNames,@PathVariable("encoding")String encoding,HttpServletRequest request,HttpServletResponse response){ PrintWriter writer = null; try { @@ -84,7 +85,7 @@ public class JavascriptController { * @param request * @param response */ - @RequestMapping("#{'${"+JsCssAutoConfiguration.refresh_js_uri+":}'?:'/refresh/js'}") + @RequestMapping(value="#{'${"+JsCssAutoConfiguration.refresh_js_uri+":}'?:'/refresh/js'}",method={RequestMethod.GET,RequestMethod.POST}) public void refreshJS(HttpServletRequest request,HttpServletResponse response){ PrintWriter writer = null; try { @@ -120,7 +121,7 @@ public class JavascriptController { * @param request * @param response */ - @RequestMapping("#{'${"+JsCssAutoConfiguration.list_js_uri+":}'?:'/list/js'}") + @RequestMapping(value="#{'${"+JsCssAutoConfiguration.list_js_uri+":}'?:'/list/js'}",method={RequestMethod.GET,RequestMethod.POST}) public void listJsMenu(HttpServletRequest request,HttpServletResponse response){ PrintWriter writer = null; try { -- Gitee From 5cdc98a4e08f5be7c5b6d797dbb6e4e83660c3f3 Mon Sep 17 00:00:00 2001 From: hm-ssy Date: Fri, 6 Jul 2018 09:58:10 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E9=9D=99=E6=80=81?= =?UTF-8?q?=E8=B5=84=E6=BA=90controller=E5=A2=9Eget=E8=AF=B7=E6=B1=82?= =?UTF-8?q?=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/top/hmtools/jsCss/srcManager/SrcController.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/v0.2.x/spring-boot-starter-js-css/src/main/java/top/hmtools/jsCss/srcManager/SrcController.java b/v0.2.x/spring-boot-starter-js-css/src/main/java/top/hmtools/jsCss/srcManager/SrcController.java index 943f364..71322cf 100644 --- a/v0.2.x/spring-boot-starter-js-css/src/main/java/top/hmtools/jsCss/srcManager/SrcController.java +++ b/v0.2.x/spring-boot-starter-js-css/src/main/java/top/hmtools/jsCss/srcManager/SrcController.java @@ -20,6 +20,7 @@ import org.springframework.stereotype.Controller; import org.springframework.util.AntPathMatcher; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.servlet.HandlerMapping; import top.hmtools.base.StringTools; @@ -46,7 +47,7 @@ public class SrcController { * @param request * @param response */ - @RequestMapping("#{'${"+JsCssAutoConfiguration.src_uri+":}'?:'/src'}/**/{srcName}") + @RequestMapping(value="#{'${"+JsCssAutoConfiguration.src_uri+":}'?:'/src'}/**/{srcName}",method={RequestMethod.GET}) public void getSrc(@PathVariable(value="srcName")String srcName,HttpServletRequest request,HttpServletResponse response){ srcName = this.extractPathFromPattern(request); this.logger.debug("当前请求的静态资源是：{}",srcName); -- Gitee From 94fd5406f3b46cfe18381e76960a5fef0800cc5b Mon Sep 17 00:00:00 2001 From: hm-ssy Date: Fri, 6 Jul 2018 10:00:48 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=B8=BB=E8=87=AA=E5=8A=A8=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E7=B1=BB=E6=9B=B4=E6=94=B9bean=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E5=8C=96=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jsCss/autoConfiguration/JsCssAutoConfiguration.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/v0.2.x/spring-boot-starter-js-css/src/main/java/top/hmtools/jsCss/autoConfiguration/JsCssAutoConfiguration.java b/v0.2.x/spring-boot-starter-js-css/src/main/java/top/hmtools/jsCss/autoConfiguration/JsCssAutoConfiguration.java index a669fc1..8d495a9 100644 --- a/v0.2.x/spring-boot-starter-js-css/src/main/java/top/hmtools/jsCss/autoConfiguration/JsCssAutoConfiguration.java +++ b/v0.2.x/spring-boot-starter-js-css/src/main/java/top/hmtools/jsCss/autoConfiguration/JsCssAutoConfiguration.java @@ -6,7 +6,7 @@ import java.util.Properties; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.BeansException; -import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; import org.springframework.context.ConfigurableApplicationContext; @@ -18,7 +18,6 @@ import org.springframework.web.servlet.config.annotation.PathMatchConfigurer; import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter; import top.hmtools.base.StringTools; -import top.hmtools.jsCss.IsEnableJsCss; /** * 自动配置类，本jar包被其它spring boot 工程引用时的入口启动（初始化）程序 @@ -27,8 +26,8 @@ import top.hmtools.jsCss.IsEnableJsCss; */ @Configuration @ComponentScan("top.hmtools.jsCss") -@ConditionalOnBean(value={IsEnableJsCss.class}) -//@ConditionalOnProperty(prefix = "hm_tools.js_css", value = "enabled", matchIfMissing = true) // 当配置文件中有hm_tools.js_css.enabled=false时，则不创建本类中的bean，如果为hm_tools.js_css.enabled=true，或者没有该条配置（注解默认为true），则创建bean +//@ConditionalOnBean(value={IsEnableJsCss.class}) +@ConditionalOnProperty(prefix = "hm_tools.js_css", value = "enabled", matchIfMissing = true) // 当配置文件中有hm_tools.js_css.enabled=false时，则不创建本类中的bean，如果为hm_tools.js_css.enabled=true，或者没有该条配置（注解默认为true），则创建bean public class JsCssAutoConfiguration extends WebMvcConfigurerAdapter implements ApplicationContextAware{ private final Logger logger = LoggerFactory.getLogger(JsCssAutoConfiguration.class); -- Gitee