center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

Merge branch 'dev' of github.com:dataease/dataease into dev

Browse Source
This commit is contained in:
taojinlong 2021-08-11 09:54:03 +08:00
commit 75d223f417
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
backend/src/main/java/io/dataease/commons/condition/LicStatusCondition.java
View File

@ -2,6 +2,7 @@ package io.dataease.commons.condition;
import io.dataease.commons.license.DefaultLicenseService; import io.dataease.commons.license.DefaultLicenseService;
import io.dataease.commons.license.F2CLicenseResponse; import io.dataease.commons.license.F2CLicenseResponse;
import io.dataease.commons.utils.CommonBeanFactory;
import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.ObjectUtils;
import org.springframework.context.annotation.Condition; import org.springframework.context.annotation.Condition;
import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.ConditionContext;
@ -15,7 +16,10 @@ public class LicStatusCondition implements Condition {
public boolean matches(ConditionContext conditionContext, AnnotatedTypeMetadata annotatedTypeMetadata) { public boolean matches(ConditionContext conditionContext, AnnotatedTypeMetadata annotatedTypeMetadata) {
// BeanDefinitionRegistry registry = conditionContext.getRegistry(); // 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) { /*if (null == defaultLicenseService) {
registry.registerBeanDefinition(); registry.registerBeanDefinition();
}*/ }*/

3
backend/src/main/java/io/dataease/commons/license/DefaultLicenseService.java
View File

@ -3,6 +3,7 @@ package io.dataease.commons.license;
import com.google.gson.Gson; import com.google.gson.Gson;
import io.dataease.base.domain.License; import io.dataease.base.domain.License;
import io.dataease.commons.exception.DEException; import io.dataease.commons.exception.DEException;
import io.dataease.commons.utils.LogUtil;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -31,6 +32,7 @@ public class DefaultLicenseService {
command.add(licenseKey); command.add(licenseKey);
try{ try{
execCommand(result, command); execCommand(result, command);
LogUtil.info("read lic content is : " + result.toString());
F2CLicenseResponse f2CLicenseResponse = new Gson().fromJson(result.toString(), F2CLicenseResponse.class); F2CLicenseResponse f2CLicenseResponse = new Gson().fromJson(result.toString(), F2CLicenseResponse.class);
if(f2CLicenseResponse.getStatus() != F2CLicenseResponse.Status.valid){ if(f2CLicenseResponse.getStatus() != F2CLicenseResponse.Status.valid){
return f2CLicenseResponse; return f2CLicenseResponse;
@ -43,6 +45,7 @@ public class DefaultLicenseService {
} }
return f2CLicenseResponse; return f2CLicenseResponse;
}catch (Exception e){ }catch (Exception e){
e.printStackTrace();
return F2CLicenseResponse.invalid(e.getMessage()); return F2CLicenseResponse.invalid(e.getMessage());
} }
} }