From ba4d22792ca107365eb7da1c4a6df76daffabeb8 Mon Sep 17 00:00:00 2001 From: pengsz Date: Tue, 9 Dec 2025 18:45:22 +0800 Subject: [PATCH] =?UTF-8?q?refactor=EF=BC=9A=20=E5=90=8E=E5=8F=B0=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E6=9B=B4=E6=96=B0=20=20=20=E7=A7=9F=E6=88=B7=E6=B3=A8?= =?UTF-8?q?=E5=86=8C=E4=BA=8C=E7=BB=B4=E7=A0=81=E5=9F=9F=E5=90=8D=E8=8E=B7?= =?UTF-8?q?=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/yzt/common/response/UserCenterResponse.java | 2 +- .../main/java/com/yzt/common/response/UserResponse.java | 5 +++++ .../com/yzt/service/service/impl/TenantServiceImpl.java | 7 +++++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/fightwine-common/src/main/java/com/yzt/common/response/UserCenterResponse.java b/fightwine-common/src/main/java/com/yzt/common/response/UserCenterResponse.java index 70bb422..5b12e23 100644 --- a/fightwine-common/src/main/java/com/yzt/common/response/UserCenterResponse.java +++ b/fightwine-common/src/main/java/com/yzt/common/response/UserCenterResponse.java @@ -96,7 +96,7 @@ public class UserCenterResponse implements Serializable { @ApiModelProperty(value = "公司名称") private String tenantName; - @ApiModelProperty(value = "租户名称") + @ApiModelProperty(value = "租户id") @JsonFormat(shape = JsonFormat.Shape.STRING) private Long tenantId; diff --git a/fightwine-common/src/main/java/com/yzt/common/response/UserResponse.java b/fightwine-common/src/main/java/com/yzt/common/response/UserResponse.java index 244b329..132f7b1 100644 --- a/fightwine-common/src/main/java/com/yzt/common/response/UserResponse.java +++ b/fightwine-common/src/main/java/com/yzt/common/response/UserResponse.java @@ -1,5 +1,6 @@ package com.yzt.common.response; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -25,6 +26,10 @@ public class UserResponse { @JsonIgnore private String pwd; + @ApiModelProperty(value = "租户名称") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private Long tenantId; + @ApiModelProperty(value = "真实姓名") private String realName; diff --git a/fightwine-service/src/main/java/com/yzt/service/service/impl/TenantServiceImpl.java b/fightwine-service/src/main/java/com/yzt/service/service/impl/TenantServiceImpl.java index 1b6820c..566ad26 100644 --- a/fightwine-service/src/main/java/com/yzt/service/service/impl/TenantServiceImpl.java +++ b/fightwine-service/src/main/java/com/yzt/service/service/impl/TenantServiceImpl.java @@ -53,6 +53,9 @@ public class TenantServiceImpl extends ServiceImpl impleme @Autowired private SystemAttachmentService systemAttachmentService; + @Autowired + private SystemConfigService systemConfigService; + @Autowired private QrCodeService qrCodeService; @@ -68,7 +71,7 @@ public class TenantServiceImpl extends ServiceImpl impleme tenant.setCreatedTime(YztDateUtil.nowDateTime()); tenant.setCreatedBy(SecurityUtil.getLoginUserVo().getUser().getId()); } - if(tenant.getRegisterQrCodeUrl().isBlank()){ + if(ObjectUtil.isNull(tenant.getRegisterQrCodeUrl())){ tenant.setRegisterQrCodeUrl(generateRegisterUrl()); } tenant.setUpdatedTime(YztDateUtil.nowDateTime()); @@ -176,7 +179,7 @@ public class TenantServiceImpl extends ServiceImpl impleme @Override public String generateRegisterUrl() { - return systemAttachmentService.getCdnUrl()+"/#/pages/register/register?tenantId=" + SecurityUtil.getLoginUserVo().getUser().getTenantId(); + return systemConfigService.getValueByKey("register_qr_code_url")+"/#/pages/register/register?tenantId=" + SecurityUtil.getLoginUserVo().getUser().getTenantId(); } private void checkNameExist(TenantSaveRequest req) {