diff --git a/rule-engine-open-compute/src/main/resources/application-dev.yml b/rule-engine-open-compute/src/main/resources/application-dev.yml index 8de2f5b0e357728ed666f0c00238f7197c867b91..a5f93d7c8545539faff0677ef131a15eecd2e0fe 100644 --- a/rule-engine-open-compute/src/main/resources/application-dev.yml +++ b/rule-engine-open-compute/src/main/resources/application-dev.yml @@ -62,10 +62,10 @@ spring: aop-patterns: cn.ruleengine.*.service.* #消息队列配置 rabbitmq: - host: + host: 127.0.0.1 port: 5672 - username: - password: + username: guest + password: guest listener: simple: retry: diff --git a/rule-engine-open-core/src/main/java/cn/ruleengine/core/condition/compare/StringCompare.java b/rule-engine-open-core/src/main/java/cn/ruleengine/core/condition/compare/StringCompare.java index aabcc150bae5f40b73cc00ee8b01cd481315a88e..eb3444c122f742211321b55025dcbf83b891cb4d 100644 --- a/rule-engine-open-core/src/main/java/cn/ruleengine/core/condition/compare/StringCompare.java +++ b/rule-engine-open-core/src/main/java/cn/ruleengine/core/condition/compare/StringCompare.java @@ -68,6 +68,8 @@ public class StringCompare implements Compare { return !leftValue.equals(rightValue); case CONTAIN: return leftValueStr.contains(rightValueStr); + case NOT_CONTAIN: + return !leftValueStr.contains(rightValueStr); case STARTS_WITH: // 如果右值为空,则返回false if (StrUtil.isEmpty(rightValueStr)) { diff --git a/rule-engine-open-core/src/main/java/cn/ruleengine/core/rule/GeneralRule.java b/rule-engine-open-core/src/main/java/cn/ruleengine/core/rule/GeneralRule.java index 7bc1bbade2bf2ef73f75d995fea37a8725c70915..4c6ee6e8caf15e637210abd360000be1c6736b08 100644 --- a/rule-engine-open-core/src/main/java/cn/ruleengine/core/rule/GeneralRule.java +++ b/rule-engine-open-core/src/main/java/cn/ruleengine/core/rule/GeneralRule.java @@ -104,6 +104,7 @@ public class GeneralRule extends DataSupport implements JsonParse { this.setWorkspaceId(generalRule.getWorkspaceId()); this.setWorkspaceCode(generalRule.getWorkspaceCode()); this.setRule(generalRule.getRule()); + this.setVersion(generalRule.getVersion()); } public void setRule(Rule rule) { diff --git a/rule-engine-open-web/src/main/resources/application-dev.yml b/rule-engine-open-web/src/main/resources/application-dev.yml index d346e06dcc4720804441773186a831dbf680fc13..96219a09f878d610985b7f97f1f318d39bedcb82 100644 --- a/rule-engine-open-web/src/main/resources/application-dev.yml +++ b/rule-engine-open-web/src/main/resources/application-dev.yml @@ -62,10 +62,10 @@ spring: aop-patterns: cn.ruleengine.*.service.* #消息队列配置 rabbitmq: - host: + host: 127.0.0.1 port: 5672 - username: - password: + username: guest + password: guest listener: simple: retry: @@ -85,9 +85,9 @@ spring: #redis配置 redis: database: 2 - host: - password: - port: 6000 + host: 127.0.0.1 + password: hidata!@# + port: 6379 lettuce: pool: max-active: 2000