From 8b3c093d191dcb48b3eaf4375c0f57f07d8d45b8 Mon Sep 17 00:00:00 2001
From: RB <getrebuild@sina.com>
Date: Tue, 21 Jan 2025 14:38:09 +0800
Subject: [PATCH] be

---
 @rbv                                                   |  2 +-
 .../core/service/trigger/DataValidateException.java    | 10 ++--------
 .../core/service/trigger/RobotTriggerObserver.java     |  3 +++
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/@rbv b/@rbv
index fd2547369..f5a2d1db8 160000
--- a/@rbv
+++ b/@rbv
@@ -1 +1 @@
-Subproject commit fd2547369b05a1b5e6733772112db14b5328c993
+Subproject commit f5a2d1db8edc9232ea07b004fb3827eb879f386c
diff --git a/src/main/java/com/rebuild/core/service/trigger/DataValidateException.java b/src/main/java/com/rebuild/core/service/trigger/DataValidateException.java
index acf64a5c4..a39b4406a 100644
--- a/src/main/java/com/rebuild/core/service/trigger/DataValidateException.java
+++ b/src/main/java/com/rebuild/core/service/trigger/DataValidateException.java
@@ -9,6 +9,7 @@
 
 import cn.devezhao.persist4j.engine.ID;
 import com.rebuild.core.service.DataSpecificationException;
+import lombok.Getter;
 
 /**
  * 数据校验专用
@@ -17,6 +18,7 @@
  * @since 2021/6/30
  * @see com.rebuild.rbv.trigger.DataValidate
  */
+@Getter
 public class DataValidateException extends DataSpecificationException {
     private static final long serialVersionUID = 4178910284594338317L;
 
@@ -36,12 +38,4 @@ public DataValidateException(String msg, boolean weakMode, ID triggerId) {
         this.weakMode = weakMode;
         this.weakModeTriggerId = triggerId;
     }
-
-    public boolean isWeakMode() {
-        return weakMode;
-    }
-
-    public ID getWeakModeTriggerId() {
-        return weakModeTriggerId;
-    }
 }
diff --git a/src/main/java/com/rebuild/core/service/trigger/RobotTriggerObserver.java b/src/main/java/com/rebuild/core/service/trigger/RobotTriggerObserver.java
index 84d11068c..e42e08f5c 100644
--- a/src/main/java/com/rebuild/core/service/trigger/RobotTriggerObserver.java
+++ b/src/main/java/com/rebuild/core/service/trigger/RobotTriggerObserver.java
@@ -10,6 +10,7 @@
 import cn.devezhao.persist4j.engine.ID;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.googlecode.aviator.exception.StandardError;
 import com.rebuild.core.Application;
 import com.rebuild.core.metadata.EntityHelper;
 import com.rebuild.core.metadata.MetadataHelper;
@@ -216,6 +217,8 @@ protected void execAction(OperatingContext context, TriggerWhen when) {
 
                     // DataValidate 直接抛出
                     if (ex instanceof DataValidateException) throw ex;
+                    // throw of Aviator 抛出
+                    if (ex instanceof StandardError) throw new DataValidateException(ex.getLocalizedMessage());
 
                     log.error("Trigger execution failed : {} << {}", action, context, ex);
                     CommonsLog.createLog(TYPE_TRIGGER,