diff --git a/flyfish-data/flyfish-data-mongodb/pom.xml b/flyfish-data/flyfish-data-mongodb/pom.xml index 9a1885c..0ada26b 100644 --- a/flyfish-data/flyfish-data-mongodb/pom.xml +++ b/flyfish-data/flyfish-data-mongodb/pom.xml @@ -31,5 +31,11 @@ com.flyfish.framework flyfish-data-common + + + org.springframework.boot + spring-boot-starter-test + test + diff --git a/flyfish-data/flyfish-data-mongodb/src/main/java/com/flyfish/framework/mongodb/config/MongoDataConfig.java b/flyfish-data/flyfish-data-mongodb/src/main/java/com/flyfish/framework/mongodb/config/MongoDataConfig.java index ccefb06..b6de5ec 100644 --- a/flyfish-data/flyfish-data-mongodb/src/main/java/com/flyfish/framework/mongodb/config/MongoDataConfig.java +++ b/flyfish-data/flyfish-data-mongodb/src/main/java/com/flyfish/framework/mongodb/config/MongoDataConfig.java @@ -1,27 +1,74 @@ package com.flyfish.framework.mongodb.config; +import com.flyfish.framework.mongodb.config.annotations.EnableMongoRepo; +import com.flyfish.framework.mongodb.config.annotations.EnableReactiveMongoRepo; import com.flyfish.framework.mongodb.operations.MongoReactiveEntityOperations; +import com.flyfish.framework.mongodb.repository.factory.DefaultReactiveRepositoryFactoryBean; import com.flyfish.framework.mongodb.repository.factory.DefaultRepositoryFactoryBean; +import com.flyfish.framework.mongodb.repository.impl.DefaultReactiveRepositoryImpl; import com.flyfish.framework.mongodb.repository.impl.DefaultRepositoryImpl; import com.flyfish.framework.repository.ReactiveEntityOperations; -import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; +import org.springframework.boot.autoconfigure.AutoConfiguration; +import org.springframework.boot.autoconfigure.data.mongo.MongoDataAutoConfiguration; import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Import; +import org.springframework.context.annotation.ImportSelector; +import org.springframework.core.type.AnnotationMetadata; import org.springframework.data.mongodb.config.EnableMongoAuditing; +import org.springframework.data.mongodb.config.EnableReactiveMongoAuditing; import org.springframework.data.mongodb.core.ReactiveMongoOperations; import org.springframework.data.mongodb.repository.config.EnableMongoRepositories; +import org.springframework.data.mongodb.repository.config.EnableReactiveMongoRepositories; +import org.springframework.lang.NonNull; -@EnableMongoRepositories( - repositoryFactoryBeanClass = DefaultRepositoryFactoryBean.class, - repositoryBaseClass = DefaultRepositoryImpl.class -) -@EnableMongoAuditing -@Configuration +import java.util.ArrayList; +import java.util.List; + +import static com.flyfish.framework.mongodb.config.MongoDataConfig.MongoRepositoriesImportSelector; + +@AutoConfiguration(before = MongoDataAutoConfiguration.class) +@Import(MongoRepositoriesImportSelector.class) public class MongoDataConfig { - @Bean - @ConditionalOnBean(ReactiveMongoOperations.class) - public ReactiveEntityOperations mongoReactiveEntityOperations(ReactiveMongoOperations reactiveMongoOperations) { - return new MongoReactiveEntityOperations(reactiveMongoOperations); + static class MongoRepositoriesImportSelector implements ImportSelector { + + @Override + @NonNull + public String[] selectImports(@NonNull AnnotationMetadata annotationMetadata) { + List imports = new ArrayList<>(); + if (annotationMetadata.hasMetaAnnotation(EnableMongoRepo.class.getName())) { + imports.add(MongoRepoConfig.class.getName()); + } + if (annotationMetadata.hasMetaAnnotation(EnableReactiveMongoRepo.class.getName())) { + imports.add(ReactiveMongoRepoConfig.class.getName()); + } + return imports.toArray(new String[]{}); + } } + + + @EnableReactiveMongoRepositories( + repositoryFactoryBeanClass = DefaultReactiveRepositoryFactoryBean.class, + repositoryBaseClass = DefaultReactiveRepositoryImpl.class, + basePackages = "com.flyfish.framework.*.repository" + ) + @EnableReactiveMongoAuditing + public static class ReactiveMongoRepoConfig { + + @Bean + public ReactiveEntityOperations mongoReactiveEntityOperations(ReactiveMongoOperations reactiveMongoOperations) { + return new MongoReactiveEntityOperations(reactiveMongoOperations); + } + } + + @EnableMongoRepositories( + repositoryFactoryBeanClass = DefaultRepositoryFactoryBean.class, + repositoryBaseClass = DefaultRepositoryImpl.class, + basePackages = "com.flyfish.framework.*.repository" + ) + @EnableMongoAuditing + public static class MongoRepoConfig { + + } + } diff --git a/flyfish-data/flyfish-data-mongodb/src/main/java/com/flyfish/framework/mongodb/config/annotations/EnableMongoRepo.java b/flyfish-data/flyfish-data-mongodb/src/main/java/com/flyfish/framework/mongodb/config/annotations/EnableMongoRepo.java index d41e37e..d6025e5 100644 --- a/flyfish-data/flyfish-data-mongodb/src/main/java/com/flyfish/framework/mongodb/config/annotations/EnableMongoRepo.java +++ b/flyfish-data/flyfish-data-mongodb/src/main/java/com/flyfish/framework/mongodb/config/annotations/EnableMongoRepo.java @@ -3,7 +3,6 @@ package com.flyfish.framework.mongodb.config.annotations; import com.flyfish.framework.mongodb.repository.factory.DefaultRepositoryFactoryBean; import com.flyfish.framework.mongodb.repository.impl.DefaultRepositoryImpl; import org.springframework.core.annotation.AliasFor; -import org.springframework.data.mongodb.config.EnableMongoAuditing; import org.springframework.data.mongodb.repository.config.EnableMongoRepositories; import java.lang.annotation.*; @@ -12,7 +11,6 @@ import java.lang.annotation.*; repositoryFactoryBeanClass = DefaultRepositoryFactoryBean.class, repositoryBaseClass = DefaultRepositoryImpl.class ) -@EnableMongoAuditing @Target({ElementType.TYPE}) @Retention(RetentionPolicy.RUNTIME) @Documented diff --git a/flyfish-data/flyfish-data-mongodb/src/main/java/com/flyfish/framework/mongodb/config/annotations/EnableReactiveMongoRepo.java b/flyfish-data/flyfish-data-mongodb/src/main/java/com/flyfish/framework/mongodb/config/annotations/EnableReactiveMongoRepo.java index 7fad1ed..791b860 100644 --- a/flyfish-data/flyfish-data-mongodb/src/main/java/com/flyfish/framework/mongodb/config/annotations/EnableReactiveMongoRepo.java +++ b/flyfish-data/flyfish-data-mongodb/src/main/java/com/flyfish/framework/mongodb/config/annotations/EnableReactiveMongoRepo.java @@ -3,7 +3,6 @@ package com.flyfish.framework.mongodb.config.annotations; import com.flyfish.framework.mongodb.repository.factory.DefaultReactiveRepositoryFactoryBean; import com.flyfish.framework.mongodb.repository.impl.DefaultReactiveRepositoryImpl; import org.springframework.core.annotation.AliasFor; -import org.springframework.data.mongodb.config.EnableReactiveMongoAuditing; import org.springframework.data.mongodb.repository.config.EnableReactiveMongoRepositories; import java.lang.annotation.*; @@ -12,7 +11,6 @@ import java.lang.annotation.*; repositoryFactoryBeanClass = DefaultReactiveRepositoryFactoryBean.class, repositoryBaseClass = DefaultReactiveRepositoryImpl.class ) -@EnableReactiveMongoAuditing @Target({ElementType.TYPE}) @Retention(RetentionPolicy.RUNTIME) @Documented @@ -25,5 +23,5 @@ public @interface EnableReactiveMongoRepo { * @return 结果 */ @AliasFor(annotation = EnableReactiveMongoRepositories.class) - String[] basePackages() default "com.flyfish"; + String[] basePackages() default {}; } diff --git a/flyfish-data/flyfish-data-mongodb/src/test/java/com/flyfish/test/mongo/MongoRepositoryTest.java b/flyfish-data/flyfish-data-mongodb/src/test/java/com/flyfish/test/mongo/MongoRepositoryTest.java new file mode 100644 index 0000000..fda8606 --- /dev/null +++ b/flyfish-data/flyfish-data-mongodb/src/test/java/com/flyfish/test/mongo/MongoRepositoryTest.java @@ -0,0 +1,39 @@ +package com.flyfish.test.mongo; + +import com.flyfish.test.mongo.repository.TestDO; +import com.flyfish.test.mongo.repository.TestQO; +import com.flyfish.test.mongo.repository.TestRepository; +import com.flyfish.framework.mongodb.config.MongoDataConfig; +import com.flyfish.framework.mongodb.config.annotations.EnableReactiveMongoRepo; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.context.annotation.Import; +import org.springframework.test.context.junit.jupiter.SpringExtension; + +import javax.annotation.Resource; + +@ExtendWith(SpringExtension.class) +@SpringBootTest(classes = MongoRepositoryTest.class) +@SpringBootApplication(scanBasePackages = "com.flyfish.framework") +@Import(MongoDataConfig.class) +@EnableReactiveMongoRepo +public class MongoRepositoryTest { + + @Resource + private TestRepository testRepository; + + @Test + public void test() { + TestQO qo = new TestQO(); + qo.setName("名"); + TestDO test = new TestDO(); + test.setId("1"); + test.setCode("ttt"); + test.setName("测试名称"); + + System.out.println(testRepository.insert(test).block()); + System.out.println(testRepository.findAll(qo).collectList().block()); + } +} diff --git a/flyfish-data/flyfish-data-mongodb/src/test/java/com/flyfish/test/mongo/repository/TestDO.java b/flyfish-data/flyfish-data-mongodb/src/test/java/com/flyfish/test/mongo/repository/TestDO.java new file mode 100644 index 0000000..4d3b427 --- /dev/null +++ b/flyfish-data/flyfish-data-mongodb/src/test/java/com/flyfish/test/mongo/repository/TestDO.java @@ -0,0 +1,11 @@ +package com.flyfish.test.mongo.repository; + +import com.flyfish.framework.domain.base.AuditDomain; +import lombok.Data; +import org.springframework.data.mongodb.core.mapping.Document; + +@Document("test") +@Data +public class TestDO extends AuditDomain { + +} diff --git a/flyfish-data/flyfish-data-mongodb/src/test/java/com/flyfish/test/mongo/repository/TestQO.java b/flyfish-data/flyfish-data-mongodb/src/test/java/com/flyfish/test/mongo/repository/TestQO.java new file mode 100644 index 0000000..474ed34 --- /dev/null +++ b/flyfish-data/flyfish-data-mongodb/src/test/java/com/flyfish/test/mongo/repository/TestQO.java @@ -0,0 +1,7 @@ +package com.flyfish.test.mongo.repository; + +import com.flyfish.framework.domain.base.NameLikeQo; + +public class TestQO extends NameLikeQo { + +} diff --git a/flyfish-data/flyfish-data-mongodb/src/test/java/com/flyfish/test/mongo/repository/TestRepository.java b/flyfish-data/flyfish-data-mongodb/src/test/java/com/flyfish/test/mongo/repository/TestRepository.java new file mode 100644 index 0000000..8952f63 --- /dev/null +++ b/flyfish-data/flyfish-data-mongodb/src/test/java/com/flyfish/test/mongo/repository/TestRepository.java @@ -0,0 +1,9 @@ +package com.flyfish.test.mongo.repository; + +import com.flyfish.framework.repository.DefaultReactiveRepository; + +/** + * 测试仓库 + */ +public interface TestRepository extends DefaultReactiveRepository { +} diff --git a/flyfish-data/flyfish-data-mongodb/src/test/resources/application.yml b/flyfish-data/flyfish-data-mongodb/src/test/resources/application.yml new file mode 100644 index 0000000..7c16209 --- /dev/null +++ b/flyfish-data/flyfish-data-mongodb/src/test/resources/application.yml @@ -0,0 +1,5 @@ +spring: + data: + mongodb: + host: 127.0.0.1 + port: 27017 diff --git a/flyfish-data/flyfish-data-mongodb/src/test/resources/schema-clean.sql b/flyfish-data/flyfish-data-mongodb/src/test/resources/schema-clean.sql new file mode 100644 index 0000000..ea9d6dd --- /dev/null +++ b/flyfish-data/flyfish-data-mongodb/src/test/resources/schema-clean.sql @@ -0,0 +1 @@ +DROP TABLE IF EXISTS `test`; diff --git a/flyfish-data/flyfish-data-mongodb/src/test/resources/schema.sql b/flyfish-data/flyfish-data-mongodb/src/test/resources/schema.sql new file mode 100644 index 0000000..17ff389 --- /dev/null +++ b/flyfish-data/flyfish-data-mongodb/src/test/resources/schema.sql @@ -0,0 +1,14 @@ +CREATE TABLE IF NOT EXISTS `test` +( + `id` VARCHAR(36) NOT NULL COMMENT '主键', + `code` VARCHAR(32) NOT NULL COMMENT '编码', + `name` VARCHAR(100) NOT NULL COMMENT '名称', + `create_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `modify_time` DATETIME NOT NULL COMMENT '修改时间', + `creator` VARCHAR(36) NULL COMMENT '创建人名称', + `creator_id` VARCHAR(36) NULL COMMENT '创建人id', + `modifier` VARCHAR(36) NULL COMMENT '修改人名称', + `modifier_id` VARCHAR(36) NULL COMMENT '修改人id', + `delete` BIT(1) NOT NULL DEFAULT b'0', + PRIMARY KEY (`id`) +) COMMENT '测试表'; diff --git a/flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/config/R2dbcDataConfig.java b/flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/config/R2dbcDataConfig.java index cef3e31..a037771 100644 --- a/flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/config/R2dbcDataConfig.java +++ b/flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/config/R2dbcDataConfig.java @@ -29,7 +29,7 @@ import java.util.Optional; @EnableR2dbcRepositories( repositoryFactoryBeanClass = DefaultReactiveRepositoryFactoryBean.class, repositoryBaseClass = DefaultReactiveRepositoryImpl.class, - basePackages = "com.flyfish.framework" + basePackages = "com.flyfish.framework.*.repository" ) @EnableR2dbcAuditing @AutoConfiguration(before = R2dbcAutoConfiguration.class) diff --git a/flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/query/fill/R2dbcReferenceFiller.java b/flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/query/fill/R2dbcReferenceFiller.java new file mode 100644 index 0000000..a201f3e --- /dev/null +++ b/flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/query/fill/R2dbcReferenceFiller.java @@ -0,0 +1,17 @@ +package com.flyfish.framework.r2dbc.query.fill; + +import com.flyfish.framework.domain.base.Domain; +import reactor.core.publisher.Flux; +import reactor.core.publisher.Mono; + +/** + * r2dbc引用填充 + * + * @author wangyu + */ +public interface R2dbcReferenceFiller { + + Flux fill(Flux beans); + + Mono fill(Mono bean); +} diff --git a/flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/repository/impl/DefaultReactiveRepositoryImpl.java b/flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/repository/impl/DefaultReactiveRepositoryImpl.java index a3eb5bf..36b54be 100644 --- a/flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/repository/impl/DefaultReactiveRepositoryImpl.java +++ b/flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/repository/impl/DefaultReactiveRepositoryImpl.java @@ -13,10 +13,12 @@ import org.springframework.data.domain.Sort; import org.springframework.data.r2dbc.convert.R2dbcConverter; import org.springframework.data.r2dbc.core.R2dbcEntityOperations; import org.springframework.data.r2dbc.repository.support.SimpleR2dbcRepository; +import org.springframework.data.relational.core.mapping.RelationalPersistentEntity; import org.springframework.data.relational.core.query.Criteria; import org.springframework.data.relational.core.query.Query; import org.springframework.data.relational.repository.query.RelationalEntityInformation; import org.springframework.data.repository.core.EntityInformation; +import org.springframework.data.util.Lazy; import org.springframework.lang.NonNull; import org.springframework.util.Assert; import reactor.core.publisher.Flux; @@ -38,6 +40,8 @@ public class DefaultReactiveRepositoryImpl extends SimpleR2dbc private final R2dbcEntityOperations entityOperations; + private final Lazy> persistentEntity; + /** * 构造新的默认仓库 * @@ -49,6 +53,9 @@ public class DefaultReactiveRepositoryImpl extends SimpleR2dbc super(entity, entityOperations, converter); this.entity = entity; this.entityOperations = entityOperations; + this.persistentEntity = Lazy.of(() -> (RelationalPersistentEntity) converter + .getMappingContext() + .getRequiredPersistentEntity(this.entity.getJavaType())); } diff --git a/flyfish-data/flyfish-data-r2dbc/src/test/java/com/flyfish/framework/r2dbc/R2DbcRepositoryTest.java b/flyfish-data/flyfish-data-r2dbc/src/test/java/com/flyfish/framework/r2dbc/R2DbcRepositoryTest.java index b679be6..feecf74 100644 --- a/flyfish-data/flyfish-data-r2dbc/src/test/java/com/flyfish/framework/r2dbc/R2DbcRepositoryTest.java +++ b/flyfish-data/flyfish-data-r2dbc/src/test/java/com/flyfish/framework/r2dbc/R2DbcRepositoryTest.java @@ -1,22 +1,17 @@ package com.flyfish.framework.r2dbc; -import com.flyfish.framework.query.Queries; import com.flyfish.framework.r2dbc.config.R2dbcDataConfig; -import com.flyfish.framework.r2dbc.config.annotations.EnableR2dbcRepo; import com.flyfish.framework.r2dbc.repository.TestDO; import com.flyfish.framework.r2dbc.repository.TestQO; import com.flyfish.framework.r2dbc.repository.TestRepository; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.autoconfigure.r2dbc.R2dbcProperties; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Import; import org.springframework.test.context.junit.jupiter.SpringExtension; import javax.annotation.Resource; -import java.util.Arrays; @ExtendWith(SpringExtension.class) @SpringBootTest(classes = R2DbcRepositoryTest.class) diff --git a/flyfish-user/src/main/java/com/flyfish/framework/annotations/.gitkeep b/flyfish-user/src/main/java/com/flyfish/framework/user/annotations/.gitkeep similarity index 100% rename from flyfish-user/src/main/java/com/flyfish/framework/annotations/.gitkeep rename to flyfish-user/src/main/java/com/flyfish/framework/user/annotations/.gitkeep diff --git a/flyfish-user/src/main/java/com/flyfish/framework/annotations/EnableAutoSecurity.java b/flyfish-user/src/main/java/com/flyfish/framework/user/annotations/EnableAutoSecurity.java similarity index 78% rename from flyfish-user/src/main/java/com/flyfish/framework/annotations/EnableAutoSecurity.java rename to flyfish-user/src/main/java/com/flyfish/framework/user/annotations/EnableAutoSecurity.java index b8d25fc..a8d0f45 100644 --- a/flyfish-user/src/main/java/com/flyfish/framework/annotations/EnableAutoSecurity.java +++ b/flyfish-user/src/main/java/com/flyfish/framework/user/annotations/EnableAutoSecurity.java @@ -1,6 +1,6 @@ -package com.flyfish.framework.annotations; +package com.flyfish.framework.user.annotations; -import com.flyfish.framework.config.WebSecurityConfig; +import com.flyfish.framework.user.config.WebSecurityConfig; import com.flyfish.framework.configuration.redis.EnableReactiveRedis; import org.springframework.context.annotation.Import; diff --git a/flyfish-user/src/main/java/com/flyfish/framework/config/AuthenticationAuditorImpl.java b/flyfish-user/src/main/java/com/flyfish/framework/user/config/AuthenticationAuditorImpl.java similarity index 95% rename from flyfish-user/src/main/java/com/flyfish/framework/config/AuthenticationAuditorImpl.java rename to flyfish-user/src/main/java/com/flyfish/framework/user/config/AuthenticationAuditorImpl.java index d4a0b65..a458709 100644 --- a/flyfish-user/src/main/java/com/flyfish/framework/config/AuthenticationAuditorImpl.java +++ b/flyfish-user/src/main/java/com/flyfish/framework/user/config/AuthenticationAuditorImpl.java @@ -1,11 +1,11 @@ -package com.flyfish.framework.config; +package com.flyfish.framework.user.config; -import com.flyfish.framework.domain.AdminUserDetails; +import com.flyfish.framework.user.domain.AdminUserDetails; import com.flyfish.framework.domain.po.User; import com.flyfish.framework.enums.UserStatus; import com.flyfish.framework.service.AuthenticationAuditor; import com.flyfish.framework.service.AuthenticationLogger; -import com.flyfish.framework.service.UserService; +import com.flyfish.framework.user.service.UserService; import com.flyfish.framework.transform.ResultDataTransformer; import org.springframework.security.authentication.BadCredentialsException; import org.springframework.security.core.AuthenticationException; diff --git a/flyfish-user/src/main/java/com/flyfish/framework/config/RSAKeys.java b/flyfish-user/src/main/java/com/flyfish/framework/user/config/RSAKeys.java similarity index 96% rename from flyfish-user/src/main/java/com/flyfish/framework/config/RSAKeys.java rename to flyfish-user/src/main/java/com/flyfish/framework/user/config/RSAKeys.java index 891374f..6d5d94d 100644 --- a/flyfish-user/src/main/java/com/flyfish/framework/config/RSAKeys.java +++ b/flyfish-user/src/main/java/com/flyfish/framework/user/config/RSAKeys.java @@ -1,4 +1,4 @@ -package com.flyfish.framework.config; +package com.flyfish.framework.user.config; /** * rsa密钥，使用PKCS8的私钥格式 diff --git a/flyfish-user/src/main/java/com/flyfish/framework/config/WebSecurityConfig.java b/flyfish-user/src/main/java/com/flyfish/framework/user/config/WebSecurityConfig.java similarity index 95% rename from flyfish-user/src/main/java/com/flyfish/framework/config/WebSecurityConfig.java rename to flyfish-user/src/main/java/com/flyfish/framework/user/config/WebSecurityConfig.java index eae65c1..001dd22 100644 --- a/flyfish-user/src/main/java/com/flyfish/framework/config/WebSecurityConfig.java +++ b/flyfish-user/src/main/java/com/flyfish/framework/user/config/WebSecurityConfig.java @@ -1,22 +1,22 @@ -package com.flyfish.framework.config; +package com.flyfish.framework.user.config; -import com.flyfish.framework.config.captcha.DxCaptchaValidator; -import com.flyfish.framework.config.converter.EncryptedAuthenticationConverter; -import com.flyfish.framework.config.properties.SecurityProperties; +import com.flyfish.framework.user.config.captcha.DxCaptchaValidator; +import com.flyfish.framework.user.config.converter.EncryptedAuthenticationConverter; +import com.flyfish.framework.user.config.properties.SecurityProperties; import com.flyfish.framework.configuration.jwt.JwtProperties; import com.flyfish.framework.configuration.jwt.JwtSecurityContextRepository; import com.flyfish.framework.configuration.jwt.TokenProvider; -import com.flyfish.framework.domain.UserQo; +import com.flyfish.framework.user.domain.UserQo; import com.flyfish.framework.domain.po.User; import com.flyfish.framework.enums.UserStatus; import com.flyfish.framework.enums.UserType; import com.flyfish.framework.handler.JsonAuthenticationFailureHandler; import com.flyfish.framework.handler.JsonAuthenticationSuccessHandler; import com.flyfish.framework.handler.JsonLogoutSuccessHandler; -import com.flyfish.framework.initializer.UserInitializer; +import com.flyfish.framework.user.initializer.UserInitializer; import com.flyfish.framework.service.AuthenticationAuditor; import com.flyfish.framework.service.AuthenticationLogger; -import com.flyfish.framework.service.UserService; +import com.flyfish.framework.user.service.UserService; import org.apache.commons.lang3.ArrayUtils; import org.springframework.beans.factory.ObjectProvider; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; diff --git a/flyfish-user/src/main/java/com/flyfish/framework/config/audit/ReactiveUserAuditor.java b/flyfish-user/src/main/java/com/flyfish/framework/user/config/audit/ReactiveUserAuditor.java similarity index 93% rename from flyfish-user/src/main/java/com/flyfish/framework/config/audit/ReactiveUserAuditor.java rename to flyfish-user/src/main/java/com/flyfish/framework/user/config/audit/ReactiveUserAuditor.java index b573421..2f25720 100644 --- a/flyfish-user/src/main/java/com/flyfish/framework/config/audit/ReactiveUserAuditor.java +++ b/flyfish-user/src/main/java/com/flyfish/framework/user/config/audit/ReactiveUserAuditor.java @@ -1,4 +1,4 @@ -package com.flyfish.framework.config.audit; +package com.flyfish.framework.user.config.audit; import com.flyfish.framework.utils.UserUtils; import org.springframework.data.domain.ReactiveAuditorAware; diff --git a/flyfish-user/src/main/java/com/flyfish/framework/config/audit/RoleBeanPoster.java b/flyfish-user/src/main/java/com/flyfish/framework/user/config/audit/RoleBeanPoster.java similarity index 88% rename from flyfish-user/src/main/java/com/flyfish/framework/config/audit/RoleBeanPoster.java rename to flyfish-user/src/main/java/com/flyfish/framework/user/config/audit/RoleBeanPoster.java index ad278bf..960fabe 100644 --- a/flyfish-user/src/main/java/com/flyfish/framework/config/audit/RoleBeanPoster.java +++ b/flyfish-user/src/main/java/com/flyfish/framework/user/config/audit/RoleBeanPoster.java @@ -1,8 +1,8 @@ -package com.flyfish.framework.config.audit; +package com.flyfish.framework.user.config.audit; import com.flyfish.framework.auditor.ReactiveBeanPoster; import com.flyfish.framework.domain.po.Role; -import com.flyfish.framework.service.UserDetailsConverter; +import com.flyfish.framework.user.service.UserDetailsConverter; import com.flyfish.framework.utils.ReactiveRedisOperations; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; diff --git a/flyfish-user/src/main/java/com/flyfish/framework/config/audit/UserAuditor.java b/flyfish-user/src/main/java/com/flyfish/framework/user/config/audit/UserAuditor.java similarity index 93% rename from flyfish-user/src/main/java/com/flyfish/framework/config/audit/UserAuditor.java rename to flyfish-user/src/main/java/com/flyfish/framework/user/config/audit/UserAuditor.java index 9e424eb..9e4ad77 100644 --- a/flyfish-user/src/main/java/com/flyfish/framework/config/audit/UserAuditor.java +++ b/flyfish-user/src/main/java/com/flyfish/framework/user/config/audit/UserAuditor.java @@ -1,4 +1,4 @@ -package com.flyfish.framework.config.audit; +package com.flyfish.framework.user.config.audit; import com.flyfish.framework.context.UserContext; import com.flyfish.framework.domain.base.Domain; diff --git a/flyfish-user/src/main/java/com/flyfish/framework/config/audit/UserBeanAuditor.java b/flyfish-user/src/main/java/com/flyfish/framework/user/config/audit/UserBeanAuditor.java similarity index 90% rename from flyfish-user/src/main/java/com/flyfish/framework/config/audit/UserBeanAuditor.java rename to flyfish-user/src/main/java/com/flyfish/framework/user/config/audit/UserBeanAuditor.java index 3c5ac57..e17a327 100644 --- a/flyfish-user/src/main/java/com/flyfish/framework/config/audit/UserBeanAuditor.java +++ b/flyfish-user/src/main/java/com/flyfish/framework/user/config/audit/UserBeanAuditor.java @@ -1,14 +1,14 @@ -package com.flyfish.framework.config.audit; +package com.flyfish.framework.user.config.audit; import com.flyfish.framework.auditor.ReactiveBeanAuditor; import com.flyfish.framework.auditor.ReactiveBeanPoster; -import com.flyfish.framework.config.constants.UserCacheKeys; +import com.flyfish.framework.user.service.UserDetailsConverter; +import com.flyfish.framework.user.utils.StrengthUtils; +import com.flyfish.framework.user.config.constants.UserCacheKeys; import com.flyfish.framework.domain.po.User; import com.flyfish.framework.enums.UserType; -import com.flyfish.framework.service.UserDetailsConverter; import com.flyfish.framework.utils.Assert; import com.flyfish.framework.utils.ReactiveRedisOperations; -import com.flyfish.framework.utils.StrengthUtils; import lombok.RequiredArgsConstructor; import org.apache.commons.lang3.StringUtils; import org.springframework.security.crypto.password.PasswordEncoder; diff --git a/flyfish-user/src/main/java/com/flyfish/framework/config/captcha/DxCaptchaValidator.java b/flyfish-user/src/main/java/com/flyfish/framework/user/config/captcha/DxCaptchaValidator.java similarity index 88% rename from flyfish-user/src/main/java/com/flyfish/framework/config/captcha/DxCaptchaValidator.java rename to flyfish-user/src/main/java/com/flyfish/framework/user/config/captcha/DxCaptchaValidator.java index 0babd6c..67684e6 100644 --- a/flyfish-user/src/main/java/com/flyfish/framework/config/captcha/DxCaptchaValidator.java +++ b/flyfish-user/src/main/java/com/flyfish/framework/user/config/captcha/DxCaptchaValidator.java @@ -1,13 +1,11 @@ -package com.flyfish.framework.config.captcha; +package com.flyfish.framework.user.config.captcha; import com.dingxianginc.ctu.client.CaptchaClient; import com.dingxianginc.ctu.client.model.CaptchaResponse; -import com.flyfish.framework.config.properties.SecurityProperties; -import lombok.RequiredArgsConstructor; +import com.flyfish.framework.user.config.properties.SecurityProperties; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.BooleanUtils; import org.springframework.security.authentication.BadCredentialsException; -import org.springframework.stereotype.Component; /** * 顶象验证码验证器 diff --git a/flyfish-user/src/main/java/com/flyfish/framework/config/constants/UserCacheKeys.java b/flyfish-user/src/main/java/com/flyfish/framework/user/config/constants/UserCacheKeys.java similarity index 80% rename from flyfish-user/src/main/java/com/flyfish/framework/config/constants/UserCacheKeys.java rename to flyfish-user/src/main/java/com/flyfish/framework/user/config/constants/UserCacheKeys.java index aa8fb3b..4eae820 100644 --- a/flyfish-user/src/main/java/com/flyfish/framework/config/constants/UserCacheKeys.java +++ b/flyfish-user/src/main/java/com/flyfish/framework/user/config/constants/UserCacheKeys.java @@ -1,4 +1,4 @@ -package com.flyfish.framework.config.constants; +package com.flyfish.framework.user.config.constants; public interface UserCacheKeys { diff --git a/flyfish-user/src/main/java/com/flyfish/framework/config/converter/EncryptedAuthenticationConverter.java b/flyfish-user/src/main/java/com/flyfish/framework/user/config/converter/EncryptedAuthenticationConverter.java similarity index 89% rename from flyfish-user/src/main/java/com/flyfish/framework/config/converter/EncryptedAuthenticationConverter.java rename to flyfish-user/src/main/java/com/flyfish/framework/user/config/converter/EncryptedAuthenticationConverter.java index 0eaa082..2cd5439 100644 --- a/flyfish-user/src/main/java/com/flyfish/framework/config/converter/EncryptedAuthenticationConverter.java +++ b/flyfish-user/src/main/java/com/flyfish/framework/user/config/converter/EncryptedAuthenticationConverter.java @@ -1,9 +1,9 @@ -package com.flyfish.framework.config.converter; +package com.flyfish.framework.user.config.converter; -import com.flyfish.framework.config.RSAKeys; -import com.flyfish.framework.config.captcha.DxCaptchaValidator; -import com.flyfish.framework.config.properties.SecurityProperties; -import com.flyfish.framework.utils.RSAUtils; +import com.flyfish.framework.user.config.RSAKeys; +import com.flyfish.framework.user.utils.RSAUtils; +import com.flyfish.framework.user.config.captcha.DxCaptchaValidator; +import com.flyfish.framework.user.config.properties.SecurityProperties; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import lombok.val; diff --git a/flyfish-user/src/main/java/com/flyfish/framework/config/properties/SecurityProperties.java b/flyfish-user/src/main/java/com/flyfish/framework/user/config/properties/SecurityProperties.java similarity index 93% rename from flyfish-user/src/main/java/com/flyfish/framework/config/properties/SecurityProperties.java rename to flyfish-user/src/main/java/com/flyfish/framework/user/config/properties/SecurityProperties.java index 82e555b..23fc2d4 100644 --- a/flyfish-user/src/main/java/com/flyfish/framework/config/properties/SecurityProperties.java +++ b/flyfish-user/src/main/java/com/flyfish/framework/user/config/properties/SecurityProperties.java @@ -1,4 +1,4 @@ -package com.flyfish.framework.config.properties; +package com.flyfish.framework.user.config.properties; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/flyfish-user/src/main/java/com/flyfish/framework/controller/DepartmentController.java b/flyfish-user/src/main/java/com/flyfish/framework/user/controller/DepartmentController.java similarity index 91% rename from flyfish-user/src/main/java/com/flyfish/framework/controller/DepartmentController.java rename to flyfish-user/src/main/java/com/flyfish/framework/user/controller/DepartmentController.java index b18c865..d8ce182 100644 --- a/flyfish-user/src/main/java/com/flyfish/framework/controller/DepartmentController.java +++ b/flyfish-user/src/main/java/com/flyfish/framework/user/controller/DepartmentController.java @@ -1,12 +1,12 @@ -package com.flyfish.framework.controller; +package com.flyfish.framework.user.controller; import com.flyfish.framework.bean.Result; import com.flyfish.framework.controller.reactive.ReactiveTreeController; -import com.flyfish.framework.domain.AdminUserDetails; -import com.flyfish.framework.domain.DepartmentQo; +import com.flyfish.framework.user.service.DepartmentService; +import com.flyfish.framework.user.domain.AdminUserDetails; +import com.flyfish.framework.user.domain.DepartmentQo; import com.flyfish.framework.domain.po.Department; import com.flyfish.framework.enums.UserType; -import com.flyfish.framework.service.DepartmentService; import com.flyfish.framework.utils.DepartUtils; import com.flyfish.framework.utils.UserUtils; import org.apache.commons.collections4.CollectionUtils; diff --git a/flyfish-user/src/main/java/com/flyfish/framework/controller/LoginController.java b/flyfish-user/src/main/java/com/flyfish/framework/user/controller/LoginController.java similarity index 79% rename from flyfish-user/src/main/java/com/flyfish/framework/controller/LoginController.java rename to flyfish-user/src/main/java/com/flyfish/framework/user/controller/LoginController.java index 6087059..383d4ac 100644 --- a/flyfish-user/src/main/java/com/flyfish/framework/controller/LoginController.java +++ b/flyfish-user/src/main/java/com/flyfish/framework/user/controller/LoginController.java @@ -1,13 +1,9 @@ -package com.flyfish.framework.controller; +package com.flyfish.framework.user.controller; import com.flyfish.framework.bean.Result; -import com.flyfish.framework.config.RSAKeys; -import com.flyfish.framework.config.properties.SecurityProperties; -import com.flyfish.framework.configuration.annotations.CurrentUser; +import com.flyfish.framework.user.config.RSAKeys; +import com.flyfish.framework.user.config.properties.SecurityProperties; import com.flyfish.framework.configuration.jwt.TokenProvider; -import com.flyfish.framework.domain.po.User; -import com.flyfish.framework.utils.UserUtils; -import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.ReactiveSecurityContextHolder; import org.springframework.web.bind.annotation.*; diff --git a/flyfish-user/src/main/java/com/flyfish/framework/controller/PermissionController.java b/flyfish-user/src/main/java/com/flyfish/framework/user/controller/PermissionController.java similarity index 81% rename from flyfish-user/src/main/java/com/flyfish/framework/controller/PermissionController.java rename to flyfish-user/src/main/java/com/flyfish/framework/user/controller/PermissionController.java index 870fb02..6985e32 100644 --- a/flyfish-user/src/main/java/com/flyfish/framework/controller/PermissionController.java +++ b/flyfish-user/src/main/java/com/flyfish/framework/user/controller/PermissionController.java @@ -1,7 +1,7 @@ -package com.flyfish.framework.controller; +package com.flyfish.framework.user.controller; import com.flyfish.framework.controller.reactive.ReactiveTreeController; -import com.flyfish.framework.domain.PermissionQo; +import com.flyfish.framework.user.domain.PermissionQo; import com.flyfish.framework.domain.po.Permission; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/flyfish-user/src/main/java/com/flyfish/framework/controller/RoleController.java b/flyfish-user/src/main/java/com/flyfish/framework/user/controller/RoleController.java similarity index 81% rename from flyfish-user/src/main/java/com/flyfish/framework/controller/RoleController.java rename to flyfish-user/src/main/java/com/flyfish/framework/user/controller/RoleController.java index 4fbf5e2..b094f5c 100644 --- a/flyfish-user/src/main/java/com/flyfish/framework/controller/RoleController.java +++ b/flyfish-user/src/main/java/com/flyfish/framework/user/controller/RoleController.java @@ -1,7 +1,7 @@ -package com.flyfish.framework.controller; +package com.flyfish.framework.user.controller; import com.flyfish.framework.controller.reactive.ReactiveBaseController; -import com.flyfish.framework.domain.RoleQo; +import com.flyfish.framework.user.domain.RoleQo; import com.flyfish.framework.domain.po.Role; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/flyfish-user/src/main/java/com/flyfish/framework/controller/UserController.java b/flyfish-user/src/main/java/com/flyfish/framework/user/controller/UserController.java similarity index 94% rename from flyfish-user/src/main/java/com/flyfish/framework/controller/UserController.java rename to flyfish-user/src/main/java/com/flyfish/framework/user/controller/UserController.java index 4591409..f6d9db5 100644 --- a/flyfish-user/src/main/java/com/flyfish/framework/controller/UserController.java +++ b/flyfish-user/src/main/java/com/flyfish/framework/user/controller/UserController.java @@ -1,18 +1,18 @@ -package com.flyfish.framework.controller; +package com.flyfish.framework.user.controller; import com.flyfish.framework.annotations.Operation; import com.flyfish.framework.bean.Result; import com.flyfish.framework.configuration.annotations.CurrentUser; import com.flyfish.framework.controller.reactive.ReactiveBaseController; -import com.flyfish.framework.domain.UserPasswordDto; -import com.flyfish.framework.domain.UserQo; +import com.flyfish.framework.user.utils.StrengthUtils; +import com.flyfish.framework.user.domain.UserPasswordDto; +import com.flyfish.framework.user.domain.UserQo; import com.flyfish.framework.domain.base.IUser; import com.flyfish.framework.domain.po.Role; import com.flyfish.framework.domain.po.User; import com.flyfish.framework.enums.UserStatus; -import com.flyfish.framework.service.UserService; +import com.flyfish.framework.user.service.UserService; import com.flyfish.framework.utils.Assert; -import com.flyfish.framework.utils.StrengthUtils; import com.flyfish.framework.utils.UserUtils; import org.springframework.security.core.context.ReactiveSecurityContextHolder; import org.springframework.security.crypto.password.PasswordEncoder; diff --git a/flyfish-user/src/main/java/com/flyfish/framework/domain/AdminUserDetails.java b/flyfish-user/src/main/java/com/flyfish/framework/user/domain/AdminUserDetails.java similarity index 98% rename from flyfish-user/src/main/java/com/flyfish/framework/domain/AdminUserDetails.java rename to flyfish-user/src/main/java/com/flyfish/framework/user/domain/AdminUserDetails.java index 4b9d7de..63870f8 100644 --- a/flyfish-user/src/main/java/com/flyfish/framework/domain/AdminUserDetails.java +++ b/flyfish-user/src/main/java/com/flyfish/framework/user/domain/AdminUserDetails.java @@ -1,4 +1,4 @@ -package com.flyfish.framework.domain; +package com.flyfish.framework.user.domain; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/flyfish-user/src/main/java/com/flyfish/framework/domain/DepartmentQo.java b/flyfish-user/src/main/java/com/flyfish/framework/user/domain/DepartmentQo.java similarity index 93% rename from flyfish-user/src/main/java/com/flyfish/framework/domain/DepartmentQo.java rename to flyfish-user/src/main/java/com/flyfish/framework/user/domain/DepartmentQo.java index f00388b..cac3626 100644 --- a/flyfish-user/src/main/java/com/flyfish/framework/domain/DepartmentQo.java +++ b/flyfish-user/src/main/java/com/flyfish/framework/user/domain/DepartmentQo.java @@ -1,4 +1,4 @@ -package com.flyfish.framework.domain; +package com.flyfish.framework.user.domain; import com.flyfish.framework.domain.po.Department; import com.flyfish.framework.domain.tree.TreeQo; diff --git a/flyfish-user/src/main/java/com/flyfish/framework/domain/LoginDto.java b/flyfish-user/src/main/java/com/flyfish/framework/user/domain/LoginDto.java similarity index 78% rename from flyfish-user/src/main/java/com/flyfish/framework/domain/LoginDto.java rename to flyfish-user/src/main/java/com/flyfish/framework/user/domain/LoginDto.java index 5000644..0b1f218 100644 --- a/flyfish-user/src/main/java/com/flyfish/framework/domain/LoginDto.java +++ b/flyfish-user/src/main/java/com/flyfish/framework/user/domain/LoginDto.java @@ -1,4 +1,4 @@ -package com.flyfish.framework.domain; +package com.flyfish.framework.user.domain; import lombok.Data; diff --git a/flyfish-user/src/main/java/com/flyfish/framework/domain/PermissionQo.java b/flyfish-user/src/main/java/com/flyfish/framework/user/domain/PermissionQo.java similarity index 94% rename from flyfish-user/src/main/java/com/flyfish/framework/domain/PermissionQo.java rename to flyfish-user/src/main/java/com/flyfish/framework/user/domain/PermissionQo.java index fb78326..c164d62 100644 --- a/flyfish-user/src/main/java/com/flyfish/framework/domain/PermissionQo.java +++ b/flyfish-user/src/main/java/com/flyfish/framework/user/domain/PermissionQo.java @@ -1,4 +1,4 @@ -package com.flyfish.framework.domain; +package com.flyfish.framework.user.domain; import com.flyfish.framework.domain.po.Permission; diff --git a/flyfish-user/src/main/java/com/flyfish/framework/domain/RoleQo.java b/flyfish-user/src/main/java/com/flyfish/framework/user/domain/RoleQo.java similarity index 95% rename from flyfish-user/src/main/java/com/flyfish/framework/domain/RoleQo.java rename to flyfish-user/src/main/java/com/flyfish/framework/user/domain/RoleQo.java index ff48ddc..56cf94f 100644 --- a/flyfish-user/src/main/java/com/flyfish/framework/domain/RoleQo.java +++ b/flyfish-user/src/main/java/com/flyfish/framework/user/domain/RoleQo.java @@ -1,4 +1,4 @@ -package com.flyfish.framework.domain; +package com.flyfish.framework.user.domain; import com.flyfish.framework.domain.base.NameLikeQo; import com.flyfish.framework.domain.po.Role; diff --git a/flyfish-user/src/main/java/com/flyfish/framework/domain/UserPasswordDto.java b/flyfish-user/src/main/java/com/flyfish/framework/user/domain/UserPasswordDto.java similarity index 90% rename from flyfish-user/src/main/java/com/flyfish/framework/domain/UserPasswordDto.java rename to flyfish-user/src/main/java/com/flyfish/framework/user/domain/UserPasswordDto.java index 61854f7..f9e93d9 100644 --- a/flyfish-user/src/main/java/com/flyfish/framework/domain/UserPasswordDto.java +++ b/flyfish-user/src/main/java/com/flyfish/framework/user/domain/UserPasswordDto.java @@ -1,4 +1,4 @@ -package com.flyfish.framework.domain; +package com.flyfish.framework.user.domain; import com.flyfish.framework.validation.annotations.Password; import lombok.Getter; diff --git a/flyfish-user/src/main/java/com/flyfish/framework/domain/UserQo.java b/flyfish-user/src/main/java/com/flyfish/framework/user/domain/UserQo.java similarity index 95% rename from flyfish-user/src/main/java/com/flyfish/framework/domain/UserQo.java rename to flyfish-user/src/main/java/com/flyfish/framework/user/domain/UserQo.java index fd667cb..9a74190 100644 --- a/flyfish-user/src/main/java/com/flyfish/framework/domain/UserQo.java +++ b/flyfish-user/src/main/java/com/flyfish/framework/user/domain/UserQo.java @@ -1,4 +1,4 @@ -package com.flyfish.framework.domain; +package com.flyfish.framework.user.domain; import com.flyfish.framework.domain.base.NameLikeQo; import com.flyfish.framework.domain.po.User; diff --git a/flyfish-user/src/main/java/com/flyfish/framework/initializer/UserInitializer.java b/flyfish-user/src/main/java/com/flyfish/framework/user/initializer/UserInitializer.java similarity index 89% rename from flyfish-user/src/main/java/com/flyfish/framework/initializer/UserInitializer.java rename to flyfish-user/src/main/java/com/flyfish/framework/user/initializer/UserInitializer.java index 13fdc3d..13b7d32 100644 --- a/flyfish-user/src/main/java/com/flyfish/framework/initializer/UserInitializer.java +++ b/flyfish-user/src/main/java/com/flyfish/framework/user/initializer/UserInitializer.java @@ -1,4 +1,4 @@ -package com.flyfish.framework.initializer; +package com.flyfish.framework.user.initializer; import org.springframework.beans.factory.InitializingBean; diff --git a/flyfish-user/src/main/java/com/flyfish/framework/repository/DepartmentRepository.java b/flyfish-user/src/main/java/com/flyfish/framework/user/repository/DepartmentRepository.java similarity index 61% rename from flyfish-user/src/main/java/com/flyfish/framework/repository/DepartmentRepository.java rename to flyfish-user/src/main/java/com/flyfish/framework/user/repository/DepartmentRepository.java index 06ac535..6b655d6 100644 --- a/flyfish-user/src/main/java/com/flyfish/framework/repository/DepartmentRepository.java +++ b/flyfish-user/src/main/java/com/flyfish/framework/user/repository/DepartmentRepository.java @@ -1,6 +1,7 @@ -package com.flyfish.framework.repository; +package com.flyfish.framework.user.repository; import com.flyfish.framework.domain.po.Department; +import com.flyfish.framework.repository.DefaultReactiveRepository; /** * 部门仓库 diff --git a/flyfish-user/src/main/java/com/flyfish/framework/repository/PermissionRepository.java b/flyfish-user/src/main/java/com/flyfish/framework/user/repository/PermissionRepository.java similarity index 62% rename from flyfish-user/src/main/java/com/flyfish/framework/repository/PermissionRepository.java rename to flyfish-user/src/main/java/com/flyfish/framework/user/repository/PermissionRepository.java index a59bfac..6ee7b90 100644 --- a/flyfish-user/src/main/java/com/flyfish/framework/repository/PermissionRepository.java +++ b/flyfish-user/src/main/java/com/flyfish/framework/user/repository/PermissionRepository.java @@ -1,7 +1,8 @@ -package com.flyfish.framework.repository; +package com.flyfish.framework.user.repository; import com.flyfish.framework.domain.po.Permission; +import com.flyfish.framework.repository.DefaultReactiveRepository; /** * 权限仓库 diff --git a/flyfish-user/src/main/java/com/flyfish/framework/repository/RoleRepository.java b/flyfish-user/src/main/java/com/flyfish/framework/user/repository/RoleRepository.java similarity index 59% rename from flyfish-user/src/main/java/com/flyfish/framework/repository/RoleRepository.java rename to flyfish-user/src/main/java/com/flyfish/framework/user/repository/RoleRepository.java index 1b80238..c4042e6 100644 --- a/flyfish-user/src/main/java/com/flyfish/framework/repository/RoleRepository.java +++ b/flyfish-user/src/main/java/com/flyfish/framework/user/repository/RoleRepository.java @@ -1,6 +1,7 @@ -package com.flyfish.framework.repository; +package com.flyfish.framework.user.repository; import com.flyfish.framework.domain.po.Role; +import com.flyfish.framework.repository.DefaultReactiveRepository; /** * 角色仓库 diff --git a/flyfish-user/src/main/java/com/flyfish/framework/repository/UserRepository.java b/flyfish-user/src/main/java/com/flyfish/framework/user/repository/UserRepository.java similarity index 83% rename from flyfish-user/src/main/java/com/flyfish/framework/repository/UserRepository.java rename to flyfish-user/src/main/java/com/flyfish/framework/user/repository/UserRepository.java index b75fc2b..9602c71 100644 --- a/flyfish-user/src/main/java/com/flyfish/framework/repository/UserRepository.java +++ b/flyfish-user/src/main/java/com/flyfish/framework/user/repository/UserRepository.java @@ -1,6 +1,7 @@ -package com.flyfish.framework.repository; +package com.flyfish.framework.user.repository; import com.flyfish.framework.domain.po.User; +import com.flyfish.framework.repository.DefaultReactiveRepository; import reactor.core.publisher.Mono; /** diff --git a/flyfish-user/src/main/java/com/flyfish/framework/service/DepartmentService.java b/flyfish-user/src/main/java/com/flyfish/framework/user/service/DepartmentService.java similarity index 78% rename from flyfish-user/src/main/java/com/flyfish/framework/service/DepartmentService.java rename to flyfish-user/src/main/java/com/flyfish/framework/user/service/DepartmentService.java index c8efb90..ad11382 100644 --- a/flyfish-user/src/main/java/com/flyfish/framework/service/DepartmentService.java +++ b/flyfish-user/src/main/java/com/flyfish/framework/user/service/DepartmentService.java @@ -1,6 +1,7 @@ -package com.flyfish.framework.service; +package com.flyfish.framework.user.service; import com.flyfish.framework.domain.po.Department; +import com.flyfish.framework.service.BaseReactiveService; import reactor.core.publisher.Mono; import java.util.Set; diff --git a/flyfish-user/src/main/java/com/flyfish/framework/service/FlyfishUserDetailsServiceImpl.java b/flyfish-user/src/main/java/com/flyfish/framework/user/service/FlyfishUserDetailsServiceImpl.java similarity index 97% rename from flyfish-user/src/main/java/com/flyfish/framework/service/FlyfishUserDetailsServiceImpl.java rename to flyfish-user/src/main/java/com/flyfish/framework/user/service/FlyfishUserDetailsServiceImpl.java index b8f0d78..37d7ac5 100644 --- a/flyfish-user/src/main/java/com/flyfish/framework/service/FlyfishUserDetailsServiceImpl.java +++ b/flyfish-user/src/main/java/com/flyfish/framework/user/service/FlyfishUserDetailsServiceImpl.java @@ -1,9 +1,10 @@ -package com.flyfish.framework.service; +package com.flyfish.framework.user.service; -import com.flyfish.framework.config.constants.UserCacheKeys; +import com.flyfish.framework.user.config.constants.UserCacheKeys; import com.flyfish.framework.configuration.jwt.TokenProvider; import com.flyfish.framework.domain.base.IUser; import com.flyfish.framework.enums.UserStatus; +import com.flyfish.framework.service.FlyfishUserDetailsService; import com.flyfish.framework.utils.Assert; import com.flyfish.framework.utils.ReactiveRedisOperations; import lombok.RequiredArgsConstructor; diff --git a/flyfish-user/src/main/java/com/flyfish/framework/service/PermissionService.java b/flyfish-user/src/main/java/com/flyfish/framework/user/service/PermissionService.java similarity index 87% rename from flyfish-user/src/main/java/com/flyfish/framework/service/PermissionService.java rename to flyfish-user/src/main/java/com/flyfish/framework/user/service/PermissionService.java index 81d2424..e51ac86 100644 --- a/flyfish-user/src/main/java/com/flyfish/framework/service/PermissionService.java +++ b/flyfish-user/src/main/java/com/flyfish/framework/user/service/PermissionService.java @@ -1,4 +1,4 @@ -package com.flyfish.framework.service; +package com.flyfish.framework.user.service; import com.flyfish.framework.domain.po.Permission; diff --git a/flyfish-user/src/main/java/com/flyfish/framework/service/RoleService.java b/flyfish-user/src/main/java/com/flyfish/framework/user/service/RoleService.java similarity index 96% rename from flyfish-user/src/main/java/com/flyfish/framework/service/RoleService.java rename to flyfish-user/src/main/java/com/flyfish/framework/user/service/RoleService.java index 0896eef..acd0b4e 100644 --- a/flyfish-user/src/main/java/com/flyfish/framework/service/RoleService.java +++ b/flyfish-user/src/main/java/com/flyfish/framework/user/service/RoleService.java @@ -1,8 +1,8 @@ -package com.flyfish.framework.service; +package com.flyfish.framework.user.service; -import com.flyfish.framework.domain.PermissionQo; -import com.flyfish.framework.domain.RoleQo; +import com.flyfish.framework.user.domain.PermissionQo; +import com.flyfish.framework.user.domain.RoleQo; import com.flyfish.framework.domain.base.Domain; import com.flyfish.framework.domain.base.IUser; import com.flyfish.framework.domain.base.Qo; diff --git a/flyfish-user/src/main/java/com/flyfish/framework/service/UserDetailsConverter.java b/flyfish-user/src/main/java/com/flyfish/framework/user/service/UserDetailsConverter.java similarity index 97% rename from flyfish-user/src/main/java/com/flyfish/framework/service/UserDetailsConverter.java rename to flyfish-user/src/main/java/com/flyfish/framework/user/service/UserDetailsConverter.java index 2c57c3f..1789286 100644 --- a/flyfish-user/src/main/java/com/flyfish/framework/service/UserDetailsConverter.java +++ b/flyfish-user/src/main/java/com/flyfish/framework/user/service/UserDetailsConverter.java @@ -1,6 +1,6 @@ -package com.flyfish.framework.service; +package com.flyfish.framework.user.service; -import com.flyfish.framework.domain.AdminUserDetails; +import com.flyfish.framework.user.domain.AdminUserDetails; import com.flyfish.framework.domain.base.IUser; import com.flyfish.framework.domain.po.Department; import com.flyfish.framework.domain.po.Role; diff --git a/flyfish-user/src/main/java/com/flyfish/framework/service/UserService.java b/flyfish-user/src/main/java/com/flyfish/framework/user/service/UserService.java similarity index 89% rename from flyfish-user/src/main/java/com/flyfish/framework/service/UserService.java rename to flyfish-user/src/main/java/com/flyfish/framework/user/service/UserService.java index e16c1bb..c8f669f 100644 --- a/flyfish-user/src/main/java/com/flyfish/framework/service/UserService.java +++ b/flyfish-user/src/main/java/com/flyfish/framework/user/service/UserService.java @@ -1,11 +1,12 @@ -package com.flyfish.framework.service; +package com.flyfish.framework.user.service; -import com.flyfish.framework.domain.UserQo; +import com.flyfish.framework.user.repository.UserRepository; +import com.flyfish.framework.user.domain.UserQo; import com.flyfish.framework.domain.authorized.AuthorizedUserDetails; import com.flyfish.framework.domain.base.Qo; import com.flyfish.framework.domain.po.User; import com.flyfish.framework.enums.UserType; -import com.flyfish.framework.repository.UserRepository; +import com.flyfish.framework.service.UserFindService; import com.flyfish.framework.service.impl.BaseReactiveServiceImpl; import org.apache.commons.collections4.CollectionUtils; import org.springframework.data.domain.Page; diff --git a/flyfish-user/src/main/java/com/flyfish/framework/service/impl/DepartmentServiceHelper.java b/flyfish-user/src/main/java/com/flyfish/framework/user/service/impl/DepartmentServiceHelper.java similarity index 94% rename from flyfish-user/src/main/java/com/flyfish/framework/service/impl/DepartmentServiceHelper.java rename to flyfish-user/src/main/java/com/flyfish/framework/user/service/impl/DepartmentServiceHelper.java index 097544e..8a5defc 100644 --- a/flyfish-user/src/main/java/com/flyfish/framework/service/impl/DepartmentServiceHelper.java +++ b/flyfish-user/src/main/java/com/flyfish/framework/user/service/impl/DepartmentServiceHelper.java @@ -1,7 +1,7 @@ -package com.flyfish.framework.service.impl; +package com.flyfish.framework.user.service.impl; -import com.flyfish.framework.domain.AdminUserDetails; -import com.flyfish.framework.domain.DepartmentQo; +import com.flyfish.framework.user.domain.AdminUserDetails; +import com.flyfish.framework.user.domain.DepartmentQo; import com.flyfish.framework.domain.base.Qo; import com.flyfish.framework.domain.po.Department; import com.flyfish.framework.enums.UserType; diff --git a/flyfish-user/src/main/java/com/flyfish/framework/service/impl/MongoDepartmentServiceImpl.java b/flyfish-user/src/main/java/com/flyfish/framework/user/service/impl/MongoDepartmentServiceImpl.java similarity index 88% rename from flyfish-user/src/main/java/com/flyfish/framework/service/impl/MongoDepartmentServiceImpl.java rename to flyfish-user/src/main/java/com/flyfish/framework/user/service/impl/MongoDepartmentServiceImpl.java index 644b621..b8026dd 100644 --- a/flyfish-user/src/main/java/com/flyfish/framework/service/impl/MongoDepartmentServiceImpl.java +++ b/flyfish-user/src/main/java/com/flyfish/framework/user/service/impl/MongoDepartmentServiceImpl.java @@ -1,9 +1,10 @@ -package com.flyfish.framework.service.impl; +package com.flyfish.framework.user.service.impl; import com.flyfish.framework.domain.base.Qo; import com.flyfish.framework.domain.po.Department; import com.flyfish.framework.domain.tree.TreeDomain; -import com.flyfish.framework.service.DepartmentService; +import com.flyfish.framework.user.service.DepartmentService; +import com.flyfish.framework.service.impl.BaseReactiveServiceImpl; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.data.mongodb.core.ReactiveMongoOperations; @@ -19,8 +20,6 @@ import java.util.Collection; import java.util.Set; import java.util.stream.Collectors; -import static com.flyfish.framework.service.impl.DepartmentServiceHelper.convertQo; - /** * 部门服务 * @@ -53,7 +52,7 @@ public class MongoDepartmentServiceImpl extends BaseReactiveServiceImpl getList(Qo query) { - return convertQo(query, this::getMinDepthInIds).flatMapMany(super::getList); + return DepartmentServiceHelper.convertQo(query, this::getMinDepthInIds).flatMapMany(super::getList); } /** diff --git a/flyfish-user/src/main/java/com/flyfish/framework/service/impl/R2dbcDepartmentServiceImpl.java b/flyfish-user/src/main/java/com/flyfish/framework/user/service/impl/R2dbcDepartmentServiceImpl.java similarity index 87% rename from flyfish-user/src/main/java/com/flyfish/framework/service/impl/R2dbcDepartmentServiceImpl.java rename to flyfish-user/src/main/java/com/flyfish/framework/user/service/impl/R2dbcDepartmentServiceImpl.java index c75a7b4..099a167 100644 --- a/flyfish-user/src/main/java/com/flyfish/framework/service/impl/R2dbcDepartmentServiceImpl.java +++ b/flyfish-user/src/main/java/com/flyfish/framework/user/service/impl/R2dbcDepartmentServiceImpl.java @@ -1,8 +1,9 @@ -package com.flyfish.framework.service.impl; +package com.flyfish.framework.user.service.impl; import com.flyfish.framework.domain.base.Qo; import com.flyfish.framework.domain.po.Department; -import com.flyfish.framework.service.DepartmentService; +import com.flyfish.framework.user.service.DepartmentService; +import com.flyfish.framework.service.impl.BaseReactiveServiceImpl; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.data.r2dbc.core.R2dbcEntityOperations; @@ -17,7 +18,7 @@ import java.util.Collection; import java.util.Set; import java.util.stream.Collectors; -import static com.flyfish.framework.service.impl.DepartmentServiceHelper.convertQo; +import static com.flyfish.framework.user.service.impl.DepartmentServiceHelper.convertQo; /** * 部门服务 diff --git a/flyfish-user/src/main/java/com/flyfish/framework/utils/RSAUtils.java b/flyfish-user/src/main/java/com/flyfish/framework/user/utils/RSAUtils.java similarity index 98% rename from flyfish-user/src/main/java/com/flyfish/framework/utils/RSAUtils.java rename to flyfish-user/src/main/java/com/flyfish/framework/user/utils/RSAUtils.java index f4447f9..88c2903 100644 --- a/flyfish-user/src/main/java/com/flyfish/framework/utils/RSAUtils.java +++ b/flyfish-user/src/main/java/com/flyfish/framework/user/utils/RSAUtils.java @@ -1,4 +1,4 @@ -package com.flyfish.framework.utils; +package com.flyfish.framework.user.utils; import lombok.extern.slf4j.Slf4j; import org.springframework.lang.Nullable; diff --git a/flyfish-user/src/main/java/com/flyfish/framework/utils/StrengthUtils.java b/flyfish-user/src/main/java/com/flyfish/framework/user/utils/StrengthUtils.java similarity index 90% rename from flyfish-user/src/main/java/com/flyfish/framework/utils/StrengthUtils.java rename to flyfish-user/src/main/java/com/flyfish/framework/user/utils/StrengthUtils.java index d63bb1d..d5fb8a8 100644 --- a/flyfish-user/src/main/java/com/flyfish/framework/utils/StrengthUtils.java +++ b/flyfish-user/src/main/java/com/flyfish/framework/user/utils/StrengthUtils.java @@ -1,4 +1,4 @@ -package com.flyfish.framework.utils; +package com.flyfish.framework.user.utils; import com.flyfish.framework.validation.validators.PasswordValidator; diff --git a/flyfish-user/src/main/java/com/flyfish/framework/validation/.gitkeep b/flyfish-user/src/main/java/com/flyfish/framework/user/validation/.gitkeep similarity index 100% rename from flyfish-user/src/main/java/com/flyfish/framework/validation/.gitkeep rename to flyfish-user/src/main/java/com/flyfish/framework/user/validation/.gitkeep diff --git a/flyfish-web/src/main/java/com/flyfish/framework/beans/excel/ExcelMappingController.java b/flyfish-web/src/main/java/com/flyfish/framework/excel/ExcelMappingController.java similarity index 92% rename from flyfish-web/src/main/java/com/flyfish/framework/beans/excel/ExcelMappingController.java rename to flyfish-web/src/main/java/com/flyfish/framework/excel/ExcelMappingController.java index 6fb7e17..d9d88a5 100644 --- a/flyfish-web/src/main/java/com/flyfish/framework/beans/excel/ExcelMappingController.java +++ b/flyfish-web/src/main/java/com/flyfish/framework/excel/ExcelMappingController.java @@ -1,4 +1,4 @@ -package com.flyfish.framework.beans.excel; +package com.flyfish.framework.excel; import com.flyfish.framework.controller.reactive.ReactiveBaseController; diff --git a/flyfish-web/src/main/java/com/flyfish/framework/beans/excel/ExcelMappingRepository.java b/flyfish-web/src/main/java/com/flyfish/framework/excel/ExcelMappingRepository.java similarity index 86% rename from flyfish-web/src/main/java/com/flyfish/framework/beans/excel/ExcelMappingRepository.java rename to flyfish-web/src/main/java/com/flyfish/framework/excel/ExcelMappingRepository.java index fb24385..aed779a 100644 --- a/flyfish-web/src/main/java/com/flyfish/framework/beans/excel/ExcelMappingRepository.java +++ b/flyfish-web/src/main/java/com/flyfish/framework/excel/ExcelMappingRepository.java @@ -1,4 +1,4 @@ -package com.flyfish.framework.beans.excel; +package com.flyfish.framework.excel; import com.flyfish.framework.domain.po.ExcelMapping; import com.flyfish.framework.repository.DefaultReactiveRepository; diff --git a/flyfish-web/src/main/java/com/flyfish/framework/beans/excel/ExcelMappingService.java b/flyfish-web/src/main/java/com/flyfish/framework/excel/ExcelMappingService.java similarity index 85% rename from flyfish-web/src/main/java/com/flyfish/framework/beans/excel/ExcelMappingService.java rename to flyfish-web/src/main/java/com/flyfish/framework/excel/ExcelMappingService.java index 0ac03c3..8a82407 100644 --- a/flyfish-web/src/main/java/com/flyfish/framework/beans/excel/ExcelMappingService.java +++ b/flyfish-web/src/main/java/com/flyfish/framework/excel/ExcelMappingService.java @@ -1,4 +1,4 @@ -package com.flyfish.framework.beans.excel; +package com.flyfish.framework.excel; import com.flyfish.framework.domain.po.ExcelMapping; import com.flyfish.framework.service.impl.BaseReactiveServiceImpl;