From a486ed073cf1a3efd17a439d4dfbe223b39d358c Mon Sep 17 00:00:00 2001 From: xiang Date: Mon, 25 Aug 2025 21:39:35 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E7=94=A8=E6=88=B7=E3=80=81=E6=9D=83?= =?UTF-8?q?=E9=99=90=E3=80=81=E8=A7=92=E8=89=B2=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../auth/api/dto/req/dept/DeptAddRequest.java | 4 + .../api/dto/req/dept/DeptQueryRequest.java | 4 + .../api/dto/req/dept/DeptUpdateRequest.java | 4 + .../dto/req/dept/DeptUserUpdateRequest.java | 4 + .../auth/api/dto/req/role/RoleAddRequest.java | 4 + .../api/dto/req/role/RoleQueryRequest.java | 4 + .../api/dto/req/role/RoleUpdateRequest.java | 4 + .../dto/req/role/RoleUserUpdateRequest.java | 4 + .../auth/api/dto/req/user/UserAddRequest.java | 4 + .../dto/req/user/UserDeptUpdateRequest.java | 4 + .../api/dto/req/user/UserQueryRequest.java | 4 + .../dto/req/user/UserRoleUpdateRequest.java | 4 + .../api/dto/req/user/UserUpdateRequest.java | 4 + .../xservice/auth/api/dto/resp/DeptDTO.java | 4 + .../xservice/auth/api/dto/resp/RoleDTO.java | 4 + .../server/controller/DeptController.java | 57 ++++++++++ .../server/controller/RoleController.java | 59 ++++++++++ .../server/controller/TokenController.java | 20 ++++ .../server/controller/UserController.java | 101 ++++++++++++++---- .../config/AuthorizationServerConfig.java | 1 + .../repository/mapper/XUserMapper.java | 4 + .../resources/mapper/user/XUserMapper.xml | 6 ++ 22 files changed, 289 insertions(+), 19 deletions(-) create mode 100644 xs-api/src/main/java/com/xiang/xservice/auth/api/dto/req/dept/DeptAddRequest.java create mode 100644 xs-api/src/main/java/com/xiang/xservice/auth/api/dto/req/dept/DeptQueryRequest.java create mode 100644 xs-api/src/main/java/com/xiang/xservice/auth/api/dto/req/dept/DeptUpdateRequest.java create mode 100644 xs-api/src/main/java/com/xiang/xservice/auth/api/dto/req/dept/DeptUserUpdateRequest.java create mode 100644 xs-api/src/main/java/com/xiang/xservice/auth/api/dto/req/role/RoleAddRequest.java create mode 100644 xs-api/src/main/java/com/xiang/xservice/auth/api/dto/req/role/RoleQueryRequest.java create mode 100644 xs-api/src/main/java/com/xiang/xservice/auth/api/dto/req/role/RoleUpdateRequest.java create mode 100644 xs-api/src/main/java/com/xiang/xservice/auth/api/dto/req/role/RoleUserUpdateRequest.java create mode 100644 xs-api/src/main/java/com/xiang/xservice/auth/api/dto/req/user/UserAddRequest.java create mode 100644 xs-api/src/main/java/com/xiang/xservice/auth/api/dto/req/user/UserDeptUpdateRequest.java create mode 100644 xs-api/src/main/java/com/xiang/xservice/auth/api/dto/req/user/UserQueryRequest.java create mode 100644 xs-api/src/main/java/com/xiang/xservice/auth/api/dto/req/user/UserRoleUpdateRequest.java create mode 100644 xs-api/src/main/java/com/xiang/xservice/auth/api/dto/req/user/UserUpdateRequest.java create mode 100644 xs-api/src/main/java/com/xiang/xservice/auth/api/dto/resp/DeptDTO.java create mode 100644 xs-api/src/main/java/com/xiang/xservice/auth/api/dto/resp/RoleDTO.java create mode 100644 xs-server/src/main/java/com/xiang/xservice/auth/server/controller/DeptController.java create mode 100644 xs-server/src/main/java/com/xiang/xservice/auth/server/controller/RoleController.java diff --git a/xs-api/src/main/java/com/xiang/xservice/auth/api/dto/req/dept/DeptAddRequest.java b/xs-api/src/main/java/com/xiang/xservice/auth/api/dto/req/dept/DeptAddRequest.java new file mode 100644 index 0000000..149c043 --- /dev/null +++ b/xs-api/src/main/java/com/xiang/xservice/auth/api/dto/req/dept/DeptAddRequest.java @@ -0,0 +1,4 @@ +package com.xiang.xservice.auth.api.dto.req.dept; + +public class DeptAddRequest { +} diff --git a/xs-api/src/main/java/com/xiang/xservice/auth/api/dto/req/dept/DeptQueryRequest.java b/xs-api/src/main/java/com/xiang/xservice/auth/api/dto/req/dept/DeptQueryRequest.java new file mode 100644 index 0000000..614528e --- /dev/null +++ b/xs-api/src/main/java/com/xiang/xservice/auth/api/dto/req/dept/DeptQueryRequest.java @@ -0,0 +1,4 @@ +package com.xiang.xservice.auth.api.dto.req.dept; + +public class DeptQueryRequest { +} diff --git a/xs-api/src/main/java/com/xiang/xservice/auth/api/dto/req/dept/DeptUpdateRequest.java b/xs-api/src/main/java/com/xiang/xservice/auth/api/dto/req/dept/DeptUpdateRequest.java new file mode 100644 index 0000000..8586d75 --- /dev/null +++ b/xs-api/src/main/java/com/xiang/xservice/auth/api/dto/req/dept/DeptUpdateRequest.java @@ -0,0 +1,4 @@ +package com.xiang.xservice.auth.api.dto.req.dept; + +public class DeptUpdateRequest { +} diff --git a/xs-api/src/main/java/com/xiang/xservice/auth/api/dto/req/dept/DeptUserUpdateRequest.java b/xs-api/src/main/java/com/xiang/xservice/auth/api/dto/req/dept/DeptUserUpdateRequest.java new file mode 100644 index 0000000..fdcc551 --- /dev/null +++ b/xs-api/src/main/java/com/xiang/xservice/auth/api/dto/req/dept/DeptUserUpdateRequest.java @@ -0,0 +1,4 @@ +package com.xiang.xservice.auth.api.dto.req.dept; + +public class DeptUserUpdateRequest { +} diff --git a/xs-api/src/main/java/com/xiang/xservice/auth/api/dto/req/role/RoleAddRequest.java b/xs-api/src/main/java/com/xiang/xservice/auth/api/dto/req/role/RoleAddRequest.java new file mode 100644 index 0000000..064f011 --- /dev/null +++ b/xs-api/src/main/java/com/xiang/xservice/auth/api/dto/req/role/RoleAddRequest.java @@ -0,0 +1,4 @@ +package com.xiang.xservice.auth.api.dto.req.role; + +public class RoleAddRequest { +} diff --git a/xs-api/src/main/java/com/xiang/xservice/auth/api/dto/req/role/RoleQueryRequest.java b/xs-api/src/main/java/com/xiang/xservice/auth/api/dto/req/role/RoleQueryRequest.java new file mode 100644 index 0000000..6620ad3 --- /dev/null +++ b/xs-api/src/main/java/com/xiang/xservice/auth/api/dto/req/role/RoleQueryRequest.java @@ -0,0 +1,4 @@ +package com.xiang.xservice.auth.api.dto.req.role; + +public class RoleQueryRequest { +} diff --git a/xs-api/src/main/java/com/xiang/xservice/auth/api/dto/req/role/RoleUpdateRequest.java b/xs-api/src/main/java/com/xiang/xservice/auth/api/dto/req/role/RoleUpdateRequest.java new file mode 100644 index 0000000..a67f1f4 --- /dev/null +++ b/xs-api/src/main/java/com/xiang/xservice/auth/api/dto/req/role/RoleUpdateRequest.java @@ -0,0 +1,4 @@ +package com.xiang.xservice.auth.api.dto.req.role; + +public class RoleUpdateRequest { +} diff --git a/xs-api/src/main/java/com/xiang/xservice/auth/api/dto/req/role/RoleUserUpdateRequest.java b/xs-api/src/main/java/com/xiang/xservice/auth/api/dto/req/role/RoleUserUpdateRequest.java new file mode 100644 index 0000000..80fbabe --- /dev/null +++ b/xs-api/src/main/java/com/xiang/xservice/auth/api/dto/req/role/RoleUserUpdateRequest.java @@ -0,0 +1,4 @@ +package com.xiang.xservice.auth.api.dto.req.role; + +public class RoleUserUpdateRequest { +} diff --git a/xs-api/src/main/java/com/xiang/xservice/auth/api/dto/req/user/UserAddRequest.java b/xs-api/src/main/java/com/xiang/xservice/auth/api/dto/req/user/UserAddRequest.java new file mode 100644 index 0000000..e19d0be --- /dev/null +++ b/xs-api/src/main/java/com/xiang/xservice/auth/api/dto/req/user/UserAddRequest.java @@ -0,0 +1,4 @@ +package com.xiang.xservice.auth.api.dto.req.user; + +public class UserAddRequest { +} diff --git a/xs-api/src/main/java/com/xiang/xservice/auth/api/dto/req/user/UserDeptUpdateRequest.java b/xs-api/src/main/java/com/xiang/xservice/auth/api/dto/req/user/UserDeptUpdateRequest.java new file mode 100644 index 0000000..dbe05f3 --- /dev/null +++ b/xs-api/src/main/java/com/xiang/xservice/auth/api/dto/req/user/UserDeptUpdateRequest.java @@ -0,0 +1,4 @@ +package com.xiang.xservice.auth.api.dto.req.user; + +public class UserDeptUpdateRequest { +} diff --git a/xs-api/src/main/java/com/xiang/xservice/auth/api/dto/req/user/UserQueryRequest.java b/xs-api/src/main/java/com/xiang/xservice/auth/api/dto/req/user/UserQueryRequest.java new file mode 100644 index 0000000..54a8bcc --- /dev/null +++ b/xs-api/src/main/java/com/xiang/xservice/auth/api/dto/req/user/UserQueryRequest.java @@ -0,0 +1,4 @@ +package com.xiang.xservice.auth.api.dto.req.user; + +public class UserQueryRequest { +} diff --git a/xs-api/src/main/java/com/xiang/xservice/auth/api/dto/req/user/UserRoleUpdateRequest.java b/xs-api/src/main/java/com/xiang/xservice/auth/api/dto/req/user/UserRoleUpdateRequest.java new file mode 100644 index 0000000..f40ff5d --- /dev/null +++ b/xs-api/src/main/java/com/xiang/xservice/auth/api/dto/req/user/UserRoleUpdateRequest.java @@ -0,0 +1,4 @@ +package com.xiang.xservice.auth.api.dto.req.user; + +public class UserRoleUpdateRequest { +} diff --git a/xs-api/src/main/java/com/xiang/xservice/auth/api/dto/req/user/UserUpdateRequest.java b/xs-api/src/main/java/com/xiang/xservice/auth/api/dto/req/user/UserUpdateRequest.java new file mode 100644 index 0000000..a2e9f2c --- /dev/null +++ b/xs-api/src/main/java/com/xiang/xservice/auth/api/dto/req/user/UserUpdateRequest.java @@ -0,0 +1,4 @@ +package com.xiang.xservice.auth.api.dto.req.user; + +public class UserUpdateRequest { +} diff --git a/xs-api/src/main/java/com/xiang/xservice/auth/api/dto/resp/DeptDTO.java b/xs-api/src/main/java/com/xiang/xservice/auth/api/dto/resp/DeptDTO.java new file mode 100644 index 0000000..d010167 --- /dev/null +++ b/xs-api/src/main/java/com/xiang/xservice/auth/api/dto/resp/DeptDTO.java @@ -0,0 +1,4 @@ +package com.xiang.xservice.auth.api.dto.resp; + +public class DeptDTO { +} diff --git a/xs-api/src/main/java/com/xiang/xservice/auth/api/dto/resp/RoleDTO.java b/xs-api/src/main/java/com/xiang/xservice/auth/api/dto/resp/RoleDTO.java new file mode 100644 index 0000000..63da712 --- /dev/null +++ b/xs-api/src/main/java/com/xiang/xservice/auth/api/dto/resp/RoleDTO.java @@ -0,0 +1,4 @@ +package com.xiang.xservice.auth.api.dto.resp; + +public class RoleDTO { +} diff --git a/xs-server/src/main/java/com/xiang/xservice/auth/server/controller/DeptController.java b/xs-server/src/main/java/com/xiang/xservice/auth/server/controller/DeptController.java new file mode 100644 index 0000000..51a7f14 --- /dev/null +++ b/xs-server/src/main/java/com/xiang/xservice/auth/server/controller/DeptController.java @@ -0,0 +1,57 @@ +package com.xiang.xservice.auth.server.controller; + +import com.xiang.xservice.auth.api.dto.req.dept.DeptAddRequest; +import com.xiang.xservice.auth.api.dto.req.dept.DeptQueryRequest; +import com.xiang.xservice.auth.api.dto.req.dept.DeptUpdateRequest; +import com.xiang.xservice.auth.api.dto.req.dept.DeptUserUpdateRequest; +import com.xiang.xservice.auth.api.dto.resp.DeptDTO; +import com.xiang.xservice.basic.common.resp.Result; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.util.List; + +/** + * 部门控制器 + */ +@RestController +@RequiredArgsConstructor +public class DeptController { + @PostMapping("/private/dept/list") + public Result getDeptList(@RequestBody @Valid @NotNull(message = "请求参数不能为空") DeptQueryRequest request) { + return Result.success(new DeptDTO()); + } + + @GetMapping("/private/dept/info/{id}") + public Result getDeptInfo(@PathVariable Long id) { + return Result.success(new DeptDTO()); + } + + @PostMapping("/private/dept/add") + public Result addDept(@RequestBody @Valid @NotNull(message = "请求参数不能为空") DeptAddRequest request) { + return Result.success(); + } + + @PostMapping("/private/dept/update") + public Result updateDept(@RequestBody @Valid @NotNull(message = "请求参数不能为空") DeptUpdateRequest request) { + return Result.success(); + } + + @PostMapping("/private/dept/del") + public Result delDept(@RequestParam @Valid @NotEmpty(message = "请求参数不能为空") List ids) { + return Result.success(); + } + + @PostMapping("/private/dept/setUser") + public Result setUserDept(@RequestBody @Valid @NotNull(message = "请求参数不能为空") DeptUserUpdateRequest request) { + return Result.success(true); + } +} diff --git a/xs-server/src/main/java/com/xiang/xservice/auth/server/controller/RoleController.java b/xs-server/src/main/java/com/xiang/xservice/auth/server/controller/RoleController.java new file mode 100644 index 0000000..1cbee35 --- /dev/null +++ b/xs-server/src/main/java/com/xiang/xservice/auth/server/controller/RoleController.java @@ -0,0 +1,59 @@ +package com.xiang.xservice.auth.server.controller; + +import com.xiang.xservice.auth.api.dto.req.role.RoleAddRequest; +import com.xiang.xservice.auth.api.dto.req.role.RoleQueryRequest; +import com.xiang.xservice.auth.api.dto.req.role.RoleUpdateRequest; +import com.xiang.xservice.auth.api.dto.req.role.RoleUserUpdateRequest; +import com.xiang.xservice.auth.api.dto.resp.RoleDTO; +import com.xiang.xservice.basic.common.resp.Result; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.util.List; + +/** + * 角色控制器 + */ +@RestController +@RequiredArgsConstructor +public class RoleController { + + @PostMapping("/private/role/list") + public Result getRoleList(@RequestBody @Valid @NotNull(message = "请求参数不能为空") RoleQueryRequest request) { + return Result.success(new RoleDTO()); + } + + @GetMapping("/private/role/info/{id}") + public Result getRoleInfo(@PathVariable Long id) { + return Result.success(new RoleDTO()); + } + + @PostMapping("/private/role/add") + public Result addRole(@RequestBody @Valid @NotNull(message = "请求参数不能为空") RoleAddRequest request) { + return Result.success(); + } + + @PostMapping("/private/role/update") + public Result updateRole(@RequestBody @Valid @NotNull(message = "请求参数不能为空") RoleUpdateRequest request) { + return Result.success(); + } + + @PostMapping("/private/role/del") + public Result delRole(@RequestParam @Valid @NotEmpty(message = "请求参数不能为空") List ids) { + return Result.success(); + } + + @PostMapping("/private/role/setUser") + public Result setUserRole(@RequestBody @Valid @NotNull(message = "请求参数不能为空") RoleUserUpdateRequest request) { + return Result.success(true); + } + +} diff --git a/xs-server/src/main/java/com/xiang/xservice/auth/server/controller/TokenController.java b/xs-server/src/main/java/com/xiang/xservice/auth/server/controller/TokenController.java index 82983c3..49443cc 100644 --- a/xs-server/src/main/java/com/xiang/xservice/auth/server/controller/TokenController.java +++ b/xs-server/src/main/java/com/xiang/xservice/auth/server/controller/TokenController.java @@ -1,7 +1,9 @@ package com.xiang.xservice.auth.server.controller; import com.xiang.xservice.auth.api.dto.req.LoginRequest; +import com.xiang.xservice.auth.api.dto.req.RegisterRequest; import com.xiang.xservice.auth.api.dto.resp.LoginResp; +import com.xiang.xservice.auth.api.dto.resp.RegisterResp; import com.xiang.xservice.auth.service.service.XUserService; import com.xiang.xservice.basic.common.resp.Result; import com.xiang.xservice.basic.exception.BusinessException; @@ -13,6 +15,7 @@ import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import javax.validation.constraints.NotNull; +import java.util.Objects; @Slf4j @RestController @@ -34,4 +37,21 @@ public class TokenController { return Result.error(); } } + + @PostMapping("/public/user/userRegister") + public Result register(@RequestBody @Valid @NotNull(message = "请求参数不能为空") RegisterRequest request) { + + try { + RegisterResp registerResp = userService.userRegister(request); + if (Objects.nonNull(registerResp)) { + return Result.success("操作成功", registerResp); + } + } catch (BusinessException e) { + log.error("【用户注册】用户注册失败：{}", e.getMessage(), e); + return Result.error(e.getMessage()); + } catch (Exception e) { + log.error("【用户注册】用户注册失败：{}", e.getMessage(), e); + } + return Result.error("操作失败"); + } } diff --git a/xs-server/src/main/java/com/xiang/xservice/auth/server/controller/UserController.java b/xs-server/src/main/java/com/xiang/xservice/auth/server/controller/UserController.java index c8362f1..973e2d4 100644 --- a/xs-server/src/main/java/com/xiang/xservice/auth/server/controller/UserController.java +++ b/xs-server/src/main/java/com/xiang/xservice/auth/server/controller/UserController.java @@ -1,41 +1,104 @@ package com.xiang.xservice.auth.server.controller; -import com.xiang.xservice.auth.api.dto.req.RegisterRequest; -import com.xiang.xservice.auth.api.dto.resp.RegisterResp; -import com.xiang.xservice.auth.service.service.XUserService; +import com.google.common.collect.Lists; +import com.xiang.xservice.auth.api.dto.req.user.UserAddRequest; +import com.xiang.xservice.auth.api.dto.req.user.UserDeptUpdateRequest; +import com.xiang.xservice.auth.api.dto.req.user.UserQueryRequest; +import com.xiang.xservice.auth.api.dto.req.user.UserRoleUpdateRequest; +import com.xiang.xservice.auth.api.dto.req.user.UserUpdateRequest; +import com.xiang.xservice.auth.api.dto.resp.UserResp; +import com.xiang.xservice.auth.service.entity.XUser; +import com.xiang.xservice.auth.service.enums.UserStatusEnum; +import com.xiang.xservice.auth.service.repository.mapper.XUserMapper; import com.xiang.xservice.basic.common.resp.Result; -import com.xiang.xservice.basic.exception.BusinessException; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; +import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; -import java.util.Objects; +import java.util.List; +import java.util.concurrent.CompletableFuture; @Slf4j @RestController @RequiredArgsConstructor public class UserController { - private final XUserService userService; + private final XUserMapper userMapper; + private final PasswordEncoder passwordEncoder; - @PostMapping("/public/user/userRegister") - public Result register(@RequestBody @Valid @NotNull(message = "请求参数不能为空") RegisterRequest request) { - try { - RegisterResp registerResp = userService.userRegister(request); - if (Objects.nonNull(registerResp)) { - return Result.success("操作成功", registerResp); - } - } catch (BusinessException e) { - log.error("【用户注册】用户注册失败：{}", e.getMessage(), e); - return Result.error(e.getMessage()); - } catch (Exception e) { - log.error("【用户注册】用户注册失败：{}", e.getMessage(), e); + @PostMapping("/private/user/list") + public Result getUserList(@RequestBody @Valid @NotNull(message = "请求参数不能为空") UserQueryRequest request) { + return Result.success(new UserResp()); + } + + @GetMapping("/private/user/info/{id}") + public Result getUserById(@PathVariable("id") Long id) { + return Result.success(new UserResp()); + } + + @PostMapping("/private/user/add") + public Result addUser(@RequestBody @Valid @NotNull(message = "请求参数不能为空") UserAddRequest request) { + return Result.success(true); + } + + @PostMapping("/private/user/update") + public Result updateUser(@RequestBody @Valid @NotNull(message = "请求参数不能为空") UserUpdateRequest request) { + return Result.success(true); + } + + @PostMapping("/private/user/del") + public Result delUser(@RequestParam @Valid @NotEmpty(message = "请求参数不能为空") List ids) { + return Result.success(true); + } + + @PostMapping("/private/user/setDept") + public Result setUserDept(@RequestBody @Valid @NotNull(message = "请求参数不能为空") UserDeptUpdateRequest request) { + return Result.success(true); + } + + @PostMapping("/private/user/setRole") + public Result setUserRole(@RequestBody @Valid @NotNull(message = "请求参数不能为空") UserRoleUpdateRequest request) { + return Result.success(true); + } + + + @PostMapping("/public/user/useraddBatch") + public Result add() { + List futures = Lists.newArrayList(); + List list = Lists.newCopyOnWriteArrayList(); + for (int i = 0; i < 100; i++) { + int finalI = i; + log.info("第{}批数据生成！", finalI); + CompletableFuture future = CompletableFuture.runAsync(() -> { + for (int j = 0; j < 1000; j++) { + log.info("第{}批的第{}条数据生成！", finalI, j); + XUser user = new XUser(); + user.setName("nameTest2" + finalI + j); + user.setUsername("usernameTest2" + finalI + j); + user.setPassword(passwordEncoder.encode("123456")); + user.setEmail("emailTest2" + finalI + j + "@test.com"); + user.setPhone("13800000000"); + user.setStatus(UserStatusEnum.USING.getCode()); + list.add(user); + } + }); + futures.add(future); } - return Result.error("操作失败"); + CompletableFuture.allOf(futures.toArray(new CompletableFuture[0])).join(); + List> partition = Lists.partition(list, 3000); + CompletableFuture.runAsync(() -> { + partition.stream().parallel().forEach(userMapper::insertBatch); + }); + return Result.success(); } } diff --git a/xs-service/src/main/java/com/xiang/xservice/auth/service/config/AuthorizationServerConfig.java b/xs-service/src/main/java/com/xiang/xservice/auth/service/config/AuthorizationServerConfig.java index 5b6b72b..ead15c8 100644 --- a/xs-service/src/main/java/com/xiang/xservice/auth/service/config/AuthorizationServerConfig.java +++ b/xs-service/src/main/java/com/xiang/xservice/auth/service/config/AuthorizationServerConfig.java @@ -53,6 +53,7 @@ public class AuthorizationServerConfig { .csrf().disable() // 禁用 CSRF .authorizeRequests(authorizeRequests -> authorizeRequests .antMatchers("/public/**").permitAll() + .antMatchers("/open/**").permitAll() .anyRequest().authenticated() ) .sessionManagement(session -> session.sessionCreationPolicy(SessionCreationPolicy.STATELESS)); diff --git a/xs-service/src/main/java/com/xiang/xservice/auth/service/repository/mapper/XUserMapper.java b/xs-service/src/main/java/com/xiang/xservice/auth/service/repository/mapper/XUserMapper.java index f5e9b1d..2e09231 100644 --- a/xs-service/src/main/java/com/xiang/xservice/auth/service/repository/mapper/XUserMapper.java +++ b/xs-service/src/main/java/com/xiang/xservice/auth/service/repository/mapper/XUserMapper.java @@ -4,6 +4,8 @@ import com.xiang.xservice.auth.service.entity.XUser; import org.apache.ibatis.annotations.Mapper; import org.springframework.stereotype.Repository; +import java.util.List; + @Repository @Mapper public interface XUserMapper { @@ -16,4 +18,6 @@ public interface XUserMapper { * @return */ int insert(XUser user); + + int insertBatch(List list); } diff --git a/xs-service/src/main/resources/mapper/user/XUserMapper.xml b/xs-service/src/main/resources/mapper/user/XUserMapper.xml index 15bf3d1..a38b47a 100644 --- a/xs-service/src/main/resources/mapper/user/XUserMapper.xml +++ b/xs-service/src/main/resources/mapper/user/XUserMapper.xml @@ -130,6 +130,12 @@ + + insert into x_user(name, username, password, email, phone, status) VALUES + + (#{item.name}, #{item.username}, #{item.password}, #{item.email}, #{item.phone}, #{item.status}) + + update x_user set del_flag = 1 where id = #{id}