chore: 升级版本到2.8.0

This commit is contained in:
fit2cloud-chenyw 2024-06-20 17:27:07 +08:00
parent 5d45800f31
commit 9447867d3f
4 changed files with 8 additions and 12 deletions

View File

@ -1,5 +1,6 @@
package io.dataease.home; package io.dataease.home;
import io.dataease.license.utils.LicenseUtil;
import io.dataease.utils.ModelUtils; import io.dataease.utils.ModelUtils;
import io.dataease.utils.RsaUtils; import io.dataease.utils.RsaUtils;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
@ -31,7 +32,7 @@ public class RestIndexController {
@GetMapping("/xpackModel") @GetMapping("/xpackModel")
@ResponseBody @ResponseBody
public boolean xpackModel() { public boolean xpackModel() {
return xpackFrontDistributed; return xpackFrontDistributed && LicenseUtil.licenseValid();
} }
} }

View File

@ -271,18 +271,9 @@ const executeVersionHandler = (response: AxiosResponse) => {
return return
} }
if (executeVersion && executeVersion !== cacheVal) { if (executeVersion && executeVersion !== cacheVal) {
wsCache.clear()
wsCache.set(key, executeVersion) wsCache.set(key, executeVersion)
showMsg('系统有升级请点击刷新页面', '-sys-upgrade-') showMsg('系统有升级请点击刷新页面', '-sys-upgrade-')
/* ElMessageBox.confirm('系统有升级请点击刷新页面', {
confirmButtonType: 'primary',
type: 'warning',
confirmButtonText: '刷新',
cancelButtonText: '取消',
autofocus: false,
showClose: false
}).then(() => {
window.location.reload()
}) */
} }
} }
export { service, cancelMap } export { service, cancelMap }

View File

@ -19,7 +19,7 @@
</parent> </parent>
<properties> <properties>
<dataease.version>2.7.0</dataease.version> <dataease.version>2.8.0</dataease.version>
<java.version>21</java.version> <java.version>21</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spring-cloud-alibaba.version>2023.0.1.0</spring-cloud-alibaba.version> <spring-cloud-alibaba.version>2023.0.1.0</spring-cloud-alibaba.version>

View File

@ -3,6 +3,7 @@ package io.dataease.extensions.view.factory;
import io.dataease.exception.DEException; import io.dataease.exception.DEException;
import io.dataease.extensions.view.template.PluginsChartTemplate; import io.dataease.extensions.view.template.PluginsChartTemplate;
import io.dataease.extensions.view.vo.XpackPluginsViewVO; import io.dataease.extensions.view.vo.XpackPluginsViewVO;
import io.dataease.license.utils.LicenseUtil;
import io.dataease.license.utils.LogUtil; import io.dataease.license.utils.LogUtil;
import io.dataease.plugins.factory.DataEasePluginFactory; import io.dataease.plugins.factory.DataEasePluginFactory;
@ -16,11 +17,13 @@ public class PluginsChartFactory {
public static PluginsChartTemplate getInstance(String render, String type) { public static PluginsChartTemplate getInstance(String render, String type) {
if (!LicenseUtil.licenseValid()) DEException.throwException("插件功能只对企业版本可用!");
String key = render + "_" + type; String key = render + "_" + type;
return templateMap.get(key); return templateMap.get(key);
} }
public static void loadTemplate(String render, String type, PluginsChartTemplate template) { public static void loadTemplate(String render, String type, PluginsChartTemplate template) {
if (!LicenseUtil.licenseValid()) DEException.throwException("插件功能只对企业版本可用!");
String key = render + "_" + type; String key = render + "_" + type;
if (templateMap.containsKey(key)) return; if (templateMap.containsKey(key)) return;
templateMap.put(key, template); templateMap.put(key, template);
@ -34,6 +37,7 @@ public class PluginsChartFactory {
} }
public static List<XpackPluginsViewVO> getViewConfigList() { public static List<XpackPluginsViewVO> getViewConfigList() {
if (!LicenseUtil.licenseValid()) DEException.throwException("插件功能只对企业版本可用!");
return templateMap.values().stream().map(PluginsChartTemplate::getConfig).toList(); return templateMap.values().stream().map(PluginsChartTemplate::getConfig).toList();
} }
} }