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) { 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/"); } /** 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 @@
- 首页 - 上一页 - 下一页 - 末页 + 首页 + 上一页 + 下一页 + 末页