diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/enums/ScriptTypeEnum.java b/liteflow-core/src/main/java/com/yomahub/liteflow/enums/ScriptTypeEnum.java
index c1d6b2cd4..b899d2705 100644
--- a/liteflow-core/src/main/java/com/yomahub/liteflow/enums/ScriptTypeEnum.java
+++ b/liteflow-core/src/main/java/com/yomahub/liteflow/enums/ScriptTypeEnum.java
@@ -2,57 +2,55 @@ package com.yomahub.liteflow.enums;
public enum ScriptTypeEnum {
- GROOVY("groovy", "groovy"),
- QLEXPRESS("qlexpress", "qlexpress"),
- JS("javascript", "js"),
- PYTHON("python", "python"),
- LUA("luaj", "lua");
- private String engineName;
+ GROOVY("groovy", "groovy"), QLEXPRESS("qlexpress", "qlexpress"), JS("javascript", "js"), PYTHON("python", "python"),
+ LUA("luaj", "lua");
- private String displayName;
+ private String engineName;
- ScriptTypeEnum(String engineName, String displayName) {
- this.engineName = engineName;
- this.displayName = displayName;
- }
+ private String displayName;
- public String getEngineName() {
- return engineName;
- }
+ ScriptTypeEnum(String engineName, String displayName) {
+ this.engineName = engineName;
+ this.displayName = displayName;
+ }
- public void setEngineName(String engineName) {
- this.engineName = engineName;
- }
+ public String getEngineName() {
+ return engineName;
+ }
- public String getDisplayName() {
- return displayName;
- }
+ public void setEngineName(String engineName) {
+ this.engineName = engineName;
+ }
- public void setDisplayName(String displayName) {
- this.displayName = displayName;
- }
+ public String getDisplayName() {
+ return displayName;
+ }
- public static ScriptTypeEnum getEnumByDisplayName(String displayName) {
- for (ScriptTypeEnum e : ScriptTypeEnum.values()) {
- if (e.getDisplayName().equals(displayName)) {
- return e;
- }
- }
- return null;
- }
+ public void setDisplayName(String displayName) {
+ this.displayName = displayName;
+ }
+
+ public static ScriptTypeEnum getEnumByDisplayName(String displayName) {
+ for (ScriptTypeEnum e : ScriptTypeEnum.values()) {
+ if (e.getDisplayName().equals(displayName)) {
+ return e;
+ }
+ }
+ return null;
+ }
+
+ /**
+ * 校验脚本类型是否合法
+ * @param scriptType 脚本类型
+ * @return true:合法,false:不合法
+ */
+ public static boolean checkScriptType(String scriptType) {
+ for (ScriptTypeEnum e : ScriptTypeEnum.values()) {
+ if (e.getDisplayName().equals(scriptType)) {
+ return true;
+ }
+ }
+ return false;
+ }
- /**
- * 校验脚本类型是否合法
- *
- * @param scriptType 脚本类型
- * @return true:合法,false:不合法
- */
- public static boolean checkScriptType(String scriptType) {
- for (ScriptTypeEnum e : ScriptTypeEnum.values()) {
- if (e.getDisplayName().equals(scriptType)) {
- return true;
- }
- }
- return false;
- }
}
diff --git a/liteflow-rule-plugin/liteflow-rule-sql/src/main/java/com/yomahub/liteflow/parser/sql/util/JDBCHelper.java b/liteflow-rule-plugin/liteflow-rule-sql/src/main/java/com/yomahub/liteflow/parser/sql/util/JDBCHelper.java
index ab276edd8..c2e44b87b 100644
--- a/liteflow-rule-plugin/liteflow-rule-sql/src/main/java/com/yomahub/liteflow/parser/sql/util/JDBCHelper.java
+++ b/liteflow-rule-plugin/liteflow-rule-sql/src/main/java/com/yomahub/liteflow/parser/sql/util/JDBCHelper.java
@@ -25,257 +25,265 @@ import java.util.Objects;
*/
public class JDBCHelper {
- private static final String SQL_PATTERN = "SELECT {},{} FROM {} WHERE {}=?";
+ private static final String SQL_PATTERN = "SELECT {},{} FROM {} WHERE {}=?";
- private static final String SCRIPT_SQL_CHECK_PATTERN = "SELECT 1 FROM {} WHERE {}=?";
+ private static final String SCRIPT_SQL_CHECK_PATTERN = "SELECT 1 FROM {} WHERE {}=?";
- private static final String SCRIPT_SQL_PATTERN = "SELECT {},{},{},{},{} FROM {} WHERE {}=?";
+ private static final String SCRIPT_SQL_PATTERN = "SELECT {},{},{},{},{} FROM {} WHERE {}=?";
- private static final String CHAIN_XML_PATTERN = "{}";
- private static final String NODE_XML_PATTERN = "{}";
+ private static final String CHAIN_XML_PATTERN = "{}";
- private static final String NODE_ITEM_XML_PATTERN = "";
- private static final String XML_PATTERN = "{}{}";
- private static final Integer FETCH_SIZE_MAX = 1000;
+ private static final String NODE_XML_PATTERN = "{}";
- private SQLParserVO sqlParserVO;
+ private static final String NODE_ITEM_XML_PATTERN = "";
- private static JDBCHelper INSTANCE;
+ private static final String XML_PATTERN = "{}{}";
- /**
- * 初始化 INSTANCE
- */
- public static void init(SQLParserVO sqlParserVO) {
- try {
- INSTANCE = new JDBCHelper();
- Class.forName(sqlParserVO.getDriverClassName());
- INSTANCE.setSqlParserVO(sqlParserVO);
- } catch (ClassNotFoundException e) {
- throw new ELSQLException(e.getMessage());
- }
- }
+ private static final Integer FETCH_SIZE_MAX = 1000;
- /**
- * 获取 INSTANCE
- */
- public static JDBCHelper getInstance() {
- return INSTANCE;
- }
+ private SQLParserVO sqlParserVO;
- /**
- * 获取链接
- */
- public Connection getConn() {
- Connection connection;
- try {
- connection = DriverManager.getConnection(sqlParserVO.getUrl(), sqlParserVO.getUsername(), sqlParserVO.getPassword());
- } catch (SQLException e) {
- throw new ELSQLException(e.getMessage());
- }
- return connection;
- }
+ private static JDBCHelper INSTANCE;
- /**
- * 获取 ElData 数据内容
- */
- public String getContent() {
- Connection conn = null;
- PreparedStatement stmt = null;
- ResultSet rs = null;
+ /**
+ * 初始化 INSTANCE
+ */
+ public static void init(SQLParserVO sqlParserVO) {
+ try {
+ INSTANCE = new JDBCHelper();
+ Class.forName(sqlParserVO.getDriverClassName());
+ INSTANCE.setSqlParserVO(sqlParserVO);
+ }
+ catch (ClassNotFoundException e) {
+ throw new ELSQLException(e.getMessage());
+ }
+ }
- String chainTableName = sqlParserVO.getChainTableName();
- String elDataField = sqlParserVO.getElDataField();
- String chainNameField = sqlParserVO.getChainNameField();
- String chainApplicationNameField = sqlParserVO.getChainApplicationNameField();
- String applicationName = sqlParserVO.getApplicationName();
+ /**
+ * 获取 INSTANCE
+ */
+ public static JDBCHelper getInstance() {
+ return INSTANCE;
+ }
- if (StrUtil.isBlank(chainTableName)) {
- throw new ELSQLException("You did not define the chainTableName property");
- }
+ /**
+ * 获取链接
+ */
+ public Connection getConn() {
+ Connection connection;
+ try {
+ connection = DriverManager.getConnection(sqlParserVO.getUrl(), sqlParserVO.getUsername(),
+ sqlParserVO.getPassword());
+ }
+ catch (SQLException e) {
+ throw new ELSQLException(e.getMessage());
+ }
+ return connection;
+ }
- if (StrUtil.isBlank(applicationName) || StrUtil.isBlank(chainApplicationNameField)) {
- throw new ELSQLException("You did not define the applicationName or chainApplicationNameField property");
- }
+ /**
+ * 获取 ElData 数据内容
+ */
+ public String getContent() {
+ Connection conn = null;
+ PreparedStatement stmt = null;
+ ResultSet rs = null;
- String sqlCmd = StrUtil.format(SQL_PATTERN, chainNameField, elDataField, chainTableName, chainApplicationNameField);
+ String chainTableName = sqlParserVO.getChainTableName();
+ String elDataField = sqlParserVO.getElDataField();
+ String chainNameField = sqlParserVO.getChainNameField();
+ String chainApplicationNameField = sqlParserVO.getChainApplicationNameField();
+ String applicationName = sqlParserVO.getApplicationName();
- List result = new ArrayList<>();
- try {
- conn = getConn();
- stmt = conn.prepareStatement(sqlCmd, ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY);
- // 设置游标拉取数量
- stmt.setFetchSize(FETCH_SIZE_MAX);
- stmt.setString(1, applicationName);
- rs = stmt.executeQuery();
+ if (StrUtil.isBlank(chainTableName)) {
+ throw new ELSQLException("You did not define the chainTableName property");
+ }
- while (rs.next()) {
- String elData = getStringFromResultSet(rs, elDataField);
- String chainName = getStringFromResultSet(rs, chainNameField);
+ if (StrUtil.isBlank(applicationName) || StrUtil.isBlank(chainApplicationNameField)) {
+ throw new ELSQLException("You did not define the applicationName or chainApplicationNameField property");
+ }
- result.add(StrUtil.format(CHAIN_XML_PATTERN, XmlUtil.escape(chainName), elData));
- }
- } catch (Exception e) {
- throw new ELSQLException(e.getMessage());
- } finally {
- // 关闭连接
- close(conn, stmt, rs);
- }
+ String sqlCmd = StrUtil.format(SQL_PATTERN, chainNameField, elDataField, chainTableName,
+ chainApplicationNameField);
- String chainsContent = CollUtil.join(result, StrUtil.EMPTY);
+ List result = new ArrayList<>();
+ try {
+ conn = getConn();
+ stmt = conn.prepareStatement(sqlCmd, ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY);
+ // 设置游标拉取数量
+ stmt.setFetchSize(FETCH_SIZE_MAX);
+ stmt.setString(1, applicationName);
+ rs = stmt.executeQuery();
- String nodesContent;
- if (hasScriptData()) {
- nodesContent = getScriptNodes();
- } else {
- nodesContent = StrUtil.EMPTY;
- }
+ while (rs.next()) {
+ String elData = getStringFromResultSet(rs, elDataField);
+ String chainName = getStringFromResultSet(rs, chainNameField);
- return StrUtil.format(XML_PATTERN, nodesContent, chainsContent);
- }
+ result.add(StrUtil.format(CHAIN_XML_PATTERN, XmlUtil.escape(chainName), elData));
+ }
+ }
+ catch (Exception e) {
+ throw new ELSQLException(e.getMessage());
+ }
+ finally {
+ // 关闭连接
+ close(conn, stmt, rs);
+ }
- public String getScriptNodes() {
- List result = new ArrayList<>();
- Connection conn = null;
- PreparedStatement stmt = null;
- ResultSet rs = null;
+ String chainsContent = CollUtil.join(result, StrUtil.EMPTY);
- String scriptTableName = sqlParserVO.getScriptTableName();
- String scriptIdField = sqlParserVO.getScriptIdField();
- String scriptDataField = sqlParserVO.getScriptDataField();
- String scriptNameField = sqlParserVO.getScriptNameField();
- String scriptTypeField = sqlParserVO.getScriptTypeField();
- String scriptApplicationNameField = sqlParserVO.getScriptApplicationNameField();
- String applicationName = sqlParserVO.getApplicationName();
- String scriptLanguageField = sqlParserVO.getScriptLanguageField();
+ String nodesContent;
+ if (hasScriptData()) {
+ nodesContent = getScriptNodes();
+ }
+ else {
+ nodesContent = StrUtil.EMPTY;
+ }
- if (StrUtil.isBlank(applicationName) || StrUtil.isBlank(scriptApplicationNameField)) {
- throw new ELSQLException("You did not define the applicationName or scriptApplicationNameField property");
- }
+ return StrUtil.format(XML_PATTERN, nodesContent, chainsContent);
+ }
- String sqlCmd = StrUtil.format(
- SCRIPT_SQL_PATTERN,
- scriptIdField,
- scriptDataField,
- scriptNameField,
- scriptTypeField,
- scriptLanguageField,
- scriptTableName,
- scriptApplicationNameField
- );
- try {
- conn = getConn();
- stmt = conn.prepareStatement(sqlCmd, ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY);
- // 设置游标拉取数量
- stmt.setFetchSize(FETCH_SIZE_MAX);
- stmt.setString(1, applicationName);
- rs = stmt.executeQuery();
+ public String getScriptNodes() {
+ List result = new ArrayList<>();
+ Connection conn = null;
+ PreparedStatement stmt = null;
+ ResultSet rs = null;
- while (rs.next()) {
- String id = getStringFromResultSet(rs, scriptIdField);
- String data = getStringFromResultSet(rs, scriptDataField);
- String name = getStringFromResultSet(rs, scriptNameField);
- String type = getStringFromResultSet(rs, scriptTypeField);
- String language = getStringFromResultSet(rs, scriptLanguageField);
+ String scriptTableName = sqlParserVO.getScriptTableName();
+ String scriptIdField = sqlParserVO.getScriptIdField();
+ String scriptDataField = sqlParserVO.getScriptDataField();
+ String scriptNameField = sqlParserVO.getScriptNameField();
+ String scriptTypeField = sqlParserVO.getScriptTypeField();
+ String scriptApplicationNameField = sqlParserVO.getScriptApplicationNameField();
+ String applicationName = sqlParserVO.getApplicationName();
+ String scriptLanguageField = sqlParserVO.getScriptLanguageField();
- NodeTypeEnum nodeTypeEnum = NodeTypeEnum.getEnumByCode(type);
- if (Objects.isNull(nodeTypeEnum)) {
- throw new ELSQLException(StrUtil.format("Invalid type value[{}]", type));
- }
+ if (StrUtil.isBlank(applicationName) || StrUtil.isBlank(scriptApplicationNameField)) {
+ throw new ELSQLException("You did not define the applicationName or scriptApplicationNameField property");
+ }
- if (!nodeTypeEnum.isScript()) {
- throw new ELSQLException(StrUtil.format("The type value[{}] is not a script type", type));
- }
+ String sqlCmd = StrUtil.format(SCRIPT_SQL_PATTERN, scriptIdField, scriptDataField, scriptNameField,
+ scriptTypeField, scriptLanguageField, scriptTableName, scriptApplicationNameField);
+ try {
+ conn = getConn();
+ stmt = conn.prepareStatement(sqlCmd, ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY);
+ // 设置游标拉取数量
+ stmt.setFetchSize(FETCH_SIZE_MAX);
+ stmt.setString(1, applicationName);
+ rs = stmt.executeQuery();
- if(!ScriptTypeEnum.checkScriptType(language)){
- throw new ELSQLException(StrUtil.format("The language value[{}] is error", language));
- }
+ while (rs.next()) {
+ String id = getStringFromResultSet(rs, scriptIdField);
+ String data = getStringFromResultSet(rs, scriptDataField);
+ String name = getStringFromResultSet(rs, scriptNameField);
+ String type = getStringFromResultSet(rs, scriptTypeField);
+ String language = getStringFromResultSet(rs, scriptLanguageField);
- result.add(StrUtil.format(NODE_ITEM_XML_PATTERN, XmlUtil.escape(id), XmlUtil.escape(name), type, language, data));
- }
- } catch (Exception e) {
- throw new ELSQLException(e.getMessage());
- } finally {
- // 关闭连接
- close(conn, stmt, rs);
- }
- return StrUtil.format(NODE_XML_PATTERN, CollUtil.join(result, StrUtil.EMPTY));
- }
+ NodeTypeEnum nodeTypeEnum = NodeTypeEnum.getEnumByCode(type);
+ if (Objects.isNull(nodeTypeEnum)) {
+ throw new ELSQLException(StrUtil.format("Invalid type value[{}]", type));
+ }
- /**
- * 关闭连接
- *
- * @param conn conn
- * @param stmt stmt
- * @param rs rs
- */
- private void close(Connection conn, PreparedStatement stmt, ResultSet rs) {
- // 关闭连接
- if (conn != null) {
- try {
- conn.close();
- } catch (SQLException e) {
- throw new ELSQLException(e.getMessage());
- }
- }
- // 关闭 statement
- if (stmt != null) {
- try {
- stmt.close();
- } catch (SQLException e) {
- throw new ELSQLException(e.getMessage());
- }
- }
- //关闭结果集
- if (rs != null) {
- try {
- rs.close();
- } catch (SQLException e) {
- throw new ELSQLException(e.getMessage());
- }
- }
- }
+ if (!nodeTypeEnum.isScript()) {
+ throw new ELSQLException(StrUtil.format("The type value[{}] is not a script type", type));
+ }
- private boolean hasScriptData() {
- if (StrUtil.isBlank(sqlParserVO.getScriptTableName())) {
- return false;
- }
+ if (!ScriptTypeEnum.checkScriptType(language)) {
+ throw new ELSQLException(StrUtil.format("The language value[{}] is error", language));
+ }
- Connection conn = null;
- PreparedStatement stmt = null;
- ResultSet rs = null;
- String sqlCmd = StrUtil.format(SCRIPT_SQL_CHECK_PATTERN,
- sqlParserVO.getScriptTableName(),
- sqlParserVO.getScriptApplicationNameField());
- try {
- conn = getConn();
- stmt = conn.prepareStatement(sqlCmd, ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY);
- stmt.setFetchSize(1);
- stmt.setString(1, sqlParserVO.getApplicationName());
- rs = stmt.executeQuery();
- return rs.next();
- } catch (Exception e) {
- return false;
- } finally {
- // 关闭连接
- close(conn, stmt, rs);
- }
- }
+ result.add(StrUtil.format(NODE_ITEM_XML_PATTERN, XmlUtil.escape(id), XmlUtil.escape(name), type,
+ language, data));
+ }
+ }
+ catch (Exception e) {
+ throw new ELSQLException(e.getMessage());
+ }
+ finally {
+ // 关闭连接
+ close(conn, stmt, rs);
+ }
+ return StrUtil.format(NODE_XML_PATTERN, CollUtil.join(result, StrUtil.EMPTY));
+ }
+ /**
+ * 关闭连接
+ * @param conn conn
+ * @param stmt stmt
+ * @param rs rs
+ */
+ private void close(Connection conn, PreparedStatement stmt, ResultSet rs) {
+ // 关闭连接
+ if (conn != null) {
+ try {
+ conn.close();
+ }
+ catch (SQLException e) {
+ throw new ELSQLException(e.getMessage());
+ }
+ }
+ // 关闭 statement
+ if (stmt != null) {
+ try {
+ stmt.close();
+ }
+ catch (SQLException e) {
+ throw new ELSQLException(e.getMessage());
+ }
+ }
+ // 关闭结果集
+ if (rs != null) {
+ try {
+ rs.close();
+ }
+ catch (SQLException e) {
+ throw new ELSQLException(e.getMessage());
+ }
+ }
+ }
- //#region get set method
- private String getStringFromResultSet(ResultSet rs, String field) throws SQLException {
- String data = rs.getString(field);
- if (StrUtil.isBlank(data)) {
- throw new ELSQLException(StrUtil.format("exist {} field value is empty", field));
- }
- return data;
- }
+ private boolean hasScriptData() {
+ if (StrUtil.isBlank(sqlParserVO.getScriptTableName())) {
+ return false;
+ }
- private SQLParserVO getSqlParserVO() {
- return sqlParserVO;
- }
+ Connection conn = null;
+ PreparedStatement stmt = null;
+ ResultSet rs = null;
+ String sqlCmd = StrUtil.format(SCRIPT_SQL_CHECK_PATTERN, sqlParserVO.getScriptTableName(),
+ sqlParserVO.getScriptApplicationNameField());
+ try {
+ conn = getConn();
+ stmt = conn.prepareStatement(sqlCmd, ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY);
+ stmt.setFetchSize(1);
+ stmt.setString(1, sqlParserVO.getApplicationName());
+ rs = stmt.executeQuery();
+ return rs.next();
+ }
+ catch (Exception e) {
+ return false;
+ }
+ finally {
+ // 关闭连接
+ close(conn, stmt, rs);
+ }
+ }
+
+ // #region get set method
+ private String getStringFromResultSet(ResultSet rs, String field) throws SQLException {
+ String data = rs.getString(field);
+ if (StrUtil.isBlank(data)) {
+ throw new ELSQLException(StrUtil.format("exist {} field value is empty", field));
+ }
+ return data;
+ }
+
+ private SQLParserVO getSqlParserVO() {
+ return sqlParserVO;
+ }
+
+ private void setSqlParserVO(SQLParserVO sqlParserVO) {
+ this.sqlParserVO = sqlParserVO;
+ }
- private void setSqlParserVO(SQLParserVO sqlParserVO) {
- this.sqlParserVO = sqlParserVO;
- }
}
diff --git a/liteflow-rule-plugin/liteflow-rule-sql/src/main/java/com/yomahub/liteflow/parser/sql/vo/SQLParserVO.java b/liteflow-rule-plugin/liteflow-rule-sql/src/main/java/com/yomahub/liteflow/parser/sql/vo/SQLParserVO.java
index 778cdf5e3..731e88109 100644
--- a/liteflow-rule-plugin/liteflow-rule-sql/src/main/java/com/yomahub/liteflow/parser/sql/vo/SQLParserVO.java
+++ b/liteflow-rule-plugin/liteflow-rule-sql/src/main/java/com/yomahub/liteflow/parser/sql/vo/SQLParserVO.java
@@ -215,4 +215,5 @@ public class SQLParserVO {
public void setScriptLanguageField(String scriptLanguageField) {
this.scriptLanguageField = scriptLanguageField;
}
+
}
diff --git a/liteflow-testcase-el/liteflow-testcase-el-sql-springboot/src/test/java/com/yomahub/liteflow/test/sql/SQLWithXmlELSpringbootTest.java b/liteflow-testcase-el/liteflow-testcase-el-sql-springboot/src/test/java/com/yomahub/liteflow/test/sql/SQLWithXmlELSpringbootTest.java
index 6b1256ab8..da6296f37 100644
--- a/liteflow-testcase-el/liteflow-testcase-el-sql-springboot/src/test/java/com/yomahub/liteflow/test/sql/SQLWithXmlELSpringbootTest.java
+++ b/liteflow-testcase-el/liteflow-testcase-el-sql-springboot/src/test/java/com/yomahub/liteflow/test/sql/SQLWithXmlELSpringbootTest.java
@@ -31,73 +31,80 @@ import java.sql.Statement;
@TestPropertySource(value = "classpath:/application-xml.properties")
@SpringBootTest(classes = SQLWithXmlELSpringbootTest.class)
@EnableAutoConfiguration
-@ComponentScan({"com.yomahub.liteflow.test.sql.cmp"})
+@ComponentScan({ "com.yomahub.liteflow.test.sql.cmp" })
public class SQLWithXmlELSpringbootTest extends BaseTest {
- @Resource
- private FlowExecutor flowExecutor;
- @Test
- public void testSQLWithXml() {
- LiteflowResponse response = flowExecutor.execute2Resp("chain1", "arg");
- Assert.assertEquals("a==>b==>c", response.getExecuteStepStr());
+ @Resource
+ private FlowExecutor flowExecutor;
- // 修改数据库
- changeData();
+ @Test
+ public void testSQLWithXml() {
+ LiteflowResponse response = flowExecutor.execute2Resp("chain1", "arg");
+ Assert.assertEquals("a==>b==>c", response.getExecuteStepStr());
- // 重新加载规则
- flowExecutor.reloadRule();
- Assert.assertEquals("a==>c==>b", flowExecutor.execute2Resp("chain1", "arg").getExecuteStepStr());
- }
+ // 修改数据库
+ changeData();
- @Test
- public void testSQLWithScriptXml() {
- LiteflowResponse response = flowExecutor.execute2Resp("chain3", "arg");
- Assert.assertTrue(response.isSuccess());
- Assert.assertEquals("x0[if 脚本]==>a==>b", response.getExecuteStepStrWithoutTime());
+ // 重新加载规则
+ flowExecutor.reloadRule();
+ Assert.assertEquals("a==>c==>b", flowExecutor.execute2Resp("chain1", "arg").getExecuteStepStr());
+ }
- // 修改数据库
- changeScriptData();
- // 重新加载规则
- flowExecutor.reloadRule();
- Assert.assertEquals("x0[if 脚本]", flowExecutor.execute2Resp("chain3", "arg").getExecuteStepStr());
- }
+ @Test
+ public void testSQLWithScriptXml() {
+ LiteflowResponse response = flowExecutor.execute2Resp("chain3", "arg");
+ Assert.assertTrue(response.isSuccess());
+ Assert.assertEquals("x0[if 脚本]==>a==>b", response.getExecuteStepStrWithoutTime());
- @Test
- public void testMultiLanguage1() {
- LiteflowResponse response = flowExecutor.execute2Resp("chain4", "arg");
- Assert.assertTrue(response.isSuccess());
- Assert.assertEquals("x2[python脚本]==>x0[if 脚本]==>a==>b", response.getExecuteStepStrWithoutTime());
- }
+ // 修改数据库
+ changeScriptData();
+ // 重新加载规则
+ flowExecutor.reloadRule();
+ Assert.assertEquals("x0[if 脚本]", flowExecutor.execute2Resp("chain3", "arg").getExecuteStepStr());
+ }
- /**
- * 修改数据库数据
- */
- private void changeData() {
- LiteflowConfig liteflowConfig = LiteflowConfigGetter.get();
- SQLParserVO sqlParserVO = JsonUtil.parseObject(liteflowConfig.getRuleSourceExtData(), SQLParserVO.class);
- Connection connection;
- try {
- connection = DriverManager.getConnection(sqlParserVO.getUrl(), sqlParserVO.getUsername(), sqlParserVO.getPassword());
- Statement statement = connection.createStatement();
- statement.executeUpdate("UPDATE EL_TABLE SET EL_DATA='THEN(a, c, b);' WHERE chain_name='chain1'");
- } catch (SQLException e) {
- throw new ELSQLException(e.getMessage());
- }
- }
+ @Test
+ public void testMultiLanguage1() {
+ LiteflowResponse response = flowExecutor.execute2Resp("chain4", "arg");
+ Assert.assertTrue(response.isSuccess());
+ Assert.assertEquals("x2[python脚本]==>x0[if 脚本]==>a==>b", response.getExecuteStepStrWithoutTime());
+ }
+
+ /**
+ * 修改数据库数据
+ */
+ private void changeData() {
+ LiteflowConfig liteflowConfig = LiteflowConfigGetter.get();
+ SQLParserVO sqlParserVO = JsonUtil.parseObject(liteflowConfig.getRuleSourceExtData(), SQLParserVO.class);
+ Connection connection;
+ try {
+ connection = DriverManager.getConnection(sqlParserVO.getUrl(), sqlParserVO.getUsername(),
+ sqlParserVO.getPassword());
+ Statement statement = connection.createStatement();
+ statement.executeUpdate("UPDATE EL_TABLE SET EL_DATA='THEN(a, c, b);' WHERE chain_name='chain1'");
+ }
+ catch (SQLException e) {
+ throw new ELSQLException(e.getMessage());
+ }
+ }
+
+ /**
+ * 修改数据库数据
+ */
+ private void changeScriptData() {
+ LiteflowConfig liteflowConfig = LiteflowConfigGetter.get();
+ SQLParserVO sqlParserVO = JsonUtil.parseObject(liteflowConfig.getRuleSourceExtData(), SQLParserVO.class);
+ Connection connection;
+ try {
+ connection = DriverManager.getConnection(sqlParserVO.getUrl(), sqlParserVO.getUsername(),
+ sqlParserVO.getPassword());
+ Statement statement = connection.createStatement();
+ statement.executeUpdate(
+ "UPDATE SCRIPT_NODE_TABLE SET SCRIPT_NODE_DATA='return false;' WHERE SCRIPT_NODE_ID='x0'");
+ }
+ catch (SQLException e) {
+ throw new ELSQLException(e.getMessage());
+ }
+ }
- /**
- * 修改数据库数据
- */
- private void changeScriptData() {
- LiteflowConfig liteflowConfig = LiteflowConfigGetter.get();
- SQLParserVO sqlParserVO = JsonUtil.parseObject(liteflowConfig.getRuleSourceExtData(), SQLParserVO.class);
- Connection connection;
- try {
- connection = DriverManager.getConnection(sqlParserVO.getUrl(), sqlParserVO.getUsername(), sqlParserVO.getPassword());
- Statement statement = connection.createStatement();
- statement.executeUpdate("UPDATE SCRIPT_NODE_TABLE SET SCRIPT_NODE_DATA='return false;' WHERE SCRIPT_NODE_ID='x0'");
- } catch (SQLException e) {
- throw new ELSQLException(e.getMessage());
- }
- }
}