获取地址栏中的url

doc/4.6.5-to-4.7.0-sqlserver.sql

@@ -452,13 +452,18 @@ app_copyright as copyright,
 <#--动态解析 -->
 <#if isDo?? && isDo>
 ''${url}'' as url,
+''${url}'' as host,
+<#--使用地址栏的域名 -->
+<#elseif url??>
+''${url}/${html}/''+app_id+''/<#if m??>${m}</#if>'' as url,
+''${url}'' as host,
 <#else>
 REPLACE(<#-- 剔除换行符 -->
-substring( app_url, 0, CHARINDEX ( CHAR ( 10 ), app_url ) ),CHAR ( 13 ),'''')+''/html/''+convert(varchar(50),app_id)+''/<#if m??>m</#if>'' as url, 
-</#if>
+substring( app_url, 0, CHARINDEX ( CHAR ( 10 ), app_url ) ),CHAR ( 13 ),'''')+''/${html}/''+convert(varchar(50),app_id)+''/<#if m??>${m}</#if>'' as url, 
 REPLACE(<#-- 剔除换行符 -->
 substring( app_url, 0, CHARINDEX ( CHAR ( 10 ), app_url ) ),CHAR ( 13 ),'''') as host,
-''templets/''+convert(varchar(50),app_id)+''/''<#if m??>+app_style+''/m''<#else>+app_style</#if> as style <#-- 判断是否为手机端 -->
+</#if>
+''templets/''+convert(varchar(50),app_id)+''/''<#if m??>+app_style+''/${m}''<#else>+app_style</#if> as style <#-- 判断是否为手机端 -->
 from app', N'1')
 GO
 

doc/db-mcms-sqlserver-4.7.0.sql

@@ -2264,13 +2264,18 @@ app_copyright as copyright,
 <#--动态解析 -->
 <#if isDo?? && isDo>
 ''${url}'' as url,
+''${url}'' as host,
+<#--使用地址栏的域名 -->
+<#elseif url??>
+''${url}/${html}/''+app_id+''/<#if m??>${m}</#if>'' as url,
+''${url}'' as host,
 <#else>
 REPLACE(<#-- 剔除换行符 -->
-substring( app_url, 0, CHARINDEX ( CHAR ( 10 ), app_url ) ),CHAR ( 13 ),'''')+''/html/''+convert(varchar(50),app_id)+''/<#if m??>m</#if>'' as url, 
-</#if>
+substring( app_url, 0, CHARINDEX ( CHAR ( 10 ), app_url ) ),CHAR ( 13 ),'''')+''/${html}/''+convert(varchar(50),app_id)+''/<#if m??>${m}</#if>'' as url, 
 REPLACE(<#-- 剔除换行符 -->
 substring( app_url, 0, CHARINDEX ( CHAR ( 10 ), app_url ) ),CHAR ( 13 ),'''') as host,
-''templets/''+convert(varchar(50),app_id)+''/''<#if m??>+app_style+''/m''<#else>+app_style</#if> as style <#-- 判断是否为手机端 -->
+</#if>
+''templets/''+convert(varchar(50),app_id)+''/''<#if m??>+app_style+''/${m}''<#else>+app_style</#if> as style <#-- 判断是否为手机端 -->
 from app', N'1'), (N'8', N'7', N'SELECT 
 basic_id as id,
 left(basic_title,${titlelen?default(40)}) as title,

src/main/java/net/mingsoft/cms/action/web/MCmsAction.java

@@ -35,10 +35,12 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 
+import cn.hutool.core.util.ObjectUtil;
 import net.mingsoft.basic.biz.IColumnBiz;
 import net.mingsoft.basic.entity.ColumnEntity;
 import net.mingsoft.cms.bean.ColumnArticleIdBean;
 import net.mingsoft.cms.biz.IArticleBiz;
+import net.mingsoft.cms.constant.ModelCode;
 import net.mingsoft.cms.entity.ArticleEntity;
 import net.mingsoft.cms.util.CmsParserUtil;
 import net.mingsoft.mdiy.biz.IPageBiz;
@@ -159,7 +161,8 @@ public class MCmsAction extends net.mingsoft.mdiy.action.BaseAction {
 		List<ColumnArticleIdBean> columnArticles = articleBiz.queryIdsByCategoryIdForParser(typeId, null, null);
 		//判断栏目下是否有文章
 		if(columnArticles.size()==0){
-			this.outJson(resp, false);
+			this.outJson(resp, null,false,getResString("err.empty", this.getResString("typeid")));
+			return;	
 		}
 		map.put(ParserUtil.COLUMN, columnArticles.get(0));
 		//获取总数
@@ -201,6 +204,10 @@ public class MCmsAction extends net.mingsoft.mdiy.action.BaseAction {
 	public void view(HttpServletRequest req, HttpServletResponse resp) {
 		//参数文章编号
 		ArticleEntity article = (ArticleEntity) articleBiz.getEntity(BasicUtil.getInt(ParserUtil.ID));
+		if(ObjectUtil.isNull(article)){
+			this.outJson(resp, null,false,getResString("err.empty", this.getResString("id")));
+			return;	
+		}
 		//根据文章编号查询栏目详情模版
 		ColumnEntity column = (ColumnEntity) columnBiz.getEntity(article.getBasicCategoryId());
 		//解析后的内容

src/main/java/net/mingsoft/cms/resources/resources_zh_CN.properties

@@ -1,3 +1,5 @@
 #mcms\u7248\u672c
 version=d3a98fefcb242db78da5fc31608ff247
-templet.file=\u6a21\u677f\u6587\u4ef6\u4e0d\u5b58\u5728
+templet.file=\u6a21\u677f\u6587\u4ef6\u4e0d\u5b58\u5728
+id=\u6587\u7ae0\u7f16\u53f7
+typeid=\u680f\u76ee\u7f16\u53f7

src/main/java/net/mingsoft/config/WebConfig.java

@@ -50,7 +50,7 @@ public class WebConfig implements WebMvcConfigurer {
 
 	@Override
 	public void addResourceHandlers(ResourceHandlerRegistry registry) {
-		registry.addResourceHandler("/html/**").addResourceLocations("classpath:/html/");
+		registry.addResourceHandler("/html/**").addResourceLocations("/html/");
 		registry.addResourceHandler("/app/**").addResourceLocations("classpath:/app/");
 		registry.addResourceHandler("/static/**").addResourceLocations("classpath:/static/");
 		registry.addResourceHandler("/api/**").addResourceLocations("classpath:/api/");