diff --git a/modules/cms/src/main/java/com/jeesite/modules/cms/entity/Site.java b/modules/cms/src/main/java/com/jeesite/modules/cms/entity/Site.java index 298dfd41..db10b6c9 100644 --- a/modules/cms/src/main/java/com/jeesite/modules/cms/entity/Site.java +++ b/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 { this.categoryList = categoryList; } - - - /** * 判断是否为当前站点 */ public Boolean getIsCurrentSite(){ return getCurrentSiteCode().equals(siteCode); } + + public String getUrl() { + return CmsUtils.getUrlDynamic(this); + } /** * 判断是否为默认（主站）站点 diff --git a/modules/cms/src/main/java/com/jeesite/modules/cms/utils/CmsUtils.java b/modules/cms/src/main/java/com/jeesite/modules/cms/utils/CmsUtils.java index e646b90a..af1a031c 100644 --- a/modules/cms/src/main/java/com/jeesite/modules/cms/utils/CmsUtils.java +++ b/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 diff --git a/modules/cms/src/main/resources/views/modules/cmsfront/themes/default/include/banner.html b/modules/cms/src/main/resources/views/modules/cmsfront/themes/default/include/banner.html index d31238c0..38984105 100644 --- a/modules/cms/src/main/resources/views/modules/cmsfront/themes/default/include/banner.html +++ b/modules/cms/src/main/resources/views/modules/cmsfront/themes/default/include/banner.html @@ -1,15 +1,15 @@

\ No newline at end of file diff --git a/modules/cms/src/main/resources/views/modules/cmsfront/themes/default/include/header.html b/modules/cms/src/main/resources/views/modules/cmsfront/themes/default/include/header.html index 7d4158c8..c9068265 100644 --- a/modules/cms/src/main/resources/views/modules/cmsfront/themes/default/include/header.html +++ b/modules/cms/src/main/resources/views/modules/cmsfront/themes/default/include/header.html @@ -4,7 +4,7 @@
- ${site.title} + ${site.title}