ContiNew/continew-admin
1
1
Fork 0
mirror of https://github.com/continew-org/continew-admin.git synced 2025-10-29 14:57:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore: 优化用户管理相关代码

Browse Source
This commit is contained in:
Charles7c
2024-10-30 22:20:30 +08:00
parent 872bc1ca81
commit 9ecdeb52f6
23 changed files with 202 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
continew-admin-webapi/src/main/java/top/continew/admin/controller/auth/AuthController.java
View File

@@ -38,7 +38,7 @@ import top.continew.admin.common.constant.CacheConstants;
import top.continew.admin.common.context.UserContext;
import top.continew.admin.common.context.UserContextHolder;
import top.continew.admin.common.util.SecureUtils;
import top.continew.admin.system.model.resp.UserDetailResp;
import top.continew.admin.system.model.resp.user.UserDetailResp;
import top.continew.admin.system.service.UserService;
import top.continew.starter.cache.redisson.util.RedisUtils;
import top.continew.starter.core.util.ExceptionUtils;

10
continew-admin-webapi/src/main/java/top/continew/admin/controller/system/UserCenterController.java
View File

@@ -35,12 +35,12 @@ import top.continew.admin.common.context.UserContextHolder;
import top.continew.admin.common.util.SecureUtils;
import top.continew.admin.system.enums.SocialSourceEnum;
import top.continew.admin.system.model.entity.UserSocialDO;
import top.continew.admin.system.model.req.UserBasicInfoUpdateReq;
import top.continew.admin.system.model.req.UserEmailUpdateRequest;
import top.continew.admin.system.model.req.UserPasswordUpdateReq;
import top.continew.admin.system.model.req.UserPhoneUpdateReq;
import top.continew.admin.system.model.req.user.UserBasicInfoUpdateReq;
import top.continew.admin.system.model.req.user.UserEmailUpdateRequest;
import top.continew.admin.system.model.req.user.UserPasswordUpdateReq;
import top.continew.admin.system.model.req.user.UserPhoneUpdateReq;
import top.continew.admin.system.model.resp.AvatarResp;
import top.continew.admin.system.model.resp.UserSocialBindResp;
import top.continew.admin.system.model.resp.user.UserSocialBindResp;
import top.continew.admin.system.service.UserService;
import top.continew.admin.system.service.UserSocialService;
import top.continew.starter.cache.redisson.util.RedisUtils;

36
continew-admin-webapi/src/main/java/top/continew/admin/controller/system/UserController.java
View File

@@ -32,14 +32,14 @@ import org.springframework.web.multipart.MultipartFile;
import top.continew.admin.common.constant.RegexConstants;
import top.continew.admin.common.util.SecureUtils;
import top.continew.admin.system.model.query.UserQuery;
import top.continew.admin.system.model.req.UserImportReq;
import top.continew.admin.system.model.req.UserPasswordResetReq;
import top.continew.admin.system.model.req.UserReq;
import top.continew.admin.system.model.req.UserRoleUpdateReq;
import top.continew.admin.system.model.resp.UserDetailResp;
import top.continew.admin.system.model.resp.UserImportParseResp;
import top.continew.admin.system.model.resp.UserImportResp;
import top.continew.admin.system.model.resp.UserResp;
import top.continew.admin.system.model.req.user.UserImportReq;
import top.continew.admin.system.model.req.user.UserPasswordResetReq;
import top.continew.admin.system.model.req.user.UserReq;
import top.continew.admin.system.model.req.user.UserRoleUpdateReq;
import top.continew.admin.system.model.resp.user.UserDetailResp;
import top.continew.admin.system.model.resp.user.UserImportParseResp;
import top.continew.admin.system.model.resp.user.UserImportResp;
import top.continew.admin.system.model.resp.user.UserResp;
import top.continew.admin.system.service.UserService;
import top.continew.starter.core.util.ExceptionUtils;
import top.continew.starter.core.util.validate.ValidationUtils;
@@ -83,24 +83,24 @@ public class UserController extends BaseController<UserService, UserResp, UserDe
return super.add(req);
}
@Operation(summary = "下载用户导入模板", description = "下载用户导入模板")
@Operation(summary = "下载导入模板", description = "下载导入模板")
@SaCheckPermission("system:user:import")
@GetMapping(value = "downloadImportUserTemplate", produces = MediaType.APPLICATION_OCTET_STREAM_VALUE)
public void downloadImportUserTemplate(HttpServletResponse response) throws IOException {
userService.downloadImportUserTemplate(response);
@GetMapping(value = "/import/template", produces = MediaType.APPLICATION_OCTET_STREAM_VALUE)
public void downloadImportTemplate(HttpServletResponse response) throws IOException {
userService.downloadImportTemplate(response);
}
@Operation(summary = "解析用户导入数据", description = "解析用户导入数据")
@Operation(summary = "解析导入数据", description = "解析导入数据")
@SaCheckPermission("system:user:import")
@PostMapping(value = "parseImportUser")
public UserImportParseResp parseImportUser(@NotNull(message = "文件不能为空") MultipartFile file) {
@PostMapping("/import/parse")
public UserImportParseResp parseImport(@NotNull(message = "文件不能为空") MultipartFile file) {
ValidationUtils.throwIf(file::isEmpty, "文件不能为空");
return userService.parseImportUser(file);
return userService.parseImport(file);
}
@Operation(summary = "导入用户", description = "导入用户")
@Operation(summary = "导入数据", description = "导入数据")
@SaCheckPermission("system:user:import")
@PostMapping(value = "import")
@PostMapping(value = "/import")
public UserImportResp importUser(@Validated @RequestBody UserImportReq req) {
return userService.importUser(req);
}

0
continew-admin-webapi/src/main/resources/templates/import/userImportTemplate.xlsx → continew-admin-webapi/src/main/resources/templates/import/user.xlsx
View File