From 25a77320d72456773593a440552aa8fb44a87391 Mon Sep 17 00:00:00 2001
From: "1437892690@qq.com" <1437892690@qq.com>
Date: Fri, 7 Nov 2025 16:03:12 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E4=BD=9C=E4=B8=9A=E5=AF=86=E7=A0=81=E4=BD=9C?=
 =?UTF-8?q?=E4=B8=9A=E5=8F=82=E6=95=B0=E6=B2=A1=E6=9C=89=E5=80=BC=E4=B9=9F?=
 =?UTF-8?q?=E4=BC=9A=E5=8A=A0=E5=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1547770580664320]创建作业作业密码作业参数没有值也会加密 http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1547770580664320
---
 .../paramtype/ScriptParamTypePassword.java      |  6 +++++-
 .../service/AutoexecCombopServiceImpl.java      | 17 ++++++++++++-----
 .../service/AutoexecProfileServiceImpl.java     |  2 +-
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/src/main/java/neatlogic/module/autoexec/script/paramtype/ScriptParamTypePassword.java b/src/main/java/neatlogic/module/autoexec/script/paramtype/ScriptParamTypePassword.java
index eb7d0033..29cd8030 100644
--- a/src/main/java/neatlogic/module/autoexec/script/paramtype/ScriptParamTypePassword.java
+++ b/src/main/java/neatlogic/module/autoexec/script/paramtype/ScriptParamTypePassword.java
@@ -20,6 +20,7 @@ import com.alibaba.fastjson.JSONObject;
 import neatlogic.framework.autoexec.constvalue.ParamType;
 import neatlogic.framework.autoexec.script.paramtype.ScriptParamTypeBase;
 import neatlogic.framework.common.util.RC4Util;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 /**
@@ -88,7 +89,10 @@ public class ScriptParamTypePassword extends ScriptParamTypeBase {
     @Override
     protected Object getMyTextByValue(Object value, JSONObject config) {
         String valueStr = value.toString();
-        return RC4Util.encrypt(valueStr);
+        if (StringUtils.isNotBlank(valueStr)) {
+            return RC4Util.encrypt(valueStr);
+        }
+        return value;
     }
 
     @Override
diff --git a/src/main/java/neatlogic/module/autoexec/service/AutoexecCombopServiceImpl.java b/src/main/java/neatlogic/module/autoexec/service/AutoexecCombopServiceImpl.java
index 55c5d926..6a33fd1d 100644
--- a/src/main/java/neatlogic/module/autoexec/service/AutoexecCombopServiceImpl.java
+++ b/src/main/java/neatlogic/module/autoexec/service/AutoexecCombopServiceImpl.java
@@ -1457,9 +1457,11 @@ public class AutoexecCombopServiceImpl implements AutoexecCombopService, IAutoex
                 if (paramVo == null) {
                     continue;
                 }
-                Object value = paramVo.getDefaultValue();
-                if (value != null && Objects.equals(paramVo.getType(), ParamType.PASSWORD.getValue())) {
-                    paramVo.setDefaultValue(RC4Util.encrypt((String) value));
+                if (paramVo.getDefaultValue() != null && Objects.equals(paramVo.getType(), ParamType.PASSWORD.getValue())) {
+                    String value = paramVo.getDefaultValue().toString();
+                    if (StringUtils.isNotBlank(value)) {
+                        paramVo.setDefaultValue(RC4Util.encrypt(value));
+                    }
                 }
             }
         }
@@ -1480,8 +1482,13 @@ public class AutoexecCombopServiceImpl implements AutoexecCombopService, IAutoex
                 List<ParamMappingVo> paramMappingList = operationConfig.getParamMappingList();
                 if (CollectionUtils.isNotEmpty(paramMappingList)) {
                     for (ParamMappingVo paramMappingVo : paramMappingList) {
-                        if (Objects.equals(paramMappingVo.getType(), ParamType.PASSWORD.getValue()) && paramMappingVo.getValue() != null && Objects.equals(paramMappingVo.getMappingMode(), ParamMappingMode.CONSTANT.getValue())) {
-                            paramMappingVo.setValue(RC4Util.encrypt((String) paramMappingVo.getValue()));
+                        if (Objects.equals(paramMappingVo.getType(), ParamType.PASSWORD.getValue())
+                                && paramMappingVo.getValue() != null
+                                && Objects.equals(paramMappingVo.getMappingMode(), ParamMappingMode.CONSTANT.getValue())) {
+                            String value = paramMappingVo.getValue().toString();
+                            if (StringUtils.isNotBlank(value)) {
+                                paramMappingVo.setValue(RC4Util.encrypt(value));
+                            }
                         }
                     }
                 }
diff --git a/src/main/java/neatlogic/module/autoexec/service/AutoexecProfileServiceImpl.java b/src/main/java/neatlogic/module/autoexec/service/AutoexecProfileServiceImpl.java
index 3d04f283..0f4d517c 100644
--- a/src/main/java/neatlogic/module/autoexec/service/AutoexecProfileServiceImpl.java
+++ b/src/main/java/neatlogic/module/autoexec/service/AutoexecProfileServiceImpl.java
@@ -202,7 +202,7 @@ public class AutoexecProfileServiceImpl implements AutoexecProfileService, IAuto
                 //获取引用的全局参数值
                 AutoexecGlobalParamVo globalParamVo = autoexecGlobalParamMapper.getGlobalParamByKey(paramVo.getDefaultValueStr());
                 if (globalParamVo != null) {
-                    if (StringUtils.equals(AutoexecGlobalParamType.PASSWORD.getValue(), globalParamVo.getType()) && globalParamVo.getDefaultValue() != null) {
+                    if (StringUtils.equals(AutoexecGlobalParamType.PASSWORD.getValue(), globalParamVo.getType()) && StringUtils.isNotBlank(globalParamVo.getDefaultValueStr())) {
                         String pwd = RC4Util.encrypt(globalParamVo.getDefaultValueStr());
                         paramVo.setDefaultValue(pwd);
                     } else {
-- 
Gitee