fix(base): 增加了动作变量的调用

kt-base/src/main/java/org/matrix/actuators/util/CompleteExpressionUtil.java

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSON;
 import com.jayway.jsonpath.Configuration;
 import com.jayway.jsonpath.JsonPath;
 import org.matrix.actuators.env.EnvironmentActuator;
+import org.matrix.actuators.move.MoveActuator;
 import org.matrix.actuators.sql.SqlExpActuator;
 import org.matrix.util.SpringUtils;
 import org.springframework.stereotype.Component;
@@ -24,16 +25,20 @@ public class CompleteExpressionUtil {
 
     public static final String JSON_PATH_REG = "\\{(\\s)*\\$.*?}|(<(\\s)*\\$.*?>)";
 
-    public static final String ACTION_REG = "\\$(?=\\{(\\s)*pre\\.)(.*?)(?<=})(\\[(.*?)])?";
+    public static final String ACTION_REG = "\\$(?=\\{(\\s)*(pre|mid|aft)[0-9]\\.)(.*?)(?<=})(\\[(.*?)])?";
 
     public static final String ENV_VARIABLE_REG = "\\#\\{(.*?)}";
 
-    public static final String DYNAMIC_VARIABLE_REG = "\\$\\{(((?!pre\\.).)*?)}(\\[(.*?)])?";
+    public static final String DYNAMIC_VARIABLE_REG = "\\$\\{(((?!(pre|mid|aft)[0-9]\\.).)*?)}(\\[(.*?)])?";
 
-    public static final String PATH_REG = "\\{(((?!pre\\.).)*?)}(\\[(.*?)])?";
+    public static final String PATH_REG = "\\{(((?!(pre|mid|aft)[0-9]\\.).)*?)}(\\[(.*?)])?";
 
     public String completeVariable(String expression, Long envId, Long projectId) {
         String result = expression;
+        result = regexExpression(
+                result, ACTION_REG,
+                null, (o, s) ->
+                        getMoveActuator().parseMoveVar(s));
         result = regexExpression(
                 result, DYNAMIC_VARIABLE_REG,
                 null, (o, s) ->
@@ -99,4 +104,9 @@ public class CompleteExpressionUtil {
         return SpringUtils.getBean("environmentActuator");
     }
 
+    private static MoveActuator getMoveActuator(){
+        return SpringUtils.getBean("moveActuator");
+    }
+
+
 }