diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/api/MyApiService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/api/MyApiService.java index d278e068a..6f6c39985 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/api/MyApiService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/api/MyApiService.java @@ -96,7 +96,7 @@ public class MyApiService { private RoomReciveRankingService roomReciveRankingService; @Autowired private RoomSendRankingService roomSendRankingService; - @Resource(name = "bizExecutor") + @Resource(name = "biz-executor") private ThreadPoolExecutor bizExecutor; @Autowired private UsersService usersService; diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/lucky/BravoPoolAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/lucky/BravoPoolAdminService.java index 44e745567..72ec362f2 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/lucky/BravoPoolAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/lucky/BravoPoolAdminService.java @@ -68,7 +68,7 @@ public class BravoPoolAdminService { @Autowired private BravoUserMetaService userMetaService; - @Resource(name = "bizExecutor") + @Resource(name = "biz-executor") private ThreadPoolExecutor bizExecutor; private String minStartDate = "2025-03-20"; diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/lucky/Lucky24RecordAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/lucky/Lucky24RecordAdminService.java index 0d71f8984..6a247f7aa 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/lucky/Lucky24RecordAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/lucky/Lucky24RecordAdminService.java @@ -62,7 +62,7 @@ public class Lucky24RecordAdminService { @Autowired private Lucky24RecordMapper recordMapper; - @Resource(name = "bizExecutor") + @Resource(name = "biz-executor") private ThreadPoolExecutor bizExecutor; private String minStartDate = "2024-09-20"; diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/lucky/Lucky25RecordAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/lucky/Lucky25RecordAdminService.java index 359ec08b8..26538e76d 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/lucky/Lucky25RecordAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/lucky/Lucky25RecordAdminService.java @@ -53,7 +53,7 @@ public class Lucky25RecordAdminService { @Autowired private Lucky25RecordMapper recordMapper; - @Resource(name = "bizExecutor") + @Resource(name = "biz-executor") private ThreadPoolExecutor bizExecutor; private String minStartDate = "2025-05-04"; diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/recharge/RechargeRiskUserAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/recharge/RechargeRiskUserAdminService.java index 64e6f2edc..74e28c8eb 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/recharge/RechargeRiskUserAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/recharge/RechargeRiskUserAdminService.java @@ -42,7 +42,7 @@ public class RechargeRiskUserAdminService { private AccountBlockService accountBlockService; @Autowired private RechargeRiskUserAdminMapper rechargeRiskUserAdminMapper; - @Resource(name = "bizExecutor") + @Resource(name = "biz-executor") private ThreadPoolExecutor bizExecutor; public Page page(Long erbanNo, PageReq req) { diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/world/community/DynamicDataAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/world/community/DynamicDataAdminService.java index a33d7dace..f2a1de3fe 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/world/community/DynamicDataAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/world/community/DynamicDataAdminService.java @@ -77,7 +77,7 @@ public class DynamicDataAdminService extends BaseService { @Autowired private IWorldService iWorldService; - @Resource(name = "bizExecutor") + @Resource(name = "biz-executor") private ThreadPoolExecutor bizExecutor; public HSSFWorkbook buildPushRecordExcel(List dynamics) { diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/AdminApplication.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/AdminApplication.java index 9d4f6f083..b31db1b3f 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/AdminApplication.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/AdminApplication.java @@ -1,6 +1,7 @@ package com.accompany.admin; import io.micrometer.core.instrument.MeterRegistry; +import org.dromara.dynamictp.spring.annotation.EnableDynamicTp; import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringBootConfiguration; @@ -16,6 +17,7 @@ import org.springframework.scheduling.annotation.EnableScheduling; * admin * */ +@EnableDynamicTp @SpringBootApplication @ComponentScan({"com.accompany","com.xuanyin"}) @EnableScheduling diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/system/AppVersionAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/system/AppVersionAdminController.java index 519c692ea..5706f76ae 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/system/AppVersionAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/system/AppVersionAdminController.java @@ -49,7 +49,7 @@ public class AppVersionAdminController extends BaseController { private AppVersionAdminService appVersionAdminService; @Autowired private TencentCosUploadService uploadService; - @Resource(name = "bizExecutor") + @Resource(name = "biz-executor") private ThreadPoolExecutor bizExecutor; @Autowired private AdminUserService adminUserService; diff --git a/accompany-admin/accompany-admin-web/src/main/resources/bootstrap.yaml b/accompany-admin/accompany-admin-web/src/main/resources/bootstrap.yaml index b04981d96..3b0fb65fb 100644 --- a/accompany-admin/accompany-admin-web/src/main/resources/bootstrap.yaml +++ b/accompany-admin/accompany-admin-web/src/main/resources/bootstrap.yaml @@ -30,7 +30,7 @@ spring: refresh: true - data-id: sysconf.yml refresh: true - - data-id: threadpool.yml + - data-id: dtp.yml refresh: true --- @@ -53,7 +53,7 @@ spring: refresh: true - data-id: sysconf.yml refresh: true - - data-id: threadpool.yml + - data-id: dtp.yml refresh: true - data-id: database.yml refresh: true diff --git a/accompany-admin/accompany-flow-team-admin-web/src/main/java/com/accompany/flowteam/admin/FlowTeamAdminApplication.java b/accompany-admin/accompany-flow-team-admin-web/src/main/java/com/accompany/flowteam/admin/FlowTeamAdminApplication.java index 854abecba..7893ad454 100644 --- a/accompany-admin/accompany-flow-team-admin-web/src/main/java/com/accompany/flowteam/admin/FlowTeamAdminApplication.java +++ b/accompany-admin/accompany-flow-team-admin-web/src/main/java/com/accompany/flowteam/admin/FlowTeamAdminApplication.java @@ -1,5 +1,6 @@ package com.accompany.flowteam.admin; +import org.dromara.dynamictp.spring.annotation.EnableDynamicTp; import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringBootConfiguration; @@ -13,6 +14,7 @@ import org.springframework.scheduling.annotation.EnableScheduling; * admin * */ +@EnableDynamicTp @SpringBootApplication @ComponentScan({"com.accompany","com.xuanyin"}) @EnableScheduling diff --git a/accompany-admin/accompany-flow-team-admin-web/src/main/resources/bootstrap.yaml b/accompany-admin/accompany-flow-team-admin-web/src/main/resources/bootstrap.yaml index 4d3e1adbf..73cb00050 100644 --- a/accompany-admin/accompany-flow-team-admin-web/src/main/resources/bootstrap.yaml +++ b/accompany-admin/accompany-flow-team-admin-web/src/main/resources/bootstrap.yaml @@ -30,7 +30,7 @@ spring: refresh: true - data-id: sysconf.yml refresh: true - - data-id: threadpool.yml + - data-id: dtp.yml refresh: true --- @@ -53,7 +53,7 @@ spring: refresh: true - data-id: sysconf.yml refresh: true - - data-id: threadpool.yml + - data-id: dtp.yml refresh: true - data-id: database.yml refresh: true diff --git a/accompany-base/accompany-core/pom.xml b/accompany-base/accompany-core/pom.xml index de9a75231..e400bc6fe 100644 --- a/accompany-base/accompany-core/pom.xml +++ b/accompany-base/accompany-core/pom.xml @@ -90,6 +90,24 @@ ${rocketmq-spring-boot.version} + + org.dromara.dynamictp + dynamic-tp-spring-boot-starter-nacos + ${dynamic-tp.version} + + + + org.dromara.dynamictp + dynamic-tp-spring-boot-starter-adapter-webserver + ${dynamic-tp.version} + + + + org.dromara.dynamictp + dynamic-tp-spring-boot-starter-adapter-rocketmq + ${dynamic-tp.version} + + diff --git a/accompany-base/accompany-core/src/main/java/com/accompany/common/config/ExecutorConfig.java b/accompany-base/accompany-core/src/main/java/com/accompany/common/config/ExecutorConfig.java new file mode 100644 index 000000000..8e5ca41a2 --- /dev/null +++ b/accompany-base/accompany-core/src/main/java/com/accompany/common/config/ExecutorConfig.java @@ -0,0 +1,28 @@ +package com.accompany.common.config; + +import com.accompany.core.base.SpringContextHolder; +import com.alibaba.fastjson.JSON; +import lombok.extern.slf4j.Slf4j; +import org.springframework.aop.interceptor.AsyncUncaughtExceptionHandler; +import org.springframework.context.annotation.Configuration; +import org.springframework.scheduling.annotation.AsyncConfigurer; +import org.springframework.scheduling.annotation.EnableAsync; + +import java.util.concurrent.Executor; + +@Slf4j +@EnableAsync +@Configuration +public class ExecutorConfig implements AsyncConfigurer { + + @Override + public Executor getAsyncExecutor() { + return SpringContextHolder.getBean("async-executor"); + } + + @Override + public AsyncUncaughtExceptionHandler getAsyncUncaughtExceptionHandler() { + return (ex,method,params)->log.error("@Async 执行异步方法{} 错误，参数{}", method, JSON.toJSONString(params), ex); + } + +} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/config/ExecutorConfig.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/config/ExecutorConfig.java deleted file mode 100644 index 80b4fc1a0..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/config/ExecutorConfig.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.accompany.business.config; - -import com.accompany.common.aop.ApiRequestLogAspect; -import com.accompany.core.base.SpringContextHolder; -import com.alibaba.fastjson.JSON; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import org.slf4j.MDC; -import org.springframework.aop.interceptor.AsyncUncaughtExceptionHandler; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Primary; -import org.springframework.core.task.TaskDecorator; -import org.springframework.scheduling.annotation.AsyncConfigurer; -import org.springframework.scheduling.annotation.EnableAsync; -import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; - -import javax.validation.constraints.NotNull; -import java.util.UUID; -import java.util.concurrent.Executor; -import java.util.concurrent.ThreadPoolExecutor; - -@Slf4j -@EnableAsync -@Configuration -public class ExecutorConfig implements AsyncConfigurer { - - @Bean - @Primary - public ThreadPoolExecutor bizExecutor() { - String threadPoolId = "biz-executor"; - ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor(); - // 核心线程数 - executor.setCorePoolSize(5); - // 最大线程数 - executor.setMaxPoolSize(10); - // 队列容量 - executor.setQueueCapacity(100); - // 线程空闲时间（秒） - executor.setKeepAliveSeconds(60); - // 线程名称前缀 - executor.setThreadNamePrefix(threadPoolId); - executor.setTaskDecorator(new MDCDecorator()); - // 设置拒绝策略 - executor.setRejectedExecutionHandler(new ThreadPoolExecutor.CallerRunsPolicy()); - // 初始化 - executor.initialize(); - return executor.getThreadPoolExecutor(); - } - - @Bean("async-executor") - public ThreadPoolExecutor asyncExecutor() { - String threadPoolId = "async-executor"; - ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor(); - // 核心线程数 - executor.setCorePoolSize(5); - // 最大线程数 - executor.setMaxPoolSize(10); - // 队列容量 - executor.setQueueCapacity(100); - // 线程空闲时间（秒） - executor.setKeepAliveSeconds(60); - // 线程名称前缀 - executor.setThreadNamePrefix(threadPoolId); - executor.setTaskDecorator(new MDCDecorator()); - // 设置拒绝策略 - executor.setRejectedExecutionHandler(new ThreadPoolExecutor.CallerRunsPolicy()); - // 初始化 - executor.initialize(); - return executor.getThreadPoolExecutor(); - } - - public static class MDCDecorator implements TaskDecorator { - - @NotNull - @Override - public Runnable decorate(@NotNull Runnable runnable) { - String mainThreadTraceId = MDC.get(ApiRequestLogAspect.TRACE_UUID); - String traceId = !StringUtils.isBlank(mainThreadTraceId)? - mainThreadTraceId : - UUID.randomUUID().toString(); - - return () -> { - try { - // Right now: @Async thread context ! - // Restore the Web thread context's MDC data - MDC.put(ApiRequestLogAspect.TRACE_UUID, traceId); - runnable.run(); - } finally { - MDC.remove(ApiRequestLogAspect.TRACE_UUID); - } - - }; - } - } - - @Override - public Executor getAsyncExecutor() { - return SpringContextHolder.getBean("async-executor"); - } - - @Override - public AsyncUncaughtExceptionHandler getAsyncUncaughtExceptionHandler() { - return (ex,method,params)->log.error("@Async 执行异步方法{} 错误，参数{}", method, JSON.toJSONString(params), ex); - } - - -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/WeekGuildOperatorStatService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/WeekGuildOperatorStatService.java index dc295a1f3..fc3787f79 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/WeekGuildOperatorStatService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/WeekGuildOperatorStatService.java @@ -44,7 +44,7 @@ public class WeekGuildOperatorStatService { private WeekGuildOperatorDetailStatMapper detailStatMapper; @Autowired private GuildService guildService; - @Resource(name = "bizExecutor") + @Resource(name = "biz-executor") private ThreadPoolExecutor bizExecutor; @Autowired private UsersService usersService; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/WeekGuildPartitionStatService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/WeekGuildPartitionStatService.java index 6c71d4ccc..d80b3f471 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/WeekGuildPartitionStatService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/WeekGuildPartitionStatService.java @@ -36,7 +36,7 @@ public class WeekGuildPartitionStatService { private GuildService guildService; @Autowired private GuildMemberService guildMemberService; - @Resource(name = "bizExecutor") + @Resource(name = "biz-executor") private ThreadPoolExecutor bizExecutor; public void stat(Integer partitionId, String mondayStr) { diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/WeekRechargeAgentPartitionStatService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/WeekRechargeAgentPartitionStatService.java index 04237c862..caf85eb84 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/WeekRechargeAgentPartitionStatService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/WeekRechargeAgentPartitionStatService.java @@ -34,7 +34,7 @@ public class WeekRechargeAgentPartitionStatService { @Autowired private WeekRechargeAgentPartitionStatMapper mapper; - @Resource(name = "bizExecutor") + @Resource(name = "biz-executor") private ThreadPoolExecutor bizExecutor; @Autowired private GuildUsdBillRecordMapper guildUsdBillRecordMapper; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/account/AccountBlockService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/account/AccountBlockService.java index 81a5f752d..035178f7a 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/account/AccountBlockService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/account/AccountBlockService.java @@ -27,6 +27,7 @@ import com.google.gson.Gson; import jodd.util.StringUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; @@ -48,6 +49,7 @@ public class AccountBlockService extends ServiceImpl implements Cl @Autowired private ClanRankService clanRankService; - @Autowired - private Executor taskExecutor; + @Resource(name = "biz-executor") + private ThreadPoolExecutor taskExecutor; @Override public ClanVO getUserClanInfo(Long uid) { diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/family/FamilyManagerService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/family/FamilyManagerService.java index d825a7ecf..1e3352e4d 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/family/FamilyManagerService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/family/FamilyManagerService.java @@ -66,7 +66,7 @@ public class FamilyManagerService { private PartitionInfoService partitionInfoService; @Autowired private JedisService jedisService; - @Resource(name = "bizExecutor") + @Resource(name = "biz-executor") private ThreadPoolExecutor bizExecutor; @Autowired private FamilyMemberWeekLevelRewardService familyMemberWeekLevelRewardService; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/AgencyMonthSettleService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/AgencyMonthSettleService.java index 8e04e82bf..fbbd0265e 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/AgencyMonthSettleService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/AgencyMonthSettleService.java @@ -75,7 +75,7 @@ public class AgencyMonthSettleService { private MessageRobotPushService messageRobotPushService; @Autowired private WebSecurityConfig webSecurityConfig; - @Resource(name = "bizExecutor") + @Resource(name = "biz-executor") private ThreadPoolExecutor bizExecutor; @Autowired private SendSysMsgService sendSysMsgService; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildManagerService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildManagerService.java index d3224b15f..e35488a76 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildManagerService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildManagerService.java @@ -75,7 +75,7 @@ public class GuildManagerService { private PartitionInfoService partitionInfoService; @Autowired private GuildDiamondWageService guildDiamondWageService; - @Resource(name = "bizExecutor") + @Resource(name = "biz-executor") private ThreadPoolExecutor bizExecutor; @Autowired private JedisService jedisService; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildUsdChannelService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildUsdChannelService.java index 71b21445c..bd55462a8 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildUsdChannelService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildUsdChannelService.java @@ -52,7 +52,7 @@ public class GuildUsdChannelService { private GuildUsdProdService guildUsdProdService; @Autowired private RechargeUserService rechargeUserService; - @Resource(name = "bizExecutor") + @Resource(name = "biz-executor") private ThreadPoolExecutor bizExecutor; @Autowired private GuildUsdBillRecordService guildUsdBillRecordService; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guildpolicy2/GuildPolicy2Service.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guildpolicy2/GuildPolicy2Service.java index 49e443e98..6296e249a 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guildpolicy2/GuildPolicy2Service.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guildpolicy2/GuildPolicy2Service.java @@ -61,7 +61,7 @@ public class GuildPolicy2Service { private GuildDiamondClearPolicy2Service guildDiamondClearPolicy2Service; @Autowired private UserPurseService userPurseService; - @Resource(name = "bizExecutor") + @Resource(name = "biz-executor") private ThreadPoolExecutor bizExecutor; @Autowired private GuildCrystalSettlementService guildCrystalSettlementService; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/hall/HallManageService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/hall/HallManageService.java index f63fc1d55..99a609d68 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/hall/HallManageService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/hall/HallManageService.java @@ -89,7 +89,7 @@ public class HallManageService extends BaseService { private OtakuRankService otakuRankService; @Autowired private JedisService jedisService; - @Resource(name = "bizExecutor") + @Resource(name = "biz-executor") private ThreadPoolExecutor taskExecutor; private static final String shareContent = "【複製后打開 %s APP】\n" + diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/level/LevelService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/level/LevelService.java index 195661329..6e8c5cc73 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/level/LevelService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/level/LevelService.java @@ -43,7 +43,7 @@ public class LevelService extends BaseService implements InitializingBean { private LevelCharmMapper levelCharmMapper; @Autowired private UsersService usersService; - @Resource(name = "bizExecutor") + @Resource(name = "biz-executor") private ThreadPoolExecutor bizExecutor; private static final ConcurrentHashMap LEVEL_EXPERIENCE_MAP = new ConcurrentHashMap<>(); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/lucky/BravoRecordService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/lucky/BravoRecordService.java index 2d3cac9d1..53d9bf451 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/lucky/BravoRecordService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/lucky/BravoRecordService.java @@ -33,7 +33,7 @@ public class BravoRecordService extends ServiceImpl recordMap, BigDecimal winGoldNum, BigDecimal afterMultiple){ diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/lucky/Lucky24RecordService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/lucky/Lucky24RecordService.java index 819d1aaed..eaa8ed11a 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/lucky/Lucky24RecordService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/lucky/Lucky24RecordService.java @@ -36,7 +36,7 @@ public class Lucky24RecordService extends ServiceImpl sendRewardByUid(Long uid, diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/BusinessApplication.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/BusinessApplication.java index c240c1958..6b97d5661 100644 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/BusinessApplication.java +++ b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/BusinessApplication.java @@ -1,6 +1,7 @@ package com.accompany.business; import io.micrometer.core.instrument.MeterRegistry; +import org.dromara.dynamictp.spring.annotation.EnableDynamicTp; import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringBootConfiguration; @@ -16,6 +17,7 @@ import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.transaction.annotation.EnableTransactionManagement; import org.springframework.boot.actuate.autoconfigure.metrics.MeterRegistryCustomizer; +@EnableDynamicTp @SpringBootApplication @EnableTransactionManagement @EnableAspectJAutoProxy(proxyTargetClass = true) diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/user/UsersController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/user/UsersController.java index 8fdb94170..a3f292760 100644 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/user/UsersController.java +++ b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/user/UsersController.java @@ -96,7 +96,7 @@ public class UsersController extends BaseController { private PrivatePhotoService privatePhotoService; @Autowired private RoomService roomService; - @Resource(name = "bizExecutor") + @Resource(name = "biz-executor") private ThreadPoolExecutor bizExecutor; @Autowired private AudioCardService audioCardService; diff --git a/accompany-business/accompany-business-web/src/main/resources/bootstrap.yaml b/accompany-business/accompany-business-web/src/main/resources/bootstrap.yaml index 70ea06851..16335563c 100644 --- a/accompany-business/accompany-business-web/src/main/resources/bootstrap.yaml +++ b/accompany-business/accompany-business-web/src/main/resources/bootstrap.yaml @@ -30,7 +30,7 @@ spring: refresh: true - data-id: sysconf.yml refresh: true - - data-id: bussiness-threadpool.yml + - data-id: bussiness-dtp.yml refresh: true --- @@ -53,7 +53,7 @@ spring: refresh: true - data-id: sysconf.yml refresh: true - - data-id: bussiness-threadpool.yml + - data-id: bussiness-dtp.yml refresh: true - data-id: database.yml refresh: true diff --git a/accompany-dependencies/pom.xml b/accompany-dependencies/pom.xml index 6f411cce7..1000cb1c6 100644 --- a/accompany-dependencies/pom.xml +++ b/accompany-dependencies/pom.xml @@ -85,6 +85,7 @@ 2.5.1 1.0.1 2.30.37 + 1.2.2 diff --git a/accompany-oauth2/accompany-oauth2-web/src/main/java/com/accompany/oauth2/OAuth2Application.java b/accompany-oauth2/accompany-oauth2-web/src/main/java/com/accompany/oauth2/OAuth2Application.java index a3ac9cae7..913b5d172 100644 --- a/accompany-oauth2/accompany-oauth2-web/src/main/java/com/accompany/oauth2/OAuth2Application.java +++ b/accompany-oauth2/accompany-oauth2-web/src/main/java/com/accompany/oauth2/OAuth2Application.java @@ -1,5 +1,6 @@ package com.accompany.oauth2; +import org.dromara.dynamictp.spring.annotation.EnableDynamicTp; import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringBootConfiguration; @@ -9,6 +10,7 @@ import org.springframework.context.annotation.ComponentScan; import org.springframework.scheduling.annotation.EnableAsync; import org.springframework.scheduling.annotation.EnableScheduling; +@EnableDynamicTp @SpringBootApplication @ComponentScan("com.accompany") @ServletComponentScan(value = {"com.accompany", "com.xuanyin"}) diff --git a/accompany-oauth2/accompany-oauth2-web/src/main/resources/bootstrap.yaml b/accompany-oauth2/accompany-oauth2-web/src/main/resources/bootstrap.yaml index 426db94bb..ac5dff6ae 100644 --- a/accompany-oauth2/accompany-oauth2-web/src/main/resources/bootstrap.yaml +++ b/accompany-oauth2/accompany-oauth2-web/src/main/resources/bootstrap.yaml @@ -30,7 +30,7 @@ spring: refresh: true - data-id: sysconf.yml refresh: true - - data-id: threadpool.yml + - data-id: dtp.yml refresh: true --- @@ -53,7 +53,7 @@ spring: refresh: true - data-id: sysconf.yml refresh: true - - data-id: threadpool.yml + - data-id: dtp.yml refresh: true - data-id: database.yml refresh: true diff --git a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/RefreshPersonTask.java b/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/RefreshPersonTask.java index 1806e53f4..bdf607672 100644 --- a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/RefreshPersonTask.java +++ b/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/RefreshPersonTask.java @@ -26,7 +26,7 @@ import java.util.concurrent.ThreadPoolExecutor; public class RefreshPersonTask extends BaseTask { @Autowired private RoomService roomService; - @Resource(name = "bizExecutor") + @Resource(name = "biz-executor") private ThreadPoolExecutor bizExecutor; @SneakyThrows diff --git a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/UserRechargeLevelTask.java b/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/UserRechargeLevelTask.java index ead8c1e7c..cb09acf5e 100644 --- a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/UserRechargeLevelTask.java +++ b/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/UserRechargeLevelTask.java @@ -20,7 +20,7 @@ public class UserRechargeLevelTask { private UserRechargeLevelService service; @Autowired private DiamondGiveHistoryMapper diamondGiveHistoryMapper; - @Resource(name = "bizExecutor") + @Resource(name = "biz-executor") private ThreadPoolExecutor bizExecutor; @Scheduled(cron = "1 0 0 * * ?") diff --git a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/guild/GuildPolicy2SettlementTask.java b/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/guild/GuildPolicy2SettlementTask.java index 87225fe26..833378967 100644 --- a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/guild/GuildPolicy2SettlementTask.java +++ b/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/guild/GuildPolicy2SettlementTask.java @@ -19,7 +19,7 @@ public class GuildPolicy2SettlementTask { @Autowired private GuildPolicy2Service guildPolicy2Service; - @Resource(name = "bizExecutor") + @Resource(name = "biz-executor") private ThreadPoolExecutor bizExecutor; /** diff --git a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/guild/SSGuildTask.java b/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/guild/SSGuildTask.java index ab5e73394..71049e503 100644 --- a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/guild/SSGuildTask.java +++ b/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/guild/SSGuildTask.java @@ -22,7 +22,7 @@ public class SSGuildTask { @Autowired private SSGuildService ssGuildService; - @Resource(name = "bizExecutor") + @Resource(name = "biz-executor") private ThreadPoolExecutor bizExecutor; private static final DateTimeFormatter dateFormatters = DateTimeFormatter.ofPattern(DateTimeUtil.DEFAULT_DATETIME_PATTERN); diff --git a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/luckyBag/BravoTask.java b/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/luckyBag/BravoTask.java index 683f3d1b5..ea7716e50 100644 --- a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/luckyBag/BravoTask.java +++ b/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/luckyBag/BravoTask.java @@ -32,7 +32,7 @@ public class BravoTask { private PartitionInfoService partitionInfoService; @Autowired private BravoRecordService service; - @Resource(name = "bizExecutor") + @Resource(name = "biz-executor") private ThreadPoolExecutor bizExecutor; @Autowired diff --git a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/luckyBag/Lucky24WeekRankTask.java b/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/luckyBag/Lucky24WeekRankTask.java index 039960142..ad849226b 100644 --- a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/luckyBag/Lucky24WeekRankTask.java +++ b/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/luckyBag/Lucky24WeekRankTask.java @@ -19,7 +19,7 @@ import java.util.concurrent.ThreadPoolExecutor; @Slf4j public class Lucky24WeekRankTask { - @Resource(name = "bizExecutor") + @Resource(name = "biz-executor") private ThreadPoolExecutor bizExecutor; @Autowired private Lucky24SendWeekRankRewardService service; diff --git a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/luckyBag/Lucky25Task.java b/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/luckyBag/Lucky25Task.java index e29c12d36..d5080d274 100644 --- a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/luckyBag/Lucky25Task.java +++ b/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/luckyBag/Lucky25Task.java @@ -31,7 +31,7 @@ public class Lucky25Task { private PartitionInfoService partitionInfoService; @Autowired private Lucky25RecordService service; - @Resource(name = "bizExecutor") + @Resource(name = "biz-executor") private ThreadPoolExecutor bizExecutor; @Autowired diff --git a/accompany-scheduler/accompany-scheduler-web/src/main/java/com/accompany/scheduler/JobApplication.java b/accompany-scheduler/accompany-scheduler-web/src/main/java/com/accompany/scheduler/JobApplication.java index a027661bb..a08ffc523 100644 --- a/accompany-scheduler/accompany-scheduler-web/src/main/java/com/accompany/scheduler/JobApplication.java +++ b/accompany-scheduler/accompany-scheduler-web/src/main/java/com/accompany/scheduler/JobApplication.java @@ -1,6 +1,7 @@ package com.accompany.scheduler; import io.micrometer.core.instrument.MeterRegistry; +import org.dromara.dynamictp.spring.annotation.EnableDynamicTp; import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringBootConfiguration; @@ -15,6 +16,7 @@ import org.springframework.scheduling.annotation.EnableScheduling; * @author PaperCut * @date 2018/6/11 */ +@EnableDynamicTp @SpringBootApplication @ComponentScan({"com.accompany","com.xuanyin"}) @EnableScheduling diff --git a/accompany-scheduler/accompany-scheduler-web/src/main/resources/bootstrap.yaml b/accompany-scheduler/accompany-scheduler-web/src/main/resources/bootstrap.yaml index 51ca2dd68..6bf1f8787 100644 --- a/accompany-scheduler/accompany-scheduler-web/src/main/resources/bootstrap.yaml +++ b/accompany-scheduler/accompany-scheduler-web/src/main/resources/bootstrap.yaml @@ -27,7 +27,7 @@ spring: refresh: true - data-id: sysconf.yml refresh: true - - data-id: threadpool.yml + - data-id: dtp.yml refresh: true --- @@ -50,7 +50,7 @@ spring: refresh: true - data-id: sysconf.yml refresh: true - - data-id: threadpool.yml + - data-id: dtp.yml refresh: true - data-id: database.yml refresh: true