From 9d5a7e017a51f77995160c1200d0abc0c3ad2790 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Wed, 26 Feb 2025 13:42:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E5=9F=9F=E5=90=8D?=
 =?UTF-8?q?=E6=8E=88=E6=9D=83=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gxwebsoft/cms/controller/CmsWebsiteController.java   | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

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<CmsDomain> domains = domainService.list(new LambdaQueryWrapper<CmsDomain>()
       .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);