public/dataease
1
0
Fork 0
mirror of https://github.com/dataease/dataease.git synced 2026-05-23 13:58:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
wangjiahao
2022-05-25 10:54:16 +08:00
parent d8c73873a2 adff099263
commit 73a9a0bd05
5 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
backend/src/main/java/io/dataease/service/AboutService.java
View File

@@ -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);
}