From f23d238cf72d53506c92d976dbc7781be280b4e2 Mon Sep 17 00:00:00 2001 From: wujj <1027418825@qq.com> Date: Fri, 6 Nov 2020 16:32:27 +0800 Subject: [PATCH] =?UTF-8?q?appid=E6=96=B9=E6=B3=95=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mingsoft/cms/action/CategoryAction.java | 2 +- .../mingsoft/cms/action/ContentAction.java | 4 ++-- .../mingsoft/cms/action/GeneraterAction.java | 8 +++++-- .../cms/action/web/ContentAction.java | 2 +- .../mingsoft/cms/action/web/MCmsAction.java | 6 +++-- .../mingsoft/cms/biz/impl/ContentBizImpl.java | 22 ++++++++++++++----- .../net/mingsoft/cms/util/CmsParserUtil.java | 4 +++- 7 files changed, 33 insertions(+), 15 deletions(-) diff --git a/src/main/java/net/mingsoft/cms/action/CategoryAction.java b/src/main/java/net/mingsoft/cms/action/CategoryAction.java index a8dd7bb6..e8b1861d 100644 --- a/src/main/java/net/mingsoft/cms/action/CategoryAction.java +++ b/src/main/java/net/mingsoft/cms/action/CategoryAction.java @@ -96,7 +96,7 @@ public class CategoryAction extends BaseAction { */ @GetMapping("/form") public String form(@ModelAttribute CategoryEntity category, HttpServletResponse response, HttpServletRequest request, ModelMap model){ - model.addAttribute("appId", BasicUtil.getAppId()); + model.addAttribute("appId", BasicUtil.getApp().getAppId()); return "/cms/category/form"; } diff --git a/src/main/java/net/mingsoft/cms/action/ContentAction.java b/src/main/java/net/mingsoft/cms/action/ContentAction.java index 9c9c5b21..1470a27c 100644 --- a/src/main/java/net/mingsoft/cms/action/ContentAction.java +++ b/src/main/java/net/mingsoft/cms/action/ContentAction.java @@ -98,7 +98,7 @@ public class ContentAction extends BaseAction { */ @GetMapping("/form") public String form(@ModelAttribute ContentEntity content, HttpServletResponse response, HttpServletRequest request, ModelMap model){ - model.addAttribute("appId", BasicUtil.getAppId()); + model.addAttribute("appId", BasicUtil.getApp().getAppId()); return "/cms/content/form"; } @@ -176,7 +176,7 @@ public class ContentAction extends BaseAction { } /** - * @param content 文章实体 + * @param contents 文章实体 */ @ApiOperation(value = "批量删除文章列表接口") @PostMapping("/delete") diff --git a/src/main/java/net/mingsoft/cms/action/GeneraterAction.java b/src/main/java/net/mingsoft/cms/action/GeneraterAction.java index 866ca49a..9883b4ae 100644 --- a/src/main/java/net/mingsoft/cms/action/GeneraterAction.java +++ b/src/main/java/net/mingsoft/cms/action/GeneraterAction.java @@ -182,7 +182,9 @@ public class GeneraterAction extends BaseAction { } //获取模板中列表标签中的条件 Map map = new HashMap<>(); - map.put(ParserUtil.APP_ID, BasicUtil.getAppId()); + if(BasicUtil.getWebsiteApp() != null){ + map.put(ParserUtil.APP_ID, BasicUtil.getWebsiteApp().getAppId()); + } PageBean page = new PageBean(); map.put(ParserUtil.HTML, ParserUtil.HTML); map.put(ParserUtil.URL, BasicUtil.getUrl()); @@ -238,7 +240,9 @@ public class GeneraterAction extends BaseAction { ContentBean contentBean = new ContentBean(); contentBean.setBeginTime(dateTime); Map map = new HashMap<>(); - map.put(ParserUtil.APP_ID, BasicUtil.getAppId()); + if(BasicUtil.getWebsiteApp() != null){ + map.put(ParserUtil.APP_ID, BasicUtil.getWebsiteApp().getAppId()); + } PageBean page = new PageBean(); map.put(ParserUtil.HTML, ParserUtil.HTML); map.put(ParserUtil.URL, BasicUtil.getUrl()); diff --git a/src/main/java/net/mingsoft/cms/action/web/ContentAction.java b/src/main/java/net/mingsoft/cms/action/web/ContentAction.java index 078a9f90..d7c17ebf 100644 --- a/src/main/java/net/mingsoft/cms/action/web/ContentAction.java +++ b/src/main/java/net/mingsoft/cms/action/web/ContentAction.java @@ -132,7 +132,7 @@ public class ContentAction extends net.mingsoft.cms.action.BaseAction{ entity.setContentId(content.getId()); entity.setCreateDate(new Date()); historyLogBiz.saveEntity(entity); - if(content.getAppId() == null || content.getAppId() != BasicUtil.getAppId()){ + if(content.getAppId() == null || content.getAppId() != BasicUtil.getApp().getAppId()){ return "document.write(0)"; } return "document.write(" + content.getContentHit() + ")"; 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 3850700a..96d253b3 100644 --- a/src/main/java/net/mingsoft/cms/action/web/MCmsAction.java +++ b/src/main/java/net/mingsoft/cms/action/web/MCmsAction.java @@ -396,10 +396,12 @@ public class MCmsAction extends net.mingsoft.cms.action.BaseAction { }); //查询数量 - int count= contentBiz.getSearchCount(contentModel,fieldValueList,searchMap,BasicUtil.getAppId(),categoryIds); + int count= contentBiz.getSearchCount(contentModel,fieldValueList,searchMap,BasicUtil.getApp().getAppId(),categoryIds); map.put(ParserUtil.URL, url); map.put(SEARCH, searchMap); - map.put(ParserUtil.APP_ID, BasicUtil.getAppId()); + if(BasicUtil.getWebsiteApp() != null){ + map.put(ParserUtil.APP_ID, BasicUtil.getWebsiteApp().getAppId()); + } map.put(ParserUtil.PAGE, page); map.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 7b77cbd2..e21790ec 100644 --- a/src/main/java/net/mingsoft/cms/biz/impl/ContentBizImpl.java +++ b/src/main/java/net/mingsoft/cms/biz/impl/ContentBizImpl.java @@ -83,7 +83,9 @@ public class ContentBizImpl extends BaseBizImpl imp @Override public List queryIdsByCategoryIdForParser(ContentBean contentBean) { - contentBean.setAppId(BasicUtil.getAppId()); + if(BasicUtil.getWebsiteApp() !=null){ + contentBean.setAppId( BasicUtil.getWebsiteApp().getAppId()); + } return this.contentDao.queryIdsByCategoryIdForParser(contentBean); } @@ -103,7 +105,7 @@ public class ContentBizImpl extends BaseBizImpl imp try { //将任务采集传过来的appId导入到线程变量中 //当前线程使用appId时优先使用此数据 - DataHolder.set(net.mingsoft.basic.constant.Const.APP_ID, appId); + DataHolder.set(ParserUtil.APP_ID, appId); //调用三种静态化 genernateColumn(); generaterIndex(tmpFileName, generateFileName); @@ -127,7 +129,9 @@ public class ContentBizImpl extends BaseBizImpl imp ContentBean contentBean = new ContentBean(); contentBean.setBeginTime(dateTime); Map map = new HashMap<>(); - map.put(net.mingsoft.basic.constant.Const.APP_ID, BasicUtil.getAppId()); + if(BasicUtil.getWebsiteApp() != null){ + map.put(ParserUtil.APP_ID, BasicUtil.getWebsiteApp().getAppId()); + } PageBean page = new PageBean(); map.put(ParserUtil.HTML, ParserUtil.HTML); map.put(ParserUtil.URL, BasicUtil.getUrl()); @@ -166,7 +170,9 @@ public class ContentBizImpl extends BaseBizImpl imp List columns = new ArrayList<>(); // 获取所有的内容管理栏目 CategoryEntity categoryEntity=new CategoryEntity(); - categoryEntity.setAppId(BasicUtil.getAppId()); + if(BasicUtil.getWebsiteApp() !=null){ + categoryEntity.setAppId( BasicUtil.getWebsiteApp().getAppId()); + } columns = categoryDao.query(categoryEntity); List articleIdList = null; // 1、设置模板文件夹路径 @@ -183,7 +189,9 @@ public class ContentBizImpl extends BaseBizImpl imp } //获取模板中列表标签中的条件 Map map = new HashMap<>(); - map.put(net.mingsoft.basic.constant.Const.APP_ID, BasicUtil.getAppId()); + if(BasicUtil.getWebsiteApp() != null){ + map.put(ParserUtil.APP_ID, BasicUtil.getWebsiteApp().getAppId()); + } PageBean page = new PageBean(); map.put(ParserUtil.HTML, ParserUtil.HTML); map.put(ParserUtil.URL, BasicUtil.getUrl()); @@ -237,7 +245,9 @@ public class ContentBizImpl extends BaseBizImpl imp //设置生成的路径 map.put(ParserUtil.HTML, ParserUtil.HTML); //设置站点编号 - map.put(Const.APP_ID, BasicUtil.getAppId()); + if(BasicUtil.getWebsiteApp() !=null){ + map.put(ParserUtil.APP_ID, BasicUtil.getWebsiteApp().getAppId()); + } String read = ParserUtil.read(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 7dfa8dc3..695e7448 100644 --- a/src/main/java/net/mingsoft/cms/util/CmsParserUtil.java +++ b/src/main/java/net/mingsoft/cms/util/CmsParserUtil.java @@ -96,7 +96,9 @@ public class CmsParserUtil extends ParserUtil { parserParams.put(FIELD, column); parserParams.put(IS_DO, false); parserParams.put(HTML, HTML); - parserParams.put(APP_ID, BasicUtil.getAppId()); + if(BasicUtil.getWebsiteApp() != null){ + parserParams.put(APP_ID, BasicUtil.getWebsiteApp().getAppId()); + } if (contentModel!=null) { // 将自定义模型编号设置为key值 parserParams.put(TABLE_NAME, contentModel.getModelTableName());