refactor: 重构项目结构
This commit is contained in:
parent
d0366337c3
commit
ad11871c67
|
@ -12,7 +12,7 @@
|
||||||
<name>common Maven Webapp</name>
|
<name>common Maven Webapp</name>
|
||||||
<url>https://maven.apache.org</url>
|
<url>https://maven.apache.org</url>
|
||||||
<modules>
|
<modules>
|
||||||
<module>service-utils</module>
|
<!-- <module>service-utils</module> -->
|
||||||
<module>common-generator</module>
|
<module>common-generator</module>
|
||||||
</modules>
|
</modules>
|
||||||
|
|
||||||
|
@ -22,10 +22,6 @@
|
||||||
<artifactId>dao</artifactId>
|
<artifactId>dao</artifactId>
|
||||||
<version>0.0.1-SNAPSHOT</version>
|
<version>0.0.1-SNAPSHOT</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
|
||||||
<groupId>org.springframework.boot</groupId>
|
|
||||||
<artifactId>spring-boot-starter-web</artifactId>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.fasterxml.jackson.datatype</groupId>
|
<groupId>com.fasterxml.jackson.datatype</groupId>
|
||||||
<artifactId>jackson-datatype-jsr310</artifactId>
|
<artifactId>jackson-datatype-jsr310</artifactId>
|
||||||
|
|
|
@ -1,70 +0,0 @@
|
||||||
<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>common</artifactId>
|
|
||||||
<version>0.0.1-SNAPSHOT</version>
|
|
||||||
</parent>
|
|
||||||
|
|
||||||
<artifactId>service-utils</artifactId>
|
|
||||||
<packaging>jar</packaging>
|
|
||||||
<name>service-utils</name>
|
|
||||||
<url>https://maven.apache.org</url>
|
|
||||||
|
|
||||||
<properties>
|
|
||||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
|
||||||
</properties>
|
|
||||||
|
|
||||||
<dependencies>
|
|
||||||
<!-- 解决 javax.xml.bind 错误 -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>javax.xml.bind</groupId>
|
|
||||||
<artifactId>jaxb-api</artifactId>
|
|
||||||
<version>2.3.1</version>
|
|
||||||
</dependency>
|
|
||||||
<!-- httpclient -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.apache.httpcomponents</groupId>
|
|
||||||
<artifactId>httpclient</artifactId>
|
|
||||||
<version>4.5.14</version>
|
|
||||||
</dependency>
|
|
||||||
<!-- redis -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.springframework.boot</groupId>
|
|
||||||
<artifactId>spring-boot-starter-data-redis</artifactId>
|
|
||||||
</dependency>
|
|
||||||
<!-- redisson 分布式锁-->
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.redisson</groupId>
|
|
||||||
<artifactId>redisson</artifactId>
|
|
||||||
<version>3.26.1</version>
|
|
||||||
</dependency>
|
|
||||||
<!-- minio -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>io.minio</groupId>
|
|
||||||
<artifactId>minio</artifactId>
|
|
||||||
</dependency>
|
|
||||||
<!-- 查询ip地址 -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.lionsoul</groupId>
|
|
||||||
<artifactId>ip2region</artifactId>
|
|
||||||
<version>2.6.5</version>
|
|
||||||
</dependency>
|
|
||||||
<!-- WebSocket -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.springframework</groupId>
|
|
||||||
<artifactId>spring-websocket</artifactId>
|
|
||||||
</dependency>
|
|
||||||
<!-- 邮箱 -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.springframework.boot</groupId>
|
|
||||||
<artifactId>spring-boot-starter-mail</artifactId>
|
|
||||||
</dependency>
|
|
||||||
<!-- 表单验证 -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.springframework.boot</groupId>
|
|
||||||
<artifactId>spring-boot-starter-validation</artifactId>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
|
||||||
</project>
|
|
|
@ -41,4 +41,5 @@ public class LoginDto {
|
||||||
|
|
||||||
@Schema(name = "readMeDay", title = "记住我的天数")
|
@Schema(name = "readMeDay", title = "记住我的天数")
|
||||||
private Long readMeDay = 1L;
|
private Long readMeDay = 1L;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,5 +1,7 @@
|
||||||
package cn.bunny.dao.entity.quartz;
|
package cn.bunny.dao.entity.quartz;
|
||||||
|
|
||||||
|
import com.baomidou.mybatisplus.annotation.IdType;
|
||||||
|
import com.baomidou.mybatisplus.annotation.TableId;
|
||||||
import com.baomidou.mybatisplus.annotation.TableName;
|
import com.baomidou.mybatisplus.annotation.TableName;
|
||||||
import io.swagger.v3.oas.annotations.media.Schema;
|
import io.swagger.v3.oas.annotations.media.Schema;
|
||||||
import lombok.Getter;
|
import lombok.Getter;
|
||||||
|
@ -24,6 +26,7 @@ import java.io.Serializable;
|
||||||
public class Schedulers implements Serializable {
|
public class Schedulers implements Serializable {
|
||||||
|
|
||||||
@Schema(name = "jobName", title = "任务名称")
|
@Schema(name = "jobName", title = "任务名称")
|
||||||
|
@TableId(type = IdType.NONE)
|
||||||
private String jobName;
|
private String jobName;
|
||||||
|
|
||||||
@Schema(name = "jobGroup", title = "任务分组")
|
@Schema(name = "jobGroup", title = "任务分组")
|
||||||
|
|
9
pom.xml
9
pom.xml
|
@ -27,19 +27,19 @@
|
||||||
<java.version>17</java.version>
|
<java.version>17</java.version>
|
||||||
<junit.version>3.8.1</junit.version>
|
<junit.version>3.8.1</junit.version>
|
||||||
<mybatis-plus.version>3.5.6</mybatis-plus.version>
|
<mybatis-plus.version>3.5.6</mybatis-plus.version>
|
||||||
<mysql.version>8.0.30</mysql.version>
|
<mysql.version>8.0.33</mysql.version>
|
||||||
<knife4j.version>4.5.0</knife4j.version>
|
<knife4j.version>4.5.0</knife4j.version>
|
||||||
<fastjson2.version>2.0.47</fastjson2.version>
|
<fastjson2.version>2.0.47</fastjson2.version>
|
||||||
<minio.version>8.5.9</minio.version>
|
<minio.version>8.5.17</minio.version>
|
||||||
<lombok.version>1.18.32</lombok.version>
|
<lombok.version>1.18.32</lombok.version>
|
||||||
<jwt.version>0.9.1</jwt.version>
|
<jwt.version>0.9.1</jwt.version>
|
||||||
<easyexcel.version>3.3.3</easyexcel.version>
|
<easyexcel.version>4.0.2</easyexcel.version>
|
||||||
<jodatime.version>2.10.1</jodatime.version>
|
<jodatime.version>2.10.1</jodatime.version>
|
||||||
<aspectj>1.9.21</aspectj>
|
<aspectj>1.9.21</aspectj>
|
||||||
<pagehelper.version>6.1.0</pagehelper.version>
|
<pagehelper.version>6.1.0</pagehelper.version>
|
||||||
<velocity.version>2.2</velocity.version>
|
<velocity.version>2.2</velocity.version>
|
||||||
<velocity-tools.version>3.1</velocity-tools.version>
|
<velocity-tools.version>3.1</velocity-tools.version>
|
||||||
<HikariCP.version>5.1.0</HikariCP.version>
|
<HikariCP.version>6.2.1</HikariCP.version>
|
||||||
<dynamic.datasource.version>4.3.1</dynamic.datasource.version>
|
<dynamic.datasource.version>4.3.1</dynamic.datasource.version>
|
||||||
<jackson-dataType.version>2.12.3</jackson-dataType.version>
|
<jackson-dataType.version>2.12.3</jackson-dataType.version>
|
||||||
<quartz-scheduler.version>2.3.2</quartz-scheduler.version>
|
<quartz-scheduler.version>2.3.2</quartz-scheduler.version>
|
||||||
|
@ -188,5 +188,4 @@
|
||||||
</properties>
|
</properties>
|
||||||
</profile>
|
</profile>
|
||||||
</profiles>
|
</profiles>
|
||||||
|
|
||||||
</project>
|
</project>
|
||||||
|
|
165
service/pom.xml
165
service/pom.xml
|
@ -14,61 +14,20 @@
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||||
<docker.repostory>192.168.3.98:1100</docker.repostory>
|
|
||||||
<docker.host>192.168.3.98:2375</docker.host>
|
|
||||||
<docker.registry.name>bunny-service</docker.registry.name>
|
<docker.registry.name>bunny-service</docker.registry.name>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>cn.bunny</groupId>
|
<groupId>cn.bunny</groupId>
|
||||||
<artifactId>service-utils</artifactId>
|
<artifactId>dao</artifactId>
|
||||||
<version>0.0.1-SNAPSHOT</version>
|
<version>0.0.1-SNAPSHOT</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<!-- devtools -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.springframework.boot</groupId>
|
|
||||||
<artifactId>spring-boot-devtools</artifactId>
|
|
||||||
<scope>runtime</scope>
|
|
||||||
<optional>true</optional>
|
|
||||||
</dependency>
|
|
||||||
<!-- thymeleaf -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.springframework.boot</groupId>
|
|
||||||
<artifactId>spring-boot-starter-thymeleaf</artifactId>
|
|
||||||
</dependency>
|
|
||||||
<!-- spring-security -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.springframework.boot</groupId>
|
|
||||||
<artifactId>spring-boot-starter-security</artifactId>
|
|
||||||
</dependency>
|
|
||||||
<!-- spring-security-test -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.springframework.security</groupId>
|
|
||||||
<artifactId>spring-security-test</artifactId>
|
|
||||||
</dependency>
|
|
||||||
<!-- 消除service utils黄色 -->
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.springframework.boot</groupId>
|
<groupId>org.springframework.boot</groupId>
|
||||||
<artifactId>spring-boot-starter-web</artifactId>
|
<artifactId>spring-boot-starter-web</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
<!-- admin 依赖 -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.springframework.boot</groupId>
|
|
||||||
<artifactId>spring-boot-starter-actuator</artifactId>
|
|
||||||
<version>3.2.3</version>
|
|
||||||
</dependency>
|
|
||||||
<!-- 单元测试 -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>junit</groupId>
|
|
||||||
<artifactId>junit</artifactId>
|
|
||||||
<version>3.8.1</version>
|
|
||||||
</dependency>
|
|
||||||
<!-- spring-test -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.springframework.boot</groupId>
|
|
||||||
<artifactId>spring-boot-starter-test</artifactId>
|
|
||||||
</dependency>
|
|
||||||
<!-- asp 切面 -->
|
<!-- asp 切面 -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.aspectj</groupId>
|
<groupId>org.aspectj</groupId>
|
||||||
|
@ -78,31 +37,135 @@
|
||||||
<groupId>org.aspectj</groupId>
|
<groupId>org.aspectj</groupId>
|
||||||
<artifactId>aspectjweaver</artifactId>
|
<artifactId>aspectjweaver</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
<!-- websocket -->
|
<dependency>
|
||||||
|
<groupId>org.springframework.boot</groupId>
|
||||||
|
<artifactId>spring-boot-devtools</artifactId>
|
||||||
|
<scope>runtime</scope>
|
||||||
|
<optional>true</optional>
|
||||||
|
</dependency>
|
||||||
|
<!-- quartz -->
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.quartz-scheduler</groupId>
|
||||||
|
<artifactId>quartz</artifactId>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
|
<!-- 单元测试 -->
|
||||||
|
<dependency>
|
||||||
|
<groupId>junit</groupId>
|
||||||
|
<artifactId>junit</artifactId>
|
||||||
|
<version>3.8.1</version>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.springframework.boot</groupId>
|
||||||
|
<artifactId>spring-boot-starter-test</artifactId>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.springframework.security</groupId>
|
||||||
|
<artifactId>spring-security-test</artifactId>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
|
<!-- <!– spring-security –> -->
|
||||||
|
<!-- <dependency> -->
|
||||||
|
<!-- <groupId>org.springframework.boot</groupId> -->
|
||||||
|
<!-- <artifactId>spring-boot-starter-security</artifactId> -->
|
||||||
|
<!-- </dependency> -->
|
||||||
|
|
||||||
|
<!-- thymeleaf -->
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.springframework.boot</groupId>
|
||||||
|
<artifactId>spring-boot-starter-thymeleaf</artifactId>
|
||||||
|
</dependency>
|
||||||
|
<!-- 邮箱 -->
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.springframework.boot</groupId>
|
||||||
|
<artifactId>spring-boot-starter-mail</artifactId>
|
||||||
|
</dependency>
|
||||||
|
<!-- WebSocket -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.springframework.boot</groupId>
|
<groupId>org.springframework.boot</groupId>
|
||||||
<artifactId>spring-boot-starter-websocket</artifactId>
|
<artifactId>spring-boot-starter-websocket</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.springframework</groupId>
|
||||||
|
<artifactId>spring-websocket</artifactId>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
|
<!-- 表单验证 -->
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.springframework.boot</groupId>
|
||||||
|
<artifactId>spring-boot-starter-validation</artifactId>
|
||||||
|
</dependency>
|
||||||
|
<!-- admin 依赖 -->
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.springframework.boot</groupId>
|
||||||
|
<artifactId>spring-boot-starter-actuator</artifactId>
|
||||||
|
<version>3.2.3</version>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
|
<!-- hutool -->
|
||||||
|
<dependency>
|
||||||
|
<groupId>cn.hutool</groupId>
|
||||||
|
<artifactId>hutool-all</artifactId>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.apache.httpcomponents</groupId>
|
||||||
|
<artifactId>httpclient</artifactId>
|
||||||
|
<version>4.5.14</version>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
|
<!-- mysql连接驱动 -->
|
||||||
|
<dependency>
|
||||||
|
<groupId>mysql</groupId>
|
||||||
|
<artifactId>mysql-connector-java</artifactId>
|
||||||
|
</dependency>
|
||||||
<!-- 多数据库源插件 -->
|
<!-- 多数据库源插件 -->
|
||||||
<!-- <dependency> -->
|
<!-- <dependency> -->
|
||||||
<!-- <groupId>com.baomidou</groupId> -->
|
<!-- <groupId>com.baomidou</groupId> -->
|
||||||
<!-- <artifactId>dynamic-datasource-spring-boot3-starter</artifactId> -->
|
<!-- <artifactId>dynamic-datasource-spring-boot3-starter</artifactId> -->
|
||||||
<!-- </dependency> -->
|
<!-- </dependency> -->
|
||||||
<!-- quartz定时任务 -->
|
<!-- redis -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.quartz-scheduler</groupId>
|
<groupId>org.springframework.boot</groupId>
|
||||||
<artifactId>quartz</artifactId>
|
<artifactId>spring-boot-starter-data-redis</artifactId>
|
||||||
|
</dependency>
|
||||||
|
<!-- minio -->
|
||||||
|
<dependency>
|
||||||
|
<groupId>io.minio</groupId>
|
||||||
|
<artifactId>minio</artifactId>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
|
<!-- JWT -->
|
||||||
|
<dependency>
|
||||||
|
<groupId>io.jsonwebtoken</groupId>
|
||||||
|
<artifactId>jjwt</artifactId>
|
||||||
|
</dependency>
|
||||||
|
<!-- 查询ip地址 -->
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.lionsoul</groupId>
|
||||||
|
<artifactId>ip2region</artifactId>
|
||||||
|
<version>2.6.5</version>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
|
<!-- 直接找不到上下文 -->
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.springframework</groupId>
|
||||||
|
<artifactId>spring-context-support</artifactId>
|
||||||
|
<version>6.1.6</version>
|
||||||
|
</dependency>
|
||||||
|
<!-- 解决 javax.xml.bind 错误 -->
|
||||||
|
<dependency>
|
||||||
|
<groupId>javax.xml.bind</groupId>
|
||||||
|
<artifactId>jaxb-api</artifactId>
|
||||||
|
<version>2.3.1</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.mchange</groupId>
|
<groupId>com.mchange</groupId>
|
||||||
<artifactId>c3p0</artifactId>
|
<artifactId>c3p0</artifactId>
|
||||||
<version>0.9.5.5</version>
|
<version>0.9.5.5</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<!-- 直接找不到上下文 -->
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.springframework</groupId>
|
<groupId>com.fasterxml.jackson.datatype</groupId>
|
||||||
<artifactId>spring-context-support</artifactId>
|
<artifactId>jackson-datatype-jsr310</artifactId>
|
||||||
<version>6.1.6</version>
|
|
||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
|
|
|
@ -14,8 +14,8 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
|
||||||
@EnableCaching
|
@EnableCaching
|
||||||
@EnableTransactionManagement
|
@EnableTransactionManagement
|
||||||
@SpringBootApplication
|
@SpringBootApplication
|
||||||
public class ServiceApplication {
|
public class AuthServiceApplication {
|
||||||
public static void main(String[] args) {
|
public static void main(String[] args) {
|
||||||
SpringApplication.run(ServiceApplication.class, args);
|
SpringApplication.run(AuthServiceApplication.class, args);
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -1,7 +1,7 @@
|
||||||
package cn.bunny.services.aop;
|
package cn.bunny.services.aop;
|
||||||
|
|
||||||
import cn.bunny.common.service.exception.AuthCustomerException;
|
|
||||||
import cn.bunny.dao.vo.result.ResultCodeEnum;
|
import cn.bunny.dao.vo.result.ResultCodeEnum;
|
||||||
|
import cn.bunny.services.exception.AuthCustomerException;
|
||||||
import org.springframework.beans.factory.config.BeanDefinition;
|
import org.springframework.beans.factory.config.BeanDefinition;
|
||||||
import org.springframework.context.annotation.ClassPathScanningCandidateComponentProvider;
|
import org.springframework.context.annotation.ClassPathScanningCandidateComponentProvider;
|
||||||
import org.springframework.core.type.filter.AnnotationTypeFilter;
|
import org.springframework.core.type.filter.AnnotationTypeFilter;
|
||||||
|
@ -12,7 +12,7 @@ import java.util.HashSet;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* * 扫描指定目录下所有类
|
* 扫描指定目录下所有类
|
||||||
*/
|
*/
|
||||||
@Component
|
@Component
|
||||||
public class AnnotationScanner {
|
public class AnnotationScanner {
|
||||||
|
|
|
@ -104,5 +104,4 @@ public class JobExecuteAspect {
|
||||||
@Pointcut("execution(* cn.bunny.services.quartz.*.execute(..))")
|
@Pointcut("execution(* cn.bunny.services.quartz.*.execute(..))")
|
||||||
public void pointCut() {
|
public void pointCut() {
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
package cn.bunny.common.service.config;
|
package cn.bunny.services.config;
|
||||||
|
|
||||||
import com.fasterxml.jackson.core.JsonParser;
|
import com.fasterxml.jackson.core.JsonParser;
|
||||||
import com.fasterxml.jackson.databind.DeserializationContext;
|
import com.fasterxml.jackson.databind.DeserializationContext;
|
|
@ -1,4 +1,4 @@
|
||||||
package cn.bunny.common.service.config;
|
package cn.bunny.services.config;
|
||||||
|
|
||||||
import io.swagger.v3.oas.models.ExternalDocumentation;
|
import io.swagger.v3.oas.models.ExternalDocumentation;
|
||||||
import io.swagger.v3.oas.models.OpenAPI;
|
import io.swagger.v3.oas.models.OpenAPI;
|
|
@ -1,6 +1,6 @@
|
||||||
package cn.bunny.common.service.config;
|
package cn.bunny.services.config;
|
||||||
|
|
||||||
import cn.bunny.common.service.context.BaseContext;
|
import cn.bunny.services.context.BaseContext;
|
||||||
import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
|
import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
|
||||||
import org.apache.ibatis.reflection.MetaObject;
|
import org.apache.ibatis.reflection.MetaObject;
|
||||||
import org.springframework.stereotype.Component;
|
import org.springframework.stereotype.Component;
|
|
@ -1,4 +1,4 @@
|
||||||
package cn.bunny.common.service.config;
|
package cn.bunny.services.config;
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.annotation.DbType;
|
import com.baomidou.mybatisplus.annotation.DbType;
|
||||||
import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
|
import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
|
|
@ -1,4 +1,4 @@
|
||||||
package cn.bunny.common.service.config;
|
package cn.bunny.services.config;
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonAutoDetect;
|
import com.fasterxml.jackson.annotation.JsonAutoDetect;
|
||||||
import com.fasterxml.jackson.annotation.PropertyAccessor;
|
import com.fasterxml.jackson.annotation.PropertyAccessor;
|
||||||
|
@ -52,7 +52,7 @@ public class RedisConfiguration {
|
||||||
redisTemplate.setHashValueSerializer(new GenericJackson2JsonRedisSerializer());
|
redisTemplate.setHashValueSerializer(new GenericJackson2JsonRedisSerializer());
|
||||||
|
|
||||||
// 开启Redis事务
|
// 开启Redis事务
|
||||||
redisTemplate.setEnableTransactionSupport(true);
|
// redisTemplate.setEnableTransactionSupport(true);
|
||||||
return redisTemplate;
|
return redisTemplate;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
package cn.bunny.common.service.context;
|
package cn.bunny.services.context;
|
||||||
|
|
||||||
import cn.bunny.dao.vo.system.user.LoginVo;
|
import cn.bunny.dao.vo.system.user.LoginVo;
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
package cn.bunny.common.service.exception;
|
package cn.bunny.services.exception;
|
||||||
|
|
||||||
import cn.bunny.dao.vo.result.ResultCodeEnum;
|
import cn.bunny.dao.vo.result.ResultCodeEnum;
|
||||||
import lombok.Getter;
|
import lombok.Getter;
|
|
@ -1,10 +1,11 @@
|
||||||
package cn.bunny.common.service.exception;
|
package cn.bunny.services.exception;
|
||||||
|
|
||||||
|
|
||||||
import cn.bunny.common.service.context.BaseContext;
|
|
||||||
import cn.bunny.dao.vo.result.Result;
|
import cn.bunny.dao.vo.result.Result;
|
||||||
import cn.bunny.dao.vo.result.ResultCodeEnum;
|
import cn.bunny.dao.vo.result.ResultCodeEnum;
|
||||||
|
import cn.bunny.services.context.BaseContext;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
import org.mybatis.spring.MyBatisSystemException;
|
||||||
import org.springframework.context.support.DefaultMessageSourceResolvable;
|
import org.springframework.context.support.DefaultMessageSourceResolvable;
|
||||||
import org.springframework.util.StringUtils;
|
import org.springframework.util.StringUtils;
|
||||||
import org.springframework.web.bind.MethodArgumentNotValidException;
|
import org.springframework.web.bind.MethodArgumentNotValidException;
|
||||||
|
@ -38,7 +39,8 @@ public class GlobalExceptionHandler {
|
||||||
public Result<Object> exceptionHandler(RuntimeException exception) {
|
public Result<Object> exceptionHandler(RuntimeException exception) {
|
||||||
String message = exception.getMessage();
|
String message = exception.getMessage();
|
||||||
message = StringUtils.hasText(message) ? message : "服务器异常";
|
message = StringUtils.hasText(message) ? message : "服务器异常";
|
||||||
|
exception.printStackTrace();
|
||||||
|
|
||||||
// 解析异常
|
// 解析异常
|
||||||
String jsonParseError = "JSON parse error (.*)";
|
String jsonParseError = "JSON parse error (.*)";
|
||||||
Matcher jsonParseErrorMatcher = Pattern.compile(jsonParseError).matcher(message);
|
Matcher jsonParseErrorMatcher = Pattern.compile(jsonParseError).matcher(message);
|
||||||
|
@ -67,36 +69,14 @@ public class GlobalExceptionHandler {
|
||||||
return Result.error(null, 500, "表达式 " + cronExpressionMatcher.group(1) + " 不合法");
|
return Result.error(null, 500, "表达式 " + cronExpressionMatcher.group(1) + " 不合法");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (exception instanceof MyBatisSystemException) {
|
||||||
|
return Result.error(null, 500, "数据库异常");
|
||||||
|
}
|
||||||
|
|
||||||
log.error("GlobalExceptionHandler===>运行时异常信息:{}", message);
|
log.error("GlobalExceptionHandler===>运行时异常信息:{}", message);
|
||||||
exception.printStackTrace();
|
|
||||||
return Result.error(null, 500, message);
|
return Result.error(null, 500, message);
|
||||||
}
|
}
|
||||||
|
|
||||||
// 捕获系统异常
|
|
||||||
@ExceptionHandler(Exception.class)
|
|
||||||
@ResponseBody
|
|
||||||
public Result<Object> error(Exception exception) {
|
|
||||||
log.error("捕获系统异常:{}", exception.getMessage());
|
|
||||||
log.error("GlobalExceptionHandler===>系统异常信息:{}", (Object) exception.getStackTrace());
|
|
||||||
|
|
||||||
// 错误消息
|
|
||||||
String message = exception.getMessage();
|
|
||||||
|
|
||||||
// 匹配到内容
|
|
||||||
String patternString = "Request method '(\\w+)' is not supported";
|
|
||||||
Matcher matcher = Pattern.compile(patternString).matcher(message);
|
|
||||||
if (matcher.find()) return Result.error(null, 500, "请求方法错误,不是 " + matcher.group(1) + "类型请求");
|
|
||||||
|
|
||||||
// 请求API不存在
|
|
||||||
String noStaticResource = "No static resource (.*)\\.";
|
|
||||||
Matcher noStaticResourceMatcher = Pattern.compile(noStaticResource).matcher(message);
|
|
||||||
if (noStaticResourceMatcher.find())
|
|
||||||
return Result.error(null, 500, "请求API不存在 " + noStaticResourceMatcher.group(1));
|
|
||||||
|
|
||||||
// 返回错误内容
|
|
||||||
return Result.error(null, 500, "系统异常");
|
|
||||||
}
|
|
||||||
|
|
||||||
// 表单验证字段
|
// 表单验证字段
|
||||||
@ExceptionHandler(MethodArgumentNotValidException.class)
|
@ExceptionHandler(MethodArgumentNotValidException.class)
|
||||||
public Result<String> handleValidationExceptions(MethodArgumentNotValidException ex) {
|
public Result<String> handleValidationExceptions(MethodArgumentNotValidException ex) {
|
|
@ -1,14 +1,14 @@
|
||||||
package cn.bunny.services.security.custom;
|
package cn.bunny.services.security.custom;
|
||||||
|
|
||||||
import cn.bunny.common.service.context.BaseContext;
|
|
||||||
import cn.bunny.common.service.utils.JwtHelper;
|
|
||||||
import cn.bunny.dao.constant.RedisUserConstant;
|
import cn.bunny.dao.constant.RedisUserConstant;
|
||||||
import cn.bunny.dao.entity.system.Power;
|
import cn.bunny.dao.entity.system.Power;
|
||||||
import cn.bunny.dao.entity.system.Role;
|
import cn.bunny.dao.entity.system.Role;
|
||||||
import cn.bunny.dao.vo.result.ResultCodeEnum;
|
import cn.bunny.dao.vo.result.ResultCodeEnum;
|
||||||
import cn.bunny.dao.vo.system.user.LoginVo;
|
import cn.bunny.dao.vo.system.user.LoginVo;
|
||||||
|
import cn.bunny.services.context.BaseContext;
|
||||||
import cn.bunny.services.mapper.PowerMapper;
|
import cn.bunny.services.mapper.PowerMapper;
|
||||||
import cn.bunny.services.mapper.RoleMapper;
|
import cn.bunny.services.mapper.RoleMapper;
|
||||||
|
import cn.bunny.services.utils.JwtHelper;
|
||||||
import cn.bunny.services.utils.RoleUtil;
|
import cn.bunny.services.utils.RoleUtil;
|
||||||
import com.alibaba.fastjson2.JSON;
|
import com.alibaba.fastjson2.JSON;
|
||||||
import jakarta.servlet.http.HttpServletRequest;
|
import jakarta.servlet.http.HttpServletRequest;
|
||||||
|
|
|
@ -1,7 +1,5 @@
|
||||||
package cn.bunny.services.security.filter;
|
package cn.bunny.services.security.filter;
|
||||||
|
|
||||||
|
|
||||||
import cn.bunny.common.service.utils.ResponseUtil;
|
|
||||||
import cn.bunny.dao.dto.system.user.LoginDto;
|
import cn.bunny.dao.dto.system.user.LoginDto;
|
||||||
import cn.bunny.dao.enums.LoginEnums;
|
import cn.bunny.dao.enums.LoginEnums;
|
||||||
import cn.bunny.dao.vo.result.Result;
|
import cn.bunny.dao.vo.result.Result;
|
||||||
|
@ -9,6 +7,7 @@ import cn.bunny.dao.vo.system.user.LoginVo;
|
||||||
import cn.bunny.services.security.handelr.SecurityAuthenticationFailureHandler;
|
import cn.bunny.services.security.handelr.SecurityAuthenticationFailureHandler;
|
||||||
import cn.bunny.services.security.handelr.SecurityAuthenticationSuccessHandler;
|
import cn.bunny.services.security.handelr.SecurityAuthenticationSuccessHandler;
|
||||||
import cn.bunny.services.service.UserService;
|
import cn.bunny.services.service.UserService;
|
||||||
|
import cn.bunny.services.utils.ResponseUtil;
|
||||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||||
import jakarta.servlet.FilterChain;
|
import jakarta.servlet.FilterChain;
|
||||||
import jakarta.servlet.http.HttpServletRequest;
|
import jakarta.servlet.http.HttpServletRequest;
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
package cn.bunny.services.security.handelr;
|
package cn.bunny.services.security.handelr;
|
||||||
|
|
||||||
import cn.bunny.common.service.utils.ResponseUtil;
|
|
||||||
import cn.bunny.dao.vo.result.Result;
|
import cn.bunny.dao.vo.result.Result;
|
||||||
import cn.bunny.dao.vo.result.ResultCodeEnum;
|
import cn.bunny.dao.vo.result.ResultCodeEnum;
|
||||||
import cn.bunny.services.security.custom.CustomAuthenticationException;
|
import cn.bunny.services.security.custom.CustomAuthenticationException;
|
||||||
|
import cn.bunny.services.utils.ResponseUtil;
|
||||||
import jakarta.servlet.http.HttpServletRequest;
|
import jakarta.servlet.http.HttpServletRequest;
|
||||||
import jakarta.servlet.http.HttpServletResponse;
|
import jakarta.servlet.http.HttpServletResponse;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
|
|
@ -1,10 +1,10 @@
|
||||||
package cn.bunny.services.service.impl;
|
package cn.bunny.services.service.impl;
|
||||||
|
|
||||||
import cn.bunny.common.service.exception.AuthCustomerException;
|
|
||||||
import cn.bunny.dao.constant.RedisUserConstant;
|
import cn.bunny.dao.constant.RedisUserConstant;
|
||||||
import cn.bunny.dao.dto.system.configuration.WebConfigurationDto;
|
import cn.bunny.dao.dto.system.configuration.WebConfigurationDto;
|
||||||
import cn.bunny.dao.entity.configuration.WebConfiguration;
|
import cn.bunny.dao.entity.configuration.WebConfiguration;
|
||||||
import cn.bunny.dao.vo.result.ResultCodeEnum;
|
import cn.bunny.dao.vo.result.ResultCodeEnum;
|
||||||
|
import cn.bunny.services.exception.AuthCustomerException;
|
||||||
import cn.bunny.services.service.ConfigurationService;
|
import cn.bunny.services.service.ConfigurationService;
|
||||||
import com.alibaba.fastjson2.JSON;
|
import com.alibaba.fastjson2.JSON;
|
||||||
import org.springframework.beans.BeanUtils;
|
import org.springframework.beans.BeanUtils;
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
package cn.bunny.services.service.impl;
|
package cn.bunny.services.service.impl;
|
||||||
|
|
||||||
import cn.bunny.common.service.exception.AuthCustomerException;
|
|
||||||
import cn.bunny.dao.dto.system.dept.DeptAddDto;
|
import cn.bunny.dao.dto.system.dept.DeptAddDto;
|
||||||
import cn.bunny.dao.dto.system.dept.DeptDto;
|
import cn.bunny.dao.dto.system.dept.DeptDto;
|
||||||
import cn.bunny.dao.dto.system.dept.DeptUpdateDto;
|
import cn.bunny.dao.dto.system.dept.DeptUpdateDto;
|
||||||
|
@ -8,6 +7,7 @@ import cn.bunny.dao.entity.system.Dept;
|
||||||
import cn.bunny.dao.vo.result.PageResult;
|
import cn.bunny.dao.vo.result.PageResult;
|
||||||
import cn.bunny.dao.vo.result.ResultCodeEnum;
|
import cn.bunny.dao.vo.result.ResultCodeEnum;
|
||||||
import cn.bunny.dao.vo.system.DeptVo;
|
import cn.bunny.dao.vo.system.DeptVo;
|
||||||
|
import cn.bunny.services.exception.AuthCustomerException;
|
||||||
import cn.bunny.services.mapper.DeptMapper;
|
import cn.bunny.services.mapper.DeptMapper;
|
||||||
import cn.bunny.services.mapper.UserDeptMapper;
|
import cn.bunny.services.mapper.UserDeptMapper;
|
||||||
import cn.bunny.services.service.DeptService;
|
import cn.bunny.services.service.DeptService;
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
package cn.bunny.services.service.impl;
|
package cn.bunny.services.service.impl;
|
||||||
|
|
||||||
import cn.bunny.common.service.exception.AuthCustomerException;
|
|
||||||
import cn.bunny.dao.dto.system.email.template.EmailTemplateAddDto;
|
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.EmailTemplateDto;
|
||||||
import cn.bunny.dao.dto.system.email.template.EmailTemplateUpdateDto;
|
import cn.bunny.dao.dto.system.email.template.EmailTemplateUpdateDto;
|
||||||
|
@ -9,6 +8,7 @@ import cn.bunny.dao.enums.EmailTemplateEnums;
|
||||||
import cn.bunny.dao.vo.result.PageResult;
|
import cn.bunny.dao.vo.result.PageResult;
|
||||||
import cn.bunny.dao.vo.result.ResultCodeEnum;
|
import cn.bunny.dao.vo.result.ResultCodeEnum;
|
||||||
import cn.bunny.dao.vo.system.email.EmailTemplateVo;
|
import cn.bunny.dao.vo.system.email.EmailTemplateVo;
|
||||||
|
import cn.bunny.services.exception.AuthCustomerException;
|
||||||
import cn.bunny.services.mapper.EmailTemplateMapper;
|
import cn.bunny.services.mapper.EmailTemplateMapper;
|
||||||
import cn.bunny.services.service.EmailTemplateService;
|
import cn.bunny.services.service.EmailTemplateService;
|
||||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
package cn.bunny.services.service.impl;
|
package cn.bunny.services.service.impl;
|
||||||
|
|
||||||
import cn.bunny.common.service.exception.AuthCustomerException;
|
|
||||||
import cn.bunny.dao.dto.system.email.user.EmailUserUpdateStatusDto;
|
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.EmailUsersAddDto;
|
||||||
import cn.bunny.dao.dto.system.email.user.EmailUsersDto;
|
import cn.bunny.dao.dto.system.email.user.EmailUsersDto;
|
||||||
|
@ -9,6 +8,7 @@ import cn.bunny.dao.entity.system.EmailUsers;
|
||||||
import cn.bunny.dao.vo.result.PageResult;
|
import cn.bunny.dao.vo.result.PageResult;
|
||||||
import cn.bunny.dao.vo.result.ResultCodeEnum;
|
import cn.bunny.dao.vo.result.ResultCodeEnum;
|
||||||
import cn.bunny.dao.vo.system.email.EmailUsersVo;
|
import cn.bunny.dao.vo.system.email.EmailUsersVo;
|
||||||
|
import cn.bunny.services.exception.AuthCustomerException;
|
||||||
import cn.bunny.services.mapper.EmailUsersMapper;
|
import cn.bunny.services.mapper.EmailUsersMapper;
|
||||||
import cn.bunny.services.service.EmailUsersService;
|
import cn.bunny.services.service.EmailUsersService;
|
||||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||||
|
|
|
@ -1,10 +1,5 @@
|
||||||
package cn.bunny.services.service.impl;
|
package cn.bunny.services.service.impl;
|
||||||
|
|
||||||
import cn.bunny.common.service.context.BaseContext;
|
|
||||||
import cn.bunny.common.service.exception.AuthCustomerException;
|
|
||||||
import cn.bunny.common.service.utils.FileUtil;
|
|
||||||
import cn.bunny.common.service.utils.minio.MinioProperties;
|
|
||||||
import cn.bunny.common.service.utils.minio.MinioUtil;
|
|
||||||
import cn.bunny.dao.dto.system.files.FileUploadDto;
|
import cn.bunny.dao.dto.system.files.FileUploadDto;
|
||||||
import cn.bunny.dao.dto.system.files.FilesAddDto;
|
import cn.bunny.dao.dto.system.files.FilesAddDto;
|
||||||
import cn.bunny.dao.dto.system.files.FilesDto;
|
import cn.bunny.dao.dto.system.files.FilesDto;
|
||||||
|
@ -15,8 +10,13 @@ import cn.bunny.dao.vo.result.PageResult;
|
||||||
import cn.bunny.dao.vo.result.ResultCodeEnum;
|
import cn.bunny.dao.vo.result.ResultCodeEnum;
|
||||||
import cn.bunny.dao.vo.system.files.FileInfoVo;
|
import cn.bunny.dao.vo.system.files.FileInfoVo;
|
||||||
import cn.bunny.dao.vo.system.files.FilesVo;
|
import cn.bunny.dao.vo.system.files.FilesVo;
|
||||||
|
import cn.bunny.services.context.BaseContext;
|
||||||
|
import cn.bunny.services.exception.AuthCustomerException;
|
||||||
import cn.bunny.services.mapper.FilesMapper;
|
import cn.bunny.services.mapper.FilesMapper;
|
||||||
import cn.bunny.services.service.FilesService;
|
import cn.bunny.services.service.FilesService;
|
||||||
|
import cn.bunny.services.utils.FileUtil;
|
||||||
|
import cn.bunny.services.utils.minio.MinioProperties;
|
||||||
|
import cn.bunny.services.utils.minio.MinioUtil;
|
||||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
package cn.bunny.services.service.impl;
|
package cn.bunny.services.service.impl;
|
||||||
|
|
||||||
import cn.bunny.common.service.exception.AuthCustomerException;
|
|
||||||
import cn.bunny.dao.dto.i18n.I18nAddDto;
|
import cn.bunny.dao.dto.i18n.I18nAddDto;
|
||||||
import cn.bunny.dao.dto.i18n.I18nDto;
|
import cn.bunny.dao.dto.i18n.I18nDto;
|
||||||
import cn.bunny.dao.dto.i18n.I18nUpdateDto;
|
import cn.bunny.dao.dto.i18n.I18nUpdateDto;
|
||||||
|
@ -9,6 +8,7 @@ import cn.bunny.dao.entity.i18n.I18nType;
|
||||||
import cn.bunny.dao.vo.i18n.I18nVo;
|
import cn.bunny.dao.vo.i18n.I18nVo;
|
||||||
import cn.bunny.dao.vo.result.PageResult;
|
import cn.bunny.dao.vo.result.PageResult;
|
||||||
import cn.bunny.dao.vo.result.ResultCodeEnum;
|
import cn.bunny.dao.vo.result.ResultCodeEnum;
|
||||||
|
import cn.bunny.services.exception.AuthCustomerException;
|
||||||
import cn.bunny.services.mapper.I18nMapper;
|
import cn.bunny.services.mapper.I18nMapper;
|
||||||
import cn.bunny.services.mapper.I18nTypeMapper;
|
import cn.bunny.services.mapper.I18nTypeMapper;
|
||||||
import cn.bunny.services.service.I18nService;
|
import cn.bunny.services.service.I18nService;
|
||||||
|
|
|
@ -1,12 +1,12 @@
|
||||||
package cn.bunny.services.service.impl;
|
package cn.bunny.services.service.impl;
|
||||||
|
|
||||||
import cn.bunny.common.service.exception.AuthCustomerException;
|
|
||||||
import cn.bunny.dao.dto.i18n.I18nTypeAddDto;
|
import cn.bunny.dao.dto.i18n.I18nTypeAddDto;
|
||||||
import cn.bunny.dao.dto.i18n.I18nTypeDto;
|
import cn.bunny.dao.dto.i18n.I18nTypeDto;
|
||||||
import cn.bunny.dao.dto.i18n.I18nTypeUpdateDto;
|
import cn.bunny.dao.dto.i18n.I18nTypeUpdateDto;
|
||||||
import cn.bunny.dao.entity.i18n.I18nType;
|
import cn.bunny.dao.entity.i18n.I18nType;
|
||||||
import cn.bunny.dao.vo.i18n.I18nTypeVo;
|
import cn.bunny.dao.vo.i18n.I18nTypeVo;
|
||||||
import cn.bunny.dao.vo.result.ResultCodeEnum;
|
import cn.bunny.dao.vo.result.ResultCodeEnum;
|
||||||
|
import cn.bunny.services.exception.AuthCustomerException;
|
||||||
import cn.bunny.services.mapper.I18nTypeMapper;
|
import cn.bunny.services.mapper.I18nTypeMapper;
|
||||||
import cn.bunny.services.service.I18nTypeService;
|
import cn.bunny.services.service.I18nTypeService;
|
||||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
package cn.bunny.services.service.impl;
|
package cn.bunny.services.service.impl;
|
||||||
|
|
||||||
import cn.bunny.common.service.exception.AuthCustomerException;
|
|
||||||
import cn.bunny.dao.dto.system.menuIcon.MenuIconAddDto;
|
import cn.bunny.dao.dto.system.menuIcon.MenuIconAddDto;
|
||||||
import cn.bunny.dao.dto.system.menuIcon.MenuIconDto;
|
import cn.bunny.dao.dto.system.menuIcon.MenuIconDto;
|
||||||
import cn.bunny.dao.dto.system.menuIcon.MenuIconUpdateDto;
|
import cn.bunny.dao.dto.system.menuIcon.MenuIconUpdateDto;
|
||||||
|
@ -8,6 +7,7 @@ import cn.bunny.dao.entity.system.MenuIcon;
|
||||||
import cn.bunny.dao.vo.result.PageResult;
|
import cn.bunny.dao.vo.result.PageResult;
|
||||||
import cn.bunny.dao.vo.result.ResultCodeEnum;
|
import cn.bunny.dao.vo.result.ResultCodeEnum;
|
||||||
import cn.bunny.dao.vo.system.MenuIconVo;
|
import cn.bunny.dao.vo.system.MenuIconVo;
|
||||||
|
import cn.bunny.services.exception.AuthCustomerException;
|
||||||
import cn.bunny.services.mapper.MenuIconMapper;
|
import cn.bunny.services.mapper.MenuIconMapper;
|
||||||
import cn.bunny.services.service.MenuIconService;
|
import cn.bunny.services.service.MenuIconService;
|
||||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||||
|
|
|
@ -1,7 +1,5 @@
|
||||||
package cn.bunny.services.service.impl;
|
package cn.bunny.services.service.impl;
|
||||||
|
|
||||||
import cn.bunny.common.service.context.BaseContext;
|
|
||||||
import cn.bunny.common.service.exception.AuthCustomerException;
|
|
||||||
import cn.bunny.dao.dto.system.message.MessageReceivedDto;
|
import cn.bunny.dao.dto.system.message.MessageReceivedDto;
|
||||||
import cn.bunny.dao.dto.system.message.MessageReceivedUpdateDto;
|
import cn.bunny.dao.dto.system.message.MessageReceivedUpdateDto;
|
||||||
import cn.bunny.dao.dto.system.message.MessageUserDto;
|
import cn.bunny.dao.dto.system.message.MessageUserDto;
|
||||||
|
@ -11,6 +9,8 @@ import cn.bunny.dao.vo.result.PageResult;
|
||||||
import cn.bunny.dao.vo.result.ResultCodeEnum;
|
import cn.bunny.dao.vo.result.ResultCodeEnum;
|
||||||
import cn.bunny.dao.vo.system.message.MessageReceivedWithMessageVo;
|
import cn.bunny.dao.vo.system.message.MessageReceivedWithMessageVo;
|
||||||
import cn.bunny.dao.vo.system.message.MessageUserVo;
|
import cn.bunny.dao.vo.system.message.MessageUserVo;
|
||||||
|
import cn.bunny.services.context.BaseContext;
|
||||||
|
import cn.bunny.services.exception.AuthCustomerException;
|
||||||
import cn.bunny.services.mapper.MessageReceivedMapper;
|
import cn.bunny.services.mapper.MessageReceivedMapper;
|
||||||
import cn.bunny.services.service.MessageReceivedService;
|
import cn.bunny.services.service.MessageReceivedService;
|
||||||
import cn.bunny.services.utils.UserUtil;
|
import cn.bunny.services.utils.UserUtil;
|
||||||
|
|
|
@ -1,7 +1,5 @@
|
||||||
package cn.bunny.services.service.impl;
|
package cn.bunny.services.service.impl;
|
||||||
|
|
||||||
import cn.bunny.common.service.context.BaseContext;
|
|
||||||
import cn.bunny.common.service.exception.AuthCustomerException;
|
|
||||||
import cn.bunny.dao.dto.system.message.MessageAddDto;
|
import cn.bunny.dao.dto.system.message.MessageAddDto;
|
||||||
import cn.bunny.dao.dto.system.message.MessageDto;
|
import cn.bunny.dao.dto.system.message.MessageDto;
|
||||||
import cn.bunny.dao.dto.system.message.MessageUpdateDto;
|
import cn.bunny.dao.dto.system.message.MessageUpdateDto;
|
||||||
|
@ -14,6 +12,8 @@ import cn.bunny.dao.vo.system.message.MessageDetailVo;
|
||||||
import cn.bunny.dao.vo.system.message.MessageReceivedWithMessageVo;
|
import cn.bunny.dao.vo.system.message.MessageReceivedWithMessageVo;
|
||||||
import cn.bunny.dao.vo.system.message.MessageReceivedWithUserVo;
|
import cn.bunny.dao.vo.system.message.MessageReceivedWithUserVo;
|
||||||
import cn.bunny.dao.vo.system.message.MessageVo;
|
import cn.bunny.dao.vo.system.message.MessageVo;
|
||||||
|
import cn.bunny.services.context.BaseContext;
|
||||||
|
import cn.bunny.services.exception.AuthCustomerException;
|
||||||
import cn.bunny.services.mapper.MessageMapper;
|
import cn.bunny.services.mapper.MessageMapper;
|
||||||
import cn.bunny.services.mapper.MessageReceivedMapper;
|
import cn.bunny.services.mapper.MessageReceivedMapper;
|
||||||
import cn.bunny.services.mapper.UserMapper;
|
import cn.bunny.services.mapper.UserMapper;
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
package cn.bunny.services.service.impl;
|
package cn.bunny.services.service.impl;
|
||||||
|
|
||||||
import cn.bunny.common.service.exception.AuthCustomerException;
|
|
||||||
import cn.bunny.dao.dto.system.rolePower.power.PowerAddDto;
|
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.PowerDto;
|
||||||
import cn.bunny.dao.dto.system.rolePower.power.PowerUpdateBatchByParentIdDto;
|
import cn.bunny.dao.dto.system.rolePower.power.PowerUpdateBatchByParentIdDto;
|
||||||
|
@ -9,6 +8,7 @@ import cn.bunny.dao.entity.system.Power;
|
||||||
import cn.bunny.dao.vo.result.PageResult;
|
import cn.bunny.dao.vo.result.PageResult;
|
||||||
import cn.bunny.dao.vo.result.ResultCodeEnum;
|
import cn.bunny.dao.vo.result.ResultCodeEnum;
|
||||||
import cn.bunny.dao.vo.system.rolePower.PowerVo;
|
import cn.bunny.dao.vo.system.rolePower.PowerVo;
|
||||||
|
import cn.bunny.services.exception.AuthCustomerException;
|
||||||
import cn.bunny.services.mapper.PowerMapper;
|
import cn.bunny.services.mapper.PowerMapper;
|
||||||
import cn.bunny.services.mapper.RolePowerMapper;
|
import cn.bunny.services.mapper.RolePowerMapper;
|
||||||
import cn.bunny.services.service.PowerService;
|
import cn.bunny.services.service.PowerService;
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
package cn.bunny.services.service.impl;
|
package cn.bunny.services.service.impl;
|
||||||
|
|
||||||
import cn.bunny.common.service.exception.AuthCustomerException;
|
|
||||||
import cn.bunny.dao.dto.system.rolePower.role.RoleAddDto;
|
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.RoleDto;
|
||||||
import cn.bunny.dao.dto.system.rolePower.role.RoleUpdateDto;
|
import cn.bunny.dao.dto.system.rolePower.role.RoleUpdateDto;
|
||||||
|
@ -9,6 +8,7 @@ import cn.bunny.dao.entity.system.UserRole;
|
||||||
import cn.bunny.dao.vo.result.PageResult;
|
import cn.bunny.dao.vo.result.PageResult;
|
||||||
import cn.bunny.dao.vo.result.ResultCodeEnum;
|
import cn.bunny.dao.vo.result.ResultCodeEnum;
|
||||||
import cn.bunny.dao.vo.system.rolePower.RoleVo;
|
import cn.bunny.dao.vo.system.rolePower.RoleVo;
|
||||||
|
import cn.bunny.services.exception.AuthCustomerException;
|
||||||
import cn.bunny.services.mapper.RoleMapper;
|
import cn.bunny.services.mapper.RoleMapper;
|
||||||
import cn.bunny.services.mapper.RolePowerMapper;
|
import cn.bunny.services.mapper.RolePowerMapper;
|
||||||
import cn.bunny.services.mapper.RouterRoleMapper;
|
import cn.bunny.services.mapper.RouterRoleMapper;
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
package cn.bunny.services.service.impl;
|
package cn.bunny.services.service.impl;
|
||||||
|
|
||||||
import cn.bunny.common.service.exception.AuthCustomerException;
|
|
||||||
import cn.bunny.dao.dto.system.router.AssignRolesToRoutersDto;
|
import cn.bunny.dao.dto.system.router.AssignRolesToRoutersDto;
|
||||||
import cn.bunny.dao.entity.system.RouterRole;
|
import cn.bunny.dao.entity.system.RouterRole;
|
||||||
import cn.bunny.dao.vo.result.ResultCodeEnum;
|
import cn.bunny.dao.vo.result.ResultCodeEnum;
|
||||||
|
import cn.bunny.services.exception.AuthCustomerException;
|
||||||
import cn.bunny.services.mapper.RouterRoleMapper;
|
import cn.bunny.services.mapper.RouterRoleMapper;
|
||||||
import cn.bunny.services.service.RouterRoleService;
|
import cn.bunny.services.service.RouterRoleService;
|
||||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||||
|
|
|
@ -1,7 +1,5 @@
|
||||||
package cn.bunny.services.service.impl;
|
package cn.bunny.services.service.impl;
|
||||||
|
|
||||||
import cn.bunny.common.service.context.BaseContext;
|
|
||||||
import cn.bunny.common.service.exception.AuthCustomerException;
|
|
||||||
import cn.bunny.dao.dto.system.router.RouterAddDto;
|
import cn.bunny.dao.dto.system.router.RouterAddDto;
|
||||||
import cn.bunny.dao.dto.system.router.RouterManageDto;
|
import cn.bunny.dao.dto.system.router.RouterManageDto;
|
||||||
import cn.bunny.dao.dto.system.router.RouterUpdateByIdWithRankDto;
|
import cn.bunny.dao.dto.system.router.RouterUpdateByIdWithRankDto;
|
||||||
|
@ -15,6 +13,8 @@ import cn.bunny.dao.vo.result.ResultCodeEnum;
|
||||||
import cn.bunny.dao.vo.system.router.RouterManageVo;
|
import cn.bunny.dao.vo.system.router.RouterManageVo;
|
||||||
import cn.bunny.dao.vo.system.router.RouterMeta;
|
import cn.bunny.dao.vo.system.router.RouterMeta;
|
||||||
import cn.bunny.dao.vo.system.router.UserRouterVo;
|
import cn.bunny.dao.vo.system.router.UserRouterVo;
|
||||||
|
import cn.bunny.services.context.BaseContext;
|
||||||
|
import cn.bunny.services.exception.AuthCustomerException;
|
||||||
import cn.bunny.services.mapper.RoleMapper;
|
import cn.bunny.services.mapper.RoleMapper;
|
||||||
import cn.bunny.services.mapper.RolePowerMapper;
|
import cn.bunny.services.mapper.RolePowerMapper;
|
||||||
import cn.bunny.services.mapper.RouterMapper;
|
import cn.bunny.services.mapper.RouterMapper;
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
package cn.bunny.services.service.impl;
|
package cn.bunny.services.service.impl;
|
||||||
|
|
||||||
import cn.bunny.common.service.exception.AuthCustomerException;
|
|
||||||
import cn.bunny.dao.dto.quartz.SchedulersOperationDto;
|
import cn.bunny.dao.dto.quartz.SchedulersOperationDto;
|
||||||
import cn.bunny.dao.dto.quartz.schedule.SchedulersAddDto;
|
import cn.bunny.dao.dto.quartz.schedule.SchedulersAddDto;
|
||||||
import cn.bunny.dao.dto.quartz.schedule.SchedulersDto;
|
import cn.bunny.dao.dto.quartz.schedule.SchedulersDto;
|
||||||
|
@ -11,6 +10,7 @@ import cn.bunny.dao.vo.result.PageResult;
|
||||||
import cn.bunny.dao.vo.result.ResultCodeEnum;
|
import cn.bunny.dao.vo.result.ResultCodeEnum;
|
||||||
import cn.bunny.services.aop.AnnotationScanner;
|
import cn.bunny.services.aop.AnnotationScanner;
|
||||||
import cn.bunny.services.aop.annotation.QuartzSchedulers;
|
import cn.bunny.services.aop.annotation.QuartzSchedulers;
|
||||||
|
import cn.bunny.services.exception.AuthCustomerException;
|
||||||
import cn.bunny.services.mapper.SchedulersMapper;
|
import cn.bunny.services.mapper.SchedulersMapper;
|
||||||
import cn.bunny.services.service.SchedulersService;
|
import cn.bunny.services.service.SchedulersService;
|
||||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||||
|
|
|
@ -1,11 +1,11 @@
|
||||||
package cn.bunny.services.service.impl;
|
package cn.bunny.services.service.impl;
|
||||||
|
|
||||||
import cn.bunny.common.service.context.BaseContext;
|
|
||||||
import cn.bunny.dao.dto.log.UserLoginLogDto;
|
import cn.bunny.dao.dto.log.UserLoginLogDto;
|
||||||
import cn.bunny.dao.entity.log.UserLoginLog;
|
import cn.bunny.dao.entity.log.UserLoginLog;
|
||||||
import cn.bunny.dao.vo.log.UserLoginLogLocalVo;
|
import cn.bunny.dao.vo.log.UserLoginLogLocalVo;
|
||||||
import cn.bunny.dao.vo.log.UserLoginLogVo;
|
import cn.bunny.dao.vo.log.UserLoginLogVo;
|
||||||
import cn.bunny.dao.vo.result.PageResult;
|
import cn.bunny.dao.vo.result.PageResult;
|
||||||
|
import cn.bunny.services.context.BaseContext;
|
||||||
import cn.bunny.services.mapper.UserLoginLogMapper;
|
import cn.bunny.services.mapper.UserLoginLogMapper;
|
||||||
import cn.bunny.services.service.UserLoginLogService;
|
import cn.bunny.services.service.UserLoginLogService;
|
||||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||||
|
|
|
@ -1,13 +1,13 @@
|
||||||
package cn.bunny.services.service.impl;
|
package cn.bunny.services.service.impl;
|
||||||
|
|
||||||
import cn.bunny.common.service.context.BaseContext;
|
|
||||||
import cn.bunny.common.service.exception.AuthCustomerException;
|
|
||||||
import cn.bunny.dao.constant.RedisUserConstant;
|
import cn.bunny.dao.constant.RedisUserConstant;
|
||||||
import cn.bunny.dao.dto.system.user.AssignRolesToUsersDto;
|
import cn.bunny.dao.dto.system.user.AssignRolesToUsersDto;
|
||||||
import cn.bunny.dao.entity.system.AdminUser;
|
import cn.bunny.dao.entity.system.AdminUser;
|
||||||
import cn.bunny.dao.entity.system.UserRole;
|
import cn.bunny.dao.entity.system.UserRole;
|
||||||
import cn.bunny.dao.vo.result.ResultCodeEnum;
|
import cn.bunny.dao.vo.result.ResultCodeEnum;
|
||||||
import cn.bunny.dao.vo.system.user.LoginVo;
|
import cn.bunny.dao.vo.system.user.LoginVo;
|
||||||
|
import cn.bunny.services.context.BaseContext;
|
||||||
|
import cn.bunny.services.exception.AuthCustomerException;
|
||||||
import cn.bunny.services.mapper.UserMapper;
|
import cn.bunny.services.mapper.UserMapper;
|
||||||
import cn.bunny.services.mapper.UserRoleMapper;
|
import cn.bunny.services.mapper.UserRoleMapper;
|
||||||
import cn.bunny.services.service.UserRoleService;
|
import cn.bunny.services.service.UserRoleService;
|
||||||
|
|
|
@ -1,9 +1,5 @@
|
||||||
package cn.bunny.services.service.impl;
|
package cn.bunny.services.service.impl;
|
||||||
|
|
||||||
import cn.bunny.common.service.context.BaseContext;
|
|
||||||
import cn.bunny.common.service.exception.AuthCustomerException;
|
|
||||||
import cn.bunny.common.service.utils.JwtHelper;
|
|
||||||
import cn.bunny.common.service.utils.ip.IpUtil;
|
|
||||||
import cn.bunny.dao.constant.MinioConstant;
|
import cn.bunny.dao.constant.MinioConstant;
|
||||||
import cn.bunny.dao.constant.RedisUserConstant;
|
import cn.bunny.dao.constant.RedisUserConstant;
|
||||||
import cn.bunny.dao.dto.system.files.FileUploadDto;
|
import cn.bunny.dao.dto.system.files.FileUploadDto;
|
||||||
|
@ -19,11 +15,15 @@ import cn.bunny.dao.vo.result.PageResult;
|
||||||
import cn.bunny.dao.vo.result.ResultCodeEnum;
|
import cn.bunny.dao.vo.result.ResultCodeEnum;
|
||||||
import cn.bunny.dao.vo.system.files.FileInfoVo;
|
import cn.bunny.dao.vo.system.files.FileInfoVo;
|
||||||
import cn.bunny.dao.vo.system.user.*;
|
import cn.bunny.dao.vo.system.user.*;
|
||||||
|
import cn.bunny.services.context.BaseContext;
|
||||||
|
import cn.bunny.services.exception.AuthCustomerException;
|
||||||
import cn.bunny.services.mapper.*;
|
import cn.bunny.services.mapper.*;
|
||||||
import cn.bunny.services.service.FilesService;
|
import cn.bunny.services.service.FilesService;
|
||||||
import cn.bunny.services.service.UserService;
|
import cn.bunny.services.service.UserService;
|
||||||
|
import cn.bunny.services.utils.JwtHelper;
|
||||||
import cn.bunny.services.utils.UserUtil;
|
import cn.bunny.services.utils.UserUtil;
|
||||||
import cn.bunny.services.utils.email.ConcreteSenderEmailTemplate;
|
import cn.bunny.services.utils.email.ConcreteSenderEmailTemplate;
|
||||||
|
import cn.bunny.services.utils.ip.IpUtil;
|
||||||
import cn.bunny.services.utils.login.DefaultLoginStrategy;
|
import cn.bunny.services.utils.login.DefaultLoginStrategy;
|
||||||
import cn.bunny.services.utils.login.EmailLoginStrategy;
|
import cn.bunny.services.utils.login.EmailLoginStrategy;
|
||||||
import cn.bunny.services.utils.login.LoginContext;
|
import cn.bunny.services.utils.login.LoginContext;
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
package cn.bunny.common.service.utils;
|
package cn.bunny.services.utils;
|
||||||
|
|
||||||
import org.springframework.stereotype.Component;
|
import org.springframework.stereotype.Component;
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
package cn.bunny.common.service.utils;
|
package cn.bunny.services.utils;
|
||||||
|
|
||||||
import cn.bunny.common.service.exception.AuthCustomerException;
|
|
||||||
import cn.bunny.dao.vo.result.ResultCodeEnum;
|
import cn.bunny.dao.vo.result.ResultCodeEnum;
|
||||||
|
import cn.bunny.services.exception.AuthCustomerException;
|
||||||
import io.jsonwebtoken.*;
|
import io.jsonwebtoken.*;
|
||||||
import io.micrometer.common.lang.Nullable;
|
import io.micrometer.common.lang.Nullable;
|
||||||
import org.springframework.util.StringUtils;
|
import org.springframework.util.StringUtils;
|
|
@ -1,4 +1,4 @@
|
||||||
package cn.bunny.common.service.utils;
|
package cn.bunny.services.utils;
|
||||||
|
|
||||||
import cn.bunny.dao.vo.result.Result;
|
import cn.bunny.dao.vo.result.Result;
|
||||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
import com.fasterxml.jackson.databind.ObjectMapper;
|
|
@ -1,8 +1,8 @@
|
||||||
package cn.bunny.services.utils;
|
package cn.bunny.services.utils;
|
||||||
|
|
||||||
import cn.bunny.common.service.context.BaseContext;
|
|
||||||
import cn.bunny.dao.constant.RedisUserConstant;
|
import cn.bunny.dao.constant.RedisUserConstant;
|
||||||
import cn.bunny.dao.entity.system.AdminUser;
|
import cn.bunny.dao.entity.system.AdminUser;
|
||||||
|
import cn.bunny.services.context.BaseContext;
|
||||||
import cn.bunny.services.mapper.UserMapper;
|
import cn.bunny.services.mapper.UserMapper;
|
||||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
|
|
@ -1,9 +1,5 @@
|
||||||
package cn.bunny.services.utils;
|
package cn.bunny.services.utils;
|
||||||
|
|
||||||
import cn.bunny.common.service.exception.AuthCustomerException;
|
|
||||||
import cn.bunny.common.service.utils.JwtHelper;
|
|
||||||
import cn.bunny.common.service.utils.ip.IpUtil;
|
|
||||||
import cn.bunny.common.service.utils.minio.MinioUtil;
|
|
||||||
import cn.bunny.dao.constant.LocalDateTimeConstant;
|
import cn.bunny.dao.constant.LocalDateTimeConstant;
|
||||||
import cn.bunny.dao.constant.RedisUserConstant;
|
import cn.bunny.dao.constant.RedisUserConstant;
|
||||||
import cn.bunny.dao.constant.UserConstant;
|
import cn.bunny.dao.constant.UserConstant;
|
||||||
|
@ -12,10 +8,13 @@ import cn.bunny.dao.entity.system.AdminUser;
|
||||||
import cn.bunny.dao.entity.system.Power;
|
import cn.bunny.dao.entity.system.Power;
|
||||||
import cn.bunny.dao.entity.system.Role;
|
import cn.bunny.dao.entity.system.Role;
|
||||||
import cn.bunny.dao.vo.system.user.LoginVo;
|
import cn.bunny.dao.vo.system.user.LoginVo;
|
||||||
|
import cn.bunny.services.exception.AuthCustomerException;
|
||||||
import cn.bunny.services.mapper.PowerMapper;
|
import cn.bunny.services.mapper.PowerMapper;
|
||||||
import cn.bunny.services.mapper.RoleMapper;
|
import cn.bunny.services.mapper.RoleMapper;
|
||||||
import cn.bunny.services.mapper.UserLoginLogMapper;
|
import cn.bunny.services.mapper.UserLoginLogMapper;
|
||||||
import cn.bunny.services.mapper.UserMapper;
|
import cn.bunny.services.mapper.UserMapper;
|
||||||
|
import cn.bunny.services.utils.ip.IpUtil;
|
||||||
|
import cn.bunny.services.utils.minio.MinioUtil;
|
||||||
import jakarta.servlet.http.HttpServletRequest;
|
import jakarta.servlet.http.HttpServletRequest;
|
||||||
import org.springframework.beans.BeanUtils;
|
import org.springframework.beans.BeanUtils;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
|
|
@ -1,13 +1,13 @@
|
||||||
package cn.bunny.services.utils.email;
|
package cn.bunny.services.utils.email;
|
||||||
|
|
||||||
import cn.bunny.common.service.exception.AuthCustomerException;
|
|
||||||
import cn.bunny.common.service.utils.mail.MailSenderUtil;
|
|
||||||
import cn.bunny.dao.entity.system.EmailTemplate;
|
import cn.bunny.dao.entity.system.EmailTemplate;
|
||||||
import cn.bunny.dao.entity.system.EmailUsers;
|
import cn.bunny.dao.entity.system.EmailUsers;
|
||||||
import cn.bunny.dao.model.email.EmailSend;
|
import cn.bunny.dao.model.email.EmailSend;
|
||||||
import cn.bunny.dao.model.email.EmailSendInit;
|
import cn.bunny.dao.model.email.EmailSendInit;
|
||||||
import cn.bunny.dao.vo.result.ResultCodeEnum;
|
import cn.bunny.dao.vo.result.ResultCodeEnum;
|
||||||
|
import cn.bunny.services.exception.AuthCustomerException;
|
||||||
import cn.bunny.services.mapper.EmailUsersMapper;
|
import cn.bunny.services.mapper.EmailUsersMapper;
|
||||||
|
import cn.bunny.services.utils.mail.MailSenderUtil;
|
||||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||||
import jakarta.mail.MessagingException;
|
import jakarta.mail.MessagingException;
|
||||||
import org.springframework.beans.BeanUtils;
|
import org.springframework.beans.BeanUtils;
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
package cn.bunny.common.service.utils.ip;
|
package cn.bunny.services.utils.ip;
|
||||||
|
|
||||||
import io.swagger.annotations.ApiModel;
|
import io.swagger.annotations.ApiModel;
|
||||||
import io.swagger.annotations.ApiModelProperty;
|
import io.swagger.annotations.ApiModelProperty;
|
|
@ -1,4 +1,4 @@
|
||||||
package cn.bunny.common.service.utils.ip;
|
package cn.bunny.services.utils.ip;
|
||||||
|
|
||||||
import jakarta.annotation.PostConstruct;
|
import jakarta.annotation.PostConstruct;
|
||||||
import jakarta.servlet.http.HttpServletRequest;
|
import jakarta.servlet.http.HttpServletRequest;
|
|
@ -1,4 +1,4 @@
|
||||||
package cn.bunny.common.service.utils.mail;
|
package cn.bunny.services.utils.mail;
|
||||||
|
|
||||||
import cn.bunny.dao.model.email.EmailSend;
|
import cn.bunny.dao.model.email.EmailSend;
|
||||||
import cn.bunny.dao.model.email.EmailSendInit;
|
import cn.bunny.dao.model.email.EmailSendInit;
|
|
@ -1,4 +1,4 @@
|
||||||
package cn.bunny.common.service.utils.minio;
|
package cn.bunny.services.utils.minio;
|
||||||
|
|
||||||
import io.minio.MinioClient;
|
import io.minio.MinioClient;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
|
@ -1,9 +1,9 @@
|
||||||
package cn.bunny.common.service.utils.minio;
|
package cn.bunny.services.utils.minio;
|
||||||
|
|
||||||
import cn.bunny.common.service.exception.AuthCustomerException;
|
|
||||||
import cn.bunny.dao.constant.MinioConstant;
|
import cn.bunny.dao.constant.MinioConstant;
|
||||||
import cn.bunny.dao.model.file.MinioFilePath;
|
import cn.bunny.dao.model.file.MinioFilePath;
|
||||||
import cn.bunny.dao.vo.result.ResultCodeEnum;
|
import cn.bunny.dao.vo.result.ResultCodeEnum;
|
||||||
|
import cn.bunny.services.exception.AuthCustomerException;
|
||||||
import io.minio.*;
|
import io.minio.*;
|
||||||
import io.minio.messages.DeleteError;
|
import io.minio.messages.DeleteError;
|
||||||
import io.minio.messages.DeleteObject;
|
import io.minio.messages.DeleteObject;
|
|
@ -9,14 +9,13 @@ logging:
|
||||||
root: info
|
root: info
|
||||||
pattern:
|
pattern:
|
||||||
dateformat: HH:mm:ss:SSS
|
dateformat: HH:mm:ss:SSS
|
||||||
# file:
|
file:
|
||||||
# path: "logs/${spring.application.name}"
|
path: "logs/${spring.application.name}"
|
||||||
# name: "logs/${spring.application.name}"
|
name: "logs/${spring.application.name}"
|
||||||
|
|
||||||
mybatis-plus:
|
#mybatis-plus:
|
||||||
configuration:
|
# configuration:
|
||||||
map-underscore-to-camel-case: true
|
# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl # 查看日志
|
||||||
log-impl: org.apache.ibatis.logging.stdout.StdOutImpl # 查看日志
|
|
||||||
|
|
||||||
bunny:
|
bunny:
|
||||||
master:
|
master:
|
||||||
|
|
|
@ -5,6 +5,6 @@
|
||||||
|_.__/ \__,_|_| |_|_| |_|\__, | _/ |\__,_| \_/ \__,_|
|
|_.__/ \__,_|_| |_|_| |_|\__, | _/ |\__,_| \_/ \__,_|
|
||||||
|___/ |__/
|
|___/ |__/
|
||||||
|
|
||||||
${spring-boot.formatted-version}
|
Service Name${spring.application.name}
|
||||||
${application.title}
|
|
||||||
SpringBoot Version: ${spring-boot.version}${spring-boot.formatted-version}
|
SpringBoot Version: ${spring-boot.version}${spring-boot.formatted-version}
|
||||||
|
SpringActive:${spring.profiles.active}
|
||||||
|
|
|
@ -16,7 +16,8 @@
|
||||||
|
|
||||||
<!-- 通用查询结果列 -->
|
<!-- 通用查询结果列 -->
|
||||||
<sql id="Base_Column_List">
|
<sql id="Base_Column_List">
|
||||||
id, create_time, update_time, create_user, update_user, is_deleted, role_code, description
|
id
|
||||||
|
, create_time, update_time, create_user, update_user, is_deleted, role_code, description
|
||||||
</sql>
|
</sql>
|
||||||
|
|
||||||
<!-- 分页查询角色内容 -->
|
<!-- 分页查询角色内容 -->
|
||||||
|
|
Loading…
Reference in New Issue