Commit Graph

94 Commits

Author SHA1 Message Date
yanglin
0858ffd8df REQ-2699: 追求workspaceType=2 2024-08-26 11:48:33 +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
yanglin
7f943d147f REQ-2135: 多返回一些字段, 用于排查问题 2024-03-27 14:46:56 +08:00
yanglin
3630d12b3b REQ-2135: backup 2024-03-26 17:19:31 +08:00
yanglin
92cfe07253 REQ-2135: 调整日志字段 2024-03-26 09:59:57 +08:00
yanglin
b0923fbe47 REQ-2135: 细化日志类型 2024-03-25 18:05:19 +08:00
yanglin
c608e745a1 REQ-2135: 方方面面 2024-03-22 15:42:29 +08:00
yanglin
94bb120f14 REQ-2135: backup 2024-03-20 20:48:20 +08:00
yanglin
6de6e9f261 REQ-2135: backup 2024-03-20 18:03:10 +08:00
yanglin
fea0c72259 REQ-2135: backup 2024-03-19 18:53:56 +08:00
yanglin
d1d69150c5 REQ-2135: 定义接口 2024-03-18 09:25:07 +08:00
yanglin
1261b7dadb REQ-2135: backup 2024-03-15 18:38:56 +08:00
yanglin
72e93edffe REQ-2010: 返回空集合 2024-03-07 15:06:30 +08:00
yanglin
d31d54bfbe Merge branch 'feature/REQ-2010' into feature/20240306
# Conflicts:
#	inside-notices/src/main/java/cn/axzo/msg/center/message/controller/PrivateMessageController.java
2024-03-05 20:06:56 +08:00
yanglin
04e526c6b2 REQ-2010: FeignConfig添加pre环境 2024-03-01 17:45:26 +08:00
李龙
5b0f980f74 Merge branch 'pre' into 'ou_id_migration'
# Conflicts:
#   inside-notices/src/main/java/cn/axzo/msg/center/message/controller/PrivateMessageController.java
#   start/src/test/java/cn/axzo/msg/center/message/service/PendingMessageNewServiceTest.java
2024-02-29 02:32:07 +00:00
yanglin
dba5c94b3a Merge branch 'feature/REQ-2010' into pre 2024-02-28 18:29:19 +08:00
yanglin
66ecd05071 REQ-2010: 根据手机查询用户im消息 2024-02-28 18:29:00 +08:00
yanglin
a7ee40a9d3 Merge branch 'feature/REQ-2010' into pre 2024-02-28 16:58:46 +08:00
yanglin
a35421e5ed REQ-2010: fix bug 2024-02-28 16:58:18 +08:00
yanglin
6dd6168490 Merge branch 'feature/REQ-2010' into pre 2024-02-28 16:03:51 +08:00
yanglin
f02c02c6f5 REQ-2010: 添加分析问题的字段 2024-02-28 16:03:33 +08:00
yanglin
aa4379038c Merge branch 'feature/REQ-2010' into pre 2024-02-28 15:31:00 +08:00
yanglin
6593ff6a16 REQ-2010: 不返回重复的templateCode 2024-02-28 15:30:12 +08:00
lilong
3a5cc22b24 feat: 通过bizCode查找对应的ouId 2024-02-28 14:26:48 +08:00
李龙
b6fbb976aa Revert "Merge branch 'ou_id_migration' of /Users/lilong/IdeaProjects/msg-center-plat with conflicts."
This reverts commit 1da5e022e3
2024-02-28 02:51:20 +00:00
lilong
1da5e022e3 Merge branch 'ou_id_migration' of /Users/lilong/IdeaProjects/msg-center-plat with conflicts. 2024-02-28 10:40:47 +08:00
yanglin
d470062a8e Merge branch 'feature/REQ-2010' into pre 2024-02-27 11:25:49 +08:00
李龙
37a16239d0 Merge branch 'test' into 'ou_id_migration'
# Conflicts:
#   inside-notices/pom.xml
#   inside-notices/src/main/java/cn/axzo/msg/center/message/controller/PrivateMessageController.java
#   start/src/main/resources/bootstrap.yml
#   start/src/test/java/cn/axzo/msg/center/message/service/PendingMessageNewServiceTest.java
2024-02-27 03:07:51 +00:00
yanglin
344054f4e6 Merge branch 'feature/REQ-2010' into test 2024-02-27 10:38:33 +08:00
yanglin
94fe53c1ff REQ-2010: 添加辅助方法 2024-02-27 10:38:24 +08:00
yanglin
54b3ec3fc6 Merge branch 'feature/REQ-2010' into test 2024-02-27 09:14:23 +08:00
yanglin
69c9bb7c99 REQ-2010: 处理消息未读 2024-02-27 09:14:18 +08:00