From 5e86f2a37b9d37300153fce48f4bed0ecc2b6e7c Mon Sep 17 00:00:00 2001
From: xuyang <748613696@qq.com>
Date: Thu, 9 Nov 2023 09:28:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/njcn/common/pojo/constant/PatternRegex.java   | 2 +-
 .../src/main/java/com/njcn/prepare/ExecutionCenter.java         | 2 +-
 .../java/com/njcn/prepare/executor/MeasurementExecutor.java     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pqs-common/common-core/src/main/java/com/njcn/common/pojo/constant/PatternRegex.java b/pqs-common/common-core/src/main/java/com/njcn/common/pojo/constant/PatternRegex.java
index 119295a50..28bee6f12 100644
--- a/pqs-common/common-core/src/main/java/com/njcn/common/pojo/constant/PatternRegex.java
+++ b/pqs-common/common-core/src/main/java/com/njcn/common/pojo/constant/PatternRegex.java
@@ -41,7 +41,7 @@ public interface PatternRegex {
     /**
      * 登录名只能输入3-16位的英文字母或数字
      */
-    String LOGIN_NAME_REGEX = "^[a-zA-Z0-9_]{3,16}$";
+    String LOGIN_NAME_REGEX = "[a-zA-Z0-9]{3,16}";
 
     /**
      * 手机号必须有11位，并且为数字，是正常的手机·号码开头
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/ExecutionCenter.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/ExecutionCenter.java
index 350a10d53..57163a3cf 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/ExecutionCenter.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/ExecutionCenter.java
@@ -109,7 +109,7 @@ public class ExecutionCenter extends BaseController {
                     ,methodDescribe
                     ,calculatedParam.isFullChain()?"全链":"指定节点：".concat(String.join(StrPool.COMMA,calculatedParam.getTagNames()))
                     ,failStep.getNodeId().concat(Objects.isNull(failStep.getTag()) ? "" :StrPool.DASHED.concat(failStep.getTag()))
-                    ,failStep.getException().getMessage());
+                    ,Objects.isNull(failStep.getException()) ? null:failStep.getException().getMessage());
         }
     }
 
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/executor/MeasurementExecutor.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/executor/MeasurementExecutor.java
index dcbce8d2a..e0dad5372 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/executor/MeasurementExecutor.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/executor/MeasurementExecutor.java
@@ -29,7 +29,7 @@ public class MeasurementExecutor extends BaseExecutor {
 
 
     /**
-     * 算法名: 3.4.1.1-----监测点报表
+     * 算法名: 3.3.1.1-----监测点评价
      *
      * @author hongawen
      * @date 2023年11月01日 11:08