From 22eec5f7300ef5371d91f1136f5b058bad462048 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=AE=B8=E7=86=8A?= <849884058@qq.com>
Date: Thu, 26 Sep 2024 23:26:19 +0800
Subject: [PATCH 1/2] =?UTF-8?q?[feat]=20String=E7=B1=BB=E5=9E=8B=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=20NOT=5FCONTAIN=20=E6=AF=94=E8=BE=83=20&=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E6=A8=A1=E6=8B=9F=E8=BF=90=E8=A1=8Cversion=E7=BC=BA?=
 =?UTF-8?q?=E5=A4=B1=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/ruleengine/core/condition/compare/StringCompare.java     | 2 ++
 .../src/main/java/cn/ruleengine/core/rule/GeneralRule.java      | 1 +
 2 files changed, 3 insertions(+)

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 aabcc15..eb3444c 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 7bc1bba..4c6ee6e 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) {
-- 
Gitee


From bc77b3b437e0b1496b620f1f21004d09c22fc208 Mon Sep 17 00:00:00 2001
From: ycpanda <849884058@qq.com>
Date: Fri, 27 Sep 2024 08:26:42 +0800
Subject: [PATCH 2/2] =?UTF-8?q?[build]=20=E5=BC=80=E5=8F=91=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/application-dev.yml           |  6 +++---
 .../src/main/resources/application-dev.yml           | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

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 8de2f5b..a5f93d7 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-web/src/main/resources/application-dev.yml b/rule-engine-open-web/src/main/resources/application-dev.yml
index d346e06..96219a0 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
-- 
Gitee