From ab111a9d32607c1e7eb5f7ddde81f1c815af9218 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Wed, 25 May 2022 10:08:37 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=85=B3=E4=BA=8E=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E4=B8=AD=E7=89=88=E6=9C=AC=E5=8F=B7=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/io/dataease/service/AboutService.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/backend/src/main/java/io/dataease/service/AboutService.java b/backend/src/main/java/io/dataease/service/AboutService.java index 1c9fc4421e..4727f9434e 100644 --- a/backend/src/main/java/io/dataease/service/AboutService.java +++ b/backend/src/main/java/io/dataease/service/AboutService.java @@ -9,6 +9,7 @@ import io.dataease.commons.utils.LogUtil; import io.dataease.listener.util.CacheUtils; import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Value; import org.springframework.core.env.Environment; import org.springframework.stereotype.Service; @@ -25,6 +26,10 @@ public class AboutService { @Resource private DefaultLicenseService defaultLicenseService; + + @Value("${version}") + private String version; + public F2CLicenseResponse updateLicense(String licenseKey) { F2CLicenseResponse f2CLicenseResponse = defaultLicenseService.updateLicense(product, licenseKey); Optional.ofNullable(f2CLicenseResponse).ifPresent(resp -> { @@ -62,8 +67,7 @@ public class AboutService { return version; } } - String property = CommonBeanFactory.getBean(Environment.class).getProperty("cmp.version"); - return Optional.ofNullable(property).orElse("V1.0"); + return Optional.ofNullable(version).orElse("V1.0"); } catch (Exception e) { LogUtil.error("failed to get build version.", e); }