From c69b4c62b2e047b20f0f31519b3d174442586037 Mon Sep 17 00:00:00 2001
From: imyzt <imyzt01@gmail.com>
Date: Tue, 23 Nov 2021 22:47:07 +0800
Subject: [PATCH] pref:lark bot support @user

---
 .../starter/alarm/lark/LarkAlarmConstants.java   | 16 ++++++++++++++--
 .../alarm/lark/LarkSendMessageHandler.java       |  3 ++-
 .../main/resources/properties/lark/alarm.json    |  4 ++--
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/alarm/lark/LarkAlarmConstants.java b/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/alarm/lark/LarkAlarmConstants.java
index 9c770dd5..fc85c64d 100644
--- a/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/alarm/lark/LarkAlarmConstants.java
+++ b/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/alarm/lark/LarkAlarmConstants.java
@@ -24,7 +24,19 @@ public class LarkAlarmConstants {
     public static final String NOTICE_JSON_PATH = "classpath:properties/lark/notice.json";
 
     /**
-     * lark at format
+     * lark at format. openid
+     * 当配置openid时,机器人可以@人
      */
-    public static final String LARK_AT_FORMAT = "<at email=''>%s</at>";
+    public static final String LARK_AT_FORMAT_OPENID = "<at id='%s'></at>";
+
+    /**
+     * lark at format. username
+     * 当配置username时,只能蓝色字体展示@username,被@人无@提醒
+     */
+    public static final String LARK_AT_FORMAT_USERNAME = "<at id=''>%s</at>";
+
+    /**
+     * lark openid prefix
+     */
+    public static final String LARK_OPENID_PREFIX = "ou_";
 }
diff --git a/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/alarm/lark/LarkSendMessageHandler.java b/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/alarm/lark/LarkSendMessageHandler.java
index e00c09bf..9db286b1 100644
--- a/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/alarm/lark/LarkSendMessageHandler.java
+++ b/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/alarm/lark/LarkSendMessageHandler.java
@@ -170,7 +170,8 @@ public class LarkSendMessageHandler implements SendMessageHandler {
             return "";
         }
         return Arrays.stream(notifyConfig.getReceives().split(","))
-                .map(receive -> String.format(LARK_AT_FORMAT, receive))
+                .map(receive -> StrUtil.startWith(receive, LARK_OPENID_PREFIX) ?
+                        String.format(LARK_AT_FORMAT_OPENID, receive) : String.format(LARK_AT_FORMAT_USERNAME, receive))
                 .collect(Collectors.joining(" "));
     }
 
diff --git a/hippo4j-spring-boot-starter/src/main/resources/properties/lark/alarm.json b/hippo4j-spring-boot-starter/src/main/resources/properties/lark/alarm.json
index b0e21a57..23af7381 100644
--- a/hippo4j-spring-boot-starter/src/main/resources/properties/lark/alarm.json
+++ b/hippo4j-spring-boot-starter/src/main/resources/properties/lark/alarm.json
@@ -153,8 +153,8 @@
           {
             "is_short": true,
             "text": {
-              "user_id": "** OWNER：** %s",
-              "tag": "at"
+              "content": "** OWNER：** %s",
+              "tag": "lark_md"
             }
           },
           {