Commit Graph

125 Commits

Author SHA1 Message Date
yanglin
29b5d14e7b REQ-3284: 推送声音 2024-12-02 20:05:48 +08:00
yanglin
034825d0ec REQ-3284: 监控查询数量 2024-11-28 18:03:31 +08:00
yanglin
746bcf7768 REQ-3284: 推送 2024-11-19 15:43:05 +08:00
yanglin
771a1ac4e2 REQ-3284: 推送 2024-11-19 11:28:05 +08:00
yanglin
b682ff40da REQ-3045: 调整web打开方式为当前页打开 2024-10-30 11:19:40 +08:00
yanglin
fbd5a92fb0 REQ-3045: 处理迁移数据问题 2024-10-24 16:08:48 +08:00
yanglin
bd0e7ef922 REQ-3046: cms的IM跳转 2024-10-23 14:59:52 +08:00
yanglin
4e07b0091e Merge branch 'feature/REQ-3045' into dev 2024-10-16 18:16:46 +08:00
yanglin
00b9c6728c REQ-3046: backup 2024-10-16 18:16:34 +08:00
yanglin
5fdec8e389 Merge branch 'feature/REQ-3045' into dev 2024-10-11 17:56:54 +08:00
yanglin
5c78b6a3ca REQ-2752: 刷审批流程按钮 2024-10-11 17:56:47 +08:00
yanglin
a621d84713 Merge branch 'feature/REQ-3045' into dev 2024-10-11 14:51:10 +08:00
yanglin
bf10344b62 REQ-2752: a lot of staff 2024-10-11 14:50:54 +08:00
yanglin
9075739bb7 Merge branch 'feature/REQ-3045' into dev 2024-10-10 16:19:12 +08:00
yanglin
1f4ea41699 REQ-3045: 迁移老模版数据 2024-10-10 13:45:46 +08:00
jinhaiyang
2ddcb60f6f Merge branch 'hoxfix/20241010' into dev 2024-10-10 11:00:11 +08:00
jinhaiyang
63c6b1d622 add feign-httpclient 2024-10-10 10:59:39 +08:00
yanglin
e72fbd74af Merge branch 'feature/REQ-2752' into dev 2024-10-08 18:32:47 +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
97d25e45b0 Merge branch 'refs/heads/REQ-2723' 2024-09-18 19:15:35 +08:00
yanglin
5887c736a1 REQ-2699: 删除无用单位测试 2024-09-02 13:49:07 +08:00
yanglin
fd5676657e Merge branch 'refs/heads/feature/REQ-2699' into dev 2024-08-30 11:27:34 +08:00
yanglin
866608ebe4 REQ-2699: 控制最大的待办返回数量 2024-08-30 11:27:17 +08:00
yanglin
13db4222b3 Merge branch 'feature/REQ-2699' into dev 2024-08-26 11:50:57 +08:00
yanglin
b31eab149f REQ-2699: 追求workspaceType=2 2024-08-26 11:50:45 +08:00
yanglin
0858ffd8df REQ-2699: 追求workspaceType=2 2024-08-26 11:48:33 +08:00
yanglin
a1eaced14c Merge branch 'refs/heads/feature/REQ-2874' into dev 2024-08-20 17:07:29 +08:00
yanglin
53340ab36f REQ-2874: 政务-添加高新区短信渠道 2024-08-16 09:23:13 +08:00
yanglin
d56b54efb3 REQ-2723: 迁移事件中心发送消息和待办的代码 2024-07-24 16:46:00 +08:00
yanglin
024f55b43c REQ-2723: 迁移事件中心发送消息和待办的代码 2024-07-24 16:17:32 +08:00
yanglin
6d5715d6b8 REQ-2723: 迁移事件中心发送消息和待办的代码 2024-07-24 14:21:06 +08:00
yanglin
f5f47d8634 通过听云统计接口调用 2024-07-11 17:23:53 +08:00
yanglin
55588b89a3 REQ-2599: 接入arthas 2024-07-11 11:20:22 +08:00
yanglin
6a351bc0c0 Merge branch 'refs/heads/master' into feature/REQ-2453 2024-07-05 11:35:25 +08:00
yanglin
90b1664a56 fix待办push问题 2024-07-04 16:26:10 +08:00
yanglin
7b938909ed 添加兜底的JsonObject数据类型处理 2024-06-25 11:04:31 +08:00
yanglin
b6834cede9 添加兜底的JsonObject数据类型处理 2024-06-25 11:04:21 +08:00
yanglin
907aceb505 REQ-2318: 分页查询待办时, 如果没有传端就查询所有端的待办 2024-06-24 09:45:14 +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
66b356339c REQ-2481: REQ-2481: graceful shutdown 2024-06-04 18:36:18 +08:00
yanglin
0ac817d9b4 REQ-2318: 多端支持 2024-05-22 14:45:28 +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
400a4b71e6 REQ-2448: 处理枚举没有对应值的情况 2024-05-08 11:49:43 +08:00
yanglin
dea3914bb0 REQ-2448: 迁移老的消息 2024-05-08 11:07:35 +08:00
yanglin
dd8c27d87f 发送IM给管理端时, 对ouId和personId去重 2024-05-08 10:28:01 +08:00
yanglin
420a6d01f0 发送im消息时去掉执行人personId<0的限制,避免其它人发送失败 2024-05-07 18:55:10 +08:00
yanglin
8a452b8439 REQ-2405: fix bugs 2024-04-30 17:24:45 +08:00
yanglin
789b755c5c REQ-2405: almost there 2024-04-25 18:19:42 +08:00
yanglin
77fcf015e0 REQ-2405: 完成IterableMapper逻辑 2024-04-25 13:40:30 +08:00
yanglin
6cd89df8f3 REQ-2405: 通过job每天晚上刷新老消息的统计数据 2024-04-24 17:58:14 +08:00