From e973fd31df32d6b828362c1e20eb19369c85e0ff Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Tue, 10 Aug 2021 19:43:36 +0800 Subject: [PATCH] =?UTF-8?q?ftx:=20spring=E4=BE=9D=E8=B5=96bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/dataease/commons/condition/LicStatusCondition.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/backend/src/main/java/io/dataease/commons/condition/LicStatusCondition.java b/backend/src/main/java/io/dataease/commons/condition/LicStatusCondition.java index b9eb7b18dd..50e906db95 100644 --- a/backend/src/main/java/io/dataease/commons/condition/LicStatusCondition.java +++ b/backend/src/main/java/io/dataease/commons/condition/LicStatusCondition.java @@ -2,6 +2,7 @@ package io.dataease.commons.condition; import io.dataease.commons.license.DefaultLicenseService; import io.dataease.commons.license.F2CLicenseResponse; +import io.dataease.commons.utils.CommonBeanFactory; import org.apache.commons.lang3.ObjectUtils; import org.springframework.context.annotation.Condition; import org.springframework.context.annotation.ConditionContext; @@ -15,7 +16,10 @@ public class LicStatusCondition implements Condition { public boolean matches(ConditionContext conditionContext, AnnotatedTypeMetadata annotatedTypeMetadata) { // BeanDefinitionRegistry registry = conditionContext.getRegistry(); - DefaultLicenseService defaultLicenseService = conditionContext.getBeanFactory().getBean(DefaultLicenseService.class); + // DefaultLicenseService defaultLicenseService = conditionContext.getBeanFactory().getBean(DefaultLicenseService.class); + + DefaultLicenseService defaultLicenseService = CommonBeanFactory.getBean(DefaultLicenseService.class); + /*if (null == defaultLicenseService) { registry.registerBeanDefinition(); }*/