Commit Graph

153 Commits

Author SHA1 Message Date
yanglin
40754a7bd0 Merge branch 'feature/REQ-3502' 2025-02-20 13:33:40 +08:00
yanglin
bf1b27af1f Merge branch 'feature/REQ-3541' 2025-02-20 13:33:32 +08:00
yanglin
0a5cbf0a3b REQ-3502: 告警时打印手机号 2025-01-20 09:42:05 +08:00
zhanghonghao
bd7e64fe69 feat(REQ-3488): 发送短信v2接口提供 2025-01-14 16:13:07 +08:00
zhanghonghao
9bdef3a05e feat(REQ-3488): 发送短信v2接口提供 2025-01-13 11:43:42 +08:00
yanglin
b60807fd8b REQ-3541: 添加渠道-龙泉 2025-01-08 17:16:39 +08:00
yanglin
03273617b0 Merge branch 'feature/REQ-3201' 2025-01-08 09:43:18 +08:00
yanglin
f81a5d1413 Merge branch 'master' into feature/REQ-3541 2025-01-07 18:18:07 +08:00
yanglin
2dcc3455e4 REQ-3444: 调用方控制是否截断参数 2024-12-17 17:02:53 +08:00
yanglin
ad153db418 REQ-3444: 调用方控制是否截断参数 2024-12-17 16:32:24 +08:00
yanglin
b5107667d8 REQ-3444: 调用方控制是否截断参数 2024-12-17 16:27:23 +08:00
xudawei
cb2d40170f feat:(REQ-3201) 定时任务更新模版中的appVersionChannel/监控卡片预设MQ 2024-12-17 16:26:29 +08:00
yanglin
f27881e394 REQ-3444: 调用方控制是否截断参数 2024-12-17 16:18:21 +08:00
yanglin
d276a5c6a5 REQ-3284: 推送 2024-11-27 20:27:27 +08:00
yanglin
4b4954e579 REQ-3117: 发送短信失败后进行重试 2024-11-22 14:19:59 +08:00
yanglin
9075739bb7 Merge branch 'feature/REQ-3045' into dev 2024-10-10 16:19:12 +08:00
yanglin
69222650df REQ-2752: 去掉兜底配置 2024-10-10 15:40:02 +08:00
jinhaiyang
a4b1780e6c Merge branch 'hoxfix/20241010' into dev 2024-10-10 11:39:48 +08:00
jinhaiyang
9dc6ebdcd2 modify pom 2024-10-10 11:39:33 +08:00
jinhaiyang
4acd714894 Merge branch 'hoxfix/20241010' into dev 2024-10-10 11:33:06 +08:00
yanglin
5118f25b2c hotfix: 添加缺失的依赖 2024-10-10 11:29:19 +08:00
jinhaiyang
ed6b24583d Merge branch 'hoxfix/20241010' into dev 2024-10-10 11:17:19 +08:00
jinhaiyang
b3307b1bf5 delete MybatisInterceptorAnalyzeProcessor 2024-10-10 11:17:13 +08:00
yanglin
b8dd881c68 Merge branch 'tingyun' into dev
# Conflicts:
#	inside-notices/src/main/java/cn/axzo/msg/center/message/controller/PrivateMessageController.java
2024-09-26 15:27:08 +08:00
yanglin
78f586ef65 REQ-2874: 政务-添加高新区短信渠道 2024-08-16 17:08:33 +08:00
yanglin
8a9be180a1 REQ-2874: 政务-添加高新区短信渠道 2024-08-16 17:08:22 +08:00
yanglin
92df5d2fc7 REQ-2874: 政务-添加高新区短信渠道 2024-08-16 15:18:50 +08:00
yanglin
d3225dc92d REQ-2874: 政务-添加高新区短信渠道 2024-08-16 15:16:13 +08:00
yanglin
2f5a939e55 REQ-2874: 政务-添加高新区短信渠道 2024-08-16 11:35:58 +08:00
yanglin
9ac1e9550b REQ-2874: 政务-添加高新区短信渠道 2024-08-16 11:35:32 +08:00
yanglin
cb264477e4 REQ-2874: 政务-添加高新区短信渠道 2024-08-16 10:48:43 +08:00
yanglin
ebba822bb6 REQ-2874: 政务-添加高新区短信渠道 2024-08-16 10:03:26 +08:00
yanglin
6e6c11fcbc REQ-2874: 政务-添加高新区短信渠道 2024-08-16 09:59:12 +08:00
yanglin
248a74193d REQ-2874: 政务-添加高新区短信渠道 2024-08-16 09:56:30 +08:00
yanglin
53340ab36f REQ-2874: 政务-添加高新区短信渠道 2024-08-16 09:23:13 +08:00
yanglin
f5f47d8634 通过听云统计接口调用 2024-07-11 17:23:53 +08:00
yanglin
7b938909ed 添加兜底的JsonObject数据类型处理 2024-06-25 11:04:31 +08:00
yanglin
04361a616b Merge branch 'refs/heads/master' into REQ-2318
# Conflicts:
#	inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/TodoRangeQueryService.java
#	inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/manage/TodoManager.java
#	inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/manage/broadcast/TodoBroadcaster.java
#	inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/manage/broadcast/TodoMqBroadcaster.java
#	inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/manage/broadcast/TodoPullBroadcaster.java
2024-06-24 10:46:49 +08:00
yanglin
eb661679f3 REQ-2497: 添加一些工具 2024-06-14 14:06:06 +08:00
yanglin
8e75dba05b REQ-2497: 短信报错时,打印出关键信息 2024-06-13 14:47:10 +08:00
yanglin
250d760c8c Merge branch 'refs/heads/master' into REQ-2318
# Conflicts:
#	inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/person/PersonService.java
#	inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/manage/TodoManager.java
#	msg-center-api/src/main/java/cn/axzo/msg/center/service/enums/PendingMessageStateEnum.java
#	msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/request/PendingMessagePageRequest.java
#	msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/response/PendingMessageResponse.java
2024-06-07 09:12:42 +08:00
yanglin
17fc08192f REQ-2497: 添加阿里回调 2024-06-06 15:32:06 +08:00
yanglin
79f561dfe8 Merge remote-tracking branch 'refs/remotes/origin/feature/merged_all_req'
# Conflicts:
#	inside-notices/src/main/java/cn/axzo/msg/center/message/domain/dto/MessageTemplateDTO.java
#	msg-notices/msg-notices-integration/src/main/java/cn/axzo/msg/center/notices/integration/client/impl/AliYunSmsClientImpl.java
2024-06-05 18:25:49 +08:00
yanglin
c9bfb6cb8d REQ-2481: 完善告警信息 2024-06-05 11:33:25 +08:00
yanglin
f678a6a2ad REQ-2481: 添加内部方法 2024-05-28 16:55:18 +08:00
yanglin
a8c77cfbd9 REQ-2481: 添加内部方法 2024-05-28 16:54:19 +08:00
yanglin
f9a2c4f9ec REQ-2318: 待办交接,端相关 2024-05-21 18:51:25 +08:00
yanglin
7dc22eec53 Merge branch 'refs/heads/master' into REQ-2303
# Conflicts:
#	inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/TodoRangeQueryService.java
2024-05-11 16:51:24 +08:00
yanglin
449c88037e hotfix 2024-05-11 15:22:05 +08:00
yanglin
93de73f346 Merge branch 'refs/heads/master' into REQ-2405
# Conflicts:
#	inside-notices/src/main/java/cn/axzo/msg/center/message/controller/PrivateMessageController.java
2024-05-09 09:54:14 +08:00