From 77a1ba602053d009c89dbfdf6e8b96443d1d8971 Mon Sep 17 00:00:00 2001 From: sgjj Date: Wed, 7 Aug 2019 18:26:46 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/templets/1/default/search.htm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/webapp/templets/1/default/search.htm b/src/main/webapp/templets/1/default/search.htm index ae48c8e7..4bacfd72 100644 --- a/src/main/webapp/templets/1/default/search.htm +++ b/src/main/webapp/templets/1/default/search.htm @@ -27,10 +27,10 @@
- 首页 - 上一页 - 下一页 - 末页 + 首页 + 上一页 + 下一页 + 末页
From 2cc1e5041a5bbbcddd3087db91d8995f104a4254 Mon Sep 17 00:00:00 2001 From: sgjj Date: Thu, 8 Aug 2019 16:37:05 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=9D=99=E6=80=81?= =?UTF-8?q?=E6=98=A0=E5=B0=84=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/net/mingsoft/config/WebConfig.java | 20 +++++++------------ 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/src/main/java/net/mingsoft/config/WebConfig.java b/src/main/java/net/mingsoft/config/WebConfig.java index 4c8bd54e..f31f0ed7 100644 --- a/src/main/java/net/mingsoft/config/WebConfig.java +++ b/src/main/java/net/mingsoft/config/WebConfig.java @@ -53,19 +53,13 @@ public class WebConfig implements WebMvcConfigurer { @Override public void addResourceHandlers(ResourceHandlerRegistry registry) { - //jar包方式映射处理 - String classPath =BasicUtil.getClassPath(""); - if(classPath.startsWith("file")) { - registry.addResourceHandler("/upload/**").addResourceLocations("file:" + BasicUtil.getRealPath("upload") + File.separator); - registry.addResourceHandler("/html/**").addResourceLocations("file:" + BasicUtil.getRealPath("html") + File.separator); - registry.addResourceHandler("/templets/**").addResourceLocations("file:" + BasicUtil.getRealPath("templets") + File.separator); - }else { - //必须做判断，不然jar运行的html路径会被覆盖掉 - registry.addResourceHandler("/html/**").addResourceLocations("/html/"); - } - registry.addResourceHandler("/app/**").addResourceLocations("classpath:/app/"); - registry.addResourceHandler("/static/**").addResourceLocations("classpath:/static/"); - registry.addResourceHandler("/api/**").addResourceLocations("classpath:/api/"); + + registry.addResourceHandler("/upload/**").addResourceLocations("file:" + BasicUtil.getRealPath("upload") + File.separator); + registry.addResourceHandler("/html/**").addResourceLocations("file:" + BasicUtil.getRealPath("html") + File.separator); + registry.addResourceHandler("/templets/**").addResourceLocations("file:" + BasicUtil.getRealPath("templets") + File.separator); + registry.addResourceHandler("/app/**").addResourceLocations("file:" + BasicUtil.getRealPath("app") + File.separator, "classpath:/app/"); + registry.addResourceHandler("/static/**").addResourceLocations("file:" + BasicUtil.getRealPath("static") + File.separator, "classpath:/static/"); + registry.addResourceHandler("/api/**").addResourceLocations("file:" + BasicUtil.getRealPath("api") + File.separator, "classpath:/api/"); } /** From e8f2f849b4c70a6a4870741f175b50922914b40e Mon Sep 17 00:00:00 2001 From: sgjj Date: Thu, 8 Aug 2019 18:12:46 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=A0=8F=E7=9B=AE?= =?UTF-8?q?=E4=B8=BA=E5=B0=81=E9=9D=A2=E6=B2=A1=E6=9C=89=E6=96=87=E7=AB=A0?= =?UTF-8?q?=E6=89=BE=E4=B8=8D=E5=88=B0=E9=A1=B5=E9=9D=A2=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/net/mingsoft/cms/action/GeneraterAction.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/main/java/net/mingsoft/cms/action/GeneraterAction.java b/src/main/java/net/mingsoft/cms/action/GeneraterAction.java index 879af10c..492d2a2b 100644 --- a/src/main/java/net/mingsoft/cms/action/GeneraterAction.java +++ b/src/main/java/net/mingsoft/cms/action/GeneraterAction.java @@ -30,6 +30,8 @@ import java.util.List; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.bean.copier.CopyOptions; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; @@ -194,8 +196,17 @@ public class GeneraterAction extends BaseAction { CmsParserUtil.generateList(column, articleIdList.size()); break; case ColumnEntity.COLUMN_TYPE_COVER:// 单页 + if(articleIdList.size()==0){ + ColumnArticleIdBean columnArticleIdBean=new ColumnArticleIdBean(); + CopyOptions copyOptions=CopyOptions.create(); + copyOptions.setIgnoreError(true); + BeanUtil.copyProperties(column,columnArticleIdBean,copyOptions); + articleIdList.add(columnArticleIdBean); + } CmsParserUtil.generateBasic(articleIdList); break; + default: + throw new IllegalStateException("Unexpected value: " + column.getColumnType()); } } } catch (IOException e) {