From 9a905268e6212df79dad15a4492c90a8c375d91c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Thu, 6 Aug 2026 19:51:05 +0800
Subject: [PATCH] =?UTF-8?q?feat(cms):=20=E5=90=8C=E6=AD=A5=E5=9F=9F?=
 =?UTF-8?q?=E5=90=8D=E5=88=B0=E7=A7=9F=E6=88=B7=E8=A1=A8=E4=BF=9D=E8=AF=81?=
 =?UTF-8?q?=E4=B8=80=E8=87=B4=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在保存网站信息后同步 cms_website.domain 到 company.app_domain 字段
- 去除域名前缀的 http(s):// 以保持与前端处理一致
- 添加异常捕获，防止同步失败影响主流程
- 通过 tenantId 关联查询对应租户公司信息并更新域名字段
- 记录同步失败的警告日志，便于问题排查
---
 .../cms/service/impl/CmsWebsiteServiceImpl.java  | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src/main/java/com/gxwebsoft/cms/service/impl/CmsWebsiteServiceImpl.java b/src/main/java/com/gxwebsoft/cms/service/impl/CmsWebsiteServiceImpl.java
index 6e9f893..92e27e4 100644
--- a/src/main/java/com/gxwebsoft/cms/service/impl/CmsWebsiteServiceImpl.java
+++ b/src/main/java/com/gxwebsoft/cms/service/impl/CmsWebsiteServiceImpl.java
@@ -9,6 +9,7 @@ import com.gxwebsoft.common.core.utils.JSONUtil;
 import com.gxwebsoft.common.core.utils.RedisUtil;
 import com.gxwebsoft.common.core.web.PageParam;
 import com.gxwebsoft.common.core.web.PageResult;
+import com.gxwebsoft.common.system.entity.Company;
 import com.gxwebsoft.common.system.entity.User;
 import com.gxwebsoft.common.system.service.CompanyService;
 import com.gxwebsoft.common.system.service.UserService;
@@ -204,6 +205,21 @@ public class CmsWebsiteServiceImpl extends ServiceImpl<CmsWebsiteMapper, CmsWebs
 
     // 初始化数据
     if(save(website)){
+      // 同步域名到 company.app_domain（websopy 租户表），保证 cms_website.domain 与 app_domain 一致
+      if (StrUtil.isNotBlank(website.getDomain())) {
+        try {
+          Company company = companyService.getByTenantIdRel(loginUser.getTenantId());
+          if (company != null) {
+            // 去掉 http(s):// 前缀，与前端处理保持一致
+            String cleanDomain = website.getDomain().replaceFirst("^(https?://)", "");
+            company.setDomain(cleanDomain);
+            companyService.updateById(company);
+          }
+        } catch (Exception e) {
+          log.warn("同步域名到 company 失败, tenantId={}", loginUser.getTenantId(), e);
+        }
+      }
+
       // 插入网站设置记录
 //      final CmsWebsiteSetting setting = new CmsWebsiteSetting();
 //      setting.setWebsiteId(website.getWebsiteId());