diff --git a/README.md b/README.md index ed7cdf9..ab9e706 100644 --- a/README.md +++ b/README.md @@ -162,9 +162,9 @@ curl -XPOST "127.0.0.1:8080/send" -H 'Content-Type: application/json' -d '{"co - [ ] 总体架构已完成,持续做基础建设和优化代码 -**近期更新时间**:6月8号 +**近期更新时间**:6月27号 -**近期更新功能**:完成接入钉钉机器人渠道所有类型的消息 +**近期更新功能**:飞书机器人、企业微信机器人部分消息类型接入 ## 项目交流 diff --git a/austin-common/src/main/java/com/java3y/austin/common/dto/model/FeiShuRobotContentModel.java b/austin-common/src/main/java/com/java3y/austin/common/dto/model/FeiShuRobotContentModel.java index 2a92869..56c5466 100644 --- a/austin-common/src/main/java/com/java3y/austin/common/dto/model/FeiShuRobotContentModel.java +++ b/austin-common/src/main/java/com/java3y/austin/common/dto/model/FeiShuRobotContentModel.java @@ -43,8 +43,4 @@ public class FeiShuRobotContentModel extends ContentModel { */ private String postContent; - /** - * 图片路径 - */ - private String imagePath; } diff --git a/austin-common/src/main/java/com/java3y/austin/common/enums/IdType.java b/austin-common/src/main/java/com/java3y/austin/common/enums/IdType.java index 3b9aea5..f0fd5a2 100644 --- a/austin-common/src/main/java/com/java3y/austin/common/enums/IdType.java +++ b/austin-common/src/main/java/com/java3y/austin/common/enums/IdType.java @@ -22,6 +22,7 @@ public enum IdType { ENTERPRISE_USER_ID(60, "enterprise_user_id"), DING_DING_USER_ID(70, "ding_ding_user_id"), CID(80, "cid"), + FEI_SHU_USER_ID(90, "fei_shu_user_id"), ; private Integer code; diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/deduplication/limit/SimpleLimitService.java b/austin-handler/src/main/java/com/java3y/austin/handler/deduplication/limit/SimpleLimitService.java index 2976805..58f042b 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/deduplication/limit/SimpleLimitService.java +++ b/austin-handler/src/main/java/com/java3y/austin/handler/deduplication/limit/SimpleLimitService.java @@ -13,7 +13,7 @@ import java.util.*; import java.util.stream.Collectors; /** - * 简单去重器(目前承载着 N分钟相同内容去重) + * 采用普通的计数去重方法,限制的是每天发送的条数。 * @author cao * @date 2022-04-20 13:41 */ diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/deduplication/limit/SlideWindowLimitService.java b/austin-handler/src/main/java/com/java3y/austin/handler/deduplication/limit/SlideWindowLimitService.java index f727faa..5bdad1c 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/deduplication/limit/SlideWindowLimitService.java +++ b/austin-handler/src/main/java/com/java3y/austin/handler/deduplication/limit/SlideWindowLimitService.java @@ -17,7 +17,7 @@ import java.util.HashSet; import java.util.Set; /** - * 滑动窗口去重器(目前承载着 一天内N次相同渠道去重) + * 滑动窗口去重器(内容去重采用基于redis中zset的滑动窗口去重,可以做到严格控制单位时间内的频次。) * @author cao * @date 2022-04-20 11:34 */ diff --git a/austin-web/src/main/resources/local.properties b/austin-web/src/main/resources/local.properties index 6aee143..8e6f9f2 100644 --- a/austin-web/src/main/resources/local.properties +++ b/austin-web/src/main/resources/local.properties @@ -7,4 +7,5 @@ dingDingRobotAccount = [{"ding_ding_robot_10":{"secret":"234324324324","webhook" dingDingWorkNoticeAccount =[{"ding_ding_work_notice_10":{"appKey":"23423423","appSecret":"tQpvmkR863dYcuKDVfM23432432432423Nlx_fYLLLlpPJWHvWKbTu","agentId":"1523423423242"}}] flowControlRule = {"flow_control_40":1} geTuiAccount = [{"ge_tui_account_10":{"appId":"23423423","appKey":"234234234","masterSecret":"2342342342342"}}] +feiShuAccountRobot = [{"fei_shu_robot_10":{"webhook":"https://open.feishu.cn/open-apis/bot/v2/hook/c24b09ef-9aa3-4aad-9239-a7e05fcaf6ec"}}] msgTypeSmsConfig = [{"message_type_10":[{"weights":99,"scriptName":"TencentSmsScript"},{"weights":1,"scriptName":"YunPianSmsScript"}]},{"message_type_20":[{"weights":99,"scriptName":"TencentSmsScript"},{"weights":1,"scriptName":"YunPianSmsScript"}]},{"message_type_30":[{"weights":20,"scriptName":"TencentSmsScript"}]},{"message_type_40":[{"weights":20,"scriptName":"TencentSmsScript"}]}]