diff --git a/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/init/EasyRetryEndListener.java b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/init/EasyRetryEndListener.java index 4e3794a2..61984778 100644 --- a/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/init/EasyRetryEndListener.java +++ b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/init/EasyRetryEndListener.java @@ -1,6 +1,7 @@ package com.aizuda.easy.retry.client.core.init; import com.aizuda.easy.retry.client.core.Lifecycle; +import com.aizuda.easy.retry.common.core.util.EasyRetryVersion; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationListener; @@ -26,8 +27,8 @@ public class EasyRetryEndListener implements ApplicationListener @Autowired private List lifecycleList; - @Value("${version}") - private String version; - @Override public void onApplicationEvent(ContextRefreshedEvent event) { - LogUtils.info(log, "easy-retry-server v{} starting...", version); + LogUtils.info(log, "easy-retry-server v{} starting...", EasyRetryVersion.getVersion()); lifecycleList.forEach(Lifecycle::start); - LogUtils.info(log, "easy-retry-server v{} start completed", version); + LogUtils.info(log, "easy-retry-server v{} start completed", EasyRetryVersion.getVersion()); } } diff --git a/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/controller/SystemInfoController.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/controller/SystemInfoController.java index 535c824e..7fee8b1e 100644 --- a/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/controller/SystemInfoController.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/controller/SystemInfoController.java @@ -1,7 +1,7 @@ package com.aizuda.easy.retry.server.web.controller; import com.aizuda.easy.retry.common.core.model.Result; -import org.springframework.beans.factory.annotation.Value; +import com.aizuda.easy.retry.common.core.util.EasyRetryVersion; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -17,11 +17,8 @@ import org.springframework.web.bind.annotation.RestController; @RequestMapping("/system") public class SystemInfoController { - @Value("${version:}") - private String version; - @GetMapping("version") public Result version() { - return new Result<>(version); + return new Result<>(EasyRetryVersion.getVersion()); } } diff --git a/easy-retry-server/src/main/resources/application.yml b/easy-retry-server/src/main/resources/application.yml index 9488677f..2fb17d1f 100644 --- a/easy-retry-server/src/main/resources/application.yml +++ b/easy-retry-server/src/main/resources/application.yml @@ -37,8 +37,6 @@ mybatis-plus: logging: config: classpath:logback-boot.xml -version: @project.version@ #系统版本号 - easy-retry: last-days: 30 # 拉取重试数据的天数 retry-pull-page-size: 100 # 拉取重试数据的每批次的大小