diff --git a/alita-framework/alita-starters/alita-authorization-server-spring-boot-starter/pom.xml b/alita-framework/alita-starters/alita-authorization-server-spring-boot-starter/pom.xml index 9d03c8a7..4a8f884c 100644 --- a/alita-framework/alita-starters/alita-authorization-server-spring-boot-starter/pom.xml +++ b/alita-framework/alita-starters/alita-authorization-server-spring-boot-starter/pom.xml @@ -129,6 +129,11 @@ com.alibaba fastjson + + + org.apache.rocketmq + rocketmq-logappender + diff --git a/alita-framework/alita-starters/alita-authorization-server-spring-boot-starter/src/test/resources/log4j2.xml b/alita-framework/alita-starters/alita-authorization-server-spring-boot-starter/src/test/resources/log4j2.xml new file mode 100644 index 00000000..f7b9c731 --- /dev/null +++ b/alita-framework/alita-starters/alita-authorization-server-spring-boot-starter/src/test/resources/log4j2.xml @@ -0,0 +1,91 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/alita-framework/alita-starters/alita-basic-services-spring-boot-starter/src/main/java/top/klw8/alita/service/authority/ISystemAuthoritysCatlogService.java b/alita-framework/alita-starters/alita-basic-services-spring-boot-starter/src/main/java/top/klw8/alita/service/authority/ISystemAuthoritysCatlogService.java index 42655db7..8324354d 100644 --- a/alita-framework/alita-starters/alita-basic-services-spring-boot-starter/src/main/java/top/klw8/alita/service/authority/ISystemAuthoritysCatlogService.java +++ b/alita-framework/alita-starters/alita-basic-services-spring-boot-starter/src/main/java/top/klw8/alita/service/authority/ISystemAuthoritysCatlogService.java @@ -1,9 +1,6 @@ package top.klw8.alita.service.authority; -import java.util.List; - import com.baomidou.mybatisplus.extension.service.IService; -import top.klw8.alita.entitys.authority.SystemAuthoritys; import top.klw8.alita.entitys.authority.SystemAuthoritysCatlog; /** diff --git a/alita-framework/alita-starters/alita-gateway-server-spring-boot-starter/pom.xml b/alita-framework/alita-starters/alita-gateway-server-spring-boot-starter/pom.xml index 4026e93a..8522b34f 100644 --- a/alita-framework/alita-starters/alita-gateway-server-spring-boot-starter/pom.xml +++ b/alita-framework/alita-starters/alita-gateway-server-spring-boot-starter/pom.xml @@ -19,6 +19,12 @@ org.springframework.cloud spring-cloud-starter-gateway + + + spring-boot-starter-logging + org.springframework.boot + + com.alibaba.cloud diff --git a/alita-framework/alita-starters/alita-gateway-server-spring-boot-starter/src/test/resources/application.yml b/alita-framework/alita-starters/alita-gateway-server-spring-boot-starter/src/test/resources/application.yml index 5eb0cee6..a87cee2c 100644 --- a/alita-framework/alita-starters/alita-gateway-server-spring-boot-starter/src/test/resources/application.yml +++ b/alita-framework/alita-starters/alita-gateway-server-spring-boot-starter/src/test/resources/application.yml @@ -7,7 +7,8 @@ spring: nacos: discovery: serverAddr: 127.0.0.1:8848 - namespace: cb525a6a-d6c7-4082-bfd9-8ddbcc5aa823 + namespace: yd-alita-web-service + group: YD_ALITA_BASE_GROUP autoUpdateRoute: enable: true runSecond: 10 diff --git a/alita-framework/alita-starters/alita-mongodb-spring-data-spring-boot-starter/pom.xml b/alita-framework/alita-starters/alita-mongodb-spring-data-spring-boot-starter/pom.xml index 99e30183..4ebd7c77 100644 --- a/alita-framework/alita-starters/alita-mongodb-spring-data-spring-boot-starter/pom.xml +++ b/alita-framework/alita-starters/alita-mongodb-spring-data-spring-boot-starter/pom.xml @@ -41,6 +41,11 @@ top.klw8.alita alita-service-mongodb-api + + org.springframework.data + spring-data-mongodb + compile + \ No newline at end of file diff --git a/alita-framework/alita-starters/alita-mongodb-spring-data-spring-boot-starter/src/main/java/top/klw8/alita/starter/cfg/SpringDataMongoDbConfig.java b/alita-framework/alita-starters/alita-mongodb-spring-data-spring-boot-starter/src/main/java/top/klw8/alita/starter/cfg/SpringDataMongoDbConfig.java index 5ecaf6e4..81cd9115 100644 --- a/alita-framework/alita-starters/alita-mongodb-spring-data-spring-boot-starter/src/main/java/top/klw8/alita/starter/cfg/SpringDataMongoDbConfig.java +++ b/alita-framework/alita-starters/alita-mongodb-spring-data-spring-boot-starter/src/main/java/top/klw8/alita/starter/cfg/SpringDataMongoDbConfig.java @@ -1,109 +1,109 @@ -package top.klw8.alita.starter.cfg; - -import java.util.Collection; -import java.util.Collections; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.boot.context.properties.EnableConfigurationProperties; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.data.mongodb.MongoDbFactory; -import org.springframework.data.mongodb.config.MongoConfigurationSupport; -import org.springframework.data.mongodb.core.MongoTemplate; -import org.springframework.data.mongodb.core.SimpleMongoDbFactory; -import org.springframework.data.mongodb.core.convert.DbRefResolver; -import org.springframework.data.mongodb.core.convert.DefaultDbRefResolver; -import org.springframework.data.mongodb.core.convert.DefaultMongoTypeMapper; -import org.springframework.data.mongodb.core.convert.MappingMongoConverter; -import org.springframework.data.mongodb.core.convert.MongoCustomConversions; -import org.springframework.data.mongodb.core.mapping.MongoMappingContext; -import org.springframework.data.mongodb.repository.config.EnableMongoRepositories; -import org.springframework.util.Assert; - -import com.mongodb.MongoClient; -import com.mongodb.MongoClientURI; - -import top.klw8.alita.config.beans.mongodb.MongoConfigBean; - -/** - * @ClassName: SpringDataMongoDbConfig - * @Description: spring-data-mongodb 非 Reactive 的配制 - * @author klw - * @date 2018-12-21 16:33:12 - */ -@Configuration -@EnableConfigurationProperties(MongoConfigBean.class) -@EnableMongoRepositories -public class SpringDataMongoDbConfig extends MongoConfigurationSupport { - - @Resource - private MongoConfigBean mongoConfigBean; - - public MongoClient mongoClient() { - Assert.notNull(mongoConfigBean, "mongodb 配置不能为空"); - Assert.hasText(mongoConfigBean.getConnectUrl(), "mongodb 连接字符串不能为空"); - return new MongoClient(new MongoClientURI(mongoConfigBean.getConnectUrl())); - } - - @Bean - public MongoDbFactory mongoDbFactory() { - return new SimpleMongoDbFactory(mongoClient(), getDatabaseName()); - } - - @Override - protected String getDatabaseName() { - Assert.notNull(mongoConfigBean, "mongodb 配置不能为空"); - Assert.hasText(mongoConfigBean.getDbName(), "mongodb 数据库名不能为空"); - return mongoConfigBean.getDbName(); - } - - @Override - protected Collection getMappingBasePackages() { - Assert.notNull(mongoConfigBean, "mongodb 配置不能为空"); - List mapPackages = mongoConfigBean.getMapPackages(); - Assert.notEmpty(mapPackages, "要扫描并映射的包路径不能为空"); - return mapPackages; - } - - public MappingMongoConverter mappingMongoConverter() throws Exception { - // 一定要把 MappingMongoConverter 配制成 Bean,否则自定义转换器不生效!!! - // 纠结了N个小时,就是差了这个 !!! -// DbRefResolver dbRefResolver = new DefaultDbRefResolver(mongoDbFactory()); -// MappingMongoConverter converter = new MappingMongoConverter(dbRefResolver, mongoMappingContext()); -// List> converters = new ArrayList<>(); -// converters.add(LongIdToIdConverter.INSTANCE); -// converters.add(IdToLongIdConverter.INSTANCE); - -// converter.setCustomConversions(new MongoCustomConversions(converters)); -// converter.setCustomConversions(new MongoCustomConversions(Collections.emptyList())); - - - - DbRefResolver dbRefResolver = new DefaultDbRefResolver(mongoDbFactory()); - MongoCustomConversions conversions = new MongoCustomConversions(Collections.emptyList()); - - MongoMappingContext mappingContext = new MongoMappingContext(); - mappingContext.setSimpleTypeHolder(conversions.getSimpleTypeHolder()); - mappingContext.afterPropertiesSet(); - - MappingMongoConverter converter = new MappingMongoConverter(dbRefResolver, mappingContext); - converter.setCustomConversions(conversions); - converter.afterPropertiesSet(); - converter.setTypeMapper(new DefaultMongoTypeMapper(null)); - - return converter; - } - - @Bean - public MongoTemplate mongoTemplate() throws Exception { - // 去掉保存到数据中的 _class 字段 - // MappingMongoConverter converter = mappingMongoConverter(); - // converter.setTypeMapper(new DefaultMongoTypeMapper(null)); - // return new MongoTemplate(mongoDbFactory(), converter); - - return new MongoTemplate(mongoDbFactory(), mappingMongoConverter()); - } - -} +//package top.klw8.alita.starter.cfg; +// +//import java.util.Collection; +//import java.util.Collections; +//import java.util.List; +// +//import javax.annotation.Resource; +// +//import com.mongodb.MongoClientURI; +//import com.mongodb.client.MongoClient; +//import com.mongodb.reactivestreams.client.internal.MongoClientImpl; +//import org.springframework.boot.context.properties.EnableConfigurationProperties; +//import org.springframework.context.annotation.Bean; +//import org.springframework.context.annotation.Configuration; +//import org.springframework.data.mongodb.MongoDatabaseFactory; +//import org.springframework.data.mongodb.config.MongoConfigurationSupport; +//import org.springframework.data.mongodb.core.MongoTemplate; +//import org.springframework.data.mongodb.core.SimpleMongoClientDatabaseFactory; +//import org.springframework.data.mongodb.core.convert.DbRefResolver; +//import org.springframework.data.mongodb.core.convert.DefaultDbRefResolver; +//import org.springframework.data.mongodb.core.convert.DefaultMongoTypeMapper; +//import org.springframework.data.mongodb.core.convert.MappingMongoConverter; +//import org.springframework.data.mongodb.core.convert.MongoCustomConversions; +//import org.springframework.data.mongodb.core.mapping.MongoMappingContext; +//import org.springframework.data.mongodb.repository.config.EnableMongoRepositories; +//import org.springframework.util.Assert; +// +//import top.klw8.alita.config.beans.mongodb.MongoConfigBean; +// +///** +// * @author klw +// * @ClassName: SpringDataMongoDbConfig +// * @Description: spring-data-mongodb 非 Reactive 的配制 +// * @date 2018-12-21 16:33:12 +// */ +//@Configuration +//@EnableConfigurationProperties(MongoConfigBean.class) +//@EnableMongoRepositories +//public class SpringDataMongoDbConfig extends MongoConfigurationSupport { +// +// @Resource +// private MongoConfigBean mongoConfigBean; +// +// public MongoClient mongoClient() { +// Assert.notNull(mongoConfigBean, "mongodb 配置不能为空"); +// Assert.hasText(mongoConfigBean.getConnectUrl(), "mongodb 连接字符串不能为空"); +//// return new MongoClientImpl(new MongoClientURI(mongoConfigBean.getConnectUrl())); +// // TODO +// return null; +// } +// +// @Bean +// public MongoDatabaseFactory mongoDbFactory() { +// return new SimpleMongoClientDatabaseFactory(mongoClient(), getDatabaseName()); +// } +// +// @Override +// protected String getDatabaseName() { +// Assert.notNull(mongoConfigBean, "mongodb 配置不能为空"); +// Assert.hasText(mongoConfigBean.getDbName(), "mongodb 数据库名不能为空"); +// return mongoConfigBean.getDbName(); +// } +// +// @Override +// protected Collection getMappingBasePackages() { +// Assert.notNull(mongoConfigBean, "mongodb 配置不能为空"); +// List mapPackages = mongoConfigBean.getMapPackages(); +// Assert.notEmpty(mapPackages, "要扫描并映射的包路径不能为空"); +// return mapPackages; +// } +// +// public MappingMongoConverter mappingMongoConverter() throws Exception { +// // 一定要把 MappingMongoConverter 配制成 Bean,否则自定义转换器不生效!!! +// // 纠结了N个小时,就是差了这个 !!! +// // DbRefResolver dbRefResolver = new DefaultDbRefResolver(mongoDbFactory()); +// // MappingMongoConverter converter = new MappingMongoConverter(dbRefResolver, mongoMappingContext()); +// // List> converters = new ArrayList<>(); +// // converters.add(LongIdToIdConverter.INSTANCE); +// // converters.add(IdToLongIdConverter.INSTANCE); +// +// // converter.setCustomConversions(new MongoCustomConversions(converters)); +// // converter.setCustomConversions(new MongoCustomConversions(Collections.emptyList())); +// +// DbRefResolver dbRefResolver = new DefaultDbRefResolver(mongoDbFactory()); +// MongoCustomConversions conversions = new MongoCustomConversions(Collections.emptyList()); +// +// MongoMappingContext mappingContext = new MongoMappingContext(); +// mappingContext.setSimpleTypeHolder(conversions.getSimpleTypeHolder()); +// mappingContext.afterPropertiesSet(); +// +// MappingMongoConverter converter = new MappingMongoConverter(dbRefResolver, mappingContext); +// converter.setCustomConversions(conversions); +// converter.afterPropertiesSet(); +// converter.setTypeMapper(new DefaultMongoTypeMapper(null)); +// +// return converter; +// } +// +// @Bean +// public MongoTemplate mongoTemplate() throws Exception { +// // 去掉保存到数据中的 _class 字段 +// // MappingMongoConverter converter = mappingMongoConverter(); +// // converter.setTypeMapper(new DefaultMongoTypeMapper(null)); +// // return new MongoTemplate(mongoDbFactory(), converter); +// +// return new MongoTemplate(mongoDbFactory(), mappingMongoConverter()); +// } +// +//} diff --git a/alita-framework/alita-starters/alita-mongodb-spring-data-spring-boot-starter/src/main/java/top/klw8/alita/starter/cfg/SpringDataMongoDbConfigReactive.java b/alita-framework/alita-starters/alita-mongodb-spring-data-spring-boot-starter/src/main/java/top/klw8/alita/starter/cfg/SpringDataMongoDbConfigReactive.java index 83b92a34..5470e56f 100644 --- a/alita-framework/alita-starters/alita-mongodb-spring-data-spring-boot-starter/src/main/java/top/klw8/alita/starter/cfg/SpringDataMongoDbConfigReactive.java +++ b/alita-framework/alita-starters/alita-mongodb-spring-data-spring-boot-starter/src/main/java/top/klw8/alita/starter/cfg/SpringDataMongoDbConfigReactive.java @@ -1,82 +1,80 @@ -package top.klw8.alita.starter.cfg; - -import com.mongodb.ConnectionString; -import com.mongodb.reactivestreams.client.MongoClient; -import com.mongodb.reactivestreams.client.MongoClients; -import org.springframework.boot.context.properties.EnableConfigurationProperties; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.data.mongodb.config.AbstractReactiveMongoConfiguration; -import org.springframework.data.mongodb.core.ReactiveMongoTemplate; -import org.springframework.data.mongodb.core.convert.DefaultMongoTypeMapper; -import org.springframework.data.mongodb.core.convert.MappingMongoConverter; -import org.springframework.data.mongodb.repository.config.EnableReactiveMongoRepositories; -import org.springframework.util.Assert; -import top.klw8.alita.config.beans.mongodb.MongoConfigBean; - -import javax.annotation.Resource; -import java.util.Collection; -import java.util.List; - -/** - * @author klw - * @ClassName: SpringDataMongoDbConfigReactive - * @Description: spring-data-mongodb Reactive 的配制 - * @date 2018-12-21 16:33:12 - */ -@Configuration -@EnableConfigurationProperties(MongoConfigBean.class) -@EnableReactiveMongoRepositories -public class SpringDataMongoDbConfigReactive extends AbstractReactiveMongoConfiguration { - - @Resource - private MongoConfigBean mongoConfigBean; - - @Override - @Bean - public MongoClient reactiveMongoClient() { - Assert.notNull(mongoConfigBean, "mongodb 配置不能为空"); - Assert.hasText(mongoConfigBean.getConnectUrl(), "mongodb 连接字符串不能为空"); - return MongoClients.create(new ConnectionString(mongoConfigBean.getConnectUrl())); - } - - @Override - protected String getDatabaseName() { - Assert.notNull(mongoConfigBean, "mongodb 配置不能为空"); - Assert.hasText(mongoConfigBean.getDbName(), "mongodb 数据库名不能为空"); - return mongoConfigBean.getDbName(); - } - - @Override - protected Collection getMappingBasePackages() { - Assert.notNull(mongoConfigBean, "mongodb 配置不能为空"); - List mapPackages = mongoConfigBean.getMapPackages(); - Assert.notEmpty(mapPackages, "要扫描并映射的包路径不能为空"); - return mapPackages; - } - - @Override - @Bean - public MappingMongoConverter mappingMongoConverter() throws Exception { - // 一定要把 MappingMongoConverter 配制成 Bean,否则自定义转换器不生效!!! - // 纠结了N个小时,就是差了这个 !!! - MappingMongoConverter converter = super.mappingMongoConverter(); -// List> converters = new ArrayList<>(); -// converters.add(LongIdToIdConverter.INSTANCE); -// converters.add(IdToLongIdConverter.INSTANCE); - -// converter.setCustomConversions(new MongoCustomConversions(converters)); -// converter.setCustomConversions(new MongoCustomConversions(Collections.emptyList())); - // 去掉保存到数据中的 _class 字段 - converter.setTypeMapper(new DefaultMongoTypeMapper(null)); - return converter; - } - - @Override - @Bean - public ReactiveMongoTemplate reactiveMongoTemplate() throws Exception { - return (ReactiveMongoTemplate) super.reactiveMongoTemplate(); - } - - -} +//package top.klw8.alita.starter.cfg; +// +//import com.mongodb.ConnectionString; +//import com.mongodb.reactivestreams.client.MongoClient; +//import com.mongodb.reactivestreams.client.MongoClients; +//import org.springframework.boot.context.properties.EnableConfigurationProperties; +//import org.springframework.context.annotation.Bean; +//import org.springframework.context.annotation.Configuration; +//import org.springframework.data.mongodb.config.AbstractReactiveMongoConfiguration; +//import org.springframework.data.mongodb.core.ReactiveMongoTemplate; +//import org.springframework.data.mongodb.core.convert.DefaultMongoTypeMapper; +//import org.springframework.data.mongodb.core.convert.MappingMongoConverter; +//import org.springframework.data.mongodb.repository.config.EnableReactiveMongoRepositories; +//import org.springframework.util.Assert; +//import top.klw8.alita.config.beans.mongodb.MongoConfigBean; +// +//import javax.annotation.Resource; +//import java.util.Collection; +//import java.util.List; +// +///** +// * @author klw +// * @ClassName: SpringDataMongoDbConfigReactive +// * @Description: spring-data-mongodb Reactive 的配制 +// * @date 2018-12-21 16:33:12 +// */ +//@Configuration +//@EnableConfigurationProperties(MongoConfigBean.class) +//@EnableReactiveMongoRepositories +//public class SpringDataMongoDbConfigReactive extends AbstractReactiveMongoConfiguration { +// +// @Resource +// private MongoConfigBean mongoConfigBean; +// +// @Override +// @Bean +// public MongoClient reactiveMongoClient() { +// Assert.notNull(mongoConfigBean, "mongodb 配置不能为空"); +// Assert.hasText(mongoConfigBean.getConnectUrl(), "mongodb 连接字符串不能为空"); +// return MongoClients.create(new ConnectionString(mongoConfigBean.getConnectUrl())); +// } +// +// @Override +// protected String getDatabaseName() { +// Assert.notNull(mongoConfigBean, "mongodb 配置不能为空"); +// Assert.hasText(mongoConfigBean.getDbName(), "mongodb 数据库名不能为空"); +// return mongoConfigBean.getDbName(); +// } +// +// @Override +// protected Collection getMappingBasePackages() { +// Assert.notNull(mongoConfigBean, "mongodb 配置不能为空"); +// List mapPackages = mongoConfigBean.getMapPackages(); +// Assert.notEmpty(mapPackages, "要扫描并映射的包路径不能为空"); +// return mapPackages; +// } +// +// @Bean +// public MappingMongoConverter mappingMongoConverter() throws Exception { +// // 一定要把 MappingMongoConverter 配制成 Bean,否则自定义转换器不生效!!! +// // 纠结了N个小时,就是差了这个 !!! +// MappingMongoConverter converter = super.mappingMongoConverter(); +//// List> converters = new ArrayList<>(); +//// converters.add(LongIdToIdConverter.INSTANCE); +//// converters.add(IdToLongIdConverter.INSTANCE); +// +//// converter.setCustomConversions(new MongoCustomConversions(converters)); +//// converter.setCustomConversions(new MongoCustomConversions(Collections.emptyList())); +// // 去掉保存到数据中的 _class 字段 +// converter.setTypeMapper(new DefaultMongoTypeMapper(null)); +// return converter; +// } +// +// @Bean +// public ReactiveMongoTemplate reactiveMongoTemplate() throws Exception { +// return (ReactiveMongoTemplate) super.reactiveMongoTemplate(); +// } +// +// +//} diff --git a/alita-framework/pom.xml b/alita-framework/pom.xml index 5dd0cf7f..fd18ecd5 100644 --- a/alita-framework/pom.xml +++ b/alita-framework/pom.xml @@ -32,7 +32,7 @@ org.springframework.boot spring-boot-starter-parent - 2.2.7.RELEASE + 2.3.6.RELEASE @@ -43,19 +43,18 @@ UTF-8 true - Hoxton.SR4 - 2.2.1.RELEASE + Hoxton.SR9 + 2.2.3.RELEASE 1.2.5 - 4.5.2 - 2.0.4 + 4.7.1 + 2.1.1 1.3.1 3.4.2 3.3.0 2.6 1.9.4 4.2 - 3.3.0 1.3.3 3.0.0 @@ -64,26 +63,25 @@ 5.3.3.RELEASE 1.0.10.RELEASE 2.3.6.RELEASE - 2.7.4.1 - 1.7.0 - 1.0.6 + 2.7.8 + 1.2.3 + 3.4.1 + 42.2.18 + 1.0.2 + 1.2.75 + 2.3.30 + 3.3.0 + 3.7.2 + 3.11.1 + 2012FF_hf1_1 - - 1.1.21 0.9 1.0.3 - 3.2.0 - 42.2.6 1.1.4 0.2.7 - 1.0.2 - 0.4.1 - 1.2.73 - 2.3.30 - 3.2.6 - 3.6 + 0.4.3 @@ -262,6 +260,16 @@ org.apache.dubbo dubbo-registry-nacos ${dubbo.version} + + + org.apache.dubbo + dubbo-common + + + org.apache.dubbo + dubbo-remoting-api + + @@ -276,12 +284,6 @@ - - com.alibaba.spring - spring-context-support - ${alibaba-spring-context-support.version} - - org.apache.dubbo dubbo-spring-boot-starter @@ -427,12 +429,6 @@ - - - com.aliyun.oss - aliyun-sdk-oss - ${aliyun-sdk-oss.version} - commons-fileupload @@ -512,18 +508,6 @@ ${postgresql.version} - - com.alibaba.csp - sentinel-apache-dubbo-adapter - ${sentinel.version} - - - - com.alibaba.csp - sentinel-spring-cloud-gateway-adapter - ${sentinel.version} - - com.alibaba.cloud spring-cloud-starter-alibaba-sentinel @@ -571,8 +555,15 @@ fastjson ${fastjson.version} - - + + + com.aliyun.oss + aliyun-sdk-oss + ${aliyun-sdk-oss.version} + + + +