优化CMS各种url生成调用

modules/cms/src/main/java/com/jeesite/modules/cms/entity/Site.java

@@ -4,20 +4,20 @@
  */
 package com.jeesite.modules.cms.entity;
 
-import java.util.List;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
-
 import com.jeesite.common.config.Global;
 import com.jeesite.common.entity.DataEntity;
 import com.jeesite.common.lang.StringUtils;
 import com.jeesite.common.mybatis.annotation.Column;
 import com.jeesite.common.mybatis.annotation.Table;
 import com.jeesite.common.mybatis.mapper.query.QueryType;
+import com.jeesite.modules.cms.utils.CmsUtils;
 import com.jeesite.modules.sys.utils.CorpUtils;
 import com.jeesite.modules.sys.utils.UserUtils;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+import java.util.List;
+
 /**
  * 站点表Entity
  * @author 长春叭哥、ThinkGem
@@ -209,15 +209,16 @@ public class Site extends DataEntity<Site> {
 		this.categoryList = categoryList;
 	}
 
-	
-	
-
 	/**
 	 * 判断是否为当前站点
 	 */
 	public Boolean getIsCurrentSite(){
 		return getCurrentSiteCode().equals(siteCode);
 	}
+
+	public String getUrl() {
+		return CmsUtils.getUrlDynamic(this);
+	}
 	
 	/**
 	 * 判断是否为默认（主站）站点

modules/cms/src/main/java/com/jeesite/modules/cms/utils/CmsUtils.java

@@ -43,7 +43,6 @@ public class CmsUtils {
 
 	/**
 	 * 获得当前站点信息
-	 * @param siteCode 站点编号
 	 */
 	public static Site getCurrentSite() {
 		return getSite(Site.getCurrentSiteCode());
@@ -296,6 +295,26 @@ public class CmsUtils {
 		return str.toString();
 	}
 
+	/**
+	 * 获得站点动态URL地址
+	 * @param site
+	 * @return url
+	 */
+	public static String getUrlDynamic(Site site) {
+		StringBuilder str = new StringBuilder();
+		str.append(Static.context.getContextPath()).append(Global.getFrontPath());
+		if (StringUtils.isNotBlank(site.getDomain())) {
+			if (site.getDomain().contains("://")) {
+				return site.getDomain();
+			} else {
+				str.append(site.getDomain());
+				return str.toString();
+			}
+		}
+		str.append("/index-").append(site.getSiteCode()).append(".html");
+		return str.toString();
+	}
+
 	/**
 	 * 获得栏目动态URL地址
 	 * @param category

modules/cms/src/main/resources/views/modules/cmsfront/themes/default/include/banner.html

@@ -1,15 +1,15 @@
 <div class="row"><br/>
 	<ul class="breadcrumb">
-		<li><span style="color:#999;">当前位置：</span><a href="${ctx}/index-${site.siteCode}">首页</a></li>
+		<li><span style="color:#999;">当前位置：</span><a href="${site.url}">首页</a></li>
 		<%
 			var pcs = @StringUtils.split(category.parentCodes, ',');
 			var tns = @StringUtils.split(category.treeNames, '/');
 			for(var i = 0; i < pcs.~size - 1; i++){
 		%>
-		<li><a href="${ctx}/list-${pcs[i+1]}">${tns[i]}</a></li>
+		<li><a href="${ctx}/list-${pcs[i+1]}.html">${tns[i]}</a></li>
 		<%
 			}
 		%>
-		<li><a href="${ctx}/list-${category.categoryCode}">${category.categoryName}</a></li>
+		<li><a href="${category.url}">${category.categoryName}</a></li>
 	</ul>
 </div>

modules/cms/src/main/resources/views/modules/cmsfront/themes/default/include/header.html

@@ -4,7 +4,7 @@
 <div class="navbar navbar-inverse navbar-fixed-top">
   <div class="container">
     <div class="navbar-header">
-      <a href="${ctx}/index-${site.siteCode}" class="navbar-brand">${site.title}</a>
+      <a href="${site.url}" class="navbar-brand">${site.title}</a>
       <button class="navbar-toggle" type="button" data-toggle="collapse" data-target="#navbar-main">
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
@@ -16,7 +16,7 @@
         <#html:foreach items="${categoryList(site.siteCode, '0', 4, '')}" var="c">
         	<#html:if test="${c.inMenu == @Global.YES}">
 	          <li class="${c.categoryCode == category.categoryCode! ? 'active' : ''}"><a
-	            href="${ctx}/list-${c.categoryCode}">${c.categoryName}</a></li>
+	            href="${c.url}">${c.categoryName}</a></li>
             </#html:if>
         </#html:foreach>
         <li><a href="http://s.jeesite.com" target="_blank">技术服务</a></li>
@@ -24,7 +24,7 @@
           <a class="dropdown-toggle" data-toggle="dropdown" href="#" title="站点">子站切换 <span class="caret"></span></a>
           <ul class="dropdown-menu">
             <#html:foreach items="${siteList()}" var="site,status">
-              <li><a href="#" onclick="location='${ctx}/index-${site.id}'">${site.title}</a></li>
+              <li><a href="#" onclick="location='${site.url}'">${site.title}</a></li>
             </#html:foreach>
           </ul>
         </li>

modules/cms/src/main/resources/views/modules/cmsfront/themes/default/index.html

@@ -15,7 +15,7 @@
 				<div class="bs-component">
 					<div class="panel panel-default">
 						<div class="panel-heading">
-							<h3 class="panel-title"><small><a href="${ctx}/list-${category.categoryCode}" class="pull-right more">更多&gt;&gt;</a></small>${category.categoryName}</h3>
+							<h3 class="panel-title"><small><a href="${category.url}" class="pull-right more">更多&gt;&gt;</a></small>${category.categoryName}</h3>
 						</div>
 						<div class="panel-body">
 							<ul class="article-list">

modules/cms/src/main/resources/views/modules/cmsfront/themes/default/list.html

@@ -21,7 +21,7 @@
 			<div class="pagination">${@page.toHtml()}</div>
 			<script type="text/javascript">
 			function page(n,s){
-				location="${ctx}/list-${category.categoryCode}?pageNo="+n+"&pageSize="+s;
+				location="${ctx}/${category.url}?pageNo="+n+"&pageSize="+s;
 			}
 			</script>
 		</#html:if>

modules/cms/src/main/resources/views/modules/cmsfront/themes/default/listCategory.html

@@ -18,7 +18,7 @@
 						<div class="bs-component">
 							<div class="panel panel-default">
 								<div class="panel-heading">
-									<h3 class="panel-title"><small><a href="${ctx}/list-${category.categoryCode}" class="pull-right more">更多&gt;&gt;</a></small>${category.categoryName}</h3>
+									<h3 class="panel-title"><small><a href="${category.url}" class="pull-right more">更多&gt;&gt;</a></small>${category.categoryName}</h3>
 								</div>
 								<div class="panel-body">
 									<ul class="article-list">