diff --git a/linkwe-admin/src/main/java/com/linkwechat/LinkWeChatApplication.java b/linkwe-admin/src/main/java/com/linkwechat/LinkWeChatApplication.java index 6ebad25f8dc5a59f19dddbec3e574e7afb04bc73..9684fe1a9e2deb6fa0fe9958c71d999b05d3990d 100644 --- a/linkwe-admin/src/main/java/com/linkwechat/LinkWeChatApplication.java +++ b/linkwe-admin/src/main/java/com/linkwechat/LinkWeChatApplication.java @@ -6,6 +6,7 @@ import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; +import org.springframework.scheduling.annotation.EnableAsync; /** * 启动程序 @@ -15,6 +16,7 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; @SpringBootApplication(exclude = { DataSourceAutoConfiguration.class, PageHelperAutoConfiguration.class }) @MapperScan("com.linkwechat.*.mapper") @ForestScan(basePackages = "com.linkwechat.wecom.client") +@EnableAsync public class LinkWeChatApplication { public static void main(String[] args) diff --git a/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeCustomerController.java b/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeCustomerController.java index bb8b98b21e87fb6047694648328c79ff45f7b7b5..e3d0d05420756f5b726ea40daaed6af9b63ac2d4 100644 --- a/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeCustomerController.java +++ b/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeCustomerController.java @@ -22,7 +22,7 @@ import java.util.List; /** * 企业微信客户Controller - * + * * @author ruoyi * @date 2020-09-13 */ @@ -106,16 +106,12 @@ public class WeCustomerController extends BaseController @PreAuthorize("@ss.hasPermi('customerManage:customer:sync')") @Log(title = "企业微信客户同步接口", businessType = BusinessType.DELETE) @GetMapping("/synchWeCustomer") - public AjaxResult synchWeCustomer(){ - SecurityContext securityContext = SecurityContextHolder.getContext(); + public AjaxResult synchWeCustomer() { try { - Threads.SINGLE_THREAD_POOL.execute(new Runnable() { - @Override - public void run() { - SecurityContextHolder.setContext(securityContext); - weCustomerService.synchWeCustomer(); - } - }); + SecurityContext context = SecurityContextHolder.getContext(); + SecurityContextHolder.setStrategyName(SecurityContextHolder.MODE_INHERITABLETHREADLOCAL); + SecurityContextHolder.setContext(context); + weCustomerService.synchWeCustomer(); } catch (Exception e) { e.printStackTrace(); } diff --git a/linkwe-admin/src/main/resources/application.yml b/linkwe-admin/src/main/resources/application.yml index 975b3382ed6d3ba089db3a2f06c754fe1586d9d5..e650ceff2a2679612e9d1a59724f0d75c0ddb332 100644 --- a/linkwe-admin/src/main/resources/application.yml +++ b/linkwe-admin/src/main/resources/application.yml @@ -56,6 +56,11 @@ spring: max-file-size: 10MB # 设置总上传的文件大小 max-request-size: 20MB + task: + execution: + pool: + keep-alive: 10s + thread-name-prefix: common-pool- # 服务模块 devtools: restart: diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/impl/WeCustomerServiceImpl.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/impl/WeCustomerServiceImpl.java index 992e3cb344c40c6e20d681c6195a3c1076fecafe..d1b81778f3b42504bac24cd661cae16fedcb5cec 100644 --- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/impl/WeCustomerServiceImpl.java +++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/impl/WeCustomerServiceImpl.java @@ -26,6 +26,7 @@ import com.linkwechat.wecom.domain.vo.WeMakeCustomerTag; import com.linkwechat.wecom.mapper.WeCustomerMapper; import com.linkwechat.wecom.service.*; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.scheduling.annotation.Async; import org.springframework.security.core.context.SecurityContext; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.stereotype.Service; @@ -121,21 +122,18 @@ public class WeCustomerServiceImpl extends ServiceImpl { + .parallelStream().forEach(k -> { try { - Threads.SINGLE_THREAD_POOL.execute(() -> { - SecurityContextHolder.setContext(securityContext); - weFlowerCustomerHandle(k); - }); + SecurityContextHolder.setContext(securityContext); + weFlowerCustomerHandle(k); } catch (Exception e) { e.printStackTrace(); }