gxwebsoft/core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复租户注册bug

Browse Source
This commit is contained in:
赵忠林
2024-07-04 22:43:12 +08:00
parent 23f892e6ee
commit 7e1573db4f
3 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/gxwebsoft/common/system/controller/MainController.java
View File

@@ -516,6 +516,8 @@ public class MainController extends BaseController {
company.setEmail(email); company.setEmail(email);
company.setPassword(password); company.setPassword(password);
company.setTid(tenant.getTenantId()); company.setTid(tenant.getTenantId());
company.setCompanyName(tenantName);
company.setShortName(tenantName);
company.setTenantId(tenant.getTenantId()); company.setTenantId(tenant.getTenantId());
tenantService.initialization(company); tenantService.initialization(company);
return success("注册成功", tenant.getTenantId()); return success("注册成功", tenant.getTenantId());

1
src/main/java/com/gxwebsoft/common/system/entity/User.java
View File

@@ -77,6 +77,7 @@ public class User implements UserDetails {
private String idCard; private String idCard;
@ApiModelProperty("身份证号") @ApiModelProperty("身份证号")
@TableField(exist = false)
private String idCardNo; private String idCardNo;
@ApiModelProperty("出生日期") @ApiModelProperty("出生日期")

2
src/main/java/com/gxwebsoft/common/system/service/impl/TenantServiceImpl.java
View File

@@ -591,7 +591,7 @@ public class TenantServiceImpl extends ServiceImpl<TenantMapper, Tenant> impleme
// 发送邮件通知 // 发送邮件通知
String title = "恭喜！您的账号已注册成功"; String title = "恭喜！您的账号已注册成功";
String content = "租户ID：".concat(company.getTid().toString()).concat("\r\n名称：" + company.getShortName()).concat("\r\n账号：" + company.getPhone()).concat("\r\n密码：" + company.getPassword()); String content = "租户ID：".concat(company.getTid().toString()).concat("\r\n名称：" + company.getShortName()).concat("\r\n账号：" + company.getPhone()).concat("\r\n密码：" + company.getPassword());
String adminUrl = "\r\n后台管理：".concat("http://").concat(company.getTid().toString()).concat(".adm.wsdns.cn"); String adminUrl = "\r\n后台管理：".concat("http://").concat(company.getTid().toString()).concat(".admin.websoft.top");
// 发送邮件通知 // 发送邮件通知
emailRecordService.sendEmail(title, content.concat(adminUrl), company.getEmail()); emailRecordService.sendEmail(title, content.concat(adminUrl), company.getEmail());
return true; return true;