1、生成修改html/编号问题，增加app_dir

2、针对app_dir调整解析器
3、模板交互增加

src/main/java/net/mingsoft/cms/action/GeneraterAction.java

@@ -223,7 +223,7 @@ public class GeneraterAction extends BaseAction {
         contentBean.setBeginTime(dateTime);
         Map<String, Object> 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;
     }

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);

src/main/java/net/mingsoft/cms/biz/impl/ContentBizImpl.java

@@ -125,7 +125,7 @@ public class ContentBizImpl  extends BaseBizImpl<IContentDao, ContentEntity> imp
 		contentBean.setBeginTime(dateTime);
 		Map<String, Object> 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<IContentDao, ContentEntity> imp
 				//获取模板中列表标签中的条件
 				Map<String, Object> 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<IContentDao, ContentEntity> 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);

src/main/java/net/mingsoft/cms/util/CmsParserUtil.java

@@ -83,7 +83,7 @@ public class CmsParserUtil extends ParserUtil {
 			//获取模板中列表标签中的条件
 			Map<String, Object> 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值