From 4cebaff0dc37caee2a8eb046b1f9cb4a6cf79a1c Mon Sep 17 00:00:00 2001 From: guwd Date: Wed, 2 Dec 2020 08:21:16 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E7=94=9F=E6=88=90=E4=BF=AE=E6=94=B9h?= =?UTF-8?q?tml/=E7=BC=96=E5=8F=B7=E9=97=AE=E9=A2=98=EF=BC=8C=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0app=5Fdir=202=E3=80=81=E9=92=88=E5=AF=B9app=5Fdir?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=A7=A3=E6=9E=90=E5=99=A8=203=E3=80=81?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E4=BA=A4=E4=BA=92=E5=A2=9E=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/net/mingsoft/cms/action/GeneraterAction.java | 4 ++-- src/main/java/net/mingsoft/cms/action/web/MCmsAction.java | 4 ++-- src/main/java/net/mingsoft/cms/biz/impl/ContentBizImpl.java | 6 +++--- src/main/java/net/mingsoft/cms/util/CmsParserUtil.java | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/java/net/mingsoft/cms/action/GeneraterAction.java b/src/main/java/net/mingsoft/cms/action/GeneraterAction.java index 54ff7bbf..369c933e 100644 --- a/src/main/java/net/mingsoft/cms/action/GeneraterAction.java +++ b/src/main/java/net/mingsoft/cms/action/GeneraterAction.java @@ -223,7 +223,7 @@ public class GeneraterAction extends BaseAction { contentBean.setBeginTime(dateTime); Map map = new HashMap<>(); if (BasicUtil.getWebsiteApp() != null) { - map.put(ParserUtil.APP_ID, BasicUtil.getWebsiteApp().getAppId()); + map.put(ParserUtil.APP_DIR, BasicUtil.getWebsiteApp().getAppDir()); } PageBean page = new PageBean(); map.put(ParserUtil.HTML, ParserUtil.HTML); @@ -277,7 +277,7 @@ public class GeneraterAction extends BaseAction { public String viewIndex(HttpServletRequest request, @PathVariable String position, HttpServletResponse response) { AppEntity app = BasicUtil.getApp(); // 组织主页预览地址 - String indexPosition = app.getAppHostUrl() + File.separator + ParserUtil.HTML + File.separator + app.getAppId() + String indexPosition = app.getAppHostUrl() + File.separator + ParserUtil.HTML + File.separator + app.getAppDir() + File.separator + position + ParserUtil.HTML_SUFFIX; return "redirect:" + indexPosition; } diff --git a/src/main/java/net/mingsoft/cms/action/web/MCmsAction.java b/src/main/java/net/mingsoft/cms/action/web/MCmsAction.java index f43d7e01..9a552cd4 100644 --- a/src/main/java/net/mingsoft/cms/action/web/MCmsAction.java +++ b/src/main/java/net/mingsoft/cms/action/web/MCmsAction.java @@ -427,7 +427,7 @@ public class MCmsAction extends net.mingsoft.cms.action.BaseAction { params.put(ParserUtil.URL, url); params.put(SEARCH, searchMap); if (BasicUtil.getWebsiteApp() != null) { - params.put(ParserUtil.APP_ID, BasicUtil.getWebsiteApp().getAppId()); + params.put(ParserUtil.APP_DIR, BasicUtil.getWebsiteApp().getAppDir()); } params.put(ParserUtil.PAGE, page); params.put(ParserUtil.HTML, ParserUtil.HTML); @@ -470,7 +470,7 @@ public class MCmsAction extends net.mingsoft.cms.action.BaseAction { params.put(ParserUtil.URL, url); params.put(SEARCH, searchMap); if (BasicUtil.getWebsiteApp() != null) { - params.put(ParserUtil.APP_ID, BasicUtil.getWebsiteApp().getAppId()); + params.put(ParserUtil.APP_DIR, BasicUtil.getWebsiteApp().getAppDir()); } params.put(ParserUtil.PAGE, page); params.put(ParserUtil.HTML, ParserUtil.HTML); diff --git a/src/main/java/net/mingsoft/cms/biz/impl/ContentBizImpl.java b/src/main/java/net/mingsoft/cms/biz/impl/ContentBizImpl.java index d0424304..1061cd63 100644 --- a/src/main/java/net/mingsoft/cms/biz/impl/ContentBizImpl.java +++ b/src/main/java/net/mingsoft/cms/biz/impl/ContentBizImpl.java @@ -125,7 +125,7 @@ public class ContentBizImpl extends BaseBizImpl imp contentBean.setBeginTime(dateTime); Map map = new HashMap<>(); if(BasicUtil.getWebsiteApp() != null){ - map.put(ParserUtil.APP_ID, BasicUtil.getWebsiteApp().getAppId()); + map.put(ParserUtil.APP_DIR, BasicUtil.getWebsiteApp().getAppDir()); } PageBean page = new PageBean(); map.put(ParserUtil.HTML, ParserUtil.HTML); @@ -177,7 +177,7 @@ public class ContentBizImpl extends BaseBizImpl imp //获取模板中列表标签中的条件 Map map = new HashMap<>(); if(BasicUtil.getWebsiteApp() != null){ - map.put(ParserUtil.APP_ID, BasicUtil.getWebsiteApp().getAppId()); + map.put(ParserUtil.APP_DIR, BasicUtil.getWebsiteApp().getAppDir()); } PageBean page = new PageBean(); map.put(ParserUtil.HTML, ParserUtil.HTML); @@ -227,7 +227,7 @@ public class ContentBizImpl extends BaseBizImpl imp map.put(ParserUtil.HTML, ParserUtil.HTML); //设置站点编号 if(BasicUtil.getWebsiteApp() !=null){ - map.put(ParserUtil.APP_ID, BasicUtil.getWebsiteApp().getAppId()); + map.put(ParserUtil.APP_DIR, BasicUtil.getWebsiteApp().getAppDir()); } String read = ParserUtil.rendering(templatePath, map); FileUtil.writeString(read, ParserUtil.buildHtmlPath(targetPath), net.mingsoft.base.constant.Const.UTF8); diff --git a/src/main/java/net/mingsoft/cms/util/CmsParserUtil.java b/src/main/java/net/mingsoft/cms/util/CmsParserUtil.java index b6458164..d46712e5 100644 --- a/src/main/java/net/mingsoft/cms/util/CmsParserUtil.java +++ b/src/main/java/net/mingsoft/cms/util/CmsParserUtil.java @@ -83,7 +83,7 @@ public class CmsParserUtil extends ParserUtil { //获取模板中列表标签中的条件 Map map = new HashMap<>(); if (BasicUtil.getWebsiteApp() != null) { - map.put(ParserUtil.APP_ID, BasicUtil.getWebsiteApp().getAppId()); + map.put(ParserUtil.APP_DIR, BasicUtil.getWebsiteApp().getAppDir()); } map.put(ParserUtil.HTML, ParserUtil.HTML); @@ -107,7 +107,7 @@ public class CmsParserUtil extends ParserUtil { parserParams.put(IS_DO, false); parserParams.put(HTML, HTML); if(BasicUtil.getWebsiteApp() != null){ - parserParams.put(APP_ID, BasicUtil.getWebsiteApp().getAppId()); + parserParams.put(APP_DIR, BasicUtil.getWebsiteApp().getAppDir()); } if (contentModel!=null) { // 将自定义模型编号设置为key值