diff --git a/src/main/java/com/gxwebsoft/cms/controller/CmsWebsiteController.java b/src/main/java/com/gxwebsoft/cms/controller/CmsWebsiteController.java index e43d124..2773107 100644 --- a/src/main/java/com/gxwebsoft/cms/controller/CmsWebsiteController.java +++ b/src/main/java/com/gxwebsoft/cms/controller/CmsWebsiteController.java @@ -197,16 +197,19 @@ public class CmsWebsiteController extends BaseController { fields.forEach(d -> { config.put(d.getName(), d.getValue()); }); - config.put("Domain", redisUtil.get("Domain:")); - config.put("SubDomain", redisUtil.get("Domain:".concat(website.getWebsiteCode()).concat("wsdns.cn"))); final List domains = domainService.list(new LambdaQueryWrapper() .eq(CmsDomain::getDeleted,0) .eq(CmsDomain::getStatus, 1) - .eq(CmsDomain::getTenantId, getTenantId())); + .eq(CmsDomain::getTenantId, getTenantId()) + .orderByAsc(CmsDomain::getSortNumber) + ); if (!CollectionUtils.isEmpty(domains)) { + // 已授权的域名 domains.forEach(d -> { config.put("Domain_" + d.getId(), d.getDomain()); }); + // 主域名(默认选第一条记录) + config.put("Domain", domains.get(0).getDomain()); } website.setConfig(config);