From b9e01b2d1dbe4ec11a129f6ad2e36c756decd29d Mon Sep 17 00:00:00 2001 From: wayn <1669738430@qq.com> Date: Tue, 30 Mar 2021 23:12:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 45 +++++++++++++++---- waynboot-admin-api/pom.xml | 13 +++--- .../framework/config/SecurityConfig.java | 2 +- waynboot-common/pom.xml | 22 +-------- waynboot-generator/pom.xml | 9 ++-- waynboot-message-core/pom.xml | 10 +---- waynboot-message/pom.xml | 12 ++--- waynboot-mobile-api/pom.xml | 16 ++++--- .../api/service/impl/IHomeServiceImpl.java | 17 +++---- 9 files changed, 76 insertions(+), 70 deletions(-) diff --git a/pom.xml b/pom.xml index c410789..4374300 100644 --- a/pom.xml +++ b/pom.xml @@ -2,11 +2,11 @@ 4.0.0 + org.springframework.boot spring-boot-starter-parent - 2.2.4.RELEASE - + 2.4.4 waynboot-common @@ -18,21 +18,22 @@ com.wayn waynboot - 0.0.1-SNAPSHOT + 1.1.0 pom waynboot - waynboot project for Spring Boot + waynboot mall - 1.8 + 11 UTF-8 + 3.8.1 ${java.version} ${java.version} - 2.2.4.RELEASE + 2.4.4 8.0.19 3.3.0 1.18.6 - 3.4.1 + 3.4.2 1.2.4 2.8.0 3.2.2 @@ -42,8 +43,8 @@ 1.6.2 2.9.2 4.2.0 - 3.12.0 - [7.2.0, 7.2.99] + 3.14.0 + 7.4.0 1.4.7 @@ -242,6 +243,32 @@ false + + spring-snapshots + https://repo.spring.io/snapshot + + + spring-milestones + https://repo.spring.io/milestone + + + + + + org.apache.maven.plugins + maven-compiler-plugin + ${maven-compiler-plugin.version} + + ${java.version} + ${java.version} + + -parameters + + + + + + diff --git a/waynboot-admin-api/pom.xml b/waynboot-admin-api/pom.xml index 5987e70..8d6f521 100644 --- a/waynboot-admin-api/pom.xml +++ b/waynboot-admin-api/pom.xml @@ -5,7 +5,7 @@ waynboot com.wayn - 0.0.1-SNAPSHOT + 1.1.0 4.0.0 @@ -55,7 +55,7 @@ com.wayn waynboot-common - 0.0.1-SNAPSHOT + 1.1.0 org.elasticsearch @@ -75,7 +75,7 @@ com.wayn waynboot-message-core - 0.0.1-SNAPSHOT + 1.1.0 org.springframework.boot @@ -99,13 +99,14 @@ org.springframework.boot spring-boot-maven-plugin + ${spring-boot.version} com.wayn.AdminApplication ZIP - - -parameters - + + + diff --git a/waynboot-admin-api/src/main/java/com/wayn/admin/framework/config/SecurityConfig.java b/waynboot-admin-api/src/main/java/com/wayn/admin/framework/config/SecurityConfig.java index 608dc0f..75fd384 100644 --- a/waynboot-admin-api/src/main/java/com/wayn/admin/framework/config/SecurityConfig.java +++ b/waynboot-admin-api/src/main/java/com/wayn/admin/framework/config/SecurityConfig.java @@ -102,7 +102,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter { @Bean public CorsConfigurationSource corsConfigurationSource() { CorsConfiguration corsConfiguration = new CorsConfiguration(); - corsConfiguration.addAllowedOrigin("*"); + corsConfiguration.addAllowedOriginPattern("*"); corsConfiguration.addAllowedHeader("*"); corsConfiguration.addAllowedMethod("*"); corsConfiguration.setAllowCredentials(true); diff --git a/waynboot-common/pom.xml b/waynboot-common/pom.xml index b2e2966..6bf860e 100644 --- a/waynboot-common/pom.xml +++ b/waynboot-common/pom.xml @@ -5,12 +5,11 @@ waynboot com.wayn - 0.0.1-SNAPSHOT + 1.1.0 4.0.0 - waynboot-common - 0.0.1-SNAPSHOT + 1.1.0 @@ -198,21 +197,4 @@ - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.3 - - ${java.version} - ${java.version} - - -parameters - - - - - diff --git a/waynboot-generator/pom.xml b/waynboot-generator/pom.xml index 35153fb..41f7be0 100644 --- a/waynboot-generator/pom.xml +++ b/waynboot-generator/pom.xml @@ -5,11 +5,11 @@ waynboot com.wayn - 0.0.1-SNAPSHOT + 1.1.0 4.0.0 - waynboot-generator + 1.1.0 @@ -22,7 +22,7 @@ com.baomidou mybatis-plus-generator - ${mybatis-plus.version} + 3.4.1 @@ -51,5 +51,4 @@ 2.3.30 - - \ No newline at end of file + diff --git a/waynboot-message-core/pom.xml b/waynboot-message-core/pom.xml index efaf7e0..f3e3b06 100644 --- a/waynboot-message-core/pom.xml +++ b/waynboot-message-core/pom.xml @@ -5,19 +5,13 @@ waynboot com.wayn - 0.0.1-SNAPSHOT + 1.1.0 4.0.0 - waynboot-message-core - - - 8 - 8 - + 1.1.0 - org.springframework.boot spring-boot-starter-web diff --git a/waynboot-message/pom.xml b/waynboot-message/pom.xml index 7479bfa..b049704 100644 --- a/waynboot-message/pom.xml +++ b/waynboot-message/pom.xml @@ -5,18 +5,18 @@ waynboot com.wayn - 0.0.1-SNAPSHOT + 1.1.0 4.0.0 - waynboot-message + 1.1.0 com.wayn waynboot-message-core - 0.0.1-SNAPSHOT + 1.1.0 @@ -76,9 +76,9 @@ com.wayn.MessageApplication ZIP - - -parameters - + + + diff --git a/waynboot-mobile-api/pom.xml b/waynboot-mobile-api/pom.xml index c1c5dfb..9ebe21c 100644 --- a/waynboot-mobile-api/pom.xml +++ b/waynboot-mobile-api/pom.xml @@ -5,11 +5,13 @@ waynboot com.wayn - 0.0.1-SNAPSHOT + 1.1.0 4.0.0 - waynboot-mobile-api + 1.1.0 + + @@ -55,7 +57,7 @@ com.wayn waynboot-common - 0.0.1-SNAPSHOT + 1.1.0 org.elasticsearch @@ -75,7 +77,7 @@ com.wayn waynboot-message-core - 0.0.1-SNAPSHOT + 1.1.0 org.springframework.boot @@ -103,9 +105,9 @@ com.wayn.MobileApplication ZIP - - -parameters - + + + diff --git a/waynboot-mobile-api/src/main/java/com/wayn/mobile/api/service/impl/IHomeServiceImpl.java b/waynboot-mobile-api/src/main/java/com/wayn/mobile/api/service/impl/IHomeServiceImpl.java index 65a99db..b34eb4d 100644 --- a/waynboot-mobile-api/src/main/java/com/wayn/mobile/api/service/impl/IHomeServiceImpl.java +++ b/waynboot-mobile-api/src/main/java/com/wayn/mobile/api/service/impl/IHomeServiceImpl.java @@ -43,13 +43,14 @@ public class IHomeServiceImpl implements IHomeService { @Override public R getHomeIndexData() { - // if (redisCache.existsKey(INDEX_DATA)) { - // return redisCache.getCacheObject(INDEX_DATA); - // } R success = R.success(); - ThreadPoolExecutor poolExecutor = new ThreadPoolExecutor(10, 10, - 0L, TimeUnit.MILLISECONDS, - new LinkedBlockingQueue<>(), r -> new Thread(r, "首页线程")); + ThreadPoolExecutor poolExecutor = new ThreadPoolExecutor( + 10, + 10, + 0L, + TimeUnit.MILLISECONDS, + new LinkedBlockingQueue<>(), + r -> new Thread(r, "首页线程")); Callable> bannerCall = () -> iBannerService.list(new QueryWrapper().eq("status", 0).orderByAsc("sort")); Callable> diamondCall = () -> iDiamondService.list(new QueryWrapper() .orderByAsc("sort") @@ -93,7 +94,7 @@ public class IHomeServiceImpl implements IHomeService { return redisCache.getCacheObject(INDEX_DATA); } R success = R.success(); - List> list = new ArrayList(); + List> list = new ArrayList<>(); CompletableFuture f1 = CompletableFuture.supplyAsync(() -> iBannerService.list(new QueryWrapper().eq("status", 0).orderByAsc("sort"))) .thenAccept(data -> success.add("bannerList", data)); CompletableFuture f2 = CompletableFuture.supplyAsync(() -> iCategoryService.list(new QueryWrapper().eq("level", "L1").orderByAsc("sort"))) @@ -114,7 +115,7 @@ public class IHomeServiceImpl implements IHomeService { list.add(f2); list.add(f3); list.add(f4); - CompletableFuture.allOf(list.toArray(new CompletableFuture[list.size()])).join(); + CompletableFuture.allOf(list.toArray(new CompletableFuture[0])).join(); redisCache.setCacheObject(INDEX_DATA, success, 10, TimeUnit.MINUTES); return success; }