feat: 接口设计: user&user.tag

pom.xml

@@ -20,10 +20,12 @@
         <lomstrcut-binding.version>0.2.0</lomstrcut-binding.version>
         <poi.version>5.2.5</poi.version>
         <commons-lang3.version>3.14.0</commons-lang3.version>
+        <commons-text.version>1.12.0</commons-text.version>
         <open-api.version>2.5.0</open-api.version>
         <jedis.version>5.1.3</jedis.version>
         <jwt.version>4.4.0</jwt.version>
         <mybatis-plus.version>3.5.6</mybatis-plus.version>
+        <page-helper.version>2.1.0</page-helper.version>
     </properties>
     <dependencies>
 
@@ -53,6 +55,11 @@
             <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
             <version>${mybatis-plus.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.github.pagehelper</groupId>
+            <artifactId>pagehelper-spring-boot-starter</artifactId>
+            <version>${page-helper.version}</version>
+        </dependency>
 
         <dependency>
             <groupId>com.mysql</groupId>
@@ -82,12 +89,17 @@
             <artifactId>commons-lang3</artifactId>
             <version>${commons-lang3.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-text</artifactId>
+            <version>${commons-text.version}</version>
+        </dependency>
 
-<!--        <dependency>-->
+        <dependency>
-<!--            <groupId>org.springdoc</groupId>-->
+            <groupId>org.springdoc</groupId>
-<!--            <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>-->
+            <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
-<!--            <version>${open-api.version}</version>-->
+            <version>${open-api.version}</version>
-<!--        </dependency>-->
+        </dependency>
 
         <dependency>
             <groupId>redis.clients</groupId>
@@ -155,6 +167,7 @@
                             <version>${lomstrcut-binding.version}</version>
                         </path>
                     </annotationProcessorPaths>
+                    <compilerArgs>--enable-preview</compilerArgs>
                 </configuration>
             </plugin>
 

src/main/java/com/rainbus/dlp/config/MybatisMetaObjectHandler.java

@@ -2,6 +2,7 @@ package com.rainbus.dlp.config;
 
 import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
 import com.rainbus.dlp.entity.dto.user.CustomUserDetails;
+import com.rainbus.dlp.util.AuthUtil;
 import org.apache.ibatis.reflection.MetaObject;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.core.context.SecurityContextHolder;
@@ -10,6 +11,12 @@ import java.time.LocalDateTime;
 
 @Configuration
 public class MybatisMetaObjectHandler implements MetaObjectHandler {
+    private final AuthUtil authUtil;
+
+    public MybatisMetaObjectHandler(AuthUtil authUtil) {
+        this.authUtil = authUtil;
+    }
+
     @Override
     public void insertFill(MetaObject metaObject) {
         if (metaObject.hasSetter("createAt")) {
@@ -40,7 +47,7 @@ public class MybatisMetaObjectHandler implements MetaObjectHandler {
     }
 
     private Long getCurrentUserId() {
-        CustomUserDetails userDetails = (CustomUserDetails) SecurityContextHolder.getContext().getAuthentication().getDetails();
+        CustomUserDetails userDetails = authUtil.getUserDetails();
         return userDetails.getId();
     }
 

src/main/java/com/rainbus/dlp/config/MybatisPlusConf.java

@@ -0,0 +1,19 @@
+package com.rainbus.dlp.config;
+
+import com.baomidou.mybatisplus.annotation.DbType;
+import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class MybatisPlusConf {
+
+    @Bean
+    public MybatisPlusInterceptor mybatisPlusInterceptor() {
+        MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
+        interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL));
+        return interceptor;
+    }
+
+}

src/main/java/com/rainbus/dlp/config/OpenApiConf.java

@@ -0,0 +1,20 @@
+package com.rainbus.dlp.config;
+
+import io.swagger.v3.oas.models.OpenAPI;
+import io.swagger.v3.oas.models.info.Info;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class OpenApiConf {
+
+    @Bean
+    public OpenAPI springOpenAPI() {
+        return new OpenAPI()
+                .info(new Info()
+                        .title("DLP Admin")
+                        .description("DLP Admin APIs")
+                        .version("0.0.1"));
+    }
+
+}

src/main/java/com/rainbus/dlp/config/SecurityConf.java

@@ -1,7 +1,7 @@
 package com.rainbus.dlp.config;
 
 
-import com.rainbus.dlp.entity.pojo.user.SysRole;
+import com.rainbus.dlp.repository.dao.UserDao;
 import com.rainbus.dlp.service.UserServ;
 import lombok.RequiredArgsConstructor;
 import org.springframework.context.annotation.Bean;
@@ -19,14 +19,12 @@ import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.security.web.SecurityFilterChain;
 import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
 
-import java.util.List;
-
 @Configuration
 @EnableWebSecurity
 @RequiredArgsConstructor
 public class SecurityConf {
 
-    private final UserServ userServ;
+    private final UserDao userDao;
 
     @Bean
     public SecurityFilterChain filterChain(HttpSecurity http, JwtFilter jwtFilter) throws Exception {
@@ -34,7 +32,7 @@ public class SecurityConf {
                 .csrf(AbstractHttpConfigurer::disable)
                 .sessionManagement(sess -> sess.sessionCreationPolicy(SessionCreationPolicy.STATELESS))
                 .authorizeHttpRequests((authorizeHttpRequests) -> {
-                    userServ.listRoleResource().forEach(role -> {
+                    userDao.listRoleResource().forEach(role -> {
                         role.getResources().forEach(resource -> {
                             authorizeHttpRequests.requestMatchers(
                                     HttpMethod.valueOf(resource.getRequestMethod().name()),

src/main/java/com/rainbus/dlp/controller/UserCtrl.java

@@ -1,66 +1,85 @@
 package com.rainbus.dlp.controller;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
+import com.github.pagehelper.PageInfo;
-import com.rainbus.dlp.entity.converter.UserConv;
+import com.rainbus.dlp.entity.req.user.*;
-import com.rainbus.dlp.entity.pojo.user.SysUser;
-import com.rainbus.dlp.entity.req.user.RegisterReq;
 import com.rainbus.dlp.entity.resp.Resp;
-import com.rainbus.dlp.repository.mapper.user.SysRoleMapper;
+import com.rainbus.dlp.entity.resp.user.GetTagResp;
-import com.rainbus.dlp.repository.mapper.user.SysUserMapper;
+import com.rainbus.dlp.entity.resp.user.GetUserResp;
-import com.rainbus.dlp.service.SystemServ;
+import com.rainbus.dlp.entity.resp.user.LoginResp;
+import com.rainbus.dlp.service.UserServ;
 import com.rainbus.dlp.util.RedisUtil;
+import io.swagger.v3.oas.annotations.Operation;
 import lombok.AllArgsConstructor;
-import org.springframework.security.authentication.AuthenticationManager;
-import org.springframework.security.crypto.password.PasswordEncoder;
-import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 @RestController
 @RequestMapping("/user")
 @AllArgsConstructor
 public class UserCtrl {
 
-    private final UserConv userConv;
-    private final AuthenticationManager authenticationManager;
-    private final PasswordEncoder passwordEncoder;
     private final RedisUtil redisUtil;
-    private final SystemServ systemServ;
+    private final UserServ userServ;
-    private final SysUserMapper sysUserMapper;
-    private final SysRoleMapper sysRoleMapper;
-
-    @PostMapping("/addUser")
-    public Resp<Object> addUser(@RequestBody @Validated RegisterReq req) {
-//        userRepo.save(userConv.RegisterReq2Pojo(req, defaultPwd(req.getUsername())));
-        return Resp.success();
-    }
 
     @PostMapping("/login")
-    public Resp<Object> login(@RequestBody RegisterReq req) {
+    @Operation(summary = "登录接口")
-//        SysUser user = userRepo.findByUsername(req.getUsername()).orElse(null);
+    public Resp<LoginResp> login(@RequestBody LoginReq req) {
-//        Authentication authentication = authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(req.getUsername(), req.getPassword()));
+        return Resp.success(userServ.login(req));
-//        SecurityContextHolder.getContext().setAuthentication(authentication);
+    }
-//        if (user == null) {
+
-//            return Resp.fail("user not exist");
+    @PostMapping("/list")
-//        }
+    @Operation(summary = "搜索用户")
-//        if (!passwordEncoder.matches(req.getPassword(), user.getPassword())) {
+    public Resp<PageInfo<GetUserResp>> listUser(@RequestBody ListUserReq req) {
-//            return Resp.fail("password error");
+        return Resp.success(null);
-//        }
+    }
-//        return Resp.success(JwtUtil.generateToken(userConv.ClaimsPojo2Dto(user)));
+
+    @PostMapping("/add")
+    @Operation(summary = "增加用户")
+    public Resp<Object> addUser(@RequestBody AddUserReq req) {
         return Resp.success();
     }
 
-    @PostMapping("/test")
+    @PostMapping("/get/{id}")
-    public Resp<Object> test() throws JsonProcessingException {
+    @Operation(summary = "获取用户")
-        return Resp.success(redisUtil.get("user", SysUser.class));
+    public Resp<GetUserResp> getUser(@PathVariable("id") Long id) {
+        return Resp.success(null);
     }
 
-    @GetMapping("/test2")
+    @PostMapping("/update")
-    public Resp<Object> test2() {
+    @Operation(summary = "更新用户")
-        return Resp.success(sysRoleMapper.selectAllRoleResource());
+    public Resp<Object> updateUser(@RequestBody UpdateUserReq req) {
+        return Resp.success();
     }
 
-    private String defaultPwd(String username) {
+    @PostMapping("/delete/{id}")
-        return passwordEncoder.encode("Dlp" + username);
+    @Operation(summary = "删除用户")
+    public Resp<Object> deleteUser(@PathVariable Long id) {
+        return Resp.success();
+    }
+
+    @PostMapping("/resetPwd/{id}")
+    @Operation(summary = "重置密码")
+    public Resp<Object> resetPwd(@PathVariable Long id) {
+        return Resp.success();
+    }
+
+    @PostMapping("/tag/add")
+    @Operation(summary = "增加用户标签")
+    private Resp<Object> addUserTag(@RequestBody AddUserTagReq req) {
+        return Resp.success();
+    }
+
+    @PostMapping("/tag/delete/{id}")
+    @Operation(summary = "删除用户标签")
+    private Resp<Object> deleteUserTag(@PathVariable Long id) {
+        return Resp.success();
+    }
+
+    @GetMapping("/tag/list")
+    @Operation(summary = "获取所有用户标签")
+    private Resp<List<GetTagResp>> listUserTag() {
+        return Resp.success(null);
     }
 
 }

src/main/java/com/rainbus/dlp/entity/ApiDescription.java

@@ -0,0 +1,11 @@
+package com.rainbus.dlp.entity;
+
+
+import java.lang.annotation.*;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
+@Documented
+public @interface ApiDescription {
+    String value();
+}

src/main/java/com/rainbus/dlp/entity/converter/SystemConv.java

@@ -0,0 +1,21 @@
+package com.rainbus.dlp.entity.converter;
+
+import com.rainbus.dlp.entity.dto.system.ApiInfo;
+import com.rainbus.dlp.entity.pojo.user.SysResource;
+import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
+
+import java.util.List;
+
+@Mapper(componentModel = "spring")
+public interface SystemConv {
+
+    @Mapping(target = "id", ignore = true)
+    @Mapping(target = "updatedAt", ignore = true)
+    @Mapping(target = "resource", source = "uri")
+    @Mapping(target = "createdAt", ignore = true)
+    SysResource ApiInfoDto2Pojo(ApiInfo apiInfo);
+
+    List<SysResource> ApiInfosDto2Pojo(List<ApiInfo> apiInfos);
+
+}

src/main/java/com/rainbus/dlp/entity/converter/UserConv.java

@@ -3,7 +3,7 @@ package com.rainbus.dlp.entity.converter;
 import com.rainbus.dlp.entity.dto.user.CustomUserDetails;
 import com.rainbus.dlp.entity.dto.user.TokenClaims;
 import com.rainbus.dlp.entity.pojo.user.SysUser;
-import com.rainbus.dlp.entity.req.user.RegisterReq;
+import com.rainbus.dlp.entity.req.user.AddUserReq;
 import org.mapstruct.InheritInverseConfiguration;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
@@ -12,13 +12,15 @@ import org.mapstruct.Mapping;
 public interface UserConv {
 
     @InheritInverseConfiguration
-    SysUser RegisterReq2Pojo(RegisterReq req, String password);
+    SysUser RegisterReq2Pojo(AddUserReq req, String password);
 
     @Mapping(target = "roles", expression = "java(user.getRoles().stream().map(com.rainbus.dlp.entity.pojo.user.SysRole::getRole).toList())")
+    @Mapping(target = "orgId", expression = "java(user.getOrg().getId())")
     TokenClaims ClaimsPojo2Dto(SysUser user);
 
+    @Mapping(target = "orgId", expression = "java(user.getOrg().getId())")
     @Mapping(target = "authorities", ignore = true)
     @Mapping(target = "roles", expression = "java(user.getRoles().stream().map(com.rainbus.dlp.entity.pojo.user.SysRole::getRole).toList())")
-    CustomUserDetails UserPojo2UserDetails(SysUser user);
+    CustomUserDetails UserDetailsPojo2Dto(SysUser user);
 
 }

src/main/java/com/rainbus/dlp/entity/dto/Tuple.java

@@ -0,0 +1,4 @@
+package com.rainbus.dlp.entity.dto;
+
+public record Tuple<T1, T2, T3>(T1 t1, T2 t2, T3 t3) {
+}

src/main/java/com/rainbus/dlp/entity/dto/system/ApiInfo.java

@@ -0,0 +1,7 @@
+package com.rainbus.dlp.entity.dto.system;
+
+import org.springframework.web.bind.annotation.RequestMethod;
+
+public record ApiInfo(String uri, RequestMethod requestMethod, String description) {
+
+}

src/main/java/com/rainbus/dlp/entity/dto/user/CustomUserDetails.java

@@ -24,6 +24,7 @@ public class CustomUserDetails implements UserDetails {
     private String username;
     private String password;
     private List<String> roles;
+    private Long orgId;
 
     @Override
     @JsonIgnore

src/main/java/com/rainbus/dlp/entity/dto/user/TokenClaims.java

@@ -1,6 +1,7 @@
 package com.rainbus.dlp.entity.dto.user;
 
 import com.auth0.jwt.interfaces.Claim;
+import com.rainbus.dlp.entity.pojo.user.SysOrg;
 import com.rainbus.dlp.util.ConvertUtil;
 import lombok.Data;
 
@@ -10,9 +11,11 @@ import java.util.Map;
 
 @Data
 public class TokenClaims {
+
     private Long id;
     private String username;
     private List<String> roles;
+    private Long orgId;
 
     public Map<String, Object> toMap() {
         return ConvertUtil.toMap(this, Object.class);

src/main/java/com/rainbus/dlp/entity/exception/OrgNotExistExcp.java

@@ -0,0 +1,14 @@
+package com.rainbus.dlp.entity.exception;
+
+import lombok.Getter;
+
+@Getter
+public class OrgNotExistExcp extends RuntimeException {
+    private final int code;
+    private final String message;
+
+    public OrgNotExistExcp() {
+        this.code = 40003;
+        this.message = "组织不存在";
+    }
+}

src/main/java/com/rainbus/dlp/entity/pojo/user/SysResource.java

@@ -17,10 +17,6 @@ public class SysResource {
 
     private String description;
 
-    private Long createdBy;
-
-    private Long updatedBy;
-
     private LocalDateTime createdAt;
 
     private LocalDateTime updatedAt;

src/main/java/com/rainbus/dlp/entity/pojo/user/SysUser.java

@@ -2,10 +2,13 @@ package com.rainbus.dlp.entity.pojo.user;
 
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.rainbus.dlp.entity.enums.UserStatusEnum;
+import com.rainbus.dlp.entity.exception.UserDisabledExcp;
+import com.rainbus.dlp.entity.exception.UsernameOrPasswordExcp;
 import lombok.Data;
 
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.Optional;
 
 @Data
 public class SysUser {

src/main/java/com/rainbus/dlp/entity/req/PageReq.java

@@ -0,0 +1,9 @@
+package com.rainbus.dlp.entity.req;
+
+import lombok.Data;
+
+@Data
+public class PageReq {
+    private Integer pageCurrent = 1;
+    private Integer pageSize = 10;
+}

src/main/java/com/rainbus/dlp/entity/req/user/AddUserReq.java

@@ -0,0 +1,38 @@
+package com.rainbus.dlp.entity.req.user;
+
+import jakarta.validation.constraints.Email;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Pattern;
+import lombok.Data;
+import lombok.NonNull;
+
+@Data
+public class AddUserReq {
+
+    @Pattern(regexp = "^[a-zA-Z0-9_-]{4,16}$", message = "用户名格式不正确")
+    private String username;
+
+    @Pattern(regexp = "^[\\u4E00-\\u9FA5]{2,4}$", message = "姓名格式不正确")
+    private String realName;
+
+    @Email(message = "邮箱格式不正确")
+    private String email;
+
+    @NotNull
+    private Long orgId;
+
+    @NotNull
+    private String region;
+
+    @Pattern(regexp = "^1(3\\d|4[5-9]|5[0-35-9]|6[2567]|7[0-8]|8\\d|9[0-35-9])\\d{8}$", message = "手机号格式不正确")
+    private String mobile;
+
+    @Pattern(regexp = "0\\d{2,3}-\\d{7,8}$", message = "座机号格式不正确")
+    private String phone;
+
+    private String remark;
+
+    private Long tagId;
+
+
+}

src/main/java/com/rainbus/dlp/entity/req/user/AddUserTagReq.java

@@ -0,0 +1,9 @@
+package com.rainbus.dlp.entity.req.user;
+
+import lombok.Data;
+
+@Data
+public class AddUserTagReq {
+    private String tag;
+    private String remark;
+}

src/main/java/com/rainbus/dlp/entity/req/user/ListUserReq.java

@@ -0,0 +1,15 @@
+package com.rainbus.dlp.entity.req.user;
+
+import com.rainbus.dlp.entity.req.PageReq;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ListUserReq extends PageReq {
+    private String username;
+    private String email;
+    private String region;
+    private Long orgId;
+}

src/main/java/com/rainbus/dlp/entity/req/user/LoginReq.java

@@ -1,16 +1,15 @@
 package com.rainbus.dlp.entity.req.user;
 
-import jakarta.validation.constraints.Email;
 import jakarta.validation.constraints.Pattern;
 import lombok.Data;
 
 @Data
-public class RegisterReq {
+public class LoginReq {
 
     @Pattern(regexp = "^[a-zA-Z0-9_-]{4,16}$", message = "用户名格式不正确")
     private String username;
 
-    @Email(message = "邮箱格式不正确")
+    @Pattern(regexp = "^[a-zA-Z0-9_-]{8,16}$", message = "密码格式不正确")
-    private String email;
+    private String password;
 
 }

src/main/java/com/rainbus/dlp/entity/req/user/UpdateUserReq.java

@@ -0,0 +1,37 @@
+package com.rainbus.dlp.entity.req.user;
+
+import jakarta.validation.constraints.Email;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Pattern;
+import lombok.Data;
+
+@Data
+public class UpdateUserReq {
+
+    @NotNull
+    private Long id;
+
+    @Pattern(regexp = "^[a-zA-Z0-9_-]{4,16}$", message = "用户名格式不正确")
+    private String username;
+
+    @Pattern(regexp = "^[\\u4E00-\\u9FA5]{2,4}$", message = "姓名格式不正确")
+    private String realName;
+
+    @Email(message = "邮箱格式不正确")
+    private String email;
+
+    @NotNull
+    private Long orgId;
+
+    @NotNull
+    private String region;
+
+    @Pattern(regexp = "^1(3\\d|4[5-9]|5[0-35-9]|6[2567]|7[0-8]|8\\d|9[0-35-9])\\d{8}$", message = "手机号格式不正确")
+    private String mobile;
+
+    @Pattern(regexp = "0\\d{2,3}-\\d{7,8}$", message = "座机号格式不正确")
+    private String phone;
+
+    private String remark;
+
+}

src/main/java/com/rainbus/dlp/entity/resp/PageResp.java

@@ -0,0 +1,13 @@
+package com.rainbus.dlp.entity.resp;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class PageResp<T> {
+    private List<T> list;
+    private Long total;
+    private Long pageSize;
+    private Long current;
+}

src/main/java/com/rainbus/dlp/entity/resp/user/GetTagResp.java

@@ -0,0 +1,10 @@
+package com.rainbus.dlp.entity.resp.user;
+
+import lombok.Data;
+
+@Data
+public class GetTagResp {
+    private Long id;
+    private String tag;
+    private String remark;
+}

src/main/java/com/rainbus/dlp/entity/resp/user/GetUserResp.java

@@ -0,0 +1,39 @@
+package com.rainbus.dlp.entity.resp.user;
+
+import com.rainbus.dlp.entity.enums.UserStatusEnum;
+import com.rainbus.dlp.entity.pojo.user.SysOrg;
+import com.rainbus.dlp.entity.pojo.user.SysRole;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.Getter;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Data
+public class GetUserResp {
+
+    private Long id;
+
+    private String username;
+
+    private String email;
+
+    private List<SysRole> roles;
+
+    private SysOrg org;
+
+    @Schema(description = "未定字段格式")
+    private List<Object> tags;
+
+    private UserStatusEnum status;
+
+    private Long createBy;
+
+    private Long updateBy;
+
+    private LocalDateTime createAt;
+
+    private LocalDateTime updateAt;
+
+}

src/main/java/com/rainbus/dlp/entity/resp/user/LoginResp.java

@@ -0,0 +1,8 @@
+package com.rainbus.dlp.entity.resp.user;
+
+import lombok.Data;
+
+@Data
+public class LoginResp {
+    private String token;
+}

src/main/java/com/rainbus/dlp/repository/dao/SystemDao.java

@@ -0,0 +1,27 @@
+package com.rainbus.dlp.repository.dao;
+
+import com.baomidou.mybatisplus.core.batch.MybatisBatch;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.rainbus.dlp.entity.pojo.user.SysResource;
+import com.rainbus.dlp.repository.mapper.user.SysResourceMapper;
+import com.rainbus.dlp.repository.mapper.user.SysUserMapper;
+import org.apache.ibatis.session.SqlSessionFactory;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Component
+public class SystemDao {
+
+    private final SysResourceMapper resourceMapper;
+    private final SqlSessionFactory sqlSessionFactory;
+    private final SysUserMapper sysUserMapper;
+
+    public SystemDao(SysResourceMapper sysResourceMapper, SqlSessionFactory sqlSessionFactory, SysUserMapper sysUserMapper) {
+        this.resourceMapper = sysResourceMapper;
+        this.sqlSessionFactory = sqlSessionFactory;
+        this.sysUserMapper = sysUserMapper;
+    }
+
+}

src/main/java/com/rainbus/dlp/repository/dao/UserDao.java

@@ -1,22 +1,27 @@
 package com.rainbus.dlp.repository.dao;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.rainbus.dlp.entity.pojo.user.SysOrg;
 import com.rainbus.dlp.entity.pojo.user.SysRole;
 import com.rainbus.dlp.entity.pojo.user.SysUser;
+import com.rainbus.dlp.repository.mapper.user.SysOrgMapper;
 import com.rainbus.dlp.repository.mapper.user.SysRoleMapper;
 import com.rainbus.dlp.repository.mapper.user.SysUserMapper;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
 
+
 @Component
 @RequiredArgsConstructor
 public class UserDao {
 
     private final SysUserMapper userMapper;
     private final SysRoleMapper roleMapper;
+    private final SysOrgMapper orgMapper;
 
     public Optional<SysUser> findUserByUsername(String username) {
         LambdaQueryWrapper<SysUser> wrapper = new LambdaQueryWrapper<SysUser>()
@@ -33,4 +38,24 @@ public class UserDao {
     }
 
 
+    public Optional<SysOrg> findOrgById(Long orgId) {
+        return Optional.ofNullable(orgMapper.selectById(orgId));
+    }
+
+    public List<SysOrg> listOrgWithSubOrg(Long orgId) {
+        SysOrg org = orgMapper.selectById(orgId);
+        if (Objects.isNull(org)) {
+            return List.of();
+        }
+        LambdaQueryWrapper<SysOrg> subQueryWrapper = new LambdaQueryWrapper<SysOrg>()
+                .like(SysOrg::getFullPath, org.getFullPath() + "%");
+        return orgMapper.selectList(subQueryWrapper);
+    }
+
+    public List<SysUser> listUserByOrgIds(List<Long> orgIds) {
+        LambdaQueryWrapper<SysUser> lqw = new LambdaQueryWrapper<SysUser>()
+                .in(SysUser::getOrg, orgIds);
+        return userMapper.selectList(lqw);
+    }
+
 }

src/main/java/com/rainbus/dlp/repository/mapper/user/SysResourceMapper.java

@@ -3,6 +3,9 @@ package com.rainbus.dlp.repository.mapper.user;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.rainbus.dlp.entity.pojo.user.SysResource;
+import com.rainbus.dlp.util.SqlUtil;
+import com.rainbus.dlp.util.TextUtil;
+import org.apache.ibatis.annotations.Insert;
 import org.apache.ibatis.annotations.Select;
 import org.mapstruct.Mapping;
 
@@ -11,11 +14,19 @@ import java.util.List;
 public interface SysResourceMapper extends BaseMapper<SysResource> {
 
     @Select("""
-        select * from sys_resource sr
+            select * from sys_resource sr
-        left join sys_role_resources srr
+            left join sys_role_resources srr
-            on sr.id = srr.resources_id
+                on sr.id = srr.resources_id
-        where srr.sys_role_id = #{roleId}
+            where srr.sys_role_id = #{roleId}
-        """)
+            """)
     List<SysResource> selectListByRoleId(Long roleId);
 
+    @Insert("""
+            insert into sys_resource (request_method, resource, created_at, description, updated_at) values
+            <foreach collection="resources" item="item" index="index" separator=",">
+                (#{item.requestMethod}, #{item.resource}, #{item.createdAt}, #{item.description}, #{item.updatedAt})
+            </foreach>
+            """)
+    Long batchInsert(List<SysResource> resources);
+
 }

src/main/java/com/rainbus/dlp/repository/mapper/user/SysRoleMapper.java

@@ -10,16 +10,16 @@ import java.util.List;
 public interface SysRoleMapper extends BaseMapper<SysRole> {
 
     @Select("""
-        select * from sys_role sr
+            select * from sys_role sr
-        left join sys_user_roles sur
+            left join sys_user_roles sur
-        on sr.id = sur.roles_id
+            on sr.id = sur.roles_id
-        where sur.sys_user_id = #{userId}
+            where sur.sys_user_id = #{userId}
-        """)
+            """)
     List<SysRole> selectListByUserId(Long userId);
 
     @Select("""
-        select * from sys_role where id = 4
+            select * from sys_role where id = 4
-        """)
+            """)
     @Results(
             @Result(
                     property = "resources",

src/main/java/com/rainbus/dlp/repository/mapper/user/SysUserMapper.java

@@ -4,10 +4,12 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.rainbus.dlp.entity.pojo.user.SysUser;
 import org.apache.ibatis.annotations.*;
 
+import java.util.List;
+
 public interface SysUserMapper extends BaseMapper<SysUser> {
     @Select("""
-        select * from sys_user where username = #{username}
+            select * from sys_user where username = #{username}
-        """)
+            """)
     @Results({
             @Result(column = "id", property = "id"),
             @Result(
@@ -26,4 +28,10 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
             )
     })
     SysUser selectUserRoleOrgByUsername(@Param("username") String username);
+
+    @Select("""
+            select roles_id from sys_user_roles where sys_user_id = #{userId}
+            """)
+    List<Long> selectRoleIdsByUserId(Long userId);
+
 }

src/main/java/com/rainbus/dlp/service/SystemServ.java

@@ -1,5 +1,10 @@
 package com.rainbus.dlp.service;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.rainbus.dlp.entity.ApiDescription;
+import com.rainbus.dlp.entity.converter.SystemConv;
+import com.rainbus.dlp.entity.dto.system.ApiInfo;
+import com.rainbus.dlp.entity.pojo.user.SysResource;
 import lombok.RequiredArgsConstructor;
 import org.springframework.context.ApplicationContext;
 import org.springframework.stereotype.Service;
@@ -17,31 +22,35 @@ import java.util.stream.Collectors;
 public class SystemServ {
 
     private final ApplicationContext applicationContext;
-
+    private final SystemConv systemConv;
-    public record ApiInfo(String url, RequestMethod method) {
-    }
 
     public List<ApiInfo> getSystemApis() {
-        List<ApiInfo> apiInfos = new ArrayList<>();
 
         RequestMappingHandlerMapping mapping = applicationContext.getBean(RequestMappingHandlerMapping.class);
         Map<RequestMappingInfo, HandlerMethod> methodMap = mapping.getHandlerMethods();
 
-        for (RequestMappingInfo info : methodMap.keySet()) {
+
+        List<ApiInfo> apiInfos = new LinkedList<>();
+        methodMap.forEach((info, func) ->  {
             if (Objects.isNull(info.getPathPatternsCondition())) {
-                continue;
+                return;
             }
 
             Set<PathPattern> patterns = info.getPathPatternsCondition().getPatterns();
             Set<RequestMethod> methods = info.getMethodsCondition().getMethods();
+            Optional<ApiDescription> desc = Optional.ofNullable(func.getMethod().getAnnotation(ApiDescription.class));
             for (PathPattern url : patterns) {
                 for (RequestMethod method : methods) {
-                    apiInfos.add(new ApiInfo(url.getPatternString(), method));
+                    apiInfos.add(new ApiInfo(url.getPatternString(), method, desc.map(ApiDescription::value).orElse(null)));
                 }
             }
-        }
+        });
 
         return apiInfos;
     }
 
+    public void initResources() {
+        List<SysResource> resources = systemConv.ApiInfosDto2Pojo(getSystemApis());
+    }
+
 }

src/main/java/com/rainbus/dlp/service/UserServ.java

@@ -2,19 +2,27 @@ package com.rainbus.dlp.service;
 
 import com.rainbus.dlp.entity.converter.UserConv;
 import com.rainbus.dlp.entity.dto.user.CustomUserDetails;
+import com.rainbus.dlp.entity.dto.user.TokenClaims;
 import com.rainbus.dlp.entity.enums.UserStatusEnum;
+import com.rainbus.dlp.entity.exception.OrgNotExistExcp;
 import com.rainbus.dlp.entity.exception.UserDisabledExcp;
+import com.rainbus.dlp.entity.exception.UsernameOrPasswordExcp;
+import com.rainbus.dlp.entity.pojo.user.SysOrg;
 import com.rainbus.dlp.entity.pojo.user.SysRole;
 import com.rainbus.dlp.entity.pojo.user.SysUser;
+import com.rainbus.dlp.entity.req.user.LoginReq;
+import com.rainbus.dlp.entity.resp.user.LoginResp;
 import com.rainbus.dlp.repository.dao.UserDao;
+import com.rainbus.dlp.util.AuthUtil;
+import com.rainbus.dlp.util.JwtUtil;
 import com.rainbus.dlp.util.RedisUtil;
 import lombok.AllArgsConstructor;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
+import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 
-import javax.management.relation.Role;
 import java.util.List;
 import java.util.Optional;
 
@@ -29,22 +37,32 @@ public class UserServ implements UserDetailsService {
     public static final String REDIS_USER_DETAILS = "user_details_%s";
     public static final long REDIS_USER_DETAILS_EXPIRE = 1 * 60 * 60;
     private final RedisUtil redisUtil;
+    private final PasswordEncoder passwordEncoder;
+    private final AuthUtil authUtil;
 
     public SysUser getUserByUsername(String username) {
         Optional<SysUser> user = userDao.findUserByUsername(username);
         if (user.isEmpty()) {
-            throw  new UsernameNotFoundException("用户不存在");
+            throw new UsernameNotFoundException("用户不存在");
         }
         return user.get();
     }
 
-    public List<SysRole> listRoleResource() {
+    public LoginResp login(LoginReq req) {
-        return userDao.listRoleResource();
+        Optional<SysUser> userOpt = userDao.findUserRoleOrgByUsername(req.getUsername());
+        SysUser user = validUserAvailable(userOpt);
+        validPassword(req.getPassword(), user.getPassword());
+        TokenClaims claims = userConv.ClaimsPojo2Dto(user);
+        LoginResp resp =  new LoginResp();
+        resp.setToken(JwtUtil.generateToken(claims));
+        return resp;
     }
 
-//    public List<SysRole> getAllRoles() {
+    public Object listUser() {
-//        return roleRepo.findAll();
+        Long orgId = authUtil.getUserDetails().getOrgId();
-//    }
+        List<Long> subOrgIds = userDao.listOrgWithSubOrg(orgId).stream().map(SysOrg::getId).toList();
+        return userDao.listUserByOrgIds(subOrgIds);
+    }
 
     @Override
     public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
@@ -55,18 +73,12 @@ public class UserServ implements UserDetailsService {
         }
 
         // 读数据库
-        Optional<SysUser> user = userDao.findUserRoleOrgByUsername(username);
+        Optional<SysUser> userOpt = userDao.findUserRoleOrgByUsername(username);
-        if (user.isEmpty()) {
+        SysUser user = validUserAvailable(userOpt);
-            throw new UsernameNotFoundException("用户不存在");
+        CustomUserDetails userDetails = userConv.UserDetailsPojo2Dto(user);
-        }
-        if (user.get().getStatus() == UserStatusEnum.DISABLED) {
-            throw new UserDisabledExcp();
-        }
-        CustomUserDetails userDetails = userConv.UserPojo2UserDetails(user.get());
 
         // 写缓存
         redisUtil.setex(RedisUtil.parseKey(REDIS_USER_DETAILS, username), userDetails, REDIS_USER_DETAILS_EXPIRE);
-
         return userDetails;
     }
 
@@ -74,4 +86,26 @@ public class UserServ implements UserDetailsService {
         return redisUtil.get(RedisUtil.parseKey(REDIS_USER_DETAILS, username), CustomUserDetails.class);
     }
 
+    private void validPassword(String rawPassword, String encodedPassword) {
+        if (!passwordEncoder.matches(rawPassword, encodedPassword)) {
+            throw new UsernameOrPasswordExcp();
+        }
+    }
+
+    private SysUser validUserAvailable(Optional<SysUser> userOpt) {
+        if (userOpt.isEmpty()) {
+            throw new UsernameOrPasswordExcp();
+        }
+        if (userOpt.get().getStatus() == UserStatusEnum.DISABLED) {
+            throw new UserDisabledExcp();
+        }
+        return userOpt.get();
+    }
+
+    private SysOrg validOrgAvailable(Optional<SysOrg> orgOpt) {
+        if (orgOpt.isEmpty()) {
+            throw new OrgNotExistExcp();
+        }
+        return orgOpt.get();
+    }
 }

src/main/java/com/rainbus/dlp/util/AuthUtil.java

@@ -0,0 +1,14 @@
+package com.rainbus.dlp.util;
+
+import com.rainbus.dlp.entity.dto.user.CustomUserDetails;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.stereotype.Component;
+
+@Component
+public class AuthUtil {
+    public CustomUserDetails getUserDetails() {
+        return (CustomUserDetails) SecurityContextHolder.getContext().getAuthentication().getDetails();
+    }
+}

src/main/java/com/rainbus/dlp/util/SqlUtil.java

@@ -0,0 +1,28 @@
+package com.rainbus.dlp.util;
+
+import java.util.Arrays;
+import java.util.List;
+
+public class SqlUtil {
+
+    record TableInfo(String tableName, List<String> columName) {}
+
+//    public static <T> String generateBatchInsertSql(String fieldName, Class<T> tClass) {
+//        TableInfo tableInfo = getTableInfo(tClass);
+//        return STR."""
+//                INSERT INTO \{tableInfo.tableName} (\{String.join(", ", tableInfo.columName)})
+//                VALUES
+//                <foreach collection="\{fieldName}" item="item" index="index" separator=",">
+//                    (\{String.join(", ", tableInfo.columName.stream().map(colum -> STR."#{item.\{colum}}").toList())})
+//                </foreach>
+//                """;
+//    }
+//
+//    private static <T> TableInfo getTableInfo(Class<T> tClass) {
+//        String tableName = TextUtil.camelToSnake(tClass.getSimpleName());
+//        List<String> columName = Arrays.stream(tClass.getDeclaredFields())
+//                .map(field -> TextUtil.camelToSnake(field.getName()))
+//                .toList();
+//        return new TableInfo(tableName, columName);
+//    }
+}

src/main/java/com/rainbus/dlp/util/TextUtil.java

@@ -0,0 +1,25 @@
+package com.rainbus.dlp.util;
+
+import org.apache.commons.lang3.StringUtils;
+
+import java.nio.charset.StandardCharsets;
+
+public class TextUtil {
+    public static String camelToSnake(String camel) {
+        if (StringUtils.isBlank(camel)) {
+            return camel;
+        }
+        camel = Character.toLowerCase(camel.charAt(0)) + camel.substring(1);
+
+        StringBuilder result = new StringBuilder();
+        for (Character c: camel.toCharArray()) {
+            if (Character.isUpperCase(c)) {
+                result.append("_");
+                result.append(Character.toLowerCase(c));
+            } else {
+                result.append(c);
+            }
+        }
+        return result.toString();
+    }
+}