From 97470cfecfb57f8a28cce617bf1d6c2ebd84fdc7 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw <67260074+fit2cloud-chenyw@users.noreply.github.com> Date: Sun, 15 Dec 2024 17:17:27 +0800 Subject: [PATCH] =?UTF-8?q?fix(X-Pack):=20=E8=B0=83=E6=95=B4dataease.login?= =?UTF-8?q?=5Ftimeout=E5=8F=82=E6=95=B0=E6=97=A0=E6=95=88=20(#14056)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/dataease/CoreApplication.java | 5 ++++- .../listener/EhCacheStartListener.java | 22 +++++++++++++++++++ .../src/main/resources/application.yml | 1 + .../src/main/resources/ehcache/ehcache.xml | 2 +- 4 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 core/core-backend/src/main/java/io/dataease/listener/EhCacheStartListener.java diff --git a/core/core-backend/src/main/java/io/dataease/CoreApplication.java b/core/core-backend/src/main/java/io/dataease/CoreApplication.java index 4f8e361003..7d8cd1433e 100644 --- a/core/core-backend/src/main/java/io/dataease/CoreApplication.java +++ b/core/core-backend/src/main/java/io/dataease/CoreApplication.java @@ -1,5 +1,6 @@ package io.dataease; +import io.dataease.listener.EhCacheStartListener; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.quartz.QuartzAutoConfiguration; @@ -12,6 +13,8 @@ import org.springframework.scheduling.annotation.EnableScheduling; public class CoreApplication { public static void main(String[] args) { - SpringApplication.run(CoreApplication.class, args); + SpringApplication context = new SpringApplication(CoreApplication.class); + context.addInitializers(new EhCacheStartListener()); + context.run(args); } } diff --git a/core/core-backend/src/main/java/io/dataease/listener/EhCacheStartListener.java b/core/core-backend/src/main/java/io/dataease/listener/EhCacheStartListener.java new file mode 100644 index 0000000000..e377678d29 --- /dev/null +++ b/core/core-backend/src/main/java/io/dataease/listener/EhCacheStartListener.java @@ -0,0 +1,22 @@ +package io.dataease.listener; + + +import org.jetbrains.annotations.NotNull; +import org.springframework.beans.factory.config.YamlPropertiesFactoryBean; +import org.springframework.context.ApplicationContextInitializer; +import org.springframework.context.ConfigurableApplicationContext; +import org.springframework.core.io.ClassPathResource; +import org.springframework.core.io.Resource; + +import java.util.Objects; + +public class EhCacheStartListener implements ApplicationContextInitializer { + @Override + public void initialize(@NotNull ConfigurableApplicationContext applicationContext) { + Resource resource = new ClassPathResource("application.yml"); + YamlPropertiesFactoryBean factory = new YamlPropertiesFactoryBean(); + factory.setResources(resource); + String property = Objects.requireNonNull(factory.getObject()).getProperty("dataease.login_timeout", "480"); + System.setProperty("dataease.login_timeout", property); + } +} diff --git a/core/core-backend/src/main/resources/application.yml b/core/core-backend/src/main/resources/application.yml index 558a46a35b..498dc93d1c 100644 --- a/core/core-backend/src/main/resources/application.yml +++ b/core/core-backend/src/main/resources/application.yml @@ -46,6 +46,7 @@ quartz: dataease: version: '@project.version@' + login_timeout: 2880 xpack-front-distributed: true origin-list: http://localhost:8080 apisix-api: diff --git a/core/core-backend/src/main/resources/ehcache/ehcache.xml b/core/core-backend/src/main/resources/ehcache/ehcache.xml index 58918c8888..b71fbbd0ec 100644 --- a/core/core-backend/src/main/resources/ehcache/ehcache.xml +++ b/core/core-backend/src/main/resources/ehcache/ehcache.xml @@ -107,7 +107,7 @@ java.lang.String java.lang.Integer - 8 + ${dataease.login_timeout}