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

优化：用户注册规则

Browse Source
This commit is contained in:
赵忠林
2025-03-02 18:16:30 +08:00
parent 05ffbb3c75
commit 4ce6d35847
6 changed files with 47 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -585,6 +585,9 @@ public class MainController extends BaseController {
final UserParam userParam = new UserParam();
userParam.setPhone(phone);
userParam.setTenantId(5);
if (user.getTemplateId() != null) {
userParam.setTemplateId(user.getTemplateId());
}
final User addUser = userService.addUser(userParam);
// 设置过期时间
Long tokenExpireTime = configProperties.getTokenExpireTime();
@@ -619,6 +622,7 @@ public class MainController extends BaseController {
company.setCompanyName(tenantName);
company.setShortName(tenantName);
company.setTenantId(tenant.getTenantId());
company.setTemplateId(user.getTemplateId());
tenantService.initialization(company);
final User adminByPhone = userService.getAdminByPhone(phone);

11
src/main/java/com/gxwebsoft/common/system/controller/MenuController.java
View File

@@ -6,14 +6,12 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.gxwebsoft.common.core.annotation.OperationLog;
import com.gxwebsoft.common.core.web.*;
import com.gxwebsoft.common.system.entity.Company;
import com.gxwebsoft.common.system.entity.Dict;
import com.gxwebsoft.common.system.entity.Menu;
import com.gxwebsoft.common.system.entity.Version;
import com.gxwebsoft.common.system.entity.*;
import com.gxwebsoft.common.system.param.MenuParam;
import com.gxwebsoft.common.system.param.VersionParam;
import com.gxwebsoft.common.system.service.CompanyService;
import com.gxwebsoft.common.system.service.MenuService;
import com.gxwebsoft.common.system.service.UserService;
import com.gxwebsoft.common.system.service.VersionService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -42,6 +40,8 @@ public class MenuController extends BaseController {
private CompanyService companyService;
@Resource
private VersionService versionService;
@Resource
private UserService userService;
@PreAuthorize("hasAuthority('sys:menu:list')")
@ApiOperation("分页查询菜单")
@@ -183,6 +183,7 @@ public class MenuController extends BaseController {
@ApiOperation("菜单克隆")
@PostMapping("/clone")
public ApiResult<?> onClone(@RequestBody MenuParam param){
final User loginUser = getLoginUser();
if(menuService.cloneMenu(param)){
Integer companyId = getCompanyId();
Company company = new Company();
@@ -197,6 +198,8 @@ public class MenuController extends BaseController {
company.setVersionCode(version.getVersionCode());
}
companyService.updateById(company);
loginUser.setInstalled(true);
userService.updateById(loginUser);
return success("安装成功");
}
return fail("安装失败");

5
src/main/java/com/gxwebsoft/common/system/entity/Company.java
View File

@@ -321,7 +321,12 @@ public class Company implements Serializable {
@TableField(exist = false)
private List<Menu> authorities;
@ApiModelProperty("记录克隆的模板ID")
@TableField(exist = false)
private Integer templateId;
public String getMobile() {
return DesensitizedUtil.mobilePhone(this.phone);
}
}

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

@@ -342,6 +342,9 @@ public class User implements UserDetails {
@ApiModelProperty("模板ID")
private Integer templateId;
@ApiModelProperty(value = "插件安装状态")
private Boolean installed;
// @ApiModelProperty("企业信息")
// @TableField(exist = false)
// private Company companyInfo;

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

@@ -108,6 +108,7 @@ public class TenantServiceImpl extends ServiceImpl<TenantMapper, Tenant> impleme
superAdmin.setNickname("超级管理员");
superAdmin.setPhone(company.getPhone());
superAdmin.setEmail(company.getEmail());
superAdmin.setTemplateId(company.getTemplateId());
superAdmin.setIsAdmin(true);
superAdmin.setRealName(company.getBusinessEntity());
superAdmin.setPassword(userService.encodePassword(company.getPassword()));

35
src/main/java/com/gxwebsoft/common/system/service/impl/UserServiceImpl.java
View File

@@ -247,17 +247,36 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
addUser.setNickname(DesensitizedUtil.mobilePhone(userParam.getPhone()));
addUser.setPlatform(WEB);
addUser.setGradeId(2);
if(userParam.getTemplateId() != null){
addUser.setTemplateId(userParam.getTemplateId());
}
if(userParam.getPhone() != null){
addUser.setPhone(userParam.getPhone());
}
if(userParam.getPassword() != null){
addUser.setPassword(encodePassword(userParam.getPassword()));
}else {
addUser.setPassword(encodePassword(CommonUtil.randomUUID16()));
}
if(userParam.getProvince() != null){
addUser.setProvince(userParam.getProvince());
}
if(userParam.getCity() != null){
addUser.setCity(userParam.getCity());
}
if(userParam.getRegion() != null){
addUser.setRegion(userParam.getRegion());
}
if(userParam.getAddress() != null){
addUser.setAddress(userParam.getAddress());
}
if(userParam.getIndustryParent() != null){
addUser.setIndustryParent(userParam.getIndustryParent());
addUser.setIndustryChild(userParam.getIndustryChild());
}
if (userParam.getGradeId() != null) {
addUser.setGradeId(userParam.getGradeId());
}
if (userParam.getPhone() != null) {
addUser.setPhone(userParam.getPhone());
}
if (userParam.getPassword() != null) {
addUser.setPassword(encodePassword(userParam.getPassword()));
} else {
addUser.setPassword(encodePassword(CommonUtil.randomUUID16()));
}
addUser.setTenantId(userParam.getTenantId());
addUser.setRecommend(0);
Role role = roleService.getOne(new QueryWrapper<Role>().eq("role_code", "user"), false);