From ac446691c47317a274bba8e1c049ad996ab7da0e Mon Sep 17 00:00:00 2001
From: JEECG <445654970@qq.com>
Date: Fri, 8 Aug 2025 22:22:30 +0800
Subject: [PATCH] Squashed commit of the following:
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

commit 925f1637844eb0a158a7e78f544b93aff66c1644
Author: JEECG <445654970@qq.com>
Date:   Fri Aug 8 22:07:24 2025 +0800

    引入jeecg-boot-starter-job依赖启动报错 #8694

commit d01c1d7d477473b2250d0b4d3a2d35b939b9e210
Author: JEECG <445654970@qq.com>
Date:   Thu Aug 7 15:41:21 2025 +0800

    支持lazy-initialization

commit 3576b549458d877f3e3ae3f61ffd55f3d64b10d4
Author: JEECG <445654970@qq.com>
Date:   Thu Aug 7 15:36:51 2025 +0800

    升级积木报表和积木BI到最新版v2.1.2

# Conflicts:
#	jeecg-boot/pom.xml
---
 .../main/java/org/jeecg/common/util/SpringContextUtils.java | 2 ++
 jeecg-boot/pom.xml                                          | 6 +++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/SpringContextUtils.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/SpringContextUtils.java
index 8a6a4aa44..a40a93bb4 100644
--- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/SpringContextUtils.java
+++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/SpringContextUtils.java
@@ -8,6 +8,7 @@ import org.jeecg.common.constant.ServiceNameConstants;
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
@@ -16,6 +17,7 @@ import org.springframework.web.context.request.ServletRequestAttributes;
  * @Description: spring上下文工具类
  * @author: jeecg-boot
  */
+@Lazy(false)
 @Component
 public class SpringContextUtils implements ApplicationContextAware {
 
diff --git a/jeecg-boot/pom.xml b/jeecg-boot/pom.xml
index 1bf95f4a1..92029babc 100644
--- a/jeecg-boot/pom.xml
+++ b/jeecg-boot/pom.xml
@@ -212,7 +212,7 @@
 			<dependency>
 				<groupId>org.jeecgframework.boot</groupId>
 				<artifactId>jeecg-boot-starter3-job</artifactId>
-				<version>${jeecgboot.version}</version>
+				<version>3.8.2-RC</version>
 			</dependency>
 			<!--redis分布式锁-->
 			<dependency>
@@ -455,6 +455,10 @@
 						<groupId>org.apache.calcite</groupId>
 						<artifactId>calcite-elasticsearch</artifactId>
 					</exclusion>
+					<exclusion>
+						<artifactId>autopoi-web</artifactId>
+						<groupId>org.jeecgframework</groupId>
+					</exclusion>
 				</exclusions>
 			</dependency>
 			<!-- 后台导出接口Echart图表支持包，按需引入 -->