diff --git a/esua-epdc/epdc-cloud-gateway-shibei b/esua-epdc/epdc-cloud-gateway-shibei index b9ed9d8d4..a783187c8 160000 --- a/esua-epdc/epdc-cloud-gateway-shibei +++ b/esua-epdc/epdc-cloud-gateway-shibei @@ -1 +1 @@ -Subproject commit b9ed9d8d4489f6cd87f2d1e5152bbf206c831dfb +Subproject commit a783187c8dbbe5e048d157493b9b871c3ef35787 diff --git a/esua-epdc/epdc-cloud-parent-shibei b/esua-epdc/epdc-cloud-parent-shibei index 418503b89..13aed64d5 160000 --- a/esua-epdc/epdc-cloud-parent-shibei +++ b/esua-epdc/epdc-cloud-parent-shibei @@ -1 +1 @@ -Subproject commit 418503b89e892d5f7279c2a52c6aad38da1544d9 +Subproject commit 13aed64d573dd166c1cf120b8a5458a76e43082c diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/EventsApplication.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/EventsApplication.java index d176f9c5d..abe0c42ba 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/EventsApplication.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/EventsApplication.java @@ -23,7 +23,6 @@ import org.springframework.scheduling.annotation.EnableAsync; @SpringBootApplication @EnableDiscoveryClient @EnableFeignClients -@EnableAsync public class EventsApplication { public static void main(String[] args) { diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/config/AsyncConfig.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/config/AsyncConfig.java deleted file mode 100644 index 32f72d7b1..000000000 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/config/AsyncConfig.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.elink.esua.epdc.config; - -import org.springframework.context.annotation.Bean; -import org.springframework.core.task.AsyncTaskExecutor; -import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; - -public class AsyncConfig { - - private static final int MAX_POOL_SIZE = 100; - - private static final int CORE_POOL_SIZE = 50; - - @Bean("asyncTaskExecutor") - public AsyncTaskExecutor asyncTaskExecutor() { - ThreadPoolTaskExecutor asyncTaskExecutor = new ThreadPoolTaskExecutor(); - asyncTaskExecutor.setMaxPoolSize(MAX_POOL_SIZE); - asyncTaskExecutor.setCorePoolSize(CORE_POOL_SIZE); - asyncTaskExecutor.setThreadNamePrefix("async-task-thread-pool-"); - asyncTaskExecutor.initialize(); - return asyncTaskExecutor; - } -} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/config/UndertowConfig.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/config/UndertowConfig.java deleted file mode 100644 index 303886487..000000000 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/config/UndertowConfig.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.elink.esua.epdc.config; - -import io.undertow.Undertow; -import io.undertow.UndertowOptions; -import org.springframework.boot.web.embedded.undertow.UndertowBuilderCustomizer; -import org.springframework.boot.web.embedded.undertow.UndertowServletWebServerFactory; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -@Configuration -public class UndertowConfig { - - @Bean - public UndertowServletWebServerFactory undertowServletWebServerFactory() { - UndertowServletWebServerFactory factory = new UndertowServletWebServerFactory(); - factory.addBuilderCustomizers(new UndertowBuilderCustomizer() { - @Override - public void customize(Undertow.Builder builder) { - builder.setServerOption(UndertowOptions.RECORD_REQUEST_START_TIME, true); - } - }); - return factory; - } -} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java index b76ea2601..aaf5c2c1d 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java @@ -3426,7 +3426,6 @@ public class ItemServiceImpl extends BaseServiceImpl implem @Override @Transactional - @Async public Result submitMsFzItemResi(SubmitItemFormDTO formDto) { if("0".equals(formDto.getAppealSource())){ formDto.setNickName("网格员:"+formDto.getNickName());