From a2a41533822355a6b1e5ab785b3d2158a68ce0d3 Mon Sep 17 00:00:00 2001
From: gavin2lee <gavin2lee@163.com>
Date: Tue, 10 Aug 2021 15:29:26 +0800
Subject: [PATCH] #2233 to support expression calculation for batch execution
---
.../core/service/plugin/BatchExecutionService.java | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/platform-core/src/main/java/com/webank/wecube/platform/core/service/plugin/BatchExecutionService.java b/platform-core/src/main/java/com/webank/wecube/platform/core/service/plugin/BatchExecutionService.java
index b8fc8c031..887a8a545 100644
--- a/platform-core/src/main/java/com/webank/wecube/platform/core/service/plugin/BatchExecutionService.java
+++ b/platform-core/src/main/java/com/webank/wecube/platform/core/service/plugin/BatchExecutionService.java
@@ -342,7 +342,7 @@ public class BatchExecutionService {
|| MAPPING_TYPE_SYSTEM_VARIABLE.equals(parameter.getMappingEntityExpression())) {
String paramValue = parameter.getValue();
if (parameter.getParameterDefinition() != null
- && "Y".equalsIgnoreCase(parameter.getParameterDefinition().getSensitiveData())) {
+ && Constants.DATA_SENSITIVE.equalsIgnoreCase(parameter.getParameterDefinition().getSensitiveData())) {
paramValue = tryDecryptParamValue(paramValue);
}
pluginInputParamMap.put(parameter.getName(), paramValue);
@@ -463,7 +463,7 @@ public class BatchExecutionService {
if (inputParameterDefinition.getInputParameterValue() != null) {
String paramValue = inputParameterDefinition.getInputParameterValue().toString();
- if ("Y".equalsIgnoreCase(interfaceParameter.getSensitiveData())) {
+ if (Constants.DATA_SENSITIVE.equalsIgnoreCase(interfaceParameter.getSensitiveData())) {
paramValue = tryEncryptParamValue(paramValue);
}
ExecutionJobParameters executionJobParameter = new ExecutionJobParameters(interfaceParameter.getName(),
@@ -770,7 +770,7 @@ public class BatchExecutionService {
// #2046
if (parameter.getParameterDefinition() != null
- && "Y".equalsIgnoreCase(parameter.getParameterDefinition().getSensitiveData())) {
+ && Constants.DATA_SENSITIVE.equalsIgnoreCase(parameter.getParameterDefinition().getSensitiveData())) {
sVal = tryEncryptParamValue(sVal);
}
parameter.setValue(sVal);
@@ -801,11 +801,12 @@ public class BatchExecutionService {
criteria.getEntityIdentity());
}
+ //TODO to support list and object data type
if (attrValsPerExpr != null && (!attrValsPerExpr.isEmpty())) {
// #2046
String paramValue = attrValsPerExpr.get(0) == null ? null : attrValsPerExpr.get(0).toString();
if (parameter.getParameterDefinition() != null
- && "Y".equalsIgnoreCase(parameter.getParameterDefinition().getSensitiveData())) {
+ && Constants.DATA_SENSITIVE.equalsIgnoreCase(parameter.getParameterDefinition().getSensitiveData())) {
paramValue = tryEncryptParamValue(paramValue);
}
parameter.setValue(paramValue);
--
GitLab