diff --git a/src/main/java/com/gxwebsoft/common/system/controller/MainController.java b/src/main/java/com/gxwebsoft/common/system/controller/MainController.java index a50320c..23cf5be 100644 --- a/src/main/java/com/gxwebsoft/common/system/controller/MainController.java +++ b/src/main/java/com/gxwebsoft/common/system/controller/MainController.java @@ -516,6 +516,8 @@ public class MainController extends BaseController { company.setEmail(email); company.setPassword(password); company.setTid(tenant.getTenantId()); + company.setCompanyName(tenantName); + company.setShortName(tenantName); company.setTenantId(tenant.getTenantId()); tenantService.initialization(company); return success("注册成功", tenant.getTenantId()); diff --git a/src/main/java/com/gxwebsoft/common/system/entity/User.java b/src/main/java/com/gxwebsoft/common/system/entity/User.java index 8b011b5..a70a311 100644 --- a/src/main/java/com/gxwebsoft/common/system/entity/User.java +++ b/src/main/java/com/gxwebsoft/common/system/entity/User.java @@ -77,6 +77,7 @@ public class User implements UserDetails { private String idCard; @ApiModelProperty("身份证号") + @TableField(exist = false) private String idCardNo; @ApiModelProperty("出生日期") diff --git a/src/main/java/com/gxwebsoft/common/system/service/impl/TenantServiceImpl.java b/src/main/java/com/gxwebsoft/common/system/service/impl/TenantServiceImpl.java index 83cf5a3..6c5de82 100644 --- a/src/main/java/com/gxwebsoft/common/system/service/impl/TenantServiceImpl.java +++ b/src/main/java/com/gxwebsoft/common/system/service/impl/TenantServiceImpl.java @@ -591,7 +591,7 @@ public class TenantServiceImpl extends ServiceImpl impleme // 发送邮件通知 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 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()); return true;