diff --git a/ReadMe-en.md b/ReadMe-en.md index 3d8368c..0f780f6 100644 --- a/ReadMe-en.md +++ b/ReadMe-en.md @@ -126,13 +126,12 @@ http.authorizeHttpRequests(auth -> auth ``` bunny-auth/ -├── auth-api # Interface Layer +├── auth-system # System Module ├── auth-core # Core Module │ ├── config # Security Configuration -│ └── domain # Domain +│ └── exception # exception │ └── ...... # And more... -├── service # Business Implementation -└── dao # Data Persistence Layer +├── domain # Domain ``` ## 🛠️ Use Cases diff --git a/ReadMe.md b/ReadMe.md index 26aa4b4..128aae5 100644 --- a/ReadMe.md +++ b/ReadMe.md @@ -129,13 +129,12 @@ http.authorizeHttpRequests(auth -> auth ``` bunny-auth/ -├── auth-api # 接口定义层 +├── auth-system # 系统模块 ├── auth-core # 核心模块 │ ├── config # 安全配置 -│ └── domain # domain +│ └── exception # exception │ └── ...... # 还要很多... -├── service # 业务实现 -└── dao # 数据持久层 +├── domain # domain ``` ## 🛠️ 应用场景 diff --git a/auth-api/pom.xml b/auth-api/pom.xml deleted file mode 100644 index 512295e..0000000 --- a/auth-api/pom.xml +++ /dev/null @@ -1,53 +0,0 @@ - - 4.0.0 - - cn.bunny - auth-server - 0.0.1-SNAPSHOT - - - auth-api - jar - - auh-api - https://maven.apache.org - - - UTF-8 - - - - - cn.bunny - service - 0.0.1-SNAPSHOT - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - 3.5.2 - - - -javaagent:"${settings.localRepository}/org/mockito/mockito-core/5.14.2/mockito-core-5.14.2.jar" - - - - - - diff --git a/auth-core/pom.xml b/auth-core/pom.xml index abbb495..bbdf35e 100644 --- a/auth-core/pom.xml +++ b/auth-core/pom.xml @@ -17,6 +17,12 @@ + + cn.bunny + domain + 0.0.1-SNAPSHOT + + junit @@ -41,17 +47,6 @@ spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-security - - - - - org.springframework.boot - spring-boot-starter-validation - @@ -59,55 +54,6 @@ spring-boot-starter-mail - - - org.projectlombok - lombok - - - cn.hutool - hutool-all - - - - - com.github.xiaoymin - knife4j-openapi3-jakarta-spring-boot-starter - - - org.springdoc - springdoc-openapi-starter-webmvc-ui - 2.8.6 - - - io.swagger - swagger-annotations - 1.6.14 - - - - - com.baomidou - mybatis-plus-spring-boot3-starter - - - - - - - - - - com.alibaba.fastjson2 - fastjson2 - - - - - com.alibaba - easyexcel - - org.springframework.boot diff --git a/auth-core/src/main/java/cn/bunny/services/config/ControllerStringParamTrimConfig.java b/auth-core/src/main/java/cn/bunny/core/config/ControllerStringParamTrimConfig.java similarity index 98% rename from auth-core/src/main/java/cn/bunny/services/config/ControllerStringParamTrimConfig.java rename to auth-core/src/main/java/cn/bunny/core/config/ControllerStringParamTrimConfig.java index 2f39290..cf16854 100644 --- a/auth-core/src/main/java/cn/bunny/services/config/ControllerStringParamTrimConfig.java +++ b/auth-core/src/main/java/cn/bunny/core/config/ControllerStringParamTrimConfig.java @@ -1,4 +1,4 @@ -package cn.bunny.services.config; +package cn.bunny.core.config; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.DeserializationContext; diff --git a/auth-core/src/main/java/cn/bunny/services/config/Knife4jConfig.java b/auth-core/src/main/java/cn/bunny/core/config/Knife4jConfig.java similarity index 98% rename from auth-core/src/main/java/cn/bunny/services/config/Knife4jConfig.java rename to auth-core/src/main/java/cn/bunny/core/config/Knife4jConfig.java index ef45430..84647ab 100644 --- a/auth-core/src/main/java/cn/bunny/services/config/Knife4jConfig.java +++ b/auth-core/src/main/java/cn/bunny/core/config/Knife4jConfig.java @@ -1,4 +1,4 @@ -package cn.bunny.services.config; +package cn.bunny.core.config; import io.swagger.v3.oas.models.ExternalDocumentation; import io.swagger.v3.oas.models.OpenAPI; diff --git a/auth-core/src/main/java/cn/bunny/services/config/MinioConfiguration.java b/auth-core/src/main/java/cn/bunny/core/config/MinioConfiguration.java similarity index 98% rename from auth-core/src/main/java/cn/bunny/services/config/MinioConfiguration.java rename to auth-core/src/main/java/cn/bunny/core/config/MinioConfiguration.java index ce3d0f0..03dab65 100644 --- a/auth-core/src/main/java/cn/bunny/services/config/MinioConfiguration.java +++ b/auth-core/src/main/java/cn/bunny/core/config/MinioConfiguration.java @@ -1,4 +1,4 @@ -package cn.bunny.services.config; +package cn.bunny.core.config; import io.minio.BucketExistsArgs; import io.minio.MakeBucketArgs; diff --git a/auth-core/src/main/java/cn/bunny/services/config/MyBatisPlusFieldConfig.java b/auth-core/src/main/java/cn/bunny/core/config/MyBatisPlusFieldConfig.java similarity index 94% rename from auth-core/src/main/java/cn/bunny/services/config/MyBatisPlusFieldConfig.java rename to auth-core/src/main/java/cn/bunny/core/config/MyBatisPlusFieldConfig.java index 02c2937..fb323ca 100644 --- a/auth-core/src/main/java/cn/bunny/services/config/MyBatisPlusFieldConfig.java +++ b/auth-core/src/main/java/cn/bunny/core/config/MyBatisPlusFieldConfig.java @@ -1,6 +1,6 @@ -package cn.bunny.services.config; +package cn.bunny.core.config; -import cn.bunny.services.context.BaseContext; +import cn.bunny.core.context.BaseContext; import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; import org.apache.ibatis.reflection.MetaObject; import org.springframework.stereotype.Component; diff --git a/auth-core/src/main/java/cn/bunny/services/config/MybatisPlusConfig.java b/auth-core/src/main/java/cn/bunny/core/config/MybatisPlusConfig.java similarity index 97% rename from auth-core/src/main/java/cn/bunny/services/config/MybatisPlusConfig.java rename to auth-core/src/main/java/cn/bunny/core/config/MybatisPlusConfig.java index 1d21c31..70f08fa 100644 --- a/auth-core/src/main/java/cn/bunny/services/config/MybatisPlusConfig.java +++ b/auth-core/src/main/java/cn/bunny/core/config/MybatisPlusConfig.java @@ -1,4 +1,4 @@ -package cn.bunny.services.config; +package cn.bunny.core.config; import com.baomidou.mybatisplus.annotation.DbType; import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; diff --git a/auth-core/src/main/java/cn/bunny/services/config/RedisConfiguration.java b/auth-core/src/main/java/cn/bunny/core/config/RedisConfiguration.java similarity index 99% rename from auth-core/src/main/java/cn/bunny/services/config/RedisConfiguration.java rename to auth-core/src/main/java/cn/bunny/core/config/RedisConfiguration.java index 90782da..6ce72b9 100644 --- a/auth-core/src/main/java/cn/bunny/services/config/RedisConfiguration.java +++ b/auth-core/src/main/java/cn/bunny/core/config/RedisConfiguration.java @@ -1,4 +1,4 @@ -package cn.bunny.services.config; +package cn.bunny.core.config; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.PropertyAccessor; diff --git a/auth-core/src/main/java/cn/bunny/services/config/ThreadLocalCleanupInterceptor.java b/auth-core/src/main/java/cn/bunny/core/config/ThreadLocalCleanupInterceptor.java similarity index 86% rename from auth-core/src/main/java/cn/bunny/services/config/ThreadLocalCleanupInterceptor.java rename to auth-core/src/main/java/cn/bunny/core/config/ThreadLocalCleanupInterceptor.java index 24d233a..e863629 100644 --- a/auth-core/src/main/java/cn/bunny/services/config/ThreadLocalCleanupInterceptor.java +++ b/auth-core/src/main/java/cn/bunny/core/config/ThreadLocalCleanupInterceptor.java @@ -1,6 +1,6 @@ -package cn.bunny.services.config; +package cn.bunny.core.config; -import cn.bunny.services.context.BaseContext; +import cn.bunny.core.context.BaseContext; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import org.springframework.stereotype.Component; diff --git a/auth-core/src/main/java/cn/bunny/services/config/WebConfig.java b/auth-core/src/main/java/cn/bunny/core/config/WebConfig.java similarity index 95% rename from auth-core/src/main/java/cn/bunny/services/config/WebConfig.java rename to auth-core/src/main/java/cn/bunny/core/config/WebConfig.java index a307b62..bf4a829 100644 --- a/auth-core/src/main/java/cn/bunny/services/config/WebConfig.java +++ b/auth-core/src/main/java/cn/bunny/core/config/WebConfig.java @@ -1,4 +1,4 @@ -package cn.bunny.services.config; +package cn.bunny.core.config; import jakarta.annotation.Resource; import org.springframework.context.annotation.Bean; diff --git a/auth-core/src/main/java/cn/bunny/services/config/mail/MailSenderConfiguration.java b/auth-core/src/main/java/cn/bunny/core/config/mail/MailSenderConfiguration.java similarity index 95% rename from auth-core/src/main/java/cn/bunny/services/config/mail/MailSenderConfiguration.java rename to auth-core/src/main/java/cn/bunny/core/config/mail/MailSenderConfiguration.java index 1aa5024..7ceac23 100644 --- a/auth-core/src/main/java/cn/bunny/services/config/mail/MailSenderConfiguration.java +++ b/auth-core/src/main/java/cn/bunny/core/config/mail/MailSenderConfiguration.java @@ -1,7 +1,7 @@ -package cn.bunny.services.config.mail; +package cn.bunny.core.config.mail; -import cn.bunny.services.domain.common.model.dto.email.EmailSend; -import cn.bunny.services.domain.common.model.dto.email.EmailSendInit; +import cn.bunny.domain.common.model.dto.email.EmailSend; +import cn.bunny.domain.common.model.dto.email.EmailSendInit; import jakarta.mail.MessagingException; import jakarta.mail.internet.MimeMessage; import org.springframework.mail.javamail.JavaMailSenderImpl; diff --git a/auth-core/src/main/java/cn/bunny/services/config/mail/template-propties b/auth-core/src/main/java/cn/bunny/core/config/mail/template-propties similarity index 100% rename from auth-core/src/main/java/cn/bunny/services/config/mail/template-propties rename to auth-core/src/main/java/cn/bunny/core/config/mail/template-propties diff --git a/auth-core/src/main/java/cn/bunny/services/context/BaseContext.java b/auth-core/src/main/java/cn/bunny/core/context/BaseContext.java similarity index 90% rename from auth-core/src/main/java/cn/bunny/services/context/BaseContext.java rename to auth-core/src/main/java/cn/bunny/core/context/BaseContext.java index 56354a1..d527dc4 100644 --- a/auth-core/src/main/java/cn/bunny/services/context/BaseContext.java +++ b/auth-core/src/main/java/cn/bunny/core/context/BaseContext.java @@ -1,7 +1,7 @@ -package cn.bunny.services.context; +package cn.bunny.core.context; -import cn.bunny.services.domain.common.model.vo.LoginVo; +import cn.bunny.domain.common.model.vo.LoginVo; public class BaseContext { private static final ThreadLocal userId = new ThreadLocal<>(); diff --git a/auth-core/src/main/java/cn/bunny/services/exception/AuthCustomerException.java b/auth-core/src/main/java/cn/bunny/core/exception/AuthCustomerException.java similarity index 89% rename from auth-core/src/main/java/cn/bunny/services/exception/AuthCustomerException.java rename to auth-core/src/main/java/cn/bunny/core/exception/AuthCustomerException.java index 941c59a..cb0f142 100644 --- a/auth-core/src/main/java/cn/bunny/services/exception/AuthCustomerException.java +++ b/auth-core/src/main/java/cn/bunny/core/exception/AuthCustomerException.java @@ -1,6 +1,6 @@ -package cn.bunny.services.exception; +package cn.bunny.core.exception; -import cn.bunny.services.domain.common.enums.ResultCodeEnum; +import cn.bunny.domain.common.enums.ResultCodeEnum; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; diff --git a/auth-core/src/main/java/cn/bunny/services/exception/GlobalExceptionHandler.java b/auth-core/src/main/java/cn/bunny/core/exception/GlobalExceptionHandler.java similarity index 96% rename from auth-core/src/main/java/cn/bunny/services/exception/GlobalExceptionHandler.java rename to auth-core/src/main/java/cn/bunny/core/exception/GlobalExceptionHandler.java index 87a4670..b265278 100644 --- a/auth-core/src/main/java/cn/bunny/services/exception/GlobalExceptionHandler.java +++ b/auth-core/src/main/java/cn/bunny/core/exception/GlobalExceptionHandler.java @@ -1,9 +1,9 @@ -package cn.bunny.services.exception; +package cn.bunny.core.exception; -import cn.bunny.services.domain.common.model.vo.result.Result; -import cn.bunny.services.domain.common.enums.ResultCodeEnum; -import cn.bunny.services.context.BaseContext; +import cn.bunny.domain.common.model.vo.result.Result; +import cn.bunny.domain.common.enums.ResultCodeEnum; +import cn.bunny.core.context.BaseContext; import lombok.extern.slf4j.Slf4j; import org.mybatis.spring.MyBatisSystemException; import org.springframework.context.support.DefaultMessageSourceResolvable; diff --git a/auth-core/src/main/java/cn/bunny/services/processor/TreeProcessor.java b/auth-core/src/main/java/cn/bunny/core/processor/TreeProcessor.java similarity index 92% rename from auth-core/src/main/java/cn/bunny/services/processor/TreeProcessor.java rename to auth-core/src/main/java/cn/bunny/core/processor/TreeProcessor.java index a0b3f87..b23b68d 100644 --- a/auth-core/src/main/java/cn/bunny/services/processor/TreeProcessor.java +++ b/auth-core/src/main/java/cn/bunny/core/processor/TreeProcessor.java @@ -1,4 +1,4 @@ -package cn.bunny.services.processor; +package cn.bunny.core.processor; import java.util.List; diff --git a/auth-core/src/main/java/cn/bunny/services/utils/FileUtil.java b/auth-core/src/main/java/cn/bunny/core/utils/FileUtil.java similarity index 98% rename from auth-core/src/main/java/cn/bunny/services/utils/FileUtil.java rename to auth-core/src/main/java/cn/bunny/core/utils/FileUtil.java index 03dcf80..2c23398 100644 --- a/auth-core/src/main/java/cn/bunny/services/utils/FileUtil.java +++ b/auth-core/src/main/java/cn/bunny/core/utils/FileUtil.java @@ -1,4 +1,4 @@ -package cn.bunny.services.utils; +package cn.bunny.core.utils; import cn.hutool.crypto.digest.MD5; import org.springframework.http.HttpHeaders; diff --git a/auth-core/src/main/java/cn/bunny/services/utils/IpUtil.java b/auth-core/src/main/java/cn/bunny/core/utils/IpUtil.java similarity index 98% rename from auth-core/src/main/java/cn/bunny/services/utils/IpUtil.java rename to auth-core/src/main/java/cn/bunny/core/utils/IpUtil.java index e2bc9f6..30dcdbb 100644 --- a/auth-core/src/main/java/cn/bunny/services/utils/IpUtil.java +++ b/auth-core/src/main/java/cn/bunny/core/utils/IpUtil.java @@ -1,6 +1,6 @@ -package cn.bunny.services.utils; +package cn.bunny.core.utils; -import cn.bunny.services.domain.common.model.dto.ip.IpEntity; +import cn.bunny.domain.common.model.dto.ip.IpEntity; import jakarta.annotation.PostConstruct; import jakarta.servlet.http.HttpServletRequest; import lombok.extern.slf4j.Slf4j; diff --git a/auth-core/src/main/java/cn/bunny/services/utils/JwtTokenUtil.java b/auth-core/src/main/java/cn/bunny/core/utils/JwtTokenUtil.java similarity index 98% rename from auth-core/src/main/java/cn/bunny/services/utils/JwtTokenUtil.java rename to auth-core/src/main/java/cn/bunny/core/utils/JwtTokenUtil.java index 5f0d2ea..3916309 100644 --- a/auth-core/src/main/java/cn/bunny/services/utils/JwtTokenUtil.java +++ b/auth-core/src/main/java/cn/bunny/core/utils/JwtTokenUtil.java @@ -1,7 +1,7 @@ -package cn.bunny.services.utils; +package cn.bunny.core.utils; -import cn.bunny.services.domain.common.enums.ResultCodeEnum; -import cn.bunny.services.exception.AuthCustomerException; +import cn.bunny.domain.common.enums.ResultCodeEnum; +import cn.bunny.core.exception.AuthCustomerException; import io.jsonwebtoken.Claims; import io.jsonwebtoken.Jws; import io.jsonwebtoken.Jwts; diff --git a/auth-core/src/main/java/cn/bunny/services/utils/ResponseUtil.java b/auth-core/src/main/java/cn/bunny/core/utils/ResponseUtil.java similarity index 89% rename from auth-core/src/main/java/cn/bunny/services/utils/ResponseUtil.java rename to auth-core/src/main/java/cn/bunny/core/utils/ResponseUtil.java index 09ca963..87b1ee6 100644 --- a/auth-core/src/main/java/cn/bunny/services/utils/ResponseUtil.java +++ b/auth-core/src/main/java/cn/bunny/core/utils/ResponseUtil.java @@ -1,6 +1,6 @@ -package cn.bunny.services.utils; +package cn.bunny.core.utils; -import cn.bunny.services.domain.common.model.vo.result.Result; +import cn.bunny.domain.common.model.vo.result.Result; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import jakarta.servlet.http.HttpServletResponse; diff --git a/service/pom.xml b/auth-system/pom.xml similarity index 71% rename from service/pom.xml rename to auth-system/pom.xml index a413dbe..1735929 100644 --- a/service/pom.xml +++ b/auth-system/pom.xml @@ -7,10 +7,10 @@ 0.0.1-SNAPSHOT - service + auth-system jar - auth-service + auh-system https://maven.apache.org @@ -18,11 +18,6 @@ - - cn.bunny - dao - 0.0.1-SNAPSHOT - cn.bunny auth-core @@ -91,4 +86,30 @@ mysql-connector-j + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + 3.5.2 + + + -javaagent:"${settings.localRepository}/org/mockito/mockito-core/5.14.2/mockito-core-5.14.2.jar" + + + + + diff --git a/auth-api/src/main/java/cn/bunny/services/AuthServiceApplication.java b/auth-system/src/main/java/cn/bunny/services/AuthServiceApplication.java similarity index 89% rename from auth-api/src/main/java/cn/bunny/services/AuthServiceApplication.java rename to auth-system/src/main/java/cn/bunny/services/AuthServiceApplication.java index a7bd896..debf593 100644 --- a/auth-api/src/main/java/cn/bunny/services/AuthServiceApplication.java +++ b/auth-system/src/main/java/cn/bunny/services/AuthServiceApplication.java @@ -1,7 +1,6 @@ package cn.bunny.services; import org.dromara.x.file.storage.spring.EnableFileStorage; -import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cache.annotation.EnableCaching; @@ -9,7 +8,7 @@ import org.springframework.context.annotation.ComponentScan; import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.transaction.annotation.EnableTransactionManagement; -@MapperScan("cn.bunny.services.mapper") +// @MapperScan("cn.bunny.services.mapper") @ComponentScan("cn.bunny") @EnableScheduling @EnableFileStorage @@ -21,3 +20,4 @@ public class AuthServiceApplication { SpringApplication.run(AuthServiceApplication.class, args); } } + \ No newline at end of file diff --git a/auth-api/src/main/java/cn/bunny/services/ReadMe.md b/auth-system/src/main/java/cn/bunny/services/ReadMe.md similarity index 100% rename from auth-api/src/main/java/cn/bunny/services/ReadMe.md rename to auth-system/src/main/java/cn/bunny/services/ReadMe.md diff --git a/service/src/main/java/cn/bunny/services/aop/annotation/PermissionTag.java b/auth-system/src/main/java/cn/bunny/services/aop/annotation/PermissionTag.java similarity index 100% rename from service/src/main/java/cn/bunny/services/aop/annotation/PermissionTag.java rename to auth-system/src/main/java/cn/bunny/services/aop/annotation/PermissionTag.java diff --git a/service/src/main/java/cn/bunny/services/aop/annotation/QuartzSchedulers.java b/auth-system/src/main/java/cn/bunny/services/aop/annotation/QuartzSchedulers.java similarity index 100% rename from service/src/main/java/cn/bunny/services/aop/annotation/QuartzSchedulers.java rename to auth-system/src/main/java/cn/bunny/services/aop/annotation/QuartzSchedulers.java diff --git a/service/src/main/java/cn/bunny/services/aop/aspect/JobExecuteAspect.java b/auth-system/src/main/java/cn/bunny/services/aop/aspect/JobExecuteAspect.java similarity index 92% rename from service/src/main/java/cn/bunny/services/aop/aspect/JobExecuteAspect.java rename to auth-system/src/main/java/cn/bunny/services/aop/aspect/JobExecuteAspect.java index c992fd0..89cd30d 100644 --- a/service/src/main/java/cn/bunny/services/aop/aspect/JobExecuteAspect.java +++ b/auth-system/src/main/java/cn/bunny/services/aop/aspect/JobExecuteAspect.java @@ -1,9 +1,9 @@ package cn.bunny.services.aop.aspect; -import cn.bunny.services.domain.common.constant.LocalDateTimeConstant; -import cn.bunny.services.domain.common.enums.JobEnums; -import cn.bunny.services.domain.common.model.dto.quartz.ScheduleExecuteLogJson; -import cn.bunny.services.domain.log.entity.ScheduleExecuteLog; +import cn.bunny.domain.common.constant.LocalDateTimeConstant; +import cn.bunny.domain.common.enums.JobEnums; +import cn.bunny.domain.common.model.dto.quartz.ScheduleExecuteLogJson; +import cn.bunny.domain.log.entity.ScheduleExecuteLog; import cn.bunny.services.mapper.log.ScheduleExecuteLogMapper; import com.alibaba.fastjson2.JSON; import jakarta.annotation.Resource; @@ -101,7 +101,7 @@ public class JobExecuteAspect { scheduleExecuteLogMapper.insert(executeLog); } - @Pointcut("execution(* cn.bunny.services.quartz.*.execute(..))") + @Pointcut("execution(* cn.bunny.core.quartz.*.execute(..))") public void pointCut() { } } diff --git a/service/src/main/java/cn/bunny/services/aop/scanner/AbstractAnnotationScanner.java b/auth-system/src/main/java/cn/bunny/services/aop/scanner/AbstractAnnotationScanner.java similarity index 94% rename from service/src/main/java/cn/bunny/services/aop/scanner/AbstractAnnotationScanner.java rename to auth-system/src/main/java/cn/bunny/services/aop/scanner/AbstractAnnotationScanner.java index 94cdf47..53fcb20 100644 --- a/service/src/main/java/cn/bunny/services/aop/scanner/AbstractAnnotationScanner.java +++ b/auth-system/src/main/java/cn/bunny/services/aop/scanner/AbstractAnnotationScanner.java @@ -1,7 +1,7 @@ package cn.bunny.services.aop.scanner; -import cn.bunny.services.domain.common.enums.ResultCodeEnum; -import cn.bunny.services.exception.AuthCustomerException; +import cn.bunny.domain.common.enums.ResultCodeEnum; +import cn.bunny.core.exception.AuthCustomerException; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.context.annotation.ClassPathScanningCandidateComponentProvider; import org.springframework.core.type.filter.AnnotationTypeFilter; diff --git a/service/src/main/java/cn/bunny/services/aop/scanner/ControllerApiPermissionScanner.java b/auth-system/src/main/java/cn/bunny/services/aop/scanner/ControllerApiPermissionScanner.java similarity index 99% rename from service/src/main/java/cn/bunny/services/aop/scanner/ControllerApiPermissionScanner.java rename to auth-system/src/main/java/cn/bunny/services/aop/scanner/ControllerApiPermissionScanner.java index e4cc66b..4217a21 100644 --- a/service/src/main/java/cn/bunny/services/aop/scanner/ControllerApiPermissionScanner.java +++ b/auth-system/src/main/java/cn/bunny/services/aop/scanner/ControllerApiPermissionScanner.java @@ -1,7 +1,7 @@ package cn.bunny.services.aop.scanner; import cn.bunny.services.aop.annotation.PermissionTag; -import cn.bunny.services.domain.common.model.dto.scanner.ScannerControllerInfoVo; +import cn.bunny.domain.common.model.dto.scanner.ScannerControllerInfoVo; import cn.bunny.services.security.config.WebSecurityConfig; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/service/src/main/java/cn/bunny/services/aop/scanner/QuartzSchedulersScanner.java b/auth-system/src/main/java/cn/bunny/services/aop/scanner/QuartzSchedulersScanner.java similarity index 100% rename from service/src/main/java/cn/bunny/services/aop/scanner/QuartzSchedulersScanner.java rename to auth-system/src/main/java/cn/bunny/services/aop/scanner/QuartzSchedulersScanner.java diff --git a/auth-api/src/main/java/cn/bunny/services/controller/IndexController.java b/auth-system/src/main/java/cn/bunny/services/controller/IndexController.java similarity index 100% rename from auth-api/src/main/java/cn/bunny/services/controller/IndexController.java rename to auth-system/src/main/java/cn/bunny/services/controller/IndexController.java diff --git a/auth-api/src/main/java/cn/bunny/services/controller/configuration/ConfigurationController.java b/auth-system/src/main/java/cn/bunny/services/controller/configuration/ConfigurationController.java similarity index 83% rename from auth-api/src/main/java/cn/bunny/services/controller/configuration/ConfigurationController.java rename to auth-system/src/main/java/cn/bunny/services/controller/configuration/ConfigurationController.java index 8ac8da1..26c6eb2 100644 --- a/auth-api/src/main/java/cn/bunny/services/controller/configuration/ConfigurationController.java +++ b/auth-system/src/main/java/cn/bunny/services/controller/configuration/ConfigurationController.java @@ -1,10 +1,10 @@ package cn.bunny.services.controller.configuration; import cn.bunny.services.aop.annotation.PermissionTag; -import cn.bunny.services.domain.common.enums.ResultCodeEnum; -import cn.bunny.services.domain.common.model.vo.result.Result; -import cn.bunny.services.domain.configuration.dto.WebConfigurationDto; -import cn.bunny.services.domain.configuration.entity.WebConfiguration; +import cn.bunny.domain.common.enums.ResultCodeEnum; +import cn.bunny.domain.common.model.vo.result.Result; +import cn.bunny.domain.configuration.dto.WebConfigurationDto; +import cn.bunny.domain.configuration.entity.WebConfiguration; import cn.bunny.services.service.configuration.ConfigurationService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/auth-api/src/main/java/cn/bunny/services/controller/configuration/EmailTemplateController.java b/auth-system/src/main/java/cn/bunny/services/controller/configuration/EmailTemplateController.java similarity index 87% rename from auth-api/src/main/java/cn/bunny/services/controller/configuration/EmailTemplateController.java rename to auth-system/src/main/java/cn/bunny/services/controller/configuration/EmailTemplateController.java index a9bf42c..ed729c9 100644 --- a/auth-api/src/main/java/cn/bunny/services/controller/configuration/EmailTemplateController.java +++ b/auth-system/src/main/java/cn/bunny/services/controller/configuration/EmailTemplateController.java @@ -1,13 +1,13 @@ package cn.bunny.services.controller.configuration; import cn.bunny.services.aop.annotation.PermissionTag; -import cn.bunny.services.domain.common.ValidationGroups; -import cn.bunny.services.domain.common.enums.ResultCodeEnum; -import cn.bunny.services.domain.common.model.vo.result.PageResult; -import cn.bunny.services.domain.common.model.vo.result.Result; -import cn.bunny.services.domain.configuration.dto.EmailTemplateDto; -import cn.bunny.services.domain.configuration.entity.EmailTemplate; -import cn.bunny.services.domain.configuration.vo.EmailTemplateVo; +import cn.bunny.domain.common.ValidationGroups; +import cn.bunny.domain.common.enums.ResultCodeEnum; +import cn.bunny.domain.common.model.vo.result.PageResult; +import cn.bunny.domain.common.model.vo.result.Result; +import cn.bunny.domain.configuration.dto.EmailTemplateDto; +import cn.bunny.domain.configuration.entity.EmailTemplate; +import cn.bunny.domain.configuration.vo.EmailTemplateVo; import cn.bunny.services.service.configuration.EmailTemplateService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; diff --git a/auth-api/src/main/java/cn/bunny/services/controller/configuration/EmailUsersController.java b/auth-system/src/main/java/cn/bunny/services/controller/configuration/EmailUsersController.java similarity index 88% rename from auth-api/src/main/java/cn/bunny/services/controller/configuration/EmailUsersController.java rename to auth-system/src/main/java/cn/bunny/services/controller/configuration/EmailUsersController.java index d639527..2fdf7c8 100644 --- a/auth-api/src/main/java/cn/bunny/services/controller/configuration/EmailUsersController.java +++ b/auth-system/src/main/java/cn/bunny/services/controller/configuration/EmailUsersController.java @@ -1,13 +1,13 @@ package cn.bunny.services.controller.configuration; import cn.bunny.services.aop.annotation.PermissionTag; -import cn.bunny.services.domain.common.ValidationGroups; -import cn.bunny.services.domain.common.enums.ResultCodeEnum; -import cn.bunny.services.domain.common.model.vo.result.PageResult; -import cn.bunny.services.domain.common.model.vo.result.Result; -import cn.bunny.services.domain.configuration.dto.EmailUsersDto; -import cn.bunny.services.domain.configuration.entity.EmailUsers; -import cn.bunny.services.domain.configuration.vo.EmailUsersVo; +import cn.bunny.domain.common.ValidationGroups; +import cn.bunny.domain.common.enums.ResultCodeEnum; +import cn.bunny.domain.common.model.vo.result.PageResult; +import cn.bunny.domain.common.model.vo.result.Result; +import cn.bunny.domain.configuration.dto.EmailUsersDto; +import cn.bunny.domain.configuration.entity.EmailUsers; +import cn.bunny.domain.configuration.vo.EmailUsersVo; import cn.bunny.services.service.configuration.EmailUsersService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; diff --git a/auth-api/src/main/java/cn/bunny/services/controller/configuration/I18nController.java b/auth-system/src/main/java/cn/bunny/services/controller/configuration/I18nController.java similarity index 87% rename from auth-api/src/main/java/cn/bunny/services/controller/configuration/I18nController.java rename to auth-system/src/main/java/cn/bunny/services/controller/configuration/I18nController.java index f318c4d..60853a6 100644 --- a/auth-api/src/main/java/cn/bunny/services/controller/configuration/I18nController.java +++ b/auth-system/src/main/java/cn/bunny/services/controller/configuration/I18nController.java @@ -1,14 +1,14 @@ package cn.bunny.services.controller.configuration; import cn.bunny.services.aop.annotation.PermissionTag; -import cn.bunny.services.domain.common.ValidationGroups; -import cn.bunny.services.domain.common.enums.ResultCodeEnum; -import cn.bunny.services.domain.common.model.vo.result.PageResult; -import cn.bunny.services.domain.common.model.vo.result.Result; -import cn.bunny.services.domain.configuration.dto.I18nDto; -import cn.bunny.services.domain.configuration.dto.I18nUpdateByFileDto; -import cn.bunny.services.domain.configuration.entity.I18n; -import cn.bunny.services.domain.configuration.vo.I18nVo; +import cn.bunny.domain.common.ValidationGroups; +import cn.bunny.domain.common.enums.ResultCodeEnum; +import cn.bunny.domain.common.model.vo.result.PageResult; +import cn.bunny.domain.common.model.vo.result.Result; +import cn.bunny.domain.configuration.dto.I18nDto; +import cn.bunny.domain.configuration.dto.I18nUpdateByFileDto; +import cn.bunny.domain.configuration.entity.I18n; +import cn.bunny.domain.configuration.vo.I18nVo; import cn.bunny.services.service.configuration.I18nService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; diff --git a/auth-api/src/main/java/cn/bunny/services/controller/configuration/I18nTypeController.java b/auth-system/src/main/java/cn/bunny/services/controller/configuration/I18nTypeController.java similarity index 87% rename from auth-api/src/main/java/cn/bunny/services/controller/configuration/I18nTypeController.java rename to auth-system/src/main/java/cn/bunny/services/controller/configuration/I18nTypeController.java index cc744b7..48ee0b9 100644 --- a/auth-api/src/main/java/cn/bunny/services/controller/configuration/I18nTypeController.java +++ b/auth-system/src/main/java/cn/bunny/services/controller/configuration/I18nTypeController.java @@ -1,11 +1,11 @@ package cn.bunny.services.controller.configuration; import cn.bunny.services.aop.annotation.PermissionTag; -import cn.bunny.services.domain.common.ValidationGroups; -import cn.bunny.services.domain.common.enums.ResultCodeEnum; -import cn.bunny.services.domain.common.model.vo.result.Result; -import cn.bunny.services.domain.configuration.dto.I18nTypeDto; -import cn.bunny.services.domain.configuration.vo.I18nTypeVo; +import cn.bunny.domain.common.ValidationGroups; +import cn.bunny.domain.common.enums.ResultCodeEnum; +import cn.bunny.domain.common.model.vo.result.Result; +import cn.bunny.domain.configuration.dto.I18nTypeDto; +import cn.bunny.domain.configuration.vo.I18nTypeVo; import cn.bunny.services.service.configuration.I18nTypeService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/auth-api/src/main/java/cn/bunny/services/controller/configuration/MenuIconController.java b/auth-system/src/main/java/cn/bunny/services/controller/configuration/MenuIconController.java similarity index 87% rename from auth-api/src/main/java/cn/bunny/services/controller/configuration/MenuIconController.java rename to auth-system/src/main/java/cn/bunny/services/controller/configuration/MenuIconController.java index 748813e..ec72a82 100644 --- a/auth-api/src/main/java/cn/bunny/services/controller/configuration/MenuIconController.java +++ b/auth-system/src/main/java/cn/bunny/services/controller/configuration/MenuIconController.java @@ -1,13 +1,13 @@ package cn.bunny.services.controller.configuration; import cn.bunny.services.aop.annotation.PermissionTag; -import cn.bunny.services.domain.common.ValidationGroups; -import cn.bunny.services.domain.common.enums.ResultCodeEnum; -import cn.bunny.services.domain.common.model.vo.result.PageResult; -import cn.bunny.services.domain.common.model.vo.result.Result; -import cn.bunny.services.domain.configuration.dto.MenuIconDto; -import cn.bunny.services.domain.configuration.entity.MenuIcon; -import cn.bunny.services.domain.configuration.vo.MenuIconVo; +import cn.bunny.domain.common.ValidationGroups; +import cn.bunny.domain.common.enums.ResultCodeEnum; +import cn.bunny.domain.common.model.vo.result.PageResult; +import cn.bunny.domain.common.model.vo.result.Result; +import cn.bunny.domain.configuration.dto.MenuIconDto; +import cn.bunny.domain.configuration.entity.MenuIcon; +import cn.bunny.domain.configuration.vo.MenuIconVo; import cn.bunny.services.service.configuration.MenuIconService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; diff --git a/auth-api/src/main/java/cn/bunny/services/controller/file/FilesController.java b/auth-system/src/main/java/cn/bunny/services/controller/file/FilesController.java similarity index 86% rename from auth-api/src/main/java/cn/bunny/services/controller/file/FilesController.java rename to auth-system/src/main/java/cn/bunny/services/controller/file/FilesController.java index 972d3db..c2a18bd 100644 --- a/auth-api/src/main/java/cn/bunny/services/controller/file/FilesController.java +++ b/auth-system/src/main/java/cn/bunny/services/controller/file/FilesController.java @@ -1,17 +1,17 @@ package cn.bunny.services.controller.file; import cn.bunny.services.aop.annotation.PermissionTag; -import cn.bunny.services.domain.common.ValidationGroups; -import cn.bunny.services.domain.common.constant.FileStorageConstant; -import cn.bunny.services.domain.common.enums.ResultCodeEnum; -import cn.bunny.services.domain.common.model.vo.result.PageResult; -import cn.bunny.services.domain.common.model.vo.result.Result; -import cn.bunny.services.domain.files.dto.FileUploadDto; -import cn.bunny.services.domain.files.dto.FilesCreateOrUpdateDto; -import cn.bunny.services.domain.files.dto.FilesDto; -import cn.bunny.services.domain.files.entity.Files; -import cn.bunny.services.domain.files.vo.FileInfoVo; -import cn.bunny.services.domain.files.vo.FilesVo; +import cn.bunny.domain.common.ValidationGroups; +import cn.bunny.domain.common.constant.FileStorageConstant; +import cn.bunny.domain.common.enums.ResultCodeEnum; +import cn.bunny.domain.common.model.vo.result.PageResult; +import cn.bunny.domain.common.model.vo.result.Result; +import cn.bunny.domain.files.dto.FileUploadDto; +import cn.bunny.domain.files.dto.FilesCreateOrUpdateDto; +import cn.bunny.domain.files.dto.FilesDto; +import cn.bunny.domain.files.entity.Files; +import cn.bunny.domain.files.vo.FileInfoVo; +import cn.bunny.domain.files.vo.FilesVo; import cn.bunny.services.service.file.FilesService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; diff --git a/auth-api/src/main/java/cn/bunny/services/controller/file/FilesParDetailController.java b/auth-system/src/main/java/cn/bunny/services/controller/file/FilesParDetailController.java similarity index 89% rename from auth-api/src/main/java/cn/bunny/services/controller/file/FilesParDetailController.java rename to auth-system/src/main/java/cn/bunny/services/controller/file/FilesParDetailController.java index 7409202..a753280 100644 --- a/auth-api/src/main/java/cn/bunny/services/controller/file/FilesParDetailController.java +++ b/auth-system/src/main/java/cn/bunny/services/controller/file/FilesParDetailController.java @@ -1,12 +1,12 @@ package cn.bunny.services.controller.file; import cn.bunny.services.aop.annotation.PermissionTag; -import cn.bunny.services.domain.common.enums.ResultCodeEnum; -import cn.bunny.services.domain.common.model.vo.result.PageResult; -import cn.bunny.services.domain.common.model.vo.result.Result; -import cn.bunny.services.domain.files.dto.FilesParDetailDto; -import cn.bunny.services.domain.files.entity.FilesParDetail; -import cn.bunny.services.domain.files.vo.FilesParDetailVo; +import cn.bunny.domain.common.enums.ResultCodeEnum; +import cn.bunny.domain.common.model.vo.result.PageResult; +import cn.bunny.domain.common.model.vo.result.Result; +import cn.bunny.domain.files.dto.FilesParDetailDto; +import cn.bunny.domain.files.entity.FilesParDetail; +import cn.bunny.domain.files.vo.FilesParDetailVo; import cn.bunny.services.service.file.FilesParDetailService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; diff --git a/auth-api/src/main/java/cn/bunny/services/controller/log/ScheduleExecuteLogController.java b/auth-system/src/main/java/cn/bunny/services/controller/log/ScheduleExecuteLogController.java similarity index 85% rename from auth-api/src/main/java/cn/bunny/services/controller/log/ScheduleExecuteLogController.java rename to auth-system/src/main/java/cn/bunny/services/controller/log/ScheduleExecuteLogController.java index 5acebfd..71074dd 100644 --- a/auth-api/src/main/java/cn/bunny/services/controller/log/ScheduleExecuteLogController.java +++ b/auth-system/src/main/java/cn/bunny/services/controller/log/ScheduleExecuteLogController.java @@ -1,12 +1,12 @@ package cn.bunny.services.controller.log; import cn.bunny.services.aop.annotation.PermissionTag; -import cn.bunny.services.domain.common.enums.ResultCodeEnum; -import cn.bunny.services.domain.common.model.vo.result.PageResult; -import cn.bunny.services.domain.common.model.vo.result.Result; -import cn.bunny.services.domain.log.dto.ScheduleExecuteLogDto; -import cn.bunny.services.domain.log.entity.ScheduleExecuteLog; -import cn.bunny.services.domain.log.vo.ScheduleExecuteLogVo; +import cn.bunny.domain.common.enums.ResultCodeEnum; +import cn.bunny.domain.common.model.vo.result.PageResult; +import cn.bunny.domain.common.model.vo.result.Result; +import cn.bunny.domain.log.dto.ScheduleExecuteLogDto; +import cn.bunny.domain.log.entity.ScheduleExecuteLog; +import cn.bunny.domain.log.vo.ScheduleExecuteLogVo; import cn.bunny.services.service.log.ScheduleExecuteLogService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; diff --git a/auth-api/src/main/java/cn/bunny/services/controller/log/UserLoginLogController.java b/auth-system/src/main/java/cn/bunny/services/controller/log/UserLoginLogController.java similarity index 86% rename from auth-api/src/main/java/cn/bunny/services/controller/log/UserLoginLogController.java rename to auth-system/src/main/java/cn/bunny/services/controller/log/UserLoginLogController.java index 59278fc..415b9a4 100644 --- a/auth-api/src/main/java/cn/bunny/services/controller/log/UserLoginLogController.java +++ b/auth-system/src/main/java/cn/bunny/services/controller/log/UserLoginLogController.java @@ -1,13 +1,13 @@ package cn.bunny.services.controller.log; import cn.bunny.services.aop.annotation.PermissionTag; -import cn.bunny.services.domain.common.enums.ResultCodeEnum; -import cn.bunny.services.domain.common.model.vo.result.PageResult; -import cn.bunny.services.domain.common.model.vo.result.Result; -import cn.bunny.services.domain.log.dto.UserLoginLogDto; -import cn.bunny.services.domain.log.entity.UserLoginLog; -import cn.bunny.services.domain.log.vo.UserLoginLogLocalVo; -import cn.bunny.services.domain.log.vo.UserLoginLogVo; +import cn.bunny.domain.common.enums.ResultCodeEnum; +import cn.bunny.domain.common.model.vo.result.PageResult; +import cn.bunny.domain.common.model.vo.result.Result; +import cn.bunny.domain.log.dto.UserLoginLogDto; +import cn.bunny.domain.log.entity.UserLoginLog; +import cn.bunny.domain.log.vo.UserLoginLogLocalVo; +import cn.bunny.domain.log.vo.UserLoginLogVo; import cn.bunny.services.service.log.UserLoginLogService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; diff --git a/auth-api/src/main/java/cn/bunny/services/controller/message/MessageController.java b/auth-system/src/main/java/cn/bunny/services/controller/message/MessageController.java similarity index 86% rename from auth-api/src/main/java/cn/bunny/services/controller/message/MessageController.java rename to auth-system/src/main/java/cn/bunny/services/controller/message/MessageController.java index 7289037..d2b9baf 100644 --- a/auth-api/src/main/java/cn/bunny/services/controller/message/MessageController.java +++ b/auth-system/src/main/java/cn/bunny/services/controller/message/MessageController.java @@ -1,15 +1,15 @@ package cn.bunny.services.controller.message; import cn.bunny.services.aop.annotation.PermissionTag; -import cn.bunny.services.domain.common.ValidationGroups; -import cn.bunny.services.domain.common.enums.ResultCodeEnum; -import cn.bunny.services.domain.common.model.vo.result.PageResult; -import cn.bunny.services.domain.common.model.vo.result.Result; -import cn.bunny.services.domain.message.dto.MessageDto; -import cn.bunny.services.domain.message.entity.Message; -import cn.bunny.services.domain.message.vo.MessageDetailVo; -import cn.bunny.services.domain.message.vo.MessageReceivedWithUserVo; -import cn.bunny.services.domain.message.vo.MessageVo; +import cn.bunny.domain.common.ValidationGroups; +import cn.bunny.domain.common.enums.ResultCodeEnum; +import cn.bunny.domain.common.model.vo.result.PageResult; +import cn.bunny.domain.common.model.vo.result.Result; +import cn.bunny.domain.message.dto.MessageDto; +import cn.bunny.domain.message.entity.Message; +import cn.bunny.domain.message.vo.MessageDetailVo; +import cn.bunny.domain.message.vo.MessageReceivedWithUserVo; +import cn.bunny.domain.message.vo.MessageVo; import cn.bunny.services.service.message.MessageService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; diff --git a/auth-api/src/main/java/cn/bunny/services/controller/message/MessageReceivedController.java b/auth-system/src/main/java/cn/bunny/services/controller/message/MessageReceivedController.java similarity index 87% rename from auth-api/src/main/java/cn/bunny/services/controller/message/MessageReceivedController.java rename to auth-system/src/main/java/cn/bunny/services/controller/message/MessageReceivedController.java index 610536a..87169c6 100644 --- a/auth-api/src/main/java/cn/bunny/services/controller/message/MessageReceivedController.java +++ b/auth-system/src/main/java/cn/bunny/services/controller/message/MessageReceivedController.java @@ -1,15 +1,15 @@ package cn.bunny.services.controller.message; import cn.bunny.services.aop.annotation.PermissionTag; -import cn.bunny.services.domain.common.enums.ResultCodeEnum; -import cn.bunny.services.domain.common.model.vo.result.PageResult; -import cn.bunny.services.domain.common.model.vo.result.Result; -import cn.bunny.services.domain.message.dto.MessageReceivedDto; -import cn.bunny.services.domain.message.dto.MessageReceivedUpdateDto; -import cn.bunny.services.domain.message.dto.MessageUserDto; -import cn.bunny.services.domain.message.entity.Message; -import cn.bunny.services.domain.message.vo.MessageReceivedWithMessageVo; -import cn.bunny.services.domain.message.vo.MessageUserVo; +import cn.bunny.domain.common.enums.ResultCodeEnum; +import cn.bunny.domain.common.model.vo.result.PageResult; +import cn.bunny.domain.common.model.vo.result.Result; +import cn.bunny.domain.message.dto.MessageReceivedDto; +import cn.bunny.domain.message.dto.MessageReceivedUpdateDto; +import cn.bunny.domain.message.dto.MessageUserDto; +import cn.bunny.domain.message.entity.Message; +import cn.bunny.domain.message.vo.MessageReceivedWithMessageVo; +import cn.bunny.domain.message.vo.MessageUserVo; import cn.bunny.services.service.message.MessageReceivedService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; diff --git a/auth-api/src/main/java/cn/bunny/services/controller/message/MessageTypeController.java b/auth-system/src/main/java/cn/bunny/services/controller/message/MessageTypeController.java similarity index 88% rename from auth-api/src/main/java/cn/bunny/services/controller/message/MessageTypeController.java rename to auth-system/src/main/java/cn/bunny/services/controller/message/MessageTypeController.java index 9464bb0..ec81234 100644 --- a/auth-api/src/main/java/cn/bunny/services/controller/message/MessageTypeController.java +++ b/auth-system/src/main/java/cn/bunny/services/controller/message/MessageTypeController.java @@ -1,13 +1,13 @@ package cn.bunny.services.controller.message; import cn.bunny.services.aop.annotation.PermissionTag; -import cn.bunny.services.domain.common.ValidationGroups; -import cn.bunny.services.domain.common.enums.ResultCodeEnum; -import cn.bunny.services.domain.common.model.vo.result.PageResult; -import cn.bunny.services.domain.common.model.vo.result.Result; -import cn.bunny.services.domain.message.dto.MessageTypeDto; -import cn.bunny.services.domain.message.entity.MessageType; -import cn.bunny.services.domain.message.vo.MessageTypeVo; +import cn.bunny.domain.common.ValidationGroups; +import cn.bunny.domain.common.enums.ResultCodeEnum; +import cn.bunny.domain.common.model.vo.result.PageResult; +import cn.bunny.domain.common.model.vo.result.Result; +import cn.bunny.domain.message.dto.MessageTypeDto; +import cn.bunny.domain.message.entity.MessageType; +import cn.bunny.domain.message.vo.MessageTypeVo; import cn.bunny.services.service.message.MessageTypeService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; diff --git a/auth-api/src/main/java/cn/bunny/services/controller/schedule/SchedulersController.java b/auth-system/src/main/java/cn/bunny/services/controller/schedule/SchedulersController.java similarity index 89% rename from auth-api/src/main/java/cn/bunny/services/controller/schedule/SchedulersController.java rename to auth-system/src/main/java/cn/bunny/services/controller/schedule/SchedulersController.java index 43f87d8..bb1672f 100644 --- a/auth-api/src/main/java/cn/bunny/services/controller/schedule/SchedulersController.java +++ b/auth-system/src/main/java/cn/bunny/services/controller/schedule/SchedulersController.java @@ -2,13 +2,13 @@ package cn.bunny.services.controller.schedule; import cn.bunny.services.aop.annotation.PermissionTag; import cn.bunny.services.aop.scanner.QuartzSchedulersScanner; -import cn.bunny.services.domain.common.ValidationGroups; -import cn.bunny.services.domain.common.enums.ResultCodeEnum; -import cn.bunny.services.domain.common.model.vo.result.PageResult; -import cn.bunny.services.domain.common.model.vo.result.Result; -import cn.bunny.services.domain.schedule.dto.SchedulersDto; -import cn.bunny.services.domain.schedule.entity.Schedulers; -import cn.bunny.services.domain.schedule.vo.SchedulersVo; +import cn.bunny.domain.common.ValidationGroups; +import cn.bunny.domain.common.enums.ResultCodeEnum; +import cn.bunny.domain.common.model.vo.result.PageResult; +import cn.bunny.domain.common.model.vo.result.Result; +import cn.bunny.domain.schedule.dto.SchedulersDto; +import cn.bunny.domain.schedule.entity.Schedulers; +import cn.bunny.domain.schedule.vo.SchedulersVo; import cn.bunny.services.service.schedule.SchedulersService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; diff --git a/auth-api/src/main/java/cn/bunny/services/controller/schedule/SchedulersGroupController.java b/auth-system/src/main/java/cn/bunny/services/controller/schedule/SchedulersGroupController.java similarity index 88% rename from auth-api/src/main/java/cn/bunny/services/controller/schedule/SchedulersGroupController.java rename to auth-system/src/main/java/cn/bunny/services/controller/schedule/SchedulersGroupController.java index c6f4711..481b3db 100644 --- a/auth-api/src/main/java/cn/bunny/services/controller/schedule/SchedulersGroupController.java +++ b/auth-system/src/main/java/cn/bunny/services/controller/schedule/SchedulersGroupController.java @@ -1,13 +1,13 @@ package cn.bunny.services.controller.schedule; import cn.bunny.services.aop.annotation.PermissionTag; -import cn.bunny.services.domain.common.ValidationGroups; -import cn.bunny.services.domain.common.enums.ResultCodeEnum; -import cn.bunny.services.domain.common.model.vo.result.PageResult; -import cn.bunny.services.domain.common.model.vo.result.Result; -import cn.bunny.services.domain.schedule.dto.SchedulersGroupDto; -import cn.bunny.services.domain.schedule.entity.SchedulersGroup; -import cn.bunny.services.domain.schedule.vo.SchedulersGroupVo; +import cn.bunny.domain.common.ValidationGroups; +import cn.bunny.domain.common.enums.ResultCodeEnum; +import cn.bunny.domain.common.model.vo.result.PageResult; +import cn.bunny.domain.common.model.vo.result.Result; +import cn.bunny.domain.schedule.dto.SchedulersGroupDto; +import cn.bunny.domain.schedule.entity.SchedulersGroup; +import cn.bunny.domain.schedule.vo.SchedulersGroupVo; import cn.bunny.services.service.schedule.SchedulersGroupService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; diff --git a/auth-api/src/main/java/cn/bunny/services/controller/system/DeptController.java b/auth-system/src/main/java/cn/bunny/services/controller/system/DeptController.java similarity index 87% rename from auth-api/src/main/java/cn/bunny/services/controller/system/DeptController.java rename to auth-system/src/main/java/cn/bunny/services/controller/system/DeptController.java index 3fa7cab..42c7c74 100644 --- a/auth-api/src/main/java/cn/bunny/services/controller/system/DeptController.java +++ b/auth-system/src/main/java/cn/bunny/services/controller/system/DeptController.java @@ -1,13 +1,13 @@ package cn.bunny.services.controller.system; import cn.bunny.services.aop.annotation.PermissionTag; -import cn.bunny.services.domain.common.ValidationGroups; -import cn.bunny.services.domain.common.enums.ResultCodeEnum; -import cn.bunny.services.domain.common.model.vo.result.PageResult; -import cn.bunny.services.domain.common.model.vo.result.Result; -import cn.bunny.services.domain.system.dto.DeptDto; -import cn.bunny.services.domain.system.entity.Dept; -import cn.bunny.services.domain.system.vo.DeptVo; +import cn.bunny.domain.common.ValidationGroups; +import cn.bunny.domain.common.enums.ResultCodeEnum; +import cn.bunny.domain.common.model.vo.result.PageResult; +import cn.bunny.domain.common.model.vo.result.Result; +import cn.bunny.domain.system.dto.DeptDto; +import cn.bunny.domain.system.entity.Dept; +import cn.bunny.domain.system.vo.DeptVo; import cn.bunny.services.service.system.DeptService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; diff --git a/auth-api/src/main/java/cn/bunny/services/controller/system/PermissionController.java b/auth-system/src/main/java/cn/bunny/services/controller/system/PermissionController.java similarity index 89% rename from auth-api/src/main/java/cn/bunny/services/controller/system/PermissionController.java rename to auth-system/src/main/java/cn/bunny/services/controller/system/PermissionController.java index 70ed371..dd56cb2 100644 --- a/auth-api/src/main/java/cn/bunny/services/controller/system/PermissionController.java +++ b/auth-system/src/main/java/cn/bunny/services/controller/system/PermissionController.java @@ -2,15 +2,15 @@ package cn.bunny.services.controller.system; import cn.bunny.services.aop.annotation.PermissionTag; import cn.bunny.services.aop.scanner.ControllerApiPermissionScanner; -import cn.bunny.services.domain.common.ValidationGroups; -import cn.bunny.services.domain.common.enums.ResultCodeEnum; -import cn.bunny.services.domain.common.model.dto.scanner.ScannerControllerInfoVo; -import cn.bunny.services.domain.common.model.vo.result.PageResult; -import cn.bunny.services.domain.common.model.vo.result.Result; -import cn.bunny.services.domain.system.dto.PermissionDto; -import cn.bunny.services.domain.system.dto.PermissionUpdateBatchByParentIdDto; -import cn.bunny.services.domain.system.entity.Permission; -import cn.bunny.services.domain.system.vo.PermissionVo; +import cn.bunny.domain.common.ValidationGroups; +import cn.bunny.domain.common.enums.ResultCodeEnum; +import cn.bunny.domain.common.model.dto.scanner.ScannerControllerInfoVo; +import cn.bunny.domain.common.model.vo.result.PageResult; +import cn.bunny.domain.common.model.vo.result.Result; +import cn.bunny.domain.system.dto.PermissionDto; +import cn.bunny.domain.system.dto.PermissionUpdateBatchByParentIdDto; +import cn.bunny.domain.system.entity.Permission; +import cn.bunny.domain.system.vo.PermissionVo; import cn.bunny.services.service.system.PermissionService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; diff --git a/auth-api/src/main/java/cn/bunny/services/controller/system/RoleController.java b/auth-system/src/main/java/cn/bunny/services/controller/system/RoleController.java similarity index 89% rename from auth-api/src/main/java/cn/bunny/services/controller/system/RoleController.java rename to auth-system/src/main/java/cn/bunny/services/controller/system/RoleController.java index fd99bc9..a759353 100644 --- a/auth-api/src/main/java/cn/bunny/services/controller/system/RoleController.java +++ b/auth-system/src/main/java/cn/bunny/services/controller/system/RoleController.java @@ -1,13 +1,13 @@ package cn.bunny.services.controller.system; import cn.bunny.services.aop.annotation.PermissionTag; -import cn.bunny.services.domain.common.ValidationGroups; -import cn.bunny.services.domain.common.enums.ResultCodeEnum; -import cn.bunny.services.domain.common.model.vo.result.PageResult; -import cn.bunny.services.domain.common.model.vo.result.Result; -import cn.bunny.services.domain.system.dto.RoleDto; -import cn.bunny.services.domain.system.entity.Role; -import cn.bunny.services.domain.system.vo.RoleVo; +import cn.bunny.domain.common.ValidationGroups; +import cn.bunny.domain.common.enums.ResultCodeEnum; +import cn.bunny.domain.common.model.vo.result.PageResult; +import cn.bunny.domain.common.model.vo.result.Result; +import cn.bunny.domain.system.dto.RoleDto; +import cn.bunny.domain.system.entity.Role; +import cn.bunny.domain.system.vo.RoleVo; import cn.bunny.services.service.system.RoleService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; diff --git a/auth-api/src/main/java/cn/bunny/services/controller/system/RolePermissionController.java b/auth-system/src/main/java/cn/bunny/services/controller/system/RolePermissionController.java similarity index 92% rename from auth-api/src/main/java/cn/bunny/services/controller/system/RolePermissionController.java rename to auth-system/src/main/java/cn/bunny/services/controller/system/RolePermissionController.java index 768dae7..0b706e9 100644 --- a/auth-api/src/main/java/cn/bunny/services/controller/system/RolePermissionController.java +++ b/auth-system/src/main/java/cn/bunny/services/controller/system/RolePermissionController.java @@ -1,8 +1,8 @@ package cn.bunny.services.controller.system; import cn.bunny.services.aop.annotation.PermissionTag; -import cn.bunny.services.domain.common.model.vo.result.Result; -import cn.bunny.services.domain.system.dto.AssignPowersToRoleDto; +import cn.bunny.domain.common.model.vo.result.Result; +import cn.bunny.domain.system.dto.AssignPowersToRoleDto; import cn.bunny.services.service.system.RolePermissionService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/auth-api/src/main/java/cn/bunny/services/controller/system/RouterController.java b/auth-system/src/main/java/cn/bunny/services/controller/system/RouterController.java similarity index 87% rename from auth-api/src/main/java/cn/bunny/services/controller/system/RouterController.java rename to auth-system/src/main/java/cn/bunny/services/controller/system/RouterController.java index 7df138b..97cd514 100644 --- a/auth-api/src/main/java/cn/bunny/services/controller/system/RouterController.java +++ b/auth-system/src/main/java/cn/bunny/services/controller/system/RouterController.java @@ -1,12 +1,12 @@ package cn.bunny.services.controller.system; import cn.bunny.services.aop.annotation.PermissionTag; -import cn.bunny.services.domain.common.ValidationGroups; -import cn.bunny.services.domain.common.enums.ResultCodeEnum; -import cn.bunny.services.domain.common.model.vo.result.Result; -import cn.bunny.services.domain.system.dto.RouterDto; -import cn.bunny.services.domain.system.vo.router.RouterManageVo; -import cn.bunny.services.domain.system.vo.router.WebUserRouterVo; +import cn.bunny.domain.common.ValidationGroups; +import cn.bunny.domain.common.enums.ResultCodeEnum; +import cn.bunny.domain.common.model.vo.result.Result; +import cn.bunny.domain.system.dto.RouterDto; +import cn.bunny.domain.system.vo.router.RouterManageVo; +import cn.bunny.domain.system.vo.router.WebUserRouterVo; import cn.bunny.services.service.system.RouterService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/auth-api/src/main/java/cn/bunny/services/controller/system/RouterRoleController.java b/auth-system/src/main/java/cn/bunny/services/controller/system/RouterRoleController.java similarity index 95% rename from auth-api/src/main/java/cn/bunny/services/controller/system/RouterRoleController.java rename to auth-system/src/main/java/cn/bunny/services/controller/system/RouterRoleController.java index 07df859..9a82de6 100644 --- a/auth-api/src/main/java/cn/bunny/services/controller/system/RouterRoleController.java +++ b/auth-system/src/main/java/cn/bunny/services/controller/system/RouterRoleController.java @@ -1,7 +1,7 @@ package cn.bunny.services.controller.system; import cn.bunny.services.aop.annotation.PermissionTag; -import cn.bunny.services.domain.common.model.vo.result.Result; +import cn.bunny.domain.common.model.vo.result.Result; import cn.bunny.services.service.system.RouterRoleService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/auth-api/src/main/java/cn/bunny/services/controller/system/UserController.java b/auth-system/src/main/java/cn/bunny/services/controller/system/UserController.java similarity index 88% rename from auth-api/src/main/java/cn/bunny/services/controller/system/UserController.java rename to auth-system/src/main/java/cn/bunny/services/controller/system/UserController.java index 3de32bd..e1ce02f 100644 --- a/auth-api/src/main/java/cn/bunny/services/controller/system/UserController.java +++ b/auth-system/src/main/java/cn/bunny/services/controller/system/UserController.java @@ -1,15 +1,15 @@ package cn.bunny.services.controller.system; import cn.bunny.services.aop.annotation.PermissionTag; -import cn.bunny.services.domain.common.enums.ResultCodeEnum; -import cn.bunny.services.domain.common.model.vo.result.PageResult; -import cn.bunny.services.domain.common.model.vo.result.Result; -import cn.bunny.services.domain.system.dto.user.AdminUserAddDto; -import cn.bunny.services.domain.system.dto.user.AdminUserDto; -import cn.bunny.services.domain.system.dto.user.AdminUserUpdateDto; -import cn.bunny.services.domain.system.entity.AdminUser; -import cn.bunny.services.domain.system.vo.user.AdminUserVo; -import cn.bunny.services.domain.system.vo.user.UserVo; +import cn.bunny.domain.common.enums.ResultCodeEnum; +import cn.bunny.domain.common.model.vo.result.PageResult; +import cn.bunny.domain.common.model.vo.result.Result; +import cn.bunny.domain.system.dto.user.AdminUserAddDto; +import cn.bunny.domain.system.dto.user.AdminUserDto; +import cn.bunny.domain.system.dto.user.AdminUserUpdateDto; +import cn.bunny.domain.system.entity.AdminUser; +import cn.bunny.domain.system.vo.user.AdminUserVo; +import cn.bunny.domain.system.vo.user.UserVo; import cn.bunny.services.service.system.UserService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; diff --git a/auth-api/src/main/java/cn/bunny/services/controller/system/UserLoginController.java b/auth-system/src/main/java/cn/bunny/services/controller/system/UserLoginController.java similarity index 84% rename from auth-api/src/main/java/cn/bunny/services/controller/system/UserLoginController.java rename to auth-system/src/main/java/cn/bunny/services/controller/system/UserLoginController.java index 63c0abf..0c9f22b 100644 --- a/auth-api/src/main/java/cn/bunny/services/controller/system/UserLoginController.java +++ b/auth-system/src/main/java/cn/bunny/services/controller/system/UserLoginController.java @@ -1,14 +1,14 @@ package cn.bunny.services.controller.system; -import cn.bunny.services.context.BaseContext; -import cn.bunny.services.domain.common.enums.ResultCodeEnum; -import cn.bunny.services.domain.common.model.vo.LoginVo; -import cn.bunny.services.domain.common.model.vo.result.Result; -import cn.bunny.services.domain.system.dto.user.AdminUserUpdateByLocalUserDto; -import cn.bunny.services.domain.system.dto.user.LoginDto; -import cn.bunny.services.domain.system.dto.user.RefreshTokenDto; -import cn.bunny.services.domain.system.vo.user.RefreshTokenVo; -import cn.bunny.services.exception.AuthCustomerException; +import cn.bunny.core.context.BaseContext; +import cn.bunny.domain.common.enums.ResultCodeEnum; +import cn.bunny.domain.common.model.vo.LoginVo; +import cn.bunny.domain.common.model.vo.result.Result; +import cn.bunny.domain.system.dto.user.AdminUserUpdateByLocalUserDto; +import cn.bunny.domain.system.dto.user.LoginDto; +import cn.bunny.domain.system.dto.user.RefreshTokenDto; +import cn.bunny.domain.system.vo.user.RefreshTokenVo; +import cn.bunny.core.exception.AuthCustomerException; import cn.bunny.services.service.system.UserLoginService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/auth-api/src/main/java/cn/bunny/services/controller/system/UserRoleController.java b/auth-system/src/main/java/cn/bunny/services/controller/system/UserRoleController.java similarity index 91% rename from auth-api/src/main/java/cn/bunny/services/controller/system/UserRoleController.java rename to auth-system/src/main/java/cn/bunny/services/controller/system/UserRoleController.java index f6e2ad8..00d6477 100644 --- a/auth-api/src/main/java/cn/bunny/services/controller/system/UserRoleController.java +++ b/auth-system/src/main/java/cn/bunny/services/controller/system/UserRoleController.java @@ -1,8 +1,8 @@ package cn.bunny.services.controller.system; import cn.bunny.services.aop.annotation.PermissionTag; -import cn.bunny.services.domain.common.model.vo.result.Result; -import cn.bunny.services.domain.system.dto.user.AssignRolesToUsersDto; +import cn.bunny.domain.common.model.vo.result.Result; +import cn.bunny.domain.system.dto.user.AssignRolesToUsersDto; import cn.bunny.services.service.system.UserRoleService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/service/src/main/java/cn/bunny/services/core/cache/EmailCacheService.java b/auth-system/src/main/java/cn/bunny/services/core/cache/EmailCacheService.java similarity index 93% rename from service/src/main/java/cn/bunny/services/core/cache/EmailCacheService.java rename to auth-system/src/main/java/cn/bunny/services/core/cache/EmailCacheService.java index a3118e4..eb0b916 100644 --- a/service/src/main/java/cn/bunny/services/core/cache/EmailCacheService.java +++ b/auth-system/src/main/java/cn/bunny/services/core/cache/EmailCacheService.java @@ -1,7 +1,7 @@ package cn.bunny.services.core.cache; -import cn.bunny.services.domain.common.constant.RedisUserConstant; -import cn.bunny.services.domain.common.enums.ResultCodeEnum; +import cn.bunny.domain.common.constant.RedisUserConstant; +import cn.bunny.domain.common.enums.ResultCodeEnum; import jakarta.annotation.Resource; import org.jetbrains.annotations.NotNull; import org.springframework.data.redis.core.RedisTemplate; diff --git a/service/src/main/java/cn/bunny/services/core/cache/RedisService.java b/auth-system/src/main/java/cn/bunny/services/core/cache/RedisService.java similarity index 95% rename from service/src/main/java/cn/bunny/services/core/cache/RedisService.java rename to auth-system/src/main/java/cn/bunny/services/core/cache/RedisService.java index 207d6a9..653b033 100644 --- a/service/src/main/java/cn/bunny/services/core/cache/RedisService.java +++ b/auth-system/src/main/java/cn/bunny/services/core/cache/RedisService.java @@ -1,6 +1,6 @@ package cn.bunny.services.core.cache; -import cn.bunny.services.domain.common.constant.RedisUserConstant; +import cn.bunny.domain.common.constant.RedisUserConstant; import jakarta.annotation.Resource; import org.jetbrains.annotations.NotNull; import org.springframework.data.redis.core.Cursor; diff --git a/service/src/main/java/cn/bunny/services/core/cache/UserAuthorizationCacheService.java b/auth-system/src/main/java/cn/bunny/services/core/cache/UserAuthorizationCacheService.java similarity index 95% rename from service/src/main/java/cn/bunny/services/core/cache/UserAuthorizationCacheService.java rename to auth-system/src/main/java/cn/bunny/services/core/cache/UserAuthorizationCacheService.java index dd1c2b4..6e0ef52 100644 --- a/service/src/main/java/cn/bunny/services/core/cache/UserAuthorizationCacheService.java +++ b/auth-system/src/main/java/cn/bunny/services/core/cache/UserAuthorizationCacheService.java @@ -1,8 +1,8 @@ package cn.bunny.services.core.cache; -import cn.bunny.services.domain.common.constant.RedisUserConstant; -import cn.bunny.services.domain.system.entity.Permission; -import cn.bunny.services.domain.system.entity.Role; +import cn.bunny.domain.common.constant.RedisUserConstant; +import cn.bunny.domain.system.entity.Permission; +import cn.bunny.domain.system.entity.Role; import cn.bunny.services.mapper.system.PermissionMapper; import cn.bunny.services.mapper.system.RoleMapper; import com.alibaba.fastjson2.JSON; diff --git a/service/src/main/java/cn/bunny/services/core/cache/UserCacheCleaner.java b/auth-system/src/main/java/cn/bunny/services/core/cache/UserCacheCleaner.java similarity index 93% rename from service/src/main/java/cn/bunny/services/core/cache/UserCacheCleaner.java rename to auth-system/src/main/java/cn/bunny/services/core/cache/UserCacheCleaner.java index e660828..8f8dfff 100644 --- a/service/src/main/java/cn/bunny/services/core/cache/UserCacheCleaner.java +++ b/auth-system/src/main/java/cn/bunny/services/core/cache/UserCacheCleaner.java @@ -1,6 +1,6 @@ package cn.bunny.services.core.cache; -import cn.bunny.services.domain.common.constant.RedisUserConstant; +import cn.bunny.domain.common.constant.RedisUserConstant; import jakarta.annotation.Resource; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Component; diff --git a/service/src/main/java/cn/bunny/services/core/cache/UserLoginVoBuilderCacheService.java b/auth-system/src/main/java/cn/bunny/services/core/cache/UserLoginVoBuilderCacheService.java similarity index 88% rename from service/src/main/java/cn/bunny/services/core/cache/UserLoginVoBuilderCacheService.java rename to auth-system/src/main/java/cn/bunny/services/core/cache/UserLoginVoBuilderCacheService.java index 59997ae..c6b1163 100644 --- a/service/src/main/java/cn/bunny/services/core/cache/UserLoginVoBuilderCacheService.java +++ b/auth-system/src/main/java/cn/bunny/services/core/cache/UserLoginVoBuilderCacheService.java @@ -1,15 +1,15 @@ package cn.bunny.services.core.cache; import cn.bunny.services.core.utils.RoleHelper; -import cn.bunny.services.domain.common.constant.LocalDateTimeConstant; -import cn.bunny.services.domain.common.constant.RedisUserConstant; -import cn.bunny.services.domain.common.model.vo.LoginVo; -import cn.bunny.services.domain.system.entity.AdminUser; -import cn.bunny.services.domain.system.entity.Permission; -import cn.bunny.services.domain.system.entity.Role; +import cn.bunny.domain.common.constant.LocalDateTimeConstant; +import cn.bunny.domain.common.constant.RedisUserConstant; +import cn.bunny.domain.common.model.vo.LoginVo; +import cn.bunny.domain.system.entity.AdminUser; +import cn.bunny.domain.system.entity.Permission; +import cn.bunny.domain.system.entity.Role; import cn.bunny.services.mapper.system.PermissionMapper; import cn.bunny.services.mapper.system.RoleMapper; -import cn.bunny.services.utils.JwtTokenUtil; +import cn.bunny.core.utils.JwtTokenUtil; import jakarta.annotation.Resource; import lombok.Value; import org.springframework.beans.BeanUtils; diff --git a/service/src/main/java/cn/bunny/services/core/event/event/ClearAllUserCacheEvent.java b/auth-system/src/main/java/cn/bunny/services/core/event/event/ClearAllUserCacheEvent.java similarity index 100% rename from service/src/main/java/cn/bunny/services/core/event/event/ClearAllUserCacheEvent.java rename to auth-system/src/main/java/cn/bunny/services/core/event/event/ClearAllUserCacheEvent.java diff --git a/service/src/main/java/cn/bunny/services/core/event/event/UpdateUserinfoByPermissionIdsEvent.java b/auth-system/src/main/java/cn/bunny/services/core/event/event/UpdateUserinfoByPermissionIdsEvent.java similarity index 100% rename from service/src/main/java/cn/bunny/services/core/event/event/UpdateUserinfoByPermissionIdsEvent.java rename to auth-system/src/main/java/cn/bunny/services/core/event/event/UpdateUserinfoByPermissionIdsEvent.java diff --git a/service/src/main/java/cn/bunny/services/core/event/event/UpdateUserinfoByRoleIdsEvent.java b/auth-system/src/main/java/cn/bunny/services/core/event/event/UpdateUserinfoByRoleIdsEvent.java similarity index 100% rename from service/src/main/java/cn/bunny/services/core/event/event/UpdateUserinfoByRoleIdsEvent.java rename to auth-system/src/main/java/cn/bunny/services/core/event/event/UpdateUserinfoByRoleIdsEvent.java diff --git a/service/src/main/java/cn/bunny/services/core/event/event/UpdateUserinfoByUserIdsEvent.java b/auth-system/src/main/java/cn/bunny/services/core/event/event/UpdateUserinfoByUserIdsEvent.java similarity index 100% rename from service/src/main/java/cn/bunny/services/core/event/event/UpdateUserinfoByUserIdsEvent.java rename to auth-system/src/main/java/cn/bunny/services/core/event/event/UpdateUserinfoByUserIdsEvent.java diff --git a/service/src/main/java/cn/bunny/services/core/event/listener/excel/I18nExcelListener.java b/auth-system/src/main/java/cn/bunny/services/core/event/listener/excel/I18nExcelListener.java similarity index 94% rename from service/src/main/java/cn/bunny/services/core/event/listener/excel/I18nExcelListener.java rename to auth-system/src/main/java/cn/bunny/services/core/event/listener/excel/I18nExcelListener.java index b698288..d24bc37 100644 --- a/service/src/main/java/cn/bunny/services/core/event/listener/excel/I18nExcelListener.java +++ b/auth-system/src/main/java/cn/bunny/services/core/event/listener/excel/I18nExcelListener.java @@ -1,7 +1,7 @@ package cn.bunny.services.core.event.listener.excel; -import cn.bunny.services.domain.common.model.dto.excel.I18nExcel; -import cn.bunny.services.domain.configuration.entity.I18n; +import cn.bunny.domain.common.model.dto.excel.I18nExcel; +import cn.bunny.domain.configuration.entity.I18n; import cn.bunny.services.service.configuration.I18nService; import com.alibaba.excel.context.AnalysisContext; import com.alibaba.excel.read.listener.ReadListener; diff --git a/service/src/main/java/cn/bunny/services/core/event/listener/excel/PermissionExcelListener.java b/auth-system/src/main/java/cn/bunny/services/core/event/listener/excel/PermissionExcelListener.java similarity index 94% rename from service/src/main/java/cn/bunny/services/core/event/listener/excel/PermissionExcelListener.java rename to auth-system/src/main/java/cn/bunny/services/core/event/listener/excel/PermissionExcelListener.java index 8a27ed0..7273a1a 100644 --- a/service/src/main/java/cn/bunny/services/core/event/listener/excel/PermissionExcelListener.java +++ b/auth-system/src/main/java/cn/bunny/services/core/event/listener/excel/PermissionExcelListener.java @@ -1,7 +1,7 @@ package cn.bunny.services.core.event.listener.excel; -import cn.bunny.services.domain.common.model.dto.excel.PermissionExcel; -import cn.bunny.services.domain.system.entity.Permission; +import cn.bunny.domain.common.model.dto.excel.PermissionExcel; +import cn.bunny.domain.system.entity.Permission; import cn.bunny.services.service.system.PermissionService; import com.alibaba.excel.context.AnalysisContext; import com.alibaba.excel.read.listener.ReadListener; diff --git a/service/src/main/java/cn/bunny/services/core/event/listener/excel/RoleExcelListener.java b/auth-system/src/main/java/cn/bunny/services/core/event/listener/excel/RoleExcelListener.java similarity index 89% rename from service/src/main/java/cn/bunny/services/core/event/listener/excel/RoleExcelListener.java rename to auth-system/src/main/java/cn/bunny/services/core/event/listener/excel/RoleExcelListener.java index e91ec29..66b2f6f 100644 --- a/service/src/main/java/cn/bunny/services/core/event/listener/excel/RoleExcelListener.java +++ b/auth-system/src/main/java/cn/bunny/services/core/event/listener/excel/RoleExcelListener.java @@ -1,9 +1,9 @@ package cn.bunny.services.core.event.listener.excel; -import cn.bunny.services.domain.common.enums.ResultCodeEnum; -import cn.bunny.services.domain.common.model.dto.excel.RoleExcel; -import cn.bunny.services.domain.system.entity.Role; -import cn.bunny.services.exception.AuthCustomerException; +import cn.bunny.domain.common.enums.ResultCodeEnum; +import cn.bunny.domain.common.model.dto.excel.RoleExcel; +import cn.bunny.domain.system.entity.Role; +import cn.bunny.core.exception.AuthCustomerException; import cn.bunny.services.service.system.RoleService; import com.alibaba.excel.context.AnalysisContext; import com.alibaba.excel.read.listener.ReadListener; diff --git a/service/src/main/java/cn/bunny/services/core/event/listener/user/AbstractUserInfoUpdateHandler.java b/auth-system/src/main/java/cn/bunny/services/core/event/listener/user/AbstractUserInfoUpdateHandler.java similarity index 89% rename from service/src/main/java/cn/bunny/services/core/event/listener/user/AbstractUserInfoUpdateHandler.java rename to auth-system/src/main/java/cn/bunny/services/core/event/listener/user/AbstractUserInfoUpdateHandler.java index dc65ec2..74a103a 100644 --- a/service/src/main/java/cn/bunny/services/core/event/listener/user/AbstractUserInfoUpdateHandler.java +++ b/auth-system/src/main/java/cn/bunny/services/core/event/listener/user/AbstractUserInfoUpdateHandler.java @@ -1,8 +1,8 @@ package cn.bunny.services.core.event.listener.user; import cn.bunny.services.core.cache.UserCacheCleaner; -import cn.bunny.services.domain.common.constant.RedisUserConstant; -import cn.bunny.services.domain.system.entity.AdminUser; +import cn.bunny.domain.common.constant.RedisUserConstant; +import cn.bunny.domain.system.entity.AdminUser; import cn.bunny.services.mapper.system.UserMapper; import jakarta.annotation.Resource; import org.springframework.data.redis.core.RedisTemplate; diff --git a/service/src/main/java/cn/bunny/services/core/event/listener/user/UserinfoUpdateListener.java b/auth-system/src/main/java/cn/bunny/services/core/event/listener/user/UserinfoUpdateListener.java similarity index 94% rename from service/src/main/java/cn/bunny/services/core/event/listener/user/UserinfoUpdateListener.java rename to auth-system/src/main/java/cn/bunny/services/core/event/listener/user/UserinfoUpdateListener.java index 5222269..8eb3491 100644 --- a/service/src/main/java/cn/bunny/services/core/event/listener/user/UserinfoUpdateListener.java +++ b/auth-system/src/main/java/cn/bunny/services/core/event/listener/user/UserinfoUpdateListener.java @@ -5,9 +5,9 @@ import cn.bunny.services.core.event.event.ClearAllUserCacheEvent; import cn.bunny.services.core.event.event.UpdateUserinfoByPermissionIdsEvent; import cn.bunny.services.core.event.event.UpdateUserinfoByRoleIdsEvent; import cn.bunny.services.core.event.event.UpdateUserinfoByUserIdsEvent; -import cn.bunny.services.domain.common.constant.RedisUserConstant; -import cn.bunny.services.domain.system.entity.RolePermission; -import cn.bunny.services.domain.system.entity.UserRole; +import cn.bunny.domain.common.constant.RedisUserConstant; +import cn.bunny.domain.system.entity.RolePermission; +import cn.bunny.domain.system.entity.UserRole; import cn.bunny.services.mapper.system.RolePermissionMapper; import cn.bunny.services.mapper.system.UserRoleMapper; import jakarta.annotation.Resource; diff --git a/service/src/main/java/cn/bunny/services/core/strategy/export/ExcelZipExportStrategy.java b/auth-system/src/main/java/cn/bunny/services/core/strategy/export/ExcelZipExportStrategy.java similarity index 100% rename from service/src/main/java/cn/bunny/services/core/strategy/export/ExcelZipExportStrategy.java rename to auth-system/src/main/java/cn/bunny/services/core/strategy/export/ExcelZipExportStrategy.java diff --git a/service/src/main/java/cn/bunny/services/core/strategy/export/ExportStrategy.java b/auth-system/src/main/java/cn/bunny/services/core/strategy/export/ExportStrategy.java similarity index 100% rename from service/src/main/java/cn/bunny/services/core/strategy/export/ExportStrategy.java rename to auth-system/src/main/java/cn/bunny/services/core/strategy/export/ExportStrategy.java diff --git a/service/src/main/java/cn/bunny/services/core/strategy/export/JsonZipExportStrategy.java b/auth-system/src/main/java/cn/bunny/services/core/strategy/export/JsonZipExportStrategy.java similarity index 100% rename from service/src/main/java/cn/bunny/services/core/strategy/export/JsonZipExportStrategy.java rename to auth-system/src/main/java/cn/bunny/services/core/strategy/export/JsonZipExportStrategy.java diff --git a/service/src/main/java/cn/bunny/services/core/strategy/login/DefaultLoginStrategy.java b/auth-system/src/main/java/cn/bunny/services/core/strategy/login/DefaultLoginStrategy.java similarity index 90% rename from service/src/main/java/cn/bunny/services/core/strategy/login/DefaultLoginStrategy.java rename to auth-system/src/main/java/cn/bunny/services/core/strategy/login/DefaultLoginStrategy.java index c49ab94..96ae01f 100644 --- a/service/src/main/java/cn/bunny/services/core/strategy/login/DefaultLoginStrategy.java +++ b/auth-system/src/main/java/cn/bunny/services/core/strategy/login/DefaultLoginStrategy.java @@ -1,7 +1,7 @@ package cn.bunny.services.core.strategy.login; -import cn.bunny.services.domain.system.dto.user.LoginDto; -import cn.bunny.services.domain.system.entity.AdminUser; +import cn.bunny.domain.system.dto.user.LoginDto; +import cn.bunny.domain.system.entity.AdminUser; import cn.bunny.services.mapper.system.UserMapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; diff --git a/service/src/main/java/cn/bunny/services/core/strategy/login/EmailLoginStrategy.java b/auth-system/src/main/java/cn/bunny/services/core/strategy/login/EmailLoginStrategy.java similarity index 92% rename from service/src/main/java/cn/bunny/services/core/strategy/login/EmailLoginStrategy.java rename to auth-system/src/main/java/cn/bunny/services/core/strategy/login/EmailLoginStrategy.java index 1bd14e9..e1933ed 100644 --- a/service/src/main/java/cn/bunny/services/core/strategy/login/EmailLoginStrategy.java +++ b/auth-system/src/main/java/cn/bunny/services/core/strategy/login/EmailLoginStrategy.java @@ -1,9 +1,9 @@ package cn.bunny.services.core.strategy.login; import cn.bunny.services.core.cache.EmailCacheService; -import cn.bunny.services.domain.common.enums.ResultCodeEnum; -import cn.bunny.services.domain.system.dto.user.LoginDto; -import cn.bunny.services.domain.system.entity.AdminUser; +import cn.bunny.domain.common.enums.ResultCodeEnum; +import cn.bunny.domain.system.dto.user.LoginDto; +import cn.bunny.domain.system.entity.AdminUser; import cn.bunny.services.mapper.system.UserMapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import org.springframework.security.core.userdetails.UsernameNotFoundException; diff --git a/service/src/main/java/cn/bunny/services/core/strategy/login/LoginContext.java b/auth-system/src/main/java/cn/bunny/services/core/strategy/login/LoginContext.java similarity index 91% rename from service/src/main/java/cn/bunny/services/core/strategy/login/LoginContext.java rename to auth-system/src/main/java/cn/bunny/services/core/strategy/login/LoginContext.java index 26c92db..8058cbc 100644 --- a/service/src/main/java/cn/bunny/services/core/strategy/login/LoginContext.java +++ b/auth-system/src/main/java/cn/bunny/services/core/strategy/login/LoginContext.java @@ -1,7 +1,7 @@ package cn.bunny.services.core.strategy.login; -import cn.bunny.services.domain.system.dto.user.LoginDto; -import cn.bunny.services.domain.system.entity.AdminUser; +import cn.bunny.domain.system.dto.user.LoginDto; +import cn.bunny.domain.system.entity.AdminUser; import org.springframework.security.core.userdetails.UsernameNotFoundException; import java.util.Map; diff --git a/service/src/main/java/cn/bunny/services/core/strategy/login/LoginStrategy.java b/auth-system/src/main/java/cn/bunny/services/core/strategy/login/LoginStrategy.java similarity index 80% rename from service/src/main/java/cn/bunny/services/core/strategy/login/LoginStrategy.java rename to auth-system/src/main/java/cn/bunny/services/core/strategy/login/LoginStrategy.java index 302d688..5849774 100644 --- a/service/src/main/java/cn/bunny/services/core/strategy/login/LoginStrategy.java +++ b/auth-system/src/main/java/cn/bunny/services/core/strategy/login/LoginStrategy.java @@ -1,8 +1,8 @@ package cn.bunny.services.core.strategy.login; -import cn.bunny.services.domain.system.dto.user.LoginDto; -import cn.bunny.services.domain.system.entity.AdminUser; +import cn.bunny.domain.system.dto.user.LoginDto; +import cn.bunny.domain.system.entity.AdminUser; /** * 登录策略 diff --git a/service/src/main/java/cn/bunny/services/core/strategy/login/ReadMe.md b/auth-system/src/main/java/cn/bunny/services/core/strategy/login/ReadMe.md similarity index 100% rename from service/src/main/java/cn/bunny/services/core/strategy/login/ReadMe.md rename to auth-system/src/main/java/cn/bunny/services/core/strategy/login/ReadMe.md diff --git a/service/src/main/java/cn/bunny/services/core/template/PermissionTreeProcessor.java b/auth-system/src/main/java/cn/bunny/services/core/template/PermissionTreeProcessor.java similarity index 87% rename from service/src/main/java/cn/bunny/services/core/template/PermissionTreeProcessor.java rename to auth-system/src/main/java/cn/bunny/services/core/template/PermissionTreeProcessor.java index 8f74ed8..99e3bed 100644 --- a/service/src/main/java/cn/bunny/services/core/template/PermissionTreeProcessor.java +++ b/auth-system/src/main/java/cn/bunny/services/core/template/PermissionTreeProcessor.java @@ -1,7 +1,7 @@ package cn.bunny.services.core.template; -import cn.bunny.services.domain.common.model.dto.excel.PermissionExcel; -import cn.bunny.services.processor.TreeProcessor; +import cn.bunny.domain.common.model.dto.excel.PermissionExcel; +import cn.bunny.core.processor.TreeProcessor; import java.util.List; import java.util.stream.Collectors; diff --git a/service/src/main/java/cn/bunny/services/core/template/email/AbstractSenderEmailTemplate.java b/auth-system/src/main/java/cn/bunny/services/core/template/email/AbstractSenderEmailTemplate.java similarity index 85% rename from service/src/main/java/cn/bunny/services/core/template/email/AbstractSenderEmailTemplate.java rename to auth-system/src/main/java/cn/bunny/services/core/template/email/AbstractSenderEmailTemplate.java index 264bc48..288824e 100644 --- a/service/src/main/java/cn/bunny/services/core/template/email/AbstractSenderEmailTemplate.java +++ b/auth-system/src/main/java/cn/bunny/services/core/template/email/AbstractSenderEmailTemplate.java @@ -1,12 +1,12 @@ package cn.bunny.services.core.template.email; -import cn.bunny.services.config.mail.MailSenderConfiguration; -import cn.bunny.services.domain.common.enums.ResultCodeEnum; -import cn.bunny.services.domain.common.model.dto.email.EmailSend; -import cn.bunny.services.domain.common.model.dto.email.EmailSendInit; -import cn.bunny.services.domain.configuration.entity.EmailTemplate; -import cn.bunny.services.domain.configuration.entity.EmailUsers; -import cn.bunny.services.exception.AuthCustomerException; +import cn.bunny.core.config.mail.MailSenderConfiguration; +import cn.bunny.domain.common.enums.ResultCodeEnum; +import cn.bunny.domain.common.model.dto.email.EmailSend; +import cn.bunny.domain.common.model.dto.email.EmailSendInit; +import cn.bunny.domain.configuration.entity.EmailTemplate; +import cn.bunny.domain.configuration.entity.EmailUsers; +import cn.bunny.core.exception.AuthCustomerException; import cn.bunny.services.mapper.configuration.EmailUsersMapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import jakarta.mail.MessagingException; diff --git a/service/src/main/java/cn/bunny/services/core/template/email/ConcreteSenderEmailTemplate.java b/auth-system/src/main/java/cn/bunny/services/core/template/email/ConcreteSenderEmailTemplate.java similarity index 96% rename from service/src/main/java/cn/bunny/services/core/template/email/ConcreteSenderEmailTemplate.java rename to auth-system/src/main/java/cn/bunny/services/core/template/email/ConcreteSenderEmailTemplate.java index dedbbb6..db33026 100644 --- a/service/src/main/java/cn/bunny/services/core/template/email/ConcreteSenderEmailTemplate.java +++ b/auth-system/src/main/java/cn/bunny/services/core/template/email/ConcreteSenderEmailTemplate.java @@ -1,6 +1,6 @@ package cn.bunny.services.core.template.email; -import cn.bunny.services.domain.configuration.entity.EmailTemplate; +import cn.bunny.domain.configuration.entity.EmailTemplate; import cn.bunny.services.mapper.configuration.EmailTemplateMapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; diff --git a/service/src/main/java/cn/bunny/services/core/utils/RoleHelper.java b/auth-system/src/main/java/cn/bunny/services/core/utils/RoleHelper.java similarity index 93% rename from service/src/main/java/cn/bunny/services/core/utils/RoleHelper.java rename to auth-system/src/main/java/cn/bunny/services/core/utils/RoleHelper.java index 99866d9..4ed9f6d 100644 --- a/service/src/main/java/cn/bunny/services/core/utils/RoleHelper.java +++ b/auth-system/src/main/java/cn/bunny/services/core/utils/RoleHelper.java @@ -1,8 +1,8 @@ package cn.bunny.services.core.utils; -import cn.bunny.services.context.BaseContext; -import cn.bunny.services.domain.common.constant.SecurityConfigConstant; -import cn.bunny.services.domain.system.entity.AdminUser; +import cn.bunny.core.context.BaseContext; +import cn.bunny.domain.common.constant.SecurityConfigConstant; +import cn.bunny.domain.system.entity.AdminUser; import java.util.List; diff --git a/service/src/main/java/cn/bunny/services/core/utils/RouterServiceHelper.java b/auth-system/src/main/java/cn/bunny/services/core/utils/RouterServiceHelper.java similarity index 94% rename from service/src/main/java/cn/bunny/services/core/utils/RouterServiceHelper.java rename to auth-system/src/main/java/cn/bunny/services/core/utils/RouterServiceHelper.java index 4b41f53..2d7968e 100644 --- a/service/src/main/java/cn/bunny/services/core/utils/RouterServiceHelper.java +++ b/auth-system/src/main/java/cn/bunny/services/core/utils/RouterServiceHelper.java @@ -1,12 +1,12 @@ package cn.bunny.services.core.utils; -import cn.bunny.services.context.BaseContext; -import cn.bunny.services.domain.system.entity.RouterRole; -import cn.bunny.services.domain.system.entity.router.Router; -import cn.bunny.services.domain.system.entity.router.RouterMeta; -import cn.bunny.services.domain.system.views.ViewRolePermission; -import cn.bunny.services.domain.system.views.ViewRouterRole; -import cn.bunny.services.domain.system.vo.router.WebUserRouterVo; +import cn.bunny.core.context.BaseContext; +import cn.bunny.domain.system.entity.RouterRole; +import cn.bunny.domain.system.entity.router.Router; +import cn.bunny.domain.system.entity.router.RouterMeta; +import cn.bunny.domain.system.views.ViewRolePermission; +import cn.bunny.domain.system.views.ViewRouterRole; +import cn.bunny.domain.system.vo.router.WebUserRouterVo; import cn.bunny.services.service.system.RouterRoleService; import com.alibaba.fastjson2.JSON; import jakarta.annotation.Resource; diff --git a/dao/src/main/java/cn/bunny/services/mapper/configuration/EmailTemplateMapper.java b/auth-system/src/main/java/cn/bunny/services/mapper/configuration/EmailTemplateMapper.java similarity index 80% rename from dao/src/main/java/cn/bunny/services/mapper/configuration/EmailTemplateMapper.java rename to auth-system/src/main/java/cn/bunny/services/mapper/configuration/EmailTemplateMapper.java index e869af7..7f25edb 100644 --- a/dao/src/main/java/cn/bunny/services/mapper/configuration/EmailTemplateMapper.java +++ b/auth-system/src/main/java/cn/bunny/services/mapper/configuration/EmailTemplateMapper.java @@ -1,8 +1,8 @@ package cn.bunny.services.mapper.configuration; -import cn.bunny.services.domain.configuration.dto.EmailTemplateDto; -import cn.bunny.services.domain.configuration.entity.EmailTemplate; -import cn.bunny.services.domain.configuration.vo.EmailTemplateVo; +import cn.bunny.domain.configuration.dto.EmailTemplateDto; +import cn.bunny.domain.configuration.entity.EmailTemplate; +import cn.bunny.domain.configuration.vo.EmailTemplateVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/dao/src/main/java/cn/bunny/services/mapper/configuration/EmailUsersMapper.java b/auth-system/src/main/java/cn/bunny/services/mapper/configuration/EmailUsersMapper.java similarity index 81% rename from dao/src/main/java/cn/bunny/services/mapper/configuration/EmailUsersMapper.java rename to auth-system/src/main/java/cn/bunny/services/mapper/configuration/EmailUsersMapper.java index 1d23ec5..8b9579e 100644 --- a/dao/src/main/java/cn/bunny/services/mapper/configuration/EmailUsersMapper.java +++ b/auth-system/src/main/java/cn/bunny/services/mapper/configuration/EmailUsersMapper.java @@ -1,8 +1,8 @@ package cn.bunny.services.mapper.configuration; -import cn.bunny.services.domain.configuration.dto.EmailUsersDto; -import cn.bunny.services.domain.configuration.entity.EmailUsers; -import cn.bunny.services.domain.configuration.vo.EmailUsersVo; +import cn.bunny.domain.configuration.dto.EmailUsersDto; +import cn.bunny.domain.configuration.entity.EmailUsers; +import cn.bunny.domain.configuration.vo.EmailUsersVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/dao/src/main/java/cn/bunny/services/mapper/configuration/I18nMapper.java b/auth-system/src/main/java/cn/bunny/services/mapper/configuration/I18nMapper.java similarity index 81% rename from dao/src/main/java/cn/bunny/services/mapper/configuration/I18nMapper.java rename to auth-system/src/main/java/cn/bunny/services/mapper/configuration/I18nMapper.java index 8093e12..c43abaf 100644 --- a/dao/src/main/java/cn/bunny/services/mapper/configuration/I18nMapper.java +++ b/auth-system/src/main/java/cn/bunny/services/mapper/configuration/I18nMapper.java @@ -1,8 +1,8 @@ package cn.bunny.services.mapper.configuration; -import cn.bunny.services.domain.configuration.dto.I18nDto; -import cn.bunny.services.domain.configuration.entity.I18n; -import cn.bunny.services.domain.configuration.vo.I18nVo; +import cn.bunny.domain.configuration.dto.I18nDto; +import cn.bunny.domain.configuration.entity.I18n; +import cn.bunny.domain.configuration.vo.I18nVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/dao/src/main/java/cn/bunny/services/mapper/configuration/I18nTypeMapper.java b/auth-system/src/main/java/cn/bunny/services/mapper/configuration/I18nTypeMapper.java similarity index 82% rename from dao/src/main/java/cn/bunny/services/mapper/configuration/I18nTypeMapper.java rename to auth-system/src/main/java/cn/bunny/services/mapper/configuration/I18nTypeMapper.java index 23aff89..852dcca 100644 --- a/dao/src/main/java/cn/bunny/services/mapper/configuration/I18nTypeMapper.java +++ b/auth-system/src/main/java/cn/bunny/services/mapper/configuration/I18nTypeMapper.java @@ -1,7 +1,7 @@ package cn.bunny.services.mapper.configuration; -import cn.bunny.services.domain.configuration.dto.I18nTypeDto; -import cn.bunny.services.domain.configuration.entity.I18nType; +import cn.bunny.domain.configuration.dto.I18nTypeDto; +import cn.bunny.domain.configuration.entity.I18nType; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/dao/src/main/java/cn/bunny/services/mapper/configuration/MenuIconMapper.java b/auth-system/src/main/java/cn/bunny/services/mapper/configuration/MenuIconMapper.java similarity index 81% rename from dao/src/main/java/cn/bunny/services/mapper/configuration/MenuIconMapper.java rename to auth-system/src/main/java/cn/bunny/services/mapper/configuration/MenuIconMapper.java index fd302ed..2240d78 100644 --- a/dao/src/main/java/cn/bunny/services/mapper/configuration/MenuIconMapper.java +++ b/auth-system/src/main/java/cn/bunny/services/mapper/configuration/MenuIconMapper.java @@ -1,8 +1,8 @@ package cn.bunny.services.mapper.configuration; -import cn.bunny.services.domain.configuration.dto.MenuIconDto; -import cn.bunny.services.domain.configuration.entity.MenuIcon; -import cn.bunny.services.domain.configuration.vo.MenuIconVo; +import cn.bunny.domain.configuration.dto.MenuIconDto; +import cn.bunny.domain.configuration.entity.MenuIcon; +import cn.bunny.domain.configuration.vo.MenuIconVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/dao/src/main/java/cn/bunny/services/mapper/file/FilesMapper.java b/auth-system/src/main/java/cn/bunny/services/mapper/file/FilesMapper.java similarity index 83% rename from dao/src/main/java/cn/bunny/services/mapper/file/FilesMapper.java rename to auth-system/src/main/java/cn/bunny/services/mapper/file/FilesMapper.java index eafcdfd..8858421 100644 --- a/dao/src/main/java/cn/bunny/services/mapper/file/FilesMapper.java +++ b/auth-system/src/main/java/cn/bunny/services/mapper/file/FilesMapper.java @@ -1,8 +1,8 @@ package cn.bunny.services.mapper.file; -import cn.bunny.services.domain.files.dto.FilesDto; -import cn.bunny.services.domain.files.entity.Files; -import cn.bunny.services.domain.files.vo.FilesVo; +import cn.bunny.domain.files.dto.FilesDto; +import cn.bunny.domain.files.entity.Files; +import cn.bunny.domain.files.vo.FilesVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/dao/src/main/java/cn/bunny/services/mapper/file/FilesParDetailMapper.java b/auth-system/src/main/java/cn/bunny/services/mapper/file/FilesParDetailMapper.java similarity index 85% rename from dao/src/main/java/cn/bunny/services/mapper/file/FilesParDetailMapper.java rename to auth-system/src/main/java/cn/bunny/services/mapper/file/FilesParDetailMapper.java index 124d2a6..d4d4b4d 100644 --- a/dao/src/main/java/cn/bunny/services/mapper/file/FilesParDetailMapper.java +++ b/auth-system/src/main/java/cn/bunny/services/mapper/file/FilesParDetailMapper.java @@ -1,8 +1,8 @@ package cn.bunny.services.mapper.file; -import cn.bunny.services.domain.files.dto.FilesParDetailDto; -import cn.bunny.services.domain.files.entity.FilesParDetail; -import cn.bunny.services.domain.files.vo.FilesParDetailVo; +import cn.bunny.domain.files.dto.FilesParDetailDto; +import cn.bunny.domain.files.entity.FilesParDetail; +import cn.bunny.domain.files.vo.FilesParDetailVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/dao/src/main/java/cn/bunny/services/mapper/log/ScheduleExecuteLogMapper.java b/auth-system/src/main/java/cn/bunny/services/mapper/log/ScheduleExecuteLogMapper.java similarity index 82% rename from dao/src/main/java/cn/bunny/services/mapper/log/ScheduleExecuteLogMapper.java rename to auth-system/src/main/java/cn/bunny/services/mapper/log/ScheduleExecuteLogMapper.java index b7a4580..80b1b99 100644 --- a/dao/src/main/java/cn/bunny/services/mapper/log/ScheduleExecuteLogMapper.java +++ b/auth-system/src/main/java/cn/bunny/services/mapper/log/ScheduleExecuteLogMapper.java @@ -1,8 +1,8 @@ package cn.bunny.services.mapper.log; -import cn.bunny.services.domain.log.dto.ScheduleExecuteLogDto; -import cn.bunny.services.domain.log.entity.ScheduleExecuteLog; -import cn.bunny.services.domain.log.vo.ScheduleExecuteLogVo; +import cn.bunny.domain.log.dto.ScheduleExecuteLogDto; +import cn.bunny.domain.log.entity.ScheduleExecuteLog; +import cn.bunny.domain.log.vo.ScheduleExecuteLogVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/dao/src/main/java/cn/bunny/services/mapper/log/UserLoginLogMapper.java b/auth-system/src/main/java/cn/bunny/services/mapper/log/UserLoginLogMapper.java similarity index 86% rename from dao/src/main/java/cn/bunny/services/mapper/log/UserLoginLogMapper.java rename to auth-system/src/main/java/cn/bunny/services/mapper/log/UserLoginLogMapper.java index c02223b..174352e 100644 --- a/dao/src/main/java/cn/bunny/services/mapper/log/UserLoginLogMapper.java +++ b/auth-system/src/main/java/cn/bunny/services/mapper/log/UserLoginLogMapper.java @@ -1,8 +1,8 @@ package cn.bunny.services.mapper.log; -import cn.bunny.services.domain.log.dto.UserLoginLogDto; -import cn.bunny.services.domain.log.entity.UserLoginLog; -import cn.bunny.services.domain.log.vo.UserLoginLogVo; +import cn.bunny.domain.log.dto.UserLoginLogDto; +import cn.bunny.domain.log.entity.UserLoginLog; +import cn.bunny.domain.log.vo.UserLoginLogVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/dao/src/main/java/cn/bunny/services/mapper/message/MessageMapper.java b/auth-system/src/main/java/cn/bunny/services/mapper/message/MessageMapper.java similarity index 78% rename from dao/src/main/java/cn/bunny/services/mapper/message/MessageMapper.java rename to auth-system/src/main/java/cn/bunny/services/mapper/message/MessageMapper.java index c2030b8..0e81036 100644 --- a/dao/src/main/java/cn/bunny/services/mapper/message/MessageMapper.java +++ b/auth-system/src/main/java/cn/bunny/services/mapper/message/MessageMapper.java @@ -1,10 +1,10 @@ package cn.bunny.services.mapper.message; -import cn.bunny.services.domain.message.dto.MessageDto; -import cn.bunny.services.domain.message.entity.Message; -import cn.bunny.services.domain.message.vo.MessageDetailVo; -import cn.bunny.services.domain.message.vo.MessageReceivedWithMessageVo; -import cn.bunny.services.domain.message.vo.MessageReceivedWithUserVo; +import cn.bunny.domain.message.dto.MessageDto; +import cn.bunny.domain.message.entity.Message; +import cn.bunny.domain.message.vo.MessageDetailVo; +import cn.bunny.domain.message.vo.MessageReceivedWithMessageVo; +import cn.bunny.domain.message.vo.MessageReceivedWithUserVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/dao/src/main/java/cn/bunny/services/mapper/message/MessageReceivedMapper.java b/auth-system/src/main/java/cn/bunny/services/mapper/message/MessageReceivedMapper.java similarity index 78% rename from dao/src/main/java/cn/bunny/services/mapper/message/MessageReceivedMapper.java rename to auth-system/src/main/java/cn/bunny/services/mapper/message/MessageReceivedMapper.java index f23758a..0533865 100644 --- a/dao/src/main/java/cn/bunny/services/mapper/message/MessageReceivedMapper.java +++ b/auth-system/src/main/java/cn/bunny/services/mapper/message/MessageReceivedMapper.java @@ -1,11 +1,11 @@ package cn.bunny.services.mapper.message; -import cn.bunny.services.domain.message.dto.MessageReceivedDto; -import cn.bunny.services.domain.message.dto.MessageUserDto; -import cn.bunny.services.domain.message.entity.Message; -import cn.bunny.services.domain.message.entity.MessageReceived; -import cn.bunny.services.domain.message.vo.MessageReceivedWithMessageVo; -import cn.bunny.services.domain.message.vo.MessageUserVo; +import cn.bunny.domain.message.dto.MessageReceivedDto; +import cn.bunny.domain.message.dto.MessageUserDto; +import cn.bunny.domain.message.entity.Message; +import cn.bunny.domain.message.entity.MessageReceived; +import cn.bunny.domain.message.vo.MessageReceivedWithMessageVo; +import cn.bunny.domain.message.vo.MessageUserVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/dao/src/main/java/cn/bunny/services/mapper/message/MessageTypeMapper.java b/auth-system/src/main/java/cn/bunny/services/mapper/message/MessageTypeMapper.java similarity index 82% rename from dao/src/main/java/cn/bunny/services/mapper/message/MessageTypeMapper.java rename to auth-system/src/main/java/cn/bunny/services/mapper/message/MessageTypeMapper.java index f2949f7..c390b6b 100644 --- a/dao/src/main/java/cn/bunny/services/mapper/message/MessageTypeMapper.java +++ b/auth-system/src/main/java/cn/bunny/services/mapper/message/MessageTypeMapper.java @@ -1,8 +1,8 @@ package cn.bunny.services.mapper.message; -import cn.bunny.services.domain.message.dto.MessageTypeDto; -import cn.bunny.services.domain.message.entity.MessageType; -import cn.bunny.services.domain.message.vo.MessageTypeVo; +import cn.bunny.domain.message.dto.MessageTypeDto; +import cn.bunny.domain.message.entity.MessageType; +import cn.bunny.domain.message.vo.MessageTypeVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/dao/src/main/java/cn/bunny/services/mapper/schedule/SchedulersGroupMapper.java b/auth-system/src/main/java/cn/bunny/services/mapper/schedule/SchedulersGroupMapper.java similarity index 81% rename from dao/src/main/java/cn/bunny/services/mapper/schedule/SchedulersGroupMapper.java rename to auth-system/src/main/java/cn/bunny/services/mapper/schedule/SchedulersGroupMapper.java index 6247a9b..6e588dc 100644 --- a/dao/src/main/java/cn/bunny/services/mapper/schedule/SchedulersGroupMapper.java +++ b/auth-system/src/main/java/cn/bunny/services/mapper/schedule/SchedulersGroupMapper.java @@ -1,8 +1,8 @@ package cn.bunny.services.mapper.schedule; -import cn.bunny.services.domain.schedule.dto.SchedulersGroupDto; -import cn.bunny.services.domain.schedule.entity.SchedulersGroup; -import cn.bunny.services.domain.schedule.vo.SchedulersGroupVo; +import cn.bunny.domain.schedule.dto.SchedulersGroupDto; +import cn.bunny.domain.schedule.entity.SchedulersGroup; +import cn.bunny.domain.schedule.vo.SchedulersGroupVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/dao/src/main/java/cn/bunny/services/mapper/schedule/SchedulersMapper.java b/auth-system/src/main/java/cn/bunny/services/mapper/schedule/SchedulersMapper.java similarity index 87% rename from dao/src/main/java/cn/bunny/services/mapper/schedule/SchedulersMapper.java rename to auth-system/src/main/java/cn/bunny/services/mapper/schedule/SchedulersMapper.java index 3ac8356..a2c7bd4 100644 --- a/dao/src/main/java/cn/bunny/services/mapper/schedule/SchedulersMapper.java +++ b/auth-system/src/main/java/cn/bunny/services/mapper/schedule/SchedulersMapper.java @@ -1,7 +1,7 @@ package cn.bunny.services.mapper.schedule; -import cn.bunny.services.domain.schedule.dto.SchedulersDto; -import cn.bunny.services.domain.schedule.entity.Schedulers; +import cn.bunny.domain.schedule.dto.SchedulersDto; +import cn.bunny.domain.schedule.entity.Schedulers; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/dao/src/main/java/cn/bunny/services/mapper/system/DeptMapper.java b/auth-system/src/main/java/cn/bunny/services/mapper/system/DeptMapper.java similarity index 82% rename from dao/src/main/java/cn/bunny/services/mapper/system/DeptMapper.java rename to auth-system/src/main/java/cn/bunny/services/mapper/system/DeptMapper.java index 2c6d668..1ae7c42 100644 --- a/dao/src/main/java/cn/bunny/services/mapper/system/DeptMapper.java +++ b/auth-system/src/main/java/cn/bunny/services/mapper/system/DeptMapper.java @@ -1,8 +1,8 @@ package cn.bunny.services.mapper.system; -import cn.bunny.services.domain.system.dto.DeptDto; -import cn.bunny.services.domain.system.entity.Dept; -import cn.bunny.services.domain.system.vo.DeptVo; +import cn.bunny.domain.system.dto.DeptDto; +import cn.bunny.domain.system.entity.Dept; +import cn.bunny.domain.system.vo.DeptVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/dao/src/main/java/cn/bunny/services/mapper/system/PermissionMapper.java b/auth-system/src/main/java/cn/bunny/services/mapper/system/PermissionMapper.java similarity index 84% rename from dao/src/main/java/cn/bunny/services/mapper/system/PermissionMapper.java rename to auth-system/src/main/java/cn/bunny/services/mapper/system/PermissionMapper.java index c734153..5049703 100644 --- a/dao/src/main/java/cn/bunny/services/mapper/system/PermissionMapper.java +++ b/auth-system/src/main/java/cn/bunny/services/mapper/system/PermissionMapper.java @@ -1,8 +1,8 @@ package cn.bunny.services.mapper.system; -import cn.bunny.services.domain.system.dto.PermissionDto; -import cn.bunny.services.domain.system.entity.Permission; -import cn.bunny.services.domain.system.vo.PermissionVo; +import cn.bunny.domain.system.dto.PermissionDto; +import cn.bunny.domain.system.entity.Permission; +import cn.bunny.domain.system.vo.PermissionVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/dao/src/main/java/cn/bunny/services/mapper/system/RoleMapper.java b/auth-system/src/main/java/cn/bunny/services/mapper/system/RoleMapper.java similarity index 87% rename from dao/src/main/java/cn/bunny/services/mapper/system/RoleMapper.java rename to auth-system/src/main/java/cn/bunny/services/mapper/system/RoleMapper.java index 489af59..44656c9 100644 --- a/dao/src/main/java/cn/bunny/services/mapper/system/RoleMapper.java +++ b/auth-system/src/main/java/cn/bunny/services/mapper/system/RoleMapper.java @@ -1,8 +1,8 @@ package cn.bunny.services.mapper.system; -import cn.bunny.services.domain.system.dto.RoleDto; -import cn.bunny.services.domain.system.entity.Role; -import cn.bunny.services.domain.system.vo.RoleVo; +import cn.bunny.domain.system.dto.RoleDto; +import cn.bunny.domain.system.entity.Role; +import cn.bunny.domain.system.vo.RoleVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/dao/src/main/java/cn/bunny/services/mapper/system/RolePermissionMapper.java b/auth-system/src/main/java/cn/bunny/services/mapper/system/RolePermissionMapper.java similarity index 90% rename from dao/src/main/java/cn/bunny/services/mapper/system/RolePermissionMapper.java rename to auth-system/src/main/java/cn/bunny/services/mapper/system/RolePermissionMapper.java index f2a1cc1..a91fa1d 100644 --- a/dao/src/main/java/cn/bunny/services/mapper/system/RolePermissionMapper.java +++ b/auth-system/src/main/java/cn/bunny/services/mapper/system/RolePermissionMapper.java @@ -1,7 +1,7 @@ package cn.bunny.services.mapper.system; -import cn.bunny.services.domain.system.entity.RolePermission; -import cn.bunny.services.domain.system.views.ViewRolePermission; +import cn.bunny.domain.system.entity.RolePermission; +import cn.bunny.domain.system.views.ViewRolePermission; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/dao/src/main/java/cn/bunny/services/mapper/system/RouterMapper.java b/auth-system/src/main/java/cn/bunny/services/mapper/system/RouterMapper.java similarity index 78% rename from dao/src/main/java/cn/bunny/services/mapper/system/RouterMapper.java rename to auth-system/src/main/java/cn/bunny/services/mapper/system/RouterMapper.java index d92dc39..13a9ec1 100644 --- a/dao/src/main/java/cn/bunny/services/mapper/system/RouterMapper.java +++ b/auth-system/src/main/java/cn/bunny/services/mapper/system/RouterMapper.java @@ -1,8 +1,8 @@ package cn.bunny.services.mapper.system; -import cn.bunny.services.domain.system.entity.router.Router; -import cn.bunny.services.domain.system.vo.router.RouterVo; +import cn.bunny.domain.system.entity.router.Router; +import cn.bunny.domain.system.vo.router.RouterVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/dao/src/main/java/cn/bunny/services/mapper/system/RouterRoleMapper.java b/auth-system/src/main/java/cn/bunny/services/mapper/system/RouterRoleMapper.java similarity index 87% rename from dao/src/main/java/cn/bunny/services/mapper/system/RouterRoleMapper.java rename to auth-system/src/main/java/cn/bunny/services/mapper/system/RouterRoleMapper.java index d0a404e..d5c5e9d 100644 --- a/dao/src/main/java/cn/bunny/services/mapper/system/RouterRoleMapper.java +++ b/auth-system/src/main/java/cn/bunny/services/mapper/system/RouterRoleMapper.java @@ -1,7 +1,7 @@ package cn.bunny.services.mapper.system; -import cn.bunny.services.domain.system.entity.RouterRole; -import cn.bunny.services.domain.system.views.ViewRouterRole; +import cn.bunny.domain.system.entity.RouterRole; +import cn.bunny.domain.system.views.ViewRouterRole; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/dao/src/main/java/cn/bunny/services/mapper/system/UserDeptMapper.java b/auth-system/src/main/java/cn/bunny/services/mapper/system/UserDeptMapper.java similarity index 92% rename from dao/src/main/java/cn/bunny/services/mapper/system/UserDeptMapper.java rename to auth-system/src/main/java/cn/bunny/services/mapper/system/UserDeptMapper.java index 84b5a5b..d1b9ccb 100644 --- a/dao/src/main/java/cn/bunny/services/mapper/system/UserDeptMapper.java +++ b/auth-system/src/main/java/cn/bunny/services/mapper/system/UserDeptMapper.java @@ -1,6 +1,6 @@ package cn.bunny.services.mapper.system; -import cn.bunny.services.domain.system.entity.UserDept; +import cn.bunny.domain.system.entity.UserDept; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/dao/src/main/java/cn/bunny/services/mapper/system/UserMapper.java b/auth-system/src/main/java/cn/bunny/services/mapper/system/UserMapper.java similarity index 84% rename from dao/src/main/java/cn/bunny/services/mapper/system/UserMapper.java rename to auth-system/src/main/java/cn/bunny/services/mapper/system/UserMapper.java index 506c819..eeedba4 100644 --- a/dao/src/main/java/cn/bunny/services/mapper/system/UserMapper.java +++ b/auth-system/src/main/java/cn/bunny/services/mapper/system/UserMapper.java @@ -1,8 +1,8 @@ package cn.bunny.services.mapper.system; -import cn.bunny.services.domain.system.dto.user.AdminUserDto; -import cn.bunny.services.domain.system.entity.AdminUser; -import cn.bunny.services.domain.system.views.ViewUserDept; +import cn.bunny.domain.system.dto.user.AdminUserDto; +import cn.bunny.domain.system.entity.AdminUser; +import cn.bunny.domain.system.views.ViewUserDept; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/dao/src/main/java/cn/bunny/services/mapper/system/UserRoleMapper.java b/auth-system/src/main/java/cn/bunny/services/mapper/system/UserRoleMapper.java similarity index 93% rename from dao/src/main/java/cn/bunny/services/mapper/system/UserRoleMapper.java rename to auth-system/src/main/java/cn/bunny/services/mapper/system/UserRoleMapper.java index 566f686..c410986 100644 --- a/dao/src/main/java/cn/bunny/services/mapper/system/UserRoleMapper.java +++ b/auth-system/src/main/java/cn/bunny/services/mapper/system/UserRoleMapper.java @@ -1,6 +1,6 @@ package cn.bunny.services.mapper.system; -import cn.bunny.services.domain.system.entity.UserRole; +import cn.bunny.domain.system.entity.UserRole; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/service/src/main/java/cn/bunny/services/quartz/DatabaseBackupJob.java b/auth-system/src/main/java/cn/bunny/services/quartz/DatabaseBackupJob.java similarity index 100% rename from service/src/main/java/cn/bunny/services/quartz/DatabaseBackupJob.java rename to auth-system/src/main/java/cn/bunny/services/quartz/DatabaseBackupJob.java diff --git a/service/src/main/java/cn/bunny/services/quartz/JobHello.java b/auth-system/src/main/java/cn/bunny/services/quartz/JobHello.java similarity index 100% rename from service/src/main/java/cn/bunny/services/quartz/JobHello.java rename to auth-system/src/main/java/cn/bunny/services/quartz/JobHello.java diff --git a/service/src/main/java/cn/bunny/services/security/config/MethodSecurityConfig.java b/auth-system/src/main/java/cn/bunny/services/security/config/MethodSecurityConfig.java similarity index 93% rename from service/src/main/java/cn/bunny/services/security/config/MethodSecurityConfig.java rename to auth-system/src/main/java/cn/bunny/services/security/config/MethodSecurityConfig.java index 68c87de..8552fd0 100644 --- a/service/src/main/java/cn/bunny/services/security/config/MethodSecurityConfig.java +++ b/auth-system/src/main/java/cn/bunny/services/security/config/MethodSecurityConfig.java @@ -1,7 +1,7 @@ package cn.bunny.services.security.config; -import cn.bunny.services.domain.common.enums.ResultCodeEnum; -import cn.bunny.services.domain.system.entity.AdminUser; +import cn.bunny.domain.common.enums.ResultCodeEnum; +import cn.bunny.domain.system.entity.AdminUser; import cn.bunny.services.mapper.system.UserMapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import org.springframework.context.annotation.Bean; diff --git a/service/src/main/java/cn/bunny/services/security/config/WebSecurityConfig.java b/auth-system/src/main/java/cn/bunny/services/security/config/WebSecurityConfig.java similarity index 100% rename from service/src/main/java/cn/bunny/services/security/config/WebSecurityConfig.java rename to auth-system/src/main/java/cn/bunny/services/security/config/WebSecurityConfig.java diff --git a/service/src/main/java/cn/bunny/services/security/exception/CustomAuthenticationException.java b/auth-system/src/main/java/cn/bunny/services/security/exception/CustomAuthenticationException.java similarity index 91% rename from service/src/main/java/cn/bunny/services/security/exception/CustomAuthenticationException.java rename to auth-system/src/main/java/cn/bunny/services/security/exception/CustomAuthenticationException.java index 05130a4..552061c 100644 --- a/service/src/main/java/cn/bunny/services/security/exception/CustomAuthenticationException.java +++ b/auth-system/src/main/java/cn/bunny/services/security/exception/CustomAuthenticationException.java @@ -1,6 +1,6 @@ package cn.bunny.services.security.exception; -import cn.bunny.services.domain.common.enums.ResultCodeEnum; +import cn.bunny.domain.common.enums.ResultCodeEnum; import lombok.Getter; import lombok.ToString; import lombok.extern.slf4j.Slf4j; diff --git a/service/src/main/java/cn/bunny/services/security/handelr/SecurityAccessDeniedHandler.java b/auth-system/src/main/java/cn/bunny/services/security/handelr/SecurityAccessDeniedHandler.java similarity index 87% rename from service/src/main/java/cn/bunny/services/security/handelr/SecurityAccessDeniedHandler.java rename to auth-system/src/main/java/cn/bunny/services/security/handelr/SecurityAccessDeniedHandler.java index e9a9ed7..9df50af 100644 --- a/service/src/main/java/cn/bunny/services/security/handelr/SecurityAccessDeniedHandler.java +++ b/auth-system/src/main/java/cn/bunny/services/security/handelr/SecurityAccessDeniedHandler.java @@ -1,7 +1,7 @@ package cn.bunny.services.security.handelr; -import cn.bunny.services.domain.common.model.vo.result.Result; -import cn.bunny.services.domain.common.enums.ResultCodeEnum; +import cn.bunny.domain.common.model.vo.result.Result; +import cn.bunny.domain.common.enums.ResultCodeEnum; import com.alibaba.fastjson2.JSON; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; diff --git a/service/src/main/java/cn/bunny/services/security/handelr/SecurityAuthenticationEntryPoint.java b/auth-system/src/main/java/cn/bunny/services/security/handelr/SecurityAuthenticationEntryPoint.java similarity index 85% rename from service/src/main/java/cn/bunny/services/security/handelr/SecurityAuthenticationEntryPoint.java rename to auth-system/src/main/java/cn/bunny/services/security/handelr/SecurityAuthenticationEntryPoint.java index b2a64b8..ff564e5 100644 --- a/service/src/main/java/cn/bunny/services/security/handelr/SecurityAuthenticationEntryPoint.java +++ b/auth-system/src/main/java/cn/bunny/services/security/handelr/SecurityAuthenticationEntryPoint.java @@ -1,9 +1,9 @@ package cn.bunny.services.security.handelr; -import cn.bunny.services.domain.common.model.vo.result.Result; -import cn.bunny.services.domain.common.enums.ResultCodeEnum; +import cn.bunny.domain.common.model.vo.result.Result; +import cn.bunny.domain.common.enums.ResultCodeEnum; import cn.bunny.services.security.exception.CustomAuthenticationException; -import cn.bunny.services.utils.ResponseUtil; +import cn.bunny.core.utils.ResponseUtil; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import lombok.extern.slf4j.Slf4j; diff --git a/service/src/main/java/cn/bunny/services/security/handelr/SecurityAuthenticationFailureHandler.java b/auth-system/src/main/java/cn/bunny/services/security/handelr/SecurityAuthenticationFailureHandler.java similarity index 93% rename from service/src/main/java/cn/bunny/services/security/handelr/SecurityAuthenticationFailureHandler.java rename to auth-system/src/main/java/cn/bunny/services/security/handelr/SecurityAuthenticationFailureHandler.java index 239c68d..c36d811 100644 --- a/service/src/main/java/cn/bunny/services/security/handelr/SecurityAuthenticationFailureHandler.java +++ b/auth-system/src/main/java/cn/bunny/services/security/handelr/SecurityAuthenticationFailureHandler.java @@ -1,6 +1,6 @@ package cn.bunny.services.security.handelr; -import cn.bunny.services.domain.common.model.vo.result.Result; +import cn.bunny.domain.common.model.vo.result.Result; import com.alibaba.fastjson2.JSON; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; diff --git a/service/src/main/java/cn/bunny/services/security/handelr/SecurityAuthenticationSuccessHandler.java b/auth-system/src/main/java/cn/bunny/services/security/handelr/SecurityAuthenticationSuccessHandler.java similarity index 93% rename from service/src/main/java/cn/bunny/services/security/handelr/SecurityAuthenticationSuccessHandler.java rename to auth-system/src/main/java/cn/bunny/services/security/handelr/SecurityAuthenticationSuccessHandler.java index bb83427..79b68c8 100644 --- a/service/src/main/java/cn/bunny/services/security/handelr/SecurityAuthenticationSuccessHandler.java +++ b/auth-system/src/main/java/cn/bunny/services/security/handelr/SecurityAuthenticationSuccessHandler.java @@ -1,6 +1,6 @@ package cn.bunny.services.security.handelr; -import cn.bunny.services.domain.common.model.vo.result.Result; +import cn.bunny.domain.common.model.vo.result.Result; import com.alibaba.fastjson2.JSON; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; diff --git a/service/src/main/java/cn/bunny/services/security/service/CustomAuthorizationManagerServiceImpl.java b/auth-system/src/main/java/cn/bunny/services/security/service/CustomAuthorizationManagerServiceImpl.java similarity index 90% rename from service/src/main/java/cn/bunny/services/security/service/CustomAuthorizationManagerServiceImpl.java rename to auth-system/src/main/java/cn/bunny/services/security/service/CustomAuthorizationManagerServiceImpl.java index cde356c..47771cc 100644 --- a/service/src/main/java/cn/bunny/services/security/service/CustomAuthorizationManagerServiceImpl.java +++ b/auth-system/src/main/java/cn/bunny/services/security/service/CustomAuthorizationManagerServiceImpl.java @@ -1,9 +1,9 @@ package cn.bunny.services.security.service; -import cn.bunny.services.context.BaseContext; -import cn.bunny.services.domain.common.enums.ResultCodeEnum; -import cn.bunny.services.domain.common.model.dto.security.TokenInfo; -import cn.bunny.services.domain.common.model.vo.LoginVo; +import cn.bunny.core.context.BaseContext; +import cn.bunny.domain.common.enums.ResultCodeEnum; +import cn.bunny.domain.common.model.dto.security.TokenInfo; +import cn.bunny.domain.common.model.vo.LoginVo; import cn.bunny.services.security.exception.CustomAuthenticationException; import jakarta.annotation.Resource; import jakarta.servlet.http.HttpServletRequest; diff --git a/service/src/main/java/cn/bunny/services/security/service/PermissionCheckService.java b/auth-system/src/main/java/cn/bunny/services/security/service/PermissionCheckService.java similarity index 95% rename from service/src/main/java/cn/bunny/services/security/service/PermissionCheckService.java rename to auth-system/src/main/java/cn/bunny/services/security/service/PermissionCheckService.java index 83f3e13..8d6a0ac 100644 --- a/service/src/main/java/cn/bunny/services/security/service/PermissionCheckService.java +++ b/auth-system/src/main/java/cn/bunny/services/security/service/PermissionCheckService.java @@ -1,10 +1,10 @@ package cn.bunny.services.security.service; -import cn.bunny.services.context.BaseContext; +import cn.bunny.core.context.BaseContext; import cn.bunny.services.core.cache.UserAuthorizationCacheService; import cn.bunny.services.core.utils.RoleHelper; -import cn.bunny.services.domain.system.entity.Permission; -import cn.bunny.services.domain.system.entity.Role; +import cn.bunny.domain.system.entity.Permission; +import cn.bunny.domain.system.entity.Role; import cn.bunny.services.security.config.WebSecurityConfig; import jakarta.annotation.Resource; import jakarta.servlet.http.HttpServletRequest; diff --git a/service/src/main/java/cn/bunny/services/security/service/ReadMe.md b/auth-system/src/main/java/cn/bunny/services/security/service/ReadMe.md similarity index 100% rename from service/src/main/java/cn/bunny/services/security/service/ReadMe.md rename to auth-system/src/main/java/cn/bunny/services/security/service/ReadMe.md diff --git a/service/src/main/java/cn/bunny/services/security/service/TokenValidationService.java b/auth-system/src/main/java/cn/bunny/services/security/service/TokenValidationService.java similarity index 83% rename from service/src/main/java/cn/bunny/services/security/service/TokenValidationService.java rename to auth-system/src/main/java/cn/bunny/services/security/service/TokenValidationService.java index 6554cf8..c26a5bd 100644 --- a/service/src/main/java/cn/bunny/services/security/service/TokenValidationService.java +++ b/auth-system/src/main/java/cn/bunny/services/security/service/TokenValidationService.java @@ -1,11 +1,11 @@ package cn.bunny.services.security.service; -import cn.bunny.services.domain.common.constant.RedisUserConstant; -import cn.bunny.services.domain.common.enums.ResultCodeEnum; -import cn.bunny.services.domain.common.model.dto.security.TokenInfo; -import cn.bunny.services.domain.common.model.vo.LoginVo; +import cn.bunny.domain.common.constant.RedisUserConstant; +import cn.bunny.domain.common.enums.ResultCodeEnum; +import cn.bunny.domain.common.model.dto.security.TokenInfo; +import cn.bunny.domain.common.model.vo.LoginVo; import cn.bunny.services.security.exception.CustomAuthenticationException; -import cn.bunny.services.utils.JwtTokenUtil; +import cn.bunny.core.utils.JwtTokenUtil; import com.alibaba.fastjson2.JSON; import jakarta.annotation.Resource; import jakarta.servlet.http.HttpServletRequest; diff --git a/service/src/main/java/cn/bunny/services/service/configuration/ConfigurationService.java b/auth-system/src/main/java/cn/bunny/services/service/configuration/ConfigurationService.java similarity index 75% rename from service/src/main/java/cn/bunny/services/service/configuration/ConfigurationService.java rename to auth-system/src/main/java/cn/bunny/services/service/configuration/ConfigurationService.java index 365cfa5..198eb11 100644 --- a/service/src/main/java/cn/bunny/services/service/configuration/ConfigurationService.java +++ b/auth-system/src/main/java/cn/bunny/services/service/configuration/ConfigurationService.java @@ -1,8 +1,8 @@ package cn.bunny.services.service.configuration; -import cn.bunny.services.domain.configuration.dto.WebConfigurationDto; -import cn.bunny.services.domain.configuration.entity.WebConfiguration; +import cn.bunny.domain.configuration.dto.WebConfigurationDto; +import cn.bunny.domain.configuration.entity.WebConfiguration; public interface ConfigurationService { diff --git a/service/src/main/java/cn/bunny/services/service/configuration/EmailTemplateService.java b/auth-system/src/main/java/cn/bunny/services/service/configuration/EmailTemplateService.java similarity index 81% rename from service/src/main/java/cn/bunny/services/service/configuration/EmailTemplateService.java rename to auth-system/src/main/java/cn/bunny/services/service/configuration/EmailTemplateService.java index 4a55f5b..b02e92b 100644 --- a/service/src/main/java/cn/bunny/services/service/configuration/EmailTemplateService.java +++ b/auth-system/src/main/java/cn/bunny/services/service/configuration/EmailTemplateService.java @@ -1,9 +1,9 @@ package cn.bunny.services.service.configuration; -import cn.bunny.services.domain.common.model.vo.result.PageResult; -import cn.bunny.services.domain.configuration.dto.EmailTemplateDto; -import cn.bunny.services.domain.configuration.entity.EmailTemplate; -import cn.bunny.services.domain.configuration.vo.EmailTemplateVo; +import cn.bunny.domain.common.model.vo.result.PageResult; +import cn.bunny.domain.configuration.dto.EmailTemplateDto; +import cn.bunny.domain.configuration.entity.EmailTemplate; +import cn.bunny.domain.configuration.vo.EmailTemplateVo; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/service/src/main/java/cn/bunny/services/service/configuration/EmailUsersService.java b/auth-system/src/main/java/cn/bunny/services/service/configuration/EmailUsersService.java similarity index 82% rename from service/src/main/java/cn/bunny/services/service/configuration/EmailUsersService.java rename to auth-system/src/main/java/cn/bunny/services/service/configuration/EmailUsersService.java index 7803fb7..8ecf9d7 100644 --- a/service/src/main/java/cn/bunny/services/service/configuration/EmailUsersService.java +++ b/auth-system/src/main/java/cn/bunny/services/service/configuration/EmailUsersService.java @@ -1,9 +1,9 @@ package cn.bunny.services.service.configuration; -import cn.bunny.services.domain.common.model.vo.result.PageResult; -import cn.bunny.services.domain.configuration.dto.EmailUsersDto; -import cn.bunny.services.domain.configuration.entity.EmailUsers; -import cn.bunny.services.domain.configuration.vo.EmailUsersVo; +import cn.bunny.domain.common.model.vo.result.PageResult; +import cn.bunny.domain.configuration.dto.EmailUsersDto; +import cn.bunny.domain.configuration.entity.EmailUsers; +import cn.bunny.domain.configuration.vo.EmailUsersVo; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/service/src/main/java/cn/bunny/services/service/configuration/I18nService.java b/auth-system/src/main/java/cn/bunny/services/service/configuration/I18nService.java similarity index 81% rename from service/src/main/java/cn/bunny/services/service/configuration/I18nService.java rename to auth-system/src/main/java/cn/bunny/services/service/configuration/I18nService.java index f3220da..62e73d0 100644 --- a/service/src/main/java/cn/bunny/services/service/configuration/I18nService.java +++ b/auth-system/src/main/java/cn/bunny/services/service/configuration/I18nService.java @@ -1,11 +1,11 @@ package cn.bunny.services.service.configuration; -import cn.bunny.services.domain.common.model.vo.result.PageResult; -import cn.bunny.services.domain.configuration.dto.I18nDto; -import cn.bunny.services.domain.configuration.dto.I18nUpdateByFileDto; -import cn.bunny.services.domain.configuration.entity.I18n; -import cn.bunny.services.domain.configuration.vo.I18nVo; +import cn.bunny.domain.common.model.vo.result.PageResult; +import cn.bunny.domain.configuration.dto.I18nDto; +import cn.bunny.domain.configuration.dto.I18nUpdateByFileDto; +import cn.bunny.domain.configuration.entity.I18n; +import cn.bunny.domain.configuration.vo.I18nVo; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import org.springframework.http.ResponseEntity; diff --git a/service/src/main/java/cn/bunny/services/service/configuration/I18nTypeService.java b/auth-system/src/main/java/cn/bunny/services/service/configuration/I18nTypeService.java similarity index 81% rename from service/src/main/java/cn/bunny/services/service/configuration/I18nTypeService.java rename to auth-system/src/main/java/cn/bunny/services/service/configuration/I18nTypeService.java index 2b234b6..77c82b1 100644 --- a/service/src/main/java/cn/bunny/services/service/configuration/I18nTypeService.java +++ b/auth-system/src/main/java/cn/bunny/services/service/configuration/I18nTypeService.java @@ -1,8 +1,8 @@ package cn.bunny.services.service.configuration; -import cn.bunny.services.domain.configuration.dto.I18nTypeDto; -import cn.bunny.services.domain.configuration.entity.I18nType; -import cn.bunny.services.domain.configuration.vo.I18nTypeVo; +import cn.bunny.domain.configuration.dto.I18nTypeDto; +import cn.bunny.domain.configuration.entity.I18nType; +import cn.bunny.domain.configuration.vo.I18nTypeVo; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; diff --git a/service/src/main/java/cn/bunny/services/service/configuration/MenuIconService.java b/auth-system/src/main/java/cn/bunny/services/service/configuration/MenuIconService.java similarity index 82% rename from service/src/main/java/cn/bunny/services/service/configuration/MenuIconService.java rename to auth-system/src/main/java/cn/bunny/services/service/configuration/MenuIconService.java index a61f226..ef33e02 100644 --- a/service/src/main/java/cn/bunny/services/service/configuration/MenuIconService.java +++ b/auth-system/src/main/java/cn/bunny/services/service/configuration/MenuIconService.java @@ -1,9 +1,9 @@ package cn.bunny.services.service.configuration; -import cn.bunny.services.domain.common.model.vo.result.PageResult; -import cn.bunny.services.domain.configuration.dto.MenuIconDto; -import cn.bunny.services.domain.configuration.entity.MenuIcon; -import cn.bunny.services.domain.configuration.vo.MenuIconVo; +import cn.bunny.domain.common.model.vo.result.PageResult; +import cn.bunny.domain.configuration.dto.MenuIconDto; +import cn.bunny.domain.configuration.entity.MenuIcon; +import cn.bunny.domain.configuration.vo.MenuIconVo; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/service/src/main/java/cn/bunny/services/service/configuration/impl/ConfigurationServiceImpl.java b/auth-system/src/main/java/cn/bunny/services/service/configuration/impl/ConfigurationServiceImpl.java similarity index 87% rename from service/src/main/java/cn/bunny/services/service/configuration/impl/ConfigurationServiceImpl.java rename to auth-system/src/main/java/cn/bunny/services/service/configuration/impl/ConfigurationServiceImpl.java index 9fbda9d..22bae1c 100644 --- a/service/src/main/java/cn/bunny/services/service/configuration/impl/ConfigurationServiceImpl.java +++ b/auth-system/src/main/java/cn/bunny/services/service/configuration/impl/ConfigurationServiceImpl.java @@ -1,10 +1,10 @@ package cn.bunny.services.service.configuration.impl; -import cn.bunny.services.domain.configuration.dto.WebConfigurationDto; -import cn.bunny.services.domain.configuration.entity.WebConfiguration; -import cn.bunny.services.domain.common.constant.RedisUserConstant; -import cn.bunny.services.domain.common.enums.ResultCodeEnum; -import cn.bunny.services.exception.AuthCustomerException; +import cn.bunny.domain.configuration.dto.WebConfigurationDto; +import cn.bunny.domain.configuration.entity.WebConfiguration; +import cn.bunny.domain.common.constant.RedisUserConstant; +import cn.bunny.domain.common.enums.ResultCodeEnum; +import cn.bunny.core.exception.AuthCustomerException; import cn.bunny.services.service.configuration.ConfigurationService; import com.alibaba.fastjson2.JSON; import jakarta.annotation.Resource; diff --git a/service/src/main/java/cn/bunny/services/service/configuration/impl/EmailTemplateServiceImpl.java b/auth-system/src/main/java/cn/bunny/services/service/configuration/impl/EmailTemplateServiceImpl.java similarity index 93% rename from service/src/main/java/cn/bunny/services/service/configuration/impl/EmailTemplateServiceImpl.java rename to auth-system/src/main/java/cn/bunny/services/service/configuration/impl/EmailTemplateServiceImpl.java index 67f946e..2dbf02f 100644 --- a/service/src/main/java/cn/bunny/services/service/configuration/impl/EmailTemplateServiceImpl.java +++ b/auth-system/src/main/java/cn/bunny/services/service/configuration/impl/EmailTemplateServiceImpl.java @@ -1,12 +1,12 @@ package cn.bunny.services.service.configuration.impl; -import cn.bunny.services.domain.common.enums.EmailTemplateEnums; -import cn.bunny.services.domain.common.enums.ResultCodeEnum; -import cn.bunny.services.domain.common.model.vo.result.PageResult; -import cn.bunny.services.domain.configuration.dto.EmailTemplateDto; -import cn.bunny.services.domain.configuration.entity.EmailTemplate; -import cn.bunny.services.domain.configuration.vo.EmailTemplateVo; -import cn.bunny.services.exception.AuthCustomerException; +import cn.bunny.domain.common.enums.EmailTemplateEnums; +import cn.bunny.domain.common.enums.ResultCodeEnum; +import cn.bunny.domain.common.model.vo.result.PageResult; +import cn.bunny.domain.configuration.dto.EmailTemplateDto; +import cn.bunny.domain.configuration.entity.EmailTemplate; +import cn.bunny.domain.configuration.vo.EmailTemplateVo; +import cn.bunny.core.exception.AuthCustomerException; import cn.bunny.services.mapper.configuration.EmailTemplateMapper; import cn.bunny.services.service.configuration.EmailTemplateService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; diff --git a/service/src/main/java/cn/bunny/services/service/configuration/impl/EmailUsersServiceImpl.java b/auth-system/src/main/java/cn/bunny/services/service/configuration/impl/EmailUsersServiceImpl.java similarity index 91% rename from service/src/main/java/cn/bunny/services/service/configuration/impl/EmailUsersServiceImpl.java rename to auth-system/src/main/java/cn/bunny/services/service/configuration/impl/EmailUsersServiceImpl.java index 5b306ef..ef2d12d 100644 --- a/service/src/main/java/cn/bunny/services/service/configuration/impl/EmailUsersServiceImpl.java +++ b/auth-system/src/main/java/cn/bunny/services/service/configuration/impl/EmailUsersServiceImpl.java @@ -1,11 +1,11 @@ package cn.bunny.services.service.configuration.impl; -import cn.bunny.services.domain.common.enums.ResultCodeEnum; -import cn.bunny.services.domain.common.model.vo.result.PageResult; -import cn.bunny.services.domain.configuration.dto.EmailUsersDto; -import cn.bunny.services.domain.configuration.entity.EmailUsers; -import cn.bunny.services.domain.configuration.vo.EmailUsersVo; -import cn.bunny.services.exception.AuthCustomerException; +import cn.bunny.domain.common.enums.ResultCodeEnum; +import cn.bunny.domain.common.model.vo.result.PageResult; +import cn.bunny.domain.configuration.dto.EmailUsersDto; +import cn.bunny.domain.configuration.entity.EmailUsers; +import cn.bunny.domain.configuration.vo.EmailUsersVo; +import cn.bunny.core.exception.AuthCustomerException; import cn.bunny.services.mapper.configuration.EmailUsersMapper; import cn.bunny.services.service.configuration.EmailUsersService; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/service/src/main/java/cn/bunny/services/service/configuration/impl/I18nServiceImpl.java b/auth-system/src/main/java/cn/bunny/services/service/configuration/impl/I18nServiceImpl.java similarity index 93% rename from service/src/main/java/cn/bunny/services/service/configuration/impl/I18nServiceImpl.java rename to auth-system/src/main/java/cn/bunny/services/service/configuration/impl/I18nServiceImpl.java index 0f0f28a..3ced38b 100644 --- a/service/src/main/java/cn/bunny/services/service/configuration/impl/I18nServiceImpl.java +++ b/auth-system/src/main/java/cn/bunny/services/service/configuration/impl/I18nServiceImpl.java @@ -3,21 +3,21 @@ package cn.bunny.services.service.configuration.impl; import cn.bunny.services.core.event.listener.excel.I18nExcelListener; import cn.bunny.services.core.strategy.export.ExcelZipExportStrategy; import cn.bunny.services.core.strategy.export.JsonZipExportStrategy; -import cn.bunny.services.domain.common.constant.FileType; -import cn.bunny.services.domain.common.enums.ResultCodeEnum; -import cn.bunny.services.domain.common.model.dto.excel.I18nExcel; -import cn.bunny.services.domain.common.model.entity.BaseEntity; -import cn.bunny.services.domain.common.model.vo.result.PageResult; -import cn.bunny.services.domain.configuration.dto.I18nDto; -import cn.bunny.services.domain.configuration.dto.I18nUpdateByFileDto; -import cn.bunny.services.domain.configuration.entity.I18n; -import cn.bunny.services.domain.configuration.entity.I18nType; -import cn.bunny.services.domain.configuration.vo.I18nVo; -import cn.bunny.services.exception.AuthCustomerException; +import cn.bunny.domain.common.constant.FileType; +import cn.bunny.domain.common.enums.ResultCodeEnum; +import cn.bunny.domain.common.model.dto.excel.I18nExcel; +import cn.bunny.domain.common.model.entity.BaseEntity; +import cn.bunny.domain.common.model.vo.result.PageResult; +import cn.bunny.domain.configuration.dto.I18nDto; +import cn.bunny.domain.configuration.dto.I18nUpdateByFileDto; +import cn.bunny.domain.configuration.entity.I18n; +import cn.bunny.domain.configuration.entity.I18nType; +import cn.bunny.domain.configuration.vo.I18nVo; +import cn.bunny.core.exception.AuthCustomerException; import cn.bunny.services.mapper.configuration.I18nMapper; import cn.bunny.services.mapper.configuration.I18nTypeMapper; import cn.bunny.services.service.configuration.I18nService; -import cn.bunny.services.utils.FileUtil; +import cn.bunny.core.utils.FileUtil; import com.alibaba.excel.EasyExcel; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.TypeReference; diff --git a/service/src/main/java/cn/bunny/services/service/configuration/impl/I18nTypeServiceImpl.java b/auth-system/src/main/java/cn/bunny/services/service/configuration/impl/I18nTypeServiceImpl.java similarity index 93% rename from service/src/main/java/cn/bunny/services/service/configuration/impl/I18nTypeServiceImpl.java rename to auth-system/src/main/java/cn/bunny/services/service/configuration/impl/I18nTypeServiceImpl.java index d326a81..504547c 100644 --- a/service/src/main/java/cn/bunny/services/service/configuration/impl/I18nTypeServiceImpl.java +++ b/auth-system/src/main/java/cn/bunny/services/service/configuration/impl/I18nTypeServiceImpl.java @@ -1,10 +1,10 @@ package cn.bunny.services.service.configuration.impl; -import cn.bunny.services.domain.common.enums.ResultCodeEnum; -import cn.bunny.services.domain.configuration.dto.I18nTypeDto; -import cn.bunny.services.domain.configuration.entity.I18nType; -import cn.bunny.services.domain.configuration.vo.I18nTypeVo; -import cn.bunny.services.exception.AuthCustomerException; +import cn.bunny.domain.common.enums.ResultCodeEnum; +import cn.bunny.domain.configuration.dto.I18nTypeDto; +import cn.bunny.domain.configuration.entity.I18nType; +import cn.bunny.domain.configuration.vo.I18nTypeVo; +import cn.bunny.core.exception.AuthCustomerException; import cn.bunny.services.mapper.configuration.I18nTypeMapper; import cn.bunny.services.service.configuration.I18nTypeService; import com.baomidou.mybatisplus.core.toolkit.Wrappers; diff --git a/service/src/main/java/cn/bunny/services/service/configuration/impl/MenuIconServiceImpl.java b/auth-system/src/main/java/cn/bunny/services/service/configuration/impl/MenuIconServiceImpl.java similarity index 90% rename from service/src/main/java/cn/bunny/services/service/configuration/impl/MenuIconServiceImpl.java rename to auth-system/src/main/java/cn/bunny/services/service/configuration/impl/MenuIconServiceImpl.java index 3a4f390..cc48c98 100644 --- a/service/src/main/java/cn/bunny/services/service/configuration/impl/MenuIconServiceImpl.java +++ b/auth-system/src/main/java/cn/bunny/services/service/configuration/impl/MenuIconServiceImpl.java @@ -1,11 +1,11 @@ package cn.bunny.services.service.configuration.impl; -import cn.bunny.services.domain.common.enums.ResultCodeEnum; -import cn.bunny.services.domain.common.model.vo.result.PageResult; -import cn.bunny.services.domain.configuration.dto.MenuIconDto; -import cn.bunny.services.domain.configuration.entity.MenuIcon; -import cn.bunny.services.domain.configuration.vo.MenuIconVo; -import cn.bunny.services.exception.AuthCustomerException; +import cn.bunny.domain.common.enums.ResultCodeEnum; +import cn.bunny.domain.common.model.vo.result.PageResult; +import cn.bunny.domain.configuration.dto.MenuIconDto; +import cn.bunny.domain.configuration.entity.MenuIcon; +import cn.bunny.domain.configuration.vo.MenuIconVo; +import cn.bunny.core.exception.AuthCustomerException; import cn.bunny.services.mapper.configuration.MenuIconMapper; import cn.bunny.services.service.configuration.MenuIconService; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/service/src/main/java/cn/bunny/services/service/file/FilesParDetailService.java b/auth-system/src/main/java/cn/bunny/services/service/file/FilesParDetailService.java similarity index 83% rename from service/src/main/java/cn/bunny/services/service/file/FilesParDetailService.java rename to auth-system/src/main/java/cn/bunny/services/service/file/FilesParDetailService.java index a60a148..eb4b7a1 100644 --- a/service/src/main/java/cn/bunny/services/service/file/FilesParDetailService.java +++ b/auth-system/src/main/java/cn/bunny/services/service/file/FilesParDetailService.java @@ -1,9 +1,9 @@ package cn.bunny.services.service.file; -import cn.bunny.services.domain.common.model.vo.result.PageResult; -import cn.bunny.services.domain.files.dto.FilesParDetailDto; -import cn.bunny.services.domain.files.entity.FilesParDetail; -import cn.bunny.services.domain.files.vo.FilesParDetailVo; +import cn.bunny.domain.common.model.vo.result.PageResult; +import cn.bunny.domain.files.dto.FilesParDetailDto; +import cn.bunny.domain.files.entity.FilesParDetail; +import cn.bunny.domain.files.vo.FilesParDetailVo; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/service/src/main/java/cn/bunny/services/service/file/FilesService.java b/auth-system/src/main/java/cn/bunny/services/service/file/FilesService.java similarity index 80% rename from service/src/main/java/cn/bunny/services/service/file/FilesService.java rename to auth-system/src/main/java/cn/bunny/services/service/file/FilesService.java index 6e51b30..aed930d 100644 --- a/service/src/main/java/cn/bunny/services/service/file/FilesService.java +++ b/auth-system/src/main/java/cn/bunny/services/service/file/FilesService.java @@ -1,13 +1,13 @@ package cn.bunny.services.service.file; -import cn.bunny.services.domain.common.model.vo.result.PageResult; -import cn.bunny.services.domain.files.dto.FileUploadDto; -import cn.bunny.services.domain.files.dto.FilesCreateOrUpdateDto; -import cn.bunny.services.domain.files.dto.FilesDto; -import cn.bunny.services.domain.files.dto.UploadThumbnail; -import cn.bunny.services.domain.files.entity.Files; -import cn.bunny.services.domain.files.vo.FileInfoVo; -import cn.bunny.services.domain.files.vo.FilesVo; +import cn.bunny.domain.common.model.vo.result.PageResult; +import cn.bunny.domain.files.dto.FileUploadDto; +import cn.bunny.domain.files.dto.FilesCreateOrUpdateDto; +import cn.bunny.domain.files.dto.FilesDto; +import cn.bunny.domain.files.dto.UploadThumbnail; +import cn.bunny.domain.files.entity.Files; +import cn.bunny.domain.files.vo.FileInfoVo; +import cn.bunny.domain.files.vo.FilesVo; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import org.dromara.x.file.storage.core.get.RemoteDirInfo; diff --git a/service/src/main/java/cn/bunny/services/service/file/impl/FileDetailService.java b/auth-system/src/main/java/cn/bunny/services/service/file/impl/FileDetailService.java similarity index 96% rename from service/src/main/java/cn/bunny/services/service/file/impl/FileDetailService.java rename to auth-system/src/main/java/cn/bunny/services/service/file/impl/FileDetailService.java index 61a8a46..a95ebb3 100644 --- a/service/src/main/java/cn/bunny/services/service/file/impl/FileDetailService.java +++ b/auth-system/src/main/java/cn/bunny/services/service/file/impl/FileDetailService.java @@ -1,10 +1,10 @@ package cn.bunny.services.service.file.impl; -import cn.bunny.services.domain.files.entity.Files; -import cn.bunny.services.domain.files.entity.FilesParDetail; +import cn.bunny.domain.files.entity.Files; +import cn.bunny.domain.files.entity.FilesParDetail; import cn.bunny.services.mapper.file.FilesMapper; import cn.bunny.services.mapper.file.FilesParDetailMapper; -import cn.bunny.services.utils.FileUtil; +import cn.bunny.core.utils.FileUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; diff --git a/service/src/main/java/cn/bunny/services/service/file/impl/FilesParDetailServiceImpl.java b/auth-system/src/main/java/cn/bunny/services/service/file/impl/FilesParDetailServiceImpl.java similarity index 91% rename from service/src/main/java/cn/bunny/services/service/file/impl/FilesParDetailServiceImpl.java rename to auth-system/src/main/java/cn/bunny/services/service/file/impl/FilesParDetailServiceImpl.java index 8ee277b..a42d5c0 100644 --- a/service/src/main/java/cn/bunny/services/service/file/impl/FilesParDetailServiceImpl.java +++ b/auth-system/src/main/java/cn/bunny/services/service/file/impl/FilesParDetailServiceImpl.java @@ -1,9 +1,9 @@ package cn.bunny.services.service.file.impl; -import cn.bunny.services.domain.common.model.vo.result.PageResult; -import cn.bunny.services.domain.files.dto.FilesParDetailDto; -import cn.bunny.services.domain.files.entity.FilesParDetail; -import cn.bunny.services.domain.files.vo.FilesParDetailVo; +import cn.bunny.domain.common.model.vo.result.PageResult; +import cn.bunny.domain.files.dto.FilesParDetailDto; +import cn.bunny.domain.files.entity.FilesParDetail; +import cn.bunny.domain.files.vo.FilesParDetailVo; import cn.bunny.services.mapper.file.FilesParDetailMapper; import cn.bunny.services.service.file.FilesParDetailService; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/service/src/main/java/cn/bunny/services/service/file/impl/FilesServiceImpl.java b/auth-system/src/main/java/cn/bunny/services/service/file/impl/FilesServiceImpl.java similarity index 92% rename from service/src/main/java/cn/bunny/services/service/file/impl/FilesServiceImpl.java rename to auth-system/src/main/java/cn/bunny/services/service/file/impl/FilesServiceImpl.java index 8c135f4..6ddb649 100644 --- a/service/src/main/java/cn/bunny/services/service/file/impl/FilesServiceImpl.java +++ b/auth-system/src/main/java/cn/bunny/services/service/file/impl/FilesServiceImpl.java @@ -1,19 +1,19 @@ package cn.bunny.services.service.file.impl; -import cn.bunny.services.domain.common.constant.FileStorageConstant; -import cn.bunny.services.domain.common.enums.ResultCodeEnum; -import cn.bunny.services.domain.common.model.vo.result.PageResult; -import cn.bunny.services.domain.files.dto.FileUploadDto; -import cn.bunny.services.domain.files.dto.FilesCreateOrUpdateDto; -import cn.bunny.services.domain.files.dto.FilesDto; -import cn.bunny.services.domain.files.dto.UploadThumbnail; -import cn.bunny.services.domain.files.entity.Files; -import cn.bunny.services.domain.files.vo.FileInfoVo; -import cn.bunny.services.domain.files.vo.FilesVo; -import cn.bunny.services.exception.AuthCustomerException; +import cn.bunny.domain.common.constant.FileStorageConstant; +import cn.bunny.domain.common.enums.ResultCodeEnum; +import cn.bunny.domain.common.model.vo.result.PageResult; +import cn.bunny.domain.files.dto.FileUploadDto; +import cn.bunny.domain.files.dto.FilesCreateOrUpdateDto; +import cn.bunny.domain.files.dto.FilesDto; +import cn.bunny.domain.files.dto.UploadThumbnail; +import cn.bunny.domain.files.entity.Files; +import cn.bunny.domain.files.vo.FileInfoVo; +import cn.bunny.domain.files.vo.FilesVo; +import cn.bunny.core.exception.AuthCustomerException; import cn.bunny.services.mapper.file.FilesMapper; import cn.bunny.services.service.file.FilesService; -import cn.bunny.services.utils.FileUtil; +import cn.bunny.core.utils.FileUtil; import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/service/src/main/java/cn/bunny/services/service/log/ScheduleExecuteLogService.java b/auth-system/src/main/java/cn/bunny/services/service/log/ScheduleExecuteLogService.java similarity index 75% rename from service/src/main/java/cn/bunny/services/service/log/ScheduleExecuteLogService.java rename to auth-system/src/main/java/cn/bunny/services/service/log/ScheduleExecuteLogService.java index 26b3c27..3779e0e 100644 --- a/service/src/main/java/cn/bunny/services/service/log/ScheduleExecuteLogService.java +++ b/auth-system/src/main/java/cn/bunny/services/service/log/ScheduleExecuteLogService.java @@ -1,9 +1,9 @@ package cn.bunny.services.service.log; -import cn.bunny.services.domain.log.dto.ScheduleExecuteLogDto; -import cn.bunny.services.domain.log.entity.ScheduleExecuteLog; -import cn.bunny.services.domain.log.vo.ScheduleExecuteLogVo; -import cn.bunny.services.domain.common.model.vo.result.PageResult; +import cn.bunny.domain.log.dto.ScheduleExecuteLogDto; +import cn.bunny.domain.log.entity.ScheduleExecuteLog; +import cn.bunny.domain.log.vo.ScheduleExecuteLogVo; +import cn.bunny.domain.common.model.vo.result.PageResult; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/service/src/main/java/cn/bunny/services/service/log/UserLoginLogService.java b/auth-system/src/main/java/cn/bunny/services/service/log/UserLoginLogService.java similarity index 76% rename from service/src/main/java/cn/bunny/services/service/log/UserLoginLogService.java rename to auth-system/src/main/java/cn/bunny/services/service/log/UserLoginLogService.java index e7ab57c..e74be23 100644 --- a/service/src/main/java/cn/bunny/services/service/log/UserLoginLogService.java +++ b/auth-system/src/main/java/cn/bunny/services/service/log/UserLoginLogService.java @@ -1,10 +1,10 @@ package cn.bunny.services.service.log; -import cn.bunny.services.domain.log.dto.UserLoginLogDto; -import cn.bunny.services.domain.log.entity.UserLoginLog; -import cn.bunny.services.domain.log.vo.UserLoginLogLocalVo; -import cn.bunny.services.domain.log.vo.UserLoginLogVo; -import cn.bunny.services.domain.common.model.vo.result.PageResult; +import cn.bunny.domain.log.dto.UserLoginLogDto; +import cn.bunny.domain.log.entity.UserLoginLog; +import cn.bunny.domain.log.vo.UserLoginLogLocalVo; +import cn.bunny.domain.log.vo.UserLoginLogVo; +import cn.bunny.domain.common.model.vo.result.PageResult; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/service/src/main/java/cn/bunny/services/service/log/impl/ScheduleExecuteLogServiceImpl.java b/auth-system/src/main/java/cn/bunny/services/service/log/impl/ScheduleExecuteLogServiceImpl.java similarity index 87% rename from service/src/main/java/cn/bunny/services/service/log/impl/ScheduleExecuteLogServiceImpl.java rename to auth-system/src/main/java/cn/bunny/services/service/log/impl/ScheduleExecuteLogServiceImpl.java index bfbe9a7..930fa9d 100644 --- a/service/src/main/java/cn/bunny/services/service/log/impl/ScheduleExecuteLogServiceImpl.java +++ b/auth-system/src/main/java/cn/bunny/services/service/log/impl/ScheduleExecuteLogServiceImpl.java @@ -1,9 +1,9 @@ package cn.bunny.services.service.log.impl; -import cn.bunny.services.domain.log.dto.ScheduleExecuteLogDto; -import cn.bunny.services.domain.log.entity.ScheduleExecuteLog; -import cn.bunny.services.domain.log.vo.ScheduleExecuteLogVo; -import cn.bunny.services.domain.common.model.vo.result.PageResult; +import cn.bunny.domain.log.dto.ScheduleExecuteLogDto; +import cn.bunny.domain.log.entity.ScheduleExecuteLog; +import cn.bunny.domain.log.vo.ScheduleExecuteLogVo; +import cn.bunny.domain.common.model.vo.result.PageResult; import cn.bunny.services.mapper.log.ScheduleExecuteLogMapper; import cn.bunny.services.service.log.ScheduleExecuteLogService; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/service/src/main/java/cn/bunny/services/service/log/impl/UserLoginLogServiceImpl.java b/auth-system/src/main/java/cn/bunny/services/service/log/impl/UserLoginLogServiceImpl.java similarity index 89% rename from service/src/main/java/cn/bunny/services/service/log/impl/UserLoginLogServiceImpl.java rename to auth-system/src/main/java/cn/bunny/services/service/log/impl/UserLoginLogServiceImpl.java index 0ee83d3..abe1076 100644 --- a/service/src/main/java/cn/bunny/services/service/log/impl/UserLoginLogServiceImpl.java +++ b/auth-system/src/main/java/cn/bunny/services/service/log/impl/UserLoginLogServiceImpl.java @@ -1,14 +1,14 @@ package cn.bunny.services.service.log.impl; -import cn.bunny.services.context.BaseContext; -import cn.bunny.services.domain.common.model.vo.result.PageResult; -import cn.bunny.services.domain.log.dto.UserLoginLogDto; -import cn.bunny.services.domain.log.entity.UserLoginLog; -import cn.bunny.services.domain.log.vo.UserLoginLogLocalVo; -import cn.bunny.services.domain.log.vo.UserLoginLogVo; +import cn.bunny.core.context.BaseContext; +import cn.bunny.domain.common.model.vo.result.PageResult; +import cn.bunny.domain.log.dto.UserLoginLogDto; +import cn.bunny.domain.log.entity.UserLoginLog; +import cn.bunny.domain.log.vo.UserLoginLogLocalVo; +import cn.bunny.domain.log.vo.UserLoginLogVo; import cn.bunny.services.mapper.log.UserLoginLogMapper; import cn.bunny.services.service.log.UserLoginLogService; -import cn.bunny.services.utils.IpUtil; +import cn.bunny.core.utils.IpUtil; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/service/src/main/java/cn/bunny/services/service/message/MessageReceivedService.java b/auth-system/src/main/java/cn/bunny/services/service/message/MessageReceivedService.java similarity index 73% rename from service/src/main/java/cn/bunny/services/service/message/MessageReceivedService.java rename to auth-system/src/main/java/cn/bunny/services/service/message/MessageReceivedService.java index afad307..223afd5 100644 --- a/service/src/main/java/cn/bunny/services/service/message/MessageReceivedService.java +++ b/auth-system/src/main/java/cn/bunny/services/service/message/MessageReceivedService.java @@ -1,13 +1,13 @@ package cn.bunny.services.service.message; -import cn.bunny.services.domain.common.model.vo.result.PageResult; -import cn.bunny.services.domain.message.dto.MessageReceivedDto; -import cn.bunny.services.domain.message.dto.MessageReceivedUpdateDto; -import cn.bunny.services.domain.message.dto.MessageUserDto; -import cn.bunny.services.domain.message.entity.Message; -import cn.bunny.services.domain.message.entity.MessageReceived; -import cn.bunny.services.domain.message.vo.MessageReceivedWithMessageVo; -import cn.bunny.services.domain.message.vo.MessageUserVo; +import cn.bunny.domain.common.model.vo.result.PageResult; +import cn.bunny.domain.message.dto.MessageReceivedDto; +import cn.bunny.domain.message.dto.MessageReceivedUpdateDto; +import cn.bunny.domain.message.dto.MessageUserDto; +import cn.bunny.domain.message.entity.Message; +import cn.bunny.domain.message.entity.MessageReceived; +import cn.bunny.domain.message.vo.MessageReceivedWithMessageVo; +import cn.bunny.domain.message.vo.MessageUserVo; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/service/src/main/java/cn/bunny/services/service/message/MessageService.java b/auth-system/src/main/java/cn/bunny/services/service/message/MessageService.java similarity index 79% rename from service/src/main/java/cn/bunny/services/service/message/MessageService.java rename to auth-system/src/main/java/cn/bunny/services/service/message/MessageService.java index 55bfd99..ca155f9 100644 --- a/service/src/main/java/cn/bunny/services/service/message/MessageService.java +++ b/auth-system/src/main/java/cn/bunny/services/service/message/MessageService.java @@ -1,11 +1,11 @@ package cn.bunny.services.service.message; -import cn.bunny.services.domain.common.model.vo.result.PageResult; -import cn.bunny.services.domain.message.dto.MessageDto; -import cn.bunny.services.domain.message.entity.Message; -import cn.bunny.services.domain.message.vo.MessageDetailVo; -import cn.bunny.services.domain.message.vo.MessageReceivedWithUserVo; -import cn.bunny.services.domain.message.vo.MessageVo; +import cn.bunny.domain.common.model.vo.result.PageResult; +import cn.bunny.domain.message.dto.MessageDto; +import cn.bunny.domain.message.entity.Message; +import cn.bunny.domain.message.vo.MessageDetailVo; +import cn.bunny.domain.message.vo.MessageReceivedWithUserVo; +import cn.bunny.domain.message.vo.MessageVo; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/service/src/main/java/cn/bunny/services/service/message/MessageTypeService.java b/auth-system/src/main/java/cn/bunny/services/service/message/MessageTypeService.java similarity index 82% rename from service/src/main/java/cn/bunny/services/service/message/MessageTypeService.java rename to auth-system/src/main/java/cn/bunny/services/service/message/MessageTypeService.java index 2d57d4b..f2346a2 100644 --- a/service/src/main/java/cn/bunny/services/service/message/MessageTypeService.java +++ b/auth-system/src/main/java/cn/bunny/services/service/message/MessageTypeService.java @@ -1,9 +1,9 @@ package cn.bunny.services.service.message; -import cn.bunny.services.domain.common.model.vo.result.PageResult; -import cn.bunny.services.domain.message.dto.MessageTypeDto; -import cn.bunny.services.domain.message.entity.MessageType; -import cn.bunny.services.domain.message.vo.MessageTypeVo; +import cn.bunny.domain.common.model.vo.result.PageResult; +import cn.bunny.domain.message.dto.MessageTypeDto; +import cn.bunny.domain.message.entity.MessageType; +import cn.bunny.domain.message.vo.MessageTypeVo; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/service/src/main/java/cn/bunny/services/service/message/impl/MessageReceivedServiceImpl.java b/auth-system/src/main/java/cn/bunny/services/service/message/impl/MessageReceivedServiceImpl.java similarity index 88% rename from service/src/main/java/cn/bunny/services/service/message/impl/MessageReceivedServiceImpl.java rename to auth-system/src/main/java/cn/bunny/services/service/message/impl/MessageReceivedServiceImpl.java index 4fa149f..8a20b79 100644 --- a/service/src/main/java/cn/bunny/services/service/message/impl/MessageReceivedServiceImpl.java +++ b/auth-system/src/main/java/cn/bunny/services/service/message/impl/MessageReceivedServiceImpl.java @@ -1,16 +1,16 @@ package cn.bunny.services.service.message.impl; -import cn.bunny.services.context.BaseContext; -import cn.bunny.services.domain.common.enums.ResultCodeEnum; -import cn.bunny.services.domain.common.model.vo.result.PageResult; -import cn.bunny.services.domain.message.dto.MessageReceivedDto; -import cn.bunny.services.domain.message.dto.MessageReceivedUpdateDto; -import cn.bunny.services.domain.message.dto.MessageUserDto; -import cn.bunny.services.domain.message.entity.Message; -import cn.bunny.services.domain.message.entity.MessageReceived; -import cn.bunny.services.domain.message.vo.MessageReceivedWithMessageVo; -import cn.bunny.services.domain.message.vo.MessageUserVo; -import cn.bunny.services.exception.AuthCustomerException; +import cn.bunny.core.context.BaseContext; +import cn.bunny.domain.common.enums.ResultCodeEnum; +import cn.bunny.domain.common.model.vo.result.PageResult; +import cn.bunny.domain.message.dto.MessageReceivedDto; +import cn.bunny.domain.message.dto.MessageReceivedUpdateDto; +import cn.bunny.domain.message.dto.MessageUserDto; +import cn.bunny.domain.message.entity.Message; +import cn.bunny.domain.message.entity.MessageReceived; +import cn.bunny.domain.message.vo.MessageReceivedWithMessageVo; +import cn.bunny.domain.message.vo.MessageUserVo; +import cn.bunny.core.exception.AuthCustomerException; import cn.bunny.services.mapper.message.MessageReceivedMapper; import cn.bunny.services.service.message.MessageReceivedService; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/service/src/main/java/cn/bunny/services/service/message/impl/MessageServiceImpl.java b/auth-system/src/main/java/cn/bunny/services/service/message/impl/MessageServiceImpl.java similarity index 91% rename from service/src/main/java/cn/bunny/services/service/message/impl/MessageServiceImpl.java rename to auth-system/src/main/java/cn/bunny/services/service/message/impl/MessageServiceImpl.java index ef0911a..f83fc88 100644 --- a/service/src/main/java/cn/bunny/services/service/message/impl/MessageServiceImpl.java +++ b/auth-system/src/main/java/cn/bunny/services/service/message/impl/MessageServiceImpl.java @@ -1,17 +1,17 @@ package cn.bunny.services.service.message.impl; -import cn.bunny.services.context.BaseContext; -import cn.bunny.services.domain.common.enums.ResultCodeEnum; -import cn.bunny.services.domain.common.model.entity.BaseEntity; -import cn.bunny.services.domain.common.model.vo.result.PageResult; -import cn.bunny.services.domain.message.dto.MessageDto; -import cn.bunny.services.domain.message.entity.Message; -import cn.bunny.services.domain.message.entity.MessageReceived; -import cn.bunny.services.domain.message.vo.MessageDetailVo; -import cn.bunny.services.domain.message.vo.MessageReceivedWithMessageVo; -import cn.bunny.services.domain.message.vo.MessageReceivedWithUserVo; -import cn.bunny.services.domain.message.vo.MessageVo; -import cn.bunny.services.exception.AuthCustomerException; +import cn.bunny.core.context.BaseContext; +import cn.bunny.domain.common.enums.ResultCodeEnum; +import cn.bunny.domain.common.model.entity.BaseEntity; +import cn.bunny.domain.common.model.vo.result.PageResult; +import cn.bunny.domain.message.dto.MessageDto; +import cn.bunny.domain.message.entity.Message; +import cn.bunny.domain.message.entity.MessageReceived; +import cn.bunny.domain.message.vo.MessageDetailVo; +import cn.bunny.domain.message.vo.MessageReceivedWithMessageVo; +import cn.bunny.domain.message.vo.MessageReceivedWithUserVo; +import cn.bunny.domain.message.vo.MessageVo; +import cn.bunny.core.exception.AuthCustomerException; import cn.bunny.services.mapper.message.MessageMapper; import cn.bunny.services.mapper.message.MessageReceivedMapper; import cn.bunny.services.mapper.system.UserMapper; diff --git a/service/src/main/java/cn/bunny/services/service/message/impl/MessageTypeServiceImpl.java b/auth-system/src/main/java/cn/bunny/services/service/message/impl/MessageTypeServiceImpl.java similarity index 92% rename from service/src/main/java/cn/bunny/services/service/message/impl/MessageTypeServiceImpl.java rename to auth-system/src/main/java/cn/bunny/services/service/message/impl/MessageTypeServiceImpl.java index 5565f59..95f9ace 100644 --- a/service/src/main/java/cn/bunny/services/service/message/impl/MessageTypeServiceImpl.java +++ b/auth-system/src/main/java/cn/bunny/services/service/message/impl/MessageTypeServiceImpl.java @@ -1,9 +1,9 @@ package cn.bunny.services.service.message.impl; -import cn.bunny.services.domain.common.model.vo.result.PageResult; -import cn.bunny.services.domain.message.dto.MessageTypeDto; -import cn.bunny.services.domain.message.entity.MessageType; -import cn.bunny.services.domain.message.vo.MessageTypeVo; +import cn.bunny.domain.common.model.vo.result.PageResult; +import cn.bunny.domain.message.dto.MessageTypeDto; +import cn.bunny.domain.message.entity.MessageType; +import cn.bunny.domain.message.vo.MessageTypeVo; import cn.bunny.services.mapper.message.MessageTypeMapper; import cn.bunny.services.service.message.MessageTypeService; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/service/src/main/java/cn/bunny/services/service/schedule/SchedulersGroupService.java b/auth-system/src/main/java/cn/bunny/services/service/schedule/SchedulersGroupService.java similarity index 82% rename from service/src/main/java/cn/bunny/services/service/schedule/SchedulersGroupService.java rename to auth-system/src/main/java/cn/bunny/services/service/schedule/SchedulersGroupService.java index 6faf608..e62e581 100644 --- a/service/src/main/java/cn/bunny/services/service/schedule/SchedulersGroupService.java +++ b/auth-system/src/main/java/cn/bunny/services/service/schedule/SchedulersGroupService.java @@ -1,9 +1,9 @@ package cn.bunny.services.service.schedule; -import cn.bunny.services.domain.common.model.vo.result.PageResult; -import cn.bunny.services.domain.schedule.dto.SchedulersGroupDto; -import cn.bunny.services.domain.schedule.entity.SchedulersGroup; -import cn.bunny.services.domain.schedule.vo.SchedulersGroupVo; +import cn.bunny.domain.common.model.vo.result.PageResult; +import cn.bunny.domain.schedule.dto.SchedulersGroupDto; +import cn.bunny.domain.schedule.entity.SchedulersGroup; +import cn.bunny.domain.schedule.vo.SchedulersGroupVo; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/service/src/main/java/cn/bunny/services/service/schedule/SchedulersService.java b/auth-system/src/main/java/cn/bunny/services/service/schedule/SchedulersService.java similarity index 83% rename from service/src/main/java/cn/bunny/services/service/schedule/SchedulersService.java rename to auth-system/src/main/java/cn/bunny/services/service/schedule/SchedulersService.java index 2a0e3c3..723e1df 100644 --- a/service/src/main/java/cn/bunny/services/service/schedule/SchedulersService.java +++ b/auth-system/src/main/java/cn/bunny/services/service/schedule/SchedulersService.java @@ -1,9 +1,9 @@ package cn.bunny.services.service.schedule; -import cn.bunny.services.domain.common.model.vo.result.PageResult; -import cn.bunny.services.domain.schedule.dto.SchedulersDto; -import cn.bunny.services.domain.schedule.entity.Schedulers; -import cn.bunny.services.domain.schedule.vo.SchedulersVo; +import cn.bunny.domain.common.model.vo.result.PageResult; +import cn.bunny.domain.schedule.dto.SchedulersDto; +import cn.bunny.domain.schedule.entity.Schedulers; +import cn.bunny.domain.schedule.vo.SchedulersVo; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/service/src/main/java/cn/bunny/services/service/schedule/impl/SchedulersGroupServiceImpl.java b/auth-system/src/main/java/cn/bunny/services/service/schedule/impl/SchedulersGroupServiceImpl.java similarity index 91% rename from service/src/main/java/cn/bunny/services/service/schedule/impl/SchedulersGroupServiceImpl.java rename to auth-system/src/main/java/cn/bunny/services/service/schedule/impl/SchedulersGroupServiceImpl.java index 84f1ada..50cf487 100644 --- a/service/src/main/java/cn/bunny/services/service/schedule/impl/SchedulersGroupServiceImpl.java +++ b/auth-system/src/main/java/cn/bunny/services/service/schedule/impl/SchedulersGroupServiceImpl.java @@ -1,9 +1,9 @@ package cn.bunny.services.service.schedule.impl; -import cn.bunny.services.domain.common.model.vo.result.PageResult; -import cn.bunny.services.domain.schedule.dto.SchedulersGroupDto; -import cn.bunny.services.domain.schedule.entity.SchedulersGroup; -import cn.bunny.services.domain.schedule.vo.SchedulersGroupVo; +import cn.bunny.domain.common.model.vo.result.PageResult; +import cn.bunny.domain.schedule.dto.SchedulersGroupDto; +import cn.bunny.domain.schedule.entity.SchedulersGroup; +import cn.bunny.domain.schedule.vo.SchedulersGroupVo; import cn.bunny.services.mapper.schedule.SchedulersGroupMapper; import cn.bunny.services.service.schedule.SchedulersGroupService; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/service/src/main/java/cn/bunny/services/service/schedule/impl/SchedulersServiceImpl.java b/auth-system/src/main/java/cn/bunny/services/service/schedule/impl/SchedulersServiceImpl.java similarity index 94% rename from service/src/main/java/cn/bunny/services/service/schedule/impl/SchedulersServiceImpl.java rename to auth-system/src/main/java/cn/bunny/services/service/schedule/impl/SchedulersServiceImpl.java index d37852b..1faeefb 100644 --- a/service/src/main/java/cn/bunny/services/service/schedule/impl/SchedulersServiceImpl.java +++ b/auth-system/src/main/java/cn/bunny/services/service/schedule/impl/SchedulersServiceImpl.java @@ -1,11 +1,11 @@ package cn.bunny.services.service.schedule.impl; -import cn.bunny.services.domain.common.enums.ResultCodeEnum; -import cn.bunny.services.domain.common.model.vo.result.PageResult; -import cn.bunny.services.domain.schedule.dto.SchedulersDto; -import cn.bunny.services.domain.schedule.entity.Schedulers; -import cn.bunny.services.domain.schedule.vo.SchedulersVo; -import cn.bunny.services.exception.AuthCustomerException; +import cn.bunny.domain.common.enums.ResultCodeEnum; +import cn.bunny.domain.common.model.vo.result.PageResult; +import cn.bunny.domain.schedule.dto.SchedulersDto; +import cn.bunny.domain.schedule.entity.Schedulers; +import cn.bunny.domain.schedule.vo.SchedulersVo; +import cn.bunny.core.exception.AuthCustomerException; import cn.bunny.services.mapper.schedule.SchedulersMapper; import cn.bunny.services.service.schedule.SchedulersService; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/service/src/main/java/cn/bunny/services/service/system/DeptService.java b/auth-system/src/main/java/cn/bunny/services/service/system/DeptService.java similarity index 81% rename from service/src/main/java/cn/bunny/services/service/system/DeptService.java rename to auth-system/src/main/java/cn/bunny/services/service/system/DeptService.java index 40a6e0a..6a6ea80 100644 --- a/service/src/main/java/cn/bunny/services/service/system/DeptService.java +++ b/auth-system/src/main/java/cn/bunny/services/service/system/DeptService.java @@ -1,9 +1,9 @@ package cn.bunny.services.service.system; -import cn.bunny.services.domain.common.model.vo.result.PageResult; -import cn.bunny.services.domain.system.dto.DeptDto; -import cn.bunny.services.domain.system.entity.Dept; -import cn.bunny.services.domain.system.vo.DeptVo; +import cn.bunny.domain.common.model.vo.result.PageResult; +import cn.bunny.domain.system.dto.DeptDto; +import cn.bunny.domain.system.entity.Dept; +import cn.bunny.domain.system.vo.DeptVo; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/service/src/main/java/cn/bunny/services/service/system/PermissionService.java b/auth-system/src/main/java/cn/bunny/services/service/system/PermissionService.java similarity index 85% rename from service/src/main/java/cn/bunny/services/service/system/PermissionService.java rename to auth-system/src/main/java/cn/bunny/services/service/system/PermissionService.java index 3e673b1..ca39192 100644 --- a/service/src/main/java/cn/bunny/services/service/system/PermissionService.java +++ b/auth-system/src/main/java/cn/bunny/services/service/system/PermissionService.java @@ -1,10 +1,10 @@ package cn.bunny.services.service.system; -import cn.bunny.services.domain.common.model.vo.result.PageResult; -import cn.bunny.services.domain.system.dto.PermissionDto; -import cn.bunny.services.domain.system.dto.PermissionUpdateBatchByParentIdDto; -import cn.bunny.services.domain.system.entity.Permission; -import cn.bunny.services.domain.system.vo.PermissionVo; +import cn.bunny.domain.common.model.vo.result.PageResult; +import cn.bunny.domain.system.dto.PermissionDto; +import cn.bunny.domain.system.dto.PermissionUpdateBatchByParentIdDto; +import cn.bunny.domain.system.entity.Permission; +import cn.bunny.domain.system.vo.PermissionVo; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import org.springframework.http.ResponseEntity; diff --git a/service/src/main/java/cn/bunny/services/service/system/RolePermissionService.java b/auth-system/src/main/java/cn/bunny/services/service/system/RolePermissionService.java similarity index 82% rename from service/src/main/java/cn/bunny/services/service/system/RolePermissionService.java rename to auth-system/src/main/java/cn/bunny/services/service/system/RolePermissionService.java index c03793e..70c6e0f 100644 --- a/service/src/main/java/cn/bunny/services/service/system/RolePermissionService.java +++ b/auth-system/src/main/java/cn/bunny/services/service/system/RolePermissionService.java @@ -1,7 +1,7 @@ package cn.bunny.services.service.system; -import cn.bunny.services.domain.system.dto.AssignPowersToRoleDto; -import cn.bunny.services.domain.system.entity.RolePermission; +import cn.bunny.domain.system.dto.AssignPowersToRoleDto; +import cn.bunny.domain.system.entity.RolePermission; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; diff --git a/service/src/main/java/cn/bunny/services/service/system/RoleService.java b/auth-system/src/main/java/cn/bunny/services/service/system/RoleService.java similarity index 85% rename from service/src/main/java/cn/bunny/services/service/system/RoleService.java rename to auth-system/src/main/java/cn/bunny/services/service/system/RoleService.java index d7ff8a5..0624457 100644 --- a/service/src/main/java/cn/bunny/services/service/system/RoleService.java +++ b/auth-system/src/main/java/cn/bunny/services/service/system/RoleService.java @@ -1,9 +1,9 @@ package cn.bunny.services.service.system; -import cn.bunny.services.domain.common.model.vo.result.PageResult; -import cn.bunny.services.domain.system.dto.RoleDto; -import cn.bunny.services.domain.system.entity.Role; -import cn.bunny.services.domain.system.vo.RoleVo; +import cn.bunny.domain.common.model.vo.result.PageResult; +import cn.bunny.domain.system.dto.RoleDto; +import cn.bunny.domain.system.entity.Role; +import cn.bunny.domain.system.vo.RoleVo; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import org.springframework.http.ResponseEntity; diff --git a/service/src/main/java/cn/bunny/services/service/system/RouterRoleService.java b/auth-system/src/main/java/cn/bunny/services/service/system/RouterRoleService.java similarity index 91% rename from service/src/main/java/cn/bunny/services/service/system/RouterRoleService.java rename to auth-system/src/main/java/cn/bunny/services/service/system/RouterRoleService.java index 2528712..e453362 100644 --- a/service/src/main/java/cn/bunny/services/service/system/RouterRoleService.java +++ b/auth-system/src/main/java/cn/bunny/services/service/system/RouterRoleService.java @@ -1,6 +1,6 @@ package cn.bunny.services.service.system; -import cn.bunny.services.domain.system.entity.RouterRole; +import cn.bunny.domain.system.entity.RouterRole; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; diff --git a/service/src/main/java/cn/bunny/services/service/system/RouterService.java b/auth-system/src/main/java/cn/bunny/services/service/system/RouterService.java similarity index 78% rename from service/src/main/java/cn/bunny/services/service/system/RouterService.java rename to auth-system/src/main/java/cn/bunny/services/service/system/RouterService.java index 2a88d29..fc21235 100644 --- a/service/src/main/java/cn/bunny/services/service/system/RouterService.java +++ b/auth-system/src/main/java/cn/bunny/services/service/system/RouterService.java @@ -1,9 +1,9 @@ package cn.bunny.services.service.system; -import cn.bunny.services.domain.system.dto.RouterDto; -import cn.bunny.services.domain.system.entity.router.Router; -import cn.bunny.services.domain.system.vo.router.RouterManageVo; -import cn.bunny.services.domain.system.vo.router.WebUserRouterVo; +import cn.bunny.domain.system.dto.RouterDto; +import cn.bunny.domain.system.entity.router.Router; +import cn.bunny.domain.system.vo.router.RouterManageVo; +import cn.bunny.domain.system.vo.router.WebUserRouterVo; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; diff --git a/service/src/main/java/cn/bunny/services/service/system/UserDeptService.java b/auth-system/src/main/java/cn/bunny/services/service/system/UserDeptService.java similarity index 82% rename from service/src/main/java/cn/bunny/services/service/system/UserDeptService.java rename to auth-system/src/main/java/cn/bunny/services/service/system/UserDeptService.java index 2311083..dc779a5 100644 --- a/service/src/main/java/cn/bunny/services/service/system/UserDeptService.java +++ b/auth-system/src/main/java/cn/bunny/services/service/system/UserDeptService.java @@ -1,6 +1,6 @@ package cn.bunny.services.service.system; -import cn.bunny.services.domain.system.entity.UserDept; +import cn.bunny.domain.system.entity.UserDept; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/service/src/main/java/cn/bunny/services/service/system/UserLoginService.java b/auth-system/src/main/java/cn/bunny/services/service/system/UserLoginService.java similarity index 74% rename from service/src/main/java/cn/bunny/services/service/system/UserLoginService.java rename to auth-system/src/main/java/cn/bunny/services/service/system/UserLoginService.java index 5553b9f..7769a53 100644 --- a/service/src/main/java/cn/bunny/services/service/system/UserLoginService.java +++ b/auth-system/src/main/java/cn/bunny/services/service/system/UserLoginService.java @@ -1,11 +1,11 @@ package cn.bunny.services.service.system; -import cn.bunny.services.domain.common.model.vo.LoginVo; -import cn.bunny.services.domain.system.dto.user.AdminUserUpdateByLocalUserDto; -import cn.bunny.services.domain.system.dto.user.LoginDto; -import cn.bunny.services.domain.system.dto.user.RefreshTokenDto; -import cn.bunny.services.domain.system.entity.AdminUser; -import cn.bunny.services.domain.system.vo.user.RefreshTokenVo; +import cn.bunny.domain.common.model.vo.LoginVo; +import cn.bunny.domain.system.dto.user.AdminUserUpdateByLocalUserDto; +import cn.bunny.domain.system.dto.user.LoginDto; +import cn.bunny.domain.system.dto.user.RefreshTokenDto; +import cn.bunny.domain.system.entity.AdminUser; +import cn.bunny.domain.system.vo.user.RefreshTokenVo; import com.baomidou.mybatisplus.extension.service.IService; import org.jetbrains.annotations.NotNull; diff --git a/service/src/main/java/cn/bunny/services/service/system/UserRoleService.java b/auth-system/src/main/java/cn/bunny/services/service/system/UserRoleService.java similarity index 82% rename from service/src/main/java/cn/bunny/services/service/system/UserRoleService.java rename to auth-system/src/main/java/cn/bunny/services/service/system/UserRoleService.java index 7cf77ee..16a7f10 100644 --- a/service/src/main/java/cn/bunny/services/service/system/UserRoleService.java +++ b/auth-system/src/main/java/cn/bunny/services/service/system/UserRoleService.java @@ -1,7 +1,7 @@ package cn.bunny.services.service.system; -import cn.bunny.services.domain.system.dto.user.AssignRolesToUsersDto; -import cn.bunny.services.domain.system.entity.UserRole; +import cn.bunny.domain.system.dto.user.AssignRolesToUsersDto; +import cn.bunny.domain.system.entity.UserRole; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; diff --git a/service/src/main/java/cn/bunny/services/service/system/UserService.java b/auth-system/src/main/java/cn/bunny/services/service/system/UserService.java similarity index 78% rename from service/src/main/java/cn/bunny/services/service/system/UserService.java rename to auth-system/src/main/java/cn/bunny/services/service/system/UserService.java index e8d73cf..62f6629 100644 --- a/service/src/main/java/cn/bunny/services/service/system/UserService.java +++ b/auth-system/src/main/java/cn/bunny/services/service/system/UserService.java @@ -1,12 +1,12 @@ package cn.bunny.services.service.system; -import cn.bunny.services.domain.common.model.vo.result.PageResult; -import cn.bunny.services.domain.system.dto.user.AdminUserAddDto; -import cn.bunny.services.domain.system.dto.user.AdminUserDto; -import cn.bunny.services.domain.system.dto.user.AdminUserUpdateDto; -import cn.bunny.services.domain.system.entity.AdminUser; -import cn.bunny.services.domain.system.vo.user.AdminUserVo; -import cn.bunny.services.domain.system.vo.user.UserVo; +import cn.bunny.domain.common.model.vo.result.PageResult; +import cn.bunny.domain.system.dto.user.AdminUserAddDto; +import cn.bunny.domain.system.dto.user.AdminUserDto; +import cn.bunny.domain.system.dto.user.AdminUserUpdateDto; +import cn.bunny.domain.system.entity.AdminUser; +import cn.bunny.domain.system.vo.user.AdminUserVo; +import cn.bunny.domain.system.vo.user.UserVo; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/service/src/main/java/cn/bunny/services/service/system/impl/DeptServiceImpl.java b/auth-system/src/main/java/cn/bunny/services/service/system/impl/DeptServiceImpl.java similarity index 91% rename from service/src/main/java/cn/bunny/services/service/system/impl/DeptServiceImpl.java rename to auth-system/src/main/java/cn/bunny/services/service/system/impl/DeptServiceImpl.java index 6007c73..bdcc65a 100644 --- a/service/src/main/java/cn/bunny/services/service/system/impl/DeptServiceImpl.java +++ b/auth-system/src/main/java/cn/bunny/services/service/system/impl/DeptServiceImpl.java @@ -1,11 +1,11 @@ package cn.bunny.services.service.system.impl; -import cn.bunny.services.domain.common.enums.ResultCodeEnum; -import cn.bunny.services.domain.common.model.vo.result.PageResult; -import cn.bunny.services.domain.system.dto.DeptDto; -import cn.bunny.services.domain.system.entity.Dept; -import cn.bunny.services.domain.system.vo.DeptVo; -import cn.bunny.services.exception.AuthCustomerException; +import cn.bunny.domain.common.enums.ResultCodeEnum; +import cn.bunny.domain.common.model.vo.result.PageResult; +import cn.bunny.domain.system.dto.DeptDto; +import cn.bunny.domain.system.entity.Dept; +import cn.bunny.domain.system.vo.DeptVo; +import cn.bunny.core.exception.AuthCustomerException; import cn.bunny.services.mapper.system.DeptMapper; import cn.bunny.services.mapper.system.UserDeptMapper; import cn.bunny.services.service.system.DeptService; diff --git a/service/src/main/java/cn/bunny/services/service/system/impl/PermissionServiceImpl.java b/auth-system/src/main/java/cn/bunny/services/service/system/impl/PermissionServiceImpl.java similarity index 95% rename from service/src/main/java/cn/bunny/services/service/system/impl/PermissionServiceImpl.java rename to auth-system/src/main/java/cn/bunny/services/service/system/impl/PermissionServiceImpl.java index a779d58..212cb9d 100644 --- a/service/src/main/java/cn/bunny/services/service/system/impl/PermissionServiceImpl.java +++ b/auth-system/src/main/java/cn/bunny/services/service/system/impl/PermissionServiceImpl.java @@ -5,18 +5,18 @@ import cn.bunny.services.core.event.listener.excel.PermissionExcelListener; import cn.bunny.services.core.strategy.export.ExcelZipExportStrategy; import cn.bunny.services.core.strategy.export.JsonZipExportStrategy; import cn.bunny.services.core.template.PermissionTreeProcessor; -import cn.bunny.services.domain.common.constant.FileType; -import cn.bunny.services.domain.common.enums.ResultCodeEnum; -import cn.bunny.services.domain.common.model.dto.excel.PermissionExcel; -import cn.bunny.services.domain.common.model.vo.result.PageResult; -import cn.bunny.services.domain.system.dto.PermissionDto; -import cn.bunny.services.domain.system.dto.PermissionUpdateBatchByParentIdDto; -import cn.bunny.services.domain.system.entity.Permission; -import cn.bunny.services.domain.system.vo.PermissionVo; -import cn.bunny.services.exception.AuthCustomerException; +import cn.bunny.domain.common.constant.FileType; +import cn.bunny.domain.common.enums.ResultCodeEnum; +import cn.bunny.domain.common.model.dto.excel.PermissionExcel; +import cn.bunny.domain.common.model.vo.result.PageResult; +import cn.bunny.domain.system.dto.PermissionDto; +import cn.bunny.domain.system.dto.PermissionUpdateBatchByParentIdDto; +import cn.bunny.domain.system.entity.Permission; +import cn.bunny.domain.system.vo.PermissionVo; +import cn.bunny.core.exception.AuthCustomerException; import cn.bunny.services.mapper.system.PermissionMapper; import cn.bunny.services.service.system.PermissionService; -import cn.bunny.services.utils.FileUtil; +import cn.bunny.core.utils.FileUtil; import com.alibaba.excel.EasyExcel; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.TypeReference; diff --git a/service/src/main/java/cn/bunny/services/service/system/impl/RolePermissionServiceImpl.java b/auth-system/src/main/java/cn/bunny/services/service/system/impl/RolePermissionServiceImpl.java similarity index 92% rename from service/src/main/java/cn/bunny/services/service/system/impl/RolePermissionServiceImpl.java rename to auth-system/src/main/java/cn/bunny/services/service/system/impl/RolePermissionServiceImpl.java index e4bbca3..6bc545f 100644 --- a/service/src/main/java/cn/bunny/services/service/system/impl/RolePermissionServiceImpl.java +++ b/auth-system/src/main/java/cn/bunny/services/service/system/impl/RolePermissionServiceImpl.java @@ -1,10 +1,10 @@ package cn.bunny.services.service.system.impl; import cn.bunny.services.core.event.event.UpdateUserinfoByRoleIdsEvent; -import cn.bunny.services.domain.system.dto.AssignPowersToRoleDto; -import cn.bunny.services.domain.system.entity.AdminUser; -import cn.bunny.services.domain.system.entity.RolePermission; -import cn.bunny.services.domain.system.entity.UserRole; +import cn.bunny.domain.system.dto.AssignPowersToRoleDto; +import cn.bunny.domain.system.entity.AdminUser; +import cn.bunny.domain.system.entity.RolePermission; +import cn.bunny.domain.system.entity.UserRole; import cn.bunny.services.mapper.system.RolePermissionMapper; import cn.bunny.services.mapper.system.UserMapper; import cn.bunny.services.mapper.system.UserRoleMapper; diff --git a/service/src/main/java/cn/bunny/services/service/system/impl/RoleServiceImpl.java b/auth-system/src/main/java/cn/bunny/services/service/system/impl/RoleServiceImpl.java similarity index 94% rename from service/src/main/java/cn/bunny/services/service/system/impl/RoleServiceImpl.java rename to auth-system/src/main/java/cn/bunny/services/service/system/impl/RoleServiceImpl.java index 56b9b1e..93cc0ed 100644 --- a/service/src/main/java/cn/bunny/services/service/system/impl/RoleServiceImpl.java +++ b/auth-system/src/main/java/cn/bunny/services/service/system/impl/RoleServiceImpl.java @@ -2,16 +2,16 @@ package cn.bunny.services.service.system.impl; import cn.bunny.services.core.event.event.UpdateUserinfoByRoleIdsEvent; import cn.bunny.services.core.event.listener.excel.RoleExcelListener; -import cn.bunny.services.domain.common.enums.ResultCodeEnum; -import cn.bunny.services.domain.common.model.dto.excel.RoleExcel; -import cn.bunny.services.domain.common.model.vo.result.PageResult; -import cn.bunny.services.domain.system.dto.RoleDto; -import cn.bunny.services.domain.system.entity.Role; -import cn.bunny.services.domain.system.vo.RoleVo; -import cn.bunny.services.exception.AuthCustomerException; +import cn.bunny.domain.common.enums.ResultCodeEnum; +import cn.bunny.domain.common.model.dto.excel.RoleExcel; +import cn.bunny.domain.common.model.vo.result.PageResult; +import cn.bunny.domain.system.dto.RoleDto; +import cn.bunny.domain.system.entity.Role; +import cn.bunny.domain.system.vo.RoleVo; +import cn.bunny.core.exception.AuthCustomerException; import cn.bunny.services.mapper.system.RoleMapper; import cn.bunny.services.service.system.RoleService; -import cn.bunny.services.utils.FileUtil; +import cn.bunny.core.utils.FileUtil; import com.alibaba.excel.EasyExcel; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; diff --git a/service/src/main/java/cn/bunny/services/service/system/impl/RouterRoleServiceImpl.java b/auth-system/src/main/java/cn/bunny/services/service/system/impl/RouterRoleServiceImpl.java similarity index 88% rename from service/src/main/java/cn/bunny/services/service/system/impl/RouterRoleServiceImpl.java rename to auth-system/src/main/java/cn/bunny/services/service/system/impl/RouterRoleServiceImpl.java index 31deb66..8fa04e7 100644 --- a/service/src/main/java/cn/bunny/services/service/system/impl/RouterRoleServiceImpl.java +++ b/auth-system/src/main/java/cn/bunny/services/service/system/impl/RouterRoleServiceImpl.java @@ -1,8 +1,8 @@ package cn.bunny.services.service.system.impl; -import cn.bunny.services.domain.system.entity.RouterRole; -import cn.bunny.services.domain.common.enums.ResultCodeEnum; -import cn.bunny.services.exception.AuthCustomerException; +import cn.bunny.domain.system.entity.RouterRole; +import cn.bunny.domain.common.enums.ResultCodeEnum; +import cn.bunny.core.exception.AuthCustomerException; import cn.bunny.services.mapper.system.RouterRoleMapper; import cn.bunny.services.service.system.RouterRoleService; import com.baomidou.mybatisplus.core.toolkit.Wrappers; diff --git a/service/src/main/java/cn/bunny/services/service/system/impl/RouterServiceImpl.java b/auth-system/src/main/java/cn/bunny/services/service/system/impl/RouterServiceImpl.java similarity index 90% rename from service/src/main/java/cn/bunny/services/service/system/impl/RouterServiceImpl.java rename to auth-system/src/main/java/cn/bunny/services/service/system/impl/RouterServiceImpl.java index cfe38f2..9099060 100644 --- a/service/src/main/java/cn/bunny/services/service/system/impl/RouterServiceImpl.java +++ b/auth-system/src/main/java/cn/bunny/services/service/system/impl/RouterServiceImpl.java @@ -1,17 +1,17 @@ package cn.bunny.services.service.system.impl; import cn.bunny.services.core.utils.RouterServiceHelper; -import cn.bunny.services.domain.common.enums.ResultCodeEnum; -import cn.bunny.services.domain.system.dto.RouterDto; -import cn.bunny.services.domain.system.entity.router.Router; -import cn.bunny.services.domain.system.entity.router.RouterMeta; -import cn.bunny.services.domain.system.entity.router.RouterMetaTransition; -import cn.bunny.services.domain.system.views.ViewRolePermission; -import cn.bunny.services.domain.system.views.ViewRouterRole; -import cn.bunny.services.domain.system.vo.router.RouterManageVo; -import cn.bunny.services.domain.system.vo.router.RouterVo; -import cn.bunny.services.domain.system.vo.router.WebUserRouterVo; -import cn.bunny.services.exception.AuthCustomerException; +import cn.bunny.domain.common.enums.ResultCodeEnum; +import cn.bunny.domain.system.dto.RouterDto; +import cn.bunny.domain.system.entity.router.Router; +import cn.bunny.domain.system.entity.router.RouterMeta; +import cn.bunny.domain.system.entity.router.RouterMetaTransition; +import cn.bunny.domain.system.views.ViewRolePermission; +import cn.bunny.domain.system.views.ViewRouterRole; +import cn.bunny.domain.system.vo.router.RouterManageVo; +import cn.bunny.domain.system.vo.router.RouterVo; +import cn.bunny.domain.system.vo.router.WebUserRouterVo; +import cn.bunny.core.exception.AuthCustomerException; import cn.bunny.services.mapper.system.RolePermissionMapper; import cn.bunny.services.mapper.system.RouterMapper; import cn.bunny.services.mapper.system.RouterRoleMapper; diff --git a/service/src/main/java/cn/bunny/services/service/system/impl/UserDeptServiceImpl.java b/auth-system/src/main/java/cn/bunny/services/service/system/impl/UserDeptServiceImpl.java similarity index 89% rename from service/src/main/java/cn/bunny/services/service/system/impl/UserDeptServiceImpl.java rename to auth-system/src/main/java/cn/bunny/services/service/system/impl/UserDeptServiceImpl.java index 7536319..1513318 100644 --- a/service/src/main/java/cn/bunny/services/service/system/impl/UserDeptServiceImpl.java +++ b/auth-system/src/main/java/cn/bunny/services/service/system/impl/UserDeptServiceImpl.java @@ -1,6 +1,6 @@ package cn.bunny.services.service.system.impl; -import cn.bunny.services.domain.system.entity.UserDept; +import cn.bunny.domain.system.entity.UserDept; import cn.bunny.services.mapper.system.UserDeptMapper; import cn.bunny.services.service.system.UserDeptService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/service/src/main/java/cn/bunny/services/service/system/impl/UserLoginServiceImpl.java b/auth-system/src/main/java/cn/bunny/services/service/system/impl/UserLoginServiceImpl.java similarity index 92% rename from service/src/main/java/cn/bunny/services/service/system/impl/UserLoginServiceImpl.java rename to auth-system/src/main/java/cn/bunny/services/service/system/impl/UserLoginServiceImpl.java index 028c89c..124ced4 100644 --- a/service/src/main/java/cn/bunny/services/service/system/impl/UserLoginServiceImpl.java +++ b/auth-system/src/main/java/cn/bunny/services/service/system/impl/UserLoginServiceImpl.java @@ -1,6 +1,6 @@ package cn.bunny.services.service.system.impl; -import cn.bunny.services.context.BaseContext; +import cn.bunny.core.context.BaseContext; import cn.bunny.services.core.cache.EmailCacheService; import cn.bunny.services.core.cache.UserLoginVoBuilderCacheService; import cn.bunny.services.core.event.event.ClearAllUserCacheEvent; @@ -9,26 +9,26 @@ import cn.bunny.services.core.strategy.login.EmailLoginStrategy; import cn.bunny.services.core.strategy.login.LoginContext; import cn.bunny.services.core.strategy.login.LoginStrategy; import cn.bunny.services.core.template.email.ConcreteSenderEmailTemplate; -import cn.bunny.services.domain.common.constant.RedisUserConstant; -import cn.bunny.services.domain.common.constant.UserConstant; -import cn.bunny.services.domain.common.enums.EmailTemplateEnums; -import cn.bunny.services.domain.common.enums.LoginEnums; -import cn.bunny.services.domain.common.enums.ResultCodeEnum; -import cn.bunny.services.domain.common.model.vo.LoginVo; -import cn.bunny.services.domain.configuration.entity.EmailTemplate; -import cn.bunny.services.domain.log.entity.UserLoginLog; -import cn.bunny.services.domain.system.dto.user.AdminUserUpdateByLocalUserDto; -import cn.bunny.services.domain.system.dto.user.LoginDto; -import cn.bunny.services.domain.system.dto.user.RefreshTokenDto; -import cn.bunny.services.domain.system.entity.AdminUser; -import cn.bunny.services.domain.system.vo.user.RefreshTokenVo; -import cn.bunny.services.exception.AuthCustomerException; +import cn.bunny.domain.common.constant.RedisUserConstant; +import cn.bunny.domain.common.constant.UserConstant; +import cn.bunny.domain.common.enums.EmailTemplateEnums; +import cn.bunny.domain.common.enums.LoginEnums; +import cn.bunny.domain.common.enums.ResultCodeEnum; +import cn.bunny.domain.common.model.vo.LoginVo; +import cn.bunny.domain.configuration.entity.EmailTemplate; +import cn.bunny.domain.log.entity.UserLoginLog; +import cn.bunny.domain.system.dto.user.AdminUserUpdateByLocalUserDto; +import cn.bunny.domain.system.dto.user.LoginDto; +import cn.bunny.domain.system.dto.user.RefreshTokenDto; +import cn.bunny.domain.system.entity.AdminUser; +import cn.bunny.domain.system.vo.user.RefreshTokenVo; +import cn.bunny.core.exception.AuthCustomerException; import cn.bunny.services.mapper.configuration.EmailTemplateMapper; import cn.bunny.services.mapper.log.UserLoginLogMapper; import cn.bunny.services.mapper.system.UserMapper; import cn.bunny.services.service.system.UserLoginService; -import cn.bunny.services.utils.IpUtil; -import cn.bunny.services.utils.JwtTokenUtil; +import cn.bunny.core.utils.IpUtil; +import cn.bunny.core.utils.JwtTokenUtil; import cn.hutool.captcha.CaptchaUtil; import cn.hutool.captcha.CircleCaptcha; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; diff --git a/service/src/main/java/cn/bunny/services/service/system/impl/UserRoleServiceImpl.java b/auth-system/src/main/java/cn/bunny/services/service/system/impl/UserRoleServiceImpl.java similarity index 89% rename from service/src/main/java/cn/bunny/services/service/system/impl/UserRoleServiceImpl.java rename to auth-system/src/main/java/cn/bunny/services/service/system/impl/UserRoleServiceImpl.java index c8229e0..fb67e88 100644 --- a/service/src/main/java/cn/bunny/services/service/system/impl/UserRoleServiceImpl.java +++ b/auth-system/src/main/java/cn/bunny/services/service/system/impl/UserRoleServiceImpl.java @@ -1,11 +1,11 @@ package cn.bunny.services.service.system.impl; import cn.bunny.services.core.event.event.UpdateUserinfoByUserIdsEvent; -import cn.bunny.services.domain.common.enums.ResultCodeEnum; -import cn.bunny.services.domain.system.dto.user.AssignRolesToUsersDto; -import cn.bunny.services.domain.system.entity.AdminUser; -import cn.bunny.services.domain.system.entity.UserRole; -import cn.bunny.services.exception.AuthCustomerException; +import cn.bunny.domain.common.enums.ResultCodeEnum; +import cn.bunny.domain.system.dto.user.AssignRolesToUsersDto; +import cn.bunny.domain.system.entity.AdminUser; +import cn.bunny.domain.system.entity.UserRole; +import cn.bunny.core.exception.AuthCustomerException; import cn.bunny.services.mapper.system.UserMapper; import cn.bunny.services.mapper.system.UserRoleMapper; import cn.bunny.services.service.system.UserRoleService; diff --git a/service/src/main/java/cn/bunny/services/service/system/impl/UserServiceImpl.java b/auth-system/src/main/java/cn/bunny/services/service/system/impl/UserServiceImpl.java similarity index 91% rename from service/src/main/java/cn/bunny/services/service/system/impl/UserServiceImpl.java rename to auth-system/src/main/java/cn/bunny/services/service/system/impl/UserServiceImpl.java index d3a7fa1..f6c64fb 100644 --- a/service/src/main/java/cn/bunny/services/service/system/impl/UserServiceImpl.java +++ b/auth-system/src/main/java/cn/bunny/services/service/system/impl/UserServiceImpl.java @@ -3,24 +3,24 @@ package cn.bunny.services.service.system.impl; import cn.bunny.services.core.cache.RedisService; import cn.bunny.services.core.event.event.ClearAllUserCacheEvent; import cn.bunny.services.core.event.event.UpdateUserinfoByUserIdsEvent; -import cn.bunny.services.domain.common.constant.FileStorageConstant; -import cn.bunny.services.domain.common.constant.UserConstant; -import cn.bunny.services.domain.common.enums.ResultCodeEnum; -import cn.bunny.services.domain.common.model.vo.LoginVo; -import cn.bunny.services.domain.common.model.vo.result.PageResult; -import cn.bunny.services.domain.files.dto.FileUploadDto; -import cn.bunny.services.domain.files.vo.FileInfoVo; -import cn.bunny.services.domain.log.entity.UserLoginLog; -import cn.bunny.services.domain.system.dto.user.AdminUserAddDto; -import cn.bunny.services.domain.system.dto.user.AdminUserDto; -import cn.bunny.services.domain.system.dto.user.AdminUserUpdateDto; -import cn.bunny.services.domain.system.entity.AdminUser; -import cn.bunny.services.domain.system.entity.Role; -import cn.bunny.services.domain.system.entity.UserDept; -import cn.bunny.services.domain.system.views.ViewUserDept; -import cn.bunny.services.domain.system.vo.user.AdminUserVo; -import cn.bunny.services.domain.system.vo.user.UserVo; -import cn.bunny.services.exception.AuthCustomerException; +import cn.bunny.domain.common.constant.FileStorageConstant; +import cn.bunny.domain.common.constant.UserConstant; +import cn.bunny.domain.common.enums.ResultCodeEnum; +import cn.bunny.domain.common.model.vo.LoginVo; +import cn.bunny.domain.common.model.vo.result.PageResult; +import cn.bunny.domain.files.dto.FileUploadDto; +import cn.bunny.domain.files.vo.FileInfoVo; +import cn.bunny.domain.log.entity.UserLoginLog; +import cn.bunny.domain.system.dto.user.AdminUserAddDto; +import cn.bunny.domain.system.dto.user.AdminUserDto; +import cn.bunny.domain.system.dto.user.AdminUserUpdateDto; +import cn.bunny.domain.system.entity.AdminUser; +import cn.bunny.domain.system.entity.Role; +import cn.bunny.domain.system.entity.UserDept; +import cn.bunny.domain.system.views.ViewUserDept; +import cn.bunny.domain.system.vo.user.AdminUserVo; +import cn.bunny.domain.system.vo.user.UserVo; +import cn.bunny.core.exception.AuthCustomerException; import cn.bunny.services.mapper.log.UserLoginLogMapper; import cn.bunny.services.mapper.system.RoleMapper; import cn.bunny.services.mapper.system.UserDeptMapper; diff --git a/auth-api/src/main/resources/application-dev.yml b/auth-system/src/main/resources/application-dev.yml similarity index 100% rename from auth-api/src/main/resources/application-dev.yml rename to auth-system/src/main/resources/application-dev.yml diff --git a/auth-api/src/main/resources/application-test.yml b/auth-system/src/main/resources/application-test.yml similarity index 100% rename from auth-api/src/main/resources/application-test.yml rename to auth-system/src/main/resources/application-test.yml diff --git a/auth-api/src/main/resources/application.yml b/auth-system/src/main/resources/application.yml similarity index 100% rename from auth-api/src/main/resources/application.yml rename to auth-system/src/main/resources/application.yml diff --git a/auth-api/src/main/resources/banner.txt b/auth-system/src/main/resources/banner.txt similarity index 100% rename from auth-api/src/main/resources/banner.txt rename to auth-system/src/main/resources/banner.txt diff --git a/auth-api/src/main/resources/logback.xml b/auth-system/src/main/resources/logback.xml similarity index 100% rename from auth-api/src/main/resources/logback.xml rename to auth-system/src/main/resources/logback.xml diff --git a/dao/src/main/resources/mapper/configuration/EmailTemplateMapper.xml b/auth-system/src/main/resources/mapper/configuration/EmailTemplateMapper.xml similarity index 91% rename from dao/src/main/resources/mapper/configuration/EmailTemplateMapper.xml rename to auth-system/src/main/resources/mapper/configuration/EmailTemplateMapper.xml index 7663482..d68daed 100644 --- a/dao/src/main/resources/mapper/configuration/EmailTemplateMapper.xml +++ b/auth-system/src/main/resources/mapper/configuration/EmailTemplateMapper.xml @@ -3,7 +3,7 @@ - + @@ -25,7 +25,7 @@ - select template.*, create_user.username as create_username, diff --git a/dao/src/main/resources/mapper/configuration/EmailUsersMapper.xml b/auth-system/src/main/resources/mapper/configuration/EmailUsersMapper.xml similarity index 92% rename from dao/src/main/resources/mapper/configuration/EmailUsersMapper.xml rename to auth-system/src/main/resources/mapper/configuration/EmailUsersMapper.xml index fe03187..6214d5e 100644 --- a/dao/src/main/resources/mapper/configuration/EmailUsersMapper.xml +++ b/auth-system/src/main/resources/mapper/configuration/EmailUsersMapper.xml @@ -3,7 +3,7 @@ - + @@ -26,7 +26,7 @@ - select email_user.*, create_user.username as create_username, diff --git a/dao/src/main/resources/mapper/configuration/I18nMapper.xml b/auth-system/src/main/resources/mapper/configuration/I18nMapper.xml similarity index 90% rename from dao/src/main/resources/mapper/configuration/I18nMapper.xml rename to auth-system/src/main/resources/mapper/configuration/I18nMapper.xml index d8eae46..a06137e 100644 --- a/dao/src/main/resources/mapper/configuration/I18nMapper.xml +++ b/auth-system/src/main/resources/mapper/configuration/I18nMapper.xml @@ -3,7 +3,7 @@ - + @@ -21,7 +21,7 @@ - select i18n.*, create_user.username as create_username, diff --git a/dao/src/main/resources/mapper/configuration/I18nTypeMapper.xml b/auth-system/src/main/resources/mapper/configuration/I18nTypeMapper.xml similarity index 89% rename from dao/src/main/resources/mapper/configuration/I18nTypeMapper.xml rename to auth-system/src/main/resources/mapper/configuration/I18nTypeMapper.xml index 49afb90..6cd9fe0 100644 --- a/dao/src/main/resources/mapper/configuration/I18nTypeMapper.xml +++ b/auth-system/src/main/resources/mapper/configuration/I18nTypeMapper.xml @@ -3,7 +3,7 @@ - + @@ -21,7 +21,7 @@ - select i18n_type.*, create_user.username as createUsername, diff --git a/dao/src/main/resources/mapper/configuration/MenuIconMapper.xml b/auth-system/src/main/resources/mapper/configuration/MenuIconMapper.xml similarity index 89% rename from dao/src/main/resources/mapper/configuration/MenuIconMapper.xml rename to auth-system/src/main/resources/mapper/configuration/MenuIconMapper.xml index 5fa9b64..ef6fdd0 100644 --- a/dao/src/main/resources/mapper/configuration/MenuIconMapper.xml +++ b/auth-system/src/main/resources/mapper/configuration/MenuIconMapper.xml @@ -3,7 +3,7 @@ - + @@ -20,7 +20,7 @@ - select icon.*, create_user.username as create_username, diff --git a/dao/src/main/resources/mapper/file/FilesMapper.xml b/auth-system/src/main/resources/mapper/file/FilesMapper.xml similarity index 95% rename from dao/src/main/resources/mapper/file/FilesMapper.xml rename to auth-system/src/main/resources/mapper/file/FilesMapper.xml index 8a8baed..72d1542 100644 --- a/dao/src/main/resources/mapper/file/FilesMapper.xml +++ b/auth-system/src/main/resources/mapper/file/FilesMapper.xml @@ -3,7 +3,7 @@ - + @@ -42,7 +42,7 @@ - select files.*, create_user.username as create_username, diff --git a/dao/src/main/resources/mapper/file/FilesPardetailMapper.xml b/auth-system/src/main/resources/mapper/file/FilesPardetailMapper.xml similarity index 94% rename from dao/src/main/resources/mapper/file/FilesPardetailMapper.xml rename to auth-system/src/main/resources/mapper/file/FilesPardetailMapper.xml index 3f7c3c1..d354fbd 100644 --- a/dao/src/main/resources/mapper/file/FilesPardetailMapper.xml +++ b/auth-system/src/main/resources/mapper/file/FilesPardetailMapper.xml @@ -3,7 +3,7 @@ - + @@ -19,7 +19,7 @@ - select base.*, create_user.username as create_username, diff --git a/dao/src/main/resources/mapper/log/ScheduleExecuteLogMapper.xml b/auth-system/src/main/resources/mapper/log/ScheduleExecuteLogMapper.xml similarity index 92% rename from dao/src/main/resources/mapper/log/ScheduleExecuteLogMapper.xml rename to auth-system/src/main/resources/mapper/log/ScheduleExecuteLogMapper.xml index 2b12d1c..c0a7282 100644 --- a/dao/src/main/resources/mapper/log/ScheduleExecuteLogMapper.xml +++ b/auth-system/src/main/resources/mapper/log/ScheduleExecuteLogMapper.xml @@ -3,7 +3,7 @@ - + @@ -25,7 +25,7 @@ - select log.*, create_user.username as create_username, diff --git a/dao/src/main/resources/mapper/log/UserLoginLogMapper.xml b/auth-system/src/main/resources/mapper/log/UserLoginLogMapper.xml similarity index 92% rename from dao/src/main/resources/mapper/log/UserLoginLogMapper.xml rename to auth-system/src/main/resources/mapper/log/UserLoginLogMapper.xml index 7229f18..98399d6 100644 --- a/dao/src/main/resources/mapper/log/UserLoginLogMapper.xml +++ b/auth-system/src/main/resources/mapper/log/UserLoginLogMapper.xml @@ -3,7 +3,7 @@ - + @@ -26,7 +26,7 @@ - select user_login.*, create_user.username as create_username, @@ -55,7 +55,7 @@ - select from log_user_login where user_id = #{id} diff --git a/dao/src/main/resources/mapper/message/MessageMapper.xml b/auth-system/src/main/resources/mapper/message/MessageMapper.xml similarity index 92% rename from dao/src/main/resources/mapper/message/MessageMapper.xml rename to auth-system/src/main/resources/mapper/message/MessageMapper.xml index bc8c755..0e59363 100644 --- a/dao/src/main/resources/mapper/message/MessageMapper.xml +++ b/auth-system/src/main/resources/mapper/message/MessageMapper.xml @@ -3,7 +3,7 @@ - + @@ -28,7 +28,7 @@ - SELECT message.id, message.create_time, @@ -83,7 +83,7 @@ - SELECT message.*, send_user.nickname AS send_nickname FROM sys_message message @@ -95,7 +95,7 @@ + resultType="cn.bunny.domain.message.vo.MessageReceivedWithMessageVo"> SELECT message_received.status AS status, message_received.received_user_id AS received_user_id, @@ -86,7 +86,7 @@ - SELECT message.id, message.title, diff --git a/dao/src/main/resources/mapper/message/MessageTypeMapper.xml b/auth-system/src/main/resources/mapper/message/MessageTypeMapper.xml similarity index 91% rename from dao/src/main/resources/mapper/message/MessageTypeMapper.xml rename to auth-system/src/main/resources/mapper/message/MessageTypeMapper.xml index b233753..713e066 100644 --- a/dao/src/main/resources/mapper/message/MessageTypeMapper.xml +++ b/auth-system/src/main/resources/mapper/message/MessageTypeMapper.xml @@ -3,7 +3,7 @@ - + @@ -22,7 +22,7 @@ - select message_type.*, create_user.username as create_username, diff --git a/dao/src/main/resources/mapper/schedule/SchedulersGroupMapper.xml b/auth-system/src/main/resources/mapper/schedule/SchedulersGroupMapper.xml similarity index 89% rename from dao/src/main/resources/mapper/schedule/SchedulersGroupMapper.xml rename to auth-system/src/main/resources/mapper/schedule/SchedulersGroupMapper.xml index dbfdb57..e537592 100644 --- a/dao/src/main/resources/mapper/schedule/SchedulersGroupMapper.xml +++ b/auth-system/src/main/resources/mapper/schedule/SchedulersGroupMapper.xml @@ -3,7 +3,7 @@ - + @@ -20,7 +20,7 @@ - select schedulers_group.*, create_user.username as create_username, diff --git a/dao/src/main/resources/mapper/schedule/SchedulersMapper.xml b/auth-system/src/main/resources/mapper/schedule/SchedulersMapper.xml similarity index 91% rename from dao/src/main/resources/mapper/schedule/SchedulersMapper.xml rename to auth-system/src/main/resources/mapper/schedule/SchedulersMapper.xml index d68e341..11d972a 100644 --- a/dao/src/main/resources/mapper/schedule/SchedulersMapper.xml +++ b/auth-system/src/main/resources/mapper/schedule/SchedulersMapper.xml @@ -3,7 +3,7 @@ - + @@ -19,7 +19,7 @@ - select from view_qrtz_schedulers diff --git a/dao/src/main/resources/mapper/system/DeptMapper.xml b/auth-system/src/main/resources/mapper/system/DeptMapper.xml similarity index 90% rename from dao/src/main/resources/mapper/system/DeptMapper.xml rename to auth-system/src/main/resources/mapper/system/DeptMapper.xml index f7aa780..d1e1db9 100644 --- a/dao/src/main/resources/mapper/system/DeptMapper.xml +++ b/auth-system/src/main/resources/mapper/system/DeptMapper.xml @@ -3,7 +3,7 @@ - + @@ -22,7 +22,7 @@ - select dept.*, create_user.username as create_username, diff --git a/dao/src/main/resources/mapper/system/PermissionMapper.xml b/auth-system/src/main/resources/mapper/system/PermissionMapper.xml similarity index 90% rename from dao/src/main/resources/mapper/system/PermissionMapper.xml rename to auth-system/src/main/resources/mapper/system/PermissionMapper.xml index 2d095f3..25a6f6b 100644 --- a/dao/src/main/resources/mapper/system/PermissionMapper.xml +++ b/auth-system/src/main/resources/mapper/system/PermissionMapper.xml @@ -3,7 +3,7 @@ - + @@ -24,7 +24,7 @@ - select permission.*, create_user.username as create_username, @@ -51,7 +51,7 @@ - SELECT p.* FROM sys_permission p INNER JOIN sys_role_permission rp ON p.id = rp.power_id diff --git a/dao/src/main/resources/mapper/system/RoleMapper.xml b/auth-system/src/main/resources/mapper/system/RoleMapper.xml similarity index 86% rename from dao/src/main/resources/mapper/system/RoleMapper.xml rename to auth-system/src/main/resources/mapper/system/RoleMapper.xml index ec6a6ee..dfea70a 100644 --- a/dao/src/main/resources/mapper/system/RoleMapper.xml +++ b/auth-system/src/main/resources/mapper/system/RoleMapper.xml @@ -3,7 +3,7 @@ - + @@ -21,7 +21,7 @@ - select role.*, create_user.username as create_username, @@ -41,7 +41,7 @@ - SELECT r.* FROM sys_user u INNER JOIN sys_user_role ur ON u.id = ur.user_id @@ -51,7 +51,7 @@ - SELECT r.* FROM sys_role r, sys_user_role ur diff --git a/dao/src/main/resources/mapper/system/RolePermissionMapper.xml b/auth-system/src/main/resources/mapper/system/RolePermissionMapper.xml similarity index 87% rename from dao/src/main/resources/mapper/system/RolePermissionMapper.xml rename to auth-system/src/main/resources/mapper/system/RolePermissionMapper.xml index 60071b5..01d1521 100644 --- a/dao/src/main/resources/mapper/system/RolePermissionMapper.xml +++ b/auth-system/src/main/resources/mapper/system/RolePermissionMapper.xml @@ -3,7 +3,7 @@ - + @@ -41,14 +41,14 @@ - SELECT rp.power_id, permission.parent_id, permission.power_code, @@ -64,7 +64,7 @@ + + + - select * from sys_user diff --git a/dao/src/main/resources/mapper/system/UserRoleMapper.xml b/auth-system/src/main/resources/mapper/system/UserRoleMapper.xml similarity index 91% rename from dao/src/main/resources/mapper/system/UserRoleMapper.xml rename to auth-system/src/main/resources/mapper/system/UserRoleMapper.xml index 1816c3e..9ca0e76 100644 --- a/dao/src/main/resources/mapper/system/UserRoleMapper.xml +++ b/auth-system/src/main/resources/mapper/system/UserRoleMapper.xml @@ -3,7 +3,7 @@ - + @@ -39,7 +39,7 @@ - SELECT * FROM sys_user_role WHERE role_id IN diff --git a/auth-api/src/main/resources/static/backup.sh b/auth-system/src/main/resources/static/backup.sh similarity index 100% rename from auth-api/src/main/resources/static/backup.sh rename to auth-system/src/main/resources/static/backup.sh diff --git a/auth-api/src/main/resources/static/error/400.html b/auth-system/src/main/resources/static/error/400.html similarity index 100% rename from auth-api/src/main/resources/static/error/400.html rename to auth-system/src/main/resources/static/error/400.html diff --git a/auth-api/src/main/resources/static/error/403.html b/auth-system/src/main/resources/static/error/403.html similarity index 100% rename from auth-api/src/main/resources/static/error/403.html rename to auth-system/src/main/resources/static/error/403.html diff --git a/auth-api/src/main/resources/static/error/404.html b/auth-system/src/main/resources/static/error/404.html similarity index 100% rename from auth-api/src/main/resources/static/error/404.html rename to auth-system/src/main/resources/static/error/404.html diff --git a/auth-api/src/main/resources/static/error/500.html b/auth-system/src/main/resources/static/error/500.html similarity index 100% rename from auth-api/src/main/resources/static/error/500.html rename to auth-system/src/main/resources/static/error/500.html diff --git a/auth-api/src/main/resources/static/error/501.html b/auth-system/src/main/resources/static/error/501.html similarity index 100% rename from auth-api/src/main/resources/static/error/501.html rename to auth-system/src/main/resources/static/error/501.html diff --git a/auth-api/src/main/resources/static/error/502.html b/auth-system/src/main/resources/static/error/502.html similarity index 100% rename from auth-api/src/main/resources/static/error/502.html rename to auth-system/src/main/resources/static/error/502.html diff --git a/auth-api/src/main/resources/static/error/503.html b/auth-system/src/main/resources/static/error/503.html similarity index 100% rename from auth-api/src/main/resources/static/error/503.html rename to auth-system/src/main/resources/static/error/503.html diff --git a/auth-api/src/main/resources/static/error/504.html b/auth-system/src/main/resources/static/error/504.html similarity index 100% rename from auth-api/src/main/resources/static/error/504.html rename to auth-system/src/main/resources/static/error/504.html diff --git a/auth-api/src/main/resources/static/error/505.html b/auth-system/src/main/resources/static/error/505.html similarity index 100% rename from auth-api/src/main/resources/static/error/505.html rename to auth-system/src/main/resources/static/error/505.html diff --git a/auth-api/src/main/resources/static/error/506.html b/auth-system/src/main/resources/static/error/506.html similarity index 100% rename from auth-api/src/main/resources/static/error/506.html rename to auth-system/src/main/resources/static/error/506.html diff --git a/auth-api/src/main/resources/static/error/507.html b/auth-system/src/main/resources/static/error/507.html similarity index 100% rename from auth-api/src/main/resources/static/error/507.html rename to auth-system/src/main/resources/static/error/507.html diff --git a/auth-api/src/main/resources/static/error/509.html b/auth-system/src/main/resources/static/error/509.html similarity index 100% rename from auth-api/src/main/resources/static/error/509.html rename to auth-system/src/main/resources/static/error/509.html diff --git a/auth-api/src/main/resources/static/error/510.html b/auth-system/src/main/resources/static/error/510.html similarity index 100% rename from auth-api/src/main/resources/static/error/510.html rename to auth-system/src/main/resources/static/error/510.html diff --git a/auth-api/src/main/resources/static/favicon.ico b/auth-system/src/main/resources/static/favicon.ico similarity index 100% rename from auth-api/src/main/resources/static/favicon.ico rename to auth-system/src/main/resources/static/favicon.ico diff --git a/auth-api/src/main/resources/static/platform-config.json b/auth-system/src/main/resources/static/platform-config.json similarity index 100% rename from auth-api/src/main/resources/static/platform-config.json rename to auth-system/src/main/resources/static/platform-config.json diff --git a/auth-api/src/main/resources/templates/index.html b/auth-system/src/main/resources/templates/index.html similarity index 100% rename from auth-api/src/main/resources/templates/index.html rename to auth-system/src/main/resources/templates/index.html diff --git a/auth-api/src/test/java/impl/BuildPermissionApiTest.java b/auth-system/src/test/java/impl/BuildPermissionApiTest.java similarity index 95% rename from auth-api/src/test/java/impl/BuildPermissionApiTest.java rename to auth-system/src/test/java/impl/BuildPermissionApiTest.java index 843a766..a2be7ec 100644 --- a/auth-api/src/test/java/impl/BuildPermissionApiTest.java +++ b/auth-system/src/test/java/impl/BuildPermissionApiTest.java @@ -2,8 +2,8 @@ package impl; import cn.bunny.services.AuthServiceApplication; import cn.bunny.services.aop.scanner.ControllerApiPermissionScanner; -import cn.bunny.services.domain.common.model.dto.scanner.ScannerControllerInfoVo; -import cn.bunny.services.domain.system.entity.Permission; +import cn.bunny.domain.common.model.dto.scanner.ScannerControllerInfoVo; +import cn.bunny.domain.system.entity.Permission; import cn.bunny.services.service.system.PermissionService; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/auth-api/src/test/java/impl/ControllerScannerTest.java b/auth-system/src/test/java/impl/ControllerScannerTest.java similarity index 92% rename from auth-api/src/test/java/impl/ControllerScannerTest.java rename to auth-system/src/test/java/impl/ControllerScannerTest.java index 253a24d..ff21684 100644 --- a/auth-api/src/test/java/impl/ControllerScannerTest.java +++ b/auth-system/src/test/java/impl/ControllerScannerTest.java @@ -1,7 +1,7 @@ package impl; import cn.bunny.services.aop.scanner.ControllerApiPermissionScanner; -import cn.bunny.services.domain.common.model.dto.scanner.ScannerControllerInfoVo; +import cn.bunny.domain.common.model.dto.scanner.ScannerControllerInfoVo; import com.alibaba.fastjson2.JSON; import org.junit.jupiter.api.Test; diff --git a/dao/pom.xml b/dao/pom.xml deleted file mode 100644 index ed4bf08..0000000 --- a/dao/pom.xml +++ /dev/null @@ -1,27 +0,0 @@ - - 4.0.0 - - cn.bunny - auth-server - 0.0.1-SNAPSHOT - - - dao - jar - - auth-dao - https://maven.apache.org - - - UTF-8 - - - - - cn.bunny - auth-core - 0.0.1-SNAPSHOT - - - diff --git a/domain/pom.xml b/domain/pom.xml new file mode 100644 index 0000000..6863192 --- /dev/null +++ b/domain/pom.xml @@ -0,0 +1,74 @@ + + 4.0.0 + + cn.bunny + auth-server + 0.0.1-SNAPSHOT + + domain + domain + https://maven.apache.org + + + + + org.springframework.boot + spring-boot-starter-security + + + + org.springframework.boot + spring-boot-starter-validation + + + + + org.projectlombok + lombok + + + cn.hutool + hutool-all + + + + + com.github.xiaoymin + knife4j-openapi3-jakarta-spring-boot-starter + + + org.springdoc + springdoc-openapi-starter-webmvc-ui + 2.8.6 + + + io.swagger + swagger-annotations + 1.6.14 + + + + + com.baomidou + mybatis-plus-spring-boot3-starter + + + + + + + + + + com.alibaba.fastjson2 + fastjson2 + + + + + com.alibaba + easyexcel + + + diff --git a/auth-core/src/main/java/cn/bunny/services/domain/common/ValidationGroups.java b/domain/src/main/java/cn/bunny/domain/common/ValidationGroups.java similarity index 74% rename from auth-core/src/main/java/cn/bunny/services/domain/common/ValidationGroups.java rename to domain/src/main/java/cn/bunny/domain/common/ValidationGroups.java index b494fd9..c80bf06 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/common/ValidationGroups.java +++ b/domain/src/main/java/cn/bunny/domain/common/ValidationGroups.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.common; +package cn.bunny.domain.common; public interface ValidationGroups { interface QUERY { diff --git a/auth-core/src/main/java/cn/bunny/services/domain/common/constant/FileStorageConstant.java b/domain/src/main/java/cn/bunny/domain/common/constant/FileStorageConstant.java similarity index 95% rename from auth-core/src/main/java/cn/bunny/services/domain/common/constant/FileStorageConstant.java rename to domain/src/main/java/cn/bunny/domain/common/constant/FileStorageConstant.java index 60303bc..e977aa4 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/common/constant/FileStorageConstant.java +++ b/domain/src/main/java/cn/bunny/domain/common/constant/FileStorageConstant.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.common.constant; +package cn.bunny.domain.common.constant; import lombok.Data; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/common/constant/FileType.java b/domain/src/main/java/cn/bunny/domain/common/constant/FileType.java similarity index 87% rename from auth-core/src/main/java/cn/bunny/services/domain/common/constant/FileType.java rename to domain/src/main/java/cn/bunny/domain/common/constant/FileType.java index 199b5a3..a701eef 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/common/constant/FileType.java +++ b/domain/src/main/java/cn/bunny/domain/common/constant/FileType.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.common.constant; +package cn.bunny.domain.common.constant; public class FileType { public static final String JPG = "jpg"; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/common/constant/LocalDateTimeConstant.java b/domain/src/main/java/cn/bunny/domain/common/constant/LocalDateTimeConstant.java similarity index 88% rename from auth-core/src/main/java/cn/bunny/services/domain/common/constant/LocalDateTimeConstant.java rename to domain/src/main/java/cn/bunny/domain/common/constant/LocalDateTimeConstant.java index 3cd9c87..d71842c 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/common/constant/LocalDateTimeConstant.java +++ b/domain/src/main/java/cn/bunny/domain/common/constant/LocalDateTimeConstant.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.common.constant; +package cn.bunny.domain.common.constant; import lombok.Data; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/common/constant/RedisUserConstant.java b/domain/src/main/java/cn/bunny/domain/common/constant/RedisUserConstant.java similarity index 97% rename from auth-core/src/main/java/cn/bunny/services/domain/common/constant/RedisUserConstant.java rename to domain/src/main/java/cn/bunny/domain/common/constant/RedisUserConstant.java index 9b0ee8c..6f4d096 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/common/constant/RedisUserConstant.java +++ b/domain/src/main/java/cn/bunny/domain/common/constant/RedisUserConstant.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.common.constant; +package cn.bunny.domain.common.constant; import lombok.Data; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/common/constant/SecurityConfigConstant.java b/domain/src/main/java/cn/bunny/domain/common/constant/SecurityConfigConstant.java similarity index 82% rename from auth-core/src/main/java/cn/bunny/services/domain/common/constant/SecurityConfigConstant.java rename to domain/src/main/java/cn/bunny/domain/common/constant/SecurityConfigConstant.java index 92f120e..ed112ac 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/common/constant/SecurityConfigConstant.java +++ b/domain/src/main/java/cn/bunny/domain/common/constant/SecurityConfigConstant.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.common.constant; +package cn.bunny.domain.common.constant; import java.util.ArrayList; import java.util.List; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/common/constant/UserConstant.java b/domain/src/main/java/cn/bunny/domain/common/constant/UserConstant.java similarity index 90% rename from auth-core/src/main/java/cn/bunny/services/domain/common/constant/UserConstant.java rename to domain/src/main/java/cn/bunny/domain/common/constant/UserConstant.java index ed0d11d..7e23d34 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/common/constant/UserConstant.java +++ b/domain/src/main/java/cn/bunny/domain/common/constant/UserConstant.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.common.constant; +package cn.bunny.domain.common.constant; import lombok.Data; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/common/enums/EmailTemplateEnums.java b/domain/src/main/java/cn/bunny/domain/common/enums/EmailTemplateEnums.java similarity index 91% rename from auth-core/src/main/java/cn/bunny/services/domain/common/enums/EmailTemplateEnums.java rename to domain/src/main/java/cn/bunny/domain/common/enums/EmailTemplateEnums.java index d45f278..422d6ae 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/common/enums/EmailTemplateEnums.java +++ b/domain/src/main/java/cn/bunny/domain/common/enums/EmailTemplateEnums.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.common.enums; +package cn.bunny.domain.common.enums; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/common/enums/JobEnums.java b/domain/src/main/java/cn/bunny/domain/common/enums/JobEnums.java similarity index 89% rename from auth-core/src/main/java/cn/bunny/services/domain/common/enums/JobEnums.java rename to domain/src/main/java/cn/bunny/domain/common/enums/JobEnums.java index e2c2345..1f86c8e 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/common/enums/JobEnums.java +++ b/domain/src/main/java/cn/bunny/domain/common/enums/JobEnums.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.common.enums; +package cn.bunny.domain.common.enums; import lombok.Getter; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/common/enums/LoginEnums.java b/domain/src/main/java/cn/bunny/domain/common/enums/LoginEnums.java similarity index 85% rename from auth-core/src/main/java/cn/bunny/services/domain/common/enums/LoginEnums.java rename to domain/src/main/java/cn/bunny/domain/common/enums/LoginEnums.java index 94bf30a..20a941c 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/common/enums/LoginEnums.java +++ b/domain/src/main/java/cn/bunny/domain/common/enums/LoginEnums.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.common.enums; +package cn.bunny.domain.common.enums; import lombok.Getter; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/common/enums/ResultCodeEnum.java b/domain/src/main/java/cn/bunny/domain/common/enums/ResultCodeEnum.java similarity index 98% rename from auth-core/src/main/java/cn/bunny/services/domain/common/enums/ResultCodeEnum.java rename to domain/src/main/java/cn/bunny/domain/common/enums/ResultCodeEnum.java index 069456d..944d891 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/common/enums/ResultCodeEnum.java +++ b/domain/src/main/java/cn/bunny/domain/common/enums/ResultCodeEnum.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.common.enums; +package cn.bunny.domain.common.enums; import lombok.Getter; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/common/model/dto/email/EmailSend.java b/domain/src/main/java/cn/bunny/domain/common/model/dto/email/EmailSend.java similarity index 95% rename from auth-core/src/main/java/cn/bunny/services/domain/common/model/dto/email/EmailSend.java rename to domain/src/main/java/cn/bunny/domain/common/model/dto/email/EmailSend.java index b6912b2..94173ec 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/common/model/dto/email/EmailSend.java +++ b/domain/src/main/java/cn/bunny/domain/common/model/dto/email/EmailSend.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.common.model.dto.email; +package cn.bunny.domain.common.model.dto.email; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/common/model/dto/email/EmailSendInit.java b/domain/src/main/java/cn/bunny/domain/common/model/dto/email/EmailSendInit.java similarity index 95% rename from auth-core/src/main/java/cn/bunny/services/domain/common/model/dto/email/EmailSendInit.java rename to domain/src/main/java/cn/bunny/domain/common/model/dto/email/EmailSendInit.java index d41ee13..f2bddda 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/common/model/dto/email/EmailSendInit.java +++ b/domain/src/main/java/cn/bunny/domain/common/model/dto/email/EmailSendInit.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.common.model.dto.email; +package cn.bunny.domain.common.model.dto.email; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/common/model/dto/excel/I18nExcel.java b/domain/src/main/java/cn/bunny/domain/common/model/dto/excel/I18nExcel.java similarity index 96% rename from auth-core/src/main/java/cn/bunny/services/domain/common/model/dto/excel/I18nExcel.java rename to domain/src/main/java/cn/bunny/domain/common/model/dto/excel/I18nExcel.java index 55a5b9a..241067f 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/common/model/dto/excel/I18nExcel.java +++ b/domain/src/main/java/cn/bunny/domain/common/model/dto/excel/I18nExcel.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.common.model.dto.excel; +package cn.bunny.domain.common.model.dto.excel; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.*; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/common/model/dto/excel/PermissionExcel.java b/domain/src/main/java/cn/bunny/domain/common/model/dto/excel/PermissionExcel.java similarity index 97% rename from auth-core/src/main/java/cn/bunny/services/domain/common/model/dto/excel/PermissionExcel.java rename to domain/src/main/java/cn/bunny/domain/common/model/dto/excel/PermissionExcel.java index 9bddcbd..cc7eb03 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/common/model/dto/excel/PermissionExcel.java +++ b/domain/src/main/java/cn/bunny/domain/common/model/dto/excel/PermissionExcel.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.common.model.dto.excel; +package cn.bunny.domain.common.model.dto.excel; import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelProperty; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/common/model/dto/excel/RoleExcel.java b/domain/src/main/java/cn/bunny/domain/common/model/dto/excel/RoleExcel.java similarity index 96% rename from auth-core/src/main/java/cn/bunny/services/domain/common/model/dto/excel/RoleExcel.java rename to domain/src/main/java/cn/bunny/domain/common/model/dto/excel/RoleExcel.java index d63ec1d..bf68d6d 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/common/model/dto/excel/RoleExcel.java +++ b/domain/src/main/java/cn/bunny/domain/common/model/dto/excel/RoleExcel.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.common.model.dto.excel; +package cn.bunny.domain.common.model.dto.excel; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.*; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/common/model/dto/ip/IpEntity.java b/domain/src/main/java/cn/bunny/domain/common/model/dto/ip/IpEntity.java similarity index 89% rename from auth-core/src/main/java/cn/bunny/services/domain/common/model/dto/ip/IpEntity.java rename to domain/src/main/java/cn/bunny/domain/common/model/dto/ip/IpEntity.java index b76c78e..78423e9 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/common/model/dto/ip/IpEntity.java +++ b/domain/src/main/java/cn/bunny/domain/common/model/dto/ip/IpEntity.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.common.model.dto.ip; +package cn.bunny.domain.common.model.dto.ip; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/common/model/dto/quartz/ScheduleExecuteLogJson.java b/domain/src/main/java/cn/bunny/domain/common/model/dto/quartz/ScheduleExecuteLogJson.java similarity index 93% rename from auth-core/src/main/java/cn/bunny/services/domain/common/model/dto/quartz/ScheduleExecuteLogJson.java rename to domain/src/main/java/cn/bunny/domain/common/model/dto/quartz/ScheduleExecuteLogJson.java index d4eb275..52ce363 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/common/model/dto/quartz/ScheduleExecuteLogJson.java +++ b/domain/src/main/java/cn/bunny/domain/common/model/dto/quartz/ScheduleExecuteLogJson.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.common.model.dto.quartz; +package cn.bunny.domain.common.model.dto.quartz; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/common/model/dto/scanner/ControllerInfo.java b/domain/src/main/java/cn/bunny/domain/common/model/dto/scanner/ControllerInfo.java similarity index 93% rename from auth-core/src/main/java/cn/bunny/services/domain/common/model/dto/scanner/ControllerInfo.java rename to domain/src/main/java/cn/bunny/domain/common/model/dto/scanner/ControllerInfo.java index 2f588c0..6aafde8 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/common/model/dto/scanner/ControllerInfo.java +++ b/domain/src/main/java/cn/bunny/domain/common/model/dto/scanner/ControllerInfo.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.common.model.dto.scanner; +package cn.bunny.domain.common.model.dto.scanner; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/common/model/dto/scanner/MethodInfo.java b/domain/src/main/java/cn/bunny/domain/common/model/dto/scanner/MethodInfo.java similarity index 93% rename from auth-core/src/main/java/cn/bunny/services/domain/common/model/dto/scanner/MethodInfo.java rename to domain/src/main/java/cn/bunny/domain/common/model/dto/scanner/MethodInfo.java index d019de0..e820a5c 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/common/model/dto/scanner/MethodInfo.java +++ b/domain/src/main/java/cn/bunny/domain/common/model/dto/scanner/MethodInfo.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.common.model.dto.scanner; +package cn.bunny.domain.common.model.dto.scanner; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/common/model/dto/scanner/ScannerControllerInfoVo.java b/domain/src/main/java/cn/bunny/domain/common/model/dto/scanner/ScannerControllerInfoVo.java similarity index 93% rename from auth-core/src/main/java/cn/bunny/services/domain/common/model/dto/scanner/ScannerControllerInfoVo.java rename to domain/src/main/java/cn/bunny/domain/common/model/dto/scanner/ScannerControllerInfoVo.java index b94458a..f9e5608 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/common/model/dto/scanner/ScannerControllerInfoVo.java +++ b/domain/src/main/java/cn/bunny/domain/common/model/dto/scanner/ScannerControllerInfoVo.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.common.model.dto.scanner; +package cn.bunny.domain.common.model.dto.scanner; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/common/model/dto/security/TokenInfo.java b/domain/src/main/java/cn/bunny/domain/common/model/dto/security/TokenInfo.java similarity index 84% rename from auth-core/src/main/java/cn/bunny/services/domain/common/model/dto/security/TokenInfo.java rename to domain/src/main/java/cn/bunny/domain/common/model/dto/security/TokenInfo.java index 19dc6ce..d143bf8 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/common/model/dto/security/TokenInfo.java +++ b/domain/src/main/java/cn/bunny/domain/common/model/dto/security/TokenInfo.java @@ -1,6 +1,6 @@ -package cn.bunny.services.domain.common.model.dto.security; +package cn.bunny.domain.common.model.dto.security; -import cn.bunny.services.domain.common.model.vo.LoginVo; +import cn.bunny.domain.common.model.vo.LoginVo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/common/model/entity/BaseEntity.java b/domain/src/main/java/cn/bunny/domain/common/model/entity/BaseEntity.java similarity index 96% rename from auth-core/src/main/java/cn/bunny/services/domain/common/model/entity/BaseEntity.java rename to domain/src/main/java/cn/bunny/domain/common/model/entity/BaseEntity.java index 4f6c20a..dba9577 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/common/model/entity/BaseEntity.java +++ b/domain/src/main/java/cn/bunny/domain/common/model/entity/BaseEntity.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.common.model.entity; +package cn.bunny.domain.common.model.entity; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.IdType; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/common/model/entity/BaseUserEntity.java b/domain/src/main/java/cn/bunny/domain/common/model/entity/BaseUserEntity.java similarity index 90% rename from auth-core/src/main/java/cn/bunny/services/domain/common/model/entity/BaseUserEntity.java rename to domain/src/main/java/cn/bunny/domain/common/model/entity/BaseUserEntity.java index e85e50d..da858d1 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/common/model/entity/BaseUserEntity.java +++ b/domain/src/main/java/cn/bunny/domain/common/model/entity/BaseUserEntity.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.common.model.entity; +package cn.bunny.domain.common.model.entity; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/common/model/vo/BaseUserVo.java b/domain/src/main/java/cn/bunny/domain/common/model/vo/BaseUserVo.java similarity index 90% rename from auth-core/src/main/java/cn/bunny/services/domain/common/model/vo/BaseUserVo.java rename to domain/src/main/java/cn/bunny/domain/common/model/vo/BaseUserVo.java index 8f09dda..8a5b632 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/common/model/vo/BaseUserVo.java +++ b/domain/src/main/java/cn/bunny/domain/common/model/vo/BaseUserVo.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.common.model.vo; +package cn.bunny.domain.common.model.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/common/model/vo/BaseVo.java b/domain/src/main/java/cn/bunny/domain/common/model/vo/BaseVo.java similarity index 97% rename from auth-core/src/main/java/cn/bunny/services/domain/common/model/vo/BaseVo.java rename to domain/src/main/java/cn/bunny/domain/common/model/vo/BaseVo.java index 9aba528..3ce794c 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/common/model/vo/BaseVo.java +++ b/domain/src/main/java/cn/bunny/domain/common/model/vo/BaseVo.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.common.model.vo; +package cn.bunny.domain.common.model.vo; import com.alibaba.fastjson2.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/common/model/vo/LoginVo.java b/domain/src/main/java/cn/bunny/domain/common/model/vo/LoginVo.java similarity index 97% rename from auth-core/src/main/java/cn/bunny/services/domain/common/model/vo/LoginVo.java rename to domain/src/main/java/cn/bunny/domain/common/model/vo/LoginVo.java index bde2871..941ee0f 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/common/model/vo/LoginVo.java +++ b/domain/src/main/java/cn/bunny/domain/common/model/vo/LoginVo.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.common.model.vo; +package cn.bunny.domain.common.model.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/common/model/vo/result/PageResult.java b/domain/src/main/java/cn/bunny/domain/common/model/vo/result/PageResult.java similarity index 93% rename from auth-core/src/main/java/cn/bunny/services/domain/common/model/vo/result/PageResult.java rename to domain/src/main/java/cn/bunny/domain/common/model/vo/result/PageResult.java index 137b557..37d00f4 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/common/model/vo/result/PageResult.java +++ b/domain/src/main/java/cn/bunny/domain/common/model/vo/result/PageResult.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.common.model.vo.result; +package cn.bunny.domain.common.model.vo.result; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/common/model/vo/result/Result.java b/domain/src/main/java/cn/bunny/domain/common/model/vo/result/Result.java similarity index 97% rename from auth-core/src/main/java/cn/bunny/services/domain/common/model/vo/result/Result.java rename to domain/src/main/java/cn/bunny/domain/common/model/vo/result/Result.java index f9fc571..773f5a3 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/common/model/vo/result/Result.java +++ b/domain/src/main/java/cn/bunny/domain/common/model/vo/result/Result.java @@ -1,6 +1,6 @@ -package cn.bunny.services.domain.common.model.vo.result; +package cn.bunny.domain.common.model.vo.result; -import cn.bunny.services.domain.common.enums.ResultCodeEnum; +import cn.bunny.domain.common.enums.ResultCodeEnum; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/configuration/dto/EmailTemplateDto.java b/domain/src/main/java/cn/bunny/domain/configuration/dto/EmailTemplateDto.java similarity index 94% rename from auth-core/src/main/java/cn/bunny/services/domain/configuration/dto/EmailTemplateDto.java rename to domain/src/main/java/cn/bunny/domain/configuration/dto/EmailTemplateDto.java index 37e8ca4..e32b143 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/configuration/dto/EmailTemplateDto.java +++ b/domain/src/main/java/cn/bunny/domain/configuration/dto/EmailTemplateDto.java @@ -1,6 +1,6 @@ -package cn.bunny.services.domain.configuration.dto; +package cn.bunny.domain.configuration.dto; -import cn.bunny.services.domain.common.ValidationGroups; +import cn.bunny.domain.common.ValidationGroups; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/configuration/dto/EmailUsersDto.java b/domain/src/main/java/cn/bunny/domain/configuration/dto/EmailUsersDto.java similarity index 89% rename from auth-core/src/main/java/cn/bunny/services/domain/configuration/dto/EmailUsersDto.java rename to domain/src/main/java/cn/bunny/domain/configuration/dto/EmailUsersDto.java index 816e708..be55b4e 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/configuration/dto/EmailUsersDto.java +++ b/domain/src/main/java/cn/bunny/domain/configuration/dto/EmailUsersDto.java @@ -1,7 +1,7 @@ -package cn.bunny.services.domain.configuration.dto; +package cn.bunny.domain.configuration.dto; -import cn.bunny.services.domain.common.ValidationGroups.Add; -import cn.bunny.services.domain.common.ValidationGroups.Update; +import cn.bunny.domain.common.ValidationGroups.Add; +import cn.bunny.domain.common.ValidationGroups.Update; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/configuration/dto/I18nDto.java b/domain/src/main/java/cn/bunny/domain/configuration/dto/I18nDto.java similarity index 91% rename from auth-core/src/main/java/cn/bunny/services/domain/configuration/dto/I18nDto.java rename to domain/src/main/java/cn/bunny/domain/configuration/dto/I18nDto.java index 87aaaf5..b61fc1d 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/configuration/dto/I18nDto.java +++ b/domain/src/main/java/cn/bunny/domain/configuration/dto/I18nDto.java @@ -1,6 +1,6 @@ -package cn.bunny.services.domain.configuration.dto; +package cn.bunny.domain.configuration.dto; -import cn.bunny.services.domain.common.ValidationGroups; +import cn.bunny.domain.common.ValidationGroups; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/configuration/dto/I18nTypeDto.java b/domain/src/main/java/cn/bunny/domain/configuration/dto/I18nTypeDto.java similarity index 90% rename from auth-core/src/main/java/cn/bunny/services/domain/configuration/dto/I18nTypeDto.java rename to domain/src/main/java/cn/bunny/domain/configuration/dto/I18nTypeDto.java index dc49fcb..c527813 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/configuration/dto/I18nTypeDto.java +++ b/domain/src/main/java/cn/bunny/domain/configuration/dto/I18nTypeDto.java @@ -1,6 +1,6 @@ -package cn.bunny.services.domain.configuration.dto; +package cn.bunny.domain.configuration.dto; -import cn.bunny.services.domain.common.ValidationGroups; +import cn.bunny.domain.common.ValidationGroups; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/configuration/dto/I18nUpdateByFileDto.java b/domain/src/main/java/cn/bunny/domain/configuration/dto/I18nUpdateByFileDto.java similarity index 95% rename from auth-core/src/main/java/cn/bunny/services/domain/configuration/dto/I18nUpdateByFileDto.java rename to domain/src/main/java/cn/bunny/domain/configuration/dto/I18nUpdateByFileDto.java index 09b07d2..8ca6193 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/configuration/dto/I18nUpdateByFileDto.java +++ b/domain/src/main/java/cn/bunny/domain/configuration/dto/I18nUpdateByFileDto.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.configuration.dto; +package cn.bunny.domain.configuration.dto; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/configuration/dto/MenuIconDto.java b/domain/src/main/java/cn/bunny/domain/configuration/dto/MenuIconDto.java similarity index 90% rename from auth-core/src/main/java/cn/bunny/services/domain/configuration/dto/MenuIconDto.java rename to domain/src/main/java/cn/bunny/domain/configuration/dto/MenuIconDto.java index e1c7cb0..ecf6844 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/configuration/dto/MenuIconDto.java +++ b/domain/src/main/java/cn/bunny/domain/configuration/dto/MenuIconDto.java @@ -1,6 +1,6 @@ -package cn.bunny.services.domain.configuration.dto; +package cn.bunny.domain.configuration.dto; -import cn.bunny.services.domain.common.ValidationGroups; +import cn.bunny.domain.common.ValidationGroups; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/configuration/dto/WebConfigurationDto.java b/domain/src/main/java/cn/bunny/domain/configuration/dto/WebConfigurationDto.java similarity index 99% rename from auth-core/src/main/java/cn/bunny/services/domain/configuration/dto/WebConfigurationDto.java rename to domain/src/main/java/cn/bunny/domain/configuration/dto/WebConfigurationDto.java index 79cf65e..c806e1b 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/configuration/dto/WebConfigurationDto.java +++ b/domain/src/main/java/cn/bunny/domain/configuration/dto/WebConfigurationDto.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.configuration.dto; +package cn.bunny.domain.configuration.dto; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.Min; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/configuration/entity/EmailTemplate.java b/domain/src/main/java/cn/bunny/domain/configuration/entity/EmailTemplate.java similarity index 90% rename from auth-core/src/main/java/cn/bunny/services/domain/configuration/entity/EmailTemplate.java rename to domain/src/main/java/cn/bunny/domain/configuration/entity/EmailTemplate.java index 3598d03..e1991aa 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/configuration/entity/EmailTemplate.java +++ b/domain/src/main/java/cn/bunny/domain/configuration/entity/EmailTemplate.java @@ -1,6 +1,6 @@ -package cn.bunny.services.domain.configuration.entity; +package cn.bunny.domain.configuration.entity; -import cn.bunny.services.domain.common.model.entity.BaseEntity; +import cn.bunny.domain.common.model.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/configuration/entity/EmailUsers.java b/domain/src/main/java/cn/bunny/domain/configuration/entity/EmailUsers.java similarity index 91% rename from auth-core/src/main/java/cn/bunny/services/domain/configuration/entity/EmailUsers.java rename to domain/src/main/java/cn/bunny/domain/configuration/entity/EmailUsers.java index 66659aa..76877d3 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/configuration/entity/EmailUsers.java +++ b/domain/src/main/java/cn/bunny/domain/configuration/entity/EmailUsers.java @@ -1,6 +1,6 @@ -package cn.bunny.services.domain.configuration.entity; +package cn.bunny.domain.configuration.entity; -import cn.bunny.services.domain.common.model.entity.BaseEntity; +import cn.bunny.domain.common.model.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/configuration/entity/I18n.java b/domain/src/main/java/cn/bunny/domain/configuration/entity/I18n.java similarity index 88% rename from auth-core/src/main/java/cn/bunny/services/domain/configuration/entity/I18n.java rename to domain/src/main/java/cn/bunny/domain/configuration/entity/I18n.java index 6a0888c..25894de 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/configuration/entity/I18n.java +++ b/domain/src/main/java/cn/bunny/domain/configuration/entity/I18n.java @@ -1,6 +1,6 @@ -package cn.bunny.services.domain.configuration.entity; +package cn.bunny.domain.configuration.entity; -import cn.bunny.services.domain.common.model.entity.BaseEntity; +import cn.bunny.domain.common.model.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/configuration/entity/I18nType.java b/domain/src/main/java/cn/bunny/domain/configuration/entity/I18nType.java similarity index 88% rename from auth-core/src/main/java/cn/bunny/services/domain/configuration/entity/I18nType.java rename to domain/src/main/java/cn/bunny/domain/configuration/entity/I18nType.java index 8a1f288..7b28b6b 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/configuration/entity/I18nType.java +++ b/domain/src/main/java/cn/bunny/domain/configuration/entity/I18nType.java @@ -1,6 +1,6 @@ -package cn.bunny.services.domain.configuration.entity; +package cn.bunny.domain.configuration.entity; -import cn.bunny.services.domain.common.model.entity.BaseEntity; +import cn.bunny.domain.common.model.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/configuration/entity/MenuIcon.java b/domain/src/main/java/cn/bunny/domain/configuration/entity/MenuIcon.java similarity index 86% rename from auth-core/src/main/java/cn/bunny/services/domain/configuration/entity/MenuIcon.java rename to domain/src/main/java/cn/bunny/domain/configuration/entity/MenuIcon.java index 673a792..ccb876d 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/configuration/entity/MenuIcon.java +++ b/domain/src/main/java/cn/bunny/domain/configuration/entity/MenuIcon.java @@ -1,6 +1,6 @@ -package cn.bunny.services.domain.configuration.entity; +package cn.bunny.domain.configuration.entity; -import cn.bunny.services.domain.common.model.entity.BaseEntity; +import cn.bunny.domain.common.model.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/configuration/entity/WebConfiguration.java b/domain/src/main/java/cn/bunny/domain/configuration/entity/WebConfiguration.java similarity index 98% rename from auth-core/src/main/java/cn/bunny/services/domain/configuration/entity/WebConfiguration.java rename to domain/src/main/java/cn/bunny/domain/configuration/entity/WebConfiguration.java index 598eeb7..9be18c9 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/configuration/entity/WebConfiguration.java +++ b/domain/src/main/java/cn/bunny/domain/configuration/entity/WebConfiguration.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.configuration.entity; +package cn.bunny.domain.configuration.entity; import com.alibaba.fastjson2.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/configuration/vo/EmailTemplateVo.java b/domain/src/main/java/cn/bunny/domain/configuration/vo/EmailTemplateVo.java similarity index 92% rename from auth-core/src/main/java/cn/bunny/services/domain/configuration/vo/EmailTemplateVo.java rename to domain/src/main/java/cn/bunny/domain/configuration/vo/EmailTemplateVo.java index b618941..0196b83 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/configuration/vo/EmailTemplateVo.java +++ b/domain/src/main/java/cn/bunny/domain/configuration/vo/EmailTemplateVo.java @@ -1,6 +1,6 @@ -package cn.bunny.services.domain.configuration.vo; +package cn.bunny.domain.configuration.vo; -import cn.bunny.services.domain.common.model.vo.BaseUserVo; +import cn.bunny.domain.common.model.vo.BaseUserVo; import com.alibaba.fastjson2.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/configuration/vo/EmailUsersVo.java b/domain/src/main/java/cn/bunny/domain/configuration/vo/EmailUsersVo.java similarity index 89% rename from auth-core/src/main/java/cn/bunny/services/domain/configuration/vo/EmailUsersVo.java rename to domain/src/main/java/cn/bunny/domain/configuration/vo/EmailUsersVo.java index d7500bc..bd40f01 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/configuration/vo/EmailUsersVo.java +++ b/domain/src/main/java/cn/bunny/domain/configuration/vo/EmailUsersVo.java @@ -1,6 +1,6 @@ -package cn.bunny.services.domain.configuration.vo; +package cn.bunny.domain.configuration.vo; -import cn.bunny.services.domain.common.model.vo.BaseUserVo; +import cn.bunny.domain.common.model.vo.BaseUserVo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/configuration/vo/I18nTypeVo.java b/domain/src/main/java/cn/bunny/domain/configuration/vo/I18nTypeVo.java similarity index 84% rename from auth-core/src/main/java/cn/bunny/services/domain/configuration/vo/I18nTypeVo.java rename to domain/src/main/java/cn/bunny/domain/configuration/vo/I18nTypeVo.java index 0780752..c0bf524 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/configuration/vo/I18nTypeVo.java +++ b/domain/src/main/java/cn/bunny/domain/configuration/vo/I18nTypeVo.java @@ -1,6 +1,6 @@ -package cn.bunny.services.domain.configuration.vo; +package cn.bunny.domain.configuration.vo; -import cn.bunny.services.domain.common.model.vo.BaseUserVo; +import cn.bunny.domain.common.model.vo.BaseUserVo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/configuration/vo/I18nVo.java b/domain/src/main/java/cn/bunny/domain/configuration/vo/I18nVo.java similarity index 84% rename from auth-core/src/main/java/cn/bunny/services/domain/configuration/vo/I18nVo.java rename to domain/src/main/java/cn/bunny/domain/configuration/vo/I18nVo.java index 57fbbea..313c374 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/configuration/vo/I18nVo.java +++ b/domain/src/main/java/cn/bunny/domain/configuration/vo/I18nVo.java @@ -1,6 +1,6 @@ -package cn.bunny.services.domain.configuration.vo; +package cn.bunny.domain.configuration.vo; -import cn.bunny.services.domain.common.model.vo.BaseUserVo; +import cn.bunny.domain.common.model.vo.BaseUserVo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/configuration/vo/MenuIconVo.java b/domain/src/main/java/cn/bunny/domain/configuration/vo/MenuIconVo.java similarity index 80% rename from auth-core/src/main/java/cn/bunny/services/domain/configuration/vo/MenuIconVo.java rename to domain/src/main/java/cn/bunny/domain/configuration/vo/MenuIconVo.java index dd86fbf..739c707 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/configuration/vo/MenuIconVo.java +++ b/domain/src/main/java/cn/bunny/domain/configuration/vo/MenuIconVo.java @@ -1,6 +1,6 @@ -package cn.bunny.services.domain.configuration.vo; +package cn.bunny.domain.configuration.vo; -import cn.bunny.services.domain.common.model.vo.BaseUserVo; +import cn.bunny.domain.common.model.vo.BaseUserVo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/files/dto/FileUploadDto.java b/domain/src/main/java/cn/bunny/domain/files/dto/FileUploadDto.java similarity index 94% rename from auth-core/src/main/java/cn/bunny/services/domain/files/dto/FileUploadDto.java rename to domain/src/main/java/cn/bunny/domain/files/dto/FileUploadDto.java index b4c4bdc..0754e90 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/files/dto/FileUploadDto.java +++ b/domain/src/main/java/cn/bunny/domain/files/dto/FileUploadDto.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.files.dto; +package cn.bunny.domain.files.dto; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/files/dto/FilesCreateOrUpdateDto.java b/domain/src/main/java/cn/bunny/domain/files/dto/FilesCreateOrUpdateDto.java similarity index 93% rename from auth-core/src/main/java/cn/bunny/services/domain/files/dto/FilesCreateOrUpdateDto.java rename to domain/src/main/java/cn/bunny/domain/files/dto/FilesCreateOrUpdateDto.java index e20568b..48fc253 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/files/dto/FilesCreateOrUpdateDto.java +++ b/domain/src/main/java/cn/bunny/domain/files/dto/FilesCreateOrUpdateDto.java @@ -1,6 +1,6 @@ -package cn.bunny.services.domain.files.dto; +package cn.bunny.domain.files.dto; -import cn.bunny.services.domain.common.ValidationGroups; +import cn.bunny.domain.common.ValidationGroups; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.Min; import jakarta.validation.constraints.NotBlank; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/files/dto/FilesDto.java b/domain/src/main/java/cn/bunny/domain/files/dto/FilesDto.java similarity index 95% rename from auth-core/src/main/java/cn/bunny/services/domain/files/dto/FilesDto.java rename to domain/src/main/java/cn/bunny/domain/files/dto/FilesDto.java index 78efbd0..69d8aa2 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/files/dto/FilesDto.java +++ b/domain/src/main/java/cn/bunny/domain/files/dto/FilesDto.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.files.dto; +package cn.bunny.domain.files.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/files/dto/FilesParDetailDto.java b/domain/src/main/java/cn/bunny/domain/files/dto/FilesParDetailDto.java similarity index 97% rename from auth-core/src/main/java/cn/bunny/services/domain/files/dto/FilesParDetailDto.java rename to domain/src/main/java/cn/bunny/domain/files/dto/FilesParDetailDto.java index dcf3795..26c7ea3 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/files/dto/FilesParDetailDto.java +++ b/domain/src/main/java/cn/bunny/domain/files/dto/FilesParDetailDto.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.files.dto; +package cn.bunny.domain.files.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/files/dto/UploadThumbnail.java b/domain/src/main/java/cn/bunny/domain/files/dto/UploadThumbnail.java similarity index 94% rename from auth-core/src/main/java/cn/bunny/services/domain/files/dto/UploadThumbnail.java rename to domain/src/main/java/cn/bunny/domain/files/dto/UploadThumbnail.java index 6afc41e..bf2abf0 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/files/dto/UploadThumbnail.java +++ b/domain/src/main/java/cn/bunny/domain/files/dto/UploadThumbnail.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.files.dto; +package cn.bunny.domain.files.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/files/entity/Files.java b/domain/src/main/java/cn/bunny/domain/files/entity/Files.java similarity index 96% rename from auth-core/src/main/java/cn/bunny/services/domain/files/entity/Files.java rename to domain/src/main/java/cn/bunny/domain/files/entity/Files.java index 57f918c..b1cb21c 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/files/entity/Files.java +++ b/domain/src/main/java/cn/bunny/domain/files/entity/Files.java @@ -1,6 +1,6 @@ -package cn.bunny.services.domain.files.entity; +package cn.bunny.domain.files.entity; -import cn.bunny.services.domain.common.model.entity.BaseEntity; +import cn.bunny.domain.common.model.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/files/entity/FilesParDetail.java b/domain/src/main/java/cn/bunny/domain/files/entity/FilesParDetail.java similarity index 91% rename from auth-core/src/main/java/cn/bunny/services/domain/files/entity/FilesParDetail.java rename to domain/src/main/java/cn/bunny/domain/files/entity/FilesParDetail.java index 7431c96..ee0964b 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/files/entity/FilesParDetail.java +++ b/domain/src/main/java/cn/bunny/domain/files/entity/FilesParDetail.java @@ -1,6 +1,6 @@ -package cn.bunny.services.domain.files.entity; +package cn.bunny.domain.files.entity; -import cn.bunny.services.domain.common.model.entity.BaseEntity; +import cn.bunny.domain.common.model.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; import lombok.EqualsAndHashCode; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/files/vo/FileInfoVo.java b/domain/src/main/java/cn/bunny/domain/files/vo/FileInfoVo.java similarity index 95% rename from auth-core/src/main/java/cn/bunny/services/domain/files/vo/FileInfoVo.java rename to domain/src/main/java/cn/bunny/domain/files/vo/FileInfoVo.java index 8936591..8dd5838 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/files/vo/FileInfoVo.java +++ b/domain/src/main/java/cn/bunny/domain/files/vo/FileInfoVo.java @@ -1,6 +1,6 @@ -package cn.bunny.services.domain.files.vo; +package cn.bunny.domain.files.vo; -import cn.bunny.services.domain.common.model.vo.BaseVo; +import cn.bunny.domain.common.model.vo.BaseVo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/files/vo/FilesParDetailVo.java b/domain/src/main/java/cn/bunny/domain/files/vo/FilesParDetailVo.java similarity index 97% rename from auth-core/src/main/java/cn/bunny/services/domain/files/vo/FilesParDetailVo.java rename to domain/src/main/java/cn/bunny/domain/files/vo/FilesParDetailVo.java index 618db49..87ac5e3 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/files/vo/FilesParDetailVo.java +++ b/domain/src/main/java/cn/bunny/domain/files/vo/FilesParDetailVo.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.files.vo; +package cn.bunny.domain.files.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/files/vo/FilesVo.java b/domain/src/main/java/cn/bunny/domain/files/vo/FilesVo.java similarity index 96% rename from auth-core/src/main/java/cn/bunny/services/domain/files/vo/FilesVo.java rename to domain/src/main/java/cn/bunny/domain/files/vo/FilesVo.java index 974b8d6..5fc427c 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/files/vo/FilesVo.java +++ b/domain/src/main/java/cn/bunny/domain/files/vo/FilesVo.java @@ -1,6 +1,6 @@ -package cn.bunny.services.domain.files.vo; +package cn.bunny.domain.files.vo; -import cn.bunny.services.domain.common.model.vo.BaseUserVo; +import cn.bunny.domain.common.model.vo.BaseUserVo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/log/dto/ScheduleExecuteLogDto.java b/domain/src/main/java/cn/bunny/domain/log/dto/ScheduleExecuteLogDto.java similarity index 95% rename from auth-core/src/main/java/cn/bunny/services/domain/log/dto/ScheduleExecuteLogDto.java rename to domain/src/main/java/cn/bunny/domain/log/dto/ScheduleExecuteLogDto.java index a6571ab..1917c8b 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/log/dto/ScheduleExecuteLogDto.java +++ b/domain/src/main/java/cn/bunny/domain/log/dto/ScheduleExecuteLogDto.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.log.dto; +package cn.bunny.domain.log.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/log/dto/UserLoginLogDto.java b/domain/src/main/java/cn/bunny/domain/log/dto/UserLoginLogDto.java similarity index 96% rename from auth-core/src/main/java/cn/bunny/services/domain/log/dto/UserLoginLogDto.java rename to domain/src/main/java/cn/bunny/domain/log/dto/UserLoginLogDto.java index e541c84..3939cab 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/log/dto/UserLoginLogDto.java +++ b/domain/src/main/java/cn/bunny/domain/log/dto/UserLoginLogDto.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.log.dto; +package cn.bunny.domain.log.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/log/entity/ScheduleExecuteLog.java b/domain/src/main/java/cn/bunny/domain/log/entity/ScheduleExecuteLog.java similarity index 92% rename from auth-core/src/main/java/cn/bunny/services/domain/log/entity/ScheduleExecuteLog.java rename to domain/src/main/java/cn/bunny/domain/log/entity/ScheduleExecuteLog.java index 5c96d74..e5d7543 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/log/entity/ScheduleExecuteLog.java +++ b/domain/src/main/java/cn/bunny/domain/log/entity/ScheduleExecuteLog.java @@ -1,6 +1,6 @@ -package cn.bunny.services.domain.log.entity; +package cn.bunny.domain.log.entity; -import cn.bunny.services.domain.common.model.entity.BaseEntity; +import cn.bunny.domain.common.model.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/log/entity/UserLoginLog.java b/domain/src/main/java/cn/bunny/domain/log/entity/UserLoginLog.java similarity index 92% rename from auth-core/src/main/java/cn/bunny/services/domain/log/entity/UserLoginLog.java rename to domain/src/main/java/cn/bunny/domain/log/entity/UserLoginLog.java index db48947..bf77342 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/log/entity/UserLoginLog.java +++ b/domain/src/main/java/cn/bunny/domain/log/entity/UserLoginLog.java @@ -1,6 +1,6 @@ -package cn.bunny.services.domain.log.entity; +package cn.bunny.domain.log.entity; -import cn.bunny.services.domain.common.model.entity.BaseEntity; +import cn.bunny.domain.common.model.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/log/vo/ScheduleExecuteLogVo.java b/domain/src/main/java/cn/bunny/domain/log/vo/ScheduleExecuteLogVo.java similarity index 90% rename from auth-core/src/main/java/cn/bunny/services/domain/log/vo/ScheduleExecuteLogVo.java rename to domain/src/main/java/cn/bunny/domain/log/vo/ScheduleExecuteLogVo.java index d4b1686..a6897d1 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/log/vo/ScheduleExecuteLogVo.java +++ b/domain/src/main/java/cn/bunny/domain/log/vo/ScheduleExecuteLogVo.java @@ -1,6 +1,6 @@ -package cn.bunny.services.domain.log.vo; +package cn.bunny.domain.log.vo; -import cn.bunny.services.domain.common.model.vo.BaseUserVo; +import cn.bunny.domain.common.model.vo.BaseUserVo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/log/vo/UserLoginLogLocalVo.java b/domain/src/main/java/cn/bunny/domain/log/vo/UserLoginLogLocalVo.java similarity index 91% rename from auth-core/src/main/java/cn/bunny/services/domain/log/vo/UserLoginLogLocalVo.java rename to domain/src/main/java/cn/bunny/domain/log/vo/UserLoginLogLocalVo.java index f5eda03..66117ec 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/log/vo/UserLoginLogLocalVo.java +++ b/domain/src/main/java/cn/bunny/domain/log/vo/UserLoginLogLocalVo.java @@ -1,6 +1,6 @@ -package cn.bunny.services.domain.log.vo; +package cn.bunny.domain.log.vo; -import cn.bunny.services.domain.common.model.vo.BaseVo; +import cn.bunny.domain.common.model.vo.BaseVo; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/log/vo/UserLoginLogVo.java b/domain/src/main/java/cn/bunny/domain/log/vo/UserLoginLogVo.java similarity index 91% rename from auth-core/src/main/java/cn/bunny/services/domain/log/vo/UserLoginLogVo.java rename to domain/src/main/java/cn/bunny/domain/log/vo/UserLoginLogVo.java index 186191c..36e9641 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/log/vo/UserLoginLogVo.java +++ b/domain/src/main/java/cn/bunny/domain/log/vo/UserLoginLogVo.java @@ -1,6 +1,6 @@ -package cn.bunny.services.domain.log.vo; +package cn.bunny.domain.log.vo; -import cn.bunny.services.domain.common.model.vo.BaseUserVo; +import cn.bunny.domain.common.model.vo.BaseUserVo; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/message/dto/MessageDto.java b/domain/src/main/java/cn/bunny/domain/message/dto/MessageDto.java similarity index 96% rename from auth-core/src/main/java/cn/bunny/services/domain/message/dto/MessageDto.java rename to domain/src/main/java/cn/bunny/domain/message/dto/MessageDto.java index fe7f13a..e086515 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/message/dto/MessageDto.java +++ b/domain/src/main/java/cn/bunny/domain/message/dto/MessageDto.java @@ -1,6 +1,6 @@ -package cn.bunny.services.domain.message.dto; +package cn.bunny.domain.message.dto; -import cn.bunny.services.domain.common.ValidationGroups; +import cn.bunny.domain.common.ValidationGroups; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/message/dto/MessageReceivedDto.java b/domain/src/main/java/cn/bunny/domain/message/dto/MessageReceivedDto.java similarity index 95% rename from auth-core/src/main/java/cn/bunny/services/domain/message/dto/MessageReceivedDto.java rename to domain/src/main/java/cn/bunny/domain/message/dto/MessageReceivedDto.java index b50ee6e..fa2e7d8 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/message/dto/MessageReceivedDto.java +++ b/domain/src/main/java/cn/bunny/domain/message/dto/MessageReceivedDto.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.message.dto; +package cn.bunny.domain.message.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/message/dto/MessageReceivedUpdateDto.java b/domain/src/main/java/cn/bunny/domain/message/dto/MessageReceivedUpdateDto.java similarity index 92% rename from auth-core/src/main/java/cn/bunny/services/domain/message/dto/MessageReceivedUpdateDto.java rename to domain/src/main/java/cn/bunny/domain/message/dto/MessageReceivedUpdateDto.java index 2f5fb35..ef180a0 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/message/dto/MessageReceivedUpdateDto.java +++ b/domain/src/main/java/cn/bunny/domain/message/dto/MessageReceivedUpdateDto.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.message.dto; +package cn.bunny.domain.message.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/message/dto/MessageTypeDto.java b/domain/src/main/java/cn/bunny/domain/message/dto/MessageTypeDto.java similarity index 91% rename from auth-core/src/main/java/cn/bunny/services/domain/message/dto/MessageTypeDto.java rename to domain/src/main/java/cn/bunny/domain/message/dto/MessageTypeDto.java index c10bcd4..326528e 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/message/dto/MessageTypeDto.java +++ b/domain/src/main/java/cn/bunny/domain/message/dto/MessageTypeDto.java @@ -1,6 +1,6 @@ -package cn.bunny.services.domain.message.dto; +package cn.bunny.domain.message.dto; -import cn.bunny.services.domain.common.ValidationGroups; +import cn.bunny.domain.common.ValidationGroups; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/message/dto/MessageUserDto.java b/domain/src/main/java/cn/bunny/domain/message/dto/MessageUserDto.java similarity index 93% rename from auth-core/src/main/java/cn/bunny/services/domain/message/dto/MessageUserDto.java rename to domain/src/main/java/cn/bunny/domain/message/dto/MessageUserDto.java index e66c401..dbc0833 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/message/dto/MessageUserDto.java +++ b/domain/src/main/java/cn/bunny/domain/message/dto/MessageUserDto.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.message.dto; +package cn.bunny.domain.message.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/message/entity/Message.java b/domain/src/main/java/cn/bunny/domain/message/entity/Message.java similarity index 92% rename from auth-core/src/main/java/cn/bunny/services/domain/message/entity/Message.java rename to domain/src/main/java/cn/bunny/domain/message/entity/Message.java index c0e948d..fd44a9d 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/message/entity/Message.java +++ b/domain/src/main/java/cn/bunny/domain/message/entity/Message.java @@ -1,6 +1,6 @@ -package cn.bunny.services.domain.message.entity; +package cn.bunny.domain.message.entity; -import cn.bunny.services.domain.common.model.entity.BaseEntity; +import cn.bunny.domain.common.model.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/message/entity/MessageReceived.java b/domain/src/main/java/cn/bunny/domain/message/entity/MessageReceived.java similarity index 89% rename from auth-core/src/main/java/cn/bunny/services/domain/message/entity/MessageReceived.java rename to domain/src/main/java/cn/bunny/domain/message/entity/MessageReceived.java index dca19a7..fd348ad 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/message/entity/MessageReceived.java +++ b/domain/src/main/java/cn/bunny/domain/message/entity/MessageReceived.java @@ -1,6 +1,6 @@ -package cn.bunny.services.domain.message.entity; +package cn.bunny.domain.message.entity; -import cn.bunny.services.domain.common.model.entity.BaseEntity; +import cn.bunny.domain.common.model.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/message/entity/MessageType.java b/domain/src/main/java/cn/bunny/domain/message/entity/MessageType.java similarity index 90% rename from auth-core/src/main/java/cn/bunny/services/domain/message/entity/MessageType.java rename to domain/src/main/java/cn/bunny/domain/message/entity/MessageType.java index 66f0a5b..65ed9aa 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/message/entity/MessageType.java +++ b/domain/src/main/java/cn/bunny/domain/message/entity/MessageType.java @@ -1,6 +1,6 @@ -package cn.bunny.services.domain.message.entity; +package cn.bunny.domain.message.entity; -import cn.bunny.services.domain.common.model.entity.BaseEntity; +import cn.bunny.domain.common.model.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/message/vo/MessageDetailVo.java b/domain/src/main/java/cn/bunny/domain/message/vo/MessageDetailVo.java similarity index 91% rename from auth-core/src/main/java/cn/bunny/services/domain/message/vo/MessageDetailVo.java rename to domain/src/main/java/cn/bunny/domain/message/vo/MessageDetailVo.java index 81add2d..e435784 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/message/vo/MessageDetailVo.java +++ b/domain/src/main/java/cn/bunny/domain/message/vo/MessageDetailVo.java @@ -1,6 +1,6 @@ -package cn.bunny.services.domain.message.vo; +package cn.bunny.domain.message.vo; -import cn.bunny.services.domain.common.model.vo.BaseUserVo; +import cn.bunny.domain.common.model.vo.BaseUserVo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/message/vo/MessageReceivedWithMessageVo.java b/domain/src/main/java/cn/bunny/domain/message/vo/MessageReceivedWithMessageVo.java similarity index 95% rename from auth-core/src/main/java/cn/bunny/services/domain/message/vo/MessageReceivedWithMessageVo.java rename to domain/src/main/java/cn/bunny/domain/message/vo/MessageReceivedWithMessageVo.java index 4ac0af0..1899218 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/message/vo/MessageReceivedWithMessageVo.java +++ b/domain/src/main/java/cn/bunny/domain/message/vo/MessageReceivedWithMessageVo.java @@ -1,6 +1,6 @@ -package cn.bunny.services.domain.message.vo; +package cn.bunny.domain.message.vo; -import cn.bunny.services.domain.common.model.vo.BaseUserVo; +import cn.bunny.domain.common.model.vo.BaseUserVo; import com.alibaba.fastjson2.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/message/vo/MessageReceivedWithUserVo.java b/domain/src/main/java/cn/bunny/domain/message/vo/MessageReceivedWithUserVo.java similarity index 96% rename from auth-core/src/main/java/cn/bunny/services/domain/message/vo/MessageReceivedWithUserVo.java rename to domain/src/main/java/cn/bunny/domain/message/vo/MessageReceivedWithUserVo.java index 0ae7932..d6bc714 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/message/vo/MessageReceivedWithUserVo.java +++ b/domain/src/main/java/cn/bunny/domain/message/vo/MessageReceivedWithUserVo.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.message.vo; +package cn.bunny.domain.message.vo; import com.alibaba.fastjson2.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/message/vo/MessageTypeVo.java b/domain/src/main/java/cn/bunny/domain/message/vo/MessageTypeVo.java similarity index 86% rename from auth-core/src/main/java/cn/bunny/services/domain/message/vo/MessageTypeVo.java rename to domain/src/main/java/cn/bunny/domain/message/vo/MessageTypeVo.java index a0636ac..5115e1b 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/message/vo/MessageTypeVo.java +++ b/domain/src/main/java/cn/bunny/domain/message/vo/MessageTypeVo.java @@ -1,6 +1,6 @@ -package cn.bunny.services.domain.message.vo; +package cn.bunny.domain.message.vo; -import cn.bunny.services.domain.common.model.vo.BaseUserVo; +import cn.bunny.domain.common.model.vo.BaseUserVo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/message/vo/MessageUserVo.java b/domain/src/main/java/cn/bunny/domain/message/vo/MessageUserVo.java similarity index 95% rename from auth-core/src/main/java/cn/bunny/services/domain/message/vo/MessageUserVo.java rename to domain/src/main/java/cn/bunny/domain/message/vo/MessageUserVo.java index aad6268..64458be 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/message/vo/MessageUserVo.java +++ b/domain/src/main/java/cn/bunny/domain/message/vo/MessageUserVo.java @@ -1,6 +1,6 @@ -package cn.bunny.services.domain.message.vo; +package cn.bunny.domain.message.vo; -import cn.bunny.services.domain.common.model.vo.BaseVo; +import cn.bunny.domain.common.model.vo.BaseVo; import com.alibaba.fastjson2.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/message/vo/MessageVo.java b/domain/src/main/java/cn/bunny/domain/message/vo/MessageVo.java similarity index 95% rename from auth-core/src/main/java/cn/bunny/services/domain/message/vo/MessageVo.java rename to domain/src/main/java/cn/bunny/domain/message/vo/MessageVo.java index bccb65b..3137c50 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/message/vo/MessageVo.java +++ b/domain/src/main/java/cn/bunny/domain/message/vo/MessageVo.java @@ -1,6 +1,6 @@ -package cn.bunny.services.domain.message.vo; +package cn.bunny.domain.message.vo; -import cn.bunny.services.domain.common.model.vo.BaseUserVo; +import cn.bunny.domain.common.model.vo.BaseUserVo; import com.alibaba.fastjson2.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/schedule/dto/SchedulersDto.java b/domain/src/main/java/cn/bunny/domain/schedule/dto/SchedulersDto.java similarity index 94% rename from auth-core/src/main/java/cn/bunny/services/domain/schedule/dto/SchedulersDto.java rename to domain/src/main/java/cn/bunny/domain/schedule/dto/SchedulersDto.java index 33aee82..6572278 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/schedule/dto/SchedulersDto.java +++ b/domain/src/main/java/cn/bunny/domain/schedule/dto/SchedulersDto.java @@ -1,6 +1,6 @@ -package cn.bunny.services.domain.schedule.dto; +package cn.bunny.domain.schedule.dto; -import cn.bunny.services.domain.common.ValidationGroups; +import cn.bunny.domain.common.ValidationGroups; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; import lombok.AllArgsConstructor; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/schedule/dto/SchedulersGroupDto.java b/domain/src/main/java/cn/bunny/domain/schedule/dto/SchedulersGroupDto.java similarity index 90% rename from auth-core/src/main/java/cn/bunny/services/domain/schedule/dto/SchedulersGroupDto.java rename to domain/src/main/java/cn/bunny/domain/schedule/dto/SchedulersGroupDto.java index 95b4037..4c8287b 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/schedule/dto/SchedulersGroupDto.java +++ b/domain/src/main/java/cn/bunny/domain/schedule/dto/SchedulersGroupDto.java @@ -1,6 +1,6 @@ -package cn.bunny.services.domain.schedule.dto; +package cn.bunny.domain.schedule.dto; -import cn.bunny.services.domain.common.ValidationGroups; +import cn.bunny.domain.common.ValidationGroups; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/schedule/entity/Schedulers.java b/domain/src/main/java/cn/bunny/domain/schedule/entity/Schedulers.java similarity index 96% rename from auth-core/src/main/java/cn/bunny/services/domain/schedule/entity/Schedulers.java rename to domain/src/main/java/cn/bunny/domain/schedule/entity/Schedulers.java index a3bab91..13ba442 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/schedule/entity/Schedulers.java +++ b/domain/src/main/java/cn/bunny/domain/schedule/entity/Schedulers.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.schedule.entity; +package cn.bunny.domain.schedule.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/schedule/entity/SchedulersGroup.java b/domain/src/main/java/cn/bunny/domain/schedule/entity/SchedulersGroup.java similarity index 88% rename from auth-core/src/main/java/cn/bunny/services/domain/schedule/entity/SchedulersGroup.java rename to domain/src/main/java/cn/bunny/domain/schedule/entity/SchedulersGroup.java index a582858..0abecac 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/schedule/entity/SchedulersGroup.java +++ b/domain/src/main/java/cn/bunny/domain/schedule/entity/SchedulersGroup.java @@ -1,6 +1,6 @@ -package cn.bunny.services.domain.schedule.entity; +package cn.bunny.domain.schedule.entity; -import cn.bunny.services.domain.common.model.entity.BaseEntity; +import cn.bunny.domain.common.model.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/schedule/vo/SchedulersGroupVo.java b/domain/src/main/java/cn/bunny/domain/schedule/vo/SchedulersGroupVo.java similarity index 82% rename from auth-core/src/main/java/cn/bunny/services/domain/schedule/vo/SchedulersGroupVo.java rename to domain/src/main/java/cn/bunny/domain/schedule/vo/SchedulersGroupVo.java index 4ceb259..2e3e28c 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/schedule/vo/SchedulersGroupVo.java +++ b/domain/src/main/java/cn/bunny/domain/schedule/vo/SchedulersGroupVo.java @@ -1,6 +1,6 @@ -package cn.bunny.services.domain.schedule.vo; +package cn.bunny.domain.schedule.vo; -import cn.bunny.services.domain.common.model.vo.BaseUserVo; +import cn.bunny.domain.common.model.vo.BaseUserVo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/schedule/vo/SchedulersVo.java b/domain/src/main/java/cn/bunny/domain/schedule/vo/SchedulersVo.java similarity index 95% rename from auth-core/src/main/java/cn/bunny/services/domain/schedule/vo/SchedulersVo.java rename to domain/src/main/java/cn/bunny/domain/schedule/vo/SchedulersVo.java index a7e8a0d..02e380f 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/schedule/vo/SchedulersVo.java +++ b/domain/src/main/java/cn/bunny/domain/schedule/vo/SchedulersVo.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.schedule.vo; +package cn.bunny.domain.schedule.vo; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotNull; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/dto/AssignPowersToRoleDto.java b/domain/src/main/java/cn/bunny/domain/system/dto/AssignPowersToRoleDto.java similarity index 93% rename from auth-core/src/main/java/cn/bunny/services/domain/system/dto/AssignPowersToRoleDto.java rename to domain/src/main/java/cn/bunny/domain/system/dto/AssignPowersToRoleDto.java index ca53bae..a36604a 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/dto/AssignPowersToRoleDto.java +++ b/domain/src/main/java/cn/bunny/domain/system/dto/AssignPowersToRoleDto.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.dto; +package cn.bunny.domain.system.dto; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotNull; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/dto/DeptDto.java b/domain/src/main/java/cn/bunny/domain/system/dto/DeptDto.java similarity index 92% rename from auth-core/src/main/java/cn/bunny/services/domain/system/dto/DeptDto.java rename to domain/src/main/java/cn/bunny/domain/system/dto/DeptDto.java index 053f439..4a66a0f 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/dto/DeptDto.java +++ b/domain/src/main/java/cn/bunny/domain/system/dto/DeptDto.java @@ -1,6 +1,6 @@ -package cn.bunny.services.domain.system.dto; +package cn.bunny.domain.system.dto; -import cn.bunny.services.domain.common.ValidationGroups; +import cn.bunny.domain.common.ValidationGroups; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotEmpty; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/dto/PermissionDto.java b/domain/src/main/java/cn/bunny/domain/system/dto/PermissionDto.java similarity index 92% rename from auth-core/src/main/java/cn/bunny/services/domain/system/dto/PermissionDto.java rename to domain/src/main/java/cn/bunny/domain/system/dto/PermissionDto.java index 11b7e10..6ea6227 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/dto/PermissionDto.java +++ b/domain/src/main/java/cn/bunny/domain/system/dto/PermissionDto.java @@ -1,6 +1,6 @@ -package cn.bunny.services.domain.system.dto; +package cn.bunny.domain.system.dto; -import cn.bunny.services.domain.common.ValidationGroups; +import cn.bunny.domain.common.ValidationGroups; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/dto/PermissionUpdateBatchByParentIdDto.java b/domain/src/main/java/cn/bunny/domain/system/dto/PermissionUpdateBatchByParentIdDto.java similarity index 94% rename from auth-core/src/main/java/cn/bunny/services/domain/system/dto/PermissionUpdateBatchByParentIdDto.java rename to domain/src/main/java/cn/bunny/domain/system/dto/PermissionUpdateBatchByParentIdDto.java index 01520f4..659bdc3 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/dto/PermissionUpdateBatchByParentIdDto.java +++ b/domain/src/main/java/cn/bunny/domain/system/dto/PermissionUpdateBatchByParentIdDto.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.dto; +package cn.bunny.domain.system.dto; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotEmpty; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/dto/RoleDto.java b/domain/src/main/java/cn/bunny/domain/system/dto/RoleDto.java similarity index 90% rename from auth-core/src/main/java/cn/bunny/services/domain/system/dto/RoleDto.java rename to domain/src/main/java/cn/bunny/domain/system/dto/RoleDto.java index 98c8785..5e0ca53 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/dto/RoleDto.java +++ b/domain/src/main/java/cn/bunny/domain/system/dto/RoleDto.java @@ -1,6 +1,6 @@ -package cn.bunny.services.domain.system.dto; +package cn.bunny.domain.system.dto; -import cn.bunny.services.domain.common.ValidationGroups; +import cn.bunny.domain.common.ValidationGroups; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/dto/RouterDto.java b/domain/src/main/java/cn/bunny/domain/system/dto/RouterDto.java similarity index 90% rename from auth-core/src/main/java/cn/bunny/services/domain/system/dto/RouterDto.java rename to domain/src/main/java/cn/bunny/domain/system/dto/RouterDto.java index c681b6a..c43bb46 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/dto/RouterDto.java +++ b/domain/src/main/java/cn/bunny/domain/system/dto/RouterDto.java @@ -1,7 +1,7 @@ -package cn.bunny.services.domain.system.dto; +package cn.bunny.domain.system.dto; -import cn.bunny.services.domain.common.ValidationGroups; -import cn.bunny.services.domain.system.entity.router.RouterMeta; +import cn.bunny.domain.common.ValidationGroups; +import cn.bunny.domain.system.entity.router.RouterMeta; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/dto/user/AdminUserAddDto.java b/domain/src/main/java/cn/bunny/domain/system/dto/user/AdminUserAddDto.java similarity index 93% rename from auth-core/src/main/java/cn/bunny/services/domain/system/dto/user/AdminUserAddDto.java rename to domain/src/main/java/cn/bunny/domain/system/dto/user/AdminUserAddDto.java index f6063b2..5d1a531 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/dto/user/AdminUserAddDto.java +++ b/domain/src/main/java/cn/bunny/domain/system/dto/user/AdminUserAddDto.java @@ -1,6 +1,6 @@ -package cn.bunny.services.domain.system.dto.user; +package cn.bunny.domain.system.dto.user; -import cn.bunny.services.domain.common.constant.UserConstant; +import cn.bunny.domain.common.constant.UserConstant; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/dto/user/AdminUserDto.java b/domain/src/main/java/cn/bunny/domain/system/dto/user/AdminUserDto.java similarity index 95% rename from auth-core/src/main/java/cn/bunny/services/domain/system/dto/user/AdminUserDto.java rename to domain/src/main/java/cn/bunny/domain/system/dto/user/AdminUserDto.java index cfe2a65..6680952 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/dto/user/AdminUserDto.java +++ b/domain/src/main/java/cn/bunny/domain/system/dto/user/AdminUserDto.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.dto.user; +package cn.bunny.domain.system.dto.user; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/dto/user/AdminUserUpdateByLocalUserDto.java b/domain/src/main/java/cn/bunny/domain/system/dto/user/AdminUserUpdateByLocalUserDto.java similarity index 90% rename from auth-core/src/main/java/cn/bunny/services/domain/system/dto/user/AdminUserUpdateByLocalUserDto.java rename to domain/src/main/java/cn/bunny/domain/system/dto/user/AdminUserUpdateByLocalUserDto.java index 1ce1279..c34c78f 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/dto/user/AdminUserUpdateByLocalUserDto.java +++ b/domain/src/main/java/cn/bunny/domain/system/dto/user/AdminUserUpdateByLocalUserDto.java @@ -1,6 +1,6 @@ -package cn.bunny.services.domain.system.dto.user; +package cn.bunny.domain.system.dto.user; -import cn.bunny.services.domain.common.constant.UserConstant; +import cn.bunny.domain.common.constant.UserConstant; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; import lombok.AllArgsConstructor; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/dto/user/AdminUserUpdateDto.java b/domain/src/main/java/cn/bunny/domain/system/dto/user/AdminUserUpdateDto.java similarity index 96% rename from auth-core/src/main/java/cn/bunny/services/domain/system/dto/user/AdminUserUpdateDto.java rename to domain/src/main/java/cn/bunny/domain/system/dto/user/AdminUserUpdateDto.java index 946a2e5..9a52591 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/dto/user/AdminUserUpdateDto.java +++ b/domain/src/main/java/cn/bunny/domain/system/dto/user/AdminUserUpdateDto.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.dto.user; +package cn.bunny.domain.system.dto.user; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotNull; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/dto/user/AssignRolesToUsersDto.java b/domain/src/main/java/cn/bunny/domain/system/dto/user/AssignRolesToUsersDto.java similarity index 91% rename from auth-core/src/main/java/cn/bunny/services/domain/system/dto/user/AssignRolesToUsersDto.java rename to domain/src/main/java/cn/bunny/domain/system/dto/user/AssignRolesToUsersDto.java index 86707a3..f952305 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/dto/user/AssignRolesToUsersDto.java +++ b/domain/src/main/java/cn/bunny/domain/system/dto/user/AssignRolesToUsersDto.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.dto.user; +package cn.bunny.domain.system.dto.user; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/dto/user/LoginDto.java b/domain/src/main/java/cn/bunny/domain/system/dto/user/LoginDto.java similarity index 96% rename from auth-core/src/main/java/cn/bunny/services/domain/system/dto/user/LoginDto.java rename to domain/src/main/java/cn/bunny/domain/system/dto/user/LoginDto.java index f05b9f5..e1cc0b5 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/dto/user/LoginDto.java +++ b/domain/src/main/java/cn/bunny/domain/system/dto/user/LoginDto.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.dto.user; +package cn.bunny.domain.system.dto.user; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/dto/user/RefreshTokenDto.java b/domain/src/main/java/cn/bunny/domain/system/dto/user/RefreshTokenDto.java similarity index 92% rename from auth-core/src/main/java/cn/bunny/services/domain/system/dto/user/RefreshTokenDto.java rename to domain/src/main/java/cn/bunny/domain/system/dto/user/RefreshTokenDto.java index 4c96574..a5cb48c 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/dto/user/RefreshTokenDto.java +++ b/domain/src/main/java/cn/bunny/domain/system/dto/user/RefreshTokenDto.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.dto.user; +package cn.bunny.domain.system.dto.user; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/entity/AdminUser.java b/domain/src/main/java/cn/bunny/domain/system/entity/AdminUser.java similarity index 94% rename from auth-core/src/main/java/cn/bunny/services/domain/system/entity/AdminUser.java rename to domain/src/main/java/cn/bunny/domain/system/entity/AdminUser.java index 4029abf..806c4eb 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/entity/AdminUser.java +++ b/domain/src/main/java/cn/bunny/domain/system/entity/AdminUser.java @@ -1,6 +1,6 @@ -package cn.bunny.services.domain.system.entity; +package cn.bunny.domain.system.entity; -import cn.bunny.services.domain.common.model.entity.BaseEntity; +import cn.bunny.domain.common.model.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/entity/Dept.java b/domain/src/main/java/cn/bunny/domain/system/entity/Dept.java similarity index 89% rename from auth-core/src/main/java/cn/bunny/services/domain/system/entity/Dept.java rename to domain/src/main/java/cn/bunny/domain/system/entity/Dept.java index 87b8397..ce6727f 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/entity/Dept.java +++ b/domain/src/main/java/cn/bunny/domain/system/entity/Dept.java @@ -1,6 +1,6 @@ -package cn.bunny.services.domain.system.entity; +package cn.bunny.domain.system.entity; -import cn.bunny.services.domain.common.model.entity.BaseEntity; +import cn.bunny.domain.common.model.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/entity/Permission.java b/domain/src/main/java/cn/bunny/domain/system/entity/Permission.java similarity index 89% rename from auth-core/src/main/java/cn/bunny/services/domain/system/entity/Permission.java rename to domain/src/main/java/cn/bunny/domain/system/entity/Permission.java index ec11a64..8c96537 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/entity/Permission.java +++ b/domain/src/main/java/cn/bunny/domain/system/entity/Permission.java @@ -1,6 +1,6 @@ -package cn.bunny.services.domain.system.entity; +package cn.bunny.domain.system.entity; -import cn.bunny.services.domain.common.model.entity.BaseEntity; +import cn.bunny.domain.common.model.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/entity/Role.java b/domain/src/main/java/cn/bunny/domain/system/entity/Role.java similarity index 86% rename from auth-core/src/main/java/cn/bunny/services/domain/system/entity/Role.java rename to domain/src/main/java/cn/bunny/domain/system/entity/Role.java index e6271bc..b4c1934 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/entity/Role.java +++ b/domain/src/main/java/cn/bunny/domain/system/entity/Role.java @@ -1,6 +1,6 @@ -package cn.bunny.services.domain.system.entity; +package cn.bunny.domain.system.entity; -import cn.bunny.services.domain.common.model.entity.BaseEntity; +import cn.bunny.domain.common.model.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/entity/RolePermission.java b/domain/src/main/java/cn/bunny/domain/system/entity/RolePermission.java similarity index 87% rename from auth-core/src/main/java/cn/bunny/services/domain/system/entity/RolePermission.java rename to domain/src/main/java/cn/bunny/domain/system/entity/RolePermission.java index 85933dd..ceb7ca1 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/entity/RolePermission.java +++ b/domain/src/main/java/cn/bunny/domain/system/entity/RolePermission.java @@ -1,6 +1,6 @@ -package cn.bunny.services.domain.system.entity; +package cn.bunny.domain.system.entity; -import cn.bunny.services.domain.common.model.entity.BaseEntity; +import cn.bunny.domain.common.model.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/entity/RouterRole.java b/domain/src/main/java/cn/bunny/domain/system/entity/RouterRole.java similarity index 86% rename from auth-core/src/main/java/cn/bunny/services/domain/system/entity/RouterRole.java rename to domain/src/main/java/cn/bunny/domain/system/entity/RouterRole.java index 7253c38..2fb224f 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/entity/RouterRole.java +++ b/domain/src/main/java/cn/bunny/domain/system/entity/RouterRole.java @@ -1,6 +1,6 @@ -package cn.bunny.services.domain.system.entity; +package cn.bunny.domain.system.entity; -import cn.bunny.services.domain.common.model.entity.BaseEntity; +import cn.bunny.domain.common.model.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/entity/UserDept.java b/domain/src/main/java/cn/bunny/domain/system/entity/UserDept.java similarity index 88% rename from auth-core/src/main/java/cn/bunny/services/domain/system/entity/UserDept.java rename to domain/src/main/java/cn/bunny/domain/system/entity/UserDept.java index f507525..482b1ec 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/entity/UserDept.java +++ b/domain/src/main/java/cn/bunny/domain/system/entity/UserDept.java @@ -1,6 +1,6 @@ -package cn.bunny.services.domain.system.entity; +package cn.bunny.domain.system.entity; -import cn.bunny.services.domain.common.model.entity.BaseEntity; +import cn.bunny.domain.common.model.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/entity/UserRole.java b/domain/src/main/java/cn/bunny/domain/system/entity/UserRole.java similarity index 86% rename from auth-core/src/main/java/cn/bunny/services/domain/system/entity/UserRole.java rename to domain/src/main/java/cn/bunny/domain/system/entity/UserRole.java index 4be0bc1..5ce6c18 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/entity/UserRole.java +++ b/domain/src/main/java/cn/bunny/domain/system/entity/UserRole.java @@ -1,6 +1,6 @@ -package cn.bunny.services.domain.system.entity; +package cn.bunny.domain.system.entity; -import cn.bunny.services.domain.common.model.entity.BaseEntity; +import cn.bunny.domain.common.model.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/entity/router/Router.java b/domain/src/main/java/cn/bunny/domain/system/entity/router/Router.java similarity index 90% rename from auth-core/src/main/java/cn/bunny/services/domain/system/entity/router/Router.java rename to domain/src/main/java/cn/bunny/domain/system/entity/router/Router.java index d5e1636..2b115b1 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/entity/router/Router.java +++ b/domain/src/main/java/cn/bunny/domain/system/entity/router/Router.java @@ -1,6 +1,6 @@ -package cn.bunny.services.domain.system.entity.router; +package cn.bunny.domain.system.entity.router; -import cn.bunny.services.domain.common.model.entity.BaseEntity; +import cn.bunny.domain.common.model.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/entity/router/RouterMeta.java b/domain/src/main/java/cn/bunny/domain/system/entity/router/RouterMeta.java similarity index 96% rename from auth-core/src/main/java/cn/bunny/services/domain/system/entity/router/RouterMeta.java rename to domain/src/main/java/cn/bunny/domain/system/entity/router/RouterMeta.java index 2411866..b9fb1de 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/entity/router/RouterMeta.java +++ b/domain/src/main/java/cn/bunny/domain/system/entity/router/RouterMeta.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.entity.router; +package cn.bunny.domain.system.entity.router; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/entity/router/RouterMetaTransition.java b/domain/src/main/java/cn/bunny/domain/system/entity/router/RouterMetaTransition.java similarity index 91% rename from auth-core/src/main/java/cn/bunny/services/domain/system/entity/router/RouterMetaTransition.java rename to domain/src/main/java/cn/bunny/domain/system/entity/router/RouterMetaTransition.java index 06c348d..26ecd92 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/entity/router/RouterMetaTransition.java +++ b/domain/src/main/java/cn/bunny/domain/system/entity/router/RouterMetaTransition.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.entity.router; +package cn.bunny.domain.system.entity.router; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/views/ViewRolePermission.java b/domain/src/main/java/cn/bunny/domain/system/views/ViewRolePermission.java similarity index 95% rename from auth-core/src/main/java/cn/bunny/services/domain/system/views/ViewRolePermission.java rename to domain/src/main/java/cn/bunny/domain/system/views/ViewRolePermission.java index 4a50533..c87b046 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/views/ViewRolePermission.java +++ b/domain/src/main/java/cn/bunny/domain/system/views/ViewRolePermission.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.views; +package cn.bunny.domain.system.views; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/views/ViewRouterRole.java b/domain/src/main/java/cn/bunny/domain/system/views/ViewRouterRole.java similarity index 96% rename from auth-core/src/main/java/cn/bunny/services/domain/system/views/ViewRouterRole.java rename to domain/src/main/java/cn/bunny/domain/system/views/ViewRouterRole.java index c1db23e..9323d09 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/views/ViewRouterRole.java +++ b/domain/src/main/java/cn/bunny/domain/system/views/ViewRouterRole.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.views; +package cn.bunny.domain.system.views; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/views/ViewUserDept.java b/domain/src/main/java/cn/bunny/domain/system/views/ViewUserDept.java similarity index 93% rename from auth-core/src/main/java/cn/bunny/services/domain/system/views/ViewUserDept.java rename to domain/src/main/java/cn/bunny/domain/system/views/ViewUserDept.java index 432f4af..736cf93 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/views/ViewUserDept.java +++ b/domain/src/main/java/cn/bunny/domain/system/views/ViewUserDept.java @@ -1,6 +1,6 @@ -package cn.bunny.services.domain.system.views; +package cn.bunny.domain.system.views; -import cn.bunny.services.domain.common.model.entity.BaseUserEntity; +import cn.bunny.domain.common.model.entity.BaseUserEntity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/vo/DeptVo.java b/domain/src/main/java/cn/bunny/domain/system/vo/DeptVo.java similarity index 85% rename from auth-core/src/main/java/cn/bunny/services/domain/system/vo/DeptVo.java rename to domain/src/main/java/cn/bunny/domain/system/vo/DeptVo.java index dbd890e..95943d5 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/vo/DeptVo.java +++ b/domain/src/main/java/cn/bunny/domain/system/vo/DeptVo.java @@ -1,6 +1,6 @@ -package cn.bunny.services.domain.system.vo; +package cn.bunny.domain.system.vo; -import cn.bunny.services.domain.common.model.vo.BaseUserVo; +import cn.bunny.domain.common.model.vo.BaseUserVo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/vo/PermissionVo.java b/domain/src/main/java/cn/bunny/domain/system/vo/PermissionVo.java similarity index 91% rename from auth-core/src/main/java/cn/bunny/services/domain/system/vo/PermissionVo.java rename to domain/src/main/java/cn/bunny/domain/system/vo/PermissionVo.java index 19d1b5c..7135c5d 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/vo/PermissionVo.java +++ b/domain/src/main/java/cn/bunny/domain/system/vo/PermissionVo.java @@ -1,6 +1,6 @@ -package cn.bunny.services.domain.system.vo; +package cn.bunny.domain.system.vo; -import cn.bunny.services.domain.common.model.vo.BaseUserVo; +import cn.bunny.domain.common.model.vo.BaseUserVo; import com.alibaba.fastjson2.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/vo/RoleVo.java b/domain/src/main/java/cn/bunny/domain/system/vo/RoleVo.java similarity index 81% rename from auth-core/src/main/java/cn/bunny/services/domain/system/vo/RoleVo.java rename to domain/src/main/java/cn/bunny/domain/system/vo/RoleVo.java index a5119d4..6f5c5a7 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/vo/RoleVo.java +++ b/domain/src/main/java/cn/bunny/domain/system/vo/RoleVo.java @@ -1,6 +1,6 @@ -package cn.bunny.services.domain.system.vo; +package cn.bunny.domain.system.vo; -import cn.bunny.services.domain.common.model.vo.BaseUserVo; +import cn.bunny.domain.common.model.vo.BaseUserVo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/vo/router/RouterManageVo.java b/domain/src/main/java/cn/bunny/domain/system/vo/router/RouterManageVo.java similarity index 96% rename from auth-core/src/main/java/cn/bunny/services/domain/system/vo/router/RouterManageVo.java rename to domain/src/main/java/cn/bunny/domain/system/vo/router/RouterManageVo.java index 8497f6e..17e575d 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/vo/router/RouterManageVo.java +++ b/domain/src/main/java/cn/bunny/domain/system/vo/router/RouterManageVo.java @@ -1,6 +1,6 @@ -package cn.bunny.services.domain.system.vo.router; +package cn.bunny.domain.system.vo.router; -import cn.bunny.services.domain.common.model.vo.BaseUserVo; +import cn.bunny.domain.common.model.vo.BaseUserVo; import com.alibaba.fastjson2.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/vo/router/RouterVo.java b/domain/src/main/java/cn/bunny/domain/system/vo/router/RouterVo.java similarity index 89% rename from auth-core/src/main/java/cn/bunny/services/domain/system/vo/router/RouterVo.java rename to domain/src/main/java/cn/bunny/domain/system/vo/router/RouterVo.java index 9750e80..4f5c4a4 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/vo/router/RouterVo.java +++ b/domain/src/main/java/cn/bunny/domain/system/vo/router/RouterVo.java @@ -1,6 +1,6 @@ -package cn.bunny.services.domain.system.vo.router; +package cn.bunny.domain.system.vo.router; -import cn.bunny.services.domain.common.model.vo.BaseUserVo; +import cn.bunny.domain.common.model.vo.BaseUserVo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/vo/router/WebUserRouterVo.java b/domain/src/main/java/cn/bunny/domain/system/vo/router/WebUserRouterVo.java similarity index 93% rename from auth-core/src/main/java/cn/bunny/services/domain/system/vo/router/WebUserRouterVo.java rename to domain/src/main/java/cn/bunny/domain/system/vo/router/WebUserRouterVo.java index 0125193..cf35957 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/vo/router/WebUserRouterVo.java +++ b/domain/src/main/java/cn/bunny/domain/system/vo/router/WebUserRouterVo.java @@ -1,6 +1,6 @@ -package cn.bunny.services.domain.system.vo.router; +package cn.bunny.domain.system.vo.router; -import cn.bunny.services.domain.system.entity.router.RouterMeta; +import cn.bunny.domain.system.entity.router.RouterMeta; import com.alibaba.fastjson2.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/vo/user/AdminUserVo.java b/domain/src/main/java/cn/bunny/domain/system/vo/user/AdminUserVo.java similarity index 93% rename from auth-core/src/main/java/cn/bunny/services/domain/system/vo/user/AdminUserVo.java rename to domain/src/main/java/cn/bunny/domain/system/vo/user/AdminUserVo.java index bf2420f..3736d84 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/vo/user/AdminUserVo.java +++ b/domain/src/main/java/cn/bunny/domain/system/vo/user/AdminUserVo.java @@ -1,6 +1,6 @@ -package cn.bunny.services.domain.system.vo.user; +package cn.bunny.domain.system.vo.user; -import cn.bunny.services.domain.common.model.vo.BaseUserVo; +import cn.bunny.domain.common.model.vo.BaseUserVo; import com.alibaba.fastjson2.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/vo/user/RefreshTokenVo.java b/domain/src/main/java/cn/bunny/domain/system/vo/user/RefreshTokenVo.java similarity index 92% rename from auth-core/src/main/java/cn/bunny/services/domain/system/vo/user/RefreshTokenVo.java rename to domain/src/main/java/cn/bunny/domain/system/vo/user/RefreshTokenVo.java index 251e7cf..689c746 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/vo/user/RefreshTokenVo.java +++ b/domain/src/main/java/cn/bunny/domain/system/vo/user/RefreshTokenVo.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.vo.user; +package cn.bunny.domain.system.vo.user; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/vo/user/UserVo.java b/domain/src/main/java/cn/bunny/domain/system/vo/user/UserVo.java similarity index 90% rename from auth-core/src/main/java/cn/bunny/services/domain/system/vo/user/UserVo.java rename to domain/src/main/java/cn/bunny/domain/system/vo/user/UserVo.java index 3c9bf16..071c283 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/vo/user/UserVo.java +++ b/domain/src/main/java/cn/bunny/domain/system/vo/user/UserVo.java @@ -1,6 +1,6 @@ -package cn.bunny.services.domain.system.vo.user; +package cn.bunny.domain.system.vo.user; -import cn.bunny.services.domain.common.model.vo.BaseVo; +import cn.bunny.domain.common.model.vo.BaseVo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/pom.xml b/pom.xml index 0c35bd4..8a77721 100644 --- a/pom.xml +++ b/pom.xml @@ -16,10 +16,9 @@ auth-admin - service - dao auth-core - auth-api + auth-system + domain