Commit Graph

136 Commits

Author SHA1 Message Date
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
yanglin
dea3914bb0 REQ-2448: 迁移老的消息 2024-05-08 11:07:35 +08:00
yanglin
0174adf960 BUG-12582: 发送短信时,如果因为黑明白的控制会跳过真实地发送短信,这时会进行钉钉通知,如果动态参数中没有传短信模版中的内容会报NPE 2024-05-07 14:21:52 +08:00
yanglin
e977cc5bbe BUG-12572: 给cm发消息时,按人做过滤 2024-05-07 11:38:01 +08:00
yanglin
3c8ba8e42e REQ-2411: 去重 2024-05-07 10:19:53 +08:00
yanglin
fab98e3f8f REQ-2411: 添加日志 2024-05-07 10:18:30 +08:00
yanglin
2de9db2e3e REQ-2411: 不限制短信验证码的重复内容发送 2024-05-07 09:32:14 +08:00
yanglin
839dd66672 REQ-2405: 添加日志 2024-04-28 17:57:30 +08:00
yanglin
985bde1a65 REQ-2405: 添加缓存兼容逻辑 2024-04-28 15:49:50 +08:00
yanglin
ed3b0e77c0 REQ-2405: 添加版本 2024-04-28 15:09:08 +08:00
yanglin
507aee4112 REQ-2411: 发送短信, 限制发送重复内容 2024-04-28 14:40:31 +08:00
yanglin
d6288bdadb Merge branch 'refs/heads/master' into REQ-2303
# Conflicts:
#	inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/config/PendingMessageBizConfig.java
2024-04-24 13:29:57 +08:00
yanglin
c911c329d4 Merge branch 'refs/heads/REQ-2141' 2024-04-23 18:08:29 +08:00
yanglin
f7be92e74f 短信流控告警降级 2024-04-23 18:08:21 +08:00
yanglin
f988245459 REQ-2303: backup 2024-04-22 18:02:44 +08:00
yanglin
0b93364c2b REQ-2212: 添加异常日志 2024-04-17 09:16:49 +08:00
yanglin
b14f157f3d REQ-2135: fix NPE 2024-04-10 23:35:09 +08:00
yanglin
c5f8a90948 REQ-2135: 更新batchSize 2024-04-10 21:16:29 +08:00