Compare commits

..

2 Commits

Author SHA1 Message Date
9a905268e6 feat(cms): 同步域名到租户表保证一致性
- 在保存网站信息后同步 cms_website.domain 到 company.app_domain 字段
- 去除域名前缀的 http(s):// 以保持与前端处理一致
- 添加异常捕获,防止同步失败影响主流程
- 通过 tenantId 关联查询对应租户公司信息并更新域名字段
- 记录同步失败的警告日志,便于问题排查
2026-08-06 19:51:05 +08:00
ed963b7a40 fix(auth): 修改权限校验允许超管直接创建和更新网站
- 新租户超管尚未被 grantCmsPermission 授予 cms:website:save 权限时允许直接创建首个站点
- 新租户超管尚未被 grantCmsPermission 授予 cms:website:update 权限时允许直接更新站点
- 更新了 save、update 和 updateAll 接口的 @PreAuthorize 注解以支持上述逻辑
- 添加注释说明注册流程中超管权限放宽的原因
2026-08-06 17:25:18 +08:00
2 changed files with 22 additions and 3 deletions

View File

@@ -92,7 +92,8 @@ public class CmsWebsiteController extends BaseController {
return success(cmsWebsiteService.getByIdRelAll(id));
}
@PreAuthorize("hasAuthority('cms:website:save')")
// 注册流程:新租户超管尚未被 grantCmsPermission 赋予 cms:website:save,允许超管直接创建首个站点
@PreAuthorize("hasAuthority('cms:website:save') or principal.getIsSuperAdmin() == true")
@Operation(summary = "添加网站信息记录表")
@PostMapping()
public ApiResult<?> save(@RequestBody CmsWebsite cmsWebsite) {
@@ -127,7 +128,8 @@ public class CmsWebsiteController extends BaseController {
return fail("创建失败");
}
@PreAuthorize("hasAuthority('cms:website:update')")
// 注册流程:新租户超管尚未被 grantCmsPermission 赋予 cms:website:update,允许超管直接更新站点
@PreAuthorize("hasAuthority('cms:website:update') or principal.getIsSuperAdmin() == true")
@Operation(summary = "修改网站信息记录表")
@PutMapping()
public ApiResult<?> update(@RequestBody CmsWebsite cmsWebsite) {
@@ -154,7 +156,8 @@ public class CmsWebsiteController extends BaseController {
return fail("修改失败");
}
@PreAuthorize("hasAuthority('cms:website:update')")
// 注册流程:新租户超管尚未被 grantCmsPermission 赋予 cms:website:update,允许超管直接更新站点
@PreAuthorize("hasAuthority('cms:website:update') or principal.getIsSuperAdmin() == true")
@Operation(summary = "修改网站信息记录表")
@PutMapping("/updateAll")
public ApiResult<?> updateAll(@RequestBody CmsWebsite cmsWebsite) {

View File

@@ -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_domainwebsopy 租户表),保证 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());