Browse Source

公共组件更新

wj 4 years ago
parent
commit
ef401eda78
34 changed files with 665 additions and 157 deletions
  1. 3 2
      common-baseapi/pom.xml
  2. 19 0
      common-baseapi/src/main/java/com/tofly/baseapi/config/ToflyWebColudApplication.java
  3. 1 1
      common-baseapi/src/main/java/com/tofly/baseapi/controller/CommonInterfaceController.java
  4. 22 0
      common-cache-redis/pom.xml
  5. 17 0
      common-cache-redis/src/main/java/com/tofly/redis/config/RedisTemplateConfig.java
  6. 7 5
      common-core/pom.xml
  7. 2 2
      common-core/src/main/java/com/tofly/common/core/util/Date8Util.java
  8. 2 2
      common-core/src/main/java/com/tofly/common/core/util/io/ExcelUtil.java
  9. 1 2
      common-data-es/src/main/java/com/tofly/es/config/ToflyEsRepository.java
  10. 2 2
      common-security/pom.xml
  11. 1 2
      common-entity/src/main/java/com/tofly/entity/pojo/UserInfo.java
  12. 5 6
      common-log/pom.xml
  13. 1 1
      common-log/src/main/java/com/tofly/common/log/aspect/LogAspect.java
  14. 1 1
      common-log/src/main/java/com/tofly/common/log/config/LogAutoConfiguration.java
  15. 2 2
      common-log/src/main/java/com/tofly/common/log/util/SysLogUtils.java
  16. 34 0
      common-oauth/pom.xml
  17. 1 1
      common-baseapi/src/main/java/com/tofly/baseapi/config/DocBean.java
  18. 1 1
      common-baseapi/src/main/java/com/tofly/baseapi/config/SwaggerConfig.java
  19. 19 0
      common-oauth/src/main/java/com/tofly/common/config/ToflyCloudApplication.java
  20. 40 0
      common-oauth/src/main/java/com/tofly/common/config/ToflyRestTemplate.java
  21. 26 26
      common-oauth/src/main/java/com/tofly/common/oauth/feign/FLowableFeignConfiguration.java
  22. 14 14
      common-oauth/src/main/java/com/tofly/common/oauth/feign/FlowableAddUserEvent.java
  23. 15 15
      common-oauth/src/main/java/com/tofly/common/oauth/feign/FlowableAddUserGroupEvent.java
  24. 17 17
      common-oauth/src/main/java/com/tofly/common/oauth/feign/FlowableAddUserToGroupEvent.java
  25. 13 13
      common-oauth/src/main/java/com/tofly/common/oauth/feign/FlowableDeleteGroupEvent.java
  26. 16 16
      common-oauth/src/main/java/com/tofly/common/oauth/feign/FlowableDeleteUserEvent.java
  27. 14 14
      common-oauth/src/main/java/com/tofly/common/oauth/feign/FlowableDeleteUserToGroupEvent.java
  28. 1 1
      common-oauth/src/main/resources/META-INF/spring.factories
  29. 6 1
      common-orm-mybatisplus/src/main/java/com/tofly/mybatisplus/config/MybatisPlusConfigurer.java
  30. 17 0
      common-orm-mybatisplus/src/main/java/com/tofly/mybatisplus/config/ToflyMapperScan.java
  31. 0 1
      common-web/pom.xml
  32. 37 9
      pom.xml
  33. 47 0
      tofly-webParent/pom.xml
  34. 261 0
      tofly-webParent/tofly-webParent.iml

+ 3 - 2
common-baseapi/pom.xml

@@ -20,8 +20,9 @@
         </dependency>
 
         <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger2</artifactId>
+            <groupId>com.tofly</groupId>
+            <artifactId>common-web</artifactId>
+            <version>1.0.0</version>
         </dependency>
     </dependencies>
 </project>

+ 19 - 0
common-baseapi/src/main/java/com/tofly/baseapi/config/ToflyWebColudApplication.java

@@ -0,0 +1,19 @@
+package com.tofly.baseapi.config;
+
+import com.tofly.common.config.ToflyCloudApplication;
+import com.tofly.mybatisplus.config.ToflyMapperScan;
+
+import java.lang.annotation.*;
+
+/**
+ * @author tuonbed
+ * @date 2020/10/13  16:22
+ */
+@Target({ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+@Inherited
+@ToflyCloudApplication
+@ToflyMapperScan
+public @interface ToflyWebColudApplication {
+}

+ 1 - 1
common-baseapi/src/main/java/com/tofly/baseapi/controller/CommonInterfaceController.java

@@ -21,7 +21,7 @@ import java.util.Map;
  * @date 2020/4/20  10:51
  */
 @RestController
-@RequestMapping("/common")
+@RequestMapping("/commonInter")
 @Api(tags="公共接口")
 @AllArgsConstructor
 @Slf4j

+ 22 - 0
common-cache-redis/pom.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>tofly-parent</artifactId>
+        <groupId>com.tofly</groupId>
+        <version>1.0.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>common-redis</artifactId>
+    <packaging>jar</packaging>
+    <version>1.0.0</version>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-redis</artifactId>
+        </dependency>
+    </dependencies>
+</project>

+ 17 - 0
common-cache-redis/src/main/java/com/tofly/redis/config/RedisTemplateConfig.java

@@ -3,14 +3,19 @@ package com.tofly.redis.config;
 import lombok.AllArgsConstructor;
 import org.springframework.boot.autoconfigure.AutoConfigureBefore;
 import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration;
+import org.springframework.cache.CacheManager;
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.cache.RedisCacheConfiguration;
+import org.springframework.data.redis.cache.RedisCacheManager;
 import org.springframework.data.redis.connection.RedisConnectionFactory;
 import org.springframework.data.redis.core.*;
 import org.springframework.data.redis.serializer.JdkSerializationRedisSerializer;
 import org.springframework.data.redis.serializer.StringRedisSerializer;
 
+import java.time.Duration;
+
 @EnableCaching
 @Configuration
 @AllArgsConstructor
@@ -18,6 +23,18 @@ import org.springframework.data.redis.serializer.StringRedisSerializer;
 public class RedisTemplateConfig {
 	private final RedisConnectionFactory factory;
 
+//	@Bean
+//	public CacheManager cacheManager() {
+//		RedisCacheConfiguration config = RedisCacheConfiguration.defaultCacheConfig()
+//				.entryTtl(Duration.ofSeconds(60))
+//				.disableCachingNullValues();
+//		return RedisCacheManager.builder(factory)
+//				.cacheDefaults(config)
+//				.transactionAware()
+//				.build();
+//	}
+
+
 	@Bean
 	public RedisTemplate<String, Object> redisTemplate() {
 		RedisTemplate<String, Object> redisTemplate = new RedisTemplate<>();

+ 7 - 5
common-core/pom.xml

@@ -44,11 +44,13 @@
         <dependency>
             <groupId>commons-net</groupId>
             <artifactId>commons-net</artifactId>
+            <version>3.6</version>
         </dependency>
 
         <dependency>
             <groupId>commons-beanutils</groupId>
             <artifactId>commons-beanutils</artifactId>
+            <version>1.9.3</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
@@ -56,11 +58,11 @@
             <scope>provided</scope>
         </dependency>
 
-        <dependency>
-            <groupId>io.swagger</groupId>
-            <artifactId>swagger-models</artifactId>
-            <version>${swaggerold.version}</version>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>io.swagger</groupId>-->
+            <!--<artifactId>swagger-models</artifactId>-->
+            <!--<version>${swaggerold.version}</version>-->
+        <!--</dependency>-->
 
         <!--二维码 -->
         <dependency>

+ 2 - 2
common-core/src/main/java/com/tofly/common/core/util/Date8Util.java

@@ -276,9 +276,9 @@ public class Date8Util {
 
     public static int between(String date1,String date2){
         LocalDate localDate1=LocalDate.of(Integer.parseInt(date1.substring(0,4)),
-                Integer.parseInt(date1.substring(5)),1);
+                Integer.parseInt(date1.substring(4)),1);
         LocalDate localDate2=LocalDate.of(Integer.parseInt(date2.substring(0,4)),
-                Integer.parseInt(date2.substring(5)),1);
+                Integer.parseInt(date2.substring(4)),1);
 
         return Period.between(localDate1,localDate2).getMonths();
     }

+ 2 - 2
common-core/src/main/java/com/tofly/common/core/util/io/ExcelUtil.java

@@ -2,7 +2,6 @@ package com.tofly.common.core.util.io;
 
 
 import com.tofly.common.core.annotation.Excel;
-import com.tofly.common.core.configs.ToflyConfig;
 import com.tofly.common.core.entity.ResultRespone;
 import com.tofly.common.core.util.Convert;
 import com.tofly.common.core.util.ReflectUtil;
@@ -516,7 +515,8 @@ public class ExcelUtil<T> {
 	 *            文件名称
 	 */
 	public String getAbsoluteFile(String filename) {
-		String downloadPath = ToflyConfig.getDownloadPath() + filename;
+//		String downloadPath = ToflyConfig.getDownloadPath() + filename;
+		String downloadPath = filename;
 		File desc = new File(downloadPath);
 		if (!desc.getParentFile().exists()) {
 			desc.getParentFile().mkdirs();

+ 1 - 2
common-data-es/src/main/java/com/tofly/es/config/ToflyEsRepository.java

@@ -40,11 +40,10 @@ public interface ToflyEsRepository<T, ID extends Serializable> extends Elasticse
         for(QueryBuilder queryBuilder1:queryBuilder){
             qb.filter(queryBuilder1);
         }
-
         Pageable pageRequest=getPageable(page);
         org.springframework.data.domain.Page<T> search = this.search(qb,pageRequest);
         page.setRecords(search.getContent());
-        page.setTotal(search.getContent().size());
+        page.setTotal(search.getTotalElements());
         return page;
     };
 

+ 2 - 2
common-security/pom.xml

@@ -9,8 +9,8 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>common-security</artifactId>
+    <artifactId>common-entity</artifactId>
+    <groupId>com.tofly</groupId>
     <packaging>jar</packaging>
     <version>1.0.0</version>
-
 </project>

+ 1 - 2
common-entity/src/main/java/com/tofly/entity/pojo/UserInfo.java

@@ -1,6 +1,5 @@
 package com.tofly.entity.pojo;
 
-import com.tofly.base.api.entity.SysUser;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -16,7 +15,7 @@ public class UserInfo implements Serializable {
     /**
      * 用户基本信息
      */
-    private SysUser sysUser;
+    private User sysUser;
     /**
      * 权限标识集合
      */

+ 5 - 6
common-log/pom.xml

@@ -14,17 +14,11 @@
     <version>1.0.0</version>
 
     <dependencies>
-        <!--<dependency>-->
-            <!--<groupId>com.tofly</groupId>-->
-            <!--<artifactId>base-api</artifactId>-->
-            <!--<version>1.0.0</version>-->
-        <!--</dependency>-->
 
         <dependency>
             <groupId>com.tofly</groupId>
             <artifactId>common-oauth</artifactId>
             <version>1.0.0</version>
-            <scope>provided</scope>
         </dependency>
 
         <dependency>
@@ -32,6 +26,11 @@
             <artifactId>common-entity</artifactId>
             <version>1.0.0</version>
         </dependency>
+        <dependency>
+            <groupId>com.tofly</groupId>
+            <artifactId>common-web</artifactId>
+            <version>1.0.0</version>
+        </dependency>
 
     </dependencies>
 

+ 1 - 1
common-log/src/main/java/com/tofly/common/log/aspect/LogAspect.java

@@ -1,11 +1,11 @@
 package com.tofly.common.log.aspect;
 
-import com.tofly.base.api.entity.Log;
 import com.tofly.common.core.constant.CommonConstants;
 import com.tofly.common.core.util.SpringContextHolder;
 import com.tofly.common.log.annotation.ToFlyAppLog;
 import com.tofly.common.log.event.SysLogEvent;
 import com.tofly.common.log.util.SysLogUtils;
+import com.tofly.entity.pojo.Log;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.aspectj.lang.JoinPoint;

+ 1 - 1
common-log/src/main/java/com/tofly/common/log/config/LogAutoConfiguration.java

@@ -1,8 +1,8 @@
 package com.tofly.common.log.config;
 
-import com.tofly.base.api.feign.BaseLogService;
 import com.tofly.common.log.aspect.LogAspect;
 import com.tofly.common.log.event.SysLogListener;
+import com.tofly.common.log.service.BaseLogService;
 import lombok.AllArgsConstructor;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
 import org.springframework.context.annotation.Bean;

+ 2 - 2
common-log/src/main/java/com/tofly/common/log/util/SysLogUtils.java

@@ -2,10 +2,10 @@
 package com.tofly.common.log.util;
 
 import com.alibaba.fastjson.JSON;
-import com.tofly.base.api.entity.Log;
-import com.tofly.common.core.configs.MyParameterRequestWrapper;
 import com.tofly.common.core.util.HttpURL;
 import com.tofly.common.core.util.IpUtil;
+import com.tofly.entity.pojo.Log;
+import com.tofly.web.config.MyParameterRequestWrapper;
 import lombok.experimental.UtilityClass;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.core.Authentication;

+ 34 - 0
common-oauth/pom.xml

@@ -14,7 +14,14 @@
     <version>1.0.0</version>
 
 
+
     <dependencies>
+
+        <dependency>
+            <groupId>com.tofly</groupId>
+            <artifactId>common-core</artifactId>
+            <version>1.0.0</version>
+        </dependency>
         <dependency>
             <groupId>org.springframework.security.oauth.boot</groupId>
             <artifactId>spring-security-oauth2-autoconfigure</artifactId>
@@ -28,6 +35,12 @@
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-security</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context-support</artifactId>
+            <version>5.2.9.RELEASE</version>
+        </dependency>
+
         <dependency>
             <groupId>io.springfox</groupId>
             <artifactId>springfox-core</artifactId>
@@ -47,6 +60,27 @@
             <scope>compile</scope>
         </dependency>
 
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger2</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>io.swagger</groupId>
+                    <artifactId>swagger-models</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-models</artifactId>
+        </dependency>
+
+
+        <!--<dependency>-->
+            <!--<groupId>io.springfox</groupId>-->
+            <!--<artifactId>springfox-swagger-ui</artifactId>-->
+        <!--</dependency>-->
+
     </dependencies>
 
 </project>

+ 1 - 1
common-baseapi/src/main/java/com/tofly/baseapi/config/DocBean.java

@@ -1,4 +1,4 @@
-package com.tofly.baseapi.config;
+package com.tofly.common.config;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;

+ 1 - 1
common-baseapi/src/main/java/com/tofly/baseapi/config/SwaggerConfig.java

@@ -1,4 +1,4 @@
-package com.tofly.baseapi.config;
+package com.tofly.common.config;
 
 import com.tofly.common.core.util.StringUtil;
 import io.swagger.annotations.ApiOperation;

+ 19 - 0
common-oauth/src/main/java/com/tofly/common/config/ToflyCloudApplication.java

@@ -0,0 +1,19 @@
+package com.tofly.common.config;
+
+import org.springframework.cloud.client.SpringCloudApplication;
+import org.springframework.context.annotation.ComponentScan;
+
+import java.lang.annotation.*;
+
+/**
+ * @author tuonbed
+ * @date 2020/10/13  9:15
+ */
+@Target({ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+@Inherited
+@ComponentScan({"com.tofly"})
+@SpringCloudApplication
+public @interface ToflyCloudApplication {
+}

+ 40 - 0
common-oauth/src/main/java/com/tofly/common/config/ToflyRestTemplate.java

@@ -0,0 +1,40 @@
+package com.tofly.common.config;
+
+import lombok.SneakyThrows;
+import org.springframework.cloud.client.loadbalancer.LoadBalanced;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.client.ClientHttpResponse;
+import org.springframework.web.client.DefaultResponseErrorHandler;
+import org.springframework.web.client.RestTemplate;
+
+/**
+ * @author tuonbed
+ * @date 2020/10/13  9:20
+ */
+@Configuration
+public class ToflyRestTemplate {
+    @Bean
+    public RestTemplate restTemplate() {
+        return new RestTemplate();
+    }
+
+    @Bean
+    @Primary
+    @LoadBalanced
+    public RestTemplate ehRestTemplate() {
+        RestTemplate restTemplate = new RestTemplate();
+        restTemplate.setErrorHandler(new DefaultResponseErrorHandler() {
+            @Override
+            @SneakyThrows
+            public void handleError(ClientHttpResponse response) {
+                if (response.getRawStatusCode() != HttpStatus.BAD_REQUEST.value()) {
+                    super.handleError(response);
+                }
+            }
+        });
+        return restTemplate;
+    }
+}

+ 26 - 26
common-oauth/src/main/java/com/tofly/common/oauth/feign/FLowableFeignConfiguration.java

@@ -1,26 +1,26 @@
-package com.tofly.common.oauth.feign;
-
-import com.tofly.base.api.feign.FlowableService;
-import lombok.AllArgsConstructor;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.scheduling.annotation.EnableAsync;
-
-/**
- * @author tuonbed
- * @date 2019/12/3  16:36
- */
-@EnableAsync
-@Configuration
-@AllArgsConstructor
-@ConditionalOnWebApplication
-public class FLowableFeignConfiguration {
-
-    private final FlowableService flowableService;
-
-    @Bean
-    public FlowableListener getFlowableListener(){
-        return new FlowableListener(flowableService);
-    }
-}
+//package com.tofly.common.oauth.feign;
+//
+//import com.tofly.base.api.feign.FlowableService;
+//import lombok.AllArgsConstructor;
+//import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
+//import org.springframework.context.annotation.Bean;
+//import org.springframework.context.annotation.Configuration;
+//import org.springframework.scheduling.annotation.EnableAsync;
+//
+///**
+// * @author tuonbed
+// * @date 2019/12/3  16:36
+// */
+//@EnableAsync
+//@Configuration
+//@AllArgsConstructor
+//@ConditionalOnWebApplication
+//public class FLowableFeignConfiguration {
+//
+//    private final FlowableService flowableService;
+//
+//    @Bean
+//    public FlowableListener getFlowableListener(){
+//        return new FlowableListener(flowableService);
+//    }
+//}

+ 14 - 14
common-oauth/src/main/java/com/tofly/common/oauth/feign/FlowableAddUserEvent.java

@@ -1,14 +1,14 @@
-package com.tofly.common.oauth.feign;
-
-import com.tofly.base.api.entity.User;
-import org.springframework.context.ApplicationEvent;
-
-/**
- * @author tuonbed
- * @date 2019/12/3  16:31
- */
-public class FlowableAddUserEvent extends ApplicationEvent {
-    public FlowableAddUserEvent(User source) {
-        super(source);
-    }
-}
+//package com.tofly.common.oauth.feign;
+//
+//import com.tofly.base.api.entity.User;
+//import org.springframework.context.ApplicationEvent;
+//
+///**
+// * @author tuonbed
+// * @date 2019/12/3  16:31
+// */
+//public class FlowableAddUserEvent extends ApplicationEvent {
+//    public FlowableAddUserEvent(User source) {
+//        super(source);
+//    }
+//}

+ 15 - 15
common-oauth/src/main/java/com/tofly/common/oauth/feign/FlowableAddUserGroupEvent.java

@@ -1,15 +1,15 @@
-package com.tofly.common.oauth.feign;
-
-import org.springframework.context.ApplicationEvent;
-
-import java.util.Map;
-
-/**
- * @author tuonbed
- * @date 2019/12/3  16:31
- */
-public class FlowableAddUserGroupEvent extends ApplicationEvent {
-    public FlowableAddUserGroupEvent(Map source) {
-        super(source);
-    }
-}
+//package com.tofly.common.oauth.feign;
+//
+//import org.springframework.context.ApplicationEvent;
+//
+//import java.util.Map;
+//
+///**
+// * @author tuonbed
+// * @date 2019/12/3  16:31
+// */
+//public class FlowableAddUserGroupEvent extends ApplicationEvent {
+//    public FlowableAddUserGroupEvent(Map source) {
+//        super(source);
+//    }
+//}

+ 17 - 17
common-oauth/src/main/java/com/tofly/common/oauth/feign/FlowableAddUserToGroupEvent.java

@@ -1,17 +1,17 @@
-package com.tofly.common.oauth.feign;
-
-import com.tofly.base.api.entity.MemberUser;
-import com.tofly.base.api.entity.User;
-import org.springframework.context.ApplicationEvent;
-
-import java.util.Map;
-
-/**
- * @author tuonbed
- * @date 2019/12/3  16:31
- */
-public class FlowableAddUserToGroupEvent extends ApplicationEvent {
-    public FlowableAddUserToGroupEvent(MemberUser source) {
-        super(source);
-    }
-}
+//package com.tofly.common.oauth.feign;
+//
+//import com.tofly.base.api.entity.MemberUser;
+//import com.tofly.base.api.entity.User;
+//import org.springframework.context.ApplicationEvent;
+//
+//import java.util.Map;
+//
+///**
+// * @author tuonbed
+// * @date 2019/12/3  16:31
+// */
+//public class FlowableAddUserToGroupEvent extends ApplicationEvent {
+//    public FlowableAddUserToGroupEvent(MemberUser source) {
+//        super(source);
+//    }
+//}

+ 13 - 13
common-oauth/src/main/java/com/tofly/common/oauth/feign/FlowableDeleteGroupEvent.java

@@ -1,13 +1,13 @@
-package com.tofly.common.oauth.feign;
-
-import org.springframework.context.ApplicationEvent;
-
-/**
- * @author tuonbed
- * @date 2019/12/3  16:31
- */
-public class FlowableDeleteGroupEvent extends ApplicationEvent {
-    public FlowableDeleteGroupEvent(String source) {
-        super(source);
-    }
-}
+//package com.tofly.common.oauth.feign;
+//
+//import org.springframework.context.ApplicationEvent;
+//
+///**
+// * @author tuonbed
+// * @date 2019/12/3  16:31
+// */
+//public class FlowableDeleteGroupEvent extends ApplicationEvent {
+//    public FlowableDeleteGroupEvent(String source) {
+//        super(source);
+//    }
+//}

+ 16 - 16
common-oauth/src/main/java/com/tofly/common/oauth/feign/FlowableDeleteUserEvent.java

@@ -1,16 +1,16 @@
-package com.tofly.common.oauth.feign;
-
-import com.tofly.base.api.entity.User;
-import org.springframework.context.ApplicationEvent;
-
-import java.util.Map;
-
-/**
- * @author tuonbed
- * @date 2019/12/3  16:31
- */
-public class FlowableDeleteUserEvent extends ApplicationEvent {
-    public FlowableDeleteUserEvent(User source) {
-        super(source);
-    }
-}
+//package com.tofly.common.oauth.feign;
+//
+//import com.tofly.base.api.entity.User;
+//import org.springframework.context.ApplicationEvent;
+//
+//import java.util.Map;
+//
+///**
+// * @author tuonbed
+// * @date 2019/12/3  16:31
+// */
+//public class FlowableDeleteUserEvent extends ApplicationEvent {
+//    public FlowableDeleteUserEvent(User source) {
+//        super(source);
+//    }
+//}

+ 14 - 14
common-oauth/src/main/java/com/tofly/common/oauth/feign/FlowableDeleteUserToGroupEvent.java

@@ -1,14 +1,14 @@
-package com.tofly.common.oauth.feign;
-
-import com.tofly.base.api.entity.MemberUser;
-import org.springframework.context.ApplicationEvent;
-
-/**
- * @author tuonbed
- * @date 2019/12/3  16:31
- */
-public class FlowableDeleteUserToGroupEvent extends ApplicationEvent {
-    public FlowableDeleteUserToGroupEvent(MemberUser source) {
-        super(source);
-    }
-}
+//package com.tofly.common.oauth.feign;
+//
+//import com.tofly.base.api.entity.MemberUser;
+//import org.springframework.context.ApplicationEvent;
+//
+///**
+// * @author tuonbed
+// * @date 2019/12/3  16:31
+// */
+//public class FlowableDeleteUserToGroupEvent extends ApplicationEvent {
+//    public FlowableDeleteUserToGroupEvent(MemberUser source) {
+//        super(source);
+//    }
+//}

+ 1 - 1
common-oauth/src/main/resources/META-INF/spring.factories

@@ -1 +1 @@
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\com.tofly.common.config.UploadAutoConfiguration
+#org.springframework.boot.autoconfigure.EnableAutoConfiguration=\com.tofly.common.config.UploadAutoConfiguration

+ 6 - 1
common-orm-mybatisplus/src/main/java/com/tofly/mybatisplus/config/MybatisPlusConfigurer.java

@@ -87,9 +87,14 @@ public class MybatisPlusConfigurer {
 
         return new ConfigurationCustomizer() {
             @Override
-            public void customize(MybatisConfiguration configuration) {
+            public void customize(org.apache.ibatis.session.Configuration configuration) {
                 configuration.setObjectWrapperFactory(new MapWrapperFactory());
             }
+
+//            @Override
+//            public void customize(MybatisConfiguration configuration) {
+//
+//            }
         };
     }
 

+ 17 - 0
common-orm-mybatisplus/src/main/java/com/tofly/mybatisplus/config/ToflyMapperScan.java

@@ -0,0 +1,17 @@
+package com.tofly.mybatisplus.config;
+
+import org.mybatis.spring.annotation.MapperScan;
+
+import java.lang.annotation.*;
+
+/**
+ * @author tuonbed
+ * @date 2020/10/13  9:13
+ */
+@Target({ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+@Inherited
+@MapperScan({"com.tofly.*.mapper","com.tofly.*.custom.mapper"})
+public @interface ToflyMapperScan {
+}

+ 0 - 1
common-web/pom.xml

@@ -17,7 +17,6 @@
             <groupId>com.tofly</groupId>
             <artifactId>common-core</artifactId>
             <version>1.0.0</version>
-            <scope>provided</scope>
         </dependency>
     </dependencies>
 </project>

+ 37 - 9
pom.xml

@@ -24,15 +24,22 @@
         <spring-cloud.version>Hoxton.SR8</spring-cloud.version>
         <jasypt.version>2.1.0</jasypt.version>
         <fastjson.version>1.2.73</fastjson.version>
+        <!--<spring-platform.version>Cairo-SR8</spring-platform.version>-->
         <spring-platform.version>Cairo-SR8</spring-platform.version>
-        <security.oauth.version>2.5.0.RELEASE</security.oauth.version>
+        <security.oauth.version>2.3.6.RELEASE</security.oauth.version>
         <jackson.modules>2.9.8</jackson.modules>
         <swagger.version>2.9.2</swagger.version>
         <swaggermg.version>1.0.6</swaggermg.version>
-
+        <swaggerold.version>1.5.21</swaggerold.version>
+        <spring.version>5.2.9</spring.version>
     </properties>
 
     <dependencies>
+
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-config</artifactId>
+        </dependency>
         <!--配置文件处理器-->
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -68,9 +75,25 @@
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-openfeign</artifactId>
         </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.springframework.boot</groupId>-->
+            <!--<artifactId>spring-boot-starter-web</artifactId>-->
+        <!--</dependency>-->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
+            <exclusions>
+                <!--排除tomcat依赖-->
+                <exclusion>
+                    <artifactId>spring-boot-starter-tomcat</artifactId>
+                    <groupId>org.springframework.boot</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <!--undertow容器,经测验,undertow比tomct性能更好-->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-undertow</artifactId>
         </dependency>
         <!-- nacos配置中心 -->
         <dependency>
@@ -138,13 +161,13 @@
                 <scope>import</scope>
             </dependency>
 
-            <dependency>
-                <groupId>io.spring.platform</groupId>
-                <artifactId>platform-bom</artifactId>
-                <version>${spring-platform.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
+            <!--<dependency>-->
+                <!--<groupId>io.spring.platform</groupId>-->
+                <!--<artifactId>platform-bom</artifactId>-->
+                <!--<version>${spring-platform.version}</version>-->
+                <!--<type>pom</type>-->
+                <!--<scope>import</scope>-->
+            <!--</dependency>-->
             <!--稳定版本,替代spring security bom内置-->
             <dependency>
                 <groupId>org.springframework.security.oauth</groupId>
@@ -174,6 +197,11 @@
                 <artifactId>swagger-mg-ui</artifactId>
                 <version>${swaggermg.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.swagger</groupId>
+                <artifactId>swagger-models</artifactId>
+                <version>${swaggerold.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 

+ 47 - 0
tofly-webParent/pom.xml

@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>tofly-parent</artifactId>
+        <groupId>com.tofly</groupId>
+        <version>1.0.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>tofly-webParent</artifactId>
+    <groupId>com.tofly</groupId>
+    <version>1.0.0</version>
+    <name>web-parent</name>
+    <packaging>pom</packaging>
+    <description>web基础架构父类</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.tofly</groupId>
+            <artifactId>common-oauth</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.tofly</groupId>
+            <artifactId>common-log</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.tofly</groupId>
+            <artifactId>common-orm-mybatisplus</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.tofly</groupId>
+            <artifactId>common-baseapi</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+
+
+    </dependencies>
+
+</project>

+ 261 - 0
tofly-webParent/tofly-webParent.iml

@@ -0,0 +1,261 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="common-oauth" />
+    <orderEntry type="module" module-name="common-core" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:3.17" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi:3.17" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:3.17" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:2.6.0" level="project" />
+    <orderEntry type="library" name="Maven: stax:stax-api:1.0.1" level="project" />
+    <orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.04" level="project" />
+    <orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:4.0.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.7.0" level="project" />
+    <orderEntry type="library" name="Maven: commons-net:commons-net:3.6" level="project" />
+    <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.3" level="project" />
+    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
+    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
+    <orderEntry type="library" name="Maven: com.google.zxing:core:3.3.0" level="project" />
+    <orderEntry type="library" name="Maven: com.itextpdf:itextpdf:5.5.13.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.security.oauth.boot:spring-security-oauth2-autoconfigure:2.1.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.0" level="project" />
+    <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-core:2.3.0.1" level="project" />
+    <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-impl:2.3.0.1" level="project" />
+    <orderEntry type="library" name="Maven: javax.xml.bind:jaxb-api:2.3.1" level="project" />
+    <orderEntry type="library" name="Maven: javax.activation:javax.activation-api:1.2.0" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.2.10.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.security.oauth:spring-security-oauth2:2.3.6.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-core:5.2.6.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-config:5.2.6.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-web:5.2.6.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-mapper-asl:1.9.13" level="project" />
+    <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-core-asl:1.9.13" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-jwt:1.0.9.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.56" level="project" />
+    <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.56" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.2.10.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-security:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-security:2.2.10.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.2.9.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.2.9.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.2.9.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-core:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.10.14" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:guava:29.0-jre" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" />
+    <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
+    <orderEntry type="library" name="Maven: org.checkerframework:checker-qual:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.3.4" level="project" />
+    <orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.5.1" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spi:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.20" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: org.mapstruct:mapstruct:1.2.0.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger:swagger-models:1.5.21" level="project" />
+    <orderEntry type="module" module-name="common-log" />
+    <orderEntry type="module" module-name="common-entity" />
+    <orderEntry type="module" module-name="common-web" />
+    <orderEntry type="module" module-name="common-orm-mybatisplus" />
+    <orderEntry type="library" name="Maven: com.oracle:ojdbc6:11.2.0.4.0-atlassian-hosted" level="project" />
+    <orderEntry type="library" name="Maven: mysql:mysql-connector-java:8.0.21" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.3.2" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.3.2" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.3.2" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.3.2" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.3.2" level="project" />
+    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:3.1" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.4" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.4" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.2.10.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.4.5" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.2.9.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.2.9.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:druid-spring-boot-starter:1.1.16" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:druid:1.1.16" level="project" />
+    <orderEntry type="module" module-name="common-baseapi" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-config:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-rsa:1.0.9.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-config-client:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.12" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.13" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.8" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.8" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-configuration-processor:2.2.10.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-actuator:2.2.10.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.2.10.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.2.10.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.12.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.12.1" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.30" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
+    <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.25" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-actuator-autoconfigure:2.2.10.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-actuator:2.2.10.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.9.8" level="project" />
+    <orderEntry type="library" name="Maven: io.micrometer:micrometer-core:1.3.14" level="project" />
+    <orderEntry type="library" name="Maven: org.hdrhistogram:HdrHistogram:2.1.11" level="project" />
+    <orderEntry type="library" name="Maven: org.latencyutils:LatencyUtils:2.0.3" level="project" />
+    <orderEntry type="library" name="Maven: de.codecentric:spring-boot-admin-starter-client:2.2.4" level="project" />
+    <orderEntry type="library" name="Maven: de.codecentric:spring-boot-admin-client:2.2.4" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-sleuth:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.2.10.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.2.9.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.6" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-sleuth-core:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.aspectj:aspectjrt:1.9.6" level="project" />
+    <orderEntry type="library" name="Maven: io.zipkin.brave:brave:5.12.3" level="project" />
+    <orderEntry type="library" name="Maven: io.zipkin.brave:brave-context-slf4j:5.12.3" level="project" />
+    <orderEntry type="library" name="Maven: io.zipkin.brave:brave-instrumentation-messaging:5.12.3" level="project" />
+    <orderEntry type="library" name="Maven: io.zipkin.brave:brave-instrumentation-rpc:5.12.3" level="project" />
+    <orderEntry type="library" name="Maven: io.zipkin.brave:brave-instrumentation-spring-web:5.12.3" level="project" />
+    <orderEntry type="library" name="Maven: io.zipkin.brave:brave-instrumentation-http:5.12.3" level="project" />
+    <orderEntry type="library" name="Maven: io.zipkin.brave:brave-instrumentation-spring-rabbit:5.12.3" level="project" />
+    <orderEntry type="library" name="Maven: io.zipkin.brave:brave-instrumentation-kafka-clients:5.12.3" level="project" />
+    <orderEntry type="library" name="Maven: io.zipkin.brave:brave-instrumentation-kafka-streams:5.12.3" level="project" />
+    <orderEntry type="library" name="Maven: io.zipkin.brave:brave-instrumentation-httpclient:5.12.3" level="project" />
+    <orderEntry type="library" name="Maven: io.zipkin.brave:brave-instrumentation-httpasyncclient:5.12.3" level="project" />
+    <orderEntry type="library" name="Maven: io.zipkin.brave:brave-instrumentation-spring-webmvc:5.12.3" level="project" />
+    <orderEntry type="library" name="Maven: io.zipkin.brave:brave-instrumentation-servlet:5.12.3" level="project" />
+    <orderEntry type="library" name="Maven: io.zipkin.brave:brave-instrumentation-jms:5.12.3" level="project" />
+    <orderEntry type="library" name="Maven: io.zipkin.reporter2:zipkin-reporter-metrics-micrometer:2.15.0" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-zipkin:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-sleuth-zipkin:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.zipkin.zipkin2:zipkin:2.21.1" level="project" />
+    <orderEntry type="library" name="Maven: io.zipkin.reporter2:zipkin-reporter:2.15.0" level="project" />
+    <orderEntry type="library" name="Maven: io.zipkin.reporter2:zipkin-reporter-brave:2.15.0" level="project" />
+    <orderEntry type="library" name="Maven: io.zipkin.reporter2:zipkin-sender-kafka:2.15.0" level="project" />
+    <orderEntry type="library" name="Maven: io.zipkin.reporter2:zipkin-sender-activemq-client:2.15.0" level="project" />
+    <orderEntry type="library" name="Maven: io.zipkin.reporter2:zipkin-sender-amqp-client:2.15.0" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-hystrix:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-hystrix:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-ribbon:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-archaius:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-archaius:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.archaius:archaius-core:0.7.6" level="project" />
+    <orderEntry type="library" name="Maven: commons-configuration:commons-configuration:1.8" level="project" />
+    <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-core:1.5.18" level="project" />
+    <orderEntry type="library" name="Maven: io.reactivex:rxjava:1.3.8" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-serialization:1.5.18" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.fasterxml.jackson.module:jackson-module-afterburner:2.9.8" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-metrics-event-stream:1.5.18" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-javanica:1.5.18" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.9" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.ow2.asm:asm:5.0.4" level="project" />
+    <orderEntry type="library" name="Maven: io.reactivex:rxjava-reactive-streams:1.2.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.reactivestreams:reactive-streams:1.0.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-openfeign:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-openfeign-core:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form-spring:3.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form:3.8.0" level="project" />
+    <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.4" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-web:5.2.9.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-commons:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-crypto:5.2.6.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign:feign-core:10.10.1" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign:feign-slf4j:10.10.1" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign:feign-hystrix:10.10.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.2.10.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.2.10.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.9.8" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.9.8" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-validation:2.2.10.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.validation:jakarta.validation-api:2.0.2" level="project" />
+    <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.0.20.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.2.9.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.2.9.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-undertow:2.2.10.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.undertow:undertow-core:2.0.31.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.4.1.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.jboss.xnio:xnio-api:3.3.8.Final" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.jboss.xnio:xnio-nio:3.3.8.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.undertow:undertow-servlet:2.0.31.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.jboss.spec.javax.annotation:jboss-annotations-api_1.2_spec:1.0.2.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.undertow:undertow-websockets-jsr:2.0.31.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.jboss.spec.javax.websocket:jboss-websocket-api_1.1_spec:1.1.4.Final" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.servlet:jakarta.servlet-api:4.0.4" level="project" />
+    <orderEntry type="library" name="Maven: org.glassfish:jakarta.el:3.0.3" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba.cloud:spring-cloud-starter-alibaba-nacos-config:2.2.1.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba.spring:spring-context-support:1.0.6" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-client:1.2.1" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-common:1.2.1" level="project" />
+    <orderEntry type="library" name="Maven: commons-io:commons-io:2.2" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-api:1.2.1" level="project" />
+    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.13" level="project" />
+    <orderEntry type="library" name="Maven: io.prometheus:simpleclient:0.5.0" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-context:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba.cloud:spring-cloud-starter-alibaba-nacos-discovery:2.2.1.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-ribbon:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon:2.3.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.ribbon:ribbon-transport:2.3.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: io.reactivex:rxnetty-contexts:0.4.9" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: io.reactivex:rxnetty-servo:0.4.9" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: javax.inject:javax.inject:1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: io.reactivex:rxnetty:0.4.9" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon-core:2.3.0" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon-httpclient:2.3.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.jersey:jersey-client:1.19.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.jersey:jersey-core:1.19.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: javax.ws.rs:jsr311-api:1.1.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.jersey.contribs:jersey-apache-client4:1.19.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.servo:servo-core:0.12.21" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.netflix-commons:netflix-commons-util:0.3.0" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon-loadbalancer:2.3.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.netflix-commons:netflix-statistics:0.1.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.2.10.RELEASE" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:2.2.10.RELEASE" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.2.10.RELEASE" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.jayway.jsonpath:json-path:2.4.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: net.minidev:json-smart:2.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: net.minidev:accessors-smart:1.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:2.3.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: jakarta.activation:jakarta.activation-api:1.2.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter:5.5.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-api:5.5.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.apiguardian:apiguardian-api:1.1.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.opentest4j:opentest4j:1.2.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-commons:1.5.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-params:5.5.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-engine:5.5.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-engine:1.5.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-junit-jupiter:3.1.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:3.13.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest:2.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:3.1.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy-agent:1.10.14" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:2.6" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.skyscreamer:jsonassert:1.5.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.2.9.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.2.9.RELEASE" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:5.2.9.RELEASE" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.xmlunit:xmlunit-core:2.6.4" level="project" />
+    <orderEntry type="library" name="Maven: com.github.ulisesbocchio:jasypt-spring-boot-starter:2.1.0" level="project" />
+    <orderEntry type="library" name="Maven: com.github.ulisesbocchio:jasypt-spring-boot:2.1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.jasypt:jasypt:1.9.2" level="project" />
+    <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.12" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.73" level="project" />
+  </component>
+</module>