From b511eaba85be6601b0676086d24f54dc9caf3e6d Mon Sep 17 00:00:00 2001
From: sterben <1473352497@qq.com>
Date: Tue, 10 Oct 2023 15:15:30 +0800
Subject: [PATCH 1/4] =?UTF-8?q?[Fixed#]=20=E5=88=A0=E9=99=A4=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 5f08db8..e6bbbfd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,7 +4,6 @@ ADD target/saber-1.0-RELEASE.jar app.jar
 EXPOSE 38092
 ENTRYPOINT java \
            -Dspring.config.import=nacos:saber.yml?group=DEFAULT_GROUP \
-           -Dspring.config.location=src/main/resources/application.yml \
            -Dspring.cloud.nacos.config.server-addr=192.168.115.23:8848 \
            -Dspring.cloud.nacos.config.namespace=38d3c5db-ee21-4651-961b-777d3ef0bf6e \
            -jar your-artifact-name.jar
\ No newline at end of file
-- 
GitLab


From 276e674f5062a379c9fc7c7c841446dff0576481 Mon Sep 17 00:00:00 2001
From: sterben <1473352497@qq.com>
Date: Wed, 11 Oct 2023 14:10:42 +0800
Subject: [PATCH 2/4] =?UTF-8?q?[SQL#]=20=E8=A7=84=E5=88=99=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E2=80=9C=E8=A7=84=E5=88=99=E4=BB=A3=E5=8F=B7=E2=80=9D?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/steadon/saber/pojo/domain/NotificationRule.java    | 7 +++++++
 .../steadon/saber/pojo/model/NotificationRuleRequest.java  | 5 +++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/steadon/saber/pojo/domain/NotificationRule.java b/src/main/java/com/steadon/saber/pojo/domain/NotificationRule.java
index a1aeaf0..ce630ce 100644
--- a/src/main/java/com/steadon/saber/pojo/domain/NotificationRule.java
+++ b/src/main/java/com/steadon/saber/pojo/domain/NotificationRule.java
@@ -28,6 +28,12 @@ public class NotificationRule implements Serializable {
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
+    /**
+     * 规则名称
+     */
+    @TableField("code")
+    private String code;
+
     /**
      * 指定消息模板
      */
@@ -79,6 +85,7 @@ public class NotificationRule implements Serializable {
     private Byte isDeleted;
 
     public void loadDataFromReq(NotificationRuleRequest request) {
+        this.code = request.getRuleCode();
         this.templateId = request.getTemplateId();
         this.groupId = request.getGroupId();
         this.feishuStatus = request.getFeishuStatus();
diff --git a/src/main/java/com/steadon/saber/pojo/model/NotificationRuleRequest.java b/src/main/java/com/steadon/saber/pojo/model/NotificationRuleRequest.java
index ed5799e..83e5fa1 100644
--- a/src/main/java/com/steadon/saber/pojo/model/NotificationRuleRequest.java
+++ b/src/main/java/com/steadon/saber/pojo/model/NotificationRuleRequest.java
@@ -4,9 +4,10 @@ import lombok.Data;
 
 @Data
 public class NotificationRuleRequest {
-    private Integer templateId;
+    private String ruleCode;
     private Integer groupId;
+    private Integer templateId;
     private Boolean feishuStatus;
     private Boolean smsStatus;
     private Boolean emailStatus;
-}
+}
\ No newline at end of file
-- 
GitLab


From 28fba255fd73acb7efb8c6c0a1ec7f0090f8e7d5 Mon Sep 17 00:00:00 2001
From: sterben <1473352497@qq.com>
Date: Wed, 11 Oct 2023 14:11:54 +0800
Subject: [PATCH 3/4] =?UTF-8?q?[Feature#]=E5=BC=80=E5=A7=8B=E5=BC=80?=
 =?UTF-8?q?=E5=8F=91=E7=94=A8=E6=88=B7=E4=B8=8E=E6=9C=BA=E5=99=A8=E4=BA=BA?=
 =?UTF-8?q?=E4=B8=9A=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/steadon/saber/biz/IFeishuRobotBiz.java | 5 +++++
 src/main/java/com/steadon/saber/biz/IUserInfoBiz.java    | 2 ++
 .../java/com/steadon/saber/biz/impl/FeishuRobotBiz.java  | 7 +++++++
 .../java/com/steadon/saber/biz/impl/UserInfoBiz.java     | 5 +++++
 .../steadon/saber/pojo/model/UserInfoSearchRequest.java  | 9 +++++++++
 5 files changed, 28 insertions(+)
 create mode 100644 src/main/java/com/steadon/saber/pojo/model/UserInfoSearchRequest.java

diff --git a/src/main/java/com/steadon/saber/biz/IFeishuRobotBiz.java b/src/main/java/com/steadon/saber/biz/IFeishuRobotBiz.java
index ce5681a..577b0d4 100644
--- a/src/main/java/com/steadon/saber/biz/IFeishuRobotBiz.java
+++ b/src/main/java/com/steadon/saber/biz/IFeishuRobotBiz.java
@@ -1,4 +1,9 @@
 package com.steadon.saber.biz;
 
+import com.steadon.saber.pojo.SaberResponse;
+import com.steadon.saber.pojo.domain.FeishuRobot;
+import com.steadon.saber.pojo.model.pageData.PageData;
+
 public interface IFeishuRobotBiz {
+    SaberResponse<PageData<FeishuRobot>> getFeishuRobotBatch(Integer pageNo, Integer pageSize);
 }
diff --git a/src/main/java/com/steadon/saber/biz/IUserInfoBiz.java b/src/main/java/com/steadon/saber/biz/IUserInfoBiz.java
index 01b82e3..69446f4 100644
--- a/src/main/java/com/steadon/saber/biz/IUserInfoBiz.java
+++ b/src/main/java/com/steadon/saber/biz/IUserInfoBiz.java
@@ -16,4 +16,6 @@ public interface IUserInfoBiz {
     SaberResponse<String> updateUserInfo(Integer uid, UserInfoRequest request);
 
     SaberResponse<PageData<UserInfo>> getUserInfoBatch(Integer pageNo, Integer pageSize);
+
+    SaberResponse<UserInfo> getuserInfo(Integer uid);
 }
\ No newline at end of file
diff --git a/src/main/java/com/steadon/saber/biz/impl/FeishuRobotBiz.java b/src/main/java/com/steadon/saber/biz/impl/FeishuRobotBiz.java
index 100a649..d38f754 100644
--- a/src/main/java/com/steadon/saber/biz/impl/FeishuRobotBiz.java
+++ b/src/main/java/com/steadon/saber/biz/impl/FeishuRobotBiz.java
@@ -1,8 +1,15 @@
 package com.steadon.saber.biz.impl;
 
 import com.steadon.saber.biz.IFeishuRobotBiz;
+import com.steadon.saber.pojo.SaberResponse;
+import com.steadon.saber.pojo.domain.FeishuRobot;
+import com.steadon.saber.pojo.model.pageData.PageData;
 import org.springframework.stereotype.Service;
 
 @Service
 public class FeishuRobotBiz implements IFeishuRobotBiz {
+    @Override
+    public SaberResponse<PageData<FeishuRobot>> getFeishuRobotBatch(Integer pageNo, Integer pageSize) {
+        return null;
+    }
 }
diff --git a/src/main/java/com/steadon/saber/biz/impl/UserInfoBiz.java b/src/main/java/com/steadon/saber/biz/impl/UserInfoBiz.java
index 8e8303e..a7a2481 100644
--- a/src/main/java/com/steadon/saber/biz/impl/UserInfoBiz.java
+++ b/src/main/java/com/steadon/saber/biz/impl/UserInfoBiz.java
@@ -50,4 +50,9 @@ public class UserInfoBiz implements IUserInfoBiz {
         PageData<UserInfo> userInfoPageData = userGroupService.getInfoListByPage(pageNo, pageSize);
         return SaberResponse.success(userInfoPageData);
     }
+
+    @Override
+    public SaberResponse<UserInfo> getuserInfo(Integer uid) {
+        return null;
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/com/steadon/saber/pojo/model/UserInfoSearchRequest.java b/src/main/java/com/steadon/saber/pojo/model/UserInfoSearchRequest.java
new file mode 100644
index 0000000..8dcc4f8
--- /dev/null
+++ b/src/main/java/com/steadon/saber/pojo/model/UserInfoSearchRequest.java
@@ -0,0 +1,9 @@
+package com.steadon.saber.pojo.model;
+
+import lombok.Data;
+
+@Data
+public class UserInfoSearchRequest {
+    private String name;
+    private String phone;
+}
-- 
GitLab


From faeec1b584cc69ca667d2672b636f41c7652d7cf Mon Sep 17 00:00:00 2001
From: sterben <1473352497@qq.com>
Date: Wed, 11 Oct 2023 14:12:01 +0800
Subject: [PATCH 4/4] =?UTF-8?q?[Feature#]=E8=A7=84=E8=8C=83=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/steadon/saber/biz/impl/NotificationBiz.java   | 7 ++++---
 .../saber/service/impl/NotificationServiceImpl.java        | 3 ++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/steadon/saber/biz/impl/NotificationBiz.java b/src/main/java/com/steadon/saber/biz/impl/NotificationBiz.java
index 91be585..21eb1f6 100644
--- a/src/main/java/com/steadon/saber/biz/impl/NotificationBiz.java
+++ b/src/main/java/com/steadon/saber/biz/impl/NotificationBiz.java
@@ -47,14 +47,15 @@ public class NotificationBiz implements INotificationBiz {
         // 校验业务ID (验签+解析)
         String businessAppCode = businessService.getBusinessAppCode(appId);
 
-        // 查询通知规则
-        NotificationRule notificationRule = notificationService.getNotificationRule(Integer.valueOf(request.getRuleId()));
-
         String title = request.getTitle();
         String userId = request.getUserId();
         String chatId = request.getChatId();
+        String ruleId = request.getRuleId();
         String feishuAppId = request.getFeishuAppId();
 
+        // 查询通知规则
+        NotificationRule notificationRule = notificationService.getNotificationRule(Integer.valueOf(ruleId));
+
         // 查询匹配的消息模板并整合参数
         String content = templateService.handleTemplate(notificationRule.getTemplateId(), request.getContent());
 
diff --git a/src/main/java/com/steadon/saber/service/impl/NotificationServiceImpl.java b/src/main/java/com/steadon/saber/service/impl/NotificationServiceImpl.java
index 7d010dd..7cda87e 100644
--- a/src/main/java/com/steadon/saber/service/impl/NotificationServiceImpl.java
+++ b/src/main/java/com/steadon/saber/service/impl/NotificationServiceImpl.java
@@ -1,5 +1,6 @@
 package com.steadon.saber.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.steadon.saber.handler.chain.model.MessageInfo;
 import com.steadon.saber.mapper.NotificationMapper;
@@ -98,7 +99,7 @@ public class NotificationServiceImpl implements NotificationService {
     @Override
     public PageData<NotificationRule> getNotificationRuleBatch(Integer pageNo, Integer pageSize) {
         Page<NotificationRule> page = new Page<>(pageNo, pageSize);
-        Page<NotificationRule> notificationRulePage = notificationRuleMapper.selectPage(page, null);
+        IPage<NotificationRule> notificationRulePage = notificationRuleMapper.selectPage(page, null);
 
         PageData<NotificationRule> notificationRulePageData = new PageData<>();
         notificationRulePageData.praiseIPage(notificationRulePage);
-- 
GitLab