auth/auth-server-java
auth
/
auth-server-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: 重构项目结构

This commit is contained in:
bunny 2025-04-18 22:48:49 +08:00
parent 0713f0abfa
commit ee2ea83dda
432 changed files with 2361 additions and 1793 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
auth-admin/pom.xml Normal file
View File

@ -0,0 +1,43 @@
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>cn.bunny</groupId>
<artifactId>auth-server</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
<artifactId>auth-admin</artifactId>
<packaging>jar</packaging>
<name>auth-framework</name>
<url>https://maven.apache.org</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<dependencies>
<dependency>
<groupId>cn.bunny</groupId>
<artifactId>controllers</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>
</project>

0
service/src/main/java/cn/bunny/services/AuthServiceApplication.java → auth-admin/src/main/java/cn/bunny/services/AuthServiceApplication.java
View File

0
service/src/main/java/cn/bunny/services/quartz/DatabaseBackupJob.java → auth-admin/src/main/java/cn/bunny/services/quartz/DatabaseBackupJob.java
View File

0
service/src/main/java/cn/bunny/services/quartz/JobHello.java → auth-admin/src/main/java/cn/bunny/services/quartz/JobHello.java
View File

45
auth-admin/src/main/java/cn/bunny/services/security/config/MethodSecurityConfig.java Normal file
View File

@ -0,0 +1,45 @@
package cn.bunny.services.security.config;
import cn.bunny.domain.system.entity.AdminUser;
import cn.bunny.domain.vo.result.ResultCodeEnum;
import cn.bunny.services.mapper.system.UserMapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.security.core.userdetails.UserDetailsService;
import org.springframework.security.core.userdetails.UsernameNotFoundException;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.security.crypto.password.PasswordEncoder;
@Configuration
public class MethodSecurityConfig {
@Bean
public PasswordEncoder passwordEncoder() {
return new BCryptPasswordEncoder();
}
/**
* 使用数据库方式
* 登录方式：邮箱+用户名
*
* @param userMapper 获取用户数据
* @return 数据库的用户
*/
@Bean
public UserDetailsService userDetailsService(UserMapper userMapper) {
return username -> {
// 查询用户相关内容
LambdaQueryWrapper<AdminUser> queryWrapper = new LambdaQueryWrapper<AdminUser>()
.eq(AdminUser::getEmail, username)
.or()
.eq(AdminUser::getUsername, username);
// 根据邮箱查询用户名
AdminUser adminUser = userMapper.selectOne(queryWrapper);
if (adminUser == null) throw new UsernameNotFoundException(ResultCodeEnum.USER_IS_EMPTY.getMessage());
return adminUser;
};
}
}

37
service/src/main/java/cn/bunny/services/security/config/WebSecurityConfig.java → auth-admin/src/main/java/cn/bunny/services/security/config/WebSecurityConfig.java
View File

@ -1,15 +1,11 @@
package cn.bunny.services.security.config;
import cn.bunny.dao.entity.system.AdminUser;
import cn.bunny.dao.vo.result.ResultCodeEnum;
import cn.bunny.services.mapper.system.UserMapper;
import cn.bunny.services.security.custom.CustomAuthorizationManagerServiceImpl;
import cn.bunny.services.security.filter.TokenLoginFilterService;
import cn.bunny.services.security.handelr.SecurityAccessDeniedHandler;
import cn.bunny.services.security.handelr.SecurityAuthenticationEntryPoint;
import cn.bunny.services.service.system.UserService;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import org.springframework.beans.factory.annotation.Autowired;
import jakarta.annotation.Resource;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.security.config.annotation.authentication.configuration.AuthenticationConfiguration;
@ -17,8 +13,6 @@ import org.springframework.security.config.annotation.method.configuration.Enabl
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer;
import org.springframework.security.core.userdetails.UserDetailsService;
import org.springframework.security.core.userdetails.UsernameNotFoundException;
import org.springframework.security.web.SecurityFilterChain;
import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
import org.springframework.security.web.util.matcher.RegexRequestMatcher;
@ -36,13 +30,13 @@ public class WebSecurityConfig {
"/error", "/*/i18n/getI18n",
};
@Autowired
@Resource
private UserService userService;
@Autowired
@Resource
private CustomAuthorizationManagerServiceImpl customAuthorizationManagerService;
@Autowired
@Resource
private AuthenticationConfiguration authenticationConfiguration;
@Bean
@ -76,27 +70,4 @@ public class WebSecurityConfig {
return httpSecurity.build();
}
/**
* 使用数据库方式
* 登录方式：邮箱+用户名
*
* @param userMapper 获取用户数据
* @return 数据库的用户
*/
@Bean
public UserDetailsService userDetailsService(UserMapper userMapper) {
return username -> {
// 查询用户相关内容
LambdaQueryWrapper<AdminUser> queryWrapper = new LambdaQueryWrapper<AdminUser>()
.eq(AdminUser::getEmail, username)
.or()
.eq(AdminUser::getUsername, username);
// 根据邮箱查询用户名
AdminUser adminUser = userMapper.selectOne(queryWrapper);
if (adminUser == null) throw new UsernameNotFoundException(ResultCodeEnum.USER_IS_EMPTY.getMessage());
return adminUser;
};
}
}

2
service/src/main/java/cn/bunny/services/security/custom/CustomAuthenticationException.java → auth-admin/src/main/java/cn/bunny/services/security/custom/CustomAuthenticationException.java
View File

@ -1,6 +1,6 @@
package cn.bunny.services.security.custom;
import cn.bunny.dao.vo.result.ResultCodeEnum;
import cn.bunny.domain.vo.result.ResultCodeEnum;
import lombok.Getter;
import lombok.ToString;
import lombok.extern.slf4j.Slf4j;

10
service/src/main/java/cn/bunny/services/security/custom/CustomAuthorizationManagerServiceImpl.java → auth-admin/src/main/java/cn/bunny/services/security/custom/CustomAuthorizationManagerServiceImpl.java
View File

@ -1,10 +1,10 @@
package cn.bunny.services.security.custom;
import cn.bunny.dao.constant.RedisUserConstant;
import cn.bunny.dao.entity.system.Power;
import cn.bunny.dao.entity.system.Role;
import cn.bunny.dao.vo.result.ResultCodeEnum;
import cn.bunny.dao.vo.system.user.LoginVo;
import cn.bunny.domain.constant.RedisUserConstant;
import cn.bunny.domain.system.entity.Power;
import cn.bunny.domain.system.entity.Role;
import cn.bunny.domain.system.vo.user.LoginVo;
import cn.bunny.domain.vo.result.ResultCodeEnum;
import cn.bunny.services.context.BaseContext;
import cn.bunny.services.mapper.system.PowerMapper;
import cn.bunny.services.mapper.system.RoleMapper;

8
service/src/main/java/cn/bunny/services/security/filter/TokenLoginFilterService.java → auth-admin/src/main/java/cn/bunny/services/security/filter/TokenLoginFilterService.java
View File

@ -1,9 +1,9 @@
package cn.bunny.services.security.filter;
import cn.bunny.dao.dto.system.user.LoginDto;
import cn.bunny.dao.enums.LoginEnums;
import cn.bunny.dao.vo.result.Result;
import cn.bunny.dao.vo.system.user.LoginVo;
import cn.bunny.domain.enums.LoginEnums;
import cn.bunny.domain.system.dto.user.LoginDto;
import cn.bunny.domain.system.vo.user.LoginVo;
import cn.bunny.domain.vo.result.Result;
import cn.bunny.services.security.handelr.SecurityAuthenticationFailureHandler;
import cn.bunny.services.security.handelr.SecurityAuthenticationSuccessHandler;
import cn.bunny.services.service.system.UserService;

4
service/src/main/java/cn/bunny/services/security/handelr/SecurityAccessDeniedHandler.java → auth-admin/src/main/java/cn/bunny/services/security/handelr/SecurityAccessDeniedHandler.java
View File

@ -1,7 +1,7 @@
package cn.bunny.services.security.handelr;
import cn.bunny.dao.vo.result.Result;
import cn.bunny.dao.vo.result.ResultCodeEnum;
import cn.bunny.domain.vo.result.Result;
import cn.bunny.domain.vo.result.ResultCodeEnum;
import com.alibaba.fastjson2.JSON;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;

4
service/src/main/java/cn/bunny/services/security/handelr/SecurityAuthenticationEntryPoint.java → auth-admin/src/main/java/cn/bunny/services/security/handelr/SecurityAuthenticationEntryPoint.java
View File

@ -1,7 +1,7 @@
package cn.bunny.services.security.handelr;
import cn.bunny.dao.vo.result.Result;
import cn.bunny.dao.vo.result.ResultCodeEnum;
import cn.bunny.domain.vo.result.Result;
import cn.bunny.domain.vo.result.ResultCodeEnum;
import cn.bunny.services.security.custom.CustomAuthenticationException;
import cn.bunny.services.utils.ResponseUtil;
import jakarta.servlet.http.HttpServletRequest;

2
service/src/main/java/cn/bunny/services/security/handelr/SecurityAuthenticationFailureHandler.java → auth-admin/src/main/java/cn/bunny/services/security/handelr/SecurityAuthenticationFailureHandler.java
View File

@ -1,6 +1,6 @@
package cn.bunny.services.security.handelr;
import cn.bunny.dao.vo.result.Result;
import cn.bunny.domain.vo.result.Result;
import com.alibaba.fastjson2.JSON;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;

2
service/src/main/java/cn/bunny/services/security/handelr/SecurityAuthenticationSuccessHandler.java → auth-admin/src/main/java/cn/bunny/services/security/handelr/SecurityAuthenticationSuccessHandler.java
View File

@ -1,6 +1,6 @@
package cn.bunny.services.security.handelr;
import cn.bunny.dao.vo.result.Result;
import cn.bunny.domain.vo.result.Result;
import com.alibaba.fastjson2.JSON;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;

6
service/src/main/resources/application-dev.yml → auth-admin/src/main/resources/application-dev.yml
View File

@ -19,20 +19,20 @@ logging:
bunny:
master:
host: 192.168.3.137
host: localhost
port: 3306
database: auth_admin
username: root
password: "123456"
redis:
host: 192.168.3.137
host: localhost
port: 6379
database: 0
password: "123456"
minio:
endpointUrl: "http://192.168.3.137:9000" # 连接地址
endpointUrl: "http://localhost:9000" # 连接地址
accessKey: bunny # 用户名
secretKey: "12345678" # 登录密码
bucket-name: auth-admin # 指定哪个桶

0
service/src/main/resources/application-test.yml → auth-admin/src/main/resources/application-test.yml
View File

0
service/src/main/resources/application.yml → auth-admin/src/main/resources/application.yml
View File

0
generator-code/src/main/resources/banner.txt → auth-admin/src/main/resources/banner.txt
View File

0
generator-code/src/main/resources/logback.xml → auth-admin/src/main/resources/logback.xml
View File

0
service/src/main/resources/static/backup.sh → auth-admin/src/main/resources/static/backup.sh
View File

0
generator-code/src/main/resources/static/error/400.html → auth-admin/src/main/resources/static/error/400.html
View File

0
generator-code/src/main/resources/static/error/403.html → auth-admin/src/main/resources/static/error/403.html
View File

0
generator-code/src/main/resources/static/error/404.html → auth-admin/src/main/resources/static/error/404.html
View File

0
generator-code/src/main/resources/static/error/500.html → auth-admin/src/main/resources/static/error/500.html
View File

0
generator-code/src/main/resources/static/error/501.html → auth-admin/src/main/resources/static/error/501.html
View File

0
generator-code/src/main/resources/static/error/502.html → auth-admin/src/main/resources/static/error/502.html
View File

0
generator-code/src/main/resources/static/error/503.html → auth-admin/src/main/resources/static/error/503.html
View File

0
generator-code/src/main/resources/static/error/504.html → auth-admin/src/main/resources/static/error/504.html
View File

0
generator-code/src/main/resources/static/error/505.html → auth-admin/src/main/resources/static/error/505.html
View File

0
generator-code/src/main/resources/static/error/506.html → auth-admin/src/main/resources/static/error/506.html
View File

0
generator-code/src/main/resources/static/error/507.html → auth-admin/src/main/resources/static/error/507.html
View File

0
generator-code/src/main/resources/static/error/509.html → auth-admin/src/main/resources/static/error/509.html
View File

0
generator-code/src/main/resources/static/error/510.html → auth-admin/src/main/resources/static/error/510.html
View File

0
generator-code/src/main/resources/static/favicon.ico → auth-admin/src/main/resources/static/favicon.ico
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 17 KiB

0
service/src/main/resources/static/platform-config.json → auth-admin/src/main/resources/static/platform-config.json
View File

0
service/src/main/resources/templates/index.html → auth-admin/src/main/resources/templates/index.html
View File

0
service/src/test/java/cn/bunny/services/config/WebConfig.java → auth-admin/src/test/java/cn/bunny/services/config/WebConfig.java
View File

0
service/src/test/java/cn/bunny/services/controller/LoginTest.java → auth-admin/src/test/java/cn/bunny/services/controller/LoginTest.java
View File

6
service/src/test/java/cn/bunny/services/controller/configuration/ConfigurationControllerTest.java → auth-admin/src/test/java/cn/bunny/services/controller/configuration/ConfigurationControllerTest.java
View File

@ -1,8 +1,8 @@
package cn.bunny.services.controller.configuration;
import cn.bunny.dao.dto.system.configuration.WebConfigurationDto;
import cn.bunny.dao.entity.configuration.WebConfiguration;
import cn.bunny.dao.vo.result.Result;
import cn.bunny.domain.configuration.dto.WebConfigurationDto;
import cn.bunny.domain.configuration.entity.WebConfiguration;
import cn.bunny.domain.vo.result.Result;
import cn.bunny.services.utils.TokenUtilsTest;
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.TypeReference;

12
service/src/test/java/cn/bunny/services/controller/configuration/EmailTemplateControllerTest.java → auth-admin/src/test/java/cn/bunny/services/controller/configuration/EmailTemplateControllerTest.java
View File

@ -1,11 +1,11 @@
package cn.bunny.services.controller.configuration;
import cn.bunny.dao.dto.system.email.template.EmailTemplateAddDto;
import cn.bunny.dao.dto.system.email.template.EmailTemplateUpdateDto;
import cn.bunny.dao.enums.EmailTemplateEnums;
import cn.bunny.dao.vo.result.PageResult;
import cn.bunny.dao.vo.result.Result;
import cn.bunny.dao.vo.system.email.EmailTemplateVo;
import cn.bunny.domain.email.dto.EmailTemplateAddDto;
import cn.bunny.domain.email.dto.EmailTemplateUpdateDto;
import cn.bunny.domain.email.vo.EmailTemplateVo;
import cn.bunny.domain.enums.EmailTemplateEnums;
import cn.bunny.domain.vo.result.PageResult;
import cn.bunny.domain.vo.result.Result;
import cn.bunny.services.utils.TokenUtilsTest;
import cn.hutool.crypto.digest.MD5;
import com.alibaba.fastjson2.JSON;

14
service/src/test/java/cn/bunny/services/controller/log/UserLoginLogControllerTest.java → auth-admin/src/test/java/cn/bunny/services/controller/log/UserLoginLogControllerTest.java
View File

@ -1,11 +1,11 @@
package cn.bunny.services.controller.log;
import cn.bunny.dao.dto.log.UserLoginLogDto;
import cn.bunny.dao.entity.log.UserLoginLog;
import cn.bunny.dao.vo.log.UserLoginLogLocalVo;
import cn.bunny.dao.vo.log.UserLoginLogVo;
import cn.bunny.dao.vo.result.PageResult;
import cn.bunny.dao.vo.result.Result;
import cn.bunny.domain.log.dto.UserLoginLogDto;
import cn.bunny.domain.log.entity.UserLoginLog;
import cn.bunny.domain.log.vo.UserLoginLogLocalVo;
import cn.bunny.domain.log.vo.UserLoginLogVo;
import cn.bunny.domain.vo.result.PageResult;
import cn.bunny.domain.vo.result.Result;
import cn.bunny.services.service.log.UserLoginLogService;
import cn.bunny.services.utils.TokenUtilsTest;
import com.alibaba.fastjson2.JSON;
@ -67,7 +67,7 @@ class UserLoginLogControllerTest {
.apply(SecurityMockMvcConfigurers.springSecurity())
.build();
testClient = WebTestClient.bindToController(new UserLoginLogController(userLoginLogService)).build();
testClient = WebTestClient.bindToController(new UserLoginLogController()).build();
}
@AfterEach

2
service/src/test/java/cn/bunny/services/service/configuration/impl/I18nServiceImplTest.java → auth-admin/src/test/java/cn/bunny/services/service/configuration/impl/I18nServiceImplTest.java
View File

@ -1,6 +1,6 @@
package cn.bunny.services.service.configuration.impl;
import cn.bunny.dao.entity.i18n.I18n;
import cn.bunny.domain.i18n.entity.I18n;
import cn.bunny.services.mapper.configuration.I18nMapper;
import cn.bunny.services.utils.system.I18nUtil;
import com.alibaba.fastjson2.JSON;

4
service/src/test/java/cn/bunny/services/utils/TokenUtilsTest.java → auth-admin/src/test/java/cn/bunny/services/utils/TokenUtilsTest.java
View File

@ -1,7 +1,7 @@
package cn.bunny.services.utils;
import cn.bunny.dao.entity.system.AdminUser;
import cn.bunny.dao.vo.system.user.LoginVo;
import cn.bunny.domain.system.entity.AdminUser;
import cn.bunny.domain.system.vo.user.LoginVo;
import cn.bunny.services.mapper.system.UserMapper;
import cn.bunny.services.utils.system.UserUtil;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;

27
auth-services/controllers/pom.xml Normal file
View File

@ -0,0 +1,27 @@
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>cn.bunny</groupId>
<artifactId>auth-services</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
<artifactId>controllers</artifactId>
<packaging>jar</packaging>
<name>controllers</name>
<url>https://maven.apache.org</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<dependencies>
<dependency>
<groupId>cn.bunny</groupId>
<artifactId>services</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
</dependencies>
</project>

1
service/src/main/java/cn/bunny/services/controller/IndexController.java → auth-services/controllers/src/main/java/cn/bunny/services/controller/IndexController.java
View File

@ -20,7 +20,6 @@ public class IndexController {
@Operation(summary = "访问首页", description = "访问首页")
@GetMapping("")
public String index() {
// return "欢迎访问 Bunny Java Template，欢迎去Gitee：https://gitee.com/BunnyBoss/java_single.git";
return "index";
}

16
service/src/main/java/cn/bunny/services/controller/configuration/ConfigurationController.java → auth-services/controllers/src/main/java/cn/bunny/services/controller/configuration/ConfigurationController.java
View File

@ -1,12 +1,13 @@
package cn.bunny.services.controller.configuration;
import cn.bunny.dao.dto.system.configuration.WebConfigurationDto;
import cn.bunny.dao.entity.configuration.WebConfiguration;
import cn.bunny.dao.vo.result.Result;
import cn.bunny.dao.vo.result.ResultCodeEnum;
import cn.bunny.domain.configuration.dto.WebConfigurationDto;
import cn.bunny.domain.configuration.entity.WebConfiguration;
import cn.bunny.domain.vo.result.Result;
import cn.bunny.domain.vo.result.ResultCodeEnum;
import cn.bunny.services.service.configuration.ConfigurationService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
import jakarta.validation.Valid;
import org.springframework.web.bind.annotation.*;
@ -15,11 +16,8 @@ import org.springframework.web.bind.annotation.*;
@RequestMapping("/api/config")
public class ConfigurationController {
private final ConfigurationService configurationService;
public ConfigurationController(ConfigurationService configurationService) {
this.configurationService = configurationService;
}
@Resource
private ConfigurationService configurationService;
@Operation(summary = "读取web配置文件", description = "读取web配置文件")
@GetMapping("noAuth/webConfig")

24
service/src/main/java/cn/bunny/services/controller/configuration/EmailTemplateController.java → auth-services/controllers/src/main/java/cn/bunny/services/controller/configuration/EmailTemplateController.java
View File

@ -1,18 +1,19 @@
package cn.bunny.services.controller.configuration;
import cn.bunny.dao.dto.system.email.template.EmailTemplateAddDto;
import cn.bunny.dao.dto.system.email.template.EmailTemplateDto;
import cn.bunny.dao.dto.system.email.template.EmailTemplateUpdateDto;
import cn.bunny.dao.entity.system.EmailTemplate;
import cn.bunny.dao.vo.result.PageResult;
import cn.bunny.dao.vo.result.Result;
import cn.bunny.dao.vo.result.ResultCodeEnum;
import cn.bunny.dao.vo.system.email.EmailTemplateVo;
import cn.bunny.domain.email.dto.EmailTemplateAddDto;
import cn.bunny.domain.email.dto.EmailTemplateDto;
import cn.bunny.domain.email.dto.EmailTemplateUpdateDto;
import cn.bunny.domain.email.entity.EmailTemplate;
import cn.bunny.domain.email.vo.EmailTemplateVo;
import cn.bunny.domain.vo.result.PageResult;
import cn.bunny.domain.vo.result.Result;
import cn.bunny.domain.vo.result.ResultCodeEnum;
import cn.bunny.services.service.configuration.EmailTemplateService;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
import jakarta.validation.Valid;
import org.springframework.web.bind.annotation.*;
@ -32,11 +33,8 @@ import java.util.Map;
@RequestMapping("api/emailTemplate")
public class EmailTemplateController {
private final EmailTemplateService emailTemplateService;
public EmailTemplateController(EmailTemplateService emailTemplateService) {
this.emailTemplateService = emailTemplateService;
}
@Resource
private EmailTemplateService emailTemplateService;
@Operation(summary = "分页查询邮件模板", description = "分页查询邮件模板")
@GetMapping("getEmailTemplateList/{page}/{limit}")

43
service/src/main/java/cn/bunny/services/controller/configuration/EmailUsersController.java → auth-services/controllers/src/main/java/cn/bunny/services/controller/configuration/EmailUsersController.java
View File

@ -1,23 +1,22 @@
package cn.bunny.services.controller.configuration;
import cn.bunny.dao.dto.system.email.user.EmailUserUpdateStatusDto;
import cn.bunny.dao.dto.system.email.user.EmailUsersAddDto;
import cn.bunny.dao.dto.system.email.user.EmailUsersDto;
import cn.bunny.dao.dto.system.email.user.EmailUsersUpdateDto;
import cn.bunny.dao.entity.system.EmailUsers;
import cn.bunny.dao.vo.result.PageResult;
import cn.bunny.dao.vo.result.Result;
import cn.bunny.dao.vo.result.ResultCodeEnum;
import cn.bunny.dao.vo.system.email.EmailUsersVo;
import cn.bunny.domain.email.dto.EmailUserUpdateStatusDto;
import cn.bunny.domain.email.dto.EmailUsersAddDto;
import cn.bunny.domain.email.dto.EmailUsersDto;
import cn.bunny.domain.email.dto.EmailUsersUpdateDto;
import cn.bunny.domain.email.entity.EmailUsers;
import cn.bunny.domain.email.vo.EmailUsersVo;
import cn.bunny.domain.vo.result.PageResult;
import cn.bunny.domain.vo.result.Result;
import cn.bunny.domain.vo.result.ResultCodeEnum;
import cn.bunny.services.service.configuration.EmailUsersService;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
import jakarta.validation.Valid;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import reactor.core.publisher.Mono;
import java.util.List;
import java.util.Map;
@ -35,12 +34,12 @@ import java.util.Map;
@RequestMapping("api/emailUsers")
public class EmailUsersController {
@Autowired
@Resource
private EmailUsersService emailUsersService;
@Operation(summary = "分页查询邮箱用户发送配置", description = "分页查询邮箱用户发送配置")
@GetMapping("getEmailUsersList/{page}/{limit}")
public Mono<Result<PageResult<EmailUsersVo>>> getEmailUsersList(
public Result<PageResult<EmailUsersVo>> getEmailUsersList(
@Parameter(name = "page", description = "当前页", required = true)
@PathVariable("page") Integer page,
@Parameter(name = "limit", description = "每页记录数", required = true)
@ -48,28 +47,28 @@ public class EmailUsersController {
EmailUsersDto dto) {
Page<EmailUsers> pageParams = new Page<>(page, limit);
PageResult<EmailUsersVo> pageResult = emailUsersService.getEmailUsersList(pageParams, dto);
return Mono.just(Result.success(pageResult));
return Result.success(pageResult);
}
@Operation(summary = "获取所有邮箱配置用户", description = "获取所有邮箱配置用户")
@GetMapping("noManage/getAllMailboxConfigurationUsers")
public Mono<Result<List<Map<String, String>>>> getAllMailboxConfigurationUsers() {
public Result<List<Map<String, String>>> getAllMailboxConfigurationUsers() {
List<Map<String, String>> list = emailUsersService.getAllMailboxConfigurationUsers();
return Mono.just(Result.success(list));
return Result.success(list);
}
@Operation(summary = "添加邮箱用户发送配置", description = "添加邮箱用户发送配置")
@PostMapping("addEmailUsers")
public Mono<Result<String>> addEmailUsers(@Valid @RequestBody EmailUsersAddDto dto) {
public Result<String> addEmailUsers(@Valid @RequestBody EmailUsersAddDto dto) {
emailUsersService.addEmailUsers(dto);
return Mono.just(Result.success(ResultCodeEnum.ADD_SUCCESS));
return Result.success(ResultCodeEnum.ADD_SUCCESS);
}
@Operation(summary = "更新邮箱用户发送配置", description = "更新邮箱用户发送配置")
@PutMapping("updateEmailUsers")
public Mono<Result<String>> updateEmailUsers(@Valid @RequestBody EmailUsersUpdateDto dto) {
public Result<String> updateEmailUsers(@Valid @RequestBody EmailUsersUpdateDto dto) {
emailUsersService.updateEmailUsers(dto);
return Mono.just(Result.success(ResultCodeEnum.UPDATE_SUCCESS));
return Result.success(ResultCodeEnum.UPDATE_SUCCESS);
}
@Operation(summary = "更新邮箱用户状态", description = "更新邮箱用户状态")
@ -81,8 +80,8 @@ public class EmailUsersController {
@Operation(summary = "删除邮箱用户", description = "删除邮箱用户")
@DeleteMapping("deleteEmailUsers")
public Mono<Result<String>> deleteEmailUsers(@RequestBody List<Long> ids) {
public Result<String> deleteEmailUsers(@RequestBody List<Long> ids) {
emailUsersService.deleteEmailUsers(ids);
return Mono.just(Result.success(ResultCodeEnum.DELETE_SUCCESS));
return Result.success(ResultCodeEnum.DELETE_SUCCESS);
}
}

34
service/src/main/java/cn/bunny/services/controller/configuration/I18nController.java → auth-services/controllers/src/main/java/cn/bunny/services/controller/configuration/I18nController.java
View File

@ -1,20 +1,21 @@
package cn.bunny.services.controller.configuration;
import cn.bunny.dao.dto.i18n.I18nAddDto;
import cn.bunny.dao.dto.i18n.I18nDto;
import cn.bunny.dao.dto.i18n.I18nUpdateDto;
import cn.bunny.dao.entity.i18n.I18n;
import cn.bunny.dao.vo.i18n.I18nVo;
import cn.bunny.dao.vo.result.PageResult;
import cn.bunny.dao.vo.result.Result;
import cn.bunny.dao.vo.result.ResultCodeEnum;
import cn.bunny.domain.i18n.dto.I18nAddDto;
import cn.bunny.domain.i18n.dto.I18nDto;
import cn.bunny.domain.i18n.dto.I18nUpdateByFileDto;
import cn.bunny.domain.i18n.dto.I18nUpdateDto;
import cn.bunny.domain.i18n.entity.I18n;
import cn.bunny.domain.i18n.vo.I18nVo;
import cn.bunny.domain.vo.result.PageResult;
import cn.bunny.domain.vo.result.Result;
import cn.bunny.domain.vo.result.ResultCodeEnum;
import cn.bunny.services.service.configuration.I18nService;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
import jakarta.validation.Valid;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
@ -34,7 +35,7 @@ import java.util.Map;
@RequestMapping("api/i18n")
public class I18nController {
@Autowired
@Resource
private I18nService i18nService;
@Operation(summary = "获取多语言内容", description = "获取多语言内容")
@ -65,21 +66,28 @@ public class I18nController {
@Operation(summary = "添加多语言", description = "添加多语言")
@PostMapping("addI18n")
public Result<Object> addI18n(@Valid @RequestBody I18nAddDto dto) {
public Result<String> addI18n(@Valid @RequestBody I18nAddDto dto) {
i18nService.addI18n(dto);
return Result.success(ResultCodeEnum.ADD_SUCCESS);
}
@Operation(summary = "更新多语言", description = "更新多语言")
@PutMapping("updateI18n")
public Result<Object> updateI18n(@Valid @RequestBody I18nUpdateDto dto) {
public Result<String> updateI18n(@Valid @RequestBody I18nUpdateDto dto) {
i18nService.updateI18n(dto);
return Result.success(ResultCodeEnum.UPDATE_SUCCESS);
}
@Operation(summary = "用文件更新多语言", description = "用文件更新多语言")
@PutMapping("updateI18nByFile")
public Result<String> updateI18nByFile(@Valid I18nUpdateByFileDto dto) {
i18nService.updateI18nByFile(dto);
return Result.success(ResultCodeEnum.UPDATE_SUCCESS);
}
@Operation(summary = "删除多语言", description = "删除多语言")
@DeleteMapping("deleteI18n")
public Result<Object> deleteI18n(@RequestBody List<Long> ids) {
public Result<String> deleteI18n(@RequestBody List<Long> ids) {
i18nService.deleteI18n(ids);
return Result.success(ResultCodeEnum.DELETE_SUCCESS);
}

22
service/src/main/java/cn/bunny/services/controller/configuration/I18nTypeController.java → auth-services/controllers/src/main/java/cn/bunny/services/controller/configuration/I18nTypeController.java
View File

@ -1,16 +1,16 @@
package cn.bunny.services.controller.configuration;
import cn.bunny.dao.dto.i18n.I18nTypeAddDto;
import cn.bunny.dao.dto.i18n.I18nTypeDto;
import cn.bunny.dao.dto.i18n.I18nTypeUpdateDto;
import cn.bunny.dao.vo.i18n.I18nTypeVo;
import cn.bunny.dao.vo.result.Result;
import cn.bunny.dao.vo.result.ResultCodeEnum;
import cn.bunny.domain.i18n.dto.I18nTypeAddDto;
import cn.bunny.domain.i18n.dto.I18nTypeDto;
import cn.bunny.domain.i18n.dto.I18nTypeUpdateDto;
import cn.bunny.domain.i18n.vo.I18nTypeVo;
import cn.bunny.domain.vo.result.Result;
import cn.bunny.domain.vo.result.ResultCodeEnum;
import cn.bunny.services.service.configuration.I18nTypeService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
import jakarta.validation.Valid;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@ -28,7 +28,7 @@ import java.util.List;
@RequestMapping("api/i18nType")
public class I18nTypeController {
@Autowired
@Resource
private I18nTypeService i18nTypeService;
@Operation(summary = "获取多语言类型", description = "获取多语言类型")
@ -40,21 +40,21 @@ public class I18nTypeController {
@Operation(summary = "添加多语言类型", description = "添加多语言类型")
@PostMapping("addI18nType")
public Result<Object> addI18nType(@Valid @RequestBody I18nTypeAddDto dto) {
public Result<String> addI18nType(@Valid @RequestBody I18nTypeAddDto dto) {
i18nTypeService.addI18nType(dto);
return Result.success(ResultCodeEnum.ADD_SUCCESS);
}
@Operation(summary = "更新多语言类型", description = "更新多语言类型")
@PutMapping("updateI18nType")
public Result<Object> updateI18nType(@Valid @RequestBody I18nTypeUpdateDto dto) {
public Result<String> updateI18nType(@Valid @RequestBody I18nTypeUpdateDto dto) {
i18nTypeService.updateI18nType(dto);
return Result.success(ResultCodeEnum.UPDATE_SUCCESS);
}
@Operation(summary = "删除多语言类型", description = "删除多语言类型")
@DeleteMapping("deleteI18nType")
public Result<Object> deleteI18nType(@RequestBody List<Long> ids) {
public Result<String> deleteI18nType(@RequestBody List<Long> ids) {
i18nTypeService.deleteI18nType(ids);
return Result.success(ResultCodeEnum.DELETE_SUCCESS);
}

41
service/src/main/java/cn/bunny/services/controller/configuration/MenuIconController.java → auth-services/controllers/src/main/java/cn/bunny/services/controller/configuration/MenuIconController.java
View File

@ -1,22 +1,21 @@
package cn.bunny.services.controller.configuration;
import cn.bunny.dao.dto.system.menuIcon.MenuIconAddDto;
import cn.bunny.dao.dto.system.menuIcon.MenuIconDto;
import cn.bunny.dao.dto.system.menuIcon.MenuIconUpdateDto;
import cn.bunny.dao.entity.system.MenuIcon;
import cn.bunny.dao.vo.result.PageResult;
import cn.bunny.dao.vo.result.Result;
import cn.bunny.dao.vo.result.ResultCodeEnum;
import cn.bunny.dao.vo.system.MenuIconVo;
import cn.bunny.domain.menuIcon.dto.MenuIconAddDto;
import cn.bunny.domain.menuIcon.dto.MenuIconDto;
import cn.bunny.domain.menuIcon.dto.MenuIconUpdateDto;
import cn.bunny.domain.menuIcon.entity.MenuIcon;
import cn.bunny.domain.menuIcon.vo.MenuIconVo;
import cn.bunny.domain.vo.result.PageResult;
import cn.bunny.domain.vo.result.Result;
import cn.bunny.domain.vo.result.ResultCodeEnum;
import cn.bunny.services.service.configuration.MenuIconService;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
import jakarta.validation.Valid;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import reactor.core.publisher.Mono;
import java.util.List;
@ -33,12 +32,12 @@ import java.util.List;
@RequestMapping("api/menuIcon")
public class MenuIconController {
@Autowired
@Resource
private MenuIconService menuIconService;
@Operation(summary = "分页查询系统菜单图标", description = "分页查询系统菜单图标")
@GetMapping("getMenuIconList/{page}/{limit}")
public Mono<Result<PageResult<MenuIconVo>>> getMenuIconList(
public Result<PageResult<MenuIconVo>> getMenuIconList(
@Parameter(name = "page", description = "当前页", required = true)
@PathVariable("page") Integer page,
@Parameter(name = "limit", description = "每页记录数", required = true)
@ -46,34 +45,34 @@ public class MenuIconController {
MenuIconDto dto) {
Page<MenuIcon> pageParams = new Page<>(page, limit);
PageResult<MenuIconVo> pageResult = menuIconService.getMenuIconList(pageParams, dto);
return Mono.just(Result.success(pageResult));
return Result.success(pageResult);
}
@Operation(summary = "获取查询图标名称列", description = "获取查询图标名称列")
@GetMapping("noManage/getIconNameList")
public Mono<Result<List<MenuIconVo>>> getIconNameList(String iconName) {
public Result<List<MenuIconVo>> getIconNameList(String iconName) {
List<MenuIconVo> voList = menuIconService.getIconNameList(iconName);
return Mono.just(Result.success(voList));
return Result.success(voList);
}
@Operation(summary = "添加系统菜单图标", description = "添加系统菜单图标")
@PostMapping("addMenuIcon")
public Mono<Result<String>> addMenuIcon(@Valid @RequestBody MenuIconAddDto dto) {
public Result<String> addMenuIcon(@Valid @RequestBody MenuIconAddDto dto) {
menuIconService.addMenuIcon(dto);
return Mono.just(Result.success(ResultCodeEnum.ADD_SUCCESS));
return Result.success(ResultCodeEnum.ADD_SUCCESS);
}
@Operation(summary = "更新系统菜单图标", description = "更新系统菜单图标")
@PutMapping("updateMenuIcon")
public Mono<Result<String>> updateMenuIcon(@Valid @RequestBody MenuIconUpdateDto dto) {
public Result<String> updateMenuIcon(@Valid @RequestBody MenuIconUpdateDto dto) {
menuIconService.updateMenuIcon(dto);
return Mono.just(Result.success(ResultCodeEnum.UPDATE_SUCCESS));
return Result.success(ResultCodeEnum.UPDATE_SUCCESS);
}
@Operation(summary = "删除系统菜单图标", description = "删除系统菜单图标")
@DeleteMapping("deleteMenuIcon")
public Mono<Result<String>> deleteMenuIcon(@RequestBody List<Long> ids) {
public Result<String> deleteMenuIcon(@RequestBody List<Long> ids) {
menuIconService.deleteMenuIcon(ids);
return Mono.just(Result.success(ResultCodeEnum.DELETE_SUCCESS));
return Result.success(ResultCodeEnum.DELETE_SUCCESS);
}
}

25
service/src/main/java/cn/bunny/services/controller/log/ScheduleExecuteLogController.java → auth-services/controllers/src/main/java/cn/bunny/services/controller/log/ScheduleExecuteLogController.java
View File

@ -1,19 +1,18 @@
package cn.bunny.services.controller.log;
import cn.bunny.dao.dto.log.ScheduleExecuteLogDto;
import cn.bunny.dao.entity.log.ScheduleExecuteLog;
import cn.bunny.dao.vo.log.QuartzExecuteLogVo;
import cn.bunny.dao.vo.result.PageResult;
import cn.bunny.dao.vo.result.Result;
import cn.bunny.dao.vo.result.ResultCodeEnum;
import cn.bunny.domain.log.dto.ScheduleExecuteLogDto;
import cn.bunny.domain.log.entity.ScheduleExecuteLog;
import cn.bunny.domain.log.vo.QuartzExecuteLogVo;
import cn.bunny.domain.vo.result.PageResult;
import cn.bunny.domain.vo.result.Result;
import cn.bunny.domain.vo.result.ResultCodeEnum;
import cn.bunny.services.service.log.ScheduleExecuteLogService;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.beans.factory.annotation.Autowired;
import jakarta.annotation.Resource;
import org.springframework.web.bind.annotation.*;
import reactor.core.publisher.Mono;
import java.util.List;
@ -30,12 +29,12 @@ import java.util.List;
@RequestMapping("api/quartzExecuteLog")
public class ScheduleExecuteLogController {
@Autowired
@Resource
private ScheduleExecuteLogService scheduleExecuteLogService;
@Operation(summary = "分页查询调度任务执行日志", description = "分页查询调度任务执行日志")
@GetMapping("getQuartzExecuteLogList/{page}/{limit}")
public Mono<Result<PageResult<QuartzExecuteLogVo>>> getQuartzExecuteLogList(
public Result<PageResult<QuartzExecuteLogVo>> getQuartzExecuteLogList(
@Parameter(name = "page", description = "当前页", required = true)
@PathVariable("page") Integer page,
@Parameter(name = "limit", description = "每页记录数", required = true)
@ -43,13 +42,13 @@ public class ScheduleExecuteLogController {
ScheduleExecuteLogDto dto) {
Page<ScheduleExecuteLog> pageParams = new Page<>(page, limit);
PageResult<QuartzExecuteLogVo> pageResult = scheduleExecuteLogService.getQuartzExecuteLogList(pageParams, dto);
return Mono.just(Result.success(pageResult));
return Result.success(pageResult);
}
@Operation(summary = "删除调度任务执行日志", description = "删除调度任务执行日志")
@DeleteMapping("deleteQuartzExecuteLog")
public Mono<Result<String>> deleteQuartzExecuteLog(@RequestBody List<Long> ids) {
public Result<String> deleteQuartzExecuteLog(@RequestBody List<Long> ids) {
scheduleExecuteLogService.deleteQuartzExecuteLog(ids);
return Mono.just(Result.success(ResultCodeEnum.DELETE_SUCCESS));
return Result.success(ResultCodeEnum.DELETE_SUCCESS);
}
}

27
service/src/main/java/cn/bunny/services/controller/log/UserLoginLogController.java → auth-services/controllers/src/main/java/cn/bunny/services/controller/log/UserLoginLogController.java
View File

@ -1,19 +1,19 @@
package cn.bunny.services.controller.log;
import cn.bunny.dao.dto.log.UserLoginLogDto;
import cn.bunny.dao.entity.log.UserLoginLog;
import cn.bunny.dao.vo.log.UserLoginLogLocalVo;
import cn.bunny.dao.vo.log.UserLoginLogVo;
import cn.bunny.dao.vo.result.PageResult;
import cn.bunny.dao.vo.result.Result;
import cn.bunny.dao.vo.result.ResultCodeEnum;
import cn.bunny.domain.log.dto.UserLoginLogDto;
import cn.bunny.domain.log.entity.UserLoginLog;
import cn.bunny.domain.log.vo.UserLoginLogLocalVo;
import cn.bunny.domain.log.vo.UserLoginLogVo;
import cn.bunny.domain.vo.result.PageResult;
import cn.bunny.domain.vo.result.Result;
import cn.bunny.domain.vo.result.ResultCodeEnum;
import cn.bunny.services.service.log.UserLoginLogService;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
import org.springframework.web.bind.annotation.*;
import reactor.core.publisher.Mono;
import java.util.List;
@ -30,11 +30,8 @@ import java.util.List;
@RequestMapping("api/userLoginLog")
public class UserLoginLogController {
private final UserLoginLogService userLoginLogService;
public UserLoginLogController(UserLoginLogService userLoginLogService) {
this.userLoginLogService = userLoginLogService;
}
@Resource
private UserLoginLogService userLoginLogService;
@Operation(summary = "分页查询用户登录日志", description = "分页查询用户登录日志")
@GetMapping("getUserLoginLogList/{page}/{limit}")
@ -59,8 +56,8 @@ public class UserLoginLogController {
@Operation(summary = "删除用户登录日志", description = "删除用户登录日志")
@DeleteMapping("deleteUserLoginLog")
public Mono<Result<String>> deleteUserLoginLog(@RequestBody List<Long> ids) {
public Result<Object> deleteUserLoginLog(@RequestBody List<Long> ids) {
userLoginLogService.deleteUserLoginLog(ids);
return Mono.just(Result.success(ResultCodeEnum.DELETE_SUCCESS));
return Result.success(ResultCodeEnum.DELETE_SUCCESS);
}
}

49
service/src/main/java/cn/bunny/services/controller/message/MessageController.java → auth-services/controllers/src/main/java/cn/bunny/services/controller/message/MessageController.java
View File

@ -1,24 +1,23 @@
package cn.bunny.services.controller.message;
import cn.bunny.dao.dto.system.message.MessageAddDto;
import cn.bunny.dao.dto.system.message.MessageDto;
import cn.bunny.dao.dto.system.message.MessageUpdateDto;
import cn.bunny.dao.entity.system.Message;
import cn.bunny.dao.vo.result.PageResult;
import cn.bunny.dao.vo.result.Result;
import cn.bunny.dao.vo.result.ResultCodeEnum;
import cn.bunny.dao.vo.system.message.MessageDetailVo;
import cn.bunny.dao.vo.system.message.MessageReceivedWithUserVo;
import cn.bunny.dao.vo.system.message.MessageVo;
import cn.bunny.domain.message.dto.MessageAddDto;
import cn.bunny.domain.message.dto.MessageDto;
import cn.bunny.domain.message.dto.MessageUpdateDto;
import cn.bunny.domain.message.entity.Message;
import cn.bunny.domain.message.vo.MessageDetailVo;
import cn.bunny.domain.message.vo.MessageReceivedWithUserVo;
import cn.bunny.domain.message.vo.MessageVo;
import cn.bunny.domain.vo.result.PageResult;
import cn.bunny.domain.vo.result.Result;
import cn.bunny.domain.vo.result.ResultCodeEnum;
import cn.bunny.services.service.message.MessageService;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
import jakarta.validation.Valid;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import reactor.core.publisher.Mono;
import java.util.List;
@ -35,12 +34,12 @@ import java.util.List;
@RequestMapping("api/message")
public class MessageController {
@Autowired
@Resource
private MessageService messageService;
@Operation(summary = "分页查询发送消息", description = "分页查询发送消息")
@GetMapping("getMessageList/{page}/{limit}")
public Mono<Result<PageResult<MessageVo>>> getMessageList(
public Result<PageResult<MessageVo>> getMessageList(
@Parameter(name = "page", description = "当前页", required = true)
@PathVariable("page") Integer page,
@Parameter(name = "limit", description = "每页记录数", required = true)
@ -48,41 +47,41 @@ public class MessageController {
MessageDto dto) {
Page<Message> pageParams = new Page<>(page, limit);
PageResult<MessageVo> pageResult = messageService.getMessageList(pageParams, dto);
return Mono.just(Result.success(pageResult));
return Result.success(pageResult);
}
@Operation(summary = "根据消息id查询消息详情", description = "根据消息id查询消息详情")
@GetMapping("noManage/getMessageDetailById")
public Mono<Result<MessageDetailVo>> getMessageDetailById(Long id) {
public Result<MessageDetailVo> getMessageDetailById(Long id) {
MessageDetailVo vo = messageService.getMessageDetailById(id);
return Mono.just(Result.success(vo));
return Result.success(vo);
}
@Operation(summary = "根据消息id获取接收人信息", description = "根据消息id获取接收人信息")
@GetMapping("noManage/getReceivedUserinfoByMessageId")
public Mono<Result<List<MessageReceivedWithUserVo>>> getReceivedUserinfoByMessageId(Long messageId) {
public Result<List<MessageReceivedWithUserVo>> getReceivedUserinfoByMessageId(Long messageId) {
List<MessageReceivedWithUserVo> voList = messageService.getReceivedUserinfoByMessageId(messageId);
return Mono.just(Result.success(voList));
return Result.success(voList);
}
@Operation(summary = "添加系统消息", description = "添加系统消息")
@PostMapping("addMessage")
public Mono<Result<String>> addMessage(@Valid @RequestBody MessageAddDto dto) {
public Result<String> addMessage(@Valid @RequestBody MessageAddDto dto) {
messageService.addMessage(dto);
return Mono.just(Result.success(ResultCodeEnum.ADD_SUCCESS));
return Result.success(ResultCodeEnum.ADD_SUCCESS);
}
@Operation(summary = "更新系统消息", description = "更新系统消息")
@PutMapping("updateMessage")
public Mono<Result<String>> updateMessage(@Valid @RequestBody MessageUpdateDto dto) {
public Result<String> updateMessage(@Valid @RequestBody MessageUpdateDto dto) {
messageService.updateMessage(dto);
return Mono.just(Result.success(ResultCodeEnum.UPDATE_SUCCESS));
return Result.success(ResultCodeEnum.UPDATE_SUCCESS);
}
@Operation(summary = "删除系统消息", description = "删除系统消息")
@DeleteMapping("deleteMessage")
public Mono<Result<String>> deleteMessage(@RequestBody List<Long> ids) {
public Result<String> deleteMessage(@RequestBody List<Long> ids) {
messageService.deleteMessage(ids);
return Mono.just(Result.success(ResultCodeEnum.DELETE_SUCCESS));
return Result.success(ResultCodeEnum.DELETE_SUCCESS);
}
}

47
service/src/main/java/cn/bunny/services/controller/message/MessageReceivedController.java → auth-services/controllers/src/main/java/cn/bunny/services/controller/message/MessageReceivedController.java
View File

@ -1,23 +1,22 @@
package cn.bunny.services.controller.message;
import cn.bunny.dao.dto.system.message.MessageReceivedDto;
import cn.bunny.dao.dto.system.message.MessageReceivedUpdateDto;
import cn.bunny.dao.dto.system.message.MessageUserDto;
import cn.bunny.dao.entity.system.Message;
import cn.bunny.dao.vo.result.PageResult;
import cn.bunny.dao.vo.result.Result;
import cn.bunny.dao.vo.result.ResultCodeEnum;
import cn.bunny.dao.vo.system.message.MessageReceivedWithMessageVo;
import cn.bunny.dao.vo.system.message.MessageUserVo;
import cn.bunny.domain.message.dto.MessageReceivedDto;
import cn.bunny.domain.message.dto.MessageReceivedUpdateDto;
import cn.bunny.domain.message.dto.MessageUserDto;
import cn.bunny.domain.message.entity.Message;
import cn.bunny.domain.message.vo.MessageReceivedWithMessageVo;
import cn.bunny.domain.message.vo.MessageUserVo;
import cn.bunny.domain.vo.result.PageResult;
import cn.bunny.domain.vo.result.Result;
import cn.bunny.domain.vo.result.ResultCodeEnum;
import cn.bunny.services.service.message.MessageReceivedService;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
import jakarta.validation.Valid;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import reactor.core.publisher.Mono;
import java.util.List;
@ -34,12 +33,12 @@ import java.util.List;
@RequestMapping("/api/messageReceived")
public class MessageReceivedController {
@Autowired
@Resource
private MessageReceivedService messageReceivedService;
@Operation(summary = "管理员分页查询用户消息", description = "管理员分页查询用户消息")
@GetMapping("getMessageReceivedList/{page}/{limit}")
public Mono<Result<PageResult<MessageReceivedWithMessageVo>>> getMessageReceivedList(
public Result<PageResult<MessageReceivedWithMessageVo>> getMessageReceivedList(
@Parameter(name = "page", description = "当前页", required = true)
@PathVariable("page") Integer page,
@Parameter(name = "limit", description = "每页记录数", required = true)
@ -47,26 +46,26 @@ public class MessageReceivedController {
MessageReceivedDto dto) {
Page<Message> pageParams = new Page<>(page, limit);
PageResult<MessageReceivedWithMessageVo> pageResult = messageReceivedService.getMessageReceivedList(pageParams, dto);
return Mono.just(Result.success(pageResult));
return Result.success(pageResult);
}
@Operation(summary = "管理员将用户消息标为已读", description = "管理员将用户消息标为已读")
@PutMapping("updateMarkMessageReceived")
public Mono<Result<String>> updateMarkMessageReceived(@Valid @RequestBody MessageReceivedUpdateDto dto) {
public Result<String> updateMarkMessageReceived(@Valid @RequestBody MessageReceivedUpdateDto dto) {
messageReceivedService.updateMarkMessageReceived(dto);
return Mono.just(Result.success());
return Result.success();
}
@Operation(summary = "管理删除用户消息", description = "管理删除用户消息")
@DeleteMapping("deleteMessageReceivedByIds")
public Mono<Result<String>> deleteMessageReceivedByIds(@RequestBody List<Long> ids) {
public Result<String> deleteMessageReceivedByIds(@RequestBody List<Long> ids) {
messageReceivedService.deleteMessageReceivedByIds(ids);
return Mono.just(Result.success(ResultCodeEnum.DELETE_SUCCESS));
return Result.success(ResultCodeEnum.DELETE_SUCCESS);
}
@Operation(summary = "分页查询用户消息", description = "分页查询用户消息")
@GetMapping("noManage/getUserMessageList/{page}/{limit}")
public Mono<Result<PageResult<MessageUserVo>>> getUserMessageList(
public Result<PageResult<MessageUserVo>> getUserMessageList(
@Parameter(name = "page", description = "当前页", required = true)
@PathVariable("page") Integer page,
@Parameter(name = "limit", description = "每页记录数", required = true)
@ -74,20 +73,20 @@ public class MessageReceivedController {
MessageUserDto dto) {
Page<Message> pageParams = new Page<>(page, limit);
PageResult<MessageUserVo> pageResult = messageReceivedService.getUserMessageList(pageParams, dto);
return Mono.just(Result.success(pageResult));
return Result.success(pageResult);
}
@Operation(summary = "用户将消息标为已读", description = "用户将消息标为已读")
@PutMapping("noManage/userMarkAsRead")
public Mono<Result<String>> userMarkAsRead(@Valid @RequestBody List<Long> ids) {
public Result<String> userMarkAsRead(@Valid @RequestBody List<Long> ids) {
messageReceivedService.userMarkAsRead(ids);
return Mono.just(Result.success(ResultCodeEnum.UPDATE_SUCCESS));
return Result.success(ResultCodeEnum.UPDATE_SUCCESS);
}
@Operation(summary = "用户删除消息", description = "用户删除消息")
@DeleteMapping("noManage/deleteUserMessageByIds")
public Mono<Result<String>> deleteUserMessageByIds(@RequestBody List<Long> ids) {
public Result<String> deleteUserMessageByIds(@RequestBody List<Long> ids) {
messageReceivedService.deleteUserMessageByIds(ids);
return Mono.just(Result.success(ResultCodeEnum.DELETE_SUCCESS));
return Result.success(ResultCodeEnum.DELETE_SUCCESS);
}
}

41
service/src/main/java/cn/bunny/services/controller/message/MessageTypeController.java → auth-services/controllers/src/main/java/cn/bunny/services/controller/message/MessageTypeController.java
View File

@ -1,22 +1,21 @@
package cn.bunny.services.controller.message;
import cn.bunny.dao.dto.system.message.MessageTypeAddDto;
import cn.bunny.dao.dto.system.message.MessageTypeDto;
import cn.bunny.dao.dto.system.message.MessageTypeUpdateDto;
import cn.bunny.dao.entity.system.MessageType;
import cn.bunny.dao.vo.result.PageResult;
import cn.bunny.dao.vo.result.Result;
import cn.bunny.dao.vo.result.ResultCodeEnum;
import cn.bunny.dao.vo.system.message.MessageTypeVo;
import cn.bunny.domain.message.dto.MessageTypeAddDto;
import cn.bunny.domain.message.dto.MessageTypeDto;
import cn.bunny.domain.message.dto.MessageTypeUpdateDto;
import cn.bunny.domain.message.entity.MessageType;
import cn.bunny.domain.message.vo.MessageTypeVo;
import cn.bunny.domain.vo.result.PageResult;
import cn.bunny.domain.vo.result.Result;
import cn.bunny.domain.vo.result.ResultCodeEnum;
import cn.bunny.services.service.message.MessageTypeService;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
import jakarta.validation.Valid;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import reactor.core.publisher.Mono;
import java.util.List;
@ -33,12 +32,12 @@ import java.util.List;
@RequestMapping("api/messageType")
public class MessageTypeController {
@Autowired
@Resource
private MessageTypeService messageTypeService;
@Operation(summary = "分页查询系统消息类型", description = "分页查询系统消息类型")
@GetMapping("getMessageTypeList/{page}/{limit}")
public Mono<Result<PageResult<MessageTypeVo>>> getMessageTypeList(
public Result<PageResult<MessageTypeVo>> getMessageTypeList(
@Parameter(name = "page", description = "当前页", required = true)
@PathVariable("page") Integer page,
@Parameter(name = "limit", description = "每页记录数", required = true)
@ -46,34 +45,34 @@ public class MessageTypeController {
MessageTypeDto dto) {
Page<MessageType> pageParams = new Page<>(page, limit);
PageResult<MessageTypeVo> pageResult = messageTypeService.getMessageTypeList(pageParams, dto);
return Mono.just(Result.success(pageResult));
return Result.success(pageResult);
}
@Operation(summary = "获取所有消息类型", description = "获取所有消息类型")
@GetMapping("noManage/getAllMessageTypes")
public Mono<Result<List<MessageTypeVo>>> getNoManageMessageTypes() {
public Result<List<MessageTypeVo>> getNoManageMessageTypes() {
List<MessageTypeVo> voList = messageTypeService.getNoManageMessageTypes();
return Mono.just(Result.success(voList));
return Result.success(voList);
}
@Operation(summary = "添加系统消息类型", description = "添加系统消息类型")
@PostMapping("addMessageType")
public Mono<Result<String>> addMessageType(@Valid @RequestBody MessageTypeAddDto dto) {
public Result<String> addMessageType(@Valid @RequestBody MessageTypeAddDto dto) {
messageTypeService.addMessageType(dto);
return Mono.just(Result.success(ResultCodeEnum.ADD_SUCCESS));
return Result.success(ResultCodeEnum.ADD_SUCCESS);
}
@Operation(summary = "更新系统消息类型", description = "更新系统消息类型")
@PutMapping("updateMessageType")
public Mono<Result<String>> updateMessageType(@Valid @RequestBody MessageTypeUpdateDto dto) {
public Result<String> updateMessageType(@Valid @RequestBody MessageTypeUpdateDto dto) {
messageTypeService.updateMessageType(dto);
return Mono.just(Result.success(ResultCodeEnum.UPDATE_SUCCESS));
return Result.success(ResultCodeEnum.UPDATE_SUCCESS);
}
@Operation(summary = "删除系统消息类型", description = "删除系统消息类型")
@DeleteMapping("deleteMessageType")
public Mono<Result<String>> deleteMessageType(@RequestBody List<Long> ids) {
public Result<String> deleteMessageType(@RequestBody List<Long> ids) {
messageTypeService.deleteMessageType(ids);
return Mono.just(Result.success(ResultCodeEnum.DELETE_SUCCESS));
return Result.success(ResultCodeEnum.DELETE_SUCCESS);
}
}

45
service/src/main/java/cn/bunny/services/controller/schedule/SchedulersController.java → auth-services/controllers/src/main/java/cn/bunny/services/controller/schedule/SchedulersController.java
View File

@ -1,23 +1,22 @@
package cn.bunny.services.controller.schedule;
import cn.bunny.dao.dto.quartz.SchedulersOperationDto;
import cn.bunny.dao.dto.quartz.schedule.SchedulersAddDto;
import cn.bunny.dao.dto.quartz.schedule.SchedulersDto;
import cn.bunny.dao.dto.quartz.schedule.SchedulersUpdateDto;
import cn.bunny.dao.entity.quartz.Schedulers;
import cn.bunny.dao.vo.quartz.SchedulersVo;
import cn.bunny.dao.vo.result.PageResult;
import cn.bunny.dao.vo.result.Result;
import cn.bunny.dao.vo.result.ResultCodeEnum;
import cn.bunny.domain.quartz.vo.SchedulersOperationDto;
import cn.bunny.domain.quartz.dto.SchedulersAddDto;
import cn.bunny.domain.quartz.dto.SchedulersDto;
import cn.bunny.domain.quartz.dto.SchedulersUpdateDto;
import cn.bunny.domain.quartz.entity.Schedulers;
import cn.bunny.domain.quartz.vo.SchedulersVo;
import cn.bunny.domain.vo.result.PageResult;
import cn.bunny.domain.vo.result.Result;
import cn.bunny.domain.vo.result.ResultCodeEnum;
import cn.bunny.services.service.schedule.SchedulersService;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
import jakarta.validation.Valid;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import reactor.core.publisher.Mono;
import java.util.List;
import java.util.Map;
@ -35,12 +34,12 @@ import java.util.Map;
@RequestMapping("api/schedulers")
public class SchedulersController {
@Autowired
@Resource
private SchedulersService schedulersService;
@Operation(summary = "分页查询视图", description = "分页查询视图")
@GetMapping("getSchedulersList/{page}/{limit}")
public Mono<Result<PageResult<SchedulersVo>>> getSchedulersList(
public Result<PageResult<SchedulersVo>> getSchedulersList(
@Parameter(name = "page", description = "当前页", required = true)
@PathVariable("page") Integer page,
@Parameter(name = "limit", description = "每页记录数", required = true)
@ -48,21 +47,21 @@ public class SchedulersController {
SchedulersDto dto) {
Page<Schedulers> pageParams = new Page<>(page, limit);
PageResult<SchedulersVo> pageResult = schedulersService.getSchedulersList(pageParams, dto);
return Mono.just(Result.success(pageResult));
return Result.success(pageResult);
}
@Operation(summary = "获取所有可用调度任务", description = "获取所有可用调度任务")
@GetMapping("noManage/getAllScheduleJobList")
public Mono<Result<List<Map<String, String>>>> getAllScheduleJobList() {
public Result<List<Map<String, String>>> getAllScheduleJobList() {
List<Map<String, String>> mapList = schedulersService.getAllScheduleJobList();
return Mono.just(Result.success(mapList));
return Result.success(mapList);
}
@Operation(summary = "添加任务", description = "添加任务")
@PostMapping("addSchedulers")
public Mono<Result<String>> addSchedulers(@Valid @RequestBody SchedulersAddDto dto) {
public Result<Object> addSchedulers(@Valid @RequestBody SchedulersAddDto dto) {
schedulersService.addSchedulers(dto);
return Mono.just(Result.success(ResultCodeEnum.ADD_SUCCESS));
return Result.success(ResultCodeEnum.ADD_SUCCESS);
}
@Operation(summary = "更新任务", description = "更新任务")
@ -74,23 +73,23 @@ public class SchedulersController {
@Operation(summary = "暂停任务", description = "暂停任务")
@PutMapping("/pauseSchedulers")
@PutMapping("pauseSchedulers")
public Result<String> pause(@RequestBody SchedulersOperationDto dto) {
schedulersService.pauseScheduler(dto);
return Result.success();
}
@Operation(summary = "恢复任务", description = "恢复任务")
@PutMapping("/resumeSchedulers")
@PutMapping("resumeSchedulers")
public Result<String> resume(@RequestBody SchedulersOperationDto dto) {
schedulersService.resumeScheduler(dto);
return Result.success();
}
@Operation(summary = "删除任务", description = "删除任务")
@DeleteMapping("/deleteSchedulers")
public Mono<Result<Object>> deleteSchedulers(@RequestBody SchedulersOperationDto dto) {
@DeleteMapping("deleteSchedulers")
public Result<String> deleteSchedulers(@RequestBody SchedulersOperationDto dto) {
schedulersService.deleteSchedulers(dto);
return Mono.just(Result.success(ResultCodeEnum.DELETE_SUCCESS));
return Result.success(ResultCodeEnum.DELETE_SUCCESS);
}
}

41
service/src/main/java/cn/bunny/services/controller/schedule/SchedulersGroupController.java → auth-services/controllers/src/main/java/cn/bunny/services/controller/schedule/SchedulersGroupController.java
View File

@ -1,22 +1,21 @@
package cn.bunny.services.controller.schedule;
import cn.bunny.dao.dto.quartz.group.SchedulersGroupAddDto;
import cn.bunny.dao.dto.quartz.group.SchedulersGroupDto;
import cn.bunny.dao.dto.quartz.group.SchedulersGroupUpdateDto;
import cn.bunny.dao.entity.quartz.SchedulersGroup;
import cn.bunny.dao.vo.quartz.SchedulersGroupVo;
import cn.bunny.dao.vo.result.PageResult;
import cn.bunny.dao.vo.result.Result;
import cn.bunny.dao.vo.result.ResultCodeEnum;
import cn.bunny.domain.quartz.dto.SchedulersGroupAddDto;
import cn.bunny.domain.quartz.dto.SchedulersGroupDto;
import cn.bunny.domain.quartz.dto.SchedulersGroupUpdateDto;
import cn.bunny.domain.quartz.entity.SchedulersGroup;
import cn.bunny.domain.quartz.vo.SchedulersGroupVo;
import cn.bunny.domain.vo.result.PageResult;
import cn.bunny.domain.vo.result.Result;
import cn.bunny.domain.vo.result.ResultCodeEnum;
import cn.bunny.services.service.schedule.SchedulersGroupService;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
import jakarta.validation.Valid;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import reactor.core.publisher.Mono;
import java.util.List;
@ -33,12 +32,12 @@ import java.util.List;
@RequestMapping("api/schedulersGroup")
public class SchedulersGroupController {
@Autowired
@Resource
private SchedulersGroupService schedulersGroupService;
@Operation(summary = "分页查询任务调度分组", description = "分页查询任务调度分组")
@GetMapping("getSchedulersGroupList/{page}/{limit}")
public Mono<Result<PageResult<SchedulersGroupVo>>> getSchedulersGroupList(
public Result<PageResult<SchedulersGroupVo>> getSchedulersGroupList(
@Parameter(name = "page", description = "当前页", required = true)
@PathVariable("page") Integer page,
@Parameter(name = "limit", description = "每页记录数", required = true)
@ -46,34 +45,34 @@ public class SchedulersGroupController {
SchedulersGroupDto dto) {
Page<SchedulersGroup> pageParams = new Page<>(page, limit);
PageResult<SchedulersGroupVo> pageResult = schedulersGroupService.getSchedulersGroupList(pageParams, dto);
return Mono.just(Result.success(pageResult));
return Result.success(pageResult);
}
@Operation(summary = "获取所有任务调度分组", description = "获取所有任务调度分组")
@GetMapping("getAllSchedulersGroup")
public Mono<Result<List<SchedulersGroupVo>>> getAllSchedulersGroup() {
public Result<List<SchedulersGroupVo>> getAllSchedulersGroup() {
List<SchedulersGroupVo> voList = schedulersGroupService.getAllSchedulersGroup();
return Mono.just(Result.success(voList));
return Result.success(voList);
}
@Operation(summary = "添加任务调度分组", description = "添加任务调度分组")
@PostMapping("addSchedulersGroup")
public Mono<Result<String>> addSchedulersGroup(@Valid @RequestBody SchedulersGroupAddDto dto) {
public Result<String> addSchedulersGroup(@Valid @RequestBody SchedulersGroupAddDto dto) {
schedulersGroupService.addSchedulersGroup(dto);
return Mono.just(Result.success(ResultCodeEnum.ADD_SUCCESS));
return Result.success(ResultCodeEnum.ADD_SUCCESS);
}
@Operation(summary = "更新任务调度分组", description = "更新任务调度分组")
@PutMapping("updateSchedulersGroup")
public Mono<Result<String>> updateSchedulersGroup(@Valid @RequestBody SchedulersGroupUpdateDto dto) {
public Result<String> updateSchedulersGroup(@Valid @RequestBody SchedulersGroupUpdateDto dto) {
schedulersGroupService.updateSchedulersGroup(dto);
return Mono.just(Result.success(ResultCodeEnum.UPDATE_SUCCESS));
return Result.success(ResultCodeEnum.UPDATE_SUCCESS);
}
@Operation(summary = "删除任务调度分组", description = "删除任务调度分组")
@DeleteMapping("deleteSchedulersGroup")
public Mono<Result<String>> deleteSchedulersGroup(@RequestBody List<Long> ids) {
public Result<String> deleteSchedulersGroup(@RequestBody List<Long> ids) {
schedulersGroupService.deleteSchedulersGroup(ids);
return Mono.just(Result.success(ResultCodeEnum.DELETE_SUCCESS));
return Result.success(ResultCodeEnum.DELETE_SUCCESS);
}
}

41
service/src/main/java/cn/bunny/services/controller/system/DeptController.java → auth-services/controllers/src/main/java/cn/bunny/services/controller/system/DeptController.java
View File

@ -1,22 +1,21 @@
package cn.bunny.services.controller.system;
import cn.bunny.dao.dto.system.dept.DeptAddDto;
import cn.bunny.dao.dto.system.dept.DeptDto;
import cn.bunny.dao.dto.system.dept.DeptUpdateDto;
import cn.bunny.dao.entity.system.Dept;
import cn.bunny.dao.vo.result.PageResult;
import cn.bunny.dao.vo.result.Result;
import cn.bunny.dao.vo.result.ResultCodeEnum;
import cn.bunny.dao.vo.system.DeptVo;
import cn.bunny.domain.system.dto.dept.DeptAddDto;
import cn.bunny.domain.system.dto.dept.DeptDto;
import cn.bunny.domain.system.dto.dept.DeptUpdateDto;
import cn.bunny.domain.system.entity.Dept;
import cn.bunny.domain.system.vo.DeptVo;
import cn.bunny.domain.vo.result.PageResult;
import cn.bunny.domain.vo.result.Result;
import cn.bunny.domain.vo.result.ResultCodeEnum;
import cn.bunny.services.service.system.DeptService;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
import jakarta.validation.Valid;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import reactor.core.publisher.Mono;
import java.util.List;
@ -33,12 +32,12 @@ import java.util.List;
@RequestMapping("/api/dept")
public class DeptController {
@Autowired
@Resource
private DeptService deptService;
@Operation(summary = "分页查询部门", description = "分页查询部门")
@GetMapping("getDeptList/{page}/{limit}")
public Mono<Result<PageResult<DeptVo>>> getDeptList(
public Result<PageResult<DeptVo>> getDeptList(
@Parameter(name = "page", description = "当前页", required = true)
@PathVariable("page") Integer page,
@Parameter(name = "limit", description = "每页记录数", required = true)
@ -46,34 +45,34 @@ public class DeptController {
DeptDto dto) {
Page<Dept> pageParams = new Page<>(page, limit);
PageResult<DeptVo> pageResult = deptService.getDeptList(pageParams, dto);
return Mono.just(Result.success(pageResult));
return Result.success(pageResult);
}
@Operation(summary = "获取所有部门", description = "获取所有部门")
@GetMapping("noManage/getAllDeptList")
public Mono<Result<List<DeptVo>>> getAllDeptList() {
public Result<List<DeptVo>> getAllDeptList() {
List<DeptVo> voList = deptService.getAllDeptList();
return Mono.just(Result.success(voList));
return Result.success(voList);
}
@Operation(summary = "添加部门", description = "添加部门")
@PostMapping("addDept")
public Mono<Result<String>> addDept(@Valid @RequestBody DeptAddDto dto) {
public Result<String> addDept(@Valid @RequestBody DeptAddDto dto) {
deptService.addDept(dto);
return Mono.just(Result.success(ResultCodeEnum.ADD_SUCCESS));
return Result.success(ResultCodeEnum.ADD_SUCCESS);
}
@Operation(summary = "更新部门", description = "更新部门")
@PutMapping("updateDept")
public Mono<Result<String>> updateDept(@Valid @RequestBody DeptUpdateDto dto) {
public Result<String> updateDept(@Valid @RequestBody DeptUpdateDto dto) {
deptService.updateDept(dto);
return Mono.just(Result.success(ResultCodeEnum.UPDATE_SUCCESS));
return Result.success(ResultCodeEnum.UPDATE_SUCCESS);
}
@Operation(summary = "删除部门", description = "删除部门")
@DeleteMapping("deleteDept")
public Mono<Result<String>> deleteDept(@RequestBody List<Long> ids) {
public Result<String> deleteDept(@RequestBody List<Long> ids) {
deptService.deleteDept(ids);
return Mono.just(Result.success(ResultCodeEnum.DELETE_SUCCESS));
return Result.success(ResultCodeEnum.DELETE_SUCCESS);
}
}

43
service/src/main/java/cn/bunny/services/controller/system/FilesController.java → auth-services/controllers/src/main/java/cn/bunny/services/controller/system/FilesController.java
View File

@ -1,26 +1,25 @@
package cn.bunny.services.controller.system;
import cn.bunny.dao.constant.MinioConstant;
import cn.bunny.dao.dto.system.files.FileUploadDto;
import cn.bunny.dao.dto.system.files.FilesAddDto;
import cn.bunny.dao.dto.system.files.FilesDto;
import cn.bunny.dao.dto.system.files.FilesUpdateDto;
import cn.bunny.dao.entity.system.Files;
import cn.bunny.dao.vo.result.PageResult;
import cn.bunny.dao.vo.result.Result;
import cn.bunny.dao.vo.result.ResultCodeEnum;
import cn.bunny.dao.vo.system.files.FileInfoVo;
import cn.bunny.dao.vo.system.files.FilesVo;
import cn.bunny.domain.constant.MinioConstant;
import cn.bunny.domain.files.dto.FileUploadDto;
import cn.bunny.domain.files.dto.FilesAddDto;
import cn.bunny.domain.files.dto.FilesDto;
import cn.bunny.domain.files.dto.FilesUpdateDto;
import cn.bunny.domain.files.entity.Files;
import cn.bunny.domain.files.vo.FileInfoVo;
import cn.bunny.domain.files.vo.FilesVo;
import cn.bunny.domain.vo.result.PageResult;
import cn.bunny.domain.vo.result.Result;
import cn.bunny.domain.vo.result.ResultCodeEnum;
import cn.bunny.services.service.system.FilesService;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
import jakarta.validation.Valid;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
import reactor.core.publisher.Mono;
import java.util.List;
import java.util.Map;
@ -39,12 +38,12 @@ import java.util.Set;
@RequestMapping("api/files")
public class FilesController {
@Autowired
@Resource
private FilesService filesService;
@Operation(summary = "分页查询系统文件", description = "分页查询系统文件")
@GetMapping("getFilesList/{page}/{limit}")
public Mono<Result<PageResult<FilesVo>>> getFilesList(
public Result<PageResult<FilesVo>> getFilesList(
@Parameter(name = "page", description = "当前页", required = true)
@PathVariable("page") Integer page,
@Parameter(name = "limit", description = "每页记录数", required = true)
@ -52,7 +51,7 @@ public class FilesController {
FilesDto dto) {
Page<Files> pageParams = new Page<>(page, limit);
PageResult<FilesVo> pageResult = filesService.getFilesList(pageParams, dto);
return Mono.just(Result.success(pageResult));
return Result.success(pageResult);
}
@Operation(summary = "下载文件", description = "下载文件")
@ -63,18 +62,18 @@ public class FilesController {
@Operation(summary = "获取所有文件类型", description = "获取所有文件类型")
@GetMapping("noManage/getAllMediaTypes")
public Mono<Result<Set<String>>> getAllMediaTypes() {
public Result<Set<String>> getAllMediaTypes() {
Set<String> list = filesService.getAllMediaTypes();
return Mono.just(Result.success(list));
return Result.success(list);
}
@Operation(summary = "获取所有文件存储基础路径", description = "获取所有文件存储基础路径")
@GetMapping("noManage/getAllFilesStoragePath")
public Mono<Result<List<String>>> getAllFilesStoragePath() {
public Result<List<String>> getAllFilesStoragePath() {
Map<String, String> typeMap = MinioConstant.typeMap;
List<String> list = typeMap.keySet().stream().toList();
return Mono.just(Result.success(list));
return Result.success(list);
}
@Operation(summary = "根据文件名下载文件", description = "根据文件名下载文件")
@ -101,9 +100,9 @@ public class FilesController {
@Operation(summary = "添加系统文件", description = "添加系统文件")
@PostMapping("addFiles")
public Mono<Result<String>> addFiles(@Valid FilesAddDto dto) {
public Result<Object> addFiles(@Valid FilesAddDto dto) {
filesService.addFiles(dto);
return Mono.just(Result.success(ResultCodeEnum.ADD_SUCCESS));
return Result.success(ResultCodeEnum.ADD_SUCCESS);
}
@Operation(summary = "上传文件", description = "上传文件")

43
service/src/main/java/cn/bunny/services/controller/system/PowerController.java → auth-services/controllers/src/main/java/cn/bunny/services/controller/system/PowerController.java
View File

@ -1,23 +1,22 @@
package cn.bunny.services.controller.system;
import cn.bunny.dao.dto.system.rolePower.power.PowerAddDto;
import cn.bunny.dao.dto.system.rolePower.power.PowerDto;
import cn.bunny.dao.dto.system.rolePower.power.PowerUpdateBatchByParentIdDto;
import cn.bunny.dao.dto.system.rolePower.power.PowerUpdateDto;
import cn.bunny.dao.entity.system.Power;
import cn.bunny.dao.vo.result.PageResult;
import cn.bunny.dao.vo.result.Result;
import cn.bunny.dao.vo.result.ResultCodeEnum;
import cn.bunny.dao.vo.system.rolePower.PowerVo;
import cn.bunny.domain.system.entity.Power;
import cn.bunny.domain.system.dto.power.PowerAddDto;
import cn.bunny.domain.system.dto.power.PowerDto;
import cn.bunny.domain.system.dto.power.PowerUpdateBatchByParentIdDto;
import cn.bunny.domain.system.dto.power.PowerUpdateDto;
import cn.bunny.domain.system.vo.PowerVo;
import cn.bunny.domain.vo.result.PageResult;
import cn.bunny.domain.vo.result.Result;
import cn.bunny.domain.vo.result.ResultCodeEnum;
import cn.bunny.services.service.system.PowerService;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
import jakarta.validation.Valid;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import reactor.core.publisher.Mono;
import java.util.List;
@ -34,12 +33,12 @@ import java.util.List;
@RequestMapping("api/power")
public class PowerController {
@Autowired
@Resource
private PowerService powerService;
@Operation(summary = "分页查询权限", description = "分页查询权限")
@GetMapping("getPowerList/{page}/{limit}")
public Mono<Result<PageResult<PowerVo>>> getPowerList(
public Result<PageResult<PowerVo>> getPowerList(
@Parameter(name = "page", description = "当前页", required = true)
@PathVariable("page") Integer page,
@Parameter(name = "limit", description = "每页记录数", required = true)
@ -47,14 +46,14 @@ public class PowerController {
PowerDto dto) {
Page<Power> pageParams = new Page<>(page, limit);
PageResult<PowerVo> pageResult = powerService.getPowerList(pageParams, dto);
return Mono.just(Result.success(pageResult));
return Result.success(pageResult);
}
@Operation(summary = "获取所有权限", description = "获取所有权限")
@GetMapping("getAllPowers")
public Mono<Result<List<PowerVo>>> getAllPowers() {
public Result<List<PowerVo>> getAllPowers() {
List<PowerVo> voList = powerService.getAllPowers();
return Mono.just(Result.success(voList));
return Result.success(voList);
}
@Operation(summary = "添加权限", description = "添加权限")
@ -66,23 +65,23 @@ public class PowerController {
@Operation(summary = "更新权限", description = "更新权限")
@PutMapping("updatePower")
public Mono<Result<String>> updatePower(@Valid @RequestBody PowerUpdateDto dto) {
public Result<Object> updatePower(@Valid @RequestBody PowerUpdateDto dto) {
powerService.updatePower(dto);
return Mono.just(Result.success(ResultCodeEnum.UPDATE_SUCCESS));
return Result.success(ResultCodeEnum.UPDATE_SUCCESS);
}
@Operation(summary = "批量修改权限父级", description = "批量修改权限父级")
@PutMapping("updateBatchByPowerWithParentId")
public Mono<Result<String>> updateBatchByPowerWithParentId(@RequestBody @Valid PowerUpdateBatchByParentIdDto dto) {
public Result<String> updateBatchByPowerWithParentId(@RequestBody @Valid PowerUpdateBatchByParentIdDto dto) {
powerService.updateBatchByPowerWithParentId(dto);
return Mono.just(Result.success(ResultCodeEnum.UPDATE_SUCCESS));
return Result.success(ResultCodeEnum.UPDATE_SUCCESS);
}
@Operation(summary = "删除权限", description = "删除权限")
@DeleteMapping("deletePower")
public Mono<Result<String>> deletePower(@RequestBody List<Long> ids) {
public Result<Object> deletePower(@RequestBody List<Long> ids) {
powerService.deletePower(ids);
return Mono.just(Result.success(ResultCodeEnum.DELETE_SUCCESS));
return Result.success(ResultCodeEnum.DELETE_SUCCESS);
}
}

41
service/src/main/java/cn/bunny/services/controller/system/RoleController.java → auth-services/controllers/src/main/java/cn/bunny/services/controller/system/RoleController.java
View File

@ -1,22 +1,21 @@
package cn.bunny.services.controller.system;
import cn.bunny.dao.dto.system.rolePower.role.RoleAddDto;
import cn.bunny.dao.dto.system.rolePower.role.RoleDto;
import cn.bunny.dao.dto.system.rolePower.role.RoleUpdateDto;
import cn.bunny.dao.entity.system.Role;
import cn.bunny.dao.vo.result.PageResult;
import cn.bunny.dao.vo.result.Result;
import cn.bunny.dao.vo.result.ResultCodeEnum;
import cn.bunny.dao.vo.system.rolePower.RoleVo;
import cn.bunny.domain.system.entity.Role;
import cn.bunny.domain.system.dto.role.RoleAddDto;
import cn.bunny.domain.system.dto.role.RoleDto;
import cn.bunny.domain.system.dto.role.RoleUpdateDto;
import cn.bunny.domain.system.vo.RoleVo;
import cn.bunny.domain.vo.result.PageResult;
import cn.bunny.domain.vo.result.Result;
import cn.bunny.domain.vo.result.ResultCodeEnum;
import cn.bunny.services.service.system.RoleService;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
import jakarta.validation.Valid;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import reactor.core.publisher.Mono;
import java.util.List;
@ -33,12 +32,12 @@ import java.util.List;
@RequestMapping("api/role")
public class RoleController {
@Autowired
@Resource
private RoleService roleService;
@Operation(summary = "分页查询角色", description = "分页查询角色")
@GetMapping("getRoleList/{page}/{limit}")
public Mono<Result<PageResult<RoleVo>>> getRoleList(
public Result<PageResult<RoleVo>> getRoleList(
@Parameter(name = "page", description = "当前页", required = true)
@PathVariable("page") Integer page,
@Parameter(name = "limit", description = "每页记录数", required = true)
@ -46,34 +45,34 @@ public class RoleController {
RoleDto dto) {
Page<Role> pageParams = new Page<>(page, limit);
PageResult<RoleVo> pageResult = roleService.getRoleList(pageParams, dto);
return Mono.just(Result.success(pageResult));
return Result.success(pageResult);
}
@Operation(summary = "获取所有角色", description = "获取所有角色")
@GetMapping("noManage/getAllRoles")
public Mono<Result<List<RoleVo>>> getAllRoles() {
public Result<List<RoleVo>> getAllRoles() {
List<RoleVo> roleVoList = roleService.getAllRoles();
return Mono.just(Result.success(roleVoList));
return Result.success(roleVoList);
}
@Operation(summary = "添加角色", description = "添加角色")
@PostMapping("addRole")
public Mono<Result<String>> addRole(@Valid @RequestBody RoleAddDto dto) {
public Result<Object> addRole(@Valid @RequestBody RoleAddDto dto) {
roleService.addRole(dto);
return Mono.just(Result.success(ResultCodeEnum.ADD_SUCCESS));
return Result.success(ResultCodeEnum.ADD_SUCCESS);
}
@Operation(summary = "更新角色", description = "更新角色")
@PutMapping("updateRole")
public Mono<Result<String>> updateRole(@Valid @RequestBody RoleUpdateDto dto) {
public Result<Object> updateRole(@Valid @RequestBody RoleUpdateDto dto) {
roleService.updateRole(dto);
return Mono.just(Result.success(ResultCodeEnum.UPDATE_SUCCESS));
return Result.success(ResultCodeEnum.UPDATE_SUCCESS);
}
@Operation(summary = "删除角色", description = "删除角色")
@DeleteMapping("deleteRole")
public Mono<Result<String>> deleteRole(@RequestBody List<Long> ids) {
public Result<Object> deleteRole(@RequestBody List<Long> ids) {
roleService.deleteRole(ids);
return Mono.just(Result.success(ResultCodeEnum.DELETE_SUCCESS));
return Result.success(ResultCodeEnum.DELETE_SUCCESS);
}
}

13
service/src/main/java/cn/bunny/services/controller/system/RolePowerController.java → auth-services/controllers/src/main/java/cn/bunny/services/controller/system/RolePowerController.java
View File

@ -1,14 +1,13 @@
package cn.bunny.services.controller.system;
import cn.bunny.dao.dto.system.rolePower.AssignPowersToRoleDto;
import cn.bunny.dao.vo.result.Result;
import cn.bunny.domain.system.dto.AssignPowersToRoleDto;
import cn.bunny.domain.vo.result.Result;
import cn.bunny.services.service.system.RolePowerService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
import jakarta.validation.Valid;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import reactor.core.publisher.Mono;
import java.util.List;
@ -25,14 +24,14 @@ import java.util.List;
@RequestMapping("api/rolePower")
public class RolePowerController {
@Autowired
@Resource
private RolePowerService rolePowerService;
@Operation(summary = "根据角色id获取权限内容", description = "根据角色id获取权限内容")
@GetMapping("noManage/getPowerListByRoleId")
public Mono<Result<List<String>>> getPowerListByRoleId(Long id) {
public Result<List<String>> getPowerListByRoleId(Long id) {
List<String> voList = rolePowerService.getPowerListByRoleId(id);
return Mono.just(Result.success(voList));
return Result.success(voList);
}
@Operation(summary = "为角色分配权限", description = "为角色分配权限")

53
service/src/main/java/cn/bunny/services/controller/system/RouterController.java → auth-services/controllers/src/main/java/cn/bunny/services/controller/system/RouterController.java
View File

@ -1,24 +1,23 @@
package cn.bunny.services.controller.system;
import cn.bunny.dao.dto.system.router.RouterAddDto;
import cn.bunny.dao.dto.system.router.RouterManageDto;
import cn.bunny.dao.dto.system.router.RouterUpdateByIdWithRankDto;
import cn.bunny.dao.dto.system.router.RouterUpdateDto;
import cn.bunny.dao.entity.system.Router;
import cn.bunny.dao.vo.result.PageResult;
import cn.bunny.dao.vo.result.Result;
import cn.bunny.dao.vo.result.ResultCodeEnum;
import cn.bunny.dao.vo.system.router.RouterManageVo;
import cn.bunny.dao.vo.system.router.UserRouterVo;
import cn.bunny.domain.system.entity.Router;
import cn.bunny.domain.system.dto.router.RouterAddDto;
import cn.bunny.domain.system.dto.router.RouterManageDto;
import cn.bunny.domain.system.dto.router.RouterUpdateByIdWithRankDto;
import cn.bunny.domain.system.dto.router.RouterUpdateDto;
import cn.bunny.domain.system.vo.router.RouterManageVo;
import cn.bunny.domain.system.vo.router.UserRouterVo;
import cn.bunny.domain.vo.result.PageResult;
import cn.bunny.domain.vo.result.Result;
import cn.bunny.domain.vo.result.ResultCodeEnum;
import cn.bunny.services.service.system.RouterService;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
import jakarta.validation.Valid;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import reactor.core.publisher.Mono;
import java.util.List;
@ -35,19 +34,19 @@ import java.util.List;
@RequestMapping("api/router")
public class RouterController {
@Autowired
@Resource
private RouterService routerService;
@Operation(summary = "获取用户菜单", description = "获取用户菜单")
@GetMapping("noManage/getRouterAsync")
public Mono<Result<List<UserRouterVo>>> getRouterAsync() {
public Result<List<UserRouterVo>> getRouterAsync() {
List<UserRouterVo> voList = routerService.getRouterAsync();
return Mono.just(Result.success(voList));
return Result.success(voList);
}
@Operation(summary = "分页管理菜单列", description = "分页管理菜单列")
@GetMapping("getMenusList/{page}/{limit}")
public Mono<Result<PageResult<RouterManageVo>>> getMenusByPage(
public Result<PageResult<RouterManageVo>> getMenusByPage(
@Parameter(name = "page", description = "当前页", required = true)
@PathVariable("page") Integer page,
@Parameter(name = "limit", description = "每页记录数", required = true)
@ -56,42 +55,42 @@ public class RouterController {
Page<Router> pageParams = new Page<>(page, limit);
PageResult<RouterManageVo> voPageResult = routerService.getMenusByPage(pageParams, dto);
return Mono.just(Result.success(voPageResult));
return Result.success(voPageResult);
}
@Operation(summary = "分页查询管理菜单列表", description = "分页查询管理菜单列表")
@GetMapping("getMenusList")
public Mono<Result<List<RouterManageVo>>> getMenusList(RouterManageDto dto) {
public Result<List<RouterManageVo>> getMenusList(RouterManageDto dto) {
List<RouterManageVo> voPageResult = routerService.getMenusList(dto);
return Mono.just(Result.success(voPageResult));
return Result.success(voPageResult);
}
@Operation(summary = "添加路由菜单", description = "添加路由菜单")
@PostMapping("addMenu")
public Mono<Result<String>> addMenu(@Valid @RequestBody RouterAddDto dto) {
public Result<Object> addMenu(@Valid @RequestBody RouterAddDto dto) {
routerService.addMenu(dto);
return Mono.just(Result.success(ResultCodeEnum.ADD_SUCCESS));
return Result.success(ResultCodeEnum.ADD_SUCCESS);
}
@Operation(summary = "更新路由菜单", description = "更新路由菜单")
@PutMapping("updateMenu")
public Mono<Result<String>> updateMenu(@Valid @RequestBody RouterUpdateDto dto) {
public Result<Object> updateMenu(@Valid @RequestBody RouterUpdateDto dto) {
routerService.updateMenu(dto);
return Mono.just(Result.success(ResultCodeEnum.UPDATE_SUCCESS));
return Result.success(ResultCodeEnum.UPDATE_SUCCESS);
}
@Operation(summary = "快速更新菜单排序", description = "快速更新菜单排序")
@PutMapping("updateMenuByIdWithRank")
public Mono<Result<String>> updateMenuByIdWithRank(@Valid @RequestBody RouterUpdateByIdWithRankDto dto) {
public Result<Object> updateMenuByIdWithRank(@Valid @RequestBody RouterUpdateByIdWithRankDto dto) {
routerService.updateMenuByIdWithRank(dto);
return Mono.just(Result.success(ResultCodeEnum.UPDATE_SUCCESS));
return Result.success(ResultCodeEnum.UPDATE_SUCCESS);
}
@Operation(summary = "删除路由菜单", description = "删除路由菜单")
@DeleteMapping("deletedMenuByIds")
public Mono<Result<String>> deletedMenuByIds(@RequestBody List<Long> ids) {
public Result<Object> deletedMenuByIds(@RequestBody List<Long> ids) {
routerService.deletedMenuByIds(ids);
return Mono.just(Result.success(ResultCodeEnum.DELETE_SUCCESS));
return Result.success(ResultCodeEnum.DELETE_SUCCESS);
}
}

21
service/src/main/java/cn/bunny/services/controller/system/RouterRoleController.java → auth-services/controllers/src/main/java/cn/bunny/services/controller/system/RouterRoleController.java
View File

@ -1,13 +1,12 @@
package cn.bunny.services.controller.system;
import cn.bunny.dao.dto.system.router.AssignRolesToRoutersDto;
import cn.bunny.dao.vo.result.Result;
import cn.bunny.domain.system.dto.router.AssignRolesToRoutersDto;
import cn.bunny.domain.vo.result.Result;
import cn.bunny.services.service.system.RouterRoleService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import reactor.core.publisher.Mono;
import java.util.List;
@ -29,29 +28,29 @@ public class RouterRoleController {
@Operation(summary = "根据菜单id获取所有角色", description = "根据菜单id获取所有角色")
@GetMapping("getRoleListByRouterId")
public Mono<Result<List<String>>> getRoleListByRouterId(Long routerId) {
public Result<List<String>> getRoleListByRouterId(Long routerId) {
List<String> roleListByRouterId = routerRoleService.getRoleListByRouterId(routerId);
return Mono.just(Result.success(roleListByRouterId));
return Result.success(roleListByRouterId);
}
@Operation(summary = "为菜单分配角色", description = "为菜单分配角色")
@PostMapping("assignRolesToRouter")
public Mono<Result<String>> assignRolesToRouter(@RequestBody AssignRolesToRoutersDto dto) {
public Result<String> assignRolesToRouter(@RequestBody AssignRolesToRoutersDto dto) {
routerRoleService.assignRolesToRouter(dto);
return Mono.just(Result.success());
return Result.success();
}
@Operation(summary = "批量为菜单添加角色", description = "批量为菜单添加角色")
@PostMapping("assignAddBatchRolesToRouter")
public Mono<Result<String>> assignAddBatchRolesToRouter(@RequestBody AssignRolesToRoutersDto dto) {
public Result<String> assignAddBatchRolesToRouter(@RequestBody AssignRolesToRoutersDto dto) {
routerRoleService.assignAddBatchRolesToRouter(dto);
return Mono.just(Result.success());
return Result.success();
}
@Operation(summary = "清除选中菜单所有角色", description = "清除选中菜单所有角色")
@DeleteMapping("clearAllRolesSelect")
public Mono<Result<String>> clearAllRolesSelect(@RequestBody List<Long> routerIds) {
public Result<String> clearAllRolesSelect(@RequestBody List<Long> routerIds) {
routerRoleService.clearAllRolesSelect(routerIds);
return Mono.just(Result.success());
return Result.success();
}
}

37
service/src/main/java/cn/bunny/services/controller/system/UserController.java → auth-services/controllers/src/main/java/cn/bunny/services/controller/system/UserController.java
View File

@ -1,20 +1,19 @@
package cn.bunny.services.controller.system;
import cn.bunny.dao.dto.system.user.*;
import cn.bunny.dao.entity.system.AdminUser;
import cn.bunny.dao.vo.result.PageResult;
import cn.bunny.dao.vo.result.Result;
import cn.bunny.dao.vo.result.ResultCodeEnum;
import cn.bunny.dao.vo.system.user.*;
import cn.bunny.domain.system.dto.user.*;
import cn.bunny.domain.system.entity.AdminUser;
import cn.bunny.domain.system.vo.user.*;
import cn.bunny.domain.vo.result.PageResult;
import cn.bunny.domain.vo.result.Result;
import cn.bunny.domain.vo.result.ResultCodeEnum;
import cn.bunny.services.service.system.UserService;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
import jakarta.validation.Valid;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import reactor.core.publisher.Mono;
import java.util.List;
@ -24,12 +23,12 @@ import java.util.List;
@RequestMapping("/api/user")
public class UserController {
@Autowired
@Resource
private UserService userService;
@Operation(summary = "分页查询用户信息", description = "分页查询用户信息")
@GetMapping("getAdminUserList/{page}/{limit}")
public Mono<Result<PageResult<AdminUserVo>>> getAdminUserList(
public Result<PageResult<AdminUserVo>> getAdminUserList(
@Parameter(name = "page", description = "当前页", required = true)
@PathVariable("page") Integer page,
@Parameter(name = "limit", description = "每页记录数", required = true)
@ -37,28 +36,28 @@ public class UserController {
AdminUserDto dto) {
Page<AdminUser> pageParams = new Page<>(page, limit);
PageResult<AdminUserVo> pageResult = userService.getAdminUserList(pageParams, dto);
return Mono.just(Result.success(pageResult));
return Result.success(pageResult);
}
@Operation(summary = "获取本地登录用户信息", description = "获取用户信息从Redis中获取")
@GetMapping("noManage/getUserinfo")
public Mono<Result<LoginVo>> getUserinfo() {
public Result<LoginVo> getUserinfo() {
LoginVo vo = userService.getUserinfo();
return Mono.just(Result.success(vo));
return Result.success(vo);
}
@Operation(summary = "获取用户信息", description = "根据用户ID获取用户信息，不包含Redis中的信息")
@GetMapping("getUserinfoById")
public Mono<Result<UserVo>> getUserinfoById(Long id) {
public Result<UserVo> getUserinfoById(Long id) {
UserVo vo = userService.getUserinfoById(id);
return Mono.just(Result.success(vo));
return Result.success(vo);
}
@Operation(summary = "多条件查询用户", description = "多条件查询用户")
@GetMapping("noManage/queryUser")
public Mono<Result<List<SearchUserinfoVo>>> queryUser(String keyword) {
public Result<List<SearchUserinfoVo>> queryUser(String keyword) {
List<SearchUserinfoVo> voList = userService.queryUser(keyword);
return Mono.just(Result.success(voList));
return Result.success(voList);
}
@Operation(summary = "更新用户信息", description = "更新用户信息，需要更新Redis中的内容")
@ -140,8 +139,8 @@ public class UserController {
@Operation(summary = "删除用户", description = "删除用户")
@DeleteMapping("deleteAdminUser")
public Mono<Result<String>> deleteAdminUser(@RequestBody List<Long> ids) {
public Result<Object> deleteAdminUser(@RequestBody List<Long> ids) {
userService.deleteAdminUser(ids);
return Mono.just(Result.success(ResultCodeEnum.DELETE_SUCCESS));
return Result.success(ResultCodeEnum.DELETE_SUCCESS);
}
}

17
service/src/main/java/cn/bunny/services/controller/system/UserRoleController.java → auth-services/controllers/src/main/java/cn/bunny/services/controller/system/UserRoleController.java
View File

@ -1,13 +1,12 @@
package cn.bunny.services.controller.system;
import cn.bunny.dao.dto.system.user.AssignRolesToUsersDto;
import cn.bunny.dao.vo.result.Result;
import cn.bunny.domain.system.dto.user.AssignRolesToUsersDto;
import cn.bunny.domain.vo.result.Result;
import cn.bunny.services.service.system.UserRoleService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.beans.factory.annotation.Autowired;
import jakarta.annotation.Resource;
import org.springframework.web.bind.annotation.*;
import reactor.core.publisher.Mono;
import java.util.List;
@ -24,20 +23,20 @@ import java.util.List;
@RequestMapping("api/userRole")
public class UserRoleController {
@Autowired
@Resource
private UserRoleService userRoleService;
@Operation(summary = "根据用户id获取角色列", description = "根据用户id获取角色列")
@GetMapping("getRoleListByUserId")
public Mono<Result<List<String>>> getRoleListByUserId(Long userId) {
public Result<List<String>> getRoleListByUserId(Long userId) {
List<String> roleVoList = userRoleService.getRoleListByUserId(userId);
return Mono.just(Result.success(roleVoList));
return Result.success(roleVoList);
}
@Operation(summary = "为用户分配角色", description = "为用户分配角色")
@PostMapping("assignRolesToUsers")
public Mono<Result<String>> assignRolesToUsers(@RequestBody AssignRolesToUsersDto dto) {
public Result<String> assignRolesToUsers(@RequestBody AssignRolesToUsersDto dto) {
userRoleService.assignRolesToUsers(dto);
return Mono.just(Result.success());
return Result.success();
}
}

20
auth-services/domain/domain-common/pom.xml Normal file
View File

@ -0,0 +1,20 @@
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>cn.bunny</groupId>
<artifactId>domain</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
<artifactId>domain-common</artifactId>
<packaging>jar</packaging>
<name>domain-common</name>
<url>https://maven.apache.org</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
</project>

2
dao/src/main/java/cn/bunny/dao/constant/LocalDateTimeConstant.java → auth-services/domain/domain-common/src/main/java/cn/bunny/domain/constant/LocalDateTimeConstant.java
View File

@ -1,4 +1,4 @@
package cn.bunny.dao.constant;
package cn.bunny.domain.constant;
import lombok.Data;

2
dao/src/main/java/cn/bunny/dao/constant/MinioConstant.java → auth-services/domain/domain-common/src/main/java/cn/bunny/domain/constant/MinioConstant.java
View File

@ -1,4 +1,4 @@
package cn.bunny.dao.constant;
package cn.bunny.domain.constant;
import lombok.Data;

2
dao/src/main/java/cn/bunny/dao/constant/RedisUserConstant.java → auth-services/domain/domain-common/src/main/java/cn/bunny/domain/constant/RedisUserConstant.java
View File

@ -1,4 +1,4 @@
package cn.bunny.dao.constant;
package cn.bunny.domain.constant;
import lombok.Data;

17
auth-services/domain/domain-common/src/main/java/cn/bunny/domain/constant/SecurityConfigConstant.java Normal file
View File

@ -0,0 +1,17 @@
package cn.bunny.domain.constant;
import java.util.ArrayList;
import java.util.List;
public class SecurityConfigConstant {
public static String[] REQUEST_MATCHERS_PERMIT_ALL = {
"/", "/**.html", "/error", "/media.ico", "/favicon.ico",
"/webjars/**", "/v3/api-docs/**", "/swagger-ui/**",
"/*/*/noAuth/**", "/*/noAuth/**", "/noAuth/**",
"/*/i18n/getI18n"
};
public static List<String> PERMIT_ALL_LIST = new ArrayList<>() {{
add("admin");
}};
}

2
dao/src/main/java/cn/bunny/dao/constant/UserConstant.java → auth-services/domain/domain-common/src/main/java/cn/bunny/domain/constant/UserConstant.java
View File

@ -1,4 +1,4 @@
package cn.bunny.dao.constant;
package cn.bunny.domain.constant;
import lombok.Data;

2
dao/src/main/java/cn/bunny/dao/entity/BaseEntity.java → auth-services/domain/domain-common/src/main/java/cn/bunny/domain/entity/BaseEntity.java
View File

@ -1,4 +1,4 @@
package cn.bunny.dao.entity;
package cn.bunny.domain.entity;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;

2
dao/src/main/java/cn/bunny/dao/entity/BaseUserEntity.java → auth-services/domain/domain-common/src/main/java/cn/bunny/domain/entity/BaseUserEntity.java
View File

@ -1,4 +1,4 @@
package cn.bunny.dao.entity;
package cn.bunny.domain.entity;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;

2
dao/src/main/java/cn/bunny/dao/enums/EmailTemplateEnums.java → auth-services/domain/domain-common/src/main/java/cn/bunny/domain/enums/EmailTemplateEnums.java
View File

@ -1,4 +1,4 @@
package cn.bunny.dao.enums;
package cn.bunny.domain.enums;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter;

2
dao/src/main/java/cn/bunny/dao/enums/JobEnums.java → auth-services/domain/domain-common/src/main/java/cn/bunny/domain/enums/JobEnums.java
View File

@ -1,4 +1,4 @@
package cn.bunny.dao.enums;
package cn.bunny.domain.enums;
import lombok.Getter;

2
dao/src/main/java/cn/bunny/dao/enums/LoginEnums.java → auth-services/domain/domain-common/src/main/java/cn/bunny/domain/enums/LoginEnums.java
View File

@ -1,4 +1,4 @@
package cn.bunny.dao.enums;
package cn.bunny.domain.enums;
import lombok.Getter;

2
dao/src/main/java/cn/bunny/dao/model/email/EmailSend.java → auth-services/domain/domain-common/src/main/java/cn/bunny/domain/model/email/EmailSend.java
View File

@ -1,4 +1,4 @@
package cn.bunny.dao.model.email;
package cn.bunny.domain.model.email;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;

2
dao/src/main/java/cn/bunny/dao/model/email/EmailSendInit.java → auth-services/domain/domain-common/src/main/java/cn/bunny/domain/model/email/EmailSendInit.java
View File

@ -1,4 +1,4 @@
package cn.bunny.dao.model.email;
package cn.bunny.domain.model.email;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;

2
dao/src/main/java/cn/bunny/dao/model/file/MinioFilePath.java → auth-services/domain/domain-common/src/main/java/cn/bunny/domain/model/file/MinioFilePath.java
View File

@ -1,4 +1,4 @@
package cn.bunny.dao.model.file;
package cn.bunny.domain.model.file;
import lombok.AllArgsConstructor;
import lombok.Builder;

2
dao/src/main/java/cn/bunny/dao/model/quartz/ScheduleExecuteLogJson.java → auth-services/domain/domain-common/src/main/java/cn/bunny/domain/model/quartz/ScheduleExecuteLogJson.java
View File

@ -1,4 +1,4 @@
package cn.bunny.dao.model.quartz;
package cn.bunny.domain.model.quartz;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;

2
dao/src/main/java/cn/bunny/dao/views/ViewRolePower.java → auth-services/domain/domain-common/src/main/java/cn/bunny/domain/views/ViewRolePower.java
View File

@ -1,4 +1,4 @@
package cn.bunny.dao.views;
package cn.bunny.domain.views;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.v3.oas.annotations.media.Schema;

2
dao/src/main/java/cn/bunny/dao/views/ViewRouterRole.java → auth-services/domain/domain-common/src/main/java/cn/bunny/domain/views/ViewRouterRole.java
View File

@ -1,4 +1,4 @@
package cn.bunny.dao.views;
package cn.bunny.domain.views;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.v3.oas.annotations.media.Schema;

4
dao/src/main/java/cn/bunny/dao/views/ViewUserDept.java → auth-services/domain/domain-common/src/main/java/cn/bunny/domain/views/ViewUserDept.java
View File

@ -1,6 +1,6 @@
package cn.bunny.dao.views;
package cn.bunny.domain.views;
import cn.bunny.dao.entity.BaseUserEntity;
import cn.bunny.domain.entity.BaseUserEntity;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;

2
dao/src/main/java/cn/bunny/dao/vo/BaseUserVo.java → auth-services/domain/domain-common/src/main/java/cn/bunny/domain/vo/BaseUserVo.java
View File

@ -1,4 +1,4 @@
package cn.bunny.dao.vo;
package cn.bunny.domain.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;

2
dao/src/main/java/cn/bunny/dao/vo/BaseVo.java → auth-services/domain/domain-common/src/main/java/cn/bunny/domain/vo/BaseVo.java
View File

@ -1,4 +1,4 @@
package cn.bunny.dao.vo;
package cn.bunny.domain.vo;
import com.alibaba.fastjson2.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonFormat;

2
dao/src/main/java/cn/bunny/dao/vo/result/PageResult.java → auth-services/domain/domain-common/src/main/java/cn/bunny/domain/vo/result/PageResult.java
View File

@ -1,4 +1,4 @@
package cn.bunny.dao.vo.result;
package cn.bunny.domain.vo.result;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;

2
dao/src/main/java/cn/bunny/dao/vo/result/Result.java → auth-services/domain/domain-common/src/main/java/cn/bunny/domain/vo/result/Result.java
View File

@ -1,4 +1,4 @@
package cn.bunny.dao.vo.result;
package cn.bunny.domain.vo.result;
import lombok.AllArgsConstructor;
import lombok.Data;

2
dao/src/main/java/cn/bunny/dao/vo/result/ResultCodeEnum.java → auth-services/domain/domain-common/src/main/java/cn/bunny/domain/vo/result/ResultCodeEnum.java
View File

@ -1,4 +1,4 @@
package cn.bunny.dao.vo.result;
package cn.bunny.domain.vo.result;
import lombok.Getter;

27
auth-services/domain/domain-system/pom.xml Normal file
View File

@ -0,0 +1,27 @@
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>cn.bunny</groupId>
<artifactId>domain</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
<artifactId>domain-system</artifactId>
<packaging>jar</packaging>
<name>domain-system</name>
<url>https://maven.apache.org</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<dependencies>
<dependency>
<groupId>cn.bunny</groupId>
<artifactId>domain-common</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
</dependencies>
</project>

2
dao/src/main/java/cn/bunny/dao/dto/system/configuration/WebConfigurationDto.java → auth-services/domain/domain-system/src/main/java/cn/bunny/domain/configuration/dto/WebConfigurationDto.java
View File

@ -1,4 +1,4 @@
package cn.bunny.dao.dto.system.configuration;
package cn.bunny.domain.configuration.dto;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.Min;

2
dao/src/main/java/cn/bunny/dao/entity/configuration/WebConfiguration.java → auth-services/domain/domain-system/src/main/java/cn/bunny/domain/configuration/entity/WebConfiguration.java
View File

@ -1,4 +1,4 @@
package cn.bunny.dao.entity.configuration;
package cn.bunny.domain.configuration.entity;
import com.alibaba.fastjson2.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonProperty;

2
dao/src/main/java/cn/bunny/dao/vo/system/configuration/WebConfigurationVo.java → auth-services/domain/domain-system/src/main/java/cn/bunny/domain/configuration/vo/WebConfigurationVo.java
View File

@ -1,4 +1,4 @@
package cn.bunny.dao.vo.system.configuration;
package cn.bunny.domain.configuration.vo;
import com.alibaba.fastjson2.annotation.JSONField;
import io.swagger.v3.oas.annotations.media.Schema;

2
dao/src/main/java/cn/bunny/dao/dto/system/email/template/EmailTemplateAddDto.java → auth-services/domain/domain-system/src/main/java/cn/bunny/domain/email/dto/EmailTemplateAddDto.java
View File

@ -1,4 +1,4 @@
package cn.bunny.dao.dto.system.email.template;
package cn.bunny.domain.email.dto;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;

2
dao/src/main/java/cn/bunny/dao/dto/system/email/template/EmailTemplateDto.java → auth-services/domain/domain-system/src/main/java/cn/bunny/domain/email/dto/EmailTemplateDto.java
View File

@ -1,4 +1,4 @@
package cn.bunny.dao.dto.system.email.template;
package cn.bunny.domain.email.dto;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;

2
dao/src/main/java/cn/bunny/dao/dto/system/email/template/EmailTemplateUpdateDto.java → auth-services/domain/domain-system/src/main/java/cn/bunny/domain/email/dto/EmailTemplateUpdateDto.java
View File

@ -1,4 +1,4 @@
package cn.bunny.dao.dto.system.email.template;
package cn.bunny.domain.email.dto;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;

2
dao/src/main/java/cn/bunny/dao/dto/system/email/user/EmailUserUpdateStatusDto.java → auth-services/domain/domain-system/src/main/java/cn/bunny/domain/email/dto/EmailUserUpdateStatusDto.java
View File

@ -1,4 +1,4 @@
package cn.bunny.dao.dto.system.email.user;
package cn.bunny.domain.email.dto;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotNull;

2
dao/src/main/java/cn/bunny/dao/dto/system/email/user/EmailUsersAddDto.java → auth-services/domain/domain-system/src/main/java/cn/bunny/domain/email/dto/EmailUsersAddDto.java
View File

@ -1,4 +1,4 @@
package cn.bunny.dao.dto.system.email.user;
package cn.bunny.domain.email.dto;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;

2
dao/src/main/java/cn/bunny/dao/dto/system/email/user/EmailUsersDto.java → auth-services/domain/domain-system/src/main/java/cn/bunny/domain/email/dto/EmailUsersDto.java
View File

@ -1,4 +1,4 @@
package cn.bunny.dao.dto.system.email.user;
package cn.bunny.domain.email.dto;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;

2
dao/src/main/java/cn/bunny/dao/dto/system/email/user/EmailUsersUpdateDto.java → auth-services/domain/domain-system/src/main/java/cn/bunny/domain/email/dto/EmailUsersUpdateDto.java
View File

@ -1,4 +1,4 @@
package cn.bunny.dao.dto.system.email.user;
package cn.bunny.domain.email.dto;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;

Some files were not shown because too many files have changed in this diff Show More