mirror of
https://gitee.com/huangge1199_admin/vue-pro.git
synced 2024-11-23 07:41:53 +08:00
!314 fix: vue3 TODO 升级springboot 2.7.6
Merge pull request !314 from xingyu/feature/vue3
This commit is contained in:
commit
80d0f12b92
22
README.md
22
README.md
@ -188,34 +188,34 @@ ps:核心功能已经实现,正在对接微信小程序中...
|
|||||||
|
|
||||||
| 框架 | 说明 | 版本 | 学习指南 |
|
| 框架 | 说明 | 版本 | 学习指南 |
|
||||||
|---------------------------------------------------------------------------------------------|-----------------------|-------------|----------------------------------------------------------------|
|
|---------------------------------------------------------------------------------------------|-----------------------|-------------|----------------------------------------------------------------|
|
||||||
| [Spring Boot](https://spring.io/projects/spring-boot) | 应用开发框架 | 2.6.13 | [文档](https://github.com/YunaiV/SpringBoot-Labs) |
|
| [Spring Boot](https://spring.io/projects/spring-boot) | 应用开发框架 | 2.7.6 | [文档](https://github.com/YunaiV/SpringBoot-Labs) |
|
||||||
| [MySQL](https://www.mysql.com/cn/) | 数据库服务器 | 5.7 / 8.0+ | |
|
| [MySQL](https://www.mysql.com/cn/) | 数据库服务器 | 5.7 / 8.0+ | |
|
||||||
| [Druid](https://github.com/alibaba/druid) | JDBC 连接池、监控组件 | 1.2.15 | [文档](http://www.iocoder.cn/Spring-Boot/datasource-pool/?yudao) |
|
| [Druid](https://github.com/alibaba/druid) | JDBC 连接池、监控组件 | 1.2.15 | [文档](http://www.iocoder.cn/Spring-Boot/datasource-pool/?yudao) |
|
||||||
| [MyBatis Plus](https://mp.baomidou.com/) | MyBatis 增强工具包 | 3.5.2 | [文档](http://www.iocoder.cn/Spring-Boot/MyBatis/?yudao) |
|
| [MyBatis Plus](https://mp.baomidou.com/) | MyBatis 增强工具包 | 3.5.2 | [文档](http://www.iocoder.cn/Spring-Boot/MyBatis/?yudao) |
|
||||||
| [Dynamic Datasource](https://dynamic-datasource.com/) | 动态数据源 | 3.5.2 | [文档](http://www.iocoder.cn/Spring-Boot/datasource-pool/?yudao) |
|
| [Dynamic Datasource](https://dynamic-datasource.com/) | 动态数据源 | 3.5.2 | [文档](http://www.iocoder.cn/Spring-Boot/datasource-pool/?yudao) |
|
||||||
| [Redis](https://redis.io/) | key-value 数据库 | 5.0 / 6.0 | |
|
| [Redis](https://redis.io/) | key-value 数据库 | 5.0 / 6.0 | |
|
||||||
| [Redisson](https://github.com/redisson/redisson) | Redis 客户端 | 3.18.0 | [文档](http://www.iocoder.cn/Spring-Boot/Redis/?yudao) |
|
| [Redisson](https://github.com/redisson/redisson) | Redis 客户端 | 3.18.0 | [文档](http://www.iocoder.cn/Spring-Boot/Redis/?yudao) |
|
||||||
| [Spring MVC](https://github.com/spring-projects/spring-framework/tree/master/spring-webmvc) | MVC 框架 | 5.3.23 | [文档](http://www.iocoder.cn/SpringMVC/MVC/?yudao) |
|
| [Spring MVC](https://github.com/spring-projects/spring-framework/tree/master/spring-webmvc) | MVC 框架 | 5.3.24 | [文档](http://www.iocoder.cn/SpringMVC/MVC/?yudao) |
|
||||||
| [Spring Security](https://github.com/spring-projects/spring-security) | Spring 安全框架 | 5.6.8 | [文档](http://www.iocoder.cn/Spring-Boot/Spring-Security/?yudao) |
|
| [Spring Security](https://github.com/spring-projects/spring-security) | Spring 安全框架 | 5.7.5 | [文档](http://www.iocoder.cn/Spring-Boot/Spring-Security/?yudao) |
|
||||||
| [Hibernate Validator](https://github.com/hibernate/hibernate-validator) | 参数校验组件 | 6.2.3 | [文档](http://www.iocoder.cn/Spring-Boot/Validation/?yudao) |
|
| [Hibernate Validator](https://github.com/hibernate/hibernate-validator) | 参数校验组件 | 6.2.5 | [文档](http://www.iocoder.cn/Spring-Boot/Validation/?yudao) |
|
||||||
| [Flowable](https://github.com/flowable/flowable-engine) | 工作流引擎 | 6.7.2 | [文档](https://doc.iocoder.cn/bpm/) |
|
| [Flowable](https://github.com/flowable/flowable-engine) | 工作流引擎 | 6.7.2 | [文档](https://doc.iocoder.cn/bpm/) |
|
||||||
| [Quartz](https://github.com/quartz-scheduler) | 任务调度组件 | 2.3.2 | [文档](http://www.iocoder.cn/Spring-Boot/Job/?yudao) |
|
| [Quartz](https://github.com/quartz-scheduler) | 任务调度组件 | 2.3.2 | [文档](http://www.iocoder.cn/Spring-Boot/Job/?yudao) |
|
||||||
| [Knife4j](https://gitee.com/xiaoym/knife4j) | Swagger 增强 UI 实现 | 3.0.3 | [文档](http://www.iocoder.cn/Spring-Boot/Swagger/?yudao) |
|
| [Knife4j](https://gitee.com/xiaoym/knife4j) | Swagger 增强 UI 实现 | 3.0.3 | [文档](http://www.iocoder.cn/Spring-Boot/Swagger/?yudao) |
|
||||||
| [Resilience4j](https://github.com/resilience4j/resilience4j) | 服务保障组件 | 1.7.1 | [文档](http://www.iocoder.cn/Spring-Boot/Resilience4j/?yudao) |
|
| [Resilience4j](https://github.com/resilience4j/resilience4j) | 服务保障组件 | 1.7.1 | [文档](http://www.iocoder.cn/Spring-Boot/Resilience4j/?yudao) |
|
||||||
| [SkyWalking](https://skywalking.apache.org/) | 分布式应用追踪系统 | 8.5.0 | [文档](http://www.iocoder.cn/Spring-Boot/SkyWalking/?yudao) |
|
| [SkyWalking](https://skywalking.apache.org/) | 分布式应用追踪系统 | 8.12.0 | [文档](http://www.iocoder.cn/Spring-Boot/SkyWalking/?yudao) |
|
||||||
| [Spring Boot Admin](https://github.com/codecentric/spring-boot-admin) | Spring Boot 监控平台 | 2.6.9 | [文档](http://www.iocoder.cn/Spring-Boot/Admin/?yudao) |
|
| [Spring Boot Admin](https://github.com/codecentric/spring-boot-admin) | Spring Boot 监控平台 | 2.7.7 | [文档](http://www.iocoder.cn/Spring-Boot/Admin/?yudao) |
|
||||||
| [Jackson](https://github.com/FasterXML/jackson) | JSON 工具库 | 2.13.3 | |
|
| [Jackson](https://github.com/FasterXML/jackson) | JSON 工具库 | 2.13.3 | |
|
||||||
| [MapStruct](https://mapstruct.org/) | Java Bean 转换 | 1.5.3.Final | [文档](http://www.iocoder.cn/Spring-Boot/MapStruct/?yudao) |
|
| [MapStruct](https://mapstruct.org/) | Java Bean 转换 | 1.5.3.Final | [文档](http://www.iocoder.cn/Spring-Boot/MapStruct/?yudao) |
|
||||||
| [Lombok](https://projectlombok.org/) | 消除冗长的 Java 代码 | 1.18.24 | [文档](http://www.iocoder.cn/Spring-Boot/Lombok/?yudao) |
|
| [Lombok](https://projectlombok.org/) | 消除冗长的 Java 代码 | 1.18.24 | [文档](http://www.iocoder.cn/Spring-Boot/Lombok/?yudao) |
|
||||||
| [JUnit](https://junit.org/junit5/) | Java 单元测试框架 | 5.8.2 | - |
|
| [JUnit](https://junit.org/junit5/) | Java 单元测试框架 | 5.8.2 | - |
|
||||||
| [Mockito](https://github.com/mockito/mockito) | Java Mock 框架 | 4.8.0 | - |
|
| [Mockito](https://github.com/mockito/mockito) | Java Mock 框架 | 4.8.2 | - |
|
||||||
|
|
||||||
### [管理后台 Vue2 前端](./yudao-ui-admin)
|
### [管理后台 Vue2 前端](./yudao-ui-admin)
|
||||||
|
|
||||||
| 框架 | 说明 | 版本 |
|
| 框架 | 说明 | 版本 |
|
||||||
|------------------------------------------------------------------------------|---------------|-------|
|
|------------------------------------------------------------------------------|---------------|--------|
|
||||||
| [Vue](https://cn.vuejs.org/index.html) | JavaScript 框架 | 2.7.0 |
|
| [Vue](https://cn.vuejs.org/index.html) | JavaScript 框架 | 2.7.14 |
|
||||||
| [Vue Element Admin](https://panjiachen.github.io/vue-element-admin-site/zh/) | 后台前端解决方案 | - |
|
| [Vue Element Admin](https://panjiachen.github.io/vue-element-admin-site/zh/) | 后台前端解决方案 | - |
|
||||||
|
|
||||||
### [管理后台 Vue3 前端](./yudao-ui-admin-vue3)
|
### [管理后台 Vue3 前端](./yudao-ui-admin-vue3)
|
||||||
|
|
||||||
|
@ -16,7 +16,7 @@
|
|||||||
<properties>
|
<properties>
|
||||||
<revision>1.6.4-snapshot</revision>
|
<revision>1.6.4-snapshot</revision>
|
||||||
<!-- 统一依赖管理 -->
|
<!-- 统一依赖管理 -->
|
||||||
<spring.boot.version>2.6.13</spring.boot.version>
|
<spring.boot.version>2.7.6</spring.boot.version>
|
||||||
<!-- Web 相关 -->
|
<!-- Web 相关 -->
|
||||||
<knife4j.version>3.0.3</knife4j.version>
|
<knife4j.version>3.0.3</knife4j.version>
|
||||||
<swagger-annotations.version>1.6.8</swagger-annotations.version>
|
<swagger-annotations.version>1.6.8</swagger-annotations.version>
|
||||||
@ -32,7 +32,7 @@
|
|||||||
<resilience4j.version>1.7.1</resilience4j.version>
|
<resilience4j.version>1.7.1</resilience4j.version>
|
||||||
<!-- 监控相关 -->
|
<!-- 监控相关 -->
|
||||||
<skywalking.version>8.12.0</skywalking.version>
|
<skywalking.version>8.12.0</skywalking.version>
|
||||||
<spring-boot-admin.version>2.6.9</spring-boot-admin.version>
|
<spring-boot-admin.version>2.7.7</spring-boot-admin.version>
|
||||||
<opentracing.version>0.33.0</opentracing.version>
|
<opentracing.version>0.33.0</opentracing.version>
|
||||||
<!-- Test 测试相关 -->
|
<!-- Test 测试相关 -->
|
||||||
<podam.version>7.2.9.RELEASE</podam.version>
|
<podam.version>7.2.9.RELEASE</podam.version>
|
||||||
@ -57,12 +57,14 @@
|
|||||||
<aj-captcha.version>1.3.0</aj-captcha.version>
|
<aj-captcha.version>1.3.0</aj-captcha.version>
|
||||||
<netty-all.version>4.1.82.Final</netty-all.version>
|
<netty-all.version>4.1.82.Final</netty-all.version>
|
||||||
<!-- 三方云服务相关 -->
|
<!-- 三方云服务相关 -->
|
||||||
<minio.version>8.2.2</minio.version>
|
<okio.version>3.0.0</okio.version>
|
||||||
|
<okhttp3.version>4.10.0</okhttp3.version>
|
||||||
|
<minio.version>8.4.6</minio.version>
|
||||||
<aliyun-java-sdk-core.version>4.6.2</aliyun-java-sdk-core.version>
|
<aliyun-java-sdk-core.version>4.6.2</aliyun-java-sdk-core.version>
|
||||||
<aliyun-java-sdk-dysmsapi.version>2.2.1</aliyun-java-sdk-dysmsapi.version>
|
<aliyun-java-sdk-dysmsapi.version>2.2.1</aliyun-java-sdk-dysmsapi.version>
|
||||||
<tencentcloud-sdk-java.version>3.1.561</tencentcloud-sdk-java.version>
|
<tencentcloud-sdk-java.version>3.1.635</tencentcloud-sdk-java.version>
|
||||||
<justauth.version>1.4.0</justauth.version>
|
<justauth.version>1.4.0</justauth.version>
|
||||||
<jimureport.version>1.5.3</jimureport.version>
|
<jimureport.version>1.5.4</jimureport.version>
|
||||||
<xercesImpl.version>2.12.2</xercesImpl.version>
|
<xercesImpl.version>2.12.2</xercesImpl.version>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
@ -509,6 +511,16 @@
|
|||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- 三方云服务相关 -->
|
<!-- 三方云服务相关 -->
|
||||||
|
<dependency>
|
||||||
|
<groupId>com.squareup.okio</groupId>
|
||||||
|
<artifactId>okio</artifactId>
|
||||||
|
<version>${okio.version}</version>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>com.squareup.okhttp3</groupId>
|
||||||
|
<artifactId>okhttp</artifactId>
|
||||||
|
<version>${okhttp3.version}</version>
|
||||||
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.iocoder.boot</groupId>
|
||||||
<artifactId>yudao-spring-boot-starter-file</artifactId>
|
<artifactId>yudao-spring-boot-starter-file</artifactId>
|
||||||
@ -543,7 +555,7 @@
|
|||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.tencentcloudapi</groupId>
|
<groupId>com.tencentcloudapi</groupId>
|
||||||
<artifactId>tencentcloud-sdk-java</artifactId>
|
<artifactId>tencentcloud-sdk-java-sms</artifactId>
|
||||||
<version>${tencentcloud-sdk-java.version}</version>
|
<version>${tencentcloud-sdk-java.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<!-- SMS SDK end -->
|
<!-- SMS SDK end -->
|
||||||
|
@ -21,7 +21,7 @@
|
|||||||
<maven.compiler.target>8</maven.compiler.target>
|
<maven.compiler.target>8</maven.compiler.target>
|
||||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||||
<!-- 统一依赖管理 -->
|
<!-- 统一依赖管理 -->
|
||||||
<spring.boot.version>2.6.13</spring.boot.version>
|
<spring.boot.version>2.7.6</spring.boot.version>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
<dependencyManagement>
|
<dependencyManagement>
|
||||||
|
@ -21,7 +21,7 @@
|
|||||||
<maven.compiler.target>8</maven.compiler.target>
|
<maven.compiler.target>8</maven.compiler.target>
|
||||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||||
<!-- 统一依赖管理 -->
|
<!-- 统一依赖管理 -->
|
||||||
<spring.boot.version>2.6.13</spring.boot.version>
|
<spring.boot.version>2.7.6</spring.boot.version>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
<dependencyManagement>
|
<dependencyManagement>
|
||||||
|
@ -1,15 +1,15 @@
|
|||||||
package cn.iocoder.yudao.framework.banner.config;
|
package cn.iocoder.yudao.framework.banner.config;
|
||||||
|
|
||||||
import cn.iocoder.yudao.framework.banner.core.BannerApplicationRunner;
|
import cn.iocoder.yudao.framework.banner.core.BannerApplicationRunner;
|
||||||
|
import org.springframework.boot.autoconfigure.AutoConfiguration;
|
||||||
import org.springframework.context.annotation.Bean;
|
import org.springframework.context.annotation.Bean;
|
||||||
import org.springframework.context.annotation.Configuration;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Banner 的自动配置类
|
* Banner 的自动配置类
|
||||||
*
|
*
|
||||||
* @author 芋道源码
|
* @author 芋道源码
|
||||||
*/
|
*/
|
||||||
@Configuration(proxyBeanMethods = false)
|
@AutoConfiguration
|
||||||
public class YudaoBannerAutoConfiguration {
|
public class YudaoBannerAutoConfiguration {
|
||||||
|
|
||||||
@Bean
|
@Bean
|
||||||
|
@ -1,2 +0,0 @@
|
|||||||
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
|
|
||||||
cn.iocoder.yudao.framework.banner.config.YudaoBannerAutoConfiguration
|
|
@ -0,0 +1 @@
|
|||||||
|
cn.iocoder.yudao.framework.banner.config.YudaoBannerAutoConfiguration
|
@ -7,8 +7,8 @@ import cn.iocoder.yudao.framework.datapermission.core.rule.DataPermissionRuleFac
|
|||||||
import cn.iocoder.yudao.framework.datapermission.core.rule.DataPermissionRuleFactoryImpl;
|
import cn.iocoder.yudao.framework.datapermission.core.rule.DataPermissionRuleFactoryImpl;
|
||||||
import cn.iocoder.yudao.framework.mybatis.core.util.MyBatisUtils;
|
import cn.iocoder.yudao.framework.mybatis.core.util.MyBatisUtils;
|
||||||
import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
|
import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
|
||||||
|
import org.springframework.boot.autoconfigure.AutoConfiguration;
|
||||||
import org.springframework.context.annotation.Bean;
|
import org.springframework.context.annotation.Bean;
|
||||||
import org.springframework.context.annotation.Configuration;
|
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
@ -17,7 +17,7 @@ import java.util.List;
|
|||||||
*
|
*
|
||||||
* @author 芋道源码
|
* @author 芋道源码
|
||||||
*/
|
*/
|
||||||
@Configuration(proxyBeanMethods = false)
|
@AutoConfiguration
|
||||||
public class YudaoDataPermissionAutoConfiguration {
|
public class YudaoDataPermissionAutoConfiguration {
|
||||||
|
|
||||||
@Bean
|
@Bean
|
||||||
|
@ -4,10 +4,10 @@ import cn.iocoder.yudao.framework.datapermission.core.rule.dept.DeptDataPermissi
|
|||||||
import cn.iocoder.yudao.framework.datapermission.core.rule.dept.DeptDataPermissionRuleCustomizer;
|
import cn.iocoder.yudao.framework.datapermission.core.rule.dept.DeptDataPermissionRuleCustomizer;
|
||||||
import cn.iocoder.yudao.framework.security.core.LoginUser;
|
import cn.iocoder.yudao.framework.security.core.LoginUser;
|
||||||
import cn.iocoder.yudao.module.system.api.permission.PermissionApi;
|
import cn.iocoder.yudao.module.system.api.permission.PermissionApi;
|
||||||
|
import org.springframework.boot.autoconfigure.AutoConfiguration;
|
||||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
|
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
|
||||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
|
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
|
||||||
import org.springframework.context.annotation.Bean;
|
import org.springframework.context.annotation.Bean;
|
||||||
import org.springframework.context.annotation.Configuration;
|
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
@ -16,7 +16,7 @@ import java.util.List;
|
|||||||
*
|
*
|
||||||
* @author 芋道源码
|
* @author 芋道源码
|
||||||
*/
|
*/
|
||||||
@Configuration(proxyBeanMethods = false)
|
@AutoConfiguration
|
||||||
@ConditionalOnClass(LoginUser.class)
|
@ConditionalOnClass(LoginUser.class)
|
||||||
@ConditionalOnBean(value = {PermissionApi.class, DeptDataPermissionRuleCustomizer.class})
|
@ConditionalOnBean(value = {PermissionApi.class, DeptDataPermissionRuleCustomizer.class})
|
||||||
public class YudaoDeptDataPermissionAutoConfiguration {
|
public class YudaoDeptDataPermissionAutoConfiguration {
|
||||||
|
@ -1,3 +0,0 @@
|
|||||||
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
|
|
||||||
cn.iocoder.yudao.framework.datapermission.config.YudaoDataPermissionAutoConfiguration,\
|
|
||||||
cn.iocoder.yudao.framework.datapermission.config.YudaoDeptDataPermissionAutoConfiguration
|
|
@ -0,0 +1,2 @@
|
|||||||
|
cn.iocoder.yudao.framework.datapermission.config.YudaoDataPermissionAutoConfiguration
|
||||||
|
cn.iocoder.yudao.framework.datapermission.config.YudaoDeptDataPermissionAutoConfiguration
|
@ -2,10 +2,10 @@ package cn.iocoder.yudao.framework.dict.config;
|
|||||||
|
|
||||||
import cn.iocoder.yudao.framework.dict.core.util.DictFrameworkUtils;
|
import cn.iocoder.yudao.framework.dict.core.util.DictFrameworkUtils;
|
||||||
import cn.iocoder.yudao.module.system.api.dict.DictDataApi;
|
import cn.iocoder.yudao.module.system.api.dict.DictDataApi;
|
||||||
|
import org.springframework.boot.autoconfigure.AutoConfiguration;
|
||||||
import org.springframework.context.annotation.Bean;
|
import org.springframework.context.annotation.Bean;
|
||||||
import org.springframework.context.annotation.Configuration;
|
|
||||||
|
|
||||||
@Configuration(proxyBeanMethods = false)
|
@AutoConfiguration
|
||||||
public class YudaoDictAutoConfiguration {
|
public class YudaoDictAutoConfiguration {
|
||||||
|
|
||||||
@Bean
|
@Bean
|
||||||
|
@ -1,2 +0,0 @@
|
|||||||
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
|
|
||||||
cn.iocoder.yudao.framework.dict.config.YudaoDictAutoConfiguration
|
|
@ -0,0 +1 @@
|
|||||||
|
cn.iocoder.yudao.framework.dict.config.YudaoDictAutoConfiguration
|
@ -6,10 +6,10 @@ import cn.iocoder.yudao.framework.errorcode.core.loader.ErrorCodeLoader;
|
|||||||
import cn.iocoder.yudao.framework.errorcode.core.loader.ErrorCodeLoaderImpl;
|
import cn.iocoder.yudao.framework.errorcode.core.loader.ErrorCodeLoaderImpl;
|
||||||
import cn.iocoder.yudao.module.system.api.errorcode.ErrorCodeApi;
|
import cn.iocoder.yudao.module.system.api.errorcode.ErrorCodeApi;
|
||||||
import org.springframework.beans.factory.annotation.Value;
|
import org.springframework.beans.factory.annotation.Value;
|
||||||
|
import org.springframework.boot.autoconfigure.AutoConfiguration;
|
||||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
|
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
|
||||||
import org.springframework.boot.context.properties.EnableConfigurationProperties;
|
import org.springframework.boot.context.properties.EnableConfigurationProperties;
|
||||||
import org.springframework.context.annotation.Bean;
|
import org.springframework.context.annotation.Bean;
|
||||||
import org.springframework.context.annotation.Configuration;
|
|
||||||
import org.springframework.scheduling.annotation.EnableScheduling;
|
import org.springframework.scheduling.annotation.EnableScheduling;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -17,7 +17,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
|
|||||||
*
|
*
|
||||||
* @author 芋道源码
|
* @author 芋道源码
|
||||||
*/
|
*/
|
||||||
@Configuration(proxyBeanMethods = false)
|
@AutoConfiguration
|
||||||
@ConditionalOnProperty(prefix = "yudao.error-code", value = "enable", matchIfMissing = true) // 允许使用 yudao.error-code.enable=false 禁用访问日志
|
@ConditionalOnProperty(prefix = "yudao.error-code", value = "enable", matchIfMissing = true) // 允许使用 yudao.error-code.enable=false 禁用访问日志
|
||||||
@EnableConfigurationProperties(ErrorCodeProperties.class)
|
@EnableConfigurationProperties(ErrorCodeProperties.class)
|
||||||
@EnableScheduling // 开启调度任务的功能,因为 ErrorCodeRemoteLoader 通过定时刷新错误码
|
@EnableScheduling // 开启调度任务的功能,因为 ErrorCodeRemoteLoader 通过定时刷新错误码
|
||||||
|
@ -1,2 +0,0 @@
|
|||||||
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
|
|
||||||
cn.iocoder.yudao.framework.errorcode.config.YudaoErrorCodeConfiguration
|
|
@ -0,0 +1 @@
|
|||||||
|
cn.iocoder.yudao.framework.errorcode.config.YudaoErrorCodeConfiguration
|
@ -4,10 +4,10 @@ import cn.iocoder.yudao.framework.operatelog.core.aop.OperateLogAspect;
|
|||||||
import cn.iocoder.yudao.framework.operatelog.core.service.OperateLogFrameworkService;
|
import cn.iocoder.yudao.framework.operatelog.core.service.OperateLogFrameworkService;
|
||||||
import cn.iocoder.yudao.framework.operatelog.core.service.OperateLogFrameworkServiceImpl;
|
import cn.iocoder.yudao.framework.operatelog.core.service.OperateLogFrameworkServiceImpl;
|
||||||
import cn.iocoder.yudao.module.system.api.logger.OperateLogApi;
|
import cn.iocoder.yudao.module.system.api.logger.OperateLogApi;
|
||||||
|
import org.springframework.boot.autoconfigure.AutoConfiguration;
|
||||||
import org.springframework.context.annotation.Bean;
|
import org.springframework.context.annotation.Bean;
|
||||||
import org.springframework.context.annotation.Configuration;
|
|
||||||
|
|
||||||
@Configuration(proxyBeanMethods = false)
|
@AutoConfiguration
|
||||||
public class YudaoOperateLogAutoConfiguration {
|
public class YudaoOperateLogAutoConfiguration {
|
||||||
|
|
||||||
@Bean
|
@Bean
|
||||||
|
@ -1,2 +0,0 @@
|
|||||||
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
|
|
||||||
cn.iocoder.yudao.framework.operatelog.config.YudaoOperateLogAutoConfiguration
|
|
@ -0,0 +1 @@
|
|||||||
|
cn.iocoder.yudao.framework.operatelog.config.YudaoOperateLogAutoConfiguration
|
@ -2,16 +2,16 @@ package cn.iocoder.yudao.framework.pay.config;
|
|||||||
|
|
||||||
import cn.iocoder.yudao.framework.pay.core.client.PayClientFactory;
|
import cn.iocoder.yudao.framework.pay.core.client.PayClientFactory;
|
||||||
import cn.iocoder.yudao.framework.pay.core.client.impl.PayClientFactoryImpl;
|
import cn.iocoder.yudao.framework.pay.core.client.impl.PayClientFactoryImpl;
|
||||||
|
import org.springframework.boot.autoconfigure.AutoConfiguration;
|
||||||
import org.springframework.boot.context.properties.EnableConfigurationProperties;
|
import org.springframework.boot.context.properties.EnableConfigurationProperties;
|
||||||
import org.springframework.context.annotation.Bean;
|
import org.springframework.context.annotation.Bean;
|
||||||
import org.springframework.context.annotation.Configuration;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 支付配置类
|
* 支付配置类
|
||||||
*
|
*
|
||||||
* @author 芋道源码
|
* @author 芋道源码
|
||||||
*/
|
*/
|
||||||
@Configuration(proxyBeanMethods = false)
|
@AutoConfiguration
|
||||||
@EnableConfigurationProperties(PayProperties.class)
|
@EnableConfigurationProperties(PayProperties.class)
|
||||||
public class YudaoPayAutoConfiguration {
|
public class YudaoPayAutoConfiguration {
|
||||||
|
|
||||||
|
@ -1,2 +0,0 @@
|
|||||||
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
|
|
||||||
cn.iocoder.yudao.framework.pay.config.YudaoPayAutoConfiguration
|
|
@ -0,0 +1 @@
|
|||||||
|
cn.iocoder.yudao.framework.pay.config.YudaoPayAutoConfiguration
|
@ -74,7 +74,7 @@
|
|||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.tencentcloudapi</groupId>
|
<groupId>com.tencentcloudapi</groupId>
|
||||||
<artifactId>tencentcloud-sdk-java</artifactId>
|
<artifactId>tencentcloud-sdk-java-sms</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
<!-- SMS SDK end -->
|
<!-- SMS SDK end -->
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
@ -2,15 +2,15 @@ package cn.iocoder.yudao.framework.sms.config;
|
|||||||
|
|
||||||
import cn.iocoder.yudao.framework.sms.core.client.SmsClientFactory;
|
import cn.iocoder.yudao.framework.sms.core.client.SmsClientFactory;
|
||||||
import cn.iocoder.yudao.framework.sms.core.client.impl.SmsClientFactoryImpl;
|
import cn.iocoder.yudao.framework.sms.core.client.impl.SmsClientFactoryImpl;
|
||||||
|
import org.springframework.boot.autoconfigure.AutoConfiguration;
|
||||||
import org.springframework.context.annotation.Bean;
|
import org.springframework.context.annotation.Bean;
|
||||||
import org.springframework.context.annotation.Configuration;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 短信配置类
|
* 短信配置类
|
||||||
*
|
*
|
||||||
* @author 芋道源码
|
* @author 芋道源码
|
||||||
*/
|
*/
|
||||||
@Configuration(proxyBeanMethods = false)
|
@AutoConfiguration
|
||||||
public class YudaoSmsAutoConfiguration {
|
public class YudaoSmsAutoConfiguration {
|
||||||
|
|
||||||
@Bean
|
@Bean
|
||||||
|
@ -1,2 +0,0 @@
|
|||||||
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
|
|
||||||
cn.iocoder.yudao.framework.sms.config.YudaoSmsAutoConfiguration
|
|
@ -0,0 +1 @@
|
|||||||
|
cn.iocoder.yudao.framework.sms.config.YudaoSmsAutoConfiguration
|
@ -6,10 +6,10 @@ import com.xkcoding.http.support.hutool.HutoolImpl;
|
|||||||
import com.xkcoding.justauth.autoconfigure.JustAuthProperties;
|
import com.xkcoding.justauth.autoconfigure.JustAuthProperties;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import me.zhyd.oauth.cache.AuthStateCache;
|
import me.zhyd.oauth.cache.AuthStateCache;
|
||||||
|
import org.springframework.boot.autoconfigure.AutoConfiguration;
|
||||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
|
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
|
||||||
import org.springframework.boot.context.properties.EnableConfigurationProperties;
|
import org.springframework.boot.context.properties.EnableConfigurationProperties;
|
||||||
import org.springframework.context.annotation.Bean;
|
import org.springframework.context.annotation.Bean;
|
||||||
import org.springframework.context.annotation.Configuration;
|
|
||||||
import org.springframework.context.annotation.Primary;
|
import org.springframework.context.annotation.Primary;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -19,7 +19,7 @@ import org.springframework.context.annotation.Primary;
|
|||||||
* @date 2021-10-30
|
* @date 2021-10-30
|
||||||
*/
|
*/
|
||||||
@Slf4j
|
@Slf4j
|
||||||
@Configuration(proxyBeanMethods = false)
|
@AutoConfiguration
|
||||||
@EnableConfigurationProperties(JustAuthProperties.class)
|
@EnableConfigurationProperties(JustAuthProperties.class)
|
||||||
public class YudaoSocialAutoConfiguration {
|
public class YudaoSocialAutoConfiguration {
|
||||||
|
|
||||||
|
@ -1,2 +0,0 @@
|
|||||||
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
|
|
||||||
cn.iocoder.yudao.framework.social.config.YudaoSocialAutoConfiguration
|
|
@ -0,0 +1 @@
|
|||||||
|
cn.iocoder.yudao.framework.social.config.YudaoSocialAutoConfiguration
|
@ -21,11 +21,11 @@ import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
|
|||||||
import com.baomidou.mybatisplus.extension.plugins.inner.TenantLineInnerInterceptor;
|
import com.baomidou.mybatisplus.extension.plugins.inner.TenantLineInnerInterceptor;
|
||||||
import org.springframework.beans.BeansException;
|
import org.springframework.beans.BeansException;
|
||||||
import org.springframework.beans.factory.config.BeanPostProcessor;
|
import org.springframework.beans.factory.config.BeanPostProcessor;
|
||||||
|
import org.springframework.boot.autoconfigure.AutoConfiguration;
|
||||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
|
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
|
||||||
import org.springframework.boot.context.properties.EnableConfigurationProperties;
|
import org.springframework.boot.context.properties.EnableConfigurationProperties;
|
||||||
import org.springframework.boot.web.servlet.FilterRegistrationBean;
|
import org.springframework.boot.web.servlet.FilterRegistrationBean;
|
||||||
import org.springframework.context.annotation.Bean;
|
import org.springframework.context.annotation.Bean;
|
||||||
import org.springframework.context.annotation.Configuration;
|
|
||||||
import org.springframework.context.annotation.Primary;
|
import org.springframework.context.annotation.Primary;
|
||||||
import org.springframework.data.redis.cache.RedisCacheConfiguration;
|
import org.springframework.data.redis.cache.RedisCacheConfiguration;
|
||||||
import org.springframework.data.redis.cache.RedisCacheManager;
|
import org.springframework.data.redis.cache.RedisCacheManager;
|
||||||
@ -35,7 +35,7 @@ import org.springframework.data.redis.core.RedisTemplate;
|
|||||||
|
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
|
|
||||||
@Configuration(proxyBeanMethods = false)
|
@AutoConfiguration
|
||||||
@ConditionalOnProperty(prefix = "yudao.tenant", value = "enable", matchIfMissing = true) // 允许使用 yudao.tenant.enable=false 禁用多租户
|
@ConditionalOnProperty(prefix = "yudao.tenant", value = "enable", matchIfMissing = true) // 允许使用 yudao.tenant.enable=false 禁用多租户
|
||||||
@EnableConfigurationProperties(TenantProperties.class)
|
@EnableConfigurationProperties(TenantProperties.class)
|
||||||
public class YudaoTenantAutoConfiguration {
|
public class YudaoTenantAutoConfiguration {
|
||||||
|
@ -1,2 +0,0 @@
|
|||||||
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
|
|
||||||
cn.iocoder.yudao.framework.tenant.config.YudaoTenantAutoConfiguration
|
|
@ -0,0 +1 @@
|
|||||||
|
cn.iocoder.yudao.framework.tenant.config.YudaoTenantAutoConfiguration
|
@ -4,11 +4,11 @@ import cn.hutool.core.util.ClassUtil;
|
|||||||
import cn.iocoder.yudao.framework.captcha.core.enums.CaptchaRedisKeyConstants;
|
import cn.iocoder.yudao.framework.captcha.core.enums.CaptchaRedisKeyConstants;
|
||||||
import cn.iocoder.yudao.framework.captcha.core.service.RedisCaptchaServiceImpl;
|
import cn.iocoder.yudao.framework.captcha.core.service.RedisCaptchaServiceImpl;
|
||||||
import com.anji.captcha.service.CaptchaCacheService;
|
import com.anji.captcha.service.CaptchaCacheService;
|
||||||
|
import org.springframework.boot.autoconfigure.AutoConfiguration;
|
||||||
import org.springframework.context.annotation.Bean;
|
import org.springframework.context.annotation.Bean;
|
||||||
import org.springframework.context.annotation.Configuration;
|
|
||||||
import org.springframework.data.redis.core.StringRedisTemplate;
|
import org.springframework.data.redis.core.StringRedisTemplate;
|
||||||
|
|
||||||
@Configuration(proxyBeanMethods = false)
|
@AutoConfiguration
|
||||||
public class YudaoCaptchaConfiguration {
|
public class YudaoCaptchaConfiguration {
|
||||||
|
|
||||||
static {
|
static {
|
||||||
|
@ -1,2 +0,0 @@
|
|||||||
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
|
|
||||||
cn.iocoder.yudao.framework.captcha.config.YudaoCaptchaConfiguration
|
|
@ -0,0 +1 @@
|
|||||||
|
cn.iocoder.yudao.framework.captcha.config.YudaoCaptchaConfiguration
|
@ -46,6 +46,7 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.fasterxml.jackson.core</groupId>
|
<groupId>com.fasterxml.jackson.core</groupId>
|
||||||
<artifactId>jackson-databind</artifactId>
|
<artifactId>jackson-databind</artifactId>
|
||||||
|
<version>2.13.2.2</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.fasterxml.jackson.core</groupId>
|
<groupId>com.fasterxml.jackson.core</groupId>
|
||||||
|
@ -2,15 +2,15 @@ package cn.iocoder.yudao.framework.file.config;
|
|||||||
|
|
||||||
import cn.iocoder.yudao.framework.file.core.client.FileClientFactory;
|
import cn.iocoder.yudao.framework.file.core.client.FileClientFactory;
|
||||||
import cn.iocoder.yudao.framework.file.core.client.FileClientFactoryImpl;
|
import cn.iocoder.yudao.framework.file.core.client.FileClientFactoryImpl;
|
||||||
|
import org.springframework.boot.autoconfigure.AutoConfiguration;
|
||||||
import org.springframework.context.annotation.Bean;
|
import org.springframework.context.annotation.Bean;
|
||||||
import org.springframework.context.annotation.Configuration;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 文件配置类
|
* 文件配置类
|
||||||
*
|
*
|
||||||
* @author 芋道源码
|
* @author 芋道源码
|
||||||
*/
|
*/
|
||||||
@Configuration(proxyBeanMethods = false)
|
@AutoConfiguration
|
||||||
public class YudaoFileAutoConfiguration {
|
public class YudaoFileAutoConfiguration {
|
||||||
|
|
||||||
@Bean
|
@Bean
|
||||||
|
@ -1,2 +0,0 @@
|
|||||||
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
|
|
||||||
cn.iocoder.yudao.framework.file.config.YudaoFileAutoConfiguration
|
|
@ -0,0 +1 @@
|
|||||||
|
cn.iocoder.yudao.framework.file.config.YudaoFileAutoConfiguration
|
@ -2,13 +2,13 @@ package cn.iocoder.yudao.framework.flowable.config;
|
|||||||
|
|
||||||
import cn.iocoder.yudao.framework.common.enums.WebFilterOrderEnum;
|
import cn.iocoder.yudao.framework.common.enums.WebFilterOrderEnum;
|
||||||
import cn.iocoder.yudao.framework.flowable.core.web.FlowableWebFilter;
|
import cn.iocoder.yudao.framework.flowable.core.web.FlowableWebFilter;
|
||||||
|
import org.springframework.boot.autoconfigure.AutoConfiguration;
|
||||||
import org.springframework.boot.web.servlet.FilterRegistrationBean;
|
import org.springframework.boot.web.servlet.FilterRegistrationBean;
|
||||||
import org.springframework.context.annotation.Bean;
|
import org.springframework.context.annotation.Bean;
|
||||||
import org.springframework.context.annotation.Configuration;
|
|
||||||
import org.springframework.core.task.AsyncListenableTaskExecutor;
|
import org.springframework.core.task.AsyncListenableTaskExecutor;
|
||||||
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
|
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
|
||||||
|
|
||||||
@Configuration(proxyBeanMethods = false)
|
@AutoConfiguration
|
||||||
public class YudaoFlowableConfiguration {
|
public class YudaoFlowableConfiguration {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -1,2 +0,0 @@
|
|||||||
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
|
|
||||||
cn.iocoder.yudao.framework.flowable.config.YudaoFlowableConfiguration
|
|
@ -0,0 +1 @@
|
|||||||
|
cn.iocoder.yudao.framework.flowable.config.YudaoFlowableConfiguration
|
@ -3,15 +3,15 @@ package cn.iocoder.yudao.framework.quartz.config;
|
|||||||
import com.alibaba.ttl.TtlRunnable;
|
import com.alibaba.ttl.TtlRunnable;
|
||||||
import org.springframework.beans.BeansException;
|
import org.springframework.beans.BeansException;
|
||||||
import org.springframework.beans.factory.config.BeanPostProcessor;
|
import org.springframework.beans.factory.config.BeanPostProcessor;
|
||||||
|
import org.springframework.boot.autoconfigure.AutoConfiguration;
|
||||||
import org.springframework.context.annotation.Bean;
|
import org.springframework.context.annotation.Bean;
|
||||||
import org.springframework.context.annotation.Configuration;
|
|
||||||
import org.springframework.scheduling.annotation.EnableAsync;
|
import org.springframework.scheduling.annotation.EnableAsync;
|
||||||
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
|
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 异步任务 Configuration
|
* 异步任务 Configuration
|
||||||
*/
|
*/
|
||||||
@Configuration(proxyBeanMethods = false)
|
@AutoConfiguration
|
||||||
@EnableAsync
|
@EnableAsync
|
||||||
public class YudaoAsyncAutoConfiguration {
|
public class YudaoAsyncAutoConfiguration {
|
||||||
|
|
||||||
|
@ -2,14 +2,14 @@ package cn.iocoder.yudao.framework.quartz.config;
|
|||||||
|
|
||||||
import cn.iocoder.yudao.framework.quartz.core.scheduler.SchedulerManager;
|
import cn.iocoder.yudao.framework.quartz.core.scheduler.SchedulerManager;
|
||||||
import org.quartz.Scheduler;
|
import org.quartz.Scheduler;
|
||||||
|
import org.springframework.boot.autoconfigure.AutoConfiguration;
|
||||||
import org.springframework.context.annotation.Bean;
|
import org.springframework.context.annotation.Bean;
|
||||||
import org.springframework.context.annotation.Configuration;
|
|
||||||
import org.springframework.scheduling.annotation.EnableScheduling;
|
import org.springframework.scheduling.annotation.EnableScheduling;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 定时任务 Configuration
|
* 定时任务 Configuration
|
||||||
*/
|
*/
|
||||||
@Configuration(proxyBeanMethods = false)
|
@AutoConfiguration
|
||||||
@EnableScheduling // 开启 Spring 自带的定时任务
|
@EnableScheduling // 开启 Spring 自带的定时任务
|
||||||
public class YudaoQuartzAutoConfiguration {
|
public class YudaoQuartzAutoConfiguration {
|
||||||
|
|
||||||
|
@ -1,3 +0,0 @@
|
|||||||
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
|
|
||||||
cn.iocoder.yudao.framework.quartz.config.YudaoQuartzAutoConfiguration,\
|
|
||||||
cn.iocoder.yudao.framework.quartz.config.YudaoAsyncAutoConfiguration
|
|
@ -0,0 +1,2 @@
|
|||||||
|
cn.iocoder.yudao.framework.quartz.config.YudaoQuartzAutoConfiguration
|
||||||
|
cn.iocoder.yudao.framework.quartz.config.YudaoAsyncAutoConfiguration
|
@ -3,17 +3,17 @@ package cn.iocoder.yudao.framework.tracer.config;
|
|||||||
import io.micrometer.core.instrument.MeterRegistry;
|
import io.micrometer.core.instrument.MeterRegistry;
|
||||||
import org.springframework.beans.factory.annotation.Value;
|
import org.springframework.beans.factory.annotation.Value;
|
||||||
import org.springframework.boot.actuate.autoconfigure.metrics.MeterRegistryCustomizer;
|
import org.springframework.boot.actuate.autoconfigure.metrics.MeterRegistryCustomizer;
|
||||||
|
import org.springframework.boot.autoconfigure.AutoConfiguration;
|
||||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
|
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
|
||||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
|
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
|
||||||
import org.springframework.context.annotation.Bean;
|
import org.springframework.context.annotation.Bean;
|
||||||
import org.springframework.context.annotation.Configuration;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Metrics 配置类
|
* Metrics 配置类
|
||||||
*
|
*
|
||||||
* @author 芋道源码
|
* @author 芋道源码
|
||||||
*/
|
*/
|
||||||
@Configuration(proxyBeanMethods = false)
|
@AutoConfiguration
|
||||||
@ConditionalOnClass({MeterRegistryCustomizer.class})
|
@ConditionalOnClass({MeterRegistryCustomizer.class})
|
||||||
@ConditionalOnProperty(prefix = "yudao.metrics", value = "enable", matchIfMissing = true) // 允许使用 yudao.metrics.enable=false 禁用 Metrics
|
@ConditionalOnProperty(prefix = "yudao.metrics", value = "enable", matchIfMissing = true) // 允许使用 yudao.metrics.enable=false 禁用 Metrics
|
||||||
public class YudaoMetricsAutoConfiguration {
|
public class YudaoMetricsAutoConfiguration {
|
||||||
|
@ -3,19 +3,19 @@ package cn.iocoder.yudao.framework.tracer.config;
|
|||||||
import cn.iocoder.yudao.framework.common.enums.WebFilterOrderEnum;
|
import cn.iocoder.yudao.framework.common.enums.WebFilterOrderEnum;
|
||||||
import cn.iocoder.yudao.framework.tracer.core.aop.BizTraceAspect;
|
import cn.iocoder.yudao.framework.tracer.core.aop.BizTraceAspect;
|
||||||
import cn.iocoder.yudao.framework.tracer.core.filter.TraceFilter;
|
import cn.iocoder.yudao.framework.tracer.core.filter.TraceFilter;
|
||||||
|
import org.springframework.boot.autoconfigure.AutoConfiguration;
|
||||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
|
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
|
||||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
|
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
|
||||||
import org.springframework.boot.context.properties.EnableConfigurationProperties;
|
import org.springframework.boot.context.properties.EnableConfigurationProperties;
|
||||||
import org.springframework.boot.web.servlet.FilterRegistrationBean;
|
import org.springframework.boot.web.servlet.FilterRegistrationBean;
|
||||||
import org.springframework.context.annotation.Bean;
|
import org.springframework.context.annotation.Bean;
|
||||||
import org.springframework.context.annotation.Configuration;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Tracer 配置类
|
* Tracer 配置类
|
||||||
*
|
*
|
||||||
* @author mashu
|
* @author mashu
|
||||||
*/
|
*/
|
||||||
@Configuration(proxyBeanMethods = false)
|
@AutoConfiguration
|
||||||
@ConditionalOnClass({BizTraceAspect.class})
|
@ConditionalOnClass({BizTraceAspect.class})
|
||||||
@EnableConfigurationProperties(TracerProperties.class)
|
@EnableConfigurationProperties(TracerProperties.class)
|
||||||
@ConditionalOnProperty(prefix = "yudao.tracer", value = "enable", matchIfMissing = true)
|
@ConditionalOnProperty(prefix = "yudao.tracer", value = "enable", matchIfMissing = true)
|
||||||
|
@ -1,3 +0,0 @@
|
|||||||
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
|
|
||||||
cn.iocoder.yudao.framework.tracer.config.YudaoTracerAutoConfiguration,\
|
|
||||||
cn.iocoder.yudao.framework.tracer.config.YudaoMetricsAutoConfiguration
|
|
@ -0,0 +1,2 @@
|
|||||||
|
cn.iocoder.yudao.framework.tracer.config.YudaoTracerAutoConfiguration
|
||||||
|
cn.iocoder.yudao.framework.tracer.config.YudaoMetricsAutoConfiguration
|
@ -10,9 +10,8 @@ import cn.iocoder.yudao.framework.mq.core.pubsub.AbstractChannelMessageListener;
|
|||||||
import cn.iocoder.yudao.framework.mq.core.stream.AbstractStreamMessageListener;
|
import cn.iocoder.yudao.framework.mq.core.stream.AbstractStreamMessageListener;
|
||||||
import cn.iocoder.yudao.framework.redis.config.YudaoRedisAutoConfiguration;
|
import cn.iocoder.yudao.framework.redis.config.YudaoRedisAutoConfiguration;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
|
import org.springframework.boot.autoconfigure.AutoConfiguration;
|
||||||
import org.springframework.context.annotation.Bean;
|
import org.springframework.context.annotation.Bean;
|
||||||
import org.springframework.context.annotation.Configuration;
|
|
||||||
import org.springframework.data.redis.connection.RedisServerCommands;
|
import org.springframework.data.redis.connection.RedisServerCommands;
|
||||||
import org.springframework.data.redis.connection.stream.Consumer;
|
import org.springframework.data.redis.connection.stream.Consumer;
|
||||||
import org.springframework.data.redis.connection.stream.ObjectRecord;
|
import org.springframework.data.redis.connection.stream.ObjectRecord;
|
||||||
@ -35,9 +34,8 @@ import java.util.Properties;
|
|||||||
*
|
*
|
||||||
* @author 芋道源码
|
* @author 芋道源码
|
||||||
*/
|
*/
|
||||||
@Configuration(proxyBeanMethods = false)
|
|
||||||
@AutoConfigureAfter(YudaoRedisAutoConfiguration.class)
|
|
||||||
@Slf4j
|
@Slf4j
|
||||||
|
@AutoConfiguration(after = YudaoRedisAutoConfiguration.class)
|
||||||
public class YudaoMQAutoConfiguration {
|
public class YudaoMQAutoConfiguration {
|
||||||
|
|
||||||
@Bean
|
@Bean
|
||||||
|
@ -1,2 +0,0 @@
|
|||||||
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
|
|
||||||
cn.iocoder.yudao.framework.mq.config.YudaoMQAutoConfiguration
|
|
@ -0,0 +1 @@
|
|||||||
|
cn.iocoder.yudao.framework.mq.config.YudaoMQAutoConfiguration
|
@ -2,11 +2,11 @@ package cn.iocoder.yudao.framework.datasource.config;
|
|||||||
|
|
||||||
import cn.iocoder.yudao.framework.datasource.core.filter.DruidAdRemoveFilter;
|
import cn.iocoder.yudao.framework.datasource.core.filter.DruidAdRemoveFilter;
|
||||||
import com.alibaba.druid.spring.boot.autoconfigure.properties.DruidStatProperties;
|
import com.alibaba.druid.spring.boot.autoconfigure.properties.DruidStatProperties;
|
||||||
|
import org.springframework.boot.autoconfigure.AutoConfiguration;
|
||||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
|
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
|
||||||
import org.springframework.boot.context.properties.EnableConfigurationProperties;
|
import org.springframework.boot.context.properties.EnableConfigurationProperties;
|
||||||
import org.springframework.boot.web.servlet.FilterRegistrationBean;
|
import org.springframework.boot.web.servlet.FilterRegistrationBean;
|
||||||
import org.springframework.context.annotation.Bean;
|
import org.springframework.context.annotation.Bean;
|
||||||
import org.springframework.context.annotation.Configuration;
|
|
||||||
import org.springframework.transaction.annotation.EnableTransactionManagement;
|
import org.springframework.transaction.annotation.EnableTransactionManagement;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -14,7 +14,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
|
|||||||
*
|
*
|
||||||
* @author 芋道源码
|
* @author 芋道源码
|
||||||
*/
|
*/
|
||||||
@Configuration(proxyBeanMethods = false)
|
@AutoConfiguration
|
||||||
@EnableTransactionManagement(proxyTargetClass = true) // 启动事务管理
|
@EnableTransactionManagement(proxyTargetClass = true) // 启动事务管理
|
||||||
@EnableConfigurationProperties(DruidStatProperties.class)
|
@EnableConfigurationProperties(DruidStatProperties.class)
|
||||||
public class YudaoDataSourceAutoConfiguration {
|
public class YudaoDataSourceAutoConfiguration {
|
||||||
|
@ -13,9 +13,9 @@ import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
|
|||||||
import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
|
import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
|
||||||
import org.apache.ibatis.annotations.Mapper;
|
import org.apache.ibatis.annotations.Mapper;
|
||||||
import org.mybatis.spring.annotation.MapperScan;
|
import org.mybatis.spring.annotation.MapperScan;
|
||||||
|
import org.springframework.boot.autoconfigure.AutoConfiguration;
|
||||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
|
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
|
||||||
import org.springframework.context.annotation.Bean;
|
import org.springframework.context.annotation.Bean;
|
||||||
import org.springframework.context.annotation.Configuration;
|
|
||||||
import org.springframework.core.env.ConfigurableEnvironment;
|
import org.springframework.core.env.ConfigurableEnvironment;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -23,7 +23,7 @@ import org.springframework.core.env.ConfigurableEnvironment;
|
|||||||
*
|
*
|
||||||
* @author 芋道源码
|
* @author 芋道源码
|
||||||
*/
|
*/
|
||||||
@Configuration(proxyBeanMethods = false)
|
@AutoConfiguration
|
||||||
@MapperScan(value = "${yudao.info.base-package}", annotationClass = Mapper.class,
|
@MapperScan(value = "${yudao.info.base-package}", annotationClass = Mapper.class,
|
||||||
lazyInitialization = "${mybatis.lazy-initialization:false}") // Mapper 懒加载,目前仅用于单元测试
|
lazyInitialization = "${mybatis.lazy-initialization:false}") // Mapper 懒加载,目前仅用于单元测试
|
||||||
public class YudaoMybatisAutoConfiguration {
|
public class YudaoMybatisAutoConfiguration {
|
||||||
|
@ -1,5 +1,2 @@
|
|||||||
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
|
|
||||||
cn.iocoder.yudao.framework.datasource.config.YudaoDataSourceAutoConfiguration,\
|
|
||||||
cn.iocoder.yudao.framework.mybatis.config.YudaoMybatisAutoConfiguration
|
|
||||||
org.springframework.boot.env.EnvironmentPostProcessor=\
|
org.springframework.boot.env.EnvironmentPostProcessor=\
|
||||||
cn.iocoder.yudao.framework.mybatis.config.IdTypeEnvironmentPostProcessor
|
cn.iocoder.yudao.framework.mybatis.config.IdTypeEnvironmentPostProcessor
|
||||||
|
@ -0,0 +1,2 @@
|
|||||||
|
cn.iocoder.yudao.framework.datasource.config.YudaoDataSourceAutoConfiguration
|
||||||
|
cn.iocoder.yudao.framework.mybatis.config.YudaoMybatisAutoConfiguration
|
@ -5,16 +5,14 @@ import cn.iocoder.yudao.framework.idempotent.core.keyresolver.impl.DefaultIdempo
|
|||||||
import cn.iocoder.yudao.framework.idempotent.core.keyresolver.impl.ExpressionIdempotentKeyResolver;
|
import cn.iocoder.yudao.framework.idempotent.core.keyresolver.impl.ExpressionIdempotentKeyResolver;
|
||||||
import cn.iocoder.yudao.framework.idempotent.core.keyresolver.IdempotentKeyResolver;
|
import cn.iocoder.yudao.framework.idempotent.core.keyresolver.IdempotentKeyResolver;
|
||||||
import cn.iocoder.yudao.framework.idempotent.core.redis.IdempotentRedisDAO;
|
import cn.iocoder.yudao.framework.idempotent.core.redis.IdempotentRedisDAO;
|
||||||
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
|
import org.springframework.boot.autoconfigure.AutoConfiguration;
|
||||||
import cn.iocoder.yudao.framework.redis.config.YudaoRedisAutoConfiguration;
|
import cn.iocoder.yudao.framework.redis.config.YudaoRedisAutoConfiguration;
|
||||||
import org.springframework.context.annotation.Bean;
|
import org.springframework.context.annotation.Bean;
|
||||||
import org.springframework.context.annotation.Configuration;
|
|
||||||
import org.springframework.data.redis.core.StringRedisTemplate;
|
import org.springframework.data.redis.core.StringRedisTemplate;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
@Configuration(proxyBeanMethods = false)
|
@AutoConfiguration(after = YudaoRedisAutoConfiguration.class)
|
||||||
@AutoConfigureAfter(YudaoRedisAutoConfiguration.class)
|
|
||||||
public class YudaoIdempotentConfiguration {
|
public class YudaoIdempotentConfiguration {
|
||||||
|
|
||||||
@Bean
|
@Bean
|
||||||
|
@ -4,12 +4,10 @@ import cn.hutool.core.util.ClassUtil;
|
|||||||
import com.baomidou.lock.spring.boot.autoconfigure.LockAutoConfiguration;
|
import com.baomidou.lock.spring.boot.autoconfigure.LockAutoConfiguration;
|
||||||
import cn.iocoder.yudao.framework.lock4j.core.DefaultLockFailureStrategy;
|
import cn.iocoder.yudao.framework.lock4j.core.DefaultLockFailureStrategy;
|
||||||
import cn.iocoder.yudao.framework.lock4j.core.Lock4jRedisKeyConstants;
|
import cn.iocoder.yudao.framework.lock4j.core.Lock4jRedisKeyConstants;
|
||||||
import org.springframework.boot.autoconfigure.AutoConfigureBefore;
|
import org.springframework.boot.autoconfigure.AutoConfiguration;
|
||||||
import org.springframework.context.annotation.Bean;
|
import org.springframework.context.annotation.Bean;
|
||||||
import org.springframework.context.annotation.Configuration;
|
|
||||||
|
|
||||||
@Configuration(proxyBeanMethods = false)
|
@AutoConfiguration(before = LockAutoConfiguration.class)
|
||||||
@AutoConfigureBefore(LockAutoConfiguration.class)
|
|
||||||
public class YudaoLock4jConfiguration {
|
public class YudaoLock4jConfiguration {
|
||||||
|
|
||||||
static {
|
static {
|
||||||
|
@ -1,3 +0,0 @@
|
|||||||
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
|
|
||||||
cn.iocoder.yudao.framework.idempotent.config.YudaoIdempotentConfiguration,\
|
|
||||||
cn.iocoder.yudao.framework.lock4j.config.YudaoLock4jConfiguration
|
|
@ -0,0 +1,2 @@
|
|||||||
|
cn.iocoder.yudao.framework.idempotent.config.YudaoIdempotentConfiguration
|
||||||
|
cn.iocoder.yudao.framework.lock4j.config.YudaoLock4jConfiguration
|
@ -1,10 +1,10 @@
|
|||||||
package cn.iocoder.yudao.framework.redis.config;
|
package cn.iocoder.yudao.framework.redis.config;
|
||||||
|
|
||||||
|
import org.springframework.boot.autoconfigure.AutoConfiguration;
|
||||||
import org.springframework.boot.autoconfigure.cache.CacheProperties;
|
import org.springframework.boot.autoconfigure.cache.CacheProperties;
|
||||||
import org.springframework.boot.context.properties.EnableConfigurationProperties;
|
import org.springframework.boot.context.properties.EnableConfigurationProperties;
|
||||||
import org.springframework.cache.annotation.EnableCaching;
|
import org.springframework.cache.annotation.EnableCaching;
|
||||||
import org.springframework.context.annotation.Bean;
|
import org.springframework.context.annotation.Bean;
|
||||||
import org.springframework.context.annotation.Configuration;
|
|
||||||
import org.springframework.context.annotation.Primary;
|
import org.springframework.context.annotation.Primary;
|
||||||
import org.springframework.data.redis.cache.RedisCacheConfiguration;
|
import org.springframework.data.redis.cache.RedisCacheConfiguration;
|
||||||
import org.springframework.data.redis.serializer.RedisSerializationContext;
|
import org.springframework.data.redis.serializer.RedisSerializationContext;
|
||||||
@ -13,7 +13,7 @@ import org.springframework.data.redis.serializer.RedisSerializer;
|
|||||||
/**
|
/**
|
||||||
* Cache 配置类,基于 Redis 实现
|
* Cache 配置类,基于 Redis 实现
|
||||||
*/
|
*/
|
||||||
@Configuration(proxyBeanMethods = false)
|
@AutoConfiguration
|
||||||
@EnableConfigurationProperties({CacheProperties.class})
|
@EnableConfigurationProperties({CacheProperties.class})
|
||||||
@EnableCaching
|
@EnableCaching
|
||||||
public class YudaoCacheAutoConfiguration {
|
public class YudaoCacheAutoConfiguration {
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
package cn.iocoder.yudao.framework.redis.config;
|
package cn.iocoder.yudao.framework.redis.config;
|
||||||
|
|
||||||
|
import org.springframework.boot.autoconfigure.AutoConfiguration;
|
||||||
import org.springframework.context.annotation.Bean;
|
import org.springframework.context.annotation.Bean;
|
||||||
import org.springframework.context.annotation.Configuration;
|
|
||||||
import org.springframework.data.redis.connection.RedisConnectionFactory;
|
import org.springframework.data.redis.connection.RedisConnectionFactory;
|
||||||
import org.springframework.data.redis.core.RedisTemplate;
|
import org.springframework.data.redis.core.RedisTemplate;
|
||||||
import org.springframework.data.redis.serializer.RedisSerializer;
|
import org.springframework.data.redis.serializer.RedisSerializer;
|
||||||
@ -9,7 +9,7 @@ import org.springframework.data.redis.serializer.RedisSerializer;
|
|||||||
/**
|
/**
|
||||||
* Redis 配置类
|
* Redis 配置类
|
||||||
*/
|
*/
|
||||||
@Configuration(proxyBeanMethods = false)
|
@AutoConfiguration
|
||||||
public class YudaoRedisAutoConfiguration {
|
public class YudaoRedisAutoConfiguration {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -1,3 +0,0 @@
|
|||||||
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
|
|
||||||
cn.iocoder.yudao.framework.redis.config.YudaoRedisAutoConfiguration,\
|
|
||||||
cn.iocoder.yudao.framework.redis.config.YudaoCacheAutoConfiguration
|
|
@ -0,0 +1,2 @@
|
|||||||
|
cn.iocoder.yudao.framework.redis.config.YudaoRedisAutoConfiguration
|
||||||
|
cn.iocoder.yudao.framework.redis.config.YudaoCacheAutoConfiguration
|
@ -11,9 +11,9 @@ import cn.iocoder.yudao.framework.web.core.handler.GlobalExceptionHandler;
|
|||||||
import cn.iocoder.yudao.module.system.api.oauth2.OAuth2TokenApi;
|
import cn.iocoder.yudao.module.system.api.oauth2.OAuth2TokenApi;
|
||||||
import cn.iocoder.yudao.module.system.api.permission.PermissionApi;
|
import cn.iocoder.yudao.module.system.api.permission.PermissionApi;
|
||||||
import org.springframework.beans.factory.config.MethodInvokingFactoryBean;
|
import org.springframework.beans.factory.config.MethodInvokingFactoryBean;
|
||||||
|
import org.springframework.boot.autoconfigure.AutoConfiguration;
|
||||||
import org.springframework.boot.context.properties.EnableConfigurationProperties;
|
import org.springframework.boot.context.properties.EnableConfigurationProperties;
|
||||||
import org.springframework.context.annotation.Bean;
|
import org.springframework.context.annotation.Bean;
|
||||||
import org.springframework.context.annotation.Configuration;
|
|
||||||
import org.springframework.security.core.context.SecurityContextHolder;
|
import org.springframework.security.core.context.SecurityContextHolder;
|
||||||
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
|
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
|
||||||
import org.springframework.security.crypto.password.PasswordEncoder;
|
import org.springframework.security.crypto.password.PasswordEncoder;
|
||||||
@ -30,7 +30,7 @@ import javax.annotation.Resource;
|
|||||||
*
|
*
|
||||||
* @author 芋道源码
|
* @author 芋道源码
|
||||||
*/
|
*/
|
||||||
@Configuration(proxyBeanMethods = false)
|
@AutoConfiguration
|
||||||
@EnableConfigurationProperties(SecurityProperties.class)
|
@EnableConfigurationProperties(SecurityProperties.class)
|
||||||
public class YudaoSecurityAutoConfiguration {
|
public class YudaoSecurityAutoConfiguration {
|
||||||
|
|
||||||
|
@ -4,10 +4,10 @@ import cn.iocoder.yudao.framework.security.core.filter.TokenAuthenticationFilter
|
|||||||
import cn.iocoder.yudao.framework.web.config.WebProperties;
|
import cn.iocoder.yudao.framework.web.config.WebProperties;
|
||||||
import com.google.common.collect.HashMultimap;
|
import com.google.common.collect.HashMultimap;
|
||||||
import com.google.common.collect.Multimap;
|
import com.google.common.collect.Multimap;
|
||||||
|
import org.springframework.boot.autoconfigure.AutoConfiguration;
|
||||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
|
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
|
||||||
import org.springframework.context.ApplicationContext;
|
import org.springframework.context.ApplicationContext;
|
||||||
import org.springframework.context.annotation.Bean;
|
import org.springframework.context.annotation.Bean;
|
||||||
import org.springframework.context.annotation.Configuration;
|
|
||||||
import org.springframework.http.HttpMethod;
|
import org.springframework.http.HttpMethod;
|
||||||
import org.springframework.security.authentication.AuthenticationManager;
|
import org.springframework.security.authentication.AuthenticationManager;
|
||||||
import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
|
import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
|
||||||
@ -32,7 +32,7 @@ import java.util.Set;
|
|||||||
*
|
*
|
||||||
* @author 芋道源码
|
* @author 芋道源码
|
||||||
*/
|
*/
|
||||||
@Configuration(proxyBeanMethods = false)
|
@AutoConfiguration
|
||||||
@EnableGlobalMethodSecurity(prePostEnabled = true, securedEnabled = true)
|
@EnableGlobalMethodSecurity(prePostEnabled = true, securedEnabled = true)
|
||||||
public class YudaoWebSecurityConfigurerAdapter extends WebSecurityConfigurerAdapter {
|
public class YudaoWebSecurityConfigurerAdapter extends WebSecurityConfigurerAdapter {
|
||||||
|
|
||||||
|
@ -1,3 +0,0 @@
|
|||||||
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
|
|
||||||
cn.iocoder.yudao.framework.security.config.YudaoSecurityAutoConfiguration,\
|
|
||||||
cn.iocoder.yudao.framework.security.config.YudaoWebSecurityConfigurerAdapter
|
|
@ -0,0 +1,2 @@
|
|||||||
|
cn.iocoder.yudao.framework.security.config.YudaoSecurityAutoConfiguration
|
||||||
|
cn.iocoder.yudao.framework.security.config.YudaoWebSecurityConfigurerAdapter
|
@ -11,16 +11,14 @@ import cn.iocoder.yudao.framework.web.config.YudaoWebAutoConfiguration;
|
|||||||
import cn.iocoder.yudao.module.infra.api.logger.ApiAccessLogApi;
|
import cn.iocoder.yudao.module.infra.api.logger.ApiAccessLogApi;
|
||||||
import cn.iocoder.yudao.module.infra.api.logger.ApiErrorLogApi;
|
import cn.iocoder.yudao.module.infra.api.logger.ApiErrorLogApi;
|
||||||
import org.springframework.beans.factory.annotation.Value;
|
import org.springframework.beans.factory.annotation.Value;
|
||||||
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
|
import org.springframework.boot.autoconfigure.AutoConfiguration;
|
||||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
|
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
|
||||||
import org.springframework.boot.web.servlet.FilterRegistrationBean;
|
import org.springframework.boot.web.servlet.FilterRegistrationBean;
|
||||||
import org.springframework.context.annotation.Bean;
|
import org.springframework.context.annotation.Bean;
|
||||||
import org.springframework.context.annotation.Configuration;
|
|
||||||
|
|
||||||
import javax.servlet.Filter;
|
import javax.servlet.Filter;
|
||||||
|
|
||||||
@Configuration(proxyBeanMethods = false)
|
@AutoConfiguration(after = YudaoWebAutoConfiguration.class)
|
||||||
@AutoConfigureAfter(YudaoWebAutoConfiguration.class)
|
|
||||||
public class YudaoApiLogAutoConfiguration {
|
public class YudaoApiLogAutoConfiguration {
|
||||||
|
|
||||||
@Bean
|
@Bean
|
||||||
|
@ -8,12 +8,12 @@ import com.fasterxml.jackson.databind.module.SimpleModule;
|
|||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.springframework.beans.BeansException;
|
import org.springframework.beans.BeansException;
|
||||||
import org.springframework.beans.factory.config.BeanPostProcessor;
|
import org.springframework.beans.factory.config.BeanPostProcessor;
|
||||||
|
import org.springframework.boot.autoconfigure.AutoConfiguration;
|
||||||
import org.springframework.context.annotation.Bean;
|
import org.springframework.context.annotation.Bean;
|
||||||
import org.springframework.context.annotation.Configuration;
|
|
||||||
|
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
|
|
||||||
@Configuration(proxyBeanMethods = false)
|
@AutoConfiguration
|
||||||
@Slf4j
|
@Slf4j
|
||||||
public class YudaoJacksonAutoConfiguration {
|
public class YudaoJacksonAutoConfiguration {
|
||||||
|
|
||||||
|
@ -2,11 +2,11 @@ package cn.iocoder.yudao.framework.swagger.config;
|
|||||||
|
|
||||||
import cn.iocoder.yudao.framework.swagger.core.SpringFoxHandlerProviderBeanPostProcessor;
|
import cn.iocoder.yudao.framework.swagger.core.SpringFoxHandlerProviderBeanPostProcessor;
|
||||||
import com.github.xiaoymin.knife4j.spring.annotations.EnableKnife4j;
|
import com.github.xiaoymin.knife4j.spring.annotations.EnableKnife4j;
|
||||||
|
import org.springframework.boot.autoconfigure.AutoConfiguration;
|
||||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
|
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
|
||||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
|
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
|
||||||
import org.springframework.boot.context.properties.EnableConfigurationProperties;
|
import org.springframework.boot.context.properties.EnableConfigurationProperties;
|
||||||
import org.springframework.context.annotation.Bean;
|
import org.springframework.context.annotation.Bean;
|
||||||
import org.springframework.context.annotation.Configuration;
|
|
||||||
import org.springframework.http.HttpHeaders;
|
import org.springframework.http.HttpHeaders;
|
||||||
import springfox.documentation.builders.ApiInfoBuilder;
|
import springfox.documentation.builders.ApiInfoBuilder;
|
||||||
import springfox.documentation.builders.ExampleBuilder;
|
import springfox.documentation.builders.ExampleBuilder;
|
||||||
@ -29,7 +29,7 @@ import static springfox.documentation.builders.RequestHandlerSelectors.basePacka
|
|||||||
*
|
*
|
||||||
* @author 芋道源码
|
* @author 芋道源码
|
||||||
*/
|
*/
|
||||||
@Configuration(proxyBeanMethods = false)
|
@AutoConfiguration
|
||||||
@EnableSwagger2
|
@EnableSwagger2
|
||||||
@EnableKnife4j
|
@EnableKnife4j
|
||||||
@ConditionalOnClass({Docket.class, ApiInfoBuilder.class})
|
@ConditionalOnClass({Docket.class, ApiInfoBuilder.class})
|
||||||
|
@ -9,11 +9,11 @@ import cn.iocoder.yudao.framework.web.core.handler.GlobalExceptionHandler;
|
|||||||
import cn.iocoder.yudao.framework.web.core.handler.GlobalResponseBodyHandler;
|
import cn.iocoder.yudao.framework.web.core.handler.GlobalResponseBodyHandler;
|
||||||
import cn.iocoder.yudao.framework.web.core.util.WebFrameworkUtils;
|
import cn.iocoder.yudao.framework.web.core.util.WebFrameworkUtils;
|
||||||
import org.springframework.beans.factory.annotation.Value;
|
import org.springframework.beans.factory.annotation.Value;
|
||||||
|
import org.springframework.boot.autoconfigure.AutoConfiguration;
|
||||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
|
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
|
||||||
import org.springframework.boot.context.properties.EnableConfigurationProperties;
|
import org.springframework.boot.context.properties.EnableConfigurationProperties;
|
||||||
import org.springframework.boot.web.servlet.FilterRegistrationBean;
|
import org.springframework.boot.web.servlet.FilterRegistrationBean;
|
||||||
import org.springframework.context.annotation.Bean;
|
import org.springframework.context.annotation.Bean;
|
||||||
import org.springframework.context.annotation.Configuration;
|
|
||||||
import org.springframework.util.AntPathMatcher;
|
import org.springframework.util.AntPathMatcher;
|
||||||
import org.springframework.util.PathMatcher;
|
import org.springframework.util.PathMatcher;
|
||||||
import org.springframework.web.bind.annotation.RestController;
|
import org.springframework.web.bind.annotation.RestController;
|
||||||
@ -26,7 +26,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
|
|||||||
import javax.annotation.Resource;
|
import javax.annotation.Resource;
|
||||||
import javax.servlet.Filter;
|
import javax.servlet.Filter;
|
||||||
|
|
||||||
@Configuration(proxyBeanMethods = false)
|
@AutoConfiguration
|
||||||
@EnableConfigurationProperties({WebProperties.class, XssProperties.class})
|
@EnableConfigurationProperties({WebProperties.class, XssProperties.class})
|
||||||
public class YudaoWebAutoConfiguration implements WebMvcConfigurer {
|
public class YudaoWebAutoConfiguration implements WebMvcConfigurer {
|
||||||
|
|
||||||
|
@ -1,5 +0,0 @@
|
|||||||
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
|
|
||||||
cn.iocoder.yudao.framework.apilog.config.YudaoApiLogAutoConfiguration,\
|
|
||||||
cn.iocoder.yudao.framework.jackson.config.YudaoJacksonAutoConfiguration,\
|
|
||||||
cn.iocoder.yudao.framework.swagger.config.YudaoSwaggerAutoConfiguration,\
|
|
||||||
cn.iocoder.yudao.framework.web.config.YudaoWebAutoConfiguration
|
|
@ -0,0 +1,4 @@
|
|||||||
|
cn.iocoder.yudao.framework.apilog.config.YudaoApiLogAutoConfiguration
|
||||||
|
cn.iocoder.yudao.framework.jackson.config.YudaoJacksonAutoConfiguration
|
||||||
|
cn.iocoder.yudao.framework.swagger.config.YudaoSwaggerAutoConfiguration
|
||||||
|
cn.iocoder.yudao.framework.web.config.YudaoWebAutoConfiguration
|
@ -100,7 +100,7 @@
|
|||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.springframework.boot</groupId>
|
<groupId>org.springframework.boot</groupId>
|
||||||
<artifactId>spring-boot-maven-plugin</artifactId>
|
<artifactId>spring-boot-maven-plugin</artifactId>
|
||||||
<version>2.6.13</version> <!-- 如果 spring.boot.version 版本修改,则这里也要跟着修改 -->
|
<version>2.7.6</version> <!-- 如果 spring.boot.version 版本修改,则这里也要跟着修改 -->
|
||||||
<configuration>
|
<configuration>
|
||||||
<fork>true</fork>
|
<fork>true</fork>
|
||||||
</configuration>
|
</configuration>
|
||||||
|
@ -25,7 +25,7 @@
|
|||||||
"p": "plop"
|
"p": "plop"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@iconify/iconify": "^3.0.0",
|
"@iconify/iconify": "^3.0.1",
|
||||||
"@vueuse/core": "^9.6.0",
|
"@vueuse/core": "^9.6.0",
|
||||||
"@wangeditor/editor": "^5.1.23",
|
"@wangeditor/editor": "^5.1.23",
|
||||||
"@wangeditor/editor-for-vue": "^5.1.10",
|
"@wangeditor/editor-for-vue": "^5.1.10",
|
||||||
@ -59,7 +59,7 @@
|
|||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@commitlint/cli": "^17.3.0",
|
"@commitlint/cli": "^17.3.0",
|
||||||
"@commitlint/config-conventional": "^17.3.0",
|
"@commitlint/config-conventional": "^17.3.0",
|
||||||
"@iconify/json": "^2.1.144",
|
"@iconify/json": "^2.1.145",
|
||||||
"@intlify/vite-plugin-vue-i18n": "^6.0.3",
|
"@intlify/vite-plugin-vue-i18n": "^6.0.3",
|
||||||
"@purge-icons/generated": "^0.9.0",
|
"@purge-icons/generated": "^0.9.0",
|
||||||
"@types/intro.js": "^5.1.0",
|
"@types/intro.js": "^5.1.0",
|
||||||
@ -68,8 +68,8 @@
|
|||||||
"@types/nprogress": "^0.2.0",
|
"@types/nprogress": "^0.2.0",
|
||||||
"@types/qrcode": "^1.5.0",
|
"@types/qrcode": "^1.5.0",
|
||||||
"@types/qs": "^6.9.7",
|
"@types/qs": "^6.9.7",
|
||||||
"@typescript-eslint/eslint-plugin": "^5.44.0",
|
"@typescript-eslint/eslint-plugin": "^5.45.0",
|
||||||
"@typescript-eslint/parser": "^5.44.0",
|
"@typescript-eslint/parser": "^5.45.0",
|
||||||
"@vitejs/plugin-vue": "^3.2.0",
|
"@vitejs/plugin-vue": "^3.2.0",
|
||||||
"@vitejs/plugin-vue-jsx": "^2.1.1",
|
"@vitejs/plugin-vue-jsx": "^2.1.1",
|
||||||
"autoprefixer": "^10.4.13",
|
"autoprefixer": "^10.4.13",
|
||||||
|
File diff suppressed because it is too large
Load Diff
@ -3,24 +3,48 @@ import request from '@/config/axios'
|
|||||||
export interface ApiAccessLogVO {
|
export interface ApiAccessLogVO {
|
||||||
id: number
|
id: number
|
||||||
traceId: string
|
traceId: string
|
||||||
userId: string
|
userId: number
|
||||||
userType: string
|
userType: number
|
||||||
applicationName: string
|
applicationName: string
|
||||||
requestMethod: string
|
requestMethod: string
|
||||||
requestParams: string
|
requestParams: string
|
||||||
requestUrl: string
|
requestUrl: string
|
||||||
beginTime: string
|
userIp: string
|
||||||
endTIme: string
|
userAgent: string
|
||||||
duration: string
|
beginTime: Date
|
||||||
|
endTIme: Date
|
||||||
|
duration: number
|
||||||
resultCode: number
|
resultCode: number
|
||||||
|
resultMsg: string
|
||||||
|
createTime: Date
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface ApiAccessLogPageReqVO extends PageParam {
|
||||||
|
userId?: number
|
||||||
|
userType?: number
|
||||||
|
applicationName?: string
|
||||||
|
requestUrl?: string
|
||||||
|
beginTime?: Date[]
|
||||||
|
duration?: number
|
||||||
|
resultCode?: number
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface ApiAccessLogExportReqVO {
|
||||||
|
userId?: number
|
||||||
|
userType?: number
|
||||||
|
applicationName?: string
|
||||||
|
requestUrl?: string
|
||||||
|
beginTime?: Date[]
|
||||||
|
duration?: number
|
||||||
|
resultCode?: number
|
||||||
}
|
}
|
||||||
|
|
||||||
// 查询列表API 访问日志
|
// 查询列表API 访问日志
|
||||||
export const getApiAccessLogPageApi = (params) => {
|
export const getApiAccessLogPageApi = (params: ApiAccessLogPageReqVO) => {
|
||||||
return request.get({ url: '/infra/api-access-log/page', params })
|
return request.get({ url: '/infra/api-access-log/page', params })
|
||||||
}
|
}
|
||||||
|
|
||||||
// 导出API 访问日志
|
// 导出API 访问日志
|
||||||
export const exportApiAccessLogApi = (params) => {
|
export const exportApiAccessLogApi = (params: ApiAccessLogExportReqVO) => {
|
||||||
return request.download({ url: '/infra/api-access-log/export-excel', params })
|
return request.download({ url: '/infra/api-access-log/export-excel', params })
|
||||||
}
|
}
|
||||||
|
@ -2,24 +2,51 @@ import request from '@/config/axios'
|
|||||||
|
|
||||||
export interface ApiErrorLogVO {
|
export interface ApiErrorLogVO {
|
||||||
id: number
|
id: number
|
||||||
userId: string
|
traceId: string
|
||||||
userIp: string
|
userId: number
|
||||||
userAgent: string
|
userType: number
|
||||||
userType: string
|
|
||||||
applicationName: string
|
applicationName: string
|
||||||
requestMethod: string
|
requestMethod: string
|
||||||
requestParams: string
|
requestParams: string
|
||||||
requestUrl: string
|
requestUrl: string
|
||||||
exceptionTime: string
|
userIp: string
|
||||||
|
userAgent: string
|
||||||
|
exceptionTime: Date
|
||||||
exceptionName: string
|
exceptionName: string
|
||||||
|
exceptionMessage: string
|
||||||
|
exceptionRootCauseMessage: string
|
||||||
exceptionStackTrace: string
|
exceptionStackTrace: string
|
||||||
processUserId: string
|
exceptionClassName: string
|
||||||
|
exceptionFileName: string
|
||||||
|
exceptionMethodName: string
|
||||||
|
exceptionLineNumber: number
|
||||||
|
processUserId: number
|
||||||
processStatus: number
|
processStatus: number
|
||||||
|
processTime: Date
|
||||||
resultCode: number
|
resultCode: number
|
||||||
|
createTime: Date
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface ApiErrorLogPageReqVO extends PageParam {
|
||||||
|
userId?: number
|
||||||
|
userType?: number
|
||||||
|
applicationName?: string
|
||||||
|
requestUrl?: string
|
||||||
|
exceptionTime?: Date[]
|
||||||
|
processStatus: number
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface ApiErrorLogExportReqVO {
|
||||||
|
userId?: number
|
||||||
|
userType?: number
|
||||||
|
applicationName?: string
|
||||||
|
requestUrl?: string
|
||||||
|
exceptionTime?: Date[]
|
||||||
|
processStatus: number
|
||||||
}
|
}
|
||||||
|
|
||||||
// 查询列表API 访问日志
|
// 查询列表API 访问日志
|
||||||
export const getApiErrorLogPageApi = (params) => {
|
export const getApiErrorLogPageApi = (params: ApiErrorLogPageReqVO) => {
|
||||||
return request.get({ url: '/infra/api-error-log/page', params })
|
return request.get({ url: '/infra/api-error-log/page', params })
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -31,7 +58,7 @@ export const updateApiErrorLogPageApi = (id: number, processStatus: number) => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 导出API 访问日志
|
// 导出API 访问日志
|
||||||
export const exportApiErrorLogApi = (params) => {
|
export const exportApiErrorLogApi = (params: ApiErrorLogExportReqVO) => {
|
||||||
return request.download({
|
return request.download({
|
||||||
url: '/infra/api-error-log/export-excel',
|
url: '/infra/api-error-log/export-excel',
|
||||||
params
|
params
|
||||||
|
@ -12,8 +12,8 @@ export type CodegenTableVO = {
|
|||||||
className: string
|
className: string
|
||||||
classComment: string
|
classComment: string
|
||||||
author: string
|
author: string
|
||||||
createTime: string
|
createTime: Date
|
||||||
updateTime: string
|
updateTime: Date
|
||||||
templateType: number
|
templateType: number
|
||||||
parentMenuId: number
|
parentMenuId: number
|
||||||
}
|
}
|
||||||
|
@ -2,26 +2,28 @@ import request from '@/config/axios'
|
|||||||
|
|
||||||
export interface ConfigVO {
|
export interface ConfigVO {
|
||||||
id: number
|
id: number
|
||||||
group: string
|
category: string
|
||||||
name: string
|
name: string
|
||||||
key: string
|
key: string
|
||||||
value: string
|
value: string
|
||||||
type: string
|
type: number
|
||||||
visible: boolean
|
visible: boolean
|
||||||
remark: string
|
remark: string
|
||||||
createTime: string
|
createTime: Date
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface ConfigPageReqVO extends PageParam {
|
export interface ConfigPageReqVO extends PageParam {
|
||||||
name?: string
|
name?: string
|
||||||
|
key?: string
|
||||||
type?: number
|
type?: number
|
||||||
createTime?: string[]
|
createTime?: Date[]
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface ConfigExportReqVO {
|
export interface ConfigExportReqVO {
|
||||||
name?: string
|
name?: string
|
||||||
|
key?: string
|
||||||
type?: number
|
type?: number
|
||||||
createTime?: string[]
|
createTime?: Date[]
|
||||||
}
|
}
|
||||||
|
|
||||||
// 查询参数列表
|
// 查询参数列表
|
||||||
|
@ -6,7 +6,7 @@ export interface DataSourceConfigVO {
|
|||||||
url: string
|
url: string
|
||||||
username: string
|
username: string
|
||||||
password: string
|
password: string
|
||||||
createTime: string
|
createTime: Date
|
||||||
}
|
}
|
||||||
|
|
||||||
// 查询数据源配置列表
|
// 查询数据源配置列表
|
||||||
|
@ -1,31 +1,37 @@
|
|||||||
import request from '@/config/axios'
|
import request from '@/config/axios'
|
||||||
|
|
||||||
export interface ConfigType {
|
export interface FileClientConfig {
|
||||||
basePath: string
|
basePath: string
|
||||||
host: string
|
host?: string
|
||||||
port: string
|
port?: number
|
||||||
username: string
|
username?: string
|
||||||
password: string
|
password?: string
|
||||||
mode: string
|
mode?: string
|
||||||
endpoint: string
|
endpoint?: string
|
||||||
bucket: string
|
bucket?: string
|
||||||
accessKey: string
|
accessKey?: string
|
||||||
accessSecret: string
|
accessSecret?: string
|
||||||
domain: string
|
domain: string
|
||||||
}
|
}
|
||||||
export interface FileConfigVO {
|
export interface FileConfigVO {
|
||||||
id: number
|
id: number
|
||||||
name: string
|
name: string
|
||||||
storage: string
|
storage: number
|
||||||
master: boolean
|
master: boolean
|
||||||
visible: boolean
|
visible: boolean
|
||||||
config: ConfigType
|
config: FileClientConfig
|
||||||
remark: string
|
remark: string
|
||||||
createTime: string
|
createTime: Date
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface FileConfigPageReqVO extends PageParam {
|
||||||
|
name?: string
|
||||||
|
storage?: number
|
||||||
|
createTime?: Date[]
|
||||||
}
|
}
|
||||||
|
|
||||||
// 查询文件配置列表
|
// 查询文件配置列表
|
||||||
export const getFileConfigPageApi = (params) => {
|
export const getFileConfigPageApi = (params: FileConfigPageReqVO) => {
|
||||||
return request.get({ url: '/infra/file-config/page', params })
|
return request.get({ url: '/infra/file-config/page', params })
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2,16 +2,19 @@ import request from '@/config/axios'
|
|||||||
|
|
||||||
export interface FileVO {
|
export interface FileVO {
|
||||||
id: number
|
id: number
|
||||||
|
configId: number
|
||||||
path: string
|
path: string
|
||||||
|
name: string
|
||||||
url: string
|
url: string
|
||||||
size: string
|
size: string
|
||||||
type: string
|
type: string
|
||||||
createTime: string
|
createTime: Date
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface FilePageReqVO extends PageParam {
|
export interface FilePageReqVO extends PageParam {
|
||||||
name?: string
|
path?: string
|
||||||
createTime?: string[]
|
type?: string
|
||||||
|
createTime?: Date[]
|
||||||
}
|
}
|
||||||
|
|
||||||
// 查询文件列表
|
// 查询文件列表
|
||||||
|
@ -10,10 +10,23 @@ export interface JobVO {
|
|||||||
retryCount: number
|
retryCount: number
|
||||||
retryInterval: number
|
retryInterval: number
|
||||||
monitorTimeout: number
|
monitorTimeout: number
|
||||||
|
createTime: Date
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface JobPageReqVO extends PageParam {
|
||||||
|
name?: string
|
||||||
|
status?: number
|
||||||
|
handlerName?: string
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface JobExportReqVO {
|
||||||
|
name?: string
|
||||||
|
status?: number
|
||||||
|
handlerName?: string
|
||||||
}
|
}
|
||||||
|
|
||||||
// 任务列表
|
// 任务列表
|
||||||
export const getJobPageApi = (params) => {
|
export const getJobPageApi = (params: JobPageReqVO) => {
|
||||||
return request.get({ url: '/infra/job/page', params })
|
return request.get({ url: '/infra/job/page', params })
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -38,7 +51,7 @@ export const deleteJobApi = (id: number) => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 导出定时任务调度
|
// 导出定时任务调度
|
||||||
export const exportJobApi = (params) => {
|
export const exportJobApi = (params: JobExportReqVO) => {
|
||||||
return request.download({ url: '/infra/job/export-excel', params })
|
return request.download({ url: '/infra/job/export-excel', params })
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -14,8 +14,24 @@ export interface JobLogVO {
|
|||||||
createTime: string
|
createTime: string
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export interface JobLogPageReqVO extends PageParam {
|
||||||
|
jobId?: number
|
||||||
|
handlerName?: string
|
||||||
|
beginTime?: string
|
||||||
|
endTime?: string
|
||||||
|
status?: number
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface JobLogExportReqVO {
|
||||||
|
jobId?: number
|
||||||
|
handlerName?: string
|
||||||
|
beginTime?: string
|
||||||
|
endTime?: string
|
||||||
|
status?: number
|
||||||
|
}
|
||||||
|
|
||||||
// 任务日志列表
|
// 任务日志列表
|
||||||
export const getJobLogPageApi = (params) => {
|
export const getJobLogPageApi = (params: JobLogPageReqVO) => {
|
||||||
return request.get({ url: '/infra/job-log/page', params })
|
return request.get({ url: '/infra/job-log/page', params })
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -25,7 +41,7 @@ export const getJobLogApi = (id: number) => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 导出定时任务日志
|
// 导出定时任务日志
|
||||||
export const exportJobLogApi = (params) => {
|
export const exportJobLogApi = (params: JobLogExportReqVO) => {
|
||||||
return request.download({
|
return request.download({
|
||||||
url: '/infra/job-log/export-excel',
|
url: '/infra/job-log/export-excel',
|
||||||
params
|
params
|
||||||
|
@ -9,6 +9,7 @@ export interface DeptVO {
|
|||||||
leaderUserId: number
|
leaderUserId: number
|
||||||
phone: string
|
phone: string
|
||||||
email: string
|
email: string
|
||||||
|
createTime: Date
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface DeptPageReqVO {
|
export interface DeptPageReqVO {
|
||||||
|
@ -4,21 +4,21 @@ export type DictTypeVO = {
|
|||||||
type: string
|
type: string
|
||||||
status: number
|
status: number
|
||||||
remark: string
|
remark: string
|
||||||
createTime: string
|
createTime: Date
|
||||||
}
|
}
|
||||||
|
|
||||||
export type DictTypePageReqVO = {
|
export type DictTypePageReqVO = {
|
||||||
name: string
|
name: string
|
||||||
type: string
|
type: string
|
||||||
status: number
|
status: number
|
||||||
createTime: []
|
createTime: Date[]
|
||||||
}
|
}
|
||||||
|
|
||||||
export type DictTypeExportReqVO = {
|
export type DictTypeExportReqVO = {
|
||||||
name: string
|
name: string
|
||||||
type: string
|
type: string
|
||||||
status: number
|
status: number
|
||||||
createTime: []
|
createTime: Date[]
|
||||||
}
|
}
|
||||||
|
|
||||||
export type DictDataVO = {
|
export type DictDataVO = {
|
||||||
@ -31,7 +31,7 @@ export type DictDataVO = {
|
|||||||
colorType: string
|
colorType: string
|
||||||
cssClass: string
|
cssClass: string
|
||||||
remark: string
|
remark: string
|
||||||
createTime: string
|
createTime: Date
|
||||||
}
|
}
|
||||||
export type DictDataPageReqVO = {
|
export type DictDataPageReqVO = {
|
||||||
label: string
|
label: string
|
||||||
|
@ -7,7 +7,7 @@ export interface ErrorCodeVO {
|
|||||||
code: number
|
code: number
|
||||||
message: string
|
message: string
|
||||||
memo: string
|
memo: string
|
||||||
createTime: string
|
createTime: Date
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface ErrorCodePageReqVO extends PageParam {
|
export interface ErrorCodePageReqVO extends PageParam {
|
||||||
@ -15,7 +15,7 @@ export interface ErrorCodePageReqVO extends PageParam {
|
|||||||
applicationName?: string
|
applicationName?: string
|
||||||
code?: number
|
code?: number
|
||||||
message?: string
|
message?: string
|
||||||
createTime?: string[]
|
createTime?: Date[]
|
||||||
}
|
}
|
||||||
|
|
||||||
// 查询错误码列表
|
// 查询错误码列表
|
||||||
|
@ -4,19 +4,20 @@ export interface LoginLogVO {
|
|||||||
id: number
|
id: number
|
||||||
logType: number
|
logType: number
|
||||||
traceId: number
|
traceId: number
|
||||||
|
userId: number
|
||||||
userType: number
|
userType: number
|
||||||
username: string
|
username: string
|
||||||
status: number
|
status: number
|
||||||
userIp: string
|
userIp: string
|
||||||
userAgent: string
|
userAgent: string
|
||||||
createTime: string
|
createTime: Date
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface LoginLogReqVO extends PageParam {
|
export interface LoginLogReqVO extends PageParam {
|
||||||
userIp?: string
|
userIp?: string
|
||||||
username?: string
|
username?: string
|
||||||
status?: boolean
|
status?: boolean
|
||||||
createTime?: string[]
|
createTime?: Date[]
|
||||||
}
|
}
|
||||||
|
|
||||||
// 查询登录日志列表
|
// 查询登录日志列表
|
||||||
|
@ -13,7 +13,7 @@ export interface MenuVO {
|
|||||||
status: number
|
status: number
|
||||||
visible: boolean
|
visible: boolean
|
||||||
keepAlive: boolean
|
keepAlive: boolean
|
||||||
createTime: string
|
createTime: Date
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface MenuPageReqVO {
|
export interface MenuPageReqVO {
|
||||||
|
@ -8,9 +8,7 @@ export interface NoticeVO {
|
|||||||
status: number
|
status: number
|
||||||
remark: string
|
remark: string
|
||||||
creator: string
|
creator: string
|
||||||
createTime: string
|
createTime: Date
|
||||||
updater: string
|
|
||||||
updateTime: string
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface NoticePageReqVO extends PageParam {
|
export interface NoticePageReqVO extends PageParam {
|
||||||
|
@ -18,11 +18,15 @@ export interface OAuth2ClientVO {
|
|||||||
resourceIds: string[]
|
resourceIds: string[]
|
||||||
additionalInformation: string
|
additionalInformation: string
|
||||||
isAdditionalInformationJson: boolean
|
isAdditionalInformationJson: boolean
|
||||||
createTime: string
|
createTime: Date
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export interface OAuth2ClientPageReqVO extends PageParam {
|
||||||
|
name?: string
|
||||||
|
status?: number
|
||||||
|
}
|
||||||
// 查询 OAuth2列表
|
// 查询 OAuth2列表
|
||||||
export const getOAuth2ClientPageApi = (params) => {
|
export const getOAuth2ClientPageApi = (params: OAuth2ClientPageReqVO) => {
|
||||||
return request.get({ url: '/system/oauth2-client/page', params })
|
return request.get({ url: '/system/oauth2-client/page', params })
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -7,14 +7,14 @@ export interface OAuth2TokenVO {
|
|||||||
userId: number
|
userId: number
|
||||||
userType: number
|
userType: number
|
||||||
clientId: string
|
clientId: string
|
||||||
createTime: string
|
createTime: Date
|
||||||
expiresTime: string
|
expiresTime: Date
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface OAuth2TokenPageReqVO extends PageParam {
|
export interface OAuth2TokenPageReqVO extends PageParam {
|
||||||
code?: string
|
userId?: number
|
||||||
name?: string
|
userType?: number
|
||||||
status?: number
|
clientId?: string
|
||||||
}
|
}
|
||||||
|
|
||||||
// 查询 token列表
|
// 查询 token列表
|
||||||
|
@ -9,14 +9,14 @@ export type OperateLogVO = {
|
|||||||
name: string
|
name: string
|
||||||
type: number
|
type: number
|
||||||
content: string
|
content: string
|
||||||
exts: object
|
exts: Map<String, Object>
|
||||||
requestMethod: string
|
requestMethod: string
|
||||||
requestUrl: string
|
requestUrl: string
|
||||||
userIp: string
|
userIp: string
|
||||||
userAgent: string
|
userAgent: string
|
||||||
javaMethod: string
|
javaMethod: string
|
||||||
javaMethodArgs: string
|
javaMethodArgs: string
|
||||||
startTime: string
|
startTime: Date
|
||||||
duration: number
|
duration: number
|
||||||
resultCode: number
|
resultCode: number
|
||||||
resultMsg: string
|
resultMsg: string
|
||||||
@ -28,7 +28,7 @@ export interface OperateLogPageReqVO extends PageParam {
|
|||||||
userNickname?: string
|
userNickname?: string
|
||||||
type?: number
|
type?: number
|
||||||
success?: boolean
|
success?: boolean
|
||||||
startTime?: string[]
|
startTime?: Date[]
|
||||||
}
|
}
|
||||||
|
|
||||||
// 查询操作日志列表
|
// 查询操作日志列表
|
||||||
|
@ -7,7 +7,7 @@ export interface PostVO {
|
|||||||
sort: number
|
sort: number
|
||||||
status: number
|
status: number
|
||||||
remark: string
|
remark: string
|
||||||
createTime?: string
|
createTime?: Date
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface PostPageReqVO extends PageParam {
|
export interface PostPageReqVO extends PageParam {
|
||||||
|
@ -7,14 +7,19 @@ export interface RoleVO {
|
|||||||
sort: number
|
sort: number
|
||||||
status: number
|
status: number
|
||||||
type: number
|
type: number
|
||||||
createTime: string
|
createTime: Date
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface RolePageReqVO extends PageParam {
|
export interface RolePageReqVO extends PageParam {
|
||||||
name?: string
|
name?: string
|
||||||
code?: string
|
code?: string
|
||||||
status?: number
|
status?: number
|
||||||
createTime?: string[]
|
createTime?: Date[]
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface UpdateStatusReqVO {
|
||||||
|
id: number
|
||||||
|
status: number
|
||||||
}
|
}
|
||||||
|
|
||||||
// 查询角色列表
|
// 查询角色列表
|
||||||
@ -43,7 +48,7 @@ export const updateRoleApi = async (data: RoleVO) => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 修改角色状态
|
// 修改角色状态
|
||||||
export const updateRoleStatusApi = async (data: RoleVO) => {
|
export const updateRoleStatusApi = async (data: UpdateStatusReqVO) => {
|
||||||
return await request.put({ url: '/system/role/update-status', data })
|
return await request.put({ url: '/system/role/update-status', data })
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -5,19 +5,22 @@ export interface SensitiveWordVO {
|
|||||||
name: string
|
name: string
|
||||||
status: number
|
status: number
|
||||||
description: string
|
description: string
|
||||||
tags: string
|
tags: string[]
|
||||||
type: number
|
createTime: Date
|
||||||
createTime: string
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface SensitiveWordPageReqVO extends PageParam {
|
export interface SensitiveWordPageReqVO extends PageParam {
|
||||||
name?: string
|
name?: string
|
||||||
|
tag?: string
|
||||||
status?: number
|
status?: number
|
||||||
|
createTime?: Date[]
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface SensitiveWordExportReqVO {
|
export interface SensitiveWordExportReqVO {
|
||||||
name?: string
|
name?: string
|
||||||
|
tag?: string
|
||||||
status?: number
|
status?: number
|
||||||
|
createTime?: Date[]
|
||||||
}
|
}
|
||||||
|
|
||||||
// 查询敏感词列表
|
// 查询敏感词列表
|
||||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user