ZP/zp-fightwine
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor： 后台用户更新 租户注册二维码域名获取

Browse Source
This commit is contained in:
pengsz 2025-12-09 18:45:22 +08:00
parent a87b5c600e
commit ba4d22792c
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fightwine-common/src/main/java/com/yzt/common/response/UserCenterResponse.java
View File

@ -96,7 +96,7 @@ public class UserCenterResponse implements Serializable {
@ApiModelProperty(value = "公司名称") @ApiModelProperty(value = "公司名称")
private String tenantName; private String tenantName;
@ApiModelProperty(value = "租户名称") @ApiModelProperty(value = "租户id")
@JsonFormat(shape = JsonFormat.Shape.STRING) @JsonFormat(shape = JsonFormat.Shape.STRING)
private Long tenantId; private Long tenantId;

5
fightwine-common/src/main/java/com/yzt/common/response/UserResponse.java
View File

@ -1,5 +1,6 @@
package com.yzt.common.response; package com.yzt.common.response;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
@ -25,6 +26,10 @@ public class UserResponse {
@JsonIgnore @JsonIgnore
private String pwd; private String pwd;
@ApiModelProperty(value = "租户名称")
@JsonFormat(shape = JsonFormat.Shape.STRING)
private Long tenantId;
@ApiModelProperty(value = "真实姓名") @ApiModelProperty(value = "真实姓名")
private String realName; private String realName;

7
fightwine-service/src/main/java/com/yzt/service/service/impl/TenantServiceImpl.java
View File

@ -53,6 +53,9 @@ public class TenantServiceImpl extends ServiceImpl<TenantMapper, Tenant> impleme
@Autowired @Autowired
private SystemAttachmentService systemAttachmentService; private SystemAttachmentService systemAttachmentService;
@Autowired
private SystemConfigService systemConfigService;
@Autowired @Autowired
private QrCodeService qrCodeService; private QrCodeService qrCodeService;
@ -68,7 +71,7 @@ public class TenantServiceImpl extends ServiceImpl<TenantMapper, Tenant> impleme
tenant.setCreatedTime(YztDateUtil.nowDateTime()); tenant.setCreatedTime(YztDateUtil.nowDateTime());
tenant.setCreatedBy(SecurityUtil.getLoginUserVo().getUser().getId()); tenant.setCreatedBy(SecurityUtil.getLoginUserVo().getUser().getId());
} }
if(tenant.getRegisterQrCodeUrl().isBlank()){ if(ObjectUtil.isNull(tenant.getRegisterQrCodeUrl())){
tenant.setRegisterQrCodeUrl(generateRegisterUrl()); tenant.setRegisterQrCodeUrl(generateRegisterUrl());
} }
tenant.setUpdatedTime(YztDateUtil.nowDateTime()); tenant.setUpdatedTime(YztDateUtil.nowDateTime());
@ -176,7 +179,7 @@ public class TenantServiceImpl extends ServiceImpl<TenantMapper, Tenant> impleme
@Override @Override
public String generateRegisterUrl() { 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) { private void checkNameExist(TenantSaveRequest req) {