Compare commits

...

1130 Commits

Author SHA1 Message Date
Tim
3bb14ca6a3 feat: use iconpark in base tabs 2025-09-06 01:42:15 +08:00
Tim
4ed679c4f4 Merge pull request #890 from nagisa77/codex/adapt-menucomponent-and-headercomponent-for-iconpark
refactor: support iconpark in menu and header
2025-09-05 22:22:18 +08:00
Tim
50848e0da1 refactor: support iconpark in menu and header 2025-09-05 22:20:46 +08:00
tim
51819913a0 feat: user info page 2025-09-05 22:18:57 +08:00
tim
741bd115d5 feat: add few icons 2025-09-05 22:11:14 +08:00
Tim
d13ee2257f feat: 表情新增 2025-09-05 18:01:38 +08:00
Tim
06dea47bec feat: 引入iconpark并修改部分icon 2025-09-05 17:48:41 +08:00
Tim
f89a17f14d Merge pull request #887 from nagisa77/feature/lottery_ui
fix: 抽奖右上角统一文字icon颜色以及间距 #871
2025-09-05 15:33:51 +08:00
Tim
ac433d6a45 fix: 抽奖右上角统一文字icon颜色以及间距 #871 2025-09-05 15:32:53 +08:00
Tim
62e7795e11 Merge pull request #886 from nagisa77/feature/reply_ui
fix: 回复ui重新调整
2025-09-05 14:50:05 +08:00
Tim
722d784691 fix: 回复ui重新调整 2025-09-05 14:48:37 +08:00
Tim
5dab838482 Merge pull request #882 from smallclover/main
轻量级redis缓存追加
2025-09-05 11:13:50 +08:00
Tim
67636475aa Merge pull request #884 from nagisa77/codex/add-log-for-successful-redis-connection
feat: log redis connection success
2025-09-05 10:56:51 +08:00
Tim
92ae8ae155 feat: log redis connection success 2025-09-05 10:55:13 +08:00
wangshun
c0afe9e2a9 轻量级redis缓存追加
本次主要改动范围:
1.分类列表缓存
2.标签列表缓存

追加的新类库
1.redis
2.jsr310→java8时间类localdatetime无法解析的问题
3.jaskson-hibernate6->hibernate 字段懒加载问题

其他改动
1.修改了初始化脚本的用户名,追加密码说明
2025-09-04 18:11:18 +08:00
Tim
2c1bef4551 Merge pull request #881 from nagisa77/feature/fix_safari_page_size
fix: 移动端Safari帖子底部被截断 #833
2025-09-04 17:01:29 +08:00
Tim
202c0f7b59 fix: 移动端Safari帖子底部被截断 #833 2025-09-04 17:00:21 +08:00
Tim
fdd6587fff Merge pull request #880 from nagisa77/feature/md_ui
fix: markdown引用ui修改 #837
2025-09-04 16:54:32 +08:00
Tim
77ea208961 fix: markdown 引用修改 2025-09-04 16:53:30 +08:00
Tim
96e1259ad7 fix: 支持swagger访问api 2025-09-04 14:22:58 +08:00
Tim
b77b629d9e fix: 新增api前缀 2025-09-04 14:02:50 +08:00
Tim
2e2813bcbd Merge pull request #838 from zpaeng/main
feat:Websocket服务拆到单独服务,主后台保持单工通信
2025-09-04 13:53:23 +08:00
Tim
ad079e6bfd Merge pull request #878 from nagisa77/codex/fix-duplicate-message-forwarding-issue
Fix duplicate WebSocket broadcasts
2025-09-04 13:50:24 +08:00
Tim
47a72dc9b0 Fix duplicate WebSocket broadcasts 2025-09-04 13:50:05 +08:00
Tim
70a83cbe06 fix: 日志等级可配置 2025-09-04 13:01:57 +08:00
Tim
0ff6f13c86 fix: ws新增 .env 文件 2025-09-04 12:24:30 +08:00
Tim
6f30cf0bc2 Merge pull request #875 from palmcivet/docs/docker-contributing
docs: 完善开发环境的 Docker Compose 配置
2025-09-04 09:54:08 +08:00
Palm Civet
931aee4c3f docs: update CONTRIBUTING.md 2025-09-04 00:36:38 +08:00
Tim
8895405606 fix: 提交一部份修改,以方便预发部署 2025-09-03 18:02:21 +08:00
Tim
12b697d9dd Merge branch 'main' into main 2025-09-03 16:24:56 +08:00
Tim
49a55bcc36 Merge pull request #870 from palmcivet/docs/contributing
docs: 优化 contributing 文档 !869
2025-09-03 14:37:27 +08:00
Palm Civet
690aae3577 docs: 优化 contributing 文档 2025-09-03 14:14:15 +08:00
Tim
93d2c39f6e Merge pull request #867 from palmcivet/docs/openapi-springdoc
docs: backend 引入 springdoc-openapi 生成 OpenAPI 文档
2025-09-03 11:35:18 +08:00
Tim
99b824d852 Merge pull request #868 from smallclover/main
部署教程修改
2025-09-03 11:34:51 +08:00
wangshun
67fae4129f 部署教程修改
1.配图统一改为项目内图片
2.增加laragon配置
3.增加github第三方登录配置
2025-09-03 10:27:57 +08:00
Palm Civet
3739286cca chore: 修改配置 2025-09-03 00:07:53 +08:00
Palm Civet
ec76e70ad0 build: backend 引入 springdoc-openapi 2025-09-02 23:54:23 +08:00
zpaeng
f482d9ff9d fix:【站内信】 2025-09-02 23:16:27 +08:00
zpaeng
5e13b4bdd3 Merge remote-tracking branch 'origin/main' 2025-09-02 23:12:50 +08:00
zpaeng
78a65c6afe feat:Websocket服务拆到单独服务,主后台保持单工通信 2025-09-02 23:10:56 +08:00
zpaeng
84236b0174 feat:Websocket服务拆到单独服务,主后台保持单工通信 2025-09-02 23:10:29 +08:00
tim
c337195b16 fix: ui简要修改 2025-09-02 16:27:05 +08:00
Tim
c506aec506 Merge pull request #835 from smallclover/main
倒计时修改
2025-09-02 16:18:07 +08:00
夢夢の幻想郷
aa4274052e Merge branch 'nagisa77:main' into main 2025-09-02 14:47:29 +08:00
wangshun
e96ba3c26f 1.追加:投票结束查看倒计时时间
2.修改:倒计时样式
3.优化:抽奖和投票倒计时代码统一
2025-09-02 14:46:18 +08:00
tim
36758624c2 Merge branch 'main' of github.com:nagisa77/OpenIsle 2025-09-02 13:01:34 +08:00
tim
4427eff78a fix: 新增Google Search Console网域识别 2025-09-02 13:01:10 +08:00
Tim
ab85e67d69 Merge pull request #830 from nagisa77/feature/ui_fix
reaction 相关修改/timeline相关修改
2025-09-02 12:44:24 +08:00
tim
d7f6bb507d reaction 相关修改/timeline相关修改 2025-09-02 12:43:30 +08:00
Tim
bced7807ae Merge pull request #829 from nagisa77/feature/cdn_change
fix: cdn 修复
2025-09-02 12:29:47 +08:00
Tim
73bb873bfe fix: cdn 修复 2025-09-02 11:45:35 +08:00
Tim
564ebfbc2c fix: 新增map变量 2025-09-01 21:11:07 +08:00
Tim
9a42b8f32a Merge pull request #826 from nagisa77/feature/good_posts
Feature/good posts
2025-09-01 20:59:01 +08:00
Tim
513b1f45a1 Merge pull request #825 from nagisa77/codex/add-conditions-for-featured-posts
feat: show featured marker only for RSS posts
2025-09-01 20:58:39 +08:00
Tim
1b204345a6 feat: show featured icon only for RSS posts 2025-09-01 20:58:21 +08:00
Tim
d146bf2b0d fix: 新增精品icon 2025-09-01 20:53:06 +08:00
Tim
864a760b20 Merge pull request #824 from nagisa77/feature/md_line
fix: markdown渲染的分割线有点深 #767
2025-09-01 19:48:47 +08:00
Tim
2ccdc21568 fix: markdown渲染的分割线有点深 #767 2025-09-01 19:47:24 +08:00
tim
ff63d232a9 Merge branch 'main' of github.com:nagisa77/OpenIsle 2025-09-01 18:50:09 +08:00
tim
32a624e62d fix: 登录样式调整 2025-09-01 18:49:33 +08:00
Tim
5af0c9dee0 Merge pull request #822 from nagisa77/codex/fix-channel-ui-scroll-behavior
fix: scroll to bottom when entering channel
2025-09-01 18:19:17 +08:00
Tim
edaafdd000 fix: scroll channel to bottom on activation 2025-09-01 18:18:58 +08:00
Tim
24838ab714 Merge pull request #819 from sivdead/main
指定Node.js最低版本为20.0.0
2025-09-01 18:16:24 +08:00
Tim
56a80a184b Merge pull request #821 from smallclover/main
修改部署教程
2025-09-01 18:15:49 +08:00
sivdead
ed24ed174b fix: 还原package-lock.json 2025-09-01 17:56:27 +08:00
夢夢の幻想郷
3080acb6e4 Merge branch 'nagisa77:main' into main 2025-09-01 17:52:24 +08:00
wangshun
1856eb191b 修改部署教程
1.本地部署前后端时,如果是时https后端会无法解析请求
2.使用第三方登录时,callback路径需要和注册的路径一致
2025-09-01 17:50:19 +08:00
Tim
0c2a50d620 Merge pull request #820 from CH-122/feat/message-setting
feat: 增加通知设置的权限控制,只有管理员可以显示特定通知类型
2025-09-01 17:40:09 +08:00
CH-122
7562de11a5 feat: 增加通知设置的权限控制,只有管理员可以显示特定通知类型 2025-09-01 17:03:13 +08:00
sivdead
aaacf4efb1 chore(frontend): 指定Node.js最低版本为20.0.0 2025-09-01 15:53:05 +08:00
Tim
1f30cdfe85 Merge pull request #818 from nagisa77/codex/fix-backend-compilation-issue
Fix CommentServiceTest compilation by mocking PointService
2025-09-01 15:35:02 +08:00
Tim
8b37cf5abb test: mock PointService in CommentServiceTest 2025-09-01 15:34:52 +08:00
Tim
4af19a75c9 Merge pull request #815 from sivdead/main
fix: 解决删除评论后积分历史和当前积分不一致的问题
2025-09-01 14:32:01 +08:00
tim
37ea986389 fix: 域名修复 2025-09-01 14:31:05 +08:00
tim
fefd0b3b6c fix: compile problem 2025-09-01 13:18:01 +08:00
tim
a31ed29cfa Reapply "feat: unify third-party auth component"
This reverts commit 800970f078.
2025-09-01 13:16:04 +08:00
tim
2719819ad7 Revert "chore: remove obsolete login styles"
This reverts commit 18fde1052f.
2025-09-01 13:16:00 +08:00
Tim
27ff9a9c9b Merge pull request #814 from nagisa77/codex/create-unified-ui-for-third-party-login-uko0i1
feat: unify third-party auth buttons with customizable styles
2025-09-01 13:15:16 +08:00
Tim
18fde1052f chore: remove obsolete login styles 2025-09-01 13:14:55 +08:00
tim
800970f078 Revert "feat: unify third-party auth component"
This reverts commit 215616d771.
2025-09-01 13:14:13 +08:00
Tim
cbbd1440a1 Merge pull request #813 from nagisa77/codex/create-unified-ui-for-third-party-login
feat: unify third-party auth component
2025-09-01 13:13:36 +08:00
Tim
215616d771 feat: unify third-party auth component 2025-09-01 13:13:16 +08:00
tim
575e90e558 fix: telegram support 2025-09-01 13:02:13 +08:00
Tim
e63d66806d fix: tg 环境变量配置 2025-09-01 11:47:37 +08:00
Tim
1fc0118c5a Merge pull request #812 from nagisa77/codex/support-telegram-registration-and-login
feat: add Telegram authentication
2025-09-01 11:41:34 +08:00
Tim
f3512c1184 feat: add Telegram authentication 2025-09-01 11:39:10 +08:00
sivdead
28842c90b1 feat(service): 在 CommentService 中添加逻辑删除评论时重新计算用户积分的功能,并在 PointService 中实现用户积分的重新计算方法 2025-09-01 11:32:20 +08:00
Tim
d67cc326c4 Merge pull request #811 from nagisa77/codex/update-last-post-time-display
feat: show message when user has no posts
2025-09-01 11:31:09 +08:00
Tim
27c217a630 feat: show message when user has no posts 2025-09-01 11:30:56 +08:00
Tim
4e3e5f147c Merge pull request #810 from nagisa77/codex/fix-channel-ui-scroll-to-bottom
fix(frontend): scroll to bottom on channel entry
2025-09-01 11:30:40 +08:00
Tim
8767aa31d6 fix(frontend): scroll to bottom on channel entry 2025-09-01 11:30:16 +08:00
Tim
a428f472f2 Merge pull request #809 from nagisa77/codex/shorten-invitation-link
feat: shorten invite links
2025-09-01 11:26:25 +08:00
Tim
8544803e62 feat: shorten invite links 2025-09-01 11:25:32 +08:00
Tim
54874cea7a Merge pull request #808 from nagisa77/codex/add-email-notification-settings
feat: add email notification settings
2025-09-01 11:24:19 +08:00
Tim
098d82a6a0 feat: add email notification settings 2025-09-01 11:23:31 +08:00
Tim
90eee03198 Merge pull request #807 from nagisa77/codex/fix-backend-compilation-issues
test: fix PostServiceTest for new PostService deps
2025-09-01 10:54:07 +08:00
Tim
3f152906f2 test: fix PostServiceTest for new PostService deps 2025-09-01 10:53:50 +08:00
Tim
ef71d0b3d4 Merge pull request #798 from nagisa77/feature/vote
feature for vote
2025-09-01 10:28:44 +08:00
Tim
6f80d139ba fix: 投票UI优化 2025-09-01 10:27:02 +08:00
Tim
7454931fa5 Merge pull request #806 from nagisa77/codex/modify-postpoll.vue-for-single-choice-voting
feat: add join button for single polls
2025-09-01 09:54:37 +08:00
Tim
0852664a82 Merge pull request #802 from sivdead/main
feat(model): 为评论和积分历史实体添加逻辑删除功能
2025-09-01 09:54:07 +08:00
Tim
5814fb673a feat: add join button for single polls 2025-09-01 01:06:51 +08:00
Tim
4ee4266e3d Merge pull request #804 from nagisa77/codex/fix-jpasystemexception-for-pollpost
Fix poll multiple property null handling
2025-08-31 14:22:59 +08:00
Tim
6a27fbe1d7 Fix null multiple field for poll posts 2025-08-31 14:22:44 +08:00
Tim
38ff04c358 Merge pull request #803 from nagisa77/codex/add-baseswitch-component-to-voting-post
feat(poll): use BaseSwitch for multiple selection
2025-08-31 14:13:32 +08:00
Tim
fc27200ac1 feat(poll): use BaseSwitch for multiple selection 2025-08-31 14:13:18 +08:00
sivdead
b1998be425 Merge remote-tracking branch 'origin/main' 2025-08-31 14:06:18 +08:00
sivdead
72adc5b232 feat(model): 为 Comment 和 PointHistory 实体添加逻辑删除功能 2025-08-31 14:03:48 +08:00
sivdead
d24e67de5d feat(model): 为 Comment 和 PointHistory 实体添加逻辑删除功能 2025-08-31 14:03:10 +08:00
Tim
eefefac236 Merge pull request #801 from nagisa77/codex/add-multi-select-support-for-voting
feat: support multi-option polls
2025-08-31 12:13:54 +08:00
Tim
2f339fdbdb feat: enable multi-option polls 2025-08-31 12:13:41 +08:00
tim
3808becc8b fix: 多选ui 2025-08-31 11:25:34 +08:00
tim
18db4d7317 fix: toolbar 层级修改 2025-08-31 11:14:48 +08:00
Tim
52cbb71945 Merge pull request #800 from nagisa77/codex/refactor-voting-and-lottery-into-components-zk6hvx
refactor: extract poll and lottery components
2025-08-31 11:10:46 +08:00
Tim
39c34a9048 feat: add PostPoll and PostLottery components 2025-08-31 11:10:20 +08:00
tim
4baabf2224 Revert "refactor: extract poll and lottery sections"
This reverts commit 27efc493b2.
2025-08-31 11:09:22 +08:00
Tim
8023183bc6 Merge pull request #799 from nagisa77/codex/refactor-voting-and-lottery-into-components
refactor: extract poll and lottery sections
2025-08-31 11:08:05 +08:00
Tim
27efc493b2 refactor: extract poll and lottery sections 2025-08-31 11:07:49 +08:00
tim
ca6e45a711 fix: 适配夜间模式 2025-08-31 10:55:40 +08:00
tim
803ca9e103 新的通知类型适配 2025-08-31 02:06:32 +08:00
Tim
9d1e12773a Merge pull request #796 from nagisa77/codex/modify-voting-module-components
Refactor poll module and add poll notifications
2025-08-31 01:49:55 +08:00
Tim
5a09934866 refactor poll and lottery forms, add poll notifications 2025-08-31 01:49:37 +08:00
tim
db1d7981c5 fix: checked修改为false 2025-08-31 01:21:52 +08:00
tim
6e1a7c773c fix: 投票模块采用clientOnly 2025-08-31 01:19:48 +08:00
tim
ac4f1064e7 fix: 结束时只显示结果 2025-08-31 01:05:00 +08:00
Tim
4e98fd6a89 Merge pull request #795 from nagisa77/codex/add-real-data-integration-for-voting-page
feat: render poll results with real data
2025-08-31 00:14:38 +08:00
Tim
1bf92ab1ad feat: render poll results with real data 2025-08-31 00:14:12 +08:00
tim
c6ab431c87 fix: 页面适配 2025-08-31 00:04:35 +08:00
Tim
aaa25d5c2f Merge pull request #794 from nagisa77/codex/add-participant-info-to-vote-response-y233h3
feat: return poll option participants
2025-08-30 12:07:01 +08:00
Tim
569531b462 feat: add poll vote repository 2025-08-30 12:06:11 +08:00
tim
c3ae97f8ba Revert "feat: track poll votes"
This reverts commit 23582934fa.
2025-08-30 12:05:35 +08:00
Tim
a57f3e6406 Merge pull request #793 from nagisa77/codex/add-participant-info-to-vote-response
feat: expose poll option participants
2025-08-30 12:03:34 +08:00
Tim
23582934fa feat: track poll votes 2025-08-30 12:03:17 +08:00
Tim
5adee4db0e Merge pull request #792 from nagisa77/codex/add-voting-feature-to-post
feat: add poll post support
2025-08-29 23:56:41 +08:00
Tim
a2ccc95b4e feat: add poll post support 2025-08-29 23:56:03 +08:00
Tim
dc5eb5a637 Merge pull request #791 from nagisa77/codex/add-voting-post-type
feat: add poll post type
2025-08-29 22:37:12 +08:00
Tim
55dd36bd24 feat: add poll post type 2025-08-29 22:36:36 +08:00
Tim
59232f99ca Merge pull request #790 from nagisa77/feature/menu_ui
fix: UI部份美化
2025-08-29 21:03:43 +08:00
tim
f93f58b055 fix: UI部份美化 2025-08-29 21:02:23 +08:00
Tim
8ad35af199 Merge pull request #789 from nagisa77/feature/menu_ui
fix: 首页 & 全局文字优化
2025-08-29 20:39:31 +08:00
tim
d427a41f6d fix: 首页 & 全局文字优化 2025-08-29 20:38:55 +08:00
Tim
ea53bc3c83 Create CODE_OF_CONDUCT.md 2025-08-29 18:15:26 +08:00
Tim
3a39cfdb49 Update issue templates 2025-08-29 18:14:05 +08:00
Tim
3d1b8b8e6e Update issue templates 2025-08-29 18:08:47 +08:00
Tim
f0e58d1efe Create LICENSE 2025-08-29 18:07:41 +08:00
Tim
5c4aca5ab8 Merge pull request #785 from nagisa77/feature/menu_ui
fix: menu ui
2025-08-29 14:52:41 +08:00
tim
fff59e800d fix: menu ui 2025-08-29 14:51:40 +08:00
Tim
b42ed19160 Merge pull request #784 from nagisa77/feature/menu_ui
feat: MENU UI 优化
2025-08-29 14:42:47 +08:00
tim
6fd663d983 feat: MENU UI 优化 2025-08-29 14:41:29 +08:00
Tim
fd6fc11630 Merge pull request #779 from CH-122/fix/comment
更新评论项组件,添加回复用户头像和样式优化
2025-08-29 14:01:17 +08:00
CH-122
d7bfeed259 feat: 更新评论项组件,增加回复用户头像点击事件,取消使用 replace 2025-08-29 13:59:02 +08:00
Tim
c5e4da5e07 Merge pull request #781 from nagisa77/feature/daily_bugfix_0829
fix: 新增ipx依赖,新增node环境说明
2025-08-29 10:21:50 +08:00
Tim
b87932560b fix: 新增ipx依赖,新增node环境说明 2025-08-29 10:20:54 +08:00
CH-122
58ff8b177e fix: 更新评论项组件,添加回复用户头像和样式优化 2025-08-29 08:51:56 +08:00
Tim
4f6b585735 Merge pull request #776 from nagisa77/codex/add-mermaid-rendering-support
feat: add mermaid support to markdown rendering
2025-08-28 16:55:24 +08:00
Tim
ac81bccd20 feat: add mermaid support to markdown 2025-08-28 16:52:07 +08:00
Tim
351447e3d1 Merge pull request #773 from sivdead/main
解决文章和草稿长度不够的问题
2025-08-28 15:59:45 +08:00
sivdead
453d8fa68b refactor(model): 将 Post和Draft 实体的内容字段类型从 TEXT 改为 LONGTEXT 2025-08-28 15:11:14 +08:00
tim
2c5b38ee9e fix: 修复 http://localhost:3000/posts/310 内容超出的问题 2025-08-28 14:40:19 +08:00
Tim
b5fd5a3edc Update README.md 2025-08-28 10:16:12 +08:00
tim
ee717aced2 fix: 处理两处图片加载异常问题 2025-08-28 09:19:06 +08:00
Tim
9a9152593e Merge pull request #764 from nagisa77/feature/daily_bugfix_0827
fix: 简化time规则
2025-08-27 20:58:47 +08:00
Tim
856d3dd513 fix: 简化time规则 2025-08-27 20:57:20 +08:00
Tim
0e42a3335a Merge pull request #763 from nagisa77/feature/daily_bugfix_0827
fix: 新增相对时间
2025-08-27 20:48:57 +08:00
Tim
d96aae59d2 fix: 新增相对时间 2025-08-27 20:47:50 +08:00
Tim
122722d0e9 Merge pull request #762 from nagisa77/codex/fix-overlap-of-mobile-post-button
Adjust mobile post icon position and add close button to message box
2025-08-27 20:40:41 +08:00
Tim
0c2264e509 fix: adjust new post icon position and close message window 2025-08-27 20:39:46 +08:00
Tim
1e503e26f2 Merge pull request #761 from nagisa77/feature/daily_bugfix_0827
fix: 帖子可被刷积分,应新增取消赞消除积分😂 #685
2025-08-27 20:28:49 +08:00
Tim
ec0fd63e30 fix: 帖子可被刷积分,应新增取消赞消除积分😂 #685 2025-08-27 20:27:53 +08:00
Tim
dfd4c70b6e Merge pull request #760 from nagisa77/codex/fix-repeated-reaction-notifications-and-points
fix: resolve repeated reaction issues
2025-08-27 20:23:43 +08:00
Tim
d79dc8877d fix: handle reaction notification and point deduction 2025-08-27 20:23:28 +08:00
Tim
e979350d40 Merge pull request #759 from nagisa77/feature/daily_bugfix_0827
Feature/daily bugfix 0827
2025-08-27 20:21:58 +08:00
Tim
99bf80a47a Merge pull request #758 from nagisa77/codex-mv1xa5
fix: gray out unearned medals
2025-08-27 20:21:23 +08:00
Tim
bfadda1e7d fix: gray out unearned medals 2025-08-27 20:21:05 +08:00
Tim
906998a07f Merge pull request #757 from nagisa77/feature/daily_bugfix_0827
fix: 站内信 scroll问题 #749
2025-08-27 20:19:29 +08:00
Tim
02287c05be fix: 站内信 scroll问题 #749 2025-08-27 20:18:39 +08:00
Tim
56aed4603e Merge pull request #756 from nagisa77/feature/daily_bugfix_0827
fix: 站内信 scroll问题 #749
2025-08-27 20:01:34 +08:00
Tim
a1fa7b2d5b fix: 站内信 scroll问题 #749 2025-08-27 20:00:14 +08:00
Tim
083c7980c6 Merge pull request #755 from nagisa77/feature/daily_bugfix_0827
fix:  回复表情通知为空的问题 #735
2025-08-27 19:45:21 +08:00
Tim
3d51f29be7 fix: 回复表情通知为空的问题 #735 2025-08-27 19:44:27 +08:00
Tim
d243e3a9d6 Merge pull request #752 from nagisa77/feature/daily_bugfix_0827
feature: 积分趋势统计
2025-08-27 15:56:33 +08:00
Tim
2b3c60f9a7 fix: 新增积分趋势统计 2025-08-27 15:55:20 +08:00
Tim
8b948a20cd Merge pull request #751 from nagisa77/codex/add-91zeiv
feat: show 30-day point trend chart
2025-08-27 15:43:33 +08:00
Tim
5053ac213d test(points): cover trend endpoint 2025-08-27 15:42:49 +08:00
Tim
e5ec801785 Merge pull request #750 from nagisa77/feature/daily_bugfix_0827
fix: 修复贴吧表情显示问题
2025-08-27 15:27:16 +08:00
Tim
31e25232d0 fix: 修复贴吧表情显示问题 2025-08-27 15:26:23 +08:00
Tim
cdc92aeebe Merge pull request #744 from nagisa77/feature/daily_bugfix_0825_c
fix: iOS修复blur问题
2025-08-27 13:21:19 +08:00
Tim
d2c2213197 fix: iOS修复blur问题 2025-08-27 13:20:42 +08:00
Tim
c687ffed54 Merge pull request #742 from nagisa77/feature/daily_bugfix_0825_c
fix: svg 采用本地,避免加载不了
2025-08-27 12:48:42 +08:00
Tim
5bc9ff45d7 fix: svg 采用本地,避免加载不了 2025-08-27 12:47:56 +08:00
Tim
78c7681bc8 Merge pull request #734 from nagisa77/feature/daily_bugfix_0825_c
daily bugfix
2025-08-27 12:36:00 +08:00
Tim
5eb206a358 fix: use base tabs 2025-08-27 12:34:28 +08:00
Tim
18179cca22 Merge pull request #741 from nagisa77/codex/create-reusable-multi-tabs-component-kvi40j
feat: add reusable swipeable tabs component
2025-08-27 12:31:11 +08:00
Tim
2b28cb2ac1 feat: add reusable swipeable tabs component 2025-08-27 12:30:56 +08:00
Tim
610a645092 Revert "feat: create BaseTabs component"
This reverts commit 0fc1415a14.
2025-08-27 12:30:08 +08:00
Tim
504ca55cad Merge pull request #740 from nagisa77/codex/create-reusable-multi-tabs-component-d2xsuk
feat: unify tab navigation with reusable swipeable component
2025-08-27 12:26:58 +08:00
Tim
0fc1415a14 feat: create BaseTabs component 2025-08-27 12:26:35 +08:00
Tim
50a84220fe Revert "feat: add reusable multi-tabs component"
This reverts commit e8a162d859.
2025-08-27 12:25:44 +08:00
Tim
af3e049c23 Merge branch 'feature/daily_bugfix_0825_c' of github.com:nagisa77/OpenIsle into feature/daily_bugfix_0825_c 2025-08-27 12:22:55 +08:00
Tim
c33b411659 Merge pull request #739 from nagisa77/codex/create-reusable-multi-tabs-component-j58zes
feat: add reusable multi-tabs component
2025-08-27 12:22:40 +08:00
Tim
e8a162d859 feat: add reusable multi-tabs component 2025-08-27 12:22:22 +08:00
Tim
e819926cf3 fix: 取消chunks分割,避免css覆盖问题 2025-08-27 12:08:50 +08:00
Tim
013d47e8e4 fix: 前端修改:图片loading做一个适配,现在图片没加载出来会出现如下情况, 不丝滑 2025-08-27 12:07:23 +08:00
Tim
6cc76593e4 Merge pull request #737 from nagisa77/codex/abstract-nuxtimg-with-placeholder-3oo626
feat: add Nuxt image component with LQIP placeholder
2025-08-27 11:47:14 +08:00
Tim
a2a08331e2 feat: add BaseImage component with blur placeholder 2025-08-27 11:46:57 +08:00
tim
3eabafadf8 fix: UI修改,采用baseplaceholder #732 2025-08-26 23:18:07 +08:00
tim
62c1983fd5 fix: markdown 支持 video 2025-08-26 13:39:33 +08:00
tim
689b719e18 fix: use keys count 2025-08-26 13:18:20 +08:00
tim
c6eccb01b9 fix: 样式修改 2025-08-26 13:14:03 +08:00
tim
cdf7e61157 Revert "fix: use keys count"
This reverts commit d23511ecb9.
2025-08-26 13:09:20 +08:00
tim
d23511ecb9 fix: use keys count 2025-08-26 13:06:05 +08:00
Tim
c76708d2ff Merge pull request #725 from nagisa77/feature/daily_bugfix_0826
0826 daily bugfix
2025-08-26 11:22:10 +08:00
Tim
d978bd428e fix: 积分icon优化 2025-08-26 11:21:43 +08:00
Tim
e5954cfb62 Merge pull request #730 from nagisa77/codex/add-point-system-for-lottery-participation
feat: integrate points with lottery participation
2025-08-26 11:14:36 +08:00
Tim
cb614b9739 feat: integrate points with lottery participation 2025-08-26 11:14:20 +08:00
Tim
88ce6b682d fix: 抽奖ui 优化 2025-08-26 10:59:54 +08:00
Tim
e02db635c4 fix: 调整收藏样式 2025-08-26 10:52:53 +08:00
Tim
231379181a Merge pull request #729 from nagisa77/codex/add-tab-for-favorite-articles
feat: add favorites tab to user profile
2025-08-26 10:49:01 +08:00
Tim
bd9ce67d4b feat: add favorites tab to user profile 2025-08-26 10:48:38 +08:00
Tim
6527b3790e fix: add link logo, 以及跳转新窗口 2025-08-26 10:47:02 +08:00
Tim
f01e8c942a Merge remote-tracking branch 'origin/main' into feature/daily_bugfix_0826 2025-08-26 10:34:21 +08:00
Tim
1e1ae29d32 fix: reactions面板,超过三种reaction才采用省略样式 而不是三个 #724 2025-08-26 10:33:45 +08:00
Tim
d31a8bfee4 Merge pull request #726 from WoJiaoFuXiaoYun/main
fix: 修复小窗口点击站内链接,会从小窗直接跳,预期主窗口跳转 #723
2025-08-26 10:33:21 +08:00
WangHe
29a96595f7 fix: 修复小窗口点击站内链接,会从小窗直接跳,预期主窗口跳转 #723 2025-08-26 10:14:28 +08:00
Tim
2b242367d7 fix: 站内信:从红点点进去又退出来,没有消退红点,新信息也没适配 #712 2025-08-26 10:12:16 +08:00
Tim
3f0cd2bf0f Merge pull request #720 from nagisa77/feature/daily_bugfix_0825_b
Feature/daily bugfix 0825 b
2025-08-25 20:38:28 +08:00
Tim
a98a631378 Revert "feat: add message float components"
This reverts commit b0eef220a6.
2025-08-25 20:38:10 +08:00
Tim
7701d359dc fix: 允许窗口收起 2025-08-25 20:35:33 +08:00
Tim
ffd9ef8a32 fix: 新增交互 2025-08-25 19:25:06 +08:00
Tim
36cd5ab171 Merge pull request #722 from nagisa77/codex/add-floating-window-support-for-message-box-a7msu4
feat: add floating message box window
2025-08-25 17:20:30 +08:00
Tim
58d86fa065 Merge branch 'feature/daily_bugfix_0825_b' into codex/add-floating-window-support-for-message-box-a7msu4 2025-08-25 17:20:23 +08:00
Tim
df71cf901b feat: add floating message box window 2025-08-25 17:18:34 +08:00
Tim
ac3fc6702a Merge pull request #721 from nagisa77/codex/add-floating-window-support-for-message-box
feat: add floating message window
2025-08-25 17:12:37 +08:00
Tim
b0eef220a6 feat: add message float components 2025-08-25 17:12:21 +08:00
Tim
02d366e2c7 fix: 支持回复/reactions 2025-08-25 17:06:44 +08:00
Tim
6409531a64 Merge pull request #719 from nagisa77/codex/add-reply-and-reaction-support-to-messages
feat: support message replies and reactions
2025-08-25 16:45:49 +08:00
Tim
175ab79b27 feat: support message replies and reactions 2025-08-25 16:42:14 +08:00
Tim
b543953d22 Revert "feat: support floating message box"
This reverts commit cd73747164.

# Conflicts:
#	frontend_nuxt/pages/message-box/index.vue
2025-08-25 15:51:02 +08:00
Tim
b4fef68af5 Merge branch 'feature/daily_bugfix_0825_b' of github.com:nagisa77/OpenIsle into feature/daily_bugfix_0825_b 2025-08-25 15:45:19 +08:00
Tim
6c48a38212 feat: delete router 2025-08-25 15:44:14 +08:00
Tim
8a3e4d8e98 Merge pull request #718 from nagisa77/codex/add-floating-window-support
feat: add floating message window
2025-08-25 15:43:43 +08:00
Tim
cd73747164 feat: support floating message box 2025-08-25 15:42:09 +08:00
Tim
0ee58df868 Merge pull request #716 from 4twocc/fix/safari-copy
fix(frontend): 修复 Safari 浏览器下邀请链接复制问题
2025-08-25 14:01:39 +08:00
Tim
6fed8131f6 Merge pull request #717 from WoJiaoFuXiaoYun/main
feat: 编辑器支持引用站内帖子
2025-08-25 14:00:25 +08:00
Tim
d75c08396a Merge pull request #714 from nagisa77/feature/daily_bugfix_0825
Feature/daily bugfix 0825
2025-08-25 14:00:02 +08:00
Tim
3a742fbb00 fix: tabs ui格式统一 #710 2025-08-25 13:56:42 +08:00
浮小云
9c2b1f6e98 Merge branch 'nagisa77:main' into main 2025-08-25 11:40:01 +08:00
WangHe
28b33d8c44 opt: 优化仅支持文章标题搜索 2025-08-25 11:38:18 +08:00
jiahaosheng
1f99a10322 fix(frontend): 修复 Safari 浏览器下邀请链接复制问题
- 在 Safari 浏览器中,直接使用 navigator.clipboard.writeText 可能导致权限问题
- 通过在 setTimeout 中调用 clipboard API,规避了 Safari 的权限限制
2025-08-25 11:04:32 +08:00
Tim
743c3dbc72 Merge pull request #715 from nagisa77/codex/update-reactionemojimap-to-google-emoji-cdn
feat: use Google emoji CDN
2025-08-25 11:03:21 +08:00
Tim
d46a446f2b feat: use Google emoji CDN 2025-08-25 11:03:06 +08:00
Tim
75a785f612 Merge branch 'feature/daily_bugfix_0825' of github.com:nagisa77/OpenIsle into feature/daily_bugfix_0825 2025-08-25 11:02:22 +08:00
Tim
e79b75f340 fix: tabs ui格式统一 #710 2025-08-25 11:01:52 +08:00
Tim
1f6f470ab5 Merge pull request #713 from nagisa77/codex/limit-base-timeline-hover-to-messages
feat: limit BaseTimeline hover to private messages
2025-08-25 10:29:52 +08:00
Tim
583d4042f5 feat: add optional hover for BaseTimeline 2025-08-25 10:29:35 +08:00
Tim
8437c1c714 Merge pull request #709 from nagisa77/codex/add-globalpopup-for-internal-messages
feat: add message feature popup
2025-08-23 02:58:34 +08:00
Tim
2613fe6cf1 feat: introduce message popup component 2025-08-23 02:58:24 +08:00
Tim
a15d541b72 Merge pull request #699 from nagisa77/feature/daily_bugfix_0823
daily bugfix
2025-08-23 02:49:36 +08:00
Tim
8657a06f52 Merge pull request #708 from nagisa77/codex/restrict-conversation-search-to-direct-messages
Fix findOrCreateConversation to only retrieve private conversations
2025-08-23 02:46:53 +08:00
Tim
09900b34aa Restrict conversation lookup to private chats 2025-08-23 02:46:41 +08:00
Tim
4e1c3f5839 Merge pull request #707 from nagisa77/codex/fix-multiple-results-error-in-findconversationbyusers
Handle multiple conversations between users
2025-08-23 02:39:28 +08:00
Tim
d97cc7df5e Handle multiple conversations between users 2025-08-23 02:38:31 +08:00
Tim
151242f3ba Merge pull request #706 from nagisa77/codex/add-unread-message-indicators-for-channels
feat: separate channel unread notifications
2025-08-23 02:28:43 +08:00
Tim
b2783a0168 chore: remove obsolete channel unread hook 2025-08-23 02:28:06 +08:00
tim
c79bcac217 fix: member count word 2025-08-23 02:15:11 +08:00
Tim
9a06da3bc1 Merge pull request #705 from nagisa77/codex/add-notification-red-dot-for-channels-uk9sj8
feat: show channel message indicator
2025-08-23 02:11:45 +08:00
Tim
98bbc36453 feat: show channel message indicator 2025-08-23 02:11:25 +08:00
tim
4a04f4ec17 Revert "feat: show channel unread indicator"
This reverts commit cf4ca89e19.
2025-08-23 02:10:52 +08:00
Tim
77be2bfebb Merge pull request #704 from nagisa77/codex/add-notification-red-dot-for-channels
feat: show channel unread indicator
2025-08-23 02:06:01 +08:00
Tim
cf4ca89e19 feat: show channel unread indicator 2025-08-23 02:05:39 +08:00
Tim
094fc78d92 Merge pull request #703 from nagisa77/codex/add-lastmessage-support-for-channel
Add last message retrieval and display for channels
2025-08-23 02:03:16 +08:00
Tim
da3d2a6a71 Return and show last channel message 2025-08-23 02:03:00 +08:00
tim
15cba0c96e fix: 支持显示最后一条消息 2025-08-23 01:57:33 +08:00
Tim
98a79acad9 Merge pull request #702 from nagisa77/codex/add-multi-tab-support-to-message-box
feat: add channel support
2025-08-23 01:31:26 +08:00
Tim
4947978f81 feat: add channel support 2025-08-23 01:31:06 +08:00
Tim
24cc479a56 Merge pull request #700 from nagisa77/codex/create-searchpersondropdown-component
feat: add person search dropdown
2025-08-23 01:06:33 +08:00
Tim
8ee1347b17 Merge branch 'feature/daily_bugfix_0823' into codex/create-searchpersondropdown-component 2025-08-23 01:06:11 +08:00
Tim
7e95120341 feat: add person search dropdown 2025-08-23 01:05:28 +08:00
tim
2f261983ac fix: 暂无会话适配 2025-08-23 01:02:35 +08:00
tim
e8e7b9a245 feat: add search drop down 2025-08-23 00:53:32 +08:00
tim
d2bd949ac8 fix: 前端采用sockjs 2025-08-22 23:57:03 +08:00
tim
605654ec99 fix: 把原生 WS 与 SockJS 分路径,避免混淆 2025-08-22 23:52:53 +08:00
tim
88127fcf34 fix: 把原生 WS 与 SockJS 分路径,避免混淆 2025-08-22 23:51:42 +08:00
tim
0a82f0036b fix: 把原生 WS 与 SockJS 分路径,避免混淆 2025-08-22 23:46:58 +08:00
tim
3a979277e4 fix: registerStompEndpoints 里保留一次注册即可,一般写法是一次 addEndpoint("/api/ws") + .withSockJS(),并统一用 setAllowedOriginPatterns(...) 配置白名单,避免同一路径双注册引起歧义。 2025-08-22 23:35:15 +08:00
tim
1c582fbbf1 fix: WebSocketConfig:同时给 SockJS 注册设置允许的 Origin(endpoint 用 patterns,SockJS 用 exact) 2025-08-22 23:18:05 +08:00
tim
92452da19a fix: 改用 patterns,补齐 staging 域名(https) 2025-08-22 23:05:24 +08:00
tim
a2ccaae7aa fix: 改用 patterns,补齐 staging 域名(https) 2025-08-22 23:01:57 +08:00
tim
23371d4433 Revert "fix: 同源内嵌"
This reverts commit e05d65cf49.
2025-08-22 22:09:41 +08:00
tim
e05d65cf49 fix: 同源内嵌 2025-08-22 22:00:08 +08:00
WangHe
809a78fee3 feat: 编辑器支持引用站内帖子
Related #683
2025-08-22 19:27:33 +08:00
Tim
aaf9b35a45 Merge pull request #698 from nagisa77/feature/daily_bugfix_0822_b
fix: api fix
2025-08-22 17:11:55 +08:00
Tim
61c0336a78 fix: api fix 2025-08-22 16:25:22 +08:00
Tim
69c913394f Merge pull request #697 from nagisa77/feature/daily_bugfix_0822_b
fix: 修复nginx /ws拦截问题
2025-08-22 15:27:10 +08:00
Tim
0ed9ad2f2a fix: 修复nginx /ws拦截问题 2025-08-22 15:26:41 +08:00
Tim
67e912381b Merge pull request #693 from nagisa77/feature/daily_bugfix_0822_a
fix: 发送信息,携带头像
2025-08-22 13:26:39 +08:00
Tim
a6a1c72a37 fix: 发送信息,携带头像 2025-08-22 13:26:04 +08:00
Tim
d77baa8a93 Merge pull request #692 from nagisa77/feature/daily_bugfix_0822_a
fix: 移动端 ui适配
2025-08-22 13:24:01 +08:00
Tim
fce4832407 fix: 移动端 ui适配 2025-08-22 13:23:35 +08:00
Tim
91c8cc9607 Merge pull request #689 from nagisa77/feature/daily_bugfix_0822
fix: 消息页面ui重构
2025-08-22 13:12:57 +08:00
Tim
02273e018f fix: 前端ui重构完成 2025-08-22 13:11:12 +08:00
Tim
4af10ecf79 fix: 消息页面ui重构 2025-08-22 12:21:10 +08:00
Tim
d34ed3c058 Merge pull request #687 from zpaeng/main
feat:【站内信】
2025-08-22 11:26:13 +08:00
zpaeng
8372e06949 Merge remote-tracking branch 'origin/main' 2025-08-22 11:16:29 +08:00
zpaeng
a74cb0c272 fix:【站内信】 2025-08-22 11:15:45 +08:00
Tim
5388767a2f Merge pull request #686 from palmcivet/feat/style-optimize
feat: 优化部分样式和文案
2025-08-22 10:36:48 +08:00
Tim
97dda9601e Merge pull request #688 from palmcivet/chore/project-config
chore: 移除未使用的依赖 && 调整 husky 配置
2025-08-22 10:35:37 +08:00
zpaeng
cddbb602bf Merge branch 'nagisa77:main' into main 2025-08-21 23:54:21 +08:00
Palm Civet
f21ed1f062 chore: 移除未使用的依赖 && 调整 husky 配置 2025-08-21 23:50:47 +08:00
Palm Civet
c009616f74 feat: 优化部分文案和 tags 页导航栏间距 2025-08-21 23:44:11 +08:00
zpaeng
84ab87878a feat:【站内信】 2025-08-21 23:42:53 +08:00
Palm Civet
c53f91913c feat: 优化 tags 页导航栏间距 2025-08-21 23:40:31 +08:00
Palm Civet
feed97154a feat: 优化部分样式和文案 2025-08-21 23:30:33 +08:00
Tim
f69562516d Update README.md 2025-08-21 19:05:10 +08:00
Tim
0b8e550097 fix: exclude==null不列入精选 2025-08-21 17:56:27 +08:00
Tim
cf722f5707 fix: 优化首页tabs排序 2025-08-21 16:30:54 +08:00
Tim
67e54c5106 Merge pull request #682 from nagisa77/codex/fix-postservice-constructor-argument-issue
Fix PostService tests for PointService dependency
2025-08-21 16:17:05 +08:00
Tim
d3dcc98122 fix tests for PointService dependency 2025-08-21 16:16:49 +08:00
Tim
c648d4cf39 Merge pull request #681 from nagisa77/codex/add-selected-content
feat: add featured content rewards and badge
2025-08-21 16:11:18 +08:00
Tim
41a5eda311 feat: support featured medals 2025-08-21 16:10:53 +08:00
Tim
c6e0dc6a1d Merge pull request #680 from nagisa77/feature/rss_comment
feat: comment
2025-08-21 15:47:30 +08:00
Tim
92e630df22 feat: comment 2025-08-21 15:26:53 +08:00
Tim
c6b0f32b09 Merge pull request #679 from nagisa77/codex/rss
feat: enrich rss items with comments and source link
2025-08-21 14:28:57 +08:00
Tim
5f5b6f84a8 feat: add markdown comments and link to rss 2025-08-21 14:28:33 +08:00
Tim
cd57d478f2 Merge pull request #677 from nagisa77/feature/website_block
fix: 微信黑名单申诉 #676
2025-08-21 13:41:31 +08:00
Tim
da07313df8 Merge pull request #678 from nagisa77/codex/add-record-to-points-history
Add point redemption history record
2025-08-21 13:41:21 +08:00
Tim
c08ecb5e33 Record point redemption in history 2025-08-21 13:38:53 +08:00
tim
0a722c81c5 fix: 微信黑名单申诉 #676 2025-08-21 13:37:02 +08:00
Tim
15071471b2 Merge pull request #673 from nagisa77/feature/daily_bugfix_0821 2025-08-21 12:37:31 +08:00
Tim
98a9939738 Merge pull request #675 from nagisa77/codex-5yja7z 2025-08-21 12:36:37 +08:00
Tim
9554030054 refactor: add reusable switch component 2025-08-21 12:36:02 +08:00
Tim
72e9a77373 fix: ui 调整 2025-08-21 12:27:50 +08:00
Tim
ed7dcd9414 Merge pull request #674 from nagisa77/codex/add-points-history-system-with-ui
feat: add point history
2025-08-21 11:05:07 +08:00
Tim
79fe8b5997 feat: add point history 2025-08-21 11:04:22 +08:00
Tim
cfce4d7d1d fix: 全局移除process.client、process.server #669 2025-08-21 10:22:33 +08:00
Tim
b7f5d8485c fix:「站点统计」新增loading #664 2025-08-21 10:15:20 +08:00
Tim
d4677a5799 Merge pull request #670 from nagisa77/feature/daily_bugfix_0820
daily bugfix
2025-08-20 20:59:57 +08:00
Tim
99644046fc fix: 本地ui优先已读 2025-08-20 20:55:22 +08:00
Tim
22c9bd7d39 Merge pull request #672 from nagisa77/codex/fix-immediate-deletion-of-unread-message
Remove notification after marking read
2025-08-20 20:46:24 +08:00
Tim
3fc6929075 Remove unread message after marking read 2025-08-20 20:46:08 +08:00
Tim
4eed6889d6 Merge pull request #671 from nagisa77/codex/add-notification-type-for-post-deletion
feat: notify authors when admin deletes post
2025-08-20 20:21:48 +08:00
Tim
959b0f6a48 feat: notify authors when admin deletes post 2025-08-20 20:21:31 +08:00
Tim
91ffacc335 fix: 已经加载的帖子 重新进入 没有执行评论定位逻辑 #652 2025-08-20 19:43:31 +08:00
Tim
4969a759aa fix: 已关闭的帖子不需要展示订阅按钮 #651 2025-08-20 19:33:31 +08:00
Tim
81e3a80d35 Update README.md 2025-08-20 16:31:49 +08:00
Tim
d717ce03c1 feat: add CONTRIBUTING 2025-08-20 16:29:45 +08:00
Tim
66035447a8 feat: add CONTRIBUTING 2025-08-20 16:28:28 +08:00
Tim
fa1148bc4e Update README.md 2025-08-20 16:25:12 +08:00
Tim
f60f184c84 Update README.md 2025-08-20 16:24:33 +08:00
Tim
06ffb180fe Update README.md 2025-08-20 16:24:05 +08:00
Tim
1b892828f1 Update README.md 2025-08-20 16:23:22 +08:00
Tim
1aa88ab0fe Merge pull request #661 from WoJiaoFuXiaoYun/main 2025-08-20 15:51:52 +08:00
WangHe
86126699d3 fix: 修复超长文本造成ui宽度撑开
Related #602
2025-08-20 15:42:52 +08:00
Tim
a6a07b9bda Merge pull request #658 from zpaeng/main
fix:验证邮箱有歧义,修改为验证并注册
2025-08-20 14:32:31 +08:00
zpaeng
d8b3c68150 fix:验证邮箱有歧义,修改为验证并注册 2025-08-20 13:51:24 +08:00
tim
318b481c4b fix: 判断close 2025-08-19 22:43:22 +08:00
Tim
7338b891db Merge pull request #648 from nagisa77/feature/daily_bugfix_0819
Feature/daily bugfix 0819
2025-08-19 22:37:42 +08:00
tim
eb18dc8e94 feat: 添加关闭 2025-08-19 22:35:28 +08:00
Tim
aec5321f89 Merge pull request #650 from nagisa77/codex/add-option-to-close-posts-s8akgv 2025-08-19 22:20:10 +08:00
Tim
2e658f37a4 Merge pull request #649 from nagisa77/codex/add-option-to-close-posts 2025-08-19 22:19:11 +08:00
Tim
7ccb2a44e3 feat: allow closing posts 2025-08-19 22:19:05 +08:00
Tim
0fa08e2260 feat: allow closing posts 2025-08-19 22:18:53 +08:00
Tim
38a49f7414 fix: 信息展示效率低 #632 2025-08-19 21:58:02 +08:00
Tim
fb89c9fb25 fix: 弹出弹窗逻辑修改 2025-08-19 21:48:48 +08:00
Tim
e9458f5419 fix: hljs 优化导入 2025-08-19 21:24:27 +08:00
Tim
2d87c8f23d fix: 格式化问题修改 2025-08-19 21:17:13 +08:00
Tim
cb281e4030 Merge pull request #638 from nagisa77/feature/message_load_more
支持分页加载
2025-08-19 19:52:34 +08:00
Tim
9b85d77158 Merge pull request #647 from nagisa77/codex/fix-pagination-issue-in-notification-queries
Fix notification pagination after filtering disabled types
2025-08-19 19:49:03 +08:00
Tim
a3b28eafe4 Fix notification pagination after filtering disabled types 2025-08-19 19:48:41 +08:00
tim
805a8df7d3 Reapply "feat: add paginated notification endpoints"
This reverts commit e7a1e1d159.
2025-08-19 19:38:04 +08:00
tim
02be045f55 Revert "feat: add paginated notification APIs and frontend support"
This reverts commit c344b5b4ae.
2025-08-19 19:37:59 +08:00
Tim
ac3c7b7bec Merge pull request #646 from nagisa77/codex/add-pagination-support-for-messages-6ssiwm
feat: add paginated notifications and unread endpoint
2025-08-19 19:35:39 +08:00
Tim
c344b5b4ae feat: add paginated notification APIs and frontend support 2025-08-19 19:34:13 +08:00
tim
e7a1e1d159 Revert "feat: add paginated notification endpoints"
This reverts commit cc525c1c27.
2025-08-19 19:33:13 +08:00
Tim
30b56e54cf Merge pull request #645 from nagisa77/codex/add-pagination-support-for-messages-owucez
feat: add paginated notification endpoints
2025-08-19 19:27:27 +08:00
Tim
cc525c1c27 feat: add paginated notification endpoints 2025-08-19 19:27:07 +08:00
tim
3f2829cd37 Revert "feat: support paginated notifications"
This reverts commit a64fd71bbe.
2025-08-19 19:01:54 +08:00
Tim
3258a42b44 Merge pull request #644 from nagisa77/codex/add-pagination-support-for-messages
feat: paginate and load notifications per page
2025-08-19 18:46:12 +08:00
Tim
a64fd71bbe feat: support paginated notifications 2025-08-19 18:45:56 +08:00
tim
1a12bec7b1 Revert "feat: add paginated notification APIs and frontend"
This reverts commit 7dd1f1b3d0.
2025-08-19 18:26:55 +08:00
Tim
fbca19791a Merge pull request #643 from nagisa77/codex/add-pagination-support-for-message-page-ymy51v
feat: add paginated notification APIs and frontend
2025-08-19 18:25:10 +08:00
tim
10b6fdd1cb Revert "feat: add paginated notifications and unread endpoint"
This reverts commit 73168c1859.
2025-08-19 18:24:49 +08:00
Tim
7dd1f1b3d0 feat: add paginated notification APIs and frontend 2025-08-19 18:24:27 +08:00
Tim
df92ff664c Merge pull request #642 from nagisa77/codex/add-pagination-support-for-message-page-2bmo7x
feat: add paginated notifications and unread endpoint
2025-08-19 18:20:39 +08:00
Tim
73168c1859 feat: add paginated notifications and unread endpoint 2025-08-19 18:20:26 +08:00
tim
77856ff9af fix: make full page 2025-08-19 17:23:50 +08:00
tim
df49b21620 Revert "feat: add paginated notification API and frontend support"
This reverts commit df7ca77652.
2025-08-19 17:23:36 +08:00
Tim
fbe2c66955 Merge pull request #641 from nagisa77/codex/add-pagination-support-for-message-page
feat: paginate notifications and add unread filter
2025-08-19 17:08:05 +08:00
Tim
df7ca77652 feat: add paginated notification API and frontend support 2025-08-19 17:07:27 +08:00
Tim
fe84e3f2fa Merge pull request #639 from CH-122/fix/post-page-update
修复文章详情页面返回后不更新数据 & 优化 /reaction-types 接口重复调用
2025-08-19 17:02:30 +08:00
Tim
c307732696 Merge pull request #637 from zpaeng/main
fix:删帖需要给发帖者提示
2025-08-19 17:01:44 +08:00
tim
35bcd2cdc2 fix: 支持分页加载 2025-08-19 16:52:34 +08:00
CH-122
a29bf7d860 feat: 增加 useReactionTypes,优化 /reaction-types 接口重复调用 2025-08-19 16:52:33 +08:00
CH-122
27393c15f2 fix: 添加 onActivated 钩子以刷新帖子和评论 2025-08-19 16:51:22 +08:00
zpaeng
c91a787f29 Merge branch 'nagisa77:main' into main 2025-08-19 16:49:08 +08:00
zpaeng
6096712291 fix:删帖需要给发帖者提示 2025-08-19 16:45:47 +08:00
Tim
6d20addcde Merge pull request #634 from CH-122/fix/post-list-content
fix: 帖子描述与参与人员重叠
2025-08-19 15:47:21 +08:00
CH-122
d8f9fd670c fix: 帖子描述与参与人员重叠 2025-08-19 15:38:12 +08:00
Tim
5ebe739917 Merge pull request #631 from WoJiaoFuXiaoYun/main
style: 优化行内代码样式
2025-08-19 15:26:29 +08:00
WangHe
022edc866a style: 优化行内代码样式
Related #622
2025-08-19 15:03:08 +08:00
tim
b06815cc59 fix: login with google 2025-08-19 09:41:15 +08:00
Tim
f1b223a3c9 Merge pull request #627 from nagisa77/codex/fix-null-value-assignment-error
Handle nullable rssExcluded flag
2025-08-19 09:17:23 +08:00
Tim
e65273daa6 Use nullable Boolean for rssExcluded 2025-08-19 09:17:10 +08:00
tim
d3a2acb605 fix: 移动端降低gap 2025-08-18 20:21:14 +08:00
tim
bced24e47d feat: rss 动画 2025-08-18 19:59:29 +08:00
tim
425ad03e6f fix: 默认不推荐 2025-08-18 19:51:57 +08:00
Tim
4462d8f711 Merge pull request #626 from nagisa77/codex/adapt-to-rss-2.0-specification
feat: provide RSS feed with admin exclusion
2025-08-18 19:43:59 +08:00
tim
1b31977ec6 feat: rss细化 2025-08-18 19:43:34 +08:00
tim
42693cb1ff feat: add invite 2025-08-18 19:16:05 +08:00
Tim
6b500466fc feat: expose rss feed endpoint 2025-08-18 19:15:12 +08:00
Tim
c84262eb88 Merge pull request #620 from nagisa77/feature/fix_vditor_css
Feature/fix vditor css
2025-08-18 11:28:28 +08:00
Tim
fa2ffaa64a fix: viditor样式失效 #586 2025-08-18 11:27:18 +08:00
Tim
3037c856d0 fix: viditor样式失效 #586 2025-08-18 11:27:13 +08:00
Tim
7b1ce3f070 Merge pull request #619 from nagisa77/feature/remove-router-link
fix: router-link
2025-08-18 11:17:14 +08:00
Tim
f4a15b3448 fix: router-link 2025-08-18 11:14:28 +08:00
Tim
239f1f8c84 Merge pull request #617 from CH-122/fix/mobile-invite-ui
fix: 优化邀请链接组件样式,增加文本换行支持;调整积分商城页面内边距
2025-08-18 10:55:40 +08:00
CH-122
ac303184c4 fix: 优化邀请链接组件样式,增加文本换行支持;调整积分商城页面内边距 2025-08-18 10:32:55 +08:00
Tim
7f16bbdb94 Merge pull request #607 from nagisa77/feature/coin_store
支持积分商城 & 邀请码
2025-08-18 02:20:59 +08:00
tim
f1c83b0f68 fix: 更新提示 2025-08-18 02:19:43 +08:00
tim
22c2b1564d feat: ui 优化+弹窗 2025-08-18 02:18:04 +08:00
tim
628d28c12d feat: 注册流程重构 2025-08-18 02:06:48 +08:00
Tim
2577992ee3 Merge pull request #613 from nagisa77/codex/implement-invitation-link-functionality
feat: add invite link generation and copy
2025-08-18 01:24:05 +08:00
Tim
5b837c9d7f feat: add invite link generation and copy 2025-08-18 01:23:33 +08:00
tim
017ad5bf54 feat: invite ui 2025-08-18 01:15:46 +08:00
Tim
f076b70e9b Merge pull request #612 from nagisa77/codex/add-invitejwt-for-generating-invitation-tokens
feat: add invite token support
2025-08-18 01:11:33 +08:00
Tim
62d12ad2a7 feat: track oauth new-user result 2025-08-18 01:11:16 +08:00
tim
923854bbc6 feat: 适配透传invite_code 2025-08-17 21:56:14 +08:00
tim
9ca5d7b167 feat: 各种登录方式传入invite_token 2025-08-17 12:45:58 +08:00
tim
9c3e1d17f0 Merge remote-tracking branch 'origin/main' into feature/coin_store 2025-08-17 12:09:26 +08:00
tim
7906062945 fix: 添加缺失route 2025-08-17 12:08:18 +08:00
tim
785c36d339 feat: 新增邀请页面ui 2025-08-17 11:51:16 +08:00
Tim
197cbca99c Merge pull request #609 from nagisa77/codex/add-invitation-code-points-event-3vhg3b
Add invite points activity
2025-08-17 11:38:34 +08:00
Tim
b1076d7256 Add invite points activity 2025-08-17 11:38:09 +08:00
tim
ce94cd7e73 feat: 积分禁止删除 2025-08-17 02:31:23 +08:00
Tim
90147d6cd9 Merge pull request #606 from nagisa77/codex/add-new-notification-type-for-points-exchange
feat: add point redeem notification type
2025-08-17 02:27:33 +08:00
Tim
2c187cf2cd feat: add point redeem notification 2025-08-17 02:27:19 +08:00
tim
0b6d4f9709 feat: 积分页面不足展示 2025-08-17 02:19:21 +08:00
Tim
cf3b6d8fc7 Merge pull request #605 from nagisa77/codex/update-points-mall-functionality
feat: add point mall redemption
2025-08-17 02:07:02 +08:00
Tim
8d98c876d2 feat: add point mall redemption 2025-08-17 02:06:47 +08:00
tim
df4df1933a feat: 积分页面ui 2025-08-17 01:57:42 +08:00
Tim
7507f1bb03 Merge pull request #604 from nagisa77/codex/add-hni7s1
feat: add point rules and products to points mall
2025-08-17 01:32:59 +08:00
Tim
9b4c36c76a feat: add point rules and products 2025-08-17 01:32:26 +08:00
Tim
edfc81aeb0 Merge pull request #603 from nagisa77/codex/add
feat: add point mall module
2025-08-17 01:24:06 +08:00
Tim
7bd1225b27 feat: add point mall module 2025-08-17 01:23:47 +08:00
Tim
2dd56e27af Merge pull request #599 from nagisa77/feature/daily_bugfix_0816
Feature/daily bugfix 0816
2025-08-17 01:13:39 +08:00
tim
c3ecef3609 feat: tooltip修改 2025-08-17 01:06:21 +08:00
Tim
efc74d0f77 Merge pull request #601 from nagisa77/codex/save-user-tab-selection-in-localstorage-4dcpd4
feat: remember home tab selection
2025-08-16 18:13:49 +08:00
Tim
f27cb5c703 feat: remember home tab selection 2025-08-16 18:13:37 +08:00
tim
a756c2fab3 feat: add 毛玻璃效果 + 开关 2025-08-16 18:11:56 +08:00
Tim
4e2171a8a6 Merge pull request #600 from nagisa77/codex/add-switch-for-frosted-glass-effect
Add frosted glass effect toggle
2025-08-16 17:58:01 +08:00
Tim
bcbdff8768 feat: initialize frosted glass setting 2025-08-16 17:57:42 +08:00
Tim
b976a1f46f Merge pull request #598 from nagisa77/codex/add-sub-tabs-to-personal-homepage-timeline
feat: add timeline filters on profile page
2025-08-16 16:21:57 +08:00
Tim
b9fd9711de feat: add timeline filters on profile page 2025-08-16 16:21:45 +08:00
tim
642a527dcf Revert "feat: persist home tab selection"
This reverts commit 2c5462cd97.
2025-08-16 16:20:52 +08:00
Tim
88afcc5a8e Merge pull request #597 from nagisa77/codex/save-user-tab-selection-in-localstorage-9dskt8
feat: persist home tab selection
2025-08-16 16:19:58 +08:00
Tim
2c5462cd97 feat: persist home tab selection 2025-08-16 16:19:44 +08:00
tim
2f29946b11 Revert "feat: remember selected tab"
This reverts commit 2322b2da15.
2025-08-16 16:19:23 +08:00
Tim
e27aa34cfd Merge pull request #596 from nagisa77/codex/save-user-tab-selection-in-localstorage
feat: persist home tab selection
2025-08-16 16:10:49 +08:00
Tim
2322b2da15 feat: remember selected tab 2025-08-16 16:10:37 +08:00
tim
79261054f9 feat: ci & cd 2025-08-16 15:24:32 +08:00
tim
86633e1f21 feat: ci & cd 2025-08-16 15:23:54 +08:00
tim
784598a6f0 feat: ci & cd 2025-08-16 15:23:05 +08:00
tim
fdad0e5d34 feat: cd & cd 2025-08-16 15:21:53 +08:00
tim
ebf63c4072 feat: test commit 2025-08-16 15:20:46 +08:00
tim
354d6bdaf9 Merge branch 'main' of github.com:nagisa77/OpenIsle 2025-08-16 15:19:21 +08:00
tim
d9aebdebdc feat: 预发环境 2025-08-16 15:19:10 +08:00
Tim
d6f6495b35 Merge pull request #595 from AnNingUI/main
fix: 修复我的信息界面中的header无法粘性布局的bug以及解决了一些-webkit样式警告
2025-08-16 15:02:48 +08:00
AnNingUI
300f8705ef fix: 修复我的信息界面中的header无法粘性布局的bug以及解决了一些-webkit样式警告
fixed: #588
2025-08-16 13:49:24 +08:00
tim
1f74a29dce fix: 修复header 显示异常 2025-08-16 11:34:03 +08:00
Tim
27ef792b11 Merge pull request #594 from immortal521/feat/user-menu-animation
feat: add transition effects for page and dropdown
2025-08-16 11:25:45 +08:00
Tim
8dd2d59617 Merge pull request #593 from immortal521/fix/mobile-theme-toggle-position
fix: incorrect animation start position on mobile theme toggle
2025-08-16 11:25:06 +08:00
Tim
077ba448d7 Merge pull request #592 from immortal521/fix/unlogin-cant-change-theme
fix: allow theme toggle without requiring user login
2025-08-16 11:22:36 +08:00
immortal521
9ce85f2769 fix: fix incorrect animation start position on mobile theme toggle
- Unified coordinate handling for mouse and touch events to ensure the
animation start point accurately follows the finger position on mobile
devices.
2025-08-16 01:45:57 +08:00
immortal521
f5557cbf08 feat: add transition effects for page and dropdown
- Add page transition CSS with opacity and blur effects

- Wrap dropdown in Transition component with slide effect

- Configure Nuxt pageTransition in config
2025-08-16 01:22:56 +08:00
immortal521
e042c499e1 fix: allow theme toggle without requiring user login 2025-08-16 01:11:30 +08:00
tim
e01afb168c Merge branch 'main' of github.com:nagisa77/OpenIsle 2025-08-16 01:11:14 +08:00
tim
c1d81eb1d1 fix: update staging base url 2025-08-16 01:11:02 +08:00
Tim
2b0b429866 Merge pull request #589 from AnNingUI/main
fix: 添加对非startViewTransition支持的浏览器添加一个回退的主题切换动画
2025-08-16 00:34:08 +08:00
AnNingUI
8ea85d78ee fix: 解决menu-background-color变量被firefox的userChrome.css覆盖问题 2025-08-15 22:54:49 +08:00
AnNingUI
3b506fe8a8 Merge branch 'main' of github.com:AnNingUI/OpenIsle 2025-08-15 22:25:40 +08:00
AnNingUI
3cc7a4c01a fix: 添加对非startViewTransition支持的浏览器添加一个回退的主题切换动画
fixes: #583
2025-08-15 22:25:02 +08:00
tim
2e749a5672 fix: update 后端端口 2025-08-15 18:16:10 +08:00
tim
7d553d7750 fix: add staging example file 2025-08-15 17:50:20 +08:00
Tim
16105cef54 Merge pull request #584 from CH-122/fix/mobile-theme-mode
fix: 手机状态栏暗黑模式背景颜色显示不正确
2025-08-15 15:48:09 +08:00
CH-122
2b824d94f2 fix: 更新新增帖子图标类名并调整样式作用域 2025-08-15 15:47:24 +08:00
CH-122
00d3c563e2 feat: 移动端 header 中添加主题切换图标, 菜单中隐藏 2025-08-15 15:36:25 +08:00
CH-122
b26891261c fix: 适配 ios safari 浏览器暗黑模式 2025-08-15 15:23:49 +08:00
CH-122
c1d19b854b fix: 手机状态栏暗黑模式背景颜色显示不正确 2025-08-15 14:52:30 +08:00
Tim
72e7ccf262 Merge pull request #581 from immortal521/feat/theme-toggle-transition
feat: implement theme transition animations and dark mode improvements
2025-08-15 13:27:44 +08:00
tim
84ca6fd28c feat: add refresh home 2025-08-15 13:24:00 +08:00
immortal521
d1c148c5c4 Merge branch 'main' into feat/theme-toggle-transition 2025-08-15 13:20:37 +08:00
immortal521
ef58630dae feat: implement theme transition animations and dark mode improvements
- Add view transition API for theme switching

- Update cycleTheme to handle animation circle

- Refactor CSS with consistent quoting and indentation

- Improve theme variable handling and no-op optimizations

- Pass event to cycleTheme in MenuComponent
2025-08-15 13:12:27 +08:00
Tim
f025e82e7c Merge pull request #580 from nagisa77/codex/resolve-chunk-size-warning-issue
chore: split large vite chunks
2025-08-15 13:11:00 +08:00
Tim
4380a988f7 chore: split large vite chunks 2025-08-15 13:10:47 +08:00
tim
2899f7af48 Merge branch 'main' of github.com:nagisa77/OpenIsle 2025-08-15 13:04:48 +08:00
tim
d4b05256a3 fix: update package-lock 2025-08-15 13:03:43 +08:00
Tim
57a26e375d Merge pull request #579 from palmcivet/docs/update-readme
feat: 更新 README “开发”章节
2025-08-15 12:57:05 +08:00
Palm Civet
8a202c4fba feat: 更新 README 2025-08-15 12:39:51 +08:00
Tim
089b2a3f5f Merge pull request #578 from AnNingUI/main
feat: Add Messages Update
2025-08-15 12:26:40 +08:00
AnNingUI
0b3d7a21d5 fix: 迁移markAllRead函数 2025-08-15 11:59:29 +08:00
AnNingUI
fe8a705a28 Merge branch 'main' of github.com:AnNingUI/OpenIsle 2025-08-15 11:44:19 +08:00
AnNingUI
974c7ba83e feat: Add Message Update 2025-08-15 11:42:39 +08:00
Tim
f2937d735d Merge pull request #576 from nagisa77/feature/ui_fix_v0
fix: 移动端才显示
2025-08-15 11:40:21 +08:00
Tim
423248c574 fix: 移动端才显示 2025-08-15 11:39:47 +08:00
Tim
5126cfda8c Merge pull request #575 from nagisa77/feature/ui_fix_v0
fix: 仅仅在主页显示
2025-08-15 11:38:07 +08:00
Tim
e009875797 fix: 仅仅在主页显示 2025-08-15 11:37:30 +08:00
Tim
04ff17f796 Merge pull request #574 from nagisa77/feature/ui_fix_v0
fix: ui fix
2025-08-15 11:25:45 +08:00
Tim
e9c9fbd742 fix: ui fix 2025-08-15 11:24:01 +08:00
Tim
b385945c2d Merge pull request #572 from CH-122/refactor/ui
refactor: 在 header 组件中添加发帖功能,移动端添加发帖悬浮按钮,优化首页搜索标题样式 ,
2025-08-15 11:16:31 +08:00
CH-122
24cbed2eda feat: 移动端添加发帖悬浮按钮 2025-08-15 10:59:29 +08:00
CH-122
ba073b71a6 feat: 在头部组件和菜单组件中添加发帖功能,并优化首页搜索标题样式 2025-08-15 10:37:51 +08:00
CH-122
5ff098ea21 feat: 添加 Tooltip 组件 2025-08-15 10:31:53 +08:00
Tim
f6713b956e Merge pull request #569 from immortal521/fix/564-theme-toggle-btn-position 2025-08-15 09:27:55 +08:00
Tim
b8ea12646f Merge pull request #568 from immortal521/fix/about-page-link-color-#566 2025-08-15 09:27:14 +08:00
immortal521
e573e54c2b fix: correct theme toggle button position (#564) 2025-08-15 03:00:57 +08:00
immortal521
8ec005d392 fix(about): fix link color issue on about page (#566)
Questions:
- Why are markdown styles split into `about-content` and
`info-content-text`?
- Why is `about-content` defined both globally and inside the Vue
component?
2025-08-15 02:42:04 +08:00
tim
b1f92f61a6 Merge branch 'main' of github.com:nagisa77/OpenIsle 2025-08-15 01:37:01 +08:00
tim
824b4dd8aa feat: ui update 2025-08-15 01:36:50 +08:00
Tim
6b08db7e58 Merge pull request #565 from nagisa77/feature/daily_bugfix_0814
fix: revert vditor change
2025-08-15 00:51:09 +08:00
tim
6f3830b3f7 fix: revert vditor change 2025-08-15 00:50:44 +08:00
Tim
d70dad723f Merge pull request #563 from nagisa77/feature/daily_bugfix_0814
若干问题修复,见评论
2025-08-15 00:31:46 +08:00
tim
2cf89e4802 fix: ssr 水合采用useAsyncData 2025-08-15 00:12:06 +08:00
tim
1fc6460ae0 fix: 修复vditor移动端贴顶的问题 2025-08-15 00:01:18 +08:00
Tim
a04e5c2f6f Merge pull request #560 from CH-122/feat/password-recovery-hint
feat: 忘记密码页面添加提示 & 修复缺少定义导致的报错 #535
2025-08-14 23:43:26 +08:00
Tim
77b26937f5 Merge pull request #562 from CH-122/fix/mobile-header-search
fix: 移动端 header 点击搜索图标功能异常
2025-08-14 23:39:19 +08:00
Tim
a1134b9d4b Merge pull request #559 from AnNingUI/main 2025-08-14 21:42:32 +08:00
AnNingUI
600f6ac1d1 fix: 修复代码高亮背景与抽奖背景色公用的问题 2025-08-14 21:39:39 +08:00
CH_122
9ad50b35c9 fix: 移动端 header 点击搜索图标功能异常 2025-08-14 21:35:57 +08:00
CH_122
867ee3907b feat: 忘记密码添加提示 & 修复缺少定义导致的报错 2025-08-14 21:21:34 +08:00
CH_122
58fcd42745 style: add cursor pointer to dropdown items for better UX 2025-08-14 21:20:23 +08:00
AnNingUI
0ee62a3a04 fix: 让代码展示背景的样式更加现代化,修复分类选择框仅有一个当前分类的问题
Fixes #558
2025-08-14 21:05:08 +08:00
Tim
f0bc7a22a0 fix: google login 问题修复 2025-08-14 20:34:21 +08:00
Tim
f6c0c8e226 Merge branch 'main' of github.com:nagisa77/OpenIsle 2025-08-14 20:25:33 +08:00
Tim
8f3c0d6710 fix: google login 问题修复 2025-08-14 20:25:09 +08:00
Tim
4f738778db Merge pull request #557 from nagisa77/feature/code_buauty
fix: 代码风格设置
2025-08-14 20:17:23 +08:00
Tim
84b45f785d fix: 代码风格设置 2025-08-14 19:55:53 +08:00
tim
df56d7e885 Revert "optimize(backend): optimize /api/posts/latest-reply"
This reverts commit 1e87e9252d.
2025-08-14 18:54:12 +08:00
tim
76176e135c Merge branch 'main' of github.com:nagisa77/OpenIsle 2025-08-14 18:27:25 +08:00
tim
ab87e0e51c fix: fix missing setup 2025-08-14 18:27:12 +08:00
Tim
5346a063bf Merge pull request #555 from netcaty/main
优化主页列表接口/api/posts/latest-reply
2025-08-14 18:19:19 +08:00
netcaty
e53f2130b8 Merge branch 'nagisa77:main' into main 2025-08-14 17:54:08 +08:00
netcat
1e87e9252d optimize(backend): optimize /api/posts/latest-reply
resolves #554
2025-08-14 17:53:01 +08:00
tim
3fc4d29dce Merge branch 'main' of github.com:nagisa77/OpenIsle 2025-08-14 17:27:42 +08:00
tim
bcdac9d9b2 fix: delete hook update 2025-08-14 17:27:30 +08:00
Tim
ea9710d16f Merge pull request #553 from nagisa77/codex/fix-missing-comment-pinning-feature
fix: restore comment pin handling
2025-08-14 17:21:26 +08:00
Tim
47134cadc2 fix: handle pinned comments from backend 2025-08-14 17:21:08 +08:00
tim
1a1b20b9cf fix: update css import 2025-08-14 17:20:02 +08:00
Tim
b63ebb8fae Merge pull request #552 from immortal521/feat/code-block-line-number
feat: add code block line number display
2025-08-14 16:47:46 +08:00
immortal521
e0f7299a86 feat: add code block line number display
- Added Maple Mono font
- Changed code block font to Maple Mono
- Increased mobile line height from 1.1 to 1.5
2025-08-14 15:40:14 +08:00
Tim
1f9ae8d057 Merge pull request #550 from nagisa77/feature/fix_db_error
fix: fix reward db error
2025-08-14 15:21:31 +08:00
Tim
da1ad73cf6 fix: fix reward db error 2025-08-14 15:19:21 +08:00
Tim
53c603f33a Merge pull request #546 from netcaty/main
optimize(backend): batch query for /api/categories && /api/tags
2025-08-14 14:30:14 +08:00
Tim
06f86f2b21 Merge pull request #545 from nagisa77/feature/first_screen
Feature/first screen
2025-08-14 14:26:17 +08:00
Tim
22693bfdd9 fix: 首屏ssr优化 2025-08-14 14:25:38 +08:00
netcat
0058f20b1e optimize(backend): batch query for /api/categories && /api/tags 2025-08-14 14:19:04 +08:00
Tim
304d941d68 Revert "fix: use home path"
This reverts commit 2efe4e733a.
2025-08-14 13:50:58 +08:00
Tim
3dbcd2ac4d Merge pull request #543 from nagisa77/feature/first_screen
fix: use home path
2025-08-14 13:46:48 +08:00
Tim
2efe4e733a fix: use home path 2025-08-14 13:45:29 +08:00
Tim
08239a16b8 Merge pull request #542 from nagisa77/feature/first_screen
fix: 首屏ssr优化
2025-08-14 13:40:07 +08:00
Tim
cb49dc9b73 fix: 首屏ssr优化 2025-08-14 13:39:25 +08:00
Tim
43d4c9be43 Merge pull request #541 from nagisa77/feature/first_screen
fix: 首屏ssr优化
2025-08-14 13:24:17 +08:00
Tim
1dc13698ad fix: 首屏ssr优化 2025-08-14 13:22:53 +08:00
Tim
d58432dcd9 Merge pull request #540 from nagisa77/codex/fix-logo-click-triggering-window.reload 2025-08-14 12:47:43 +08:00
Tim
e7ff73c7f9 fix: prevent header logo from triggering page reload 2025-08-14 12:47:26 +08:00
Tim
4ee9532d5f Merge pull request #539 from nagisa77/codex/fix-logo-click-reload-issue 2025-08-14 12:38:11 +08:00
Tim
80c3fd8ea2 fix: prevent homepage reload on logo click 2025-08-14 12:37:54 +08:00
Tim
7e277d06d5 Merge pull request #538 from nagisa77/feature/first_screen
fix: 首屏幕ssr优化
2025-08-14 12:29:58 +08:00
Tim
d2b68119bd fix: 首屏幕ssr优化 2025-08-14 12:29:08 +08:00
Tim
f7b0d7edd5 Merge pull request #537 from nagisa77/feature/first_screen
fix: 首屏幕ssr优化
2025-08-14 11:56:26 +08:00
Tim
cdea1ab911 fix: 首屏幕ssr优化 2025-08-14 11:55:39 +08:00
Tim
ada6bfb5cf Merge pull request #536 from nagisa77/codex/add-logo-click-to-refresh-homepage
feat: refresh home when clicking header logo
2025-08-14 11:00:37 +08:00
Tim
928dbd73b5 feat: allow logo to refresh home page 2025-08-14 11:00:17 +08:00
Tim
8c1a7afc6e Merge pull request #530 from nagisa77/feature/env
fix: 前后端代码域名hardcode调整(for预发环境做准备)
2025-08-14 10:38:49 +08:00
Tim
87453f7198 fix: add .env.example 2025-08-14 10:36:02 +08:00
Tim
48e3593ef9 Merge remote-tracking branch 'origin/main' into feature/env 2025-08-14 10:34:10 +08:00
Tim
655e8f2a65 fix: setup 迁移完成 v1 2025-08-14 10:27:01 +08:00
Tim
7a0afedc7c Merge pull request #533 from CH-122/feat/link 2025-08-13 18:12:34 +08:00
Tim
902fce5174 fix: setup 迁移完成 2025-08-13 17:59:38 +08:00
Tim
0034839e8d fix: 迁移部分页面为setup 2025-08-13 17:49:51 +08:00
CH-122
148fd36fd1 Merge branch 'main' into feat/link 2025-08-13 17:48:23 +08:00
Tim
06cd663eaf Merge pull request #532 from nagisa77/codex/add-comment-pinning-feature
feat: support comment pinning
2025-08-13 16:31:12 +08:00
Tim
0edbeabac2 feat: allow post authors to pin comments 2025-08-13 16:30:48 +08:00
Tim
65cc3ee58b Merge pull request #531 from nagisa77/codex/add-post-lottery-notification-to-author 2025-08-13 16:20:09 +08:00
Tim
6965fcfb7f feat: notify lottery author 2025-08-13 16:19:53 +08:00
Tim
40520c30ec Merge pull request #529 from nagisa77/codex/refactor-to-use-environment-variables
feat: move API and OAuth IDs to runtime config
2025-08-13 16:01:07 +08:00
Tim
5d7ca3d29a feat: use runtime config for API and OAuth client IDs 2025-08-13 16:00:26 +08:00
Tim
a3aec1133b Merge pull request #528 from nagisa77/codex/add-new-prize-notification-type
feat: add lottery win notification
2025-08-13 15:58:33 +08:00
Tim
8fa715477b feat: add lottery win notification 2025-08-13 15:57:59 +08:00
CH-122
9209ebea4c feat: 添加链接插件以支持外部链接在新窗口打开 2025-08-13 15:40:40 +08:00
Tim
47a9ce5843 fix: 后端取消网址hardcode 2025-08-13 14:02:32 +08:00
Tim
dfef13e2be Merge pull request #520 from AnNingUI/main
fix: 清理掉了大部分warn,优化了在移动端侧边栏的逻辑问题
2025-08-12 21:45:46 +08:00
AnNingUI
2f4d6e68da fix: 用传递menuBtn的ref代替手动查询dom的方式 2025-08-12 21:26:24 +08:00
AnNingUI
414872f61e fix: 解决tag与类别切换需要reload整个页面的bug 2025-08-12 20:42:31 +08:00
AnNingUI
82475f71db fix: 清理掉了所有warn,优化了在移动端侧边栏的逻辑问题 2025-08-12 20:36:00 +08:00
Tim
a6874e9be3 Merge pull request #512 from nagisa77/feature/message_control
feat: message control
2025-08-12 17:45:17 +08:00
Tim
720031770d Merge branch 'main' into feature/message_control 2025-08-12 17:43:36 +08:00
Tim
eb7a25434f fix: global popup 2025-08-12 17:34:13 +08:00
Tim
bda4b24cf0 Revert "Disable post viewed and user activity notifications by default"
This reverts commit aea4f59af7.
2025-08-12 17:31:01 +08:00
Tim
4dedb70d54 Merge pull request #519 from nagisa77/codex/enable-user-notification-filtering
Disable post-viewed and user-activity notifications by default
2025-08-12 17:18:15 +08:00
Tim
aea4f59af7 Disable post viewed and user activity notifications by default 2025-08-12 17:16:42 +08:00
Tim
84ed778dc0 Merge pull request #518 from nagisa77/codex/add-notification-settings-pop-up
feat: add notification settings popup
2025-08-12 16:41:13 +08:00
Tim
6ca1862034 feat: allow navigating to notification settings 2025-08-12 16:29:04 +08:00
Tim
b3ea41ad1e Merge pull request #513 from AnNingUI/main
fix: 统一使用绝对路径别名“~”并加入jsconfig方便编辑器跳转
2025-08-12 15:19:34 +08:00
Tim
210d3dfa6f fix: add type 2025-08-12 15:01:03 +08:00
AnNingUI
80ecb1620d fix: 统一使用绝对路径别名“~”并加入jsconfig方便编辑器跳转
Fixes #510
2025-08-12 14:45:55 +08:00
Tim
b094f2f287 Merge pull request #511 from nagisa77/codex/support-disabling-message-notification-types
feat: support notification type preferences
2025-08-12 14:29:30 +08:00
Tim
02076e24e5 feat: allow updating notification prefs 2025-08-12 14:28:34 +08:00
Tim
d195d2f624 fix: basic ui 2025-08-12 14:07:57 +08:00
Tim
8b12402e89 fix: 右上角头像有显示问题, 点击后恢复 #508 2025-08-12 12:46:01 +08:00
Tim
d72709ca4d Merge pull request #507 from nagisa77/feature/stats
fix: stat problems
2025-08-12 10:21:08 +08:00
Tim
9878c12e33 fix: stat problems 2025-08-12 10:19:40 +08:00
Tim
84c1833923 Merge pull request #506 from nagisa77/codex/add-three-new-reports 2025-08-12 09:31:42 +08:00
Tim
08a2678bd5 feat: add stat service 2025-08-12 09:31:27 +08:00
Tim
ae46cbf216 Merge pull request #505 from nagisa77/codex/adapt-mobile-menu-for-click-outside 2025-08-12 09:27:11 +08:00
Tim
5fee90dfae feat: close mobile menu on outside tap 2025-08-12 09:25:41 +08:00
Tim
5a5d5add23 Merge pull request #503 from nagisa77/feature/nuxt_opt_v2
fix: 前端水合前ui优化. 可以考虑评论框不出
2025-08-12 01:30:20 +08:00
tim
cf4c427335 Merge branch 'feature/nuxt_opt_v2' of github.com:nagisa77/OpenIsle into feature/nuxt_opt_v2 2025-08-12 01:30:02 +08:00
tim
85fb1b8a27 fix: search button issue 2025-08-12 01:29:50 +08:00
Tim
72282b1a2f Merge pull request #504 from nagisa77/codex/return-dto-in-activitycontroller-list-method
Use DTO for activity list
2025-08-12 01:22:40 +08:00
Tim
499488c22a Use DTO for activity list 2025-08-12 01:22:26 +08:00
tim
e2d812246a fix: 移动端勋章展示有点异常 #485 2025-08-12 01:21:39 +08:00
tim
c7d99885dc fix: 30DAYS 2025-08-12 01:17:03 +08:00
tim
f977f96407 fix: 抽奖ui优化 #494 2025-08-12 01:07:50 +08:00
tim
fb7d134b27 fix: SSR 迁移后 pwa 图标显示问题 #499 2025-08-12 00:37:33 +08:00
tim
98d85a0573 fix: 前端水合前ui优化. 可以考虑评论框不出 2025-08-12 00:20:07 +08:00
Tim
6c2a7f7957 Merge pull request #498 from nagisa77/codex/add-badge-for-first-1000-users
feat: add pioneer medal for first 1000 users
2025-08-11 20:17:26 +08:00
Tim
2ebccb40f5 feat: add pioneer medal dto 2025-08-11 20:15:49 +08:00
Tim
6342b8f3a6 Merge pull request #497 from nagisa77/codex/add-title-and-metadata-for-seo
feat: enhance SEO titles and descriptions
2025-08-11 19:02:49 +08:00
Tim
20585201dd feat: add SSR titles and metadata 2025-08-11 19:02:35 +08:00
Tim
1c4df40f12 fix: 全局格式化 2025-08-11 18:16:13 +08:00
Tim
31cff70f63 fix: test commit 2025-08-11 18:12:18 +08:00
Tim
678626a3d7 Merge pull request #495 from nagisa77/codex/add-gift-icon-for-lottery-posts
feat: add lottery icon to post list
2025-08-11 15:44:50 +08:00
Tim
05bf33dacd feat: add lottery icon to post list 2025-08-11 15:44:34 +08:00
tim
4cf7f1dacf fix: utc 2025-08-11 11:25:23 +08:00
tim
5871d74c4f fix: utc 2025-08-11 11:18:10 +08:00
Tim
1e3e1a78a5 Merge pull request #483 from nagisa77/zrjuux-codex/fix-circular-dependency-in-beans
Avoid PostService self-dependency at startup
2025-08-11 11:11:22 +08:00
Tim
4b987f894d Handle self-invocation in PostService 2025-08-11 11:11:11 +08:00
Tim
3ab1e92a37 Merge pull request #482 from nagisa77/revert-481-codex/fix-circular-dependency-in-beans
Revert "refactor: remove circular dependency in PostService"
2025-08-11 11:10:55 +08:00
Tim
2c334a26b6 Revert "refactor: remove circular dependency in PostService" 2025-08-11 11:10:45 +08:00
Tim
2a25c6edfa Merge pull request #481 from nagisa77/codex/fix-circular-dependency-in-beans
refactor: remove circular dependency in PostService
2025-08-11 11:09:35 +08:00
Tim
3c6553d7f8 refactor: remove circular dependency in PostService 2025-08-11 11:09:23 +08:00
tim
908df079e0 fix: UTC 时间 2025-08-11 11:03:00 +08:00
Tim
a3f30e9444 Merge pull request #480 from nagisa77/codex/fix-finalizelottery-execution-issue
Fix lottery finalization scheduling
2025-08-11 10:59:20 +08:00
Tim
aff3997687 Merge branch 'main' into codex/fix-finalizelottery-execution-issue 2025-08-11 10:59:06 +08:00
Tim
5fa0bd792b Ensure lottery finalization runs transactionally 2025-08-11 10:57:55 +08:00
tim
2280a16a83 Reapply "fix: UTC 时间"
This reverts commit 86ef6f9ce7.
2025-08-11 10:55:37 +08:00
tim
86ef6f9ce7 Revert "fix: UTC 时间"
This reverts commit bcd499b4bc.
2025-08-11 10:50:36 +08:00
tim
bcd499b4bc fix: UTC 时间 2025-08-11 10:43:27 +08:00
tim
dcc7c3ebcc fix: 取消时区计算 2025-08-11 10:28:40 +08:00
tim
fd2676ef04 fix: add log 2025-08-11 10:24:13 +08:00
Tim
ca49407bf9 Merge pull request #479 from nagisa77/codex/refactor-lottery-task-scheduling
Reschedule lottery finalization on startup
2025-08-11 10:21:01 +08:00
Tim
ff64f13765 Reschedule lottery finalization on startup 2025-08-11 10:20:50 +08:00
Tim
29e061c885 Merge pull request #478 from nagisa77/codex/fix-postservice-argument-length-error
test: update PostService tests for new signature
2025-08-11 10:07:10 +08:00
Tim
36bc86da7f test: update PostService tests for new signature 2025-08-11 10:06:53 +08:00
Tim
2811a89e3b Merge pull request #477 from nagisa77/codex/remove-schedule-when-deleting-lottery-post
Cancel scheduled lottery finalizations when deleting posts
2025-08-11 10:06:07 +08:00
Tim
a774c9cc97 Cancel lottery schedule on post deletion 2025-08-11 10:05:37 +08:00
tim
e27f57fab2 fix: website 2025-08-11 10:01:36 +08:00
Tim
692fc6d1d0 Merge pull request #470 from nagisa77/codex/add-lottery-post-type-and-api
feat: add lottery post type with participation API
2025-08-11 09:56:45 +08:00
tim
5360529327 feat: 抽奖ui 2025-08-11 09:56:15 +08:00
Tim
e7d0f7fb0e Merge pull request #476 from nagisa77/codex/implement-logic-in-posts-page
feat: add lottery section logic
2025-08-11 02:35:25 +08:00
Tim
6b1aeb82c1 feat: add lottery section logic 2025-08-11 02:34:54 +08:00
tim
8320a84ba0 feat: 抽奖ui 2025-08-11 02:22:38 +08:00
Tim
7aef126181 Merge pull request #475 from nagisa77/codex/add-post-type-selection-and-lottery-options
feat: add lottery post type options
2025-08-11 01:45:38 +08:00
Tim
e0291868bc feat: add lottery post type options 2025-08-11 01:45:23 +08:00
Tim
0cf1bf187a Merge pull request #474 from nagisa77/revert-473-f9h526-codex/add-post-creation-enhancements
Revert "feat: add lottery post fields"
2025-08-11 01:33:12 +08:00
Tim
6fb16e91dc Revert "feat: add lottery post fields" 2025-08-11 01:32:50 +08:00
Tim
6d40e6e5e8 Merge pull request #473 from nagisa77/f9h526-codex/add-post-creation-enhancements
feat: add lottery post fields
2025-08-11 01:32:26 +08:00
Tim
398226b9bc feat: add lottery post fields 2025-08-11 01:32:12 +08:00
Tim
c1ad6b499f Merge pull request #472 from nagisa77/revert-471-codex/add-post-creation-enhancements
Revert "feat: add lottery post options"
2025-08-11 01:31:00 +08:00
Tim
71e0b1379c Revert "feat: add lottery post options" 2025-08-11 01:30:36 +08:00
Tim
594d8bf994 Merge pull request #471 from nagisa77/codex/add-post-creation-enhancements
feat: add lottery post options
2025-08-11 01:29:42 +08:00
Tim
7616a2d0e0 feat: add lottery post options 2025-08-11 01:29:22 +08:00
tim
c4ca1465ee Merge remote-tracking branch 'origin/main' into codex/add-lottery-post-type-and-api 2025-08-11 01:18:50 +08:00
Tim
eb32e4bad7 feat: implement lottery post type 2025-08-11 01:17:55 +08:00
tim
ae1a8daa22 Revert "Reapply "feat: reuse server data on home page""
This reverts commit dbeaefe9ba.
2025-08-11 01:14:51 +08:00
tim
0fdb4c234a feat: fix menu show 2025-08-11 01:08:44 +08:00
tim
23815fbd0a feat: fix ssr 2025-08-11 00:55:58 +08:00
tim
dbeaefe9ba Reapply "feat: reuse server data on home page"
This reverts commit 6d277b5809.
2025-08-11 00:41:34 +08:00
tim
582873e505 Reapply "fix: retain scroll position after hydration"
This reverts commit ff767970a1.
2025-08-11 00:41:08 +08:00
Tim
6b35b43fd6 Merge pull request #469 from nagisa77/feature/nuxt_opt_v1 2025-08-10 22:12:02 +08:00
Tim
06fd7e893e Merge pull request #468 from nagisa77/codex/fix-avatar-misalignment-on-refresh 2025-08-10 22:09:00 +08:00
Tim
ef2bf7f32b fix: ensure unique avatar keys on home page 2025-08-10 22:01:56 +08:00
tim
f312cf7d1c Revert "fix: correct SSR mobile detection"
This reverts commit 113cec1705.
2025-08-10 17:41:20 +08:00
Tim
351b33bb3c Merge pull request #465 from nagisa77/codex/ssrismobile
fix: correct SSR mobile detection
2025-08-10 17:14:42 +08:00
Tim
113cec1705 fix: correct SSR mobile detection 2025-08-10 17:14:02 +08:00
tim
454f2b4a0b Merge branch 'main' of github.com:nagisa77/OpenIsle 2025-08-10 13:19:02 +08:00
tim
6ab4879968 fix: 解决帖子评论问题 2025-08-10 13:18:37 +08:00
tim
57acb37e84 fix: 解决帖子评论问题 2025-08-10 12:46:20 +08:00
Tim
4441c697b3 Merge pull request #460 from nagisa77/feature/nuxt_opt_v1
Feature/nuxt opt
2025-08-10 12:30:22 +08:00
tim
bda2b54ce9 fix: magic delay 2025-08-10 12:30:09 +08:00
Tim
f6f4f198b0 Merge pull request #461 from nagisa77/codex/improve-comment-box-scroll-behavior
fix comment reply editor visibility
2025-08-10 12:27:45 +08:00
Tim
f50541bff7 feat: scroll to comment editor when opened 2025-08-10 12:27:32 +08:00
tim
2a5bff1086 feat: 本地回复数据fixed 2025-08-10 12:26:22 +08:00
Tim
8c1386a2d0 Merge pull request #459 from nagisa77/codex/reset-login-state-on-401-error
Reset auth on token expiry
2025-08-10 11:59:39 +08:00
Tim
ce5bcb9dca Reset auth on 401 2025-08-10 11:59:23 +08:00
tim
1177a778ee feat: fix 注册失败和登录失败 2025-08-10 11:50:21 +08:00
tim
1a8e216aa9 feat: 新增贡献者前端标识 2025-08-10 02:24:26 +08:00
tim
7189977a2f feat: 防止重新弄错代码行数 2025-08-10 02:14:43 +08:00
Tim
d5f52529f7 Merge pull request #457 from nagisa77/codex/fix-compilation-issue-in-medalservicetest
test: update MedalService tests for contributor medal
2025-08-10 02:08:47 +08:00
Tim
1e85e489a7 test: update MedalService tests for contributor medal 2025-08-10 02:08:28 +08:00
Tim
5ec85519c7 Merge pull request #447 from nagisa77/codex/add-new-medallions-and-related-api
feat: implement medal API
2025-08-10 02:03:00 +08:00
tim
9462c284d6 feat: 新增贡献者勋章 2025-08-10 02:02:36 +08:00
Tim
c6e88792a3 Merge pull request #456 from nagisa77/codex/add-contributor-achievement-feature
feat: add contributor achievement
2025-08-10 01:30:03 +08:00
Tim
2dfbf0d904 feat: track contributor lines 2025-08-10 01:29:41 +08:00
Tim
68c7b12cb0 Merge pull request #455 from nagisa77/codex/update-backend-to-set-selected-badge
feat: auto select medal for user in mappers
2025-08-10 01:15:21 +08:00
Tim
33b2734ba5 feat: auto select medal for user in mappers 2025-08-10 01:15:02 +08:00
Tim
b58a5d975c Merge pull request #454 from nagisa77/codex/update-medal-selection-logic-in-backend
feat: auto select medals and improve navigation
2025-08-10 00:59:51 +08:00
Tim
d0df698aa9 feat: auto select medals and improve navigation 2025-08-10 00:59:34 +08:00
tim
6b80f2386b Revert "feat: auto select medals and make badges interactive"
This reverts commit 4516f77727.
2025-08-10 00:32:07 +08:00
Tim
8e475103f8 Merge pull request #452 from nagisa77/codex/add-badge-selection-for-users
feat: auto select medals and make badges interactive
2025-08-10 00:26:54 +08:00
Tim
4516f77727 feat: auto select medals and make badges interactive 2025-08-10 00:25:13 +08:00
Tim
594068bd5e Merge pull request #451 from nagisa77/codex/add-user-badge-selection-feature
feat: enable user medal selection and display
2025-08-10 00:14:31 +08:00
Tim
041496cf98 feat: add user medal selection and display 2025-08-10 00:13:54 +08:00
tim
6aedec7a9b feat: achievement select to show 2025-08-09 22:26:46 +08:00
Tim
6d08d10f19 Merge pull request #450 from nagisa77/codex/add-achievement-popup-to-globalpopups.vue
feat: add medal popup
2025-08-09 17:18:46 +08:00
Tim
cdc35878a2 feat: add medal popup 2025-08-09 17:18:31 +08:00
tim
57c0aa5899 feat: 完成的排序在前面 2025-08-09 17:08:48 +08:00
Tim
b196be59a2 Merge pull request #449 from nagisa77/codex/tabloading
feat: optimize achievements tab loading
2025-08-09 16:53:40 +08:00
Tim
760bc4fc4b feat: optimize achievements tab loading 2025-08-09 16:53:27 +08:00
tim
6b5b6b8c81 feat: fix some code 2025-08-09 16:47:40 +08:00
Tim
411d24194b Merge pull request #448 from nagisa77/codex/integrate-real-data-for-achievementlist
feat: wire achievements to backend
2025-08-09 14:29:42 +08:00
Tim
2560bf45a7 feat: wire achievements to backend 2025-08-09 14:29:29 +08:00
tim
4207886dce feat: achivement 2025-08-09 14:15:54 +08:00
Tim
987fe0d885 feat: implement medal feature 2025-08-09 02:08:02 +08:00
tim
9c1cedd172 feature: delete vue3 CSR 2025-08-09 01:16:37 +08:00
tim
ff767970a1 Revert "fix: retain scroll position after hydration"
This reverts commit 637f5316e8.
2025-08-08 18:45:53 +08:00
tim
6d277b5809 Revert "feat: reuse server data on home page"
This reverts commit 4df96f8aa2.

# Conflicts:
#	frontend_nuxt/pages/index.vue
2025-08-08 18:45:34 +08:00
Tim
fddfd07836 Merge pull request #446 from nagisa77/codex/fix-ismobile-check-for-initial-data 2025-08-08 18:12:56 +08:00
Tim
27a2591904 refactor: per-request mobile detection 2025-08-08 18:12:40 +08:00
Tim
70eece7a83 Merge pull request #445 from nagisa77/codex/fix-scroll-issue-on-homepage 2025-08-08 18:06:10 +08:00
Tim
637f5316e8 fix: retain scroll position after hydration 2025-08-08 18:05:36 +08:00
Tim
25a64d7666 Merge pull request #443 from nagisa77/codex/use-server-fetch-data-in-homepage
feat: reuse server data on home page
2025-08-08 17:58:33 +08:00
Tim
4df96f8aa2 feat: reuse server data on home page 2025-08-08 17:53:44 +08:00
Tim
3e4834f0fd fix: profile提速 2025-08-08 17:37:12 +08:00
Tim
10a63d3659 fix: 夜间模式修复 2025-08-08 17:36:39 +08:00
Tim
cc1a414df4 feat: support keepalive 2025-08-08 17:24:43 +08:00
Tim
8ceae90962 Revert "feat: enable page keepalive"
This reverts commit d9099c7281.
2025-08-08 17:21:59 +08:00
Tim
12b7c68cae Merge pull request #442 from nagisa77/codex/add-keep-alive-feature-for-navigation
feat: enable page keepalive
2025-08-08 17:10:33 +08:00
Tim
d9099c7281 feat: enable page keepalive 2025-08-08 17:10:17 +08:00
Tim
7d793ede6e Merge pull request #441 from nagisa77/codex/fix-vditor-styles-not-applying-in-ssr
fix: apply global Vditor styles in SSR
2025-08-08 17:05:17 +08:00
Tim
6233508442 fix: apply global Vditor styles in SSR 2025-08-08 17:05:00 +08:00
Tim
91298c6922 Merge pull request #440 from nagisa77/codex/fix-flash-of-white-on-night-mode
fix: apply theme before render to avoid flash
2025-08-08 17:02:58 +08:00
Tim
8dcb61dfed fix: apply theme before render to avoid flash 2025-08-08 17:02:43 +08:00
Tim
2b33253182 Merge pull request #439 from nagisa77/codex/fix-homepage-redirection-issue
fix: support user profile trailing slash
2025-08-08 17:01:13 +08:00
Tim
30919212f3 fix: support user profile trailing slash 2025-08-08 17:00:58 +08:00
Tim
1a496dc0ee Merge pull request #438 from nagisa77/codex/fix-server-side-ismobile-detection-for-ssr
fix: handle mobile detection during SSR
2025-08-08 17:00:03 +08:00
Tim
7aafe30b46 feat: improve SSR mobile detection 2025-08-08 16:59:45 +08:00
Tim
688d29f445 Merge branch 'main' of github.com:nagisa77/OpenIsle 2025-08-08 15:53:40 +08:00
Tim
14dd5a8fc2 feat: add global css 2025-08-08 15:53:08 +08:00
Tim
0ec5db5d91 Merge pull request #437 from nagisa77/codex/fix-night-mode-reset-on-refresh
fix: persist theme mode across refresh
2025-08-08 15:41:17 +08:00
Tim
26622a4ad2 fix: persist theme mode across refresh 2025-08-08 15:41:02 +08:00
Tim
f36532d45f Merge pull request #436 from nagisa77/codex/add-global-loading-progress-bar
feat(frontend_nuxt): add global loading progress bar
2025-08-08 15:17:44 +08:00
Tim
af2cf99041 feat(frontend_nuxt): wire up nprogress plugin 2025-08-08 15:05:33 +08:00
Tim
af9028190d feat: 域名修改 2025-08-08 14:26:49 +08:00
Tim
9120ea511b Merge pull request #432 from nagisa77/feature/nuxt_optimization
Feature: nuxt optimization
2025-08-08 14:22:53 +08:00
Tim
37e0f9dbc5 feat: 移动端服务器渲染判断 2025-08-08 14:21:58 +08:00
Tim
98bcbf52ba feat: 首刷返回 2025-08-08 14:15:42 +08:00
Tim
3a23cd8e19 Merge pull request #435 from nagisa77/codex/fix-composable-usage-outside-of-valid-context 2025-08-08 13:57:52 +08:00
Tim
e1a1bc8a69 fix: ensure router composable initialized before async 2025-08-08 13:56:56 +08:00
Tim
44c3091951 fix: 解决冲突 2025-08-08 13:50:15 +08:00
Tim
1840284b48 Merge remote-tracking branch 'origin/codex/modify-menu-component-for-server-content' into feature/nuxt_optimization 2025-08-08 13:40:20 +08:00
Tim
9de5f4ce8d feat(frontend_nuxt): fetch menu data server-side 2025-08-08 13:38:17 +08:00
Tim
a794872ab6 Merge remote-tracking branch 'origin/main' into feature/nuxt_optimization 2025-08-08 13:35:37 +08:00
Tim
963f2167eb Merge pull request #433 from nagisa77/codex/fix-editing-article-navigation-issue
Fix post edit navigation in Nuxt frontend
2025-08-08 13:33:53 +08:00
Tim
35bdf58cd6 Fix post edit navigation by restructuring routes 2025-08-08 13:33:34 +08:00
Tim
65ae660486 feat: 修改为服务端渲染、解决跳转问题 2025-08-08 13:22:42 +08:00
Tim
6554e66a4e Merge pull request #430 from nagisa77/codex/add-server-side-rendering-for-index.vue
Enable SSR initial render for home and post pages
2025-08-08 12:58:05 +08:00
Tim
5e839be3af Enable SSR initial fetch for posts and home 2025-08-08 12:57:41 +08:00
Tim
44daa255c8 feat: 处理nuxt部分样式问题 & 跳转问题 2025-08-08 11:24:52 +08:00
Tim
2b1958a603 feat: 处理编译问题 2025-08-07 22:35:43 +08:00
Tim
51e958799d feat: 处理编译问题 2025-08-07 22:28:39 +08:00
Tim
676e959d4b feat: toast 问题修改 2025-08-07 22:20:59 +08:00
Tim
f9a89ae9ef Merge pull request #426 from nagisa77/codex/migrate-frontend-to-nuxt4-with-ssr
feat: add initial Nuxt frontend with SSR
2025-08-07 21:35:21 +08:00
Tim
af85e7eee4 feat: update base url 2025-08-07 21:34:18 +08:00
Tim
a9d104735c Merge pull request #428 from nagisa77/codex/fix-element-retrieval-error-on-refresh
fix: stable editor id on SSR
2025-08-07 21:28:34 +08:00
Tim
752d288e3b fix: stable editor id on SSR 2025-08-07 21:28:17 +08:00
Tim
9c59277023 feat: 处理页面报错 2025-08-07 21:18:21 +08:00
Tim
d19cfc0797 Merge pull request #427 from nagisa77/codex/assist-migration-of-other-pages-to-nuxt
feat: migrate legacy Vue pages to Nuxt
2025-08-07 20:22:02 +08:00
Tim
565678f79a chore: migrate legacy pages and utilities to nuxt 2025-08-07 20:21:22 +08:00
Tim
73b9dcf0cd fix: 操作ldrs 2025-08-07 20:07:37 +08:00
Tim
a65e051af8 Merge pull request #423 from WilliamColton/main
增加积分系统
2025-08-07 20:04:03 +08:00
WilliamColton
f2a034f299 Merge remote-tracking branch 'origin/main' 2025-08-07 19:53:52 +08:00
WilliamColton
b42cdcf640 增加积分系统 2025-08-07 19:53:25 +08:00
Tim
cfdd257b9a feat: add initial Nuxt frontend with SSR 2025-08-07 19:18:42 +08:00
WilliamColton
b4ac496b55 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	frontend/src/views/NewPostPageView.vue
#	frontend/src/views/PostPageView.vue
2025-08-07 16:29:14 +08:00
WilliamColton
105f7781b3 增加积分系统 2025-08-07 16:24:40 +08:00
Tim
925973b134 fix 2025-08-06 20:31:58 +08:00
Tim
4a88685e81 fix: 移动端表情面板fix 2025-08-06 20:26:01 +08:00
Tim
d121bb08b9 Merge pull request #413 from nagisa77/codex/add-support-for-tieba-emojis-in-vditor
feat: add tieba emoji support
2025-08-06 20:11:07 +08:00
tim
b4f85989d0 feat: 移动端 vditor 支持 2025-08-06 20:10:25 +08:00
Tim
21d8984bfb Merge pull request #414 from WoJiaoFuXiaoYun/main
fix: Click outside the drop-down box to not hide
2025-08-06 19:52:03 +08:00
tim
3de6b89cc4 fix: 修复vditor高度问题 2025-08-06 19:47:51 +08:00
Tim
9621efd282 Merge pull request #416 from nagisa77/codex/add-limited-toolbar-options-for-mobile
feat: show compact vditor toolbar on mobile
2025-08-06 19:33:09 +08:00
Tim
fbaa05f146 feat: show compact vditor toolbar on mobile 2025-08-06 19:32:56 +08:00
Tim
05089761b6 Merge pull request #415 from nagisa77/codex/prevent-clearing-comments-on-error
fix: preserve comment text on failure
2025-08-06 19:29:10 +08:00
Tim
fdf51be5f5 Preserve comment text on submission errors 2025-08-06 19:28:57 +08:00
tim
05dbeccdd7 fix: emoji fix 2025-08-06 19:26:35 +08:00
浮小云
25b8ac97d7 Merge branch 'nagisa77:main' into main 2025-08-06 19:16:00 +08:00
WangHe
c2fe5649e2 Merge branch 'main' of https://github.com/WoJiaoFuXiaoYun/OpenIsle 2025-08-06 19:14:24 +08:00
WangHe
2235612070 fix: Click outside the drop-down box to not hide 2025-08-06 19:14:19 +08:00
Tim
6a1b71de0f feat: add tieba emoji support 2025-08-06 18:59:08 +08:00
Tim
b9819252d3 Merge pull request #412 from nagisa77/codex/iconmap
refactor: centralize reaction emoji map
2025-08-06 18:58:17 +08:00
Tim
5709b0d6fd refactor: reuse shared reaction emoji map 2025-08-06 18:58:01 +08:00
Tim
5ef104df46 Merge pull request #411 from nagisa77/codex/modify-ui-to-update-on-read-actions
feat: improve notification read UX
2025-08-06 18:55:09 +08:00
Tim
c838caf9e1 feat: update notification read UI instantly 2025-08-06 18:52:02 +08:00
Tim
597f682b75 fix: message page layout fix 2025-08-06 18:37:51 +08:00
Tim
2a72345943 Merge pull request #408 from nagisa77/codex/vditor
fix: offset vditor toolbar when pinned
2025-08-06 17:26:12 +08:00
Tim
73066522e3 Merge pull request #410 from WoJiaoFuXiaoYun/main
feat: vditor add loading
2025-08-06 17:25:58 +08:00
Tim
f5a3206f36 feat: sticky 优化 2025-08-06 17:23:19 +08:00
浮小云
6a6d743b96 Merge branch 'nagisa77:main' into main 2025-08-06 17:11:29 +08:00
WangHe
2241cfc9da feat: vditor add loading 2025-08-06 17:10:36 +08:00
Tim
597bc09c57 fix: offset vditor toolbar when pinned 2025-08-06 16:15:22 +08:00
Tim
fd024cf65d Merge pull request #406 from WoJiaoFuXiaoYun/main
fix: npm ci "highlight.js" build fail
2025-08-06 15:40:18 +08:00
WangHe
393e60c6e9 fix: npm ci "highlight.js" build fail 2025-08-06 15:20:33 +08:00
Tim
9a36b7651b Merge pull request #405 from WoJiaoFuXiaoYun/main
fix: add missing highlight.js
2025-08-06 14:37:26 +08:00
WangHe
5a2ef02ce7 fix: add missing highlight.js 2025-08-06 14:29:10 +08:00
Tim
227269c639 Merge pull request #404 from nagisa77/codex/update-application-approval-logic 2025-08-06 13:12:33 +08:00
Tim
beb1bf70bf Test admin register request notification handling 2025-08-06 13:12:14 +08:00
Tim
3167aad6d8 更新 index.js 2025-08-06 12:36:17 +08:00
Tim
79ccc45c95 Merge branch 'main' of github.com:nagisa77/OpenIsle 2025-08-06 11:34:46 +08:00
Tim
48ee45a560 feat: md 格式优化 2025-08-06 11:27:09 +08:00
tim
5f75f34289 fix: callback 2025-08-06 02:07:09 +08:00
tim
f0d1caf5f3 feat: 去除多线程操作 规避400问题 2025-08-06 01:45:46 +08:00
tim
004924815b feat: 偶现400错误,线程处理 2025-08-06 00:09:12 +08:00
tim
472db0174b feat: 偶现400错误,线程处理 2025-08-05 23:59:15 +08:00
tim
26ed082f93 Revert "revert: 通知取消异步,并且采用事务,看看能否解决 400"
This reverts commit 4e0dda3a24.
2025-08-05 23:54:40 +08:00
tim
e491a00c57 Merge branch 'main' of github.com:nagisa77/OpenIsle 2025-08-05 23:26:45 +08:00
tim
4e0dda3a24 revert: 通知取消异步,并且采用事务,看看能否解决 400 2025-08-05 23:26:15 +08:00
Tim
91862713e7 Merge remote-tracking branch 'origin/main' into codex/fix-sticky-header-and-jumptohashcomment 2025-08-05 19:55:05 +08:00
Tim
009d139549 fix: magic bug with magic wait 2025-08-05 19:54:43 +08:00
Tim
74fa970902 Merge pull request #394 from nagisa77/codex/fix-sticky-header-and-jumptohashcomment
fix: sticky scroller and hash comment navigation
2025-08-05 19:45:32 +08:00
Tim
eb933b8f78 fix: scroller fix! 2025-08-05 19:44:59 +08:00
Tim
7fe37d0131 fix: sync post scroller with window 2025-08-05 19:39:13 +08:00
Tim
82c0aa240a fix: make post page scroller sticky and restore comment hash navigation 2025-08-05 19:27:02 +08:00
Tim
a543a7bcf2 fix: header use fixed 2025-08-05 19:23:44 +08:00
Tim
f0caf930c5 Merge pull request #393 from nagisa77/feature/site_fix
Feature/site fix
2025-08-05 18:37:31 +08:00
Tim
05e28123ed fix: 页面使用最外层滚动 2025-08-05 18:35:51 +08:00
Tim
7292834700 Merge pull request #392 from nagisa77/codex/adapt-load-more-feature-in-homepageview
feat: unify scroll-based loading for outer scroll
2025-08-05 18:25:09 +08:00
Tim
3e4b94f1f2 feat: 通用滚动加载工具 2025-08-05 18:24:45 +08:00
Tim
0957a5c132 feat: 设置为外层滚动 2025-08-05 18:13:01 +08:00
Tim
1edaa50732 Revert "Reapply "feat: handle ios safari keyboard""
This reverts commit fb3eb2646d.
2025-08-05 15:46:31 +08:00
Tim
fb3eb2646d Reapply "feat: handle ios safari keyboard"
This reverts commit dc73a74e1c.
2025-08-05 15:31:30 +08:00
Tim
1ed76f7687 feat: fix async request 2025-08-05 15:21:14 +08:00
Tim
dc73a74e1c Revert "feat: handle ios safari keyboard"
This reverts commit 9b31df28aa.
2025-08-05 15:20:57 +08:00
Tim
2c0d39a6b8 Merge pull request #391 from nagisa77/356s63-codex/fix-header-overlap-issue-in-ios-safari
fix: handle iOS Safari keyboard scroll offset
2025-08-05 15:16:28 +08:00
Tim
9b31df28aa feat: handle ios safari keyboard 2025-08-05 15:15:57 +08:00
tim
caba1c6658 fix: add error code 2025-08-05 13:34:28 +08:00
Tim
dd0beb1955 Merge pull request #388 from nagisa77/codex/0
Fix homepage reply count display
2025-08-05 12:45:13 +08:00
Tim
c65dfbcbf9 feat: show correct reply counts 2025-08-05 12:44:50 +08:00
Tim
2e8bc012fa feat: delete -webkit-backdrop-filter 2025-08-05 11:01:10 +08:00
Tim
8ac1794853 fix: 互动先取消通知 2025-08-05 10:38:36 +08:00
Tim
d047e3d17a Revert "fix: support iOS safe area for header"
This reverts commit ea1588d9e9.
2025-08-05 10:17:57 +08:00
Tim
3673f5b904 Merge pull request #387 from nagisa77/codex/fix-header-overlap-issue-in-ios-safari 2025-08-05 09:39:02 +08:00
Tim
ea1588d9e9 fix: support iOS safe area for header 2025-08-05 09:38:48 +08:00
tim
2b9a4d35b6 Merge branch 'main' of github.com:nagisa77/OpenIsle 2025-08-05 01:09:52 +08:00
tim
0cfcd5588f fix: markdown渲染的 code 间距调整 2025-08-05 01:09:22 +08:00
Tim
043b369695 Merge pull request #381 from nagisa77/codex/add-navigation-without-page-reload
Preserve home page state when navigating back
2025-08-05 01:04:30 +08:00
tim
730d5b1d10 feat: 主页缓存 2025-08-05 01:04:01 +08:00
Tim
42c3ef3377 Track home page scroll position 2025-08-05 01:00:19 +08:00
Tim
eedde0fd28 Restore scroll position on cached home page 2025-08-05 00:46:08 +08:00
Tim
ae054f76de cache home page view 2025-08-05 00:34:13 +08:00
Tim
e5c746fe27 fix: test cases 2025-08-04 21:57:52 +08:00
Tim
cce0560cb3 Merge pull request #377 from nagisa77/jfcb2y-codex/fix-applicationcontext-loading-error
Handle missing push notification keys
2025-08-04 21:48:12 +08:00
Tim
7368fa77ae Allow missing push notification keys 2025-08-04 21:47:59 +08:00
Tim
90c26c5e7f Merge pull request #376 from nagisa77/codex/fix-usercontrollertest-json-path-assertions
test: mock user mapper for user endpoints
2025-08-04 21:47:22 +08:00
Tim
ed7319d61b test: mock user mapper for user endpoints 2025-08-04 21:47:09 +08:00
Tim
232ce26246 Merge pull request #374 from nagisa77/codex/fix-nullpointerexception-in-authcontrollertest
test: fix auth controller tests
2025-08-04 21:39:39 +08:00
Tim
14b4f67bcb Merge pull request #372 from nagisa77/codex/fix-usercontrollertest-bean-resolution-issue
test: mock user controller dependencies
2025-08-04 21:39:22 +08:00
Tim
c62c4b2942 Merge pull request #371 from nagisa77/codex/fix-applicationcontext-loading-error
Add default website URL for tests
2025-08-04 21:39:10 +08:00
Tim
7ab247f58d Merge pull request #370 from nagisa77/codex/fix-application-context-startup-error
Add website URL property for tests
2025-08-04 21:38:55 +08:00
Tim
33e1e92af3 test: fix auth controller tests 2025-08-04 21:38:30 +08:00
Tim
ac6bafb708 test: mock user controller dependencies 2025-08-04 21:38:26 +08:00
Tim
cfe7a44b98 Add default website URL for tests 2025-08-04 21:38:24 +08:00
Tim
49ae2c1fa2 Add website-url property for tests 2025-08-04 21:38:22 +08:00
Tim
3b107ffbd2 Merge pull request #366 from nagisa77/codex/fix-userrepository-bean-not-found-error
Fix TagControllerTest dependency setup
2025-08-04 21:32:06 +08:00
Tim
eac582ee74 Merge pull request #365 from nagisa77/codex/fix-commentcontrollertest-bean-loading-issue
test: mock CommentMapper in controller tests
2025-08-04 21:32:00 +08:00
Tim
ee5e0f38dc Merge pull request #369 from nagisa77/codex/fix-unsatisfied-dependency-for-postmapper
test: mock PostMapper in CategoryControllerTest
2025-08-04 21:31:54 +08:00
Tim
88c3933540 Merge pull request #364 from nagisa77/codex/fix-missing-usermapper-bean-for-searchcontroller
test: mock mapper dependencies in SearchControllerTest
2025-08-04 21:31:43 +08:00
Tim
6f32de633a Merge pull request #363 from nagisa77/codex/fix-notification-repository-test-assertions
Fix notification handling and email content
2025-08-04 21:31:28 +08:00
Tim
58bed963c5 Merge pull request #362 from nagisa77/codex/fix-missing-githubauthservice-bean
Add missing mocks for AuthControllerTest
2025-08-04 21:31:15 +08:00
Tim
62c6699adc Merge pull request #361 from nagisa77/codex/fix-unsatisfied-dependency-for-jwtservice
test: add missing JWT secrets for tests
2025-08-04 21:31:08 +08:00
Tim
4d78877849 Merge pull request #368 from nagisa77/codex/fix-email-not-sent-in-tests
Send email and push notification every five reactions
2025-08-04 21:30:55 +08:00
Tim
63a30127b7 Merge pull request #367 from nagisa77/codex/fix-unsatisfied-dependency-in-reactioncontroller
Ensure ReactionMapper bean in controller tests
2025-08-04 21:30:18 +08:00
Tim
a6a302760a Merge pull request #360 from nagisa77/codex/fix-application-context-loading-error
test: provide jwt secrets for tests
2025-08-04 21:30:06 +08:00
Tim
93a3dd421a Merge pull request #359 from nagisa77/codex/fix-missing-notificationmapper-bean
test: mock NotificationMapper in NotificationControllerTest
2025-08-04 21:29:58 +08:00
Tim
1a1a610b29 Merge pull request #358 from nagisa77/codex/fix-missing-commentmapper-bean
test: include mapper deps in PostControllerTest
2025-08-04 21:29:50 +08:00
Tim
053c05ea26 test: mock PostMapper in CategoryControllerTest 2025-08-04 21:29:45 +08:00
Tim
f04c4b27d9 Send email and push every five reactions 2025-08-04 21:29:33 +08:00
Tim
e73479feec Load ReactionMapper in controller tests 2025-08-04 21:29:31 +08:00
Tim
c99839d75b Mock repository and mapper dependencies for TagControllerTest 2025-08-04 21:29:03 +08:00
Tim
8452ffbd03 test: mock CommentMapper in controller tests 2025-08-04 21:29:02 +08:00
Tim
9985884534 test: mock dependencies in SearchControllerTest 2025-08-04 21:29:00 +08:00
Tim
c795bdad28 Fix notification service 2025-08-04 21:28:59 +08:00
Tim
5171f89182 Mock additional services in AuthControllerTest 2025-08-04 21:28:59 +08:00
Tim
ccc87f3f10 test: add missing JWT secrets for tests 2025-08-04 21:28:58 +08:00
Tim
7f06964eb2 test: provide jwt secrets for tests 2025-08-04 21:28:52 +08:00
Tim
e0fcc0d1f7 test: mock NotificationMapper in NotificationControllerTest 2025-08-04 21:28:51 +08:00
Tim
e3964c1b3d test: include mapper deps in PostControllerTest 2025-08-04 21:28:04 +08:00
Tim
0f5d5653f5 Merge branch 'main' of github.com:nagisa77/OpenIsle 2025-08-04 21:16:59 +08:00
Tim
e886142b39 feat: fix compile 2025-08-04 21:15:20 +08:00
Tim
d11403209d Merge pull request #357 from nagisa77/codex/refactor-dto-structure-in-controller
refactor: extract post dtos
2025-08-04 21:13:34 +08:00
Tim
e2e5942941 feat: add dedicated mappers 2025-08-04 21:10:09 +08:00
Tim
2db998a9d9 feat: relocate remaining dtos 2025-08-04 20:51:33 +08:00
Tim
a22967fc0c test: verify post dtos 2025-08-04 20:37:43 +08:00
Tim
b41835d9c8 refactor: extract post dtos 2025-08-04 20:37:20 +08:00
Tim
93d3023276 Merge pull request #356 from WilliamColton/main
修复申请原因可能为空的bug
2025-08-04 19:26:19 +08:00
WilliamColton
3b82a4aba0 修复申请原因可能为空的bug 2025-08-04 18:36:38 +08:00
Tim
6fa5978613 Merge branch 'main' of github.com:nagisa77/OpenIsle 2025-08-04 17:05:03 +08:00
Tim
0584cdb42c fix 2025-08-04 17:04:49 +08:00
Tim
147598275a Merge pull request #351 from WilliamColton/feature/last-comment-time
添加显示最后评论时间的功能
2025-08-04 16:36:42 +08:00
WilliamColton
f6d7020165 添加显示最后评论时间的功能 2025-08-04 16:29:21 +08:00
Tim
44e262a636 Merge pull request #342 from nagisa77/g2s0r1-codex/fix-occasional-errors-in-application
Handle null exception messages in global handler
2025-08-04 14:26:27 +08:00
Tim
3ae27e6216 Handle missing exception messages in global handler 2025-08-04 14:26:12 +08:00
tim
4da16cd071 Revert "fix: guard against null exception messages"
This reverts commit d50e8c0863.
2025-08-04 14:25:43 +08:00
Tim
7eb6ffde1d Merge pull request #341 from nagisa77/codex/fix-occasional-errors-in-application
fix: guard against null exception messages
2025-08-04 14:23:41 +08:00
Tim
d50e8c0863 fix: guard against null exception messages 2025-08-04 14:22:55 +08:00
Tim
797c39b1e4 Merge pull request #340 from nagisa77/codex/add-hourly-log-saving
chore: add hourly log rotation
2025-08-04 13:19:30 +08:00
Tim
a5899565b1 feat: add log save 2025-08-04 13:18:55 +08:00
Tim
b30939dd7d chore: add hourly log rotation 2025-08-04 13:15:01 +08:00
Tim
a1b5597944 Merge pull request #339 from nagisa77/codex/add-user-defined-avatar-cropping
feat: add avatar cropping
2025-08-04 13:12:19 +08:00
Tim
9f1080eeb0 feat: cropper 2025-08-04 13:11:55 +08:00
Tim
a8187b7d38 feat: add avatar cropping 2025-08-04 12:59:43 +08:00
Tim
11b839b21a Revert "feat: add hourly rolling logs"
This reverts commit afe01bc6ad.
2025-08-04 12:53:43 +08:00
Tim
957a07309a Merge pull request #338 from nagisa77/codex/check-for-log-rotation-and-retention
feat: add hourly rolling logs
2025-08-04 12:51:45 +08:00
Tim
afe01bc6ad feat: add hourly rolling logs 2025-08-04 12:51:16 +08:00
Tim
ee0aceeab7 Merge pull request #337 from nagisa77/codex/add-debug-logging-to
chore: add debug logging for comments
2025-08-04 12:07:24 +08:00
Tim
8a2adc5632 chore: add debug logging for comments 2025-08-04 12:06:51 +08:00
Tim
9b840ca769 fix: 403 bugfix 2025-08-04 11:03:14 +08:00
Tim
8bd27af592 Merge branch 'main' of github.com:nagisa77/OpenIsle 2025-08-04 10:24:06 +08:00
tim
f5f09cddcc Merge branch 'main' of github.com:nagisa77/OpenIsle 2025-08-04 02:06:34 +08:00
tim
c154967564 feat: 评论嵌套规则修复 2025-08-04 02:06:24 +08:00
tim
ba8babd68a feat: 评论嵌套规则修复 2025-08-04 02:04:31 +08:00
Tim
3c7915e672 Merge pull request #331 from nagisa77/codex/refactor-callbackpage-into-components
refactor: reuse callback page component
2025-08-04 01:23:11 +08:00
Tim
f78a3ae149 refactor: reuse callback page component 2025-08-04 01:22:56 +08:00
Tim
b8632acebd Merge pull request #330 from nagisa77/codex/fix-google-login-popup-issue
Open Google login in new window
2025-08-04 01:09:08 +08:00
tim
365bcb86dd feat: fix with google login 2025-08-04 01:08:33 +08:00
tim
089e38f577 feat: fix with google login 2025-08-04 01:07:45 +08:00
Tim
1b206af28c Open Google auth in new window 2025-08-04 00:58:45 +08:00
Tim
dc5fdf4857 Merge pull request #329 from WilliamColton/bug/countLikesReceived 2025-08-04 00:43:11 +08:00
WilliamColton
d7b0aca4e6 修复收到的点赞显示异常问题 2025-08-03 22:36:29 +08:00
tim
354cc7cd17 feat: 处理添加表情偶现失败的问题 2025-08-03 20:12:44 +08:00
tim
d70433ff93 feat: 处理添加评论偶现失败的问题 2025-08-03 20:10:14 +08:00
tim
3a0cea8cd4 Revert "Add popup-based Google login function"
This reverts commit 1b39289dad.
2025-08-03 20:07:59 +08:00
tim
5aeedb07fe fix: header avatar object-fit method 2025-08-03 19:57:44 +08:00
Tim
61e2122ca9 Merge pull request #321 from nagisa77/codex/add-loginwithgooglewithpop-function
Add popup-based Google login option
2025-08-03 19:28:31 +08:00
Tim
1b39289dad Add popup-based Google login function 2025-08-03 19:17:00 +08:00
Tim
d58d5014da Merge pull request #320 from nagisa77/codex/add-cache-cleanup-for-vditor-editor
chore: clear stale vditor caches
2025-08-03 17:34:30 +08:00
Tim
c3e377ca3c chore: add helper to clear vditor cache 2025-08-03 17:33:48 +08:00
tim
67910317e8 fix: 修复消息页面有时候消息过长的问题 2025-08-03 16:45:38 +08:00
tim
ff09df03e3 Merge branch 'main' of github.com:nagisa77/OpenIsle 2025-08-03 16:26:34 +08:00
tim
a34e213647 feat: ios PWA 2025-08-03 16:26:28 +08:00
tim
b393eaadea feat: ios PWA 2025-08-03 16:25:58 +08:00
Tim
80998c71b0 Merge pull request #319 from nagisa77/codex/add-new-reaction-types-to-frontend-and-backend 2025-08-03 15:39:43 +08:00
Tim
9fd67c6c71 feat: add new reaction types 2025-08-03 15:30:11 +08:00
tim
4d2b616aed bugfix: menu 高度调整 2025-08-03 14:35:23 +08:00
tim
41f603e349 bugfix: 规避后台偶现失败的问题 2025-08-03 14:28:51 +08:00
Tim
ca9b2cb14d Merge pull request #310 from WilliamColton/refactor/directory-structure
feature: 优化目录结构
2025-08-03 02:15:14 +08:00
WilliamColton
c08723574d 优化目录结构 2025-08-03 01:27:28 +08:00
Tim
d63081955e Merge pull request #309 from nagisa77/codex/add-immediate-reaction-feedback-in-ui
feat: add optimistic reaction update
2025-08-03 01:17:26 +08:00
Tim
561a622c26 feat: add optimistic reaction update 2025-08-03 01:16:06 +08:00
Tim
50fcdbd12f Merge pull request #308 from nagisa77/codex/update-reply-count-to-include-subcomments
feat: count nested replies in post lists and comments
2025-08-03 01:15:29 +08:00
Tim
06eb9e2c7e feat: count nested replies 2025-08-03 01:15:14 +08:00
Tim
2ad3275753 Merge pull request #307 from nagisa77/codex/fix-sidebar-scroll-syncing-issues
Fix post scroller sync and top time
2025-08-03 00:56:25 +08:00
tim
a128bfa960 feat: 时序问题修正 2025-08-03 00:56:05 +08:00
Tim
454c7fb8f3 Fix post scroller sync and top time 2025-08-03 00:33:34 +08:00
tim
ac08fc96ce bugfix: 首页列表划到底部最后一条数据会被地址栏挡住部分 2025-08-03 00:14:56 +08:00
tim
6642a248fd feat: 1.添加内网调试地址, 2. Spaceship最新域名优惠码 这条数据横向超出了 挡住发帖人 2025-08-03 00:10:03 +08:00
Tim
9df8a9d123 Merge pull request #306 from nagisa77/codex/display-read-message-status-for-roles
Adjust message for mark-all-read
2025-08-01 16:04:46 +08:00
Tim
486787084a Show detailed mark-all-read message only for admins 2025-08-01 16:04:34 +08:00
Tim
49f5f36630 Merge pull request #305 from nagisa77/fm7fu9-codex
fix comment replies expansion
2025-08-01 12:57:47 +08:00
Tim
624729ae9e fix: expand top-level comment replies 2025-08-01 12:57:35 +08:00
Tim
5b8f3a1284 Merge pull request #304 from nagisa77/codex/update-commentdto-for-multiple-reactions
Add reactions to comment listing
2025-08-01 12:30:28 +08:00
Tim
d056bc9120 Include reactions in comment API 2025-08-01 12:30:15 +08:00
Tim
f73f0cd45a Merge pull request #303 from nagisa77/codex/update-user-profile-like-statistics
Fix profile like counts
2025-08-01 12:16:54 +08:00
Tim
d9d4597e13 fix like counts 2025-08-01 12:16:42 +08:00
Tim
873db304d1 feat: 搜索点击tag、分类需要重入 2025-08-01 12:15:36 +08:00
Tim
a239e29c32 Merge pull request #302 from nagisa77/codex/add-default-display-for-level-1-comments
Expand first-level comments by default
2025-08-01 12:09:27 +08:00
Tim
847426a507 feat(frontend): expand first-level comments by default 2025-08-01 12:09:10 +08:00
Tim
d4d8245671 Merge pull request #301 from nagisa77/tl0f6z-codex
Fix duplicate post view notifications
2025-08-01 12:02:25 +08:00
Tim
14bd9d86c0 feat: 处理重复阅读问题 2025-08-01 12:01:44 +08:00
Tim
db31b5d6c1 Deduplicate post view notifications 2025-08-01 11:55:17 +08:00
Tim
e8e77b6467 Revert "Deduplicate post view notifications"
This reverts commit 2fc22e7580.
2025-08-01 11:49:40 +08:00
Tim
ba1432d945 Merge pull request #300 from nagisa77/codex/remove-duplicate-notifications-for-posts
Implement deduplication for post view notifications
2025-08-01 11:48:05 +08:00
Tim
2fc22e7580 Deduplicate post view notifications 2025-08-01 11:47:43 +08:00
Tim
ba2299e882 feat: 避免消息页面出错 2025-08-01 11:38:46 +08:00
Tim
cd020c7e49 Merge pull request #299 from nagisa77/codex/improve-menu-loading-behavior
Implement menu caching
2025-08-01 11:25:16 +08:00
tim
caa255b882 feat: 修复menu每次都刷新的问题 2025-08-01 11:24:45 +08:00
Tim
f900a45c81 feat: cache menu categories and tags 2025-08-01 11:18:06 +08:00
tim
ce1a94dbaf feat: 【界面优化】在看别人帖子的时候发现代码块的内容间距有点紧,尤其在有中文注释的时候更明显 2025-08-01 11:10:53 +08:00
Tim
6a3644bca1 Merge pull request #294 from nagisa77/codex/modify-image-upload-to-frontend-direct-transfer
Enable presigned URL uploads
2025-08-01 10:42:10 +08:00
tim
67db6579e9 feat: vditor 修改 2025-08-01 10:41:16 +08:00
tim
ebc39a6388 Revert "Fix paste upload handler"
This reverts commit 97118e7bc8.
2025-08-01 02:12:22 +08:00
Tim
a97ca0cec9 Merge pull request #298 from nagisa77/codex/fix-paste-event-for-image-upload
Fix image paste event
2025-08-01 02:10:05 +08:00
Tim
97118e7bc8 Fix paste upload handler 2025-08-01 02:09:50 +08:00
Tim
22c2b41ac5 Merge pull request #297 from nagisa77/codex/fix-image-upload-with-command-+-v
Fix paste image upload in Vditor
2025-08-01 01:06:38 +08:00
Tim
3cd49c64f2 fix paste upload 2025-08-01 01:06:16 +08:00
tim
cc371fad85 fix: enable tips 2025-08-01 00:55:10 +08:00
Tim
a182b0b8da Merge pull request #296 from nagisa77/codex/fix-image-upload-and-loading-issues
Fix paste upload in custom Vditor handler
2025-08-01 00:51:32 +08:00
Tim
913ffa8a5a fix: enable paste upload with progress 2025-08-01 00:51:11 +08:00
Tim
296b0a737f Merge pull request #295 from nagisa77/codex/fix-vditor-upload-text-output
Fix vditor upload insertion
2025-08-01 00:42:09 +08:00
Tim
69b5e96695 fix: insert uploaded file into vditor 2025-08-01 00:41:52 +08:00
tim
c6a133978b fix: old version upload 2025-08-01 00:35:42 +08:00
Tim
ea17240cf1 feat: support presigned url upload 2025-07-31 22:34:27 +08:00
Tim
68e3daa736 Merge pull request #292 from nagisa77/n67uug-codex/add-user-mention-feature
Add mention notification feature
2025-07-31 20:24:23 +08:00
Tim
8d3bc728c5 feat: 通知自测通过 2025-07-31 20:22:44 +08:00
Tim
5486b9a6fe Merge pull request #293 from nagisa77/codex/add-special-hyperlink-for-user-mentions
Add user mention hyperlink
2025-07-31 20:08:20 +08:00
Tim
d4c1ad54fc Add mention link rendering in Markdown 2025-07-31 20:03:23 +08:00
Tim
4fcc47aa40 feat: 修改 @ 样式 2025-07-31 19:53:21 +08:00
Tim
954eb9afc4 Merge pull request #291 from nagisa77/codex/add-x-n-support-for-categories
Add counts for categories in menu
2025-07-31 18:06:13 +08:00
Tim
c94aeb9984 Merge branch 'main' of github.com:nagisa77/OpenIsle 2025-07-31 17:58:33 +08:00
Tim
aa70fc3273 feat: 修改通知 2025-07-31 17:58:15 +08:00
Tim
c541306494 Add mention suggestions and admin list 2025-07-31 17:57:25 +08:00
Tim
ef2aa43f03 feat(menu): show post count for categories 2025-07-31 17:48:28 +08:00
Tim
a02129b8f9 Merge pull request #290 from nagisa77/codex/fix-searchservice-constructor-argument-mismatch
Fix SearchServiceTest constructor
2025-07-31 14:08:44 +08:00
Tim
c4ecb80524 Fix SearchServiceTest to match new constructor 2025-07-31 14:08:32 +08:00
Tim
3ff94d0a5c bugfix: 修复首页可能会加载相同文章的问题 2025-07-31 13:51:20 +08:00
Tim
d385ce8c54 Merge pull request #289 from nagisa77/codex/refine-user_activity-notification-type 2025-07-31 13:15:07 +08:00
Tim
e2053c0428 feat: refine USER_ACTIVITY notifications 2025-07-31 13:13:45 +08:00
Tim
62096ba34d Merge pull request #288 from nagisa77/codex/add-keyword-matching-for-categories-and-tags
Add categories/tags to search
2025-07-31 12:52:39 +08:00
Tim
d4bfef36f7 feat: include categories and tags in global search 2025-07-31 12:52:25 +08:00
Tim
c242c89690 Merge pull request #287 from nagisa77/codex/adjust-latest-and-latest-reply-direction
Adjust default topic view to latest reply
2025-07-31 12:50:37 +08:00
Tim
a322d94f42 feat(frontend): default to latest reply view 2025-07-31 12:50:23 +08:00
Tim
aa38c2e5e1 Merge pull request #286 from nagisa77/codex/fix-sitemap-invalid-date-errors
Fix sitemap lastmod format
2025-07-30 20:52:21 +08:00
Tim
c16709a36d fix sitemap lastmod format 2025-07-30 20:51:59 +08:00
Tim
c52ac92549 feat: update robot.txt 2025-07-30 20:47:39 +08:00
Tim
33432a10f4 Merge pull request #285 from nagisa77/codex/fix-sitemap.xml-redirection-issue
Fix sitemap access without auth
2025-07-30 20:46:58 +08:00
Tim
cb5411c091 feat: make a sitemap api 2025-07-30 20:44:30 +08:00
Tim
dc4159b308 fix: allow public access to sitemap 2025-07-30 20:32:36 +08:00
Tim
86aff7aeb2 Merge pull request #284 from nagisa77/codex/generate-dynamic-sitemap.xml-for-posts
Add sitemap.xml endpoint
2025-07-30 20:19:29 +08:00
Tim
43c1f67b33 feat: add dynamic sitemap endpoint 2025-07-30 20:19:05 +08:00
Tim
2a7727e446 Merge pull request #283 from nagisa77/codex/fix-robots.txt-format-error
Add robots.txt file
2025-07-30 20:12:29 +08:00
Tim
b65bf7cc82 feat: add robot.txt 2025-07-30 20:11:35 +08:00
Tim
cab4b5c57d Add basic sitemap 2025-07-30 20:06:41 +08:00
Tim
1834636e01 Merge pull request #282 from nagisa77/codex/fix-missing-alt-attributes-for-images
Fix alt attributes for SEO
2025-07-30 20:01:04 +08:00
Tim
1aa39b8f91 Add missing alt attributes 2025-07-30 20:00:43 +08:00
Tim
a80ffbf85b Merge pull request #281 from nagisa77/codex/update-milk-tea-redemption-logic
Count real milk tea redemptions
2025-07-30 17:09:58 +08:00
Tim
18f3e31251 feat: track milk tea redemption count 2025-07-30 17:09:44 +08:00
Tim
7129514a9a Merge branch 'main' of github.com:nagisa77/OpenIsle 2025-07-30 16:55:03 +08:00
Tim
8711237cf8 feat: update toolbar layer 2025-07-30 16:54:51 +08:00
Tim
980e2e6d1e Merge pull request #280 from nagisa77/codex/fix-compilation-errors-in-notificationservicetest
Fix duplicate test mocks in NotificationServiceTest
2025-07-30 16:24:28 +08:00
Tim
1b98f09115 Fix duplicate ReactionRepository variables 2025-07-30 16:24:09 +08:00
Tim
e27c821d80 feat: email fix & default avatar 2025-07-30 14:47:10 +08:00
Tim
8efdd5a50d Merge pull request #279 from nagisa77/codex/remove-github-default-avatar
Switch to DiceBear default avatars
2025-07-30 14:25:03 +08:00
Tim
1fcdff6203 feat: use DiceBear for default avatars 2025-07-30 14:24:49 +08:00
Tim
b2779759c0 feat: mobile 修改 2025-07-30 13:05:20 +08:00
Tim
36652d3a39 Merge pull request #278 from nagisa77/codex/use-teleport-for-dropdown-mobile-page
Add Teleport for mobile dropdown menu
2025-07-30 13:02:33 +08:00
Tim
23ce2f7d1f use teleport for mobile dropdown 2025-07-30 13:01:43 +08:00
Tim
18c52c18e3 Merge pull request #277 from nagisa77/codex/refactor-notification-handling-to-async-thread
Enable asynchronous notification sending
2025-07-30 12:56:34 +08:00
Tim
03704b62a7 Merge branch 'main' into codex/refactor-notification-handling-to-async-thread 2025-07-30 12:56:27 +08:00
Tim
2a64e3ed14 Make ResendEmailSender asynchronous 2025-07-30 12:54:59 +08:00
Tim
3b69b1b3ee Merge pull request #276 from nagisa77/codex/fix-test-case-compilation-issues
Fix NotificationService tests
2025-07-30 12:47:51 +08:00
Tim
c7685f9b92 Fix NotificationServiceTest constructor 2025-07-30 12:47:39 +08:00
Tim
9347d423e2 Merge pull request #273 from nagisa77/codex/integrate-browser-notifications-for-website
Add web push notification support
2025-07-30 12:17:24 +08:00
Tim
854401ca8d feat: delete useless code 2025-07-30 12:16:20 +08:00
Tim
995cfdf87e feat: 修改邮件格式 2025-07-30 12:14:11 +08:00
Tim
748f7f9709 feat: 邮件、讯息通知 2025-07-30 12:06:23 +08:00
Tim
fb010607f1 Merge pull request #275 from nagisa77/codex/update-notification-format-for-replies-and-reactions
Improve push notifications
2025-07-30 11:53:56 +08:00
Tim
40c919348f feat: improve push notifications 2025-07-30 11:53:43 +08:00
Tim
fe79a5481a Merge remote-tracking branch 'origin/main' into codex/integrate-browser-notifications-for-website 2025-07-30 11:39:58 +08:00
Tim
02b0628bfc Merge pull request #274 from nagisa77/codex/add-email-notifications-for-user-replies
Add email notifications for replies and reactions
2025-07-30 11:37:55 +08:00
Tim
3464137511 feat: email notifications for replies and reactions 2025-07-30 11:37:40 +08:00
Tim
aa138afe61 feat: 推送链路调整 2025-07-30 11:35:28 +08:00
Tim
dccf8f9d0c feat: add browser push notifications 2025-07-30 10:48:02 +08:00
Tim
69f5745fe8 feat: 邮件发送,修改为中文 2025-07-30 10:42:06 +08:00
Tim
df8c5376f6 feat: delete sleep 1 s 2025-07-29 21:54:11 +08:00
Tim
2ec13ed2c9 feat: 评论排序支持 2025-07-29 21:50:11 +08:00
Tim
75a5be2d3c Merge pull request #272 from nagisa77/codex/add-comment-section-sorting-options
Add comment sorting by date and interactions
2025-07-29 21:33:21 +08:00
Tim
143ceebc00 feat: add comment sorting 2025-07-29 21:33:05 +08:00
Tim
24a46384b0 feat: sort by 2025-07-29 21:21:03 +08:00
Tim
d248be21e2 Merge branch 'main' of github.com:nagisa77/OpenIsle 2025-07-29 21:04:25 +08:00
Tim
27ec900780 fix: 2025-07-29 21:04:14 +08:00
Tim
393128b326 feat: blur 2025-07-29 21:01:51 +08:00
Tim
80a86cec3b Merge pull request #271 from nagisa77/codex/fix-test-case-compilation-error
Fix PostService test import
2025-07-29 19:52:48 +08:00
Tim
d6a1e53646 Fix PostService test compile error 2025-07-29 19:52:37 +08:00
Tim
275360983f feat: update avatar upload 2025-07-29 19:49:57 +08:00
Tim
89241ced04 feat: 搜索层级调整 2025-07-29 19:41:32 +08:00
Tim
3dbeb25a09 feat: 设置页面修改用户名,需要重新发放token 2025-07-29 19:12:39 +08:00
Tim
9aec1afcf5 feat: 活动新增🔥(低成本修改) 2025-07-29 18:41:03 +08:00
Tim
1f18c2b000 feat: 发布rate 明确指引 2025-07-29 18:39:23 +08:00
Tim
74433b507d Merge pull request #270 from nagisa77/codex/add-post-and-comment-rate-limiting
Implement comment and post rate limits
2025-07-29 18:33:43 +08:00
Tim
045693db21 Add rate limit for posts and comments 2025-07-29 18:33:30 +08:00
Tim
b84cc19ee5 Merge branch 'main' of github.com:nagisa77/OpenIsle 2025-07-29 18:32:44 +08:00
Tim
846cb4a2de Merge pull request #269 from nagisa77/codex/refactor-activity-popup-to-separate-file
Add global popups component
2025-07-29 18:32:32 +08:00
Tim
20b0eb0df5 refactor: move milk tea popup logic 2025-07-29 18:32:15 +08:00
Tim
08c78c8666 fix: router 页面宽度设置 2025-07-29 18:31:30 +08:00
Tim
23dc6a971c feat: 文章title 修改 2025-07-29 17:20:20 +08:00
Tim
9ed47c727b Merge pull request #268 from nagisa77/codex/optimize-site-for-seo-visibility
Implement dynamic metadata for post pages
2025-07-29 17:18:08 +08:00
Tim
e4dd121bb6 feat: dynamic meta for post page 2025-07-29 17:17:40 +08:00
Tim
92b7099a44 feat: 修复网站metaData 2025-07-29 17:13:58 +08:00
Tim
9589b10e2e Merge branch 'main' of github.com:nagisa77/OpenIsle 2025-07-29 17:04:08 +08:00
Tim
2226577b68 feat: 修复网站metaData 2025-07-29 17:03:43 +08:00
Tim
3bc530cbde Merge pull request #267 from nagisa77/codex/fix-unread-indicator-not-disappearing
Fix menu unread indicator
2025-07-29 14:53:49 +08:00
Tim
2a1c19697a fix: update unread notification handling 2025-07-29 14:53:21 +08:00
Tim
1ed65ff184 Merge branch 'main' of github.com:nagisa77/OpenIsle 2025-07-29 14:12:33 +08:00
Tim
2bc64ecc87 Merge pull request #266 from nagisa77/codex/add-popup-for-new-user-activity-guidance
Add milk-tea activity popup for new users
2025-07-29 14:12:21 +08:00
Tim
cdeed1fcb0 fix: 活动页增加loading/个人等级增加loading 2025-07-29 14:11:55 +08:00
Tim
816eacde42 feat: add activity popup for milk tea 2025-07-29 13:50:26 +08:00
Tim
8f76ee80f4 fix: 在 xxx 下回复了 格式修复 2025-07-29 13:49:38 +08:00
Tim
9f3e5df9ca Revert "chore: fix component name for lint"
This reverts commit b900e7c620.
2025-07-29 11:39:54 +08:00
Tim
9255b37533 Merge branch 'main' of github.com:nagisa77/OpenIsle 2025-07-29 11:36:32 +08:00
Tim
b48114a34c Merge pull request #265 from nagisa77/codex/add-popup-for-activity-page
Add milk tea activity popup
2025-07-29 11:36:04 +08:00
Tim
b900e7c620 chore: fix component name for lint 2025-07-29 11:35:49 +08:00
Tim
03164bc87a fix: 【openisle】就是选了类别或者tag之后,想要回到无筛选状态只能从筛选框点击无类别才能回去。点首页无法回到最初状态,是不是不太符合通用逻辑 2025-07-29 10:30:29 +08:00
Tim
cbc3819697 feat: activity page mobile 2025-07-28 16:21:11 +08:00
Tim
5193df6289 feat: redeem ui 2025-07-28 16:07:37 +08:00
Tim
8d6a118e97 Merge pull request #264 from nagisa77/codex/update-dialog-for-milk-tea-exchange
Refine milk tea redeem flow
2025-07-28 15:59:25 +08:00
Tim
de7a2c5b80 Update milk tea redeem dialog and notifications 2025-07-28 15:59:09 +08:00
Tim
54bf778977 feat: coffe redeem 2025-07-28 15:47:25 +08:00
Tim
96827afd41 Merge pull request #263 from nagisa77/codex/enhance-event-page-for-tea-exchange
Add milk tea event detail page
2025-07-28 15:11:43 +08:00
Tim
29c584f059 feat: add milk tea activity page 2025-07-28 15:11:25 +08:00
Tim
9a01a5daf6 feat: 活动页面基础ui 2025-07-28 14:52:26 +08:00
Tim
5a3456b878 Merge pull request #262 from nagisa77/codex/add-activity-module-and-endpoints
Add activity module with milk tea event
2025-07-28 14:12:43 +08:00
Tim
51a3a7b8f8 Add activity module with milk tea event 2025-07-28 14:12:28 +08:00
Tim
bcd34e1019 Merge pull request #261 from nagisa77/codex/add-info-icon-for-experience-module
Add experience info tooltip
2025-07-28 13:56:07 +08:00
Tim
69dbcd2572 Merge branch 'main' into codex/add-info-icon-for-experience-module 2025-07-28 13:55:45 +08:00
Tim
b953b4c8fe feat(profile): add exp info tooltip 2025-07-28 13:55:15 +08:00
Tim
62299d17f0 Merge branch 'main' of github.com:nagisa77/OpenIsle 2025-07-28 13:54:33 +08:00
Tim
38405f89b2 Merge pull request #260 from nagisa77/codex/fix-experience-points-exploitation-issue
Prevent XP farming via deletion
2025-07-28 13:53:06 +08:00
Tim
10080e6d74 fix: track daily experience to prevent abuse 2025-07-28 13:52:50 +08:00
Tim
46531b5461 feat: level 模块 2025-07-28 13:35:59 +08:00
Tim
56c89c3228 Merge branch 'main' of github.com:nagisa77/OpenIsle 2025-07-28 13:11:08 +08:00
Tim
55b545c058 Merge pull request #259 from nagisa77/codex/add-progress-bar-to-profile-page
Add level display on profile page
2025-07-28 13:10:56 +08:00
Tim
2f41da9486 feat: show level progress on profile 2025-07-28 13:10:41 +08:00
Tim
d1843fc58d feat: fotgot password 2025-07-28 13:09:10 +08:00
Tim
14008292d9 Merge pull request #258 from nagisa77/codex/add-password-recovery-feature
Add password recovery
2025-07-28 13:02:39 +08:00
Tim
0c784dc5cc feat: add password recovery 2025-07-28 13:02:02 +08:00
Tim
ef6ad46d12 Merge pull request #257 from nagisa77/codex/add-leveling-system-with-experience-rewards
Implement user leveling and rewards
2025-07-28 12:40:50 +08:00
Tim
1c2751422d feat: add user leveling and experience system 2025-07-28 12:34:45 +08:00
tim
a5900aa60d feat: ui 调整 2025-07-26 18:08:03 +08:00
tim
0028a501fb feat: 优化google登录提醒 2025-07-26 17:09:44 +08:00
536 changed files with 45211 additions and 23035 deletions

View File

@@ -0,0 +1,20 @@
---
name: 新功能建议
about: 请为该项目提出一个想法
title: ''
labels: ''
assignees: ''
---
**你的功能请求是否与某个问题相关?请描述。**
请清晰、简洁地说明问题。例如:“我经常因为……而感到困扰。”
**你期望的解决方案**
请清晰、简洁地描述你希望发生的事情/功能如何工作。
**你考虑过的替代方案**
请清晰、简洁地说明你已考虑过的其他解决方案或功能。
**其他上下文**
在此添加与功能请求相关的其他信息或截图。

View File

@@ -0,0 +1,41 @@
---
name: 错误/Bug报告
about: 创建报告以帮助我们改进
title: ''
labels: ''
assignees: ''
---
**描述 Bug**
对该 Bug 进行清晰简明的描述。
**复现步骤**
复现该问题的步骤:
1. 进入 '...'
2. 点击 '...'
3. 下拉到 '...'
4. 看到错误
**预期行为**
清晰简明地描述你期望发生的情况。
**截图**
如果适用,请添加截图以帮助解释问题。
**桌面端(请完成以下信息):**
* 操作系统:\[例如 iOS]
* 浏览器:\[例如 Chrome、Safari]
* 版本:\[例如 22]
**移动端(请完成以下信息):**
* 设备:\[例如 iPhone6]
* 操作系统:\[例如 iOS8.1]
* 浏览器:\[例如 系统自带浏览器、Safari]
* 版本:\[例如 22]
**附加上下文**
在此添加与问题相关的其他上下文信息。

23
.github/workflows/deploy-staging.yml vendored Normal file
View File

@@ -0,0 +1,23 @@
name: Staging CI & CD
on:
push:
branches: [main]
workflow_dispatch:
jobs:
build-and-deploy:
runs-on: ubuntu-latest
environment: Deploy
steps:
- uses: actions/checkout@v4
- name: Deploy to Server
uses: appleboy/ssh-action@v1.0.3
with:
host: ${{ secrets.SSH_HOST }}
username: root
key: ${{ secrets.SSH_KEY }}
script: bash /opt/openisle/deploy-staging.sh

View File

@@ -1,9 +1,9 @@
name: CI & CD
on:
push:
branches: [main]
workflow_dispatch:
schedule:
- cron: "0 19 * * *" # 每天 UTC 19:00相当于北京时间凌晨3点
jobs:
build-and-deploy:
@@ -11,29 +11,12 @@ jobs:
environment: Deploy
steps:
- uses: actions/checkout@v4
# - uses: actions/setup-java@v4
# with:
# java-version: '17'
# distribution: 'temurin'
# - run: mvn -B clean package -DskipTests
# - uses: actions/setup-node@v4
# with:
# node-version: '20'
# - run: |
# cd open-isle-cli
# npm ci
# npm run build
- name: Deploy to Server
uses: appleboy/ssh-action@v1.0.3
with:
host: ${{ secrets.SSH_HOST }}
username: root
key: ${{ secrets.SSH_KEY }}
script: bash /opt/openisle/deploy.sh
- uses: actions/checkout@v4
- name: Deploy to Server
uses: appleboy/ssh-action@v1.0.3
with:
host: ${{ secrets.SSH_HOST }}
username: root
key: ${{ secrets.SSH_KEY }}
script: bash /opt/openisle/deploy.sh

29
.gitignore vendored
View File

@@ -1,5 +1,30 @@
# IDE
.idea
target
openisle.iml
# log
logs
# deps
node_modules
dist
# test & build
coverage
out/
build
dist
*.tsbuildinfo
# misc
.DS_Store
*.pem
npm-debug.log*
yarn-debug.log*
yarn-error.log*
# env
*.env
.env*.local
# others
openisle.iml

1
.husky/pre-commit Executable file
View File

@@ -0,0 +1 @@
npx lint-staged

32
CODE_OF_CONDUCT.md Normal file
View File

@@ -0,0 +1,32 @@
# OpenIsle Code of Conduct
Like the technical community as a whole, the OpenIsle team and community is made up of a mixture of professionals and volunteers from all over the world, working on every aspect of the mission - including mentorship, teaching, and connecting people.
Diversity is one of our huge strengths, but it can also lead to communication issues and unhappiness. To that end, we have a few ground rules that we ask people to adhere to. This code applies equally to founders, mentors and those seeking help and guidance.
This isnt an exhaustive list of things that you cant do. Rather, take it in the spirit in which its intended - a guide to make it easier to enrich all of us and the technical communities in which we participate.
This code of conduct applies to all spaces managed by the OpenIsle project or . This includes IRC, the mailing lists, the issue tracker, DSF events, and any other forums created by the project team which the community uses for communication. In addition, violations of this code outside these spaces may affect a person's ability to participate within them.
If you believe someone is violating the code of conduct, we ask that you report it by emailing [](mailto:). For more details please see our
- **Be friendly and patient.**
- **Be welcoming.** We strive to be a community that welcomes and supports people of all backgrounds and identities. This includes, but is not limited to members of any race, ethnicity, culture, national origin, colour, immigration status, social and economic class, educational level, sex, sexual orientation, gender identity and expression, age, size, family status, political belief, religion, and mental and physical ability.
- **Be considerate.** Your work will be used by other people, and you in turn will depend on the work of others. Any decision you take will affect users and colleagues, and you should take those consequences into account when making decisions. Remember that we're a world-wide community, so you might not be communicating in someone else's primary language.
- **Be respectful.** Not all of us will agree all the time, but disagreement is no excuse for poor behavior and poor manners. We might all experience some frustration now and then, but we cannot allow that frustration to turn into a personal attack. Its important to remember that a community where people feel uncomfortable or threatened is not a productive one. Members of the OpenIsle community should be respectful when dealing with other members as well as with people outside the OpenIsle community.
- **Be careful in the words that you choose.** We are a community of professionals, and we conduct ourselves professionally. Be kind to others. Do not insult or put down other participants. Harassment and other exclusionary behavior aren't acceptable. This includes, but is not limited to:
- Violent threats or language directed against another person.
- Discriminatory jokes and language.
- Posting sexually explicit or violent material.
- Posting (or threatening to post) other people's personally identifying information ("doxing").
- Personal insults, especially those using racist or sexist terms.
- Unwelcome sexual attention.
- Advocating for, or encouraging, any of the above behavior.
- Repeated harassment of others. In general, if someone asks you to stop, then stop.
- **When we disagree, try to understand why.** Disagreements, both social and technical, happen all the time and OpenIsle is no exception. It is important that we resolve disagreements and differing views constructively. Remember that were different. The strength of OpenIsle comes from its varied community, people from a wide range of backgrounds. Different people have different perspectives on issues. Being unable to understand why someone holds a viewpoint doesnt mean that theyre wrong. Dont forget that it is human to err and blaming each other doesnt get us anywhere. Instead, focus on helping to resolve issues and learning from mistakes.
Original text courtesy of the [Speak Up! project](http://web.archive.org/web/20141109123859/http://speakup.io/coc.html).
## Questions?
If you have questions, please see . If that doesn't answer your questions, feel free to [contact us](mailto:).

210
CONTRIBUTING.md Normal file
View File

@@ -0,0 +1,210 @@
- [前置工作](#前置工作)
- [启动后端服务](#启动后端服务)
- [本地 IDEA](#本地-idea)
- [配置环境变量](#配置环境变量)
- [配置 IDEA 参数](#配置-idea-参数)
- [配置 MySQL](#配置-mysql)
- [Docker 环境](#docker-环境)
- [配置环境变量](#配置环境变量-1)
- [构建并启动镜像](#构建并启动镜像)
- [启动前端服务](#启动前端服务)
- [配置环境变量](#配置环境变量-2)
- [安装依赖和运行](#安装依赖和运行)
- [其他配置](#其他配置)
## 前置工作
先克隆仓库:
```shell
git clone https://github.com/nagisa77/OpenIsle.git
cd OpenIsle
```
- 后端开发环境
- JDK 17+
- 前端开发环境
- Node.JS 20+
## 启动后端服务
启动后端服务有多种方式,选择一种即可。
> [!IMPORTANT]
> 仅想修改前端的朋友可不用部署后端服务。转到 [启动前端服务](#启动前端服务) 章节。
### 本地 IDEA
```shell
cd backend/
```
IDEA 打开 `backend/` 文件夹。
#### 配置环境变量
1. 生成环境变量文件
```shell
cp open-isle.env.example open-isle.env
```
`open-isle.env.example` 是环境变量模板,`open-isle.env` 才是真正读取的内容
2. 修改环境变量,留下需要的,比如你要开发 Google 登录业务,就需要谷歌相关的变量,数据库是一定要的
![环境变量](assets/contributing/backend_img_7.png)
3. 应用环境文件,选择刚刚的 `open-isle.env`
可以在 `open-isle.env` 按需填写个性化的配置,该文件不会被 Git 追踪。比如你想把服务跑在 `8082`(默认为 `8080`),那么直接改 `open-isle.env` 即可:
```ini
SERVER_PORT=8082
```
另一种方式是修改 `.properities` 文件(但不建议),位于 `src/main/application.properties`,该配置同样来源于 `open-isle.env`,但修改 `.properties` 文件会被 Git 追踪。
![配置数据库](assets/contributing/backend_img_5.png)
#### 配置 IDEA 参数
- 设置 JDK 版本为 java 17
- 设置 VM Option最好运行在其他端口非 `8080`,这里设置 `8081`
```shell
-Dserver.port=8081
```
![配置1](assets/contributing/backend_img_3.png)
![配置2](assets/contributing/backend_img_2.png)
#### 配置 MySQL
> [!TIP]
> 如果不知道怎么配置数据库可以参考 [Docker 环境](#docker-环境) 章节
1. 本机配置 MySQL 服务(网上很多教程,忽略)
+ 可以用 Laragon自带 MySQL 包括 Nodejs版本建议 `6.x``7` 以后需要 Lisence
+ [下载地址](https://github.com/leokhoa/laragon/releases)
2. 填写环境变量
![环境变量](assets/contributing/backend_img_6.png)
```ini
MYSQL_URL=jdbc:mysql://<数据库地址>:<端口>/<数据库名>?useUnicode=yes&characterEncoding=UTF-8&useInformationSchema=true&useSSL=false&serverTimezone=UTC
MYSQL_USER=<数据库用户名>
MYSQL_PASSWORD=<数据库密码>
```
3. 执行 [`db/init/init_script.sql`](backend/src/main/resources/db/init/init_script.sql) 脚本,导入基本的数据
![初始化脚本](assets/contributing/resources_img.png)
4. 处理完环境问题直接跑起来就能通了
![运行画面](assets/contributing/backend_img_4.png)
### Docker 环境
#### 配置环境变量
```shell
cd docker/
```
主要配置两个 `.env` 文件
- `backend/open-isle.env`:后端环境变量,配置同上,见 [配置环境变量](#配置环境变量)。
- `docker/.env`Docker Compose 环境变量,主要配置 MySQL 相关
```shell
cp .env.example .env
```
> [!TIP]
> 使用单独的 `.env` 文件是为了兼容线上环境或已启用 MySQL 服务的情况,如果只是想快速体验或者启动统一的环境,则推荐使用本方式。
在指定 `docker/.env` 后,`backend/open-isle.env` 中以下配置会被覆盖,这样就确保使用了同一份配置。
```ini
MYSQL_URL=
MYSQL_USER=
MYSQL_PASSWORD=
```
#### 构建并启动镜像
```shell
docker compose up -d
```
如果想了解启动过程发生了什么可以查看日志
```shell
docker compose logs
```
## 启动前端服务
> [!IMPORTANT]
> **⚠️ 环境要求Node.js 版本最低 20.0.0(因为 Nuxt 框架要求)**
```shell
cd frontend_nuxt/
```
### 配置环境变量
前端可以依赖本机部署的后端,也可以直接调用线上的后端接口。
- 利用预发环境:**(⚠️ 强烈推荐只开发前端的朋友使用该环境)**
```shell
cp .env.staging.example .env
```
- 利用生产环境
```shell
cp .env.production.example .env
```
- 利用本地环境
```shell
cp .env.dev.example .env
```
### 安装依赖和运行
前端安装依赖并启动服务。
```shell
# 安装依赖
npm install --verbose
# 运行前端服务
npm run dev
```
如此一来,浏览器访问 http://127.0.0.1:3000 即可访问前端页面。
## 其他配置
配置第三方登录,这里以 GitHub 为例:
- 修改 `application.properties` 配置
![后端配置](assets/contributing/backend_img.png)
- 修改 `.env` 配置
![前端](assets/contributing/fontend_img.png)
- 配置第三方登录回调地址
![github配置](assets/contributing/github_img.png)
![github配置2](assets/contributing/github_img_2.png)

21
LICENSE Normal file
View File

@@ -0,0 +1,21 @@
MIT License
Copyright (c) 2025 Tim
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

View File

@@ -1,28 +1,21 @@
<p align="center">
<img alt="OpenIsle" src="https://openisle-1307107697.cos.ap-guangzhou.myqcloud.com/assert/image.png" width="200">
<br><br>
高效的开源社区前后端平台
<br><br>
<a href="LICENSE"><img src="https://img.shields.io/badge/license-MIT-blue.svg?style=flat-square"></a>
<br>
高效的开源社区前后端平台
<br><br><br>
<img alt="Image" src="https://openisle-1307107697.cos.accelerate.myqcloud.com/dynamic_assert/22752cfac5a04a9c90c41995b9f55fed.png" width="1200">
</p>
## 💡 简介
OpenIsle 是一个使用 Spring Boot 和 Vue 3 构建的全栈开源社区平台,提供用户注册、登录、贴文发布、评论交互等完整功能,可用于项目社区或直接打造自主社区站点。
## 🚀 部署
## 🚧 开发 & 部署
### 后端
1. 确保安装 JDK 17 及 Maven
2. 信息配置修改 `src/main/resources/application.properties`,或通过环境变量设置数据库等参数
3. 执行 `mvn clean package` 生成包,之后使用 `java -jar target/openisle-0.0.1-SNAPSHOT.jar`启动,或在开发时直接使用 `mvn spring-boot:run`
### 前端
1. `cd open-isle-cli`
2. 执行 `npm install`
3. `npm run serve`可在本地启动开发服务,产品环境使用 `npm run build`生成 `dist/` 文件,配合线上网站方式部署
详细见 [Contributing](https://github.com/nagisa77/OpenIsle?tab=contributing-ov-file)
## ✨ 项目特点
- JWT 认证以及 Google、GitHub、Discord、Twitter 等多种 OAuth 登录
- 支持分类、标签的贴文管理以及草稿保存功能
- 嵌套评论、指定贴文或评论的点赞/抖弹系统
@@ -31,14 +24,18 @@ OpenIsle 是一个使用 Spring Boot 和 Vue 3 构建的全栈开源社区平台
- 集成 OpenAI 提供的 Markdown 格式化功能
- 通过环境变量可调整密码强度、登录方式、保护码等多种配置
- 支持图片上传,默认使用腾讯云 COS 扩展
- 默认头像使用 DiceBear Avatars可通过 `AVATAR_STYLE``AVATAR_SIZE` 环境变量自定义主题和大小
- 浏览器推送通知,离开网站也能及时收到提醒
## 🌟 项目优势
- 全面开源,便于二次开发和自定义扩展
- Spring Boot + Vue 3 成熟技术栈,学习起点低,社区资源丰富
- 支持多种登录方式和角色权限,容易展展到不同场景
- 模块化设计,代码结构清晰,维护成本低
- REST API 可接入任意前端框架,兼容多端平台
- 配置简单,通过环境变量快速调整和部署
- 如需推送通知,请设置 `WEBPUSH_PUBLIC_KEY``WEBPUSH_PRIVATE_KEY` 环境变量
## 🏘️ 社区
@@ -49,6 +46,7 @@ OpenIsle 是一个使用 Spring Boot 和 Vue 3 构建的全栈开源社区平台
本项目以 MIT License 发布,欢迎自由使用与修改。
## 🙏 鼓赞
- [Spring Boot](https://spring.io/projects/spring-boot)
- [JJWT](https://github.com/jwtk/jjwt)
- [Lombok](https://github.com/projectlombok/lombok)

View File

Binary file not shown.

After

Width:  |  Height:  |  Size: 49 KiB

View File

Binary file not shown.

After

Width:  |  Height:  |  Size: 204 KiB

View File

Binary file not shown.

After

Width:  |  Height:  |  Size: 30 KiB

View File

Binary file not shown.

After

Width:  |  Height:  |  Size: 242 KiB

View File

Binary file not shown.

After

Width:  |  Height:  |  Size: 94 KiB

View File

Binary file not shown.

After

Width:  |  Height:  |  Size: 239 KiB

View File

Binary file not shown.

After

Width:  |  Height:  |  Size: 90 KiB

View File

Binary file not shown.

After

Width:  |  Height:  |  Size: 26 KiB

View File

Binary file not shown.

After

Width:  |  Height:  |  Size: 103 KiB

View File

Binary file not shown.

After

Width:  |  Height:  |  Size: 174 KiB

View File

Binary file not shown.

After

Width:  |  Height:  |  Size: 43 KiB

View File

@@ -0,0 +1,49 @@
# === Spring Boot ===
SERVER_PORT=8080
# === Database ===
MYSQL_URL=jdbc:mysql://<数据库地址>:<数据库端口>/<数据库名>?useUnicode=yes&characterEncoding=UTF-8&useInformationSchema=true&useSSL=false&serverTimezone=UTC
MYSQL_USER=<数据库用户名>
MYSQL_PASSWORD=<数据库密码>
# === JWT ===
JWT_SECRET=<jwt secret>
JWT_REASON_SECRET=<jwt reason secret>
JWT_RESET_SECRET=<jwt reset secret>
JWT_INVITE_SECRET=<jwt invite secret>
JWT_EXPIRATION=2592000000
# === Resend ===
RESEND_API_KEY=<你的resend-api-key>
# === COS ===
# COS_BASE_URL=https://<你的cos>.cos.ap-guangzhou.myqcloud.com
COS_BASE_URL=https://<你的cos>.cos.accelerate.myqcloud.com
COS_SECRET_ID=<你的cos-secret-id>
COS_SECRET_KEY=<你的cos-secret-key>
COS_BUCKET_NAME=<你的cos-bucket-name>
# === OAuth ===
GOOGLE_CLIENT_ID=<你的google-client-id>
GITHUB_CLIENT_ID=<你的github-client-id>
GITHUB_CLIENT_SECRET=<你的github-client-secret>
TWITTER_CLIENT_ID=<你的twitter-client-id>
TWITTER_CLIENT_SECRET=<你的-twitter-client-secret>
DISCORD_CLIENT_ID=<你的discord-client-id>
DISCORD_CLIENT_SECRET=<你的discord-client-secret>
TELEGRAM_BOT_TOKEN=<你的telegram-bot-token>
# === OPENAI ===
OPENAI_API_KEY=<你的openai-api-key>
# === Webpush ===
WEBPUSH_PUBLIC_KEY=<你的webpush-public-key>
WEBPUSH_PRIVATE_KEY=<你的webpush-private-key>
# === RabbitMQ ===
RABBITMQ_HOST=<你的rabbitmq_host>
RABBITMQ_PORT=<你的rabbitmq_port>
RABBITMQ_USERNAME=<你的rabbitmq_username>
RABBITMQ_PASSWORD=<你的rabbitmq_password>
# LOG_LEVEL=DEBUG

View File

@@ -26,6 +26,23 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-amqp</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-redis</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-hibernate6</artifactId>
<version>2.20.0</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
@@ -38,6 +55,16 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-security</artifactId>
</dependency>
<dependency>
<groupId>com.vladsch.flexmark</groupId>
<artifactId>flexmark-all</artifactId>
<version>0.64.8</version>
</dependency>
<dependency>
<groupId>org.jsoup</groupId>
<artifactId>jsoup</artifactId>
<version>1.17.2</version>
</dependency>
<dependency>
<groupId>com.mysql</groupId>
<artifactId>mysql-connector-j</artifactId>
@@ -90,6 +117,21 @@
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>nl.martijndwars</groupId>
<artifactId>web-push</artifactId>
<version>5.1.1</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
<version>1.70</version>
</dependency>
<dependency>
<groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-starter-webmvc-api</artifactId>
<version>2.2.0</version>
</dependency>
</dependencies>
<build>
@@ -117,6 +159,26 @@
</annotationProcessorPaths>
</configuration>
</plugin>
<plugin>
<!-- https://github.com/OpenAPITools/openapi-generator/blob/master/modules/openapi-generator-maven-plugin/README.md -->
<groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-maven-plugin</artifactId>
<version>1.4</version>
<executions>
<execution>
<goals>
<goal>generate</goal>
</goals>
</execution>
</executions>
<configuration>
<!-- 此处为硬编码,应优化为 env 的配置 -->
<apiDocsUrl>http://localhost:8080/api/v3/api-docs</apiDocsUrl>
<outputFileName>openapi.json</outputFileName>
<outputDir>${project.build.directory}</outputDir>
</configuration>
</plugin>
</plugins>
</build>
</project>

View File

@@ -2,8 +2,10 @@ package com.openisle;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.scheduling.annotation.EnableScheduling;
@SpringBootApplication
@EnableScheduling
public class OpenIsleApplication {
public static void main(String[] args) {
SpringApplication.run(OpenIsleApplication.class, args);

View File

@@ -0,0 +1,39 @@
package com.openisle.config;
import com.openisle.model.Activity;
import com.openisle.model.ActivityType;
import com.openisle.repository.ActivityRepository;
import lombok.RequiredArgsConstructor;
import org.springframework.boot.CommandLineRunner;
import org.springframework.stereotype.Component;
import java.time.LocalDate;
import java.time.LocalDateTime;
@Component
@RequiredArgsConstructor
public class ActivityInitializer implements CommandLineRunner {
private final ActivityRepository activityRepository;
@Override
public void run(String... args) {
if (activityRepository.findByType(ActivityType.MILK_TEA) == null) {
Activity a = new Activity();
a.setTitle("🎡建站送奶茶活动");
a.setType(ActivityType.MILK_TEA);
a.setIcon("https://icons.veryicon.com/png/o/food--drinks/delicious-food-1/coffee-36.png");
a.setContent("为了有利于建站推广以及激励发布内容我们推出了建站送奶茶的活动前50名达到level 1的用户可以联系站长获取奶茶/咖啡一杯");
activityRepository.save(a);
}
if (activityRepository.findByType(ActivityType.INVITE_POINTS) == null) {
Activity a = new Activity();
a.setTitle("🎁邀请码送积分活动");
a.setType(ActivityType.INVITE_POINTS);
a.setIcon("https://img.icons8.com/color/96/gift.png");
a.setContent("使用邀请码注册或邀请好友即可获得积分奖励,快来参与吧!");
a.setStartTime(LocalDateTime.now());
a.setEndTime(LocalDate.of(LocalDate.now().getYear(), 10, 1).atStartOfDay());
activityRepository.save(a);
}
}
}

View File

@@ -0,0 +1,23 @@
package com.openisle.config;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.scheduling.annotation.EnableAsync;
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
import java.util.concurrent.Executor;
@Configuration
@EnableAsync
public class AsyncConfig {
@Bean(name = "notificationExecutor")
public Executor notificationExecutor() {
ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
executor.setCorePoolSize(2);
executor.setMaxPoolSize(10);
executor.setQueueCapacity(100);
executor.setThreadNamePrefix("notification-");
executor.initialize();
return executor;
}
}

View File

@@ -0,0 +1,109 @@
package com.openisle.config;
import com.fasterxml.jackson.annotation.JsonAutoDetect;
import com.fasterxml.jackson.annotation.JsonTypeInfo;
import com.fasterxml.jackson.annotation.PropertyAccessor;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.jsontype.impl.LaissezFaireSubTypeValidator;
import com.fasterxml.jackson.datatype.hibernate6.Hibernate6Module;
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
import org.springframework.cache.CacheManager;
import org.springframework.cache.annotation.EnableCaching;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Primary;
import org.springframework.data.redis.cache.RedisCacheConfiguration;
import org.springframework.data.redis.cache.RedisCacheManager;
import org.springframework.data.redis.connection.RedisConnectionFactory;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer;
import org.springframework.data.redis.serializer.RedisSerializationContext;
import org.springframework.data.redis.serializer.RedisSerializer;
import org.springframework.data.redis.serializer.StringRedisSerializer;
import java.time.Duration;
/**
* Redis 缓存配置类
* @author smallclover
* @since 2025-09-04
*/
@Configuration
@EnableCaching
public class CachingConfig {
// 标签缓存名
public static final String TAG_CACHE_NAME="openisle_tags";
// 分类缓存名
public static final String CATEGORY_CACHE_NAME="openisle_categories";
/**
* 自定义Redis的序列化器
* @return
*/
@Bean()
@Primary
public RedisSerializer<Object> redisSerializer() {
// 注册 JavaTimeModule 來支持 Java 8 的日期和时间 API,否则回报一下错误同时还要引入jsr310
// org.springframework.data.redis.serializer.SerializationException: Could not write JSON: Java 8 date/time type `java.time.LocalDateTime` not supported by default:
// add Module "com.fasterxml.jackson.datatype:jackson-datatype-jsr310" to enable handling
// (through reference chain: java.util.ArrayList[0]->com.openisle.dto.TagDto["createdAt"])
// 设置可见性,允许序列化所有元素
ObjectMapper objectMapper = new ObjectMapper();
objectMapper.registerModule(new JavaTimeModule());
// Hibernate6Module 可以自动处理懒加载代理对象。
// Tag对象的creator是FetchType.LAZY
objectMapper.registerModule(new Hibernate6Module()
.disable(Hibernate6Module.Feature.USE_TRANSIENT_ANNOTATION));
// service的时候带上类型信息
// 启用类型信息,避免 LinkedHashMap 问题
objectMapper.activateDefaultTyping(
LaissezFaireSubTypeValidator.instance,
ObjectMapper.DefaultTyping.NON_FINAL,
JsonTypeInfo.As.PROPERTY
);
objectMapper.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY);
return new GenericJackson2JsonRedisSerializer(objectMapper);
}
/**
* 配置 Spring Cache 使用 RedisCacheManager
*/
@Bean
public CacheManager cacheManager(RedisConnectionFactory connectionFactory, RedisSerializer<Object> redisSerializer) {
RedisCacheConfiguration config = RedisCacheConfiguration.defaultCacheConfig()
.entryTtl(Duration.ZERO) // 默认缓存不过期
.serializeKeysWith(RedisSerializationContext.SerializationPair.fromSerializer(new StringRedisSerializer()))
.serializeValuesWith(RedisSerializationContext.SerializationPair.fromSerializer(redisSerializer))
.disableCachingNullValues(); // 禁止缓存 null 值
// 个别缓存单独设置TTL时间
// Map<String, RedisCacheConfiguration> cacheConfigs = new HashMap<>();
// cacheConfigs.put("openisle_tags", RedisCacheConfiguration.defaultCacheConfig().entryTtl(Duration.ZERO));
// cacheConfigs.put("openisle_categories", RedisCacheConfiguration.defaultCacheConfig().entryTtl(Duration.ZERO));
return RedisCacheManager.builder(connectionFactory)
.cacheDefaults(config)
.build();
}
/**
* 配置 RedisTemplate支持直接操作 Redis
*/
@Bean
public RedisTemplate<String, Object> redisTemplate(RedisConnectionFactory connectionFactory, RedisSerializer<Object> redisSerializer) {
RedisTemplate<String, Object> template = new RedisTemplate<>();
template.setConnectionFactory(connectionFactory);
// key 和 hashKey 使用 String 序列化
template.setKeySerializer(new StringRedisSerializer());
template.setHashKeySerializer(new StringRedisSerializer());
// value 和 hashValue 使用 JSON 序列化
template.setValueSerializer(redisSerializer);
template.setHashValueSerializer(redisSerializer);
return template;
}
}

View File

@@ -0,0 +1,32 @@
package com.openisle.config;
import com.openisle.model.MessageConversation;
import com.openisle.repository.MessageConversationRepository;
import lombok.RequiredArgsConstructor;
import org.springframework.boot.CommandLineRunner;
import org.springframework.stereotype.Component;
@Component
@RequiredArgsConstructor
public class ChannelInitializer implements CommandLineRunner {
private final MessageConversationRepository conversationRepository;
@Override
public void run(String... args) {
if (conversationRepository.countByChannelTrue() == 0) {
MessageConversation chat = new MessageConversation();
chat.setChannel(true);
chat.setName("吹水群");
chat.setDescription("吹水聊天");
chat.setAvatar("https://openisle-1307107697.cos.accelerate.myqcloud.com/dynamic_assert/32647273e2334d14adfd4a6ce9db0643.jpeg");
conversationRepository.save(chat);
MessageConversation tech = new MessageConversation();
tech.setChannel(true);
tech.setName("技术讨论群");
tech.setDescription("讨论技术相关话题");
tech.setAvatar("https://openisle-1307107697.cos.accelerate.myqcloud.com/dynamic_assert/5edde9a5864e471caa32491dbcdaa8b2.png");
conversationRepository.save(tech);
}
}
}

View File

@@ -0,0 +1,48 @@
package com.openisle.config;
import io.swagger.v3.oas.models.Components;
import io.swagger.v3.oas.models.OpenAPI;
import io.swagger.v3.oas.models.info.Info;
import io.swagger.v3.oas.models.security.SecurityRequirement;
import io.swagger.v3.oas.models.security.SecurityScheme;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@Configuration
public class OpenApiConfig {
@Value("${springdoc.info.title}")
private String title;
@Value("${springdoc.info.description}")
private String description;
@Value("${springdoc.info.version}")
private String version;
@Value("${springdoc.info.scheme}")
private String scheme;
@Value("${springdoc.info.header}")
private String header;
@Bean
public OpenAPI openAPI() {
SecurityScheme securityScheme = new SecurityScheme()
.type(SecurityScheme.Type.HTTP)
.scheme(scheme.toLowerCase())
.bearerFormat("JWT")
.in(SecurityScheme.In.HEADER)
.name(header);
return new OpenAPI()
.info(new Info()
.title(title)
.description(description)
.version(version))
.components(new Components()
.addSecuritySchemes("JWT", securityScheme))
.addSecurityItem(new SecurityRequirement().addList("JWT"));
}
}

View File

@@ -0,0 +1,31 @@
package com.openisle.config;
import com.openisle.model.PointGood;
import com.openisle.repository.PointGoodRepository;
import lombok.RequiredArgsConstructor;
import org.springframework.boot.CommandLineRunner;
import org.springframework.stereotype.Component;
/** Initialize default point mall goods. */
@Component
@RequiredArgsConstructor
public class PointGoodInitializer implements CommandLineRunner {
private final PointGoodRepository pointGoodRepository;
@Override
public void run(String... args) {
if (pointGoodRepository.count() == 0) {
PointGood g1 = new PointGood();
g1.setName("GPT Plus 1 个月");
g1.setCost(20000);
g1.setImage("https://openisle-1307107697.cos.ap-guangzhou.myqcloud.com/assert/icons/chatgpt.png");
pointGoodRepository.save(g1);
PointGood g2 = new PointGood();
g2.setName("奶茶");
g2.setCost(5000);
g2.setImage("https://openisle-1307107697.cos.ap-guangzhou.myqcloud.com/assert/icons/coffee.png");
pointGoodRepository.save(g2);
}
}
}

View File

@@ -0,0 +1,204 @@
package com.openisle.config;
import lombok.RequiredArgsConstructor;
import org.springframework.amqp.core.Binding;
import org.springframework.amqp.core.BindingBuilder;
import org.springframework.amqp.core.Queue;
import org.springframework.amqp.core.TopicExchange;
import org.springframework.amqp.rabbit.connection.ConnectionFactory;
import org.springframework.amqp.rabbit.core.RabbitTemplate;
import org.springframework.amqp.support.converter.Jackson2JsonMessageConverter;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.springframework.amqp.rabbit.core.RabbitAdmin;
import org.springframework.boot.CommandLineRunner;
import org.springframework.context.annotation.DependsOn;
import jakarta.annotation.PostConstruct;
import java.util.ArrayList;
import java.util.List;
@Configuration
@RequiredArgsConstructor
public class RabbitMQConfig {
public static final String EXCHANGE_NAME = "openisle-exchange";
// 保持向后兼容的常量
public static final String QUEUE_NAME = "notifications-queue";
public static final String ROUTING_KEY = "notifications.routingkey";
// 硬编码为16以匹配ShardingStrategy中的十六进制分片逻辑
private final int queueCount = 16;
@Value("${rabbitmq.queue.durable}")
private boolean queueDurable;
@PostConstruct
public void init() {
System.out.println("RabbitMQ配置初始化: 队列数量=" + queueCount + ", 持久化=" + queueDurable);
}
@Bean
public TopicExchange exchange() {
return new TopicExchange(EXCHANGE_NAME);
}
/**
* 创建所有分片队列, 使用十六进制后缀 (0-f)
*/
@Bean
public List<Queue> shardedQueues() {
System.out.println("开始创建分片队列 Bean...");
List<Queue> queues = new ArrayList<>();
for (int i = 0; i < queueCount; i++) {
String shardKey = Integer.toHexString(i);
String queueName = "notifications-queue-" + shardKey;
Queue queue = new Queue(queueName, queueDurable);
queues.add(queue);
}
System.out.println("分片队列 Bean 创建完成,总数: " + queues.size());
return queues;
}
/**
* 创建所有分片绑定, 使用十六进制路由键 (notifications.shard.0 - notifications.shard.f)
*/
@Bean
public List<Binding> shardedBindings(TopicExchange exchange, @Qualifier("shardedQueues") List<Queue> shardedQueues) {
System.out.println("开始创建分片绑定 Bean...");
List<Binding> bindings = new ArrayList<>();
if (shardedQueues != null) {
for (Queue queue : shardedQueues) {
String queueName = queue.getName();
String shardKey = queueName.substring("notifications-queue-".length());
String routingKey = "notifications.shard." + shardKey;
Binding binding = BindingBuilder.bind(queue).to(exchange).with(routingKey);
bindings.add(binding);
}
}
System.out.println("分片绑定 Bean 创建完成,总数: " + bindings.size());
return bindings;
}
/**
* 保持向后兼容的单队列配置(可选)
*/
@Bean
public Queue legacyQueue() {
return new Queue(QUEUE_NAME, queueDurable);
}
/**
* 保持向后兼容的单队列绑定(可选)
*/
@Bean
public Binding legacyBinding(Queue legacyQueue, TopicExchange exchange) {
return BindingBuilder.bind(legacyQueue).to(exchange).with(ROUTING_KEY);
}
@Bean
public Jackson2JsonMessageConverter messageConverter() {
ObjectMapper objectMapper = new ObjectMapper();
objectMapper.registerModule(new com.fasterxml.jackson.datatype.jsr310.JavaTimeModule());
objectMapper.disable(com.fasterxml.jackson.databind.SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
return new Jackson2JsonMessageConverter(objectMapper);
}
@Bean
public RabbitAdmin rabbitAdmin(ConnectionFactory connectionFactory) {
return new RabbitAdmin(connectionFactory);
}
@Bean
public RabbitTemplate rabbitTemplate(ConnectionFactory connectionFactory) {
RabbitTemplate template = new RabbitTemplate(connectionFactory);
template.setMessageConverter(messageConverter());
return template;
}
/**
* 使用 CommandLineRunner 确保在应用完全启动后声明队列到 RabbitMQ
* 这样可以确保 RabbitAdmin 和所有 Bean 都已正确初始化
*/
@Bean
@DependsOn({"rabbitAdmin", "shardedQueues", "exchange"})
public CommandLineRunner queueDeclarationRunner(RabbitAdmin rabbitAdmin,
@Qualifier("shardedQueues") List<Queue> shardedQueues,
TopicExchange exchange,
Queue legacyQueue,
@Qualifier("shardedBindings") List<Binding> shardedBindings,
Binding legacyBinding) {
return args -> {
System.out.println("=== 开始主动声明 RabbitMQ 组件 ===");
try {
// 声明交换
rabbitAdmin.declareExchange(exchange);
// 声明分片队列 - 检查存在性
System.out.println("开始检查并声明 " + shardedQueues.size() + " 个分片队列...");
int successCount = 0;
int skippedCount = 0;
for (Queue queue : shardedQueues) {
String queueName = queue.getName();
try {
// 使用 declareQueue 的返回值判断队列是否已存在
// 如果队列已存在且配置匹配declareQueue 会返回现有队列信息
// 如果不匹配或不存在,会创建新队列
rabbitAdmin.declareQueue(queue);
successCount++;
} catch (org.springframework.amqp.AmqpIOException e) {
if (e.getMessage().contains("PRECONDITION_FAILED") && e.getMessage().contains("durable")) {
skippedCount++;
}
} catch (Exception e) {
System.err.println("队列声明失败: " + queueName + ", 错误: " + e.getMessage());
}
}
System.out.println("分片队列处理完成: 成功 " + successCount + ", 跳过 " + skippedCount + ", 总数 " + shardedQueues.size());
// 声明分片绑定
System.out.println("开始声明 " + shardedBindings.size() + " 个分片绑定...");
int bindingSuccessCount = 0;
for (Binding binding : shardedBindings) {
try {
rabbitAdmin.declareBinding(binding);
bindingSuccessCount++;
} catch (Exception e) {
System.err.println("绑定声明失败: " + e.getMessage());
}
}
System.out.println("分片绑定声明完成: 成功 " + bindingSuccessCount + "/" + shardedBindings.size());
// 声明遗留队列和绑定 - 检查存在性
try {
rabbitAdmin.declareQueue(legacyQueue);
rabbitAdmin.declareBinding(legacyBinding);
System.out.println("遗留队列和绑定就绪: " + QUEUE_NAME + " (已存在或新创建)");
} catch (org.springframework.amqp.AmqpIOException e) {
if (e.getMessage().contains("PRECONDITION_FAILED") && e.getMessage().contains("durable")) {
System.out.println("遗留队列已存在但 durable 设置不匹配: " + QUEUE_NAME + ", 保持现有队列");
} else {
System.err.println("遗留队列声明失败: " + QUEUE_NAME + ", 错误: " + e.getMessage());
}
} catch (Exception e) {
System.err.println("遗留队列声明失败: " + QUEUE_NAME + ", 错误: " + e.getMessage());
}
System.out.println("=== RabbitMQ 组件声明完成 ===");
System.out.println("请检查 RabbitMQ 管理界面确认队列已正确创建");
} catch (Exception e) {
System.err.println("RabbitMQ 组件声明过程中发生严重错误:");
e.printStackTrace();
}
};
}
}

View File

@@ -0,0 +1,35 @@
package com.openisle.config;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.data.redis.connection.RedisConnectionFactory;
import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
import org.springframework.stereotype.Component;
/**
* Logs a message when a Redis connection is successfully established.
*/
@Component
@Slf4j
public class RedisConnectionLogger implements InitializingBean {
private final RedisConnectionFactory connectionFactory;
public RedisConnectionLogger(RedisConnectionFactory connectionFactory) {
this.connectionFactory = connectionFactory;
}
@Override
public void afterPropertiesSet() {
try (var connection = connectionFactory.getConnection()) {
connection.ping();
if (connectionFactory instanceof LettuceConnectionFactory lettuce) {
log.info("Redis connection established at {}:{}", lettuce.getHostName(), lettuce.getPort());
} else {
log.info("Redis connection established");
}
} catch (Exception e) {
log.error("Failed to connect to Redis", e);
}
}
}

View File

@@ -0,0 +1,20 @@
package com.openisle.config;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
import org.springframework.scheduling.TaskScheduler;
@Configuration
@EnableScheduling
public class SchedulerConfig {
@Bean
public TaskScheduler taskScheduler() {
ThreadPoolTaskScheduler scheduler = new ThreadPoolTaskScheduler();
scheduler.setPoolSize(2);
scheduler.setThreadNamePrefix("lottery-");
scheduler.initialize();
return scheduler;
}
}

View File

@@ -74,11 +74,22 @@ public class SecurityConfig {
CorsConfiguration cfg = new CorsConfiguration();
cfg.setAllowedOrigins(List.of(
"http://127.0.0.1:8080",
"http://127.0.0.1:8081",
"http://127.0.0.1:8082",
"http://127.0.0.1:3000",
"http://127.0.0.1:3001",
"http://127.0.0.1",
"http://localhost:8080",
"http://localhost:8081",
"http://localhost:8082",
"http://localhost:3000",
"http://localhost:3001",
"http://localhost",
"http://30.211.97.254:8080",
"http://30.211.97.254",
"http://30.211.97.238:3000",
"http://30.211.97.238",
"http://192.168.7.98",
"http://192.168.7.98:3000",
"https://petstore.swagger.io",
websiteUrl,
websiteUrl.replace("://www.", "://")
));
@@ -93,11 +104,14 @@ public class SecurityConfig {
@Bean
public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
http.csrf(csrf -> csrf.disable())
.cors(Customizer.withDefaults()) // Spring 自带 CorsFilter 处理预检
.sessionManagement(sm -> sm.sessionCreationPolicy(SessionCreationPolicy.STATELESS))
.cors(Customizer.withDefaults())
.headers(h -> h.frameOptions(f -> f.sameOrigin()))
.sessionManagement(sm -> sm.sessionCreationPolicy(SessionCreationPolicy.STATELESS))
.exceptionHandling(eh -> eh.accessDeniedHandler(customAccessDeniedHandler))
.authorizeHttpRequests(auth -> auth
.requestMatchers(HttpMethod.OPTIONS, "/**").permitAll()
.requestMatchers("/api/ws/**", "/api/sockjs/**").permitAll()
.requestMatchers("/api/v3/api-docs/**").permitAll()
.requestMatchers(HttpMethod.POST, "/api/auth/**").permitAll()
.requestMatchers(HttpMethod.GET, "/api/posts/**").permitAll()
.requestMatchers(HttpMethod.GET, "/api/comments/**").permitAll()
@@ -108,11 +122,20 @@ public class SecurityConfig {
.requestMatchers(HttpMethod.POST,"/api/auth/reason").permitAll()
.requestMatchers(HttpMethod.GET, "/api/search/**").permitAll()
.requestMatchers(HttpMethod.GET, "/api/users/**").permitAll()
.requestMatchers(HttpMethod.GET, "/api/medals/**").permitAll()
.requestMatchers(HttpMethod.GET, "/api/push/public-key").permitAll()
.requestMatchers(HttpMethod.GET, "/api/reaction-types").permitAll()
.requestMatchers(HttpMethod.GET, "/api/activities/**").permitAll()
.requestMatchers(HttpMethod.GET, "/api/sitemap.xml").permitAll()
.requestMatchers(HttpMethod.GET, "/api/channels").permitAll()
.requestMatchers(HttpMethod.GET, "/api/rss").permitAll()
.requestMatchers(HttpMethod.GET, "/api/point-goods").permitAll()
.requestMatchers(HttpMethod.POST, "/api/point-goods").permitAll()
.requestMatchers(HttpMethod.POST, "/api/categories/**").hasAuthority("ADMIN")
.requestMatchers(HttpMethod.POST, "/api/tags/**").authenticated()
.requestMatchers(HttpMethod.DELETE, "/api/categories/**").hasAuthority("ADMIN")
.requestMatchers(HttpMethod.DELETE, "/api/tags/**").hasAuthority("ADMIN")
.requestMatchers(HttpMethod.GET, "/api/stats/**").hasAuthority("ADMIN")
.requestMatchers("/api/admin/**").hasAuthority("ADMIN")
.anyRequest().authenticated()
)
@@ -137,8 +160,12 @@ public class SecurityConfig {
boolean publicGet = "GET".equalsIgnoreCase(request.getMethod()) &&
(uri.startsWith("/api/posts") || uri.startsWith("/api/comments") ||
uri.startsWith("/api/categories") || uri.startsWith("/api/tags") ||
uri.startsWith("/api/search") || uri.startsWith("/api/users") ||
uri.startsWith("/api/reaction-types") || uri.startsWith("/api/config"));
uri.startsWith("/api/search") || uri.startsWith("/api/users") ||
uri.startsWith("/api/reaction-types") || uri.startsWith("/api/config") ||
uri.startsWith("/api/activities") || uri.startsWith("/api/push/public-key") ||
uri.startsWith("/api/point-goods") || uri.startsWith("/api/channels") ||
uri.startsWith("/api/sitemap.xml") || uri.startsWith("/api/medals") ||
uri.startsWith("/api/rss"));
if (authHeader != null && authHeader.startsWith("Bearer ")) {
String token = authHeader.substring(7);
@@ -154,7 +181,9 @@ public class SecurityConfig {
response.getWriter().write("{\"error\": \"Invalid or expired token\"}");
return;
}
} else if (!uri.startsWith("/api/auth") && !publicGet) {
} else if (!uri.startsWith("/api/auth") && !publicGet
&& !uri.startsWith("/api/ws") && !uri.startsWith("/api/sockjs")
&& !uri.startsWith("/api/v3/api-docs")) {
response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
response.setContentType("application/json");
response.getWriter().write("{\"error\": \"Missing token\"}");

View File

@@ -0,0 +1,14 @@
package com.openisle.config;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
@AllArgsConstructor
@NoArgsConstructor
public class ShardInfo {
private int shardIndex;
private String queueName;
private String routingKey;
}

View File

@@ -0,0 +1,84 @@
package com.openisle.config;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicLong;
import java.util.Map;
import java.util.stream.Collectors;
@Component
@Slf4j
public class ShardingStrategy {
// 固定为16以匹配RabbitMQConfig中的十六进制分片逻辑
private static final int QUEUE_COUNT = 16;
// 分片分布统计
private final Map<Integer, AtomicLong> shardCounts = new ConcurrentHashMap<>();
/**
* 根据用户名获取分片信息(基于哈希值首字符)
*/
public ShardInfo getShardInfo(String username) {
if (username == null || username.isEmpty()) {
// 空用户名默认分到第0个分片
return getShardInfoByIndex(0);
}
// 计算用户名的哈希值并转为十六进制字符串
String hash = Integer.toHexString(Math.abs(username.hashCode()));
// 取哈希值的第一个字符 (0-9, a-f)
char firstChar = hash.charAt(0);
// 十六进制字符映射到队列
int shard = getShardFromHexChar(firstChar);
recordShardUsage(shard);
log.debug("Username '{}' -> hash '{}' -> firstChar '{}' -> shard {}",
username, hash, firstChar, shard);
return getShardInfoByIndex(shard);
}
/**
* 将十六进制字符映射到分片索引
*/
private int getShardFromHexChar(char hexChar) {
int charValue;
if (hexChar >= '0' && hexChar <= '9') {
charValue = hexChar - '0'; // 0-9
} else if (hexChar >= 'a' && hexChar <= 'f') {
charValue = hexChar - 'a' + 10; // 10-15
} else {
// 异常情况默认为0
charValue = 0;
}
// 映射到队列数量范围内
return charValue % QUEUE_COUNT;
}
/**
* 根据分片索引获取分片信息
*/
private ShardInfo getShardInfoByIndex(int shard) {
String shardKey = Integer.toHexString(shard);
return new ShardInfo(
shard,
"notifications-queue-" + shardKey,
"notifications.shard." + shardKey
);
}
/**
* 记录分片使用统计
*/
private void recordShardUsage(int shard) {
shardCounts.computeIfAbsent(shard, k -> new AtomicLong(0)).incrementAndGet();
}
}

View File

@@ -0,0 +1,57 @@
package com.openisle.controller;
import com.openisle.dto.ActivityDto;
import com.openisle.dto.MilkTeaInfoDto;
import com.openisle.dto.MilkTeaRedeemRequest;
import com.openisle.mapper.ActivityMapper;
import com.openisle.model.Activity;
import com.openisle.model.ActivityType;
import com.openisle.model.User;
import com.openisle.service.ActivityService;
import com.openisle.service.UserService;
import lombok.RequiredArgsConstructor;
import org.springframework.security.core.Authentication;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.stream.Collectors;
@RestController
@RequestMapping("/api/activities")
@RequiredArgsConstructor
public class ActivityController {
private final ActivityService activityService;
private final UserService userService;
private final ActivityMapper activityMapper;
@GetMapping
public List<ActivityDto> list() {
return activityService.list().stream()
.map(activityMapper::toDto)
.collect(Collectors.toList());
}
@GetMapping("/milk-tea")
public MilkTeaInfoDto milkTea() {
Activity a = activityService.getByType(ActivityType.MILK_TEA);
long count = activityService.countParticipants(a);
if (!a.isEnded() && count >= 50) {
activityService.end(a);
}
MilkTeaInfoDto info = new MilkTeaInfoDto();
info.setRedeemCount(count);
info.setEnded(a.isEnded());
return info;
}
@PostMapping("/milk-tea/redeem")
public java.util.Map<String, String> redeemMilkTea(@RequestBody MilkTeaRedeemRequest req, Authentication auth) {
User user = userService.findByIdentifier(auth.getName()).orElseThrow();
Activity a = activityService.getByType(ActivityType.MILK_TEA);
boolean first = activityService.redeem(a, user, req.getContact());
if (first) {
return java.util.Map.of("message", "redeemed");
}
return java.util.Map.of("message", "updated");
}
}

View File

@@ -0,0 +1,29 @@
package com.openisle.controller;
import com.openisle.dto.CommentDto;
import com.openisle.mapper.CommentMapper;
import com.openisle.service.CommentService;
import lombok.RequiredArgsConstructor;
import org.springframework.security.core.Authentication;
import org.springframework.web.bind.annotation.*;
/**
* Endpoints for administrators to manage comments.
*/
@RestController
@RequestMapping("/api/admin/comments")
@RequiredArgsConstructor
public class AdminCommentController {
private final CommentService commentService;
private final CommentMapper commentMapper;
@PostMapping("/{id}/pin")
public CommentDto pin(@PathVariable Long id, Authentication auth) {
return commentMapper.toDto(commentService.pinComment(auth.getName(), id));
}
@PostMapping("/{id}/unpin")
public CommentDto unpin(@PathVariable Long id, Authentication auth) {
return commentMapper.toDto(commentService.unpinComment(auth.getName(), id));
}
}

View File

@@ -1,13 +1,10 @@
package com.openisle.controller;
import com.openisle.model.PasswordStrength;
import com.openisle.model.PublishMode;
import com.openisle.dto.ConfigDto;
import com.openisle.service.AiUsageService;
import com.openisle.service.PasswordValidator;
import com.openisle.service.PostService;
import com.openisle.service.AiUsageService;
import com.openisle.service.RegisterModeService;
import com.openisle.model.RegisterMode;
import lombok.Data;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -47,11 +44,4 @@ public class AdminConfigController {
return getConfig();
}
@Data
public static class ConfigDto {
private PublishMode publishMode;
private PasswordStrength passwordStrength;
private Integer aiFormatLimit;
private RegisterMode registerMode;
}
}

View File

@@ -0,0 +1,58 @@
package com.openisle.controller;
import com.openisle.dto.PostSummaryDto;
import com.openisle.mapper.PostMapper;
import com.openisle.service.PostService;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.stream.Collectors;
/**
* Endpoints for administrators to manage posts.
*/
@RestController
@RequestMapping("/api/admin/posts")
@RequiredArgsConstructor
public class AdminPostController {
private final PostService postService;
private final PostMapper postMapper;
@GetMapping("/pending")
public List<PostSummaryDto> pendingPosts() {
return postService.listPendingPosts().stream()
.map(postMapper::toSummaryDto)
.collect(Collectors.toList());
}
@PostMapping("/{id}/approve")
public PostSummaryDto approve(@PathVariable Long id) {
return postMapper.toSummaryDto(postService.approvePost(id));
}
@PostMapping("/{id}/reject")
public PostSummaryDto reject(@PathVariable Long id) {
return postMapper.toSummaryDto(postService.rejectPost(id));
}
@PostMapping("/{id}/pin")
public PostSummaryDto pin(@PathVariable Long id) {
return postMapper.toSummaryDto(postService.pinPost(id));
}
@PostMapping("/{id}/unpin")
public PostSummaryDto unpin(@PathVariable Long id) {
return postMapper.toSummaryDto(postService.unpinPost(id));
}
@PostMapping("/{id}/rss-exclude")
public PostSummaryDto excludeFromRss(@PathVariable Long id) {
return postMapper.toSummaryDto(postService.excludeFromRss(id));
}
@PostMapping("/{id}/rss-include")
public PostSummaryDto includeInRss(@PathVariable Long id) {
return postMapper.toSummaryDto(postService.includeInRss(id));
}
}

View File

@@ -1,9 +1,10 @@
package com.openisle.controller;
import com.openisle.dto.TagDto;
import com.openisle.mapper.TagMapper;
import com.openisle.model.Tag;
import com.openisle.service.TagService;
import com.openisle.service.PostService;
import lombok.Data;
import com.openisle.service.TagService;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -16,11 +17,12 @@ import java.util.stream.Collectors;
public class AdminTagController {
private final TagService tagService;
private final PostService postService;
private final TagMapper tagMapper;
@GetMapping("/pending")
public List<TagDto> pendingTags() {
return tagService.listPendingTags().stream()
.map(t -> toDto(t, postService.countPostsByTag(t.getId())))
.map(t -> tagMapper.toDto(t, postService.countPostsByTag(t.getId())))
.collect(Collectors.toList());
}
@@ -28,27 +30,6 @@ public class AdminTagController {
public TagDto approve(@PathVariable Long id) {
Tag tag = tagService.approveTag(id);
long count = postService.countPostsByTag(tag.getId());
return toDto(tag, count);
}
private TagDto toDto(Tag tag, long count) {
TagDto dto = new TagDto();
dto.setId(tag.getId());
dto.setName(tag.getName());
dto.setDescription(tag.getDescription());
dto.setIcon(tag.getIcon());
dto.setSmallIcon(tag.getSmallIcon());
dto.setCount(count);
return dto;
}
@Data
private static class TagDto {
private Long id;
private String name;
private String description;
private String icon;
private String smallIcon;
private Long count;
return tagMapper.toDto(tag, count);
}
}

View File

@@ -1,7 +1,10 @@
package com.openisle.controller;
import com.openisle.model.Notification;
import com.openisle.model.NotificationType;
import com.openisle.model.User;
import com.openisle.service.EmailSender;
import com.openisle.repository.NotificationRepository;
import com.openisle.repository.UserRepository;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Value;
@@ -13,6 +16,7 @@ import org.springframework.web.bind.annotation.*;
@RequiredArgsConstructor
public class AdminUserController {
private final UserRepository userRepository;
private final NotificationRepository notificationRepository;
private final EmailSender emailSender;
@Value("${app.website-url}")
private String websiteUrl;
@@ -22,8 +26,9 @@ public class AdminUserController {
User user = userRepository.findById(id).orElseThrow();
user.setApproved(true);
userRepository.save(user);
emailSender.sendEmail(user.getEmail(), "Registration Approved",
"Your account has been approved. Visit: " + websiteUrl);
markRegisterRequestNotificationsRead(user);
emailSender.sendEmail(user.getEmail(), "您的注册已审核通过",
"🎉您的注册已经审核通过, 点击以访问网站: " + websiteUrl);
return ResponseEntity.ok().build();
}
@@ -32,8 +37,18 @@ public class AdminUserController {
User user = userRepository.findById(id).orElseThrow();
user.setApproved(false);
userRepository.save(user);
emailSender.sendEmail(user.getEmail(), "Registration Rejected",
"Your account request was rejected. Visit: " + websiteUrl);
markRegisterRequestNotificationsRead(user);
emailSender.sendEmail(user.getEmail(), "您的注册已被管理员拒绝",
"您的注册被管理员拒绝, 点击链接可以重新填写理由申请: " + websiteUrl);
return ResponseEntity.ok().build();
}
private void markRegisterRequestNotificationsRead(User applicant) {
java.util.List<Notification> notifs =
notificationRepository.findByTypeAndFromUser(NotificationType.REGISTER_REQUEST, applicant);
for (Notification n : notifs) {
n.setRead(true);
}
notificationRepository.saveAll(notifs);
}
}

View File

@@ -0,0 +1,450 @@
package com.openisle.controller;
import com.openisle.dto.*;
import com.openisle.exception.FieldException;
import com.openisle.model.RegisterMode;
import com.openisle.model.User;
import com.openisle.repository.UserRepository;
import com.openisle.service.*;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
import java.util.Map;
import java.util.Optional;
@RestController
@RequestMapping("/api/auth")
@RequiredArgsConstructor
public class AuthController {
private final UserService userService;
private final JwtService jwtService;
private final EmailSender emailService;
private final CaptchaService captchaService;
private final GoogleAuthService googleAuthService;
private final GithubAuthService githubAuthService;
private final DiscordAuthService discordAuthService;
private final TwitterAuthService twitterAuthService;
private final TelegramAuthService telegramAuthService;
private final RegisterModeService registerModeService;
private final NotificationService notificationService;
private final UserRepository userRepository;
private final InviteService inviteService;
@Value("${app.captcha.enabled:false}")
private boolean captchaEnabled;
@Value("${app.captcha.register-enabled:false}")
private boolean registerCaptchaEnabled;
@Value("${app.captcha.login-enabled:false}")
private boolean loginCaptchaEnabled;
@PostMapping("/register")
public ResponseEntity<?> register(@RequestBody RegisterRequest req) {
if (captchaEnabled && registerCaptchaEnabled && !captchaService.verify(req.getCaptcha())) {
return ResponseEntity.badRequest().body(Map.of("error", "Invalid captcha"));
}
if (req.getInviteToken() != null && !req.getInviteToken().isEmpty()) {
InviteService.InviteValidateResult result = inviteService.validate(req.getInviteToken());
if (!result.isValidate()) {
return ResponseEntity.badRequest().body(Map.of("error", "邀请码使用次数过多"));
}
try {
User user = userService.registerWithInvite(
req.getUsername(), req.getEmail(), req.getPassword());
inviteService.consume(req.getInviteToken(), user.getUsername());
emailService.sendEmail(user.getEmail(), "在网站填写验证码以验证", "您的验证码是 " + user.getVerificationCode());
return ResponseEntity.ok(Map.of(
"token", jwtService.generateToken(user.getUsername()),
"reason_code", "INVITE_APPROVED"
));
} catch (FieldException e) {
return ResponseEntity.badRequest().body(Map.of(
"field", e.getField(),
"error", e.getMessage()
));
}
}
User user = userService.register(
req.getUsername(), req.getEmail(), req.getPassword(), "", registerModeService.getRegisterMode());
emailService.sendEmail(user.getEmail(), "在网站填写验证码以验证", "您的验证码是 " + user.getVerificationCode());
if (!user.isApproved()) {
notificationService.createRegisterRequestNotifications(user, user.getRegisterReason());
}
return ResponseEntity.ok(Map.of("message", "Verification code sent"));
}
@PostMapping("/verify")
public ResponseEntity<?> verify(@RequestBody VerifyRequest req) {
boolean ok = userService.verifyCode(req.getUsername(), req.getCode());
if (ok) {
Optional<User> userOpt = userService.findByUsername(req.getUsername());
if (userOpt.isEmpty()) {
return ResponseEntity.badRequest().body(Map.of("error", "Invalid credentials"));
}
User user = userOpt.get();
if (user.isApproved()) {
return ResponseEntity.ok(Map.of(
"message", "Verified and isApproved",
"reason_code", "VERIFIED_AND_APPROVED",
"token", jwtService.generateToken(req.getUsername())
));
} else {
return ResponseEntity.ok(Map.of(
"message", "Verified",
"reason_code", "VERIFIED",
"token", jwtService.generateReasonToken(req.getUsername())
));
}
}
return ResponseEntity.badRequest().body(Map.of("error", "Invalid verification code"));
}
@PostMapping("/login")
public ResponseEntity<?> login(@RequestBody LoginRequest req) {
if (captchaEnabled && loginCaptchaEnabled && !captchaService.verify(req.getCaptcha())) {
return ResponseEntity.badRequest().body(Map.of("error", "Invalid captcha"));
}
Optional<User> userOpt = userService.findByUsername(req.getUsername());
if (userOpt.isEmpty()) {
userOpt = userService.findByEmail(req.getUsername());
}
if (userOpt.isEmpty() || !userService.matchesPassword(userOpt.get(), req.getPassword())) {
return ResponseEntity.badRequest().body(Map.of(
"error", "Invalid credentials",
"reason_code", "INVALID_CREDENTIALS"));
}
User user = userOpt.get();
if (!user.isVerified()) {
user = userService.register(user.getUsername(), user.getEmail(), user.getPassword(), user.getRegisterReason(), registerModeService.getRegisterMode());
emailService.sendEmail(user.getEmail(), "在网站填写验证码以验证", "您的验证码是 " + user.getVerificationCode());
return ResponseEntity.badRequest().body(Map.of(
"error", "User not verified",
"reason_code", "NOT_VERIFIED",
"user_name", user.getUsername()));
}
if (RegisterMode.WHITELIST.equals(registerModeService.getRegisterMode()) && !user.isApproved()) {
if (user.getRegisterReason() != null && !user.getRegisterReason().isEmpty()) {
return ResponseEntity.badRequest().body(Map.of(
"error", "Account awaiting approval",
"reason_code", "IS_APPROVING"
));
}
return ResponseEntity.badRequest().body(Map.of(
"error", "Register reason not approved",
"reason_code", "NOT_APPROVED",
"token", jwtService.generateReasonToken(user.getUsername())));
}
return ResponseEntity.ok(Map.of("token", jwtService.generateToken(user.getUsername())));
}
@PostMapping("/google")
public ResponseEntity<?> loginWithGoogle(@RequestBody GoogleLoginRequest req) {
boolean viaInvite = req.getInviteToken() != null && !req.getInviteToken().isEmpty();
InviteService.InviteValidateResult inviteValidateResult = inviteService.validate(req.getInviteToken());
if (viaInvite && !inviteValidateResult.isValidate()) {
return ResponseEntity.badRequest().body(Map.of("error", "Invalid invite token"));
}
Optional<AuthResult> resultOpt = googleAuthService.authenticate(
req.getIdToken(),
registerModeService.getRegisterMode(),
viaInvite);
if (resultOpt.isPresent()) {
AuthResult result = resultOpt.get();
if (viaInvite && result.isNewUser()) {
inviteService.consume(req.getInviteToken(), inviteValidateResult.getInviteToken().getInviter().getUsername());
return ResponseEntity.ok(Map.of(
"token", jwtService.generateToken(result.getUser().getUsername()),
"reason_code", "INVITE_APPROVED"
));
}
if (RegisterMode.DIRECT.equals(registerModeService.getRegisterMode())) {
return ResponseEntity.ok(Map.of("token", jwtService.generateToken(result.getUser().getUsername())));
}
if (!result.getUser().isApproved()) {
if (result.getUser().getRegisterReason() != null && !result.getUser().getRegisterReason().isEmpty()) {
return ResponseEntity.badRequest().body(Map.of(
"error", "Account awaiting approval",
"reason_code", "IS_APPROVING",
"token", jwtService.generateReasonToken(result.getUser().getUsername())
));
}
return ResponseEntity.badRequest().body(Map.of(
"error", "Account awaiting approval",
"reason_code", "NOT_APPROVED",
"token", jwtService.generateReasonToken(result.getUser().getUsername())
));
}
return ResponseEntity.ok(Map.of("token", jwtService.generateToken(result.getUser().getUsername())));
}
return ResponseEntity.badRequest().body(Map.of(
"error", "Invalid google token",
"reason_code", "INVALID_CREDENTIALS"
));
}
@PostMapping("/reason")
public ResponseEntity<?> reason(@RequestBody MakeReasonRequest req) {
String username = jwtService.validateAndGetSubjectForReason(req.getToken());
Optional<User> userOpt = userService.findByUsername(username);
if (userOpt.isEmpty()) {
return ResponseEntity.badRequest().body(Map.of(
"error", "Invalid token, Please re-login",
"reason_code", "INVALID_CREDENTIALS"
));
}
if (req.getReason() == null || req.getReason().trim().length() <= 20) {
return ResponseEntity.badRequest().body(Map.of(
"error", "Reason's length must longer than 20",
"reason_code", "INVALID_CREDENTIALS"
));
}
User user = userOpt.get();
if (user.isApproved() || registerModeService.getRegisterMode() == RegisterMode.DIRECT) {
return ResponseEntity.ok().body(Map.of("valid", true));
}
user = userService.updateReason(user.getUsername(), req.getReason());
notificationService.createRegisterRequestNotifications(user, req.getReason());
return ResponseEntity.ok().body(Map.of("valid", true));
}
@PostMapping("/github")
public ResponseEntity<?> loginWithGithub(@RequestBody GithubLoginRequest req) {
boolean viaInvite = req.getInviteToken() != null && !req.getInviteToken().isEmpty();
InviteService.InviteValidateResult inviteValidateResult = inviteService.validate(req.getInviteToken());
if (viaInvite && !inviteValidateResult.isValidate()) {
return ResponseEntity.badRequest().body(Map.of("error", "Invalid invite token"));
}
Optional<AuthResult> resultOpt = githubAuthService.authenticate(
req.getCode(),
registerModeService.getRegisterMode(),
req.getRedirectUri(),
viaInvite);
if (resultOpt.isPresent()) {
AuthResult result = resultOpt.get();
if (viaInvite && result.isNewUser()) {
inviteService.consume(req.getInviteToken(), inviteValidateResult.getInviteToken().getInviter().getUsername());
return ResponseEntity.ok(Map.of(
"token", jwtService.generateToken(result.getUser().getUsername()),
"reason_code", "INVITE_APPROVED"
));
}
if (RegisterMode.DIRECT.equals(registerModeService.getRegisterMode())) {
return ResponseEntity.ok(Map.of("token", jwtService.generateToken(result.getUser().getUsername())));
}
if (!result.getUser().isApproved()) {
if (result.getUser().getRegisterReason() != null && !result.getUser().getRegisterReason().isEmpty()) {
// 已填写注册理由
return ResponseEntity.badRequest().body(Map.of(
"error", "Account awaiting approval",
"reason_code", "IS_APPROVING",
"token", jwtService.generateReasonToken(result.getUser().getUsername())
));
}
return ResponseEntity.badRequest().body(Map.of(
"error", "Account awaiting approval",
"reason_code", "NOT_APPROVED",
"token", jwtService.generateReasonToken(result.getUser().getUsername())
));
}
return ResponseEntity.ok(Map.of("token", jwtService.generateToken(result.getUser().getUsername())));
}
return ResponseEntity.badRequest().body(Map.of(
"error", "Invalid github code",
"reason_code", "INVALID_CREDENTIALS"
));
}
@PostMapping("/discord")
public ResponseEntity<?> loginWithDiscord(@RequestBody DiscordLoginRequest req) {
boolean viaInvite = req.getInviteToken() != null && !req.getInviteToken().isEmpty();
InviteService.InviteValidateResult inviteValidateResult = inviteService.validate(req.getInviteToken());
if (viaInvite && !inviteValidateResult.isValidate()) {
return ResponseEntity.badRequest().body(Map.of("error", "Invalid invite token"));
}
Optional<AuthResult> resultOpt = discordAuthService.authenticate(
req.getCode(),
registerModeService.getRegisterMode(),
req.getRedirectUri(),
viaInvite);
if (resultOpt.isPresent()) {
AuthResult result = resultOpt.get();
if (viaInvite && result.isNewUser()) {
inviteService.consume(req.getInviteToken(), inviteValidateResult.getInviteToken().getInviter().getUsername());
return ResponseEntity.ok(Map.of(
"token", jwtService.generateToken(result.getUser().getUsername()),
"reason_code", "INVITE_APPROVED"
));
}
if (RegisterMode.DIRECT.equals(registerModeService.getRegisterMode())) {
return ResponseEntity.ok(Map.of("token", jwtService.generateToken(result.getUser().getUsername())));
}
if (!result.getUser().isApproved()) {
if (result.getUser().getRegisterReason() != null && !result.getUser().getRegisterReason().isEmpty()) {
return ResponseEntity.badRequest().body(Map.of(
"error", "Account awaiting approval",
"reason_code", "IS_APPROVING",
"token", jwtService.generateReasonToken(result.getUser().getUsername())
));
}
return ResponseEntity.badRequest().body(Map.of(
"error", "Account awaiting approval",
"reason_code", "NOT_APPROVED",
"token", jwtService.generateReasonToken(result.getUser().getUsername())
));
}
return ResponseEntity.ok(Map.of("token", jwtService.generateToken(result.getUser().getUsername())));
}
return ResponseEntity.badRequest().body(Map.of(
"error", "Invalid discord code",
"reason_code", "INVALID_CREDENTIALS"
));
}
@PostMapping("/twitter")
public ResponseEntity<?> loginWithTwitter(@RequestBody TwitterLoginRequest req) {
boolean viaInvite = req.getInviteToken() != null && !req.getInviteToken().isEmpty();
InviteService.InviteValidateResult inviteValidateResult = inviteService.validate(req.getInviteToken());
if (viaInvite && !inviteValidateResult.isValidate()) {
return ResponseEntity.badRequest().body(Map.of("error", "Invalid invite token"));
}
Optional<AuthResult> resultOpt = twitterAuthService.authenticate(
req.getCode(),
req.getCodeVerifier(),
registerModeService.getRegisterMode(),
req.getRedirectUri(),
viaInvite);
if (resultOpt.isPresent()) {
AuthResult result = resultOpt.get();
if (viaInvite && result.isNewUser()) {
inviteService.consume(req.getInviteToken(), inviteValidateResult.getInviteToken().getInviter().getUsername());
return ResponseEntity.ok(Map.of(
"token", jwtService.generateToken(result.getUser().getUsername()),
"reason_code", "INVITE_APPROVED"
));
}
if (RegisterMode.DIRECT.equals(registerModeService.getRegisterMode())) {
return ResponseEntity.ok(Map.of("token", jwtService.generateToken(result.getUser().getUsername())));
}
if (!result.getUser().isApproved()) {
if (result.getUser().getRegisterReason() != null && !result.getUser().getRegisterReason().isEmpty()) {
return ResponseEntity.badRequest().body(Map.of(
"error", "Account awaiting approval",
"reason_code", "IS_APPROVING",
"token", jwtService.generateReasonToken(result.getUser().getUsername())
));
}
return ResponseEntity.badRequest().body(Map.of(
"error", "Account awaiting approval",
"reason_code", "NOT_APPROVED",
"token", jwtService.generateReasonToken(result.getUser().getUsername())
));
}
return ResponseEntity.ok(Map.of("token", jwtService.generateToken(result.getUser().getUsername())));
}
return ResponseEntity.badRequest().body(Map.of(
"error", "Invalid twitter code",
"reason_code", "INVALID_CREDENTIALS"
));
}
@PostMapping("/telegram")
public ResponseEntity<?> loginWithTelegram(@RequestBody TelegramLoginRequest req) {
boolean viaInvite = req.getInviteToken() != null && !req.getInviteToken().isEmpty();
InviteService.InviteValidateResult inviteValidateResult = inviteService.validate(req.getInviteToken());
if (viaInvite && !inviteValidateResult.isValidate()) {
return ResponseEntity.badRequest().body(Map.of("error", "Invalid invite token"));
}
Optional<AuthResult> resultOpt = telegramAuthService.authenticate(
req,
registerModeService.getRegisterMode(),
viaInvite);
if (resultOpt.isPresent()) {
AuthResult result = resultOpt.get();
if (viaInvite && result.isNewUser()) {
inviteService.consume(req.getInviteToken(), inviteValidateResult.getInviteToken().getInviter().getUsername());
return ResponseEntity.ok(Map.of(
"token", jwtService.generateToken(result.getUser().getUsername()),
"reason_code", "INVITE_APPROVED"
));
}
if (RegisterMode.DIRECT.equals(registerModeService.getRegisterMode())) {
return ResponseEntity.ok(Map.of("token", jwtService.generateToken(result.getUser().getUsername())));
}
if (!result.getUser().isApproved()) {
if (result.getUser().getRegisterReason() != null && !result.getUser().getRegisterReason().isEmpty()) {
return ResponseEntity.badRequest().body(Map.of(
"error", "Account awaiting approval",
"reason_code", "IS_APPROVING",
"token", jwtService.generateReasonToken(result.getUser().getUsername())
));
}
return ResponseEntity.badRequest().body(Map.of(
"error", "Account awaiting approval",
"reason_code", "NOT_APPROVED",
"token", jwtService.generateReasonToken(result.getUser().getUsername())
));
}
return ResponseEntity.ok(Map.of("token", jwtService.generateToken(result.getUser().getUsername())));
}
return ResponseEntity.badRequest().body(Map.of(
"error", "Invalid telegram data",
"reason_code", "INVALID_CREDENTIALS"
));
}
@GetMapping("/check")
public ResponseEntity<?> checkToken() {
return ResponseEntity.ok(Map.of("valid", true));
}
@PostMapping("/forgot/send")
public ResponseEntity<?> sendReset(@RequestBody ForgotPasswordRequest req) {
Optional<User> userOpt = userService.findByEmail(req.getEmail());
if (userOpt.isEmpty()) {
return ResponseEntity.badRequest().body(Map.of("error", "User not found"));
}
String code = userService.generatePasswordResetCode(req.getEmail());
emailService.sendEmail(req.getEmail(), "请填写验证码以重置密码", "您的验证码是" + code);
return ResponseEntity.ok(Map.of("message", "Verification code sent"));
}
@PostMapping("/forgot/verify")
public ResponseEntity<?> verifyReset(@RequestBody VerifyForgotRequest req) {
boolean ok = userService.verifyPasswordResetCode(req.getEmail(), req.getCode());
if (ok) {
String username = userService.findByEmail(req.getEmail()).get().getUsername();
return ResponseEntity.ok(Map.of("token", jwtService.generateResetToken(username)));
}
return ResponseEntity.badRequest().body(Map.of("error", "Invalid verification code"));
}
@PostMapping("/forgot/reset")
public ResponseEntity<?> resetPassword(@RequestBody ResetPasswordRequest req) {
String username = jwtService.validateAndGetSubjectForReset(req.getToken());
try {
userService.updatePassword(username, req.getPassword());
return ResponseEntity.ok(Map.of("message", "Password updated"));
} catch (FieldException e) {
return ResponseEntity.badRequest().body(Map.of(
"field", e.getField(),
"error", e.getMessage()
));
}
}
// DTO classes moved to com.openisle.dto package
}

View File

@@ -1,13 +1,18 @@
package com.openisle.controller;
import com.openisle.dto.CategoryDto;
import com.openisle.dto.CategoryRequest;
import com.openisle.dto.PostSummaryDto;
import com.openisle.mapper.CategoryMapper;
import com.openisle.mapper.PostMapper;
import com.openisle.model.Category;
import com.openisle.service.CategoryService;
import com.openisle.service.PostService;
import lombok.Data;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@RestController
@@ -16,19 +21,21 @@ import java.util.stream.Collectors;
public class CategoryController {
private final CategoryService categoryService;
private final PostService postService;
private final PostMapper postMapper;
private final CategoryMapper categoryMapper;
@PostMapping
public CategoryDto create(@RequestBody CategoryRequest req) {
Category c = categoryService.createCategory(req.getName(), req.getDescription(), req.getIcon(), req.getSmallIcon());
long count = postService.countPostsByCategory(c.getId());
return toDto(c, count);
return categoryMapper.toDto(c, count);
}
@PutMapping("/{id}")
public CategoryDto update(@PathVariable Long id, @RequestBody CategoryRequest req) {
Category c = categoryService.updateCategory(id, req.getName(), req.getDescription(), req.getIcon(), req.getSmallIcon());
long count = postService.countPostsByCategory(c.getId());
return toDto(c, count);
return categoryMapper.toDto(c, count);
}
@DeleteMapping("/{id}")
@@ -38,8 +45,11 @@ public class CategoryController {
@GetMapping
public List<CategoryDto> list() {
return categoryService.listCategories().stream()
.map(c -> toDto(c, postService.countPostsByCategory(c.getId())))
List<Category> all = categoryService.listCategories();
List<Long> ids = all.stream().map(Category::getId).toList();
Map<Long, Long> postsCntByCategoryIds = postService.countPostsByCategoryIds(ids);
return all.stream()
.map(c -> categoryMapper.toDto(c, postsCntByCategoryIds.getOrDefault(c.getId(), 0L)))
.sorted((a, b) -> Long.compare(b.getCount(), a.getCount()))
.collect(Collectors.toList());
}
@@ -48,7 +58,7 @@ public class CategoryController {
public CategoryDto get(@PathVariable Long id) {
Category c = categoryService.getCategory(id);
long count = postService.countPostsByCategory(c.getId());
return toDto(c, count);
return categoryMapper.toDto(c, count);
}
@GetMapping("/{id}/posts")
@@ -57,47 +67,7 @@ public class CategoryController {
@RequestParam(value = "pageSize", required = false) Integer pageSize) {
return postService.listPostsByCategories(java.util.List.of(id), page, pageSize)
.stream()
.map(p -> {
PostSummaryDto dto = new PostSummaryDto();
dto.setId(p.getId());
dto.setTitle(p.getTitle());
return dto;
})
.map(postMapper::toSummaryDto)
.collect(Collectors.toList());
}
private CategoryDto toDto(Category c, long count) {
CategoryDto dto = new CategoryDto();
dto.setId(c.getId());
dto.setName(c.getName());
dto.setIcon(c.getIcon());
dto.setSmallIcon(c.getSmallIcon());
dto.setDescription(c.getDescription());
dto.setCount(count);
return dto;
}
@Data
private static class CategoryRequest {
private String name;
private String description;
private String icon;
private String smallIcon;
}
@Data
private static class CategoryDto {
private Long id;
private String name;
private String description;
private String icon;
private String smallIcon;
private Long count;
}
@Data
private static class PostSummaryDto {
private Long id;
private String title;
}
}

View File

@@ -0,0 +1,42 @@
package com.openisle.controller;
import com.openisle.dto.ChannelDto;
import com.openisle.model.User;
import com.openisle.repository.UserRepository;
import com.openisle.service.ChannelService;
import com.openisle.service.MessageService;
import lombok.RequiredArgsConstructor;
import org.springframework.security.core.Authentication;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@RestController
@RequestMapping("/api/channels")
@RequiredArgsConstructor
public class ChannelController {
private final ChannelService channelService;
private final MessageService messageService;
private final UserRepository userRepository;
private Long getCurrentUserId(Authentication auth) {
User user = userRepository.findByUsername(auth.getName())
.orElseThrow(() -> new IllegalArgumentException("User not found"));
return user.getId();
}
@GetMapping
public List<ChannelDto> listChannels(Authentication auth) {
return channelService.listChannels(getCurrentUserId(auth));
}
@PostMapping("/{channelId}/join")
public ChannelDto joinChannel(@PathVariable Long channelId, Authentication auth) {
return channelService.joinChannel(channelId, getCurrentUserId(auth));
}
@GetMapping("/unread-count")
public long unreadCount(Authentication auth) {
return messageService.getUnreadChannelCount(getCurrentUserId(auth));
}
}

View File

@@ -0,0 +1,100 @@
package com.openisle.controller;
import com.openisle.model.Comment;
import com.openisle.dto.CommentDto;
import com.openisle.dto.CommentRequest;
import com.openisle.mapper.CommentMapper;
import com.openisle.service.CaptchaService;
import com.openisle.service.CommentService;
import com.openisle.service.LevelService;
import com.openisle.service.PointService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.ResponseEntity;
import org.springframework.security.core.Authentication;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.stream.Collectors;
@RestController
@RequestMapping("/api")
@RequiredArgsConstructor
@Slf4j
public class CommentController {
private final CommentService commentService;
private final LevelService levelService;
private final CaptchaService captchaService;
private final CommentMapper commentMapper;
private final PointService pointService;
@Value("${app.captcha.enabled:false}")
private boolean captchaEnabled;
@Value("${app.captcha.comment-enabled:false}")
private boolean commentCaptchaEnabled;
@PostMapping("/posts/{postId}/comments")
public ResponseEntity<CommentDto> createComment(@PathVariable Long postId,
@RequestBody CommentRequest req,
Authentication auth) {
log.debug("createComment called by user {} for post {}", auth.getName(), postId);
if (captchaEnabled && commentCaptchaEnabled && !captchaService.verify(req.getCaptcha())) {
log.debug("Captcha verification failed for user {} on post {}", auth.getName(), postId);
return ResponseEntity.badRequest().build();
}
Comment comment = commentService.addComment(auth.getName(), postId, req.getContent());
CommentDto dto = commentMapper.toDto(comment);
dto.setReward(levelService.awardForComment(auth.getName()));
dto.setPointReward(pointService.awardForComment(auth.getName(), postId, comment.getId()));
log.debug("createComment succeeded for comment {}", comment.getId());
return ResponseEntity.ok(dto);
}
@PostMapping("/comments/{commentId}/replies")
public ResponseEntity<CommentDto> replyComment(@PathVariable Long commentId,
@RequestBody CommentRequest req,
Authentication auth) {
log.debug("replyComment called by user {} for comment {}", auth.getName(), commentId);
if (captchaEnabled && commentCaptchaEnabled && !captchaService.verify(req.getCaptcha())) {
log.debug("Captcha verification failed for user {} on comment {}", auth.getName(), commentId);
return ResponseEntity.badRequest().build();
}
Comment comment = commentService.addReply(auth.getName(), commentId, req.getContent());
CommentDto dto = commentMapper.toDto(comment);
dto.setReward(levelService.awardForComment(auth.getName()));
log.debug("replyComment succeeded for comment {}", comment.getId());
return ResponseEntity.ok(dto);
}
@GetMapping("/posts/{postId}/comments")
public List<CommentDto> listComments(@PathVariable Long postId,
@RequestParam(value = "sort", required = false, defaultValue = "OLDEST") com.openisle.model.CommentSort sort) {
log.debug("listComments called for post {} with sort {}", postId, sort);
List<CommentDto> list = commentService.getCommentsForPost(postId, sort).stream()
.map(commentMapper::toDtoWithReplies)
.collect(Collectors.toList());
log.debug("listComments returning {} comments", list.size());
return list;
}
@DeleteMapping("/comments/{id}")
public void deleteComment(@PathVariable Long id, Authentication auth) {
log.debug("deleteComment called by user {} for comment {}", auth.getName(), id);
commentService.deleteComment(auth.getName(), id);
log.debug("deleteComment completed for comment {}", id);
}
@PostMapping("/comments/{id}/pin")
public CommentDto pinComment(@PathVariable Long id, Authentication auth) {
log.debug("pinComment called by user {} for comment {}", auth.getName(), id);
return commentMapper.toDto(commentService.pinComment(auth.getName(), id));
}
@PostMapping("/comments/{id}/unpin")
public CommentDto unpinComment(@PathVariable Long id, Authentication auth) {
log.debug("unpinComment called by user {} for comment {}", auth.getName(), id);
return commentMapper.toDto(commentService.unpinComment(auth.getName(), id));
}
}

View File

@@ -1,9 +1,8 @@
package com.openisle.controller;
import lombok.Data;
import org.springframework.beans.factory.annotation.Value;
import com.openisle.dto.SiteConfigDto;
import com.openisle.service.RegisterModeService;
import com.openisle.model.RegisterMode;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -34,8 +33,8 @@ public class ConfigController {
private final RegisterModeService registerModeService;
@GetMapping("/config")
public ConfigResponse getConfig() {
ConfigResponse resp = new ConfigResponse();
public SiteConfigDto getConfig() {
SiteConfigDto resp = new SiteConfigDto();
resp.setCaptchaEnabled(captchaEnabled);
resp.setRegisterCaptchaEnabled(registerCaptchaEnabled);
resp.setLoginCaptchaEnabled(loginCaptchaEnabled);
@@ -45,15 +44,4 @@ public class ConfigController {
resp.setRegisterMode(registerModeService.getRegisterMode());
return resp;
}
@Data
private static class ConfigResponse {
private boolean captchaEnabled;
private boolean registerCaptchaEnabled;
private boolean loginCaptchaEnabled;
private boolean postCaptchaEnabled;
private boolean commentCaptchaEnabled;
private int aiFormatLimit;
private RegisterMode registerMode;
}
}

View File

@@ -1,32 +1,32 @@
package com.openisle.controller;
import com.openisle.dto.DraftDto;
import com.openisle.dto.DraftRequest;
import com.openisle.mapper.DraftMapper;
import com.openisle.model.Draft;
import com.openisle.service.DraftService;
import lombok.Data;
import lombok.RequiredArgsConstructor;
import org.springframework.http.ResponseEntity;
import org.springframework.security.core.Authentication;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.stream.Collectors;
@RestController
@RequestMapping("/api/drafts")
@RequiredArgsConstructor
public class DraftController {
private final DraftService draftService;
private final DraftMapper draftMapper;
@PostMapping
public ResponseEntity<DraftDto> saveDraft(@RequestBody DraftRequest req, Authentication auth) {
Draft draft = draftService.saveDraft(auth.getName(), req.getCategoryId(), req.getTitle(), req.getContent(), req.getTagIds());
return ResponseEntity.ok(toDto(draft));
return ResponseEntity.ok(draftMapper.toDto(draft));
}
@GetMapping("/me")
public ResponseEntity<DraftDto> getMyDraft(Authentication auth) {
return draftService.getDraft(auth.getName())
.map(d -> ResponseEntity.ok(toDto(d)))
.map(d -> ResponseEntity.ok(draftMapper.toDto(d)))
.orElseGet(() -> ResponseEntity.noContent().build());
}
@@ -35,33 +35,4 @@ public class DraftController {
draftService.deleteDraft(auth.getName());
return ResponseEntity.ok().build();
}
private DraftDto toDto(Draft draft) {
DraftDto dto = new DraftDto();
dto.setId(draft.getId());
dto.setTitle(draft.getTitle());
dto.setContent(draft.getContent());
if (draft.getCategory() != null) {
dto.setCategoryId(draft.getCategory().getId());
}
dto.setTagIds(draft.getTags().stream().map(com.openisle.model.Tag::getId).collect(Collectors.toList()));
return dto;
}
@Data
private static class DraftRequest {
private String title;
private String content;
private Long categoryId;
private List<Long> tagIds;
}
@Data
private static class DraftDto {
private Long id;
private String title;
private String content;
private Long categoryId;
private List<Long> tagIds;
}
}

View File

@@ -5,6 +5,7 @@ import org.springframework.web.bind.annotation.ExceptionHandler;
import org.springframework.web.bind.annotation.RestControllerAdvice;
import com.openisle.exception.FieldException;
import com.openisle.exception.NotFoundException;
import com.openisle.exception.RateLimitException;
import java.util.Map;
@@ -22,9 +23,18 @@ public class GlobalExceptionHandler {
return ResponseEntity.status(404).body(Map.of("error", ex.getMessage()));
}
@ExceptionHandler(RateLimitException.class)
public ResponseEntity<?> handleRateLimitException(RateLimitException ex) {
return ResponseEntity.status(429).body(Map.of("error", ex.getMessage()));
}
@ExceptionHandler(Exception.class)
public ResponseEntity<?> handleException(Exception ex) {
return ResponseEntity.badRequest().body(Map.of("error", ex.getMessage()));
String message = ex.getMessage();
if (message == null) {
message = ex.getClass().getSimpleName();
}
return ResponseEntity.badRequest().body(Map.of("error", message));
}
}

View File

@@ -0,0 +1,23 @@
package com.openisle.controller;
import com.openisle.service.InviteService;
import lombok.RequiredArgsConstructor;
import org.springframework.security.core.Authentication;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.Map;
@RestController
@RequestMapping("/api/invite")
@RequiredArgsConstructor
public class InviteController {
private final InviteService inviteService;
@PostMapping("/generate")
public Map<String, String> generate(Authentication auth) {
String token = inviteService.generate(auth.getName());
return Map.of("token", token);
}
}

View File

@@ -0,0 +1,33 @@
package com.openisle.controller;
import com.openisle.dto.MedalDto;
import com.openisle.dto.MedalSelectRequest;
import com.openisle.service.MedalService;
import lombok.RequiredArgsConstructor;
import org.springframework.http.ResponseEntity;
import org.springframework.security.core.Authentication;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@RestController
@RequestMapping("/api/medals")
@RequiredArgsConstructor
public class MedalController {
private final MedalService medalService;
@GetMapping
public List<MedalDto> getMedals(@RequestParam(value = "userId", required = false) Long userId) {
return medalService.getMedals(userId);
}
@PostMapping("/select")
public ResponseEntity<Void> selectMedal(@RequestBody MedalSelectRequest req, Authentication auth) {
try {
medalService.selectMedal(auth.getName(), req.getType());
return ResponseEntity.ok().build();
} catch (IllegalArgumentException e) {
return ResponseEntity.badRequest().build();
}
}
}

View File

@@ -0,0 +1,137 @@
package com.openisle.controller;
import com.openisle.dto.ConversationDetailDto;
import com.openisle.dto.ConversationDto;
import com.openisle.dto.CreateConversationRequest;
import com.openisle.dto.CreateConversationResponse;
import com.openisle.dto.MessageDto;
import com.openisle.model.Message;
import com.openisle.model.MessageConversation;
import com.openisle.model.User;
import com.openisle.repository.UserRepository;
import com.openisle.service.MessageService;
import lombok.RequiredArgsConstructor;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort;
import org.springframework.http.ResponseEntity;
import org.springframework.security.core.Authentication;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@RestController
@RequestMapping("/api/messages")
@RequiredArgsConstructor
public class MessageController {
private final MessageService messageService;
private final UserRepository userRepository;
// This is a placeholder for getting the current user's ID
private Long getCurrentUserId(Authentication auth) {
User user = userRepository.findByUsername(auth.getName()).orElseThrow(() -> new IllegalArgumentException("Sender not found"));
// In a real application, you would get this from the Authentication object
return user.getId();
}
@GetMapping("/conversations")
public ResponseEntity<List<ConversationDto>> getConversations(Authentication auth) {
List<ConversationDto> conversations = messageService.getConversations(getCurrentUserId(auth));
return ResponseEntity.ok(conversations);
}
@GetMapping("/conversations/{conversationId}")
public ResponseEntity<ConversationDetailDto> getMessages(@PathVariable Long conversationId,
@RequestParam(defaultValue = "0") int page,
@RequestParam(defaultValue = "20") int size,
Authentication auth) {
Pageable pageable = PageRequest.of(page, size, Sort.by("createdAt").descending());
ConversationDetailDto conversationDetails = messageService.getConversationDetails(conversationId, getCurrentUserId(auth), pageable);
return ResponseEntity.ok(conversationDetails);
}
@PostMapping
public ResponseEntity<MessageDto> sendMessage(@RequestBody MessageRequest req, Authentication auth) {
Message message = messageService.sendMessage(getCurrentUserId(auth), req.getRecipientId(), req.getContent(), req.getReplyToId());
return ResponseEntity.ok(messageService.toDto(message));
}
@PostMapping("/conversations/{conversationId}/messages")
public ResponseEntity<MessageDto> sendMessageToConversation(@PathVariable Long conversationId,
@RequestBody ChannelMessageRequest req,
Authentication auth) {
Message message = messageService.sendMessageToConversation(getCurrentUserId(auth), conversationId, req.getContent(), req.getReplyToId());
return ResponseEntity.ok(messageService.toDto(message));
}
@PostMapping("/conversations/{conversationId}/read")
public ResponseEntity<Void> markAsRead(@PathVariable Long conversationId, Authentication auth) {
messageService.markConversationAsRead(conversationId, getCurrentUserId(auth));
return ResponseEntity.ok().build();
}
@PostMapping("/conversations")
public ResponseEntity<CreateConversationResponse> findOrCreateConversation(@RequestBody CreateConversationRequest req, Authentication auth) {
MessageConversation conversation = messageService.findOrCreateConversation(getCurrentUserId(auth), req.getRecipientId());
return ResponseEntity.ok(new CreateConversationResponse(conversation.getId()));
}
@GetMapping("/unread-count")
public ResponseEntity<Long> getUnreadCount(Authentication auth) {
return ResponseEntity.ok(messageService.getUnreadMessageCount(getCurrentUserId(auth)));
}
// A simple request DTO
static class MessageRequest {
private Long recipientId;
private String content;
private Long replyToId;
public Long getRecipientId() {
return recipientId;
}
public void setRecipientId(Long recipientId) {
this.recipientId = recipientId;
}
public String getContent() {
return content;
}
public void setContent(String content) {
this.content = content;
}
public Long getReplyToId() {
return replyToId;
}
public void setReplyToId(Long replyToId) {
this.replyToId = replyToId;
}
}
static class ChannelMessageRequest {
private String content;
private Long replyToId;
public String getContent() {
return content;
}
public void setContent(String content) {
this.content = content;
}
public Long getReplyToId() {
return replyToId;
}
public void setReplyToId(Long replyToId) {
this.replyToId = replyToId;
}
}
}

View File

@@ -0,0 +1,75 @@
package com.openisle.controller;
import com.openisle.dto.NotificationDto;
import com.openisle.dto.NotificationMarkReadRequest;
import com.openisle.dto.NotificationUnreadCountDto;
import com.openisle.dto.NotificationPreferenceDto;
import com.openisle.dto.NotificationPreferenceUpdateRequest;
import com.openisle.mapper.NotificationMapper;
import com.openisle.service.NotificationService;
import lombok.RequiredArgsConstructor;
import org.springframework.security.core.Authentication;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.stream.Collectors;
/** Endpoints for user notifications. */
@RestController
@RequestMapping("/api/notifications")
@RequiredArgsConstructor
public class NotificationController {
private final NotificationService notificationService;
private final NotificationMapper notificationMapper;
@GetMapping
public List<NotificationDto> list(@RequestParam(value = "page", defaultValue = "0") int page,
@RequestParam(value = "size", defaultValue = "30") int size,
Authentication auth) {
return notificationService.listNotifications(auth.getName(), null, page, size).stream()
.map(notificationMapper::toDto)
.collect(Collectors.toList());
}
@GetMapping("/unread")
public List<NotificationDto> listUnread(@RequestParam(value = "page", defaultValue = "0") int page,
@RequestParam(value = "size", defaultValue = "30") int size,
Authentication auth) {
return notificationService.listNotifications(auth.getName(), false, page, size).stream()
.map(notificationMapper::toDto)
.collect(Collectors.toList());
}
@GetMapping("/unread-count")
public NotificationUnreadCountDto unreadCount(Authentication auth) {
long count = notificationService.countUnread(auth.getName());
NotificationUnreadCountDto uc = new NotificationUnreadCountDto();
uc.setCount(count);
return uc;
}
@PostMapping("/read")
public void markRead(@RequestBody NotificationMarkReadRequest req, Authentication auth) {
notificationService.markRead(auth.getName(), req.getIds());
}
@GetMapping("/prefs")
public List<NotificationPreferenceDto> prefs(Authentication auth) {
return notificationService.listPreferences(auth.getName());
}
@PostMapping("/prefs")
public void updatePref(@RequestBody NotificationPreferenceUpdateRequest req, Authentication auth) {
notificationService.updatePreference(auth.getName(), req.getType(), req.isEnabled());
}
@GetMapping("/email-prefs")
public List<NotificationPreferenceDto> emailPrefs(Authentication auth) {
return notificationService.listEmailPreferences(auth.getName());
}
@PostMapping("/email-prefs")
public void updateEmailPref(@RequestBody NotificationPreferenceUpdateRequest req, Authentication auth) {
notificationService.updateEmailPreference(auth.getName(), req.getType(), req.isEnabled());
}
}

View File

@@ -0,0 +1,36 @@
package com.openisle.controller;
import com.openisle.dto.PointHistoryDto;
import com.openisle.mapper.PointHistoryMapper;
import com.openisle.service.PointService;
import lombok.RequiredArgsConstructor;
import org.springframework.security.core.Authentication;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@RestController
@RequestMapping("/api/point-histories")
@RequiredArgsConstructor
public class PointHistoryController {
private final PointService pointService;
private final PointHistoryMapper pointHistoryMapper;
@GetMapping
public List<PointHistoryDto> list(Authentication auth) {
return pointService.listHistory(auth.getName()).stream()
.map(pointHistoryMapper::toDto)
.collect(Collectors.toList());
}
@GetMapping("/trend")
public List<Map<String, Object>> trend(Authentication auth,
@RequestParam(value = "days", defaultValue = "30") int days) {
return pointService.trend(auth.getName(), days);
}
}

View File

@@ -0,0 +1,39 @@
package com.openisle.controller;
import com.openisle.dto.PointGoodDto;
import com.openisle.dto.PointRedeemRequest;
import com.openisle.mapper.PointGoodMapper;
import com.openisle.model.User;
import com.openisle.service.PointMallService;
import com.openisle.service.UserService;
import lombok.RequiredArgsConstructor;
import org.springframework.security.core.Authentication;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/** REST controller for point mall. */
@RestController
@RequestMapping("/api/point-goods")
@RequiredArgsConstructor
public class PointMallController {
private final PointMallService pointMallService;
private final UserService userService;
private final PointGoodMapper pointGoodMapper;
@GetMapping
public List<PointGoodDto> list() {
return pointMallService.listGoods().stream()
.map(pointGoodMapper::toDto)
.collect(Collectors.toList());
}
@PostMapping("/redeem")
public Map<String, Integer> redeem(@RequestBody PointRedeemRequest req, Authentication auth) {
User user = userService.findByIdentifier(auth.getName()).orElseThrow();
int point = pointMallService.redeem(user, req.getGoodId(), req.getContact());
return Map.of("point", point);
}
}

View File

@@ -0,0 +1,211 @@
package com.openisle.controller;
import com.openisle.dto.PostDetailDto;
import com.openisle.dto.PostRequest;
import com.openisle.dto.PostSummaryDto;
import com.openisle.dto.PollDto;
import com.openisle.mapper.PostMapper;
import com.openisle.model.Post;
import com.openisle.service.*;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.ResponseEntity;
import org.springframework.security.core.Authentication;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.stream.Collectors;
@RestController
@RequestMapping("/api/posts")
@RequiredArgsConstructor
public class PostController {
private final PostService postService;
private final LevelService levelService;
private final CaptchaService captchaService;
private final DraftService draftService;
private final UserVisitService userVisitService;
private final PostMapper postMapper;
private final PointService pointService;
@Value("${app.captcha.enabled:false}")
private boolean captchaEnabled;
@Value("${app.captcha.post-enabled:false}")
private boolean postCaptchaEnabled;
@PostMapping
public ResponseEntity<PostDetailDto> createPost(@RequestBody PostRequest req, Authentication auth) {
if (captchaEnabled && postCaptchaEnabled && !captchaService.verify(req.getCaptcha())) {
return ResponseEntity.badRequest().build();
}
Post post = postService.createPost(auth.getName(), req.getCategoryId(),
req.getTitle(), req.getContent(), req.getTagIds(),
req.getType(), req.getPrizeDescription(), req.getPrizeIcon(),
req.getPrizeCount(), req.getPointCost(),
req.getStartTime(), req.getEndTime(),
req.getOptions(), req.getMultiple());
draftService.deleteDraft(auth.getName());
PostDetailDto dto = postMapper.toDetailDto(post, auth.getName());
dto.setReward(levelService.awardForPost(auth.getName()));
dto.setPointReward(pointService.awardForPost(auth.getName(), post.getId()));
return ResponseEntity.ok(dto);
}
@PutMapping("/{id}")
public ResponseEntity<PostDetailDto> updatePost(@PathVariable Long id, @RequestBody PostRequest req,
Authentication auth) {
Post post = postService.updatePost(id, auth.getName(), req.getCategoryId(),
req.getTitle(), req.getContent(), req.getTagIds());
return ResponseEntity.ok(postMapper.toDetailDto(post, auth.getName()));
}
@DeleteMapping("/{id}")
public void deletePost(@PathVariable Long id, Authentication auth) {
postService.deletePost(id, auth.getName());
}
@PostMapping("/{id}/close")
public PostSummaryDto close(@PathVariable Long id, Authentication auth) {
return postMapper.toSummaryDto(postService.closePost(id, auth.getName()));
}
@PostMapping("/{id}/reopen")
public PostSummaryDto reopen(@PathVariable Long id, Authentication auth) {
return postMapper.toSummaryDto(postService.reopenPost(id, auth.getName()));
}
@GetMapping("/{id}")
public ResponseEntity<PostDetailDto> getPost(@PathVariable Long id, Authentication auth) {
String viewer = auth != null ? auth.getName() : null;
Post post = postService.viewPost(id, viewer);
return ResponseEntity.ok(postMapper.toDetailDto(post, viewer));
}
@PostMapping("/{id}/lottery/join")
public ResponseEntity<Void> joinLottery(@PathVariable Long id, Authentication auth) {
postService.joinLottery(id, auth.getName());
return ResponseEntity.ok().build();
}
@GetMapping("/{id}/poll/progress")
public ResponseEntity<PollDto> pollProgress(@PathVariable Long id) {
return ResponseEntity.ok(postMapper.toSummaryDto(postService.getPoll(id)).getPoll());
}
@PostMapping("/{id}/poll/vote")
public ResponseEntity<Void> vote(@PathVariable Long id, @RequestParam("option") List<Integer> option, Authentication auth) {
postService.votePoll(id, auth.getName(), option);
return ResponseEntity.ok().build();
}
@GetMapping
public List<PostSummaryDto> listPosts(@RequestParam(value = "categoryId", required = false) Long categoryId,
@RequestParam(value = "categoryIds", required = false) List<Long> categoryIds,
@RequestParam(value = "tagId", required = false) Long tagId,
@RequestParam(value = "tagIds", required = false) List<Long> tagIds,
@RequestParam(value = "page", required = false) Integer page,
@RequestParam(value = "pageSize", required = false) Integer pageSize,
Authentication auth) {
List<Long> ids = categoryIds;
if (categoryId != null) {
ids = java.util.List.of(categoryId);
}
List<Long> tids = tagIds;
if (tagId != null) {
tids = java.util.List.of(tagId);
}
if (auth != null) {
userVisitService.recordVisit(auth.getName());
}
boolean hasCategories = ids != null && !ids.isEmpty();
boolean hasTags = tids != null && !tids.isEmpty();
if (hasCategories && hasTags) {
return postService.listPostsByCategoriesAndTags(ids, tids, page, pageSize)
.stream().map(postMapper::toSummaryDto).collect(Collectors.toList());
}
if (hasTags) {
return postService.listPostsByTags(tids, page, pageSize)
.stream().map(postMapper::toSummaryDto).collect(Collectors.toList());
}
return postService.listPostsByCategories(ids, page, pageSize)
.stream().map(postMapper::toSummaryDto).collect(Collectors.toList());
}
@GetMapping("/ranking")
public List<PostSummaryDto> rankingPosts(@RequestParam(value = "categoryId", required = false) Long categoryId,
@RequestParam(value = "categoryIds", required = false) List<Long> categoryIds,
@RequestParam(value = "tagId", required = false) Long tagId,
@RequestParam(value = "tagIds", required = false) List<Long> tagIds,
@RequestParam(value = "page", required = false) Integer page,
@RequestParam(value = "pageSize", required = false) Integer pageSize,
Authentication auth) {
List<Long> ids = categoryIds;
if (categoryId != null) {
ids = java.util.List.of(categoryId);
}
List<Long> tids = tagIds;
if (tagId != null) {
tids = java.util.List.of(tagId);
}
if (auth != null) {
userVisitService.recordVisit(auth.getName());
}
return postService.listPostsByViews(ids, tids, page, pageSize)
.stream().map(postMapper::toSummaryDto).collect(Collectors.toList());
}
@GetMapping("/latest-reply")
public List<PostSummaryDto> latestReplyPosts(@RequestParam(value = "categoryId", required = false) Long categoryId,
@RequestParam(value = "categoryIds", required = false) List<Long> categoryIds,
@RequestParam(value = "tagId", required = false) Long tagId,
@RequestParam(value = "tagIds", required = false) List<Long> tagIds,
@RequestParam(value = "page", required = false) Integer page,
@RequestParam(value = "pageSize", required = false) Integer pageSize,
Authentication auth) {
List<Long> ids = categoryIds;
if (categoryId != null) {
ids = java.util.List.of(categoryId);
}
List<Long> tids = tagIds;
if (tagId != null) {
tids = java.util.List.of(tagId);
}
if (auth != null) {
userVisitService.recordVisit(auth.getName());
}
return postService.listPostsByLatestReply(ids, tids, page, pageSize)
.stream().map(postMapper::toSummaryDto).collect(Collectors.toList());
}
@GetMapping("/featured")
public List<PostSummaryDto> featuredPosts(@RequestParam(value = "categoryId", required = false) Long categoryId,
@RequestParam(value = "categoryIds", required = false) List<Long> categoryIds,
@RequestParam(value = "tagId", required = false) Long tagId,
@RequestParam(value = "tagIds", required = false) List<Long> tagIds,
@RequestParam(value = "page", required = false) Integer page,
@RequestParam(value = "pageSize", required = false) Integer pageSize,
Authentication auth) {
List<Long> ids = categoryIds;
if (categoryId != null) {
ids = java.util.List.of(categoryId);
}
List<Long> tids = tagIds;
if (tagId != null) {
tids = java.util.List.of(tagId);
}
if (auth != null) {
userVisitService.recordVisit(auth.getName());
}
return postService.listFeaturedPosts(ids, tids, page, pageSize)
.stream().map(postMapper::toSummaryDto).collect(Collectors.toList());
}
}

View File

@@ -0,0 +1,30 @@
package com.openisle.controller;
import com.openisle.dto.PushPublicKeyDto;
import com.openisle.dto.PushSubscriptionRequest;
import com.openisle.service.PushSubscriptionService;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.security.core.Authentication;
import org.springframework.web.bind.annotation.*;
@RestController
@RequestMapping("/api/push")
@RequiredArgsConstructor
public class PushSubscriptionController {
private final PushSubscriptionService pushSubscriptionService;
@Value("${app.webpush.public-key}")
private String publicKey;
@GetMapping("/public-key")
public PushPublicKeyDto getPublicKey() {
PushPublicKeyDto r = new PushPublicKeyDto();
r.setKey(publicKey);
return r;
}
@PostMapping("/subscribe")
public void subscribe(@RequestBody PushSubscriptionRequest req, Authentication auth) {
pushSubscriptionService.saveSubscription(auth.getName(), req.getEndpoint(), req.getP256dh(), req.getAuth());
}
}

View File

@@ -0,0 +1,75 @@
package com.openisle.controller;
import com.openisle.dto.ReactionDto;
import com.openisle.dto.ReactionRequest;
import com.openisle.mapper.ReactionMapper;
import com.openisle.model.Reaction;
import com.openisle.model.ReactionType;
import com.openisle.service.LevelService;
import com.openisle.service.PointService;
import com.openisle.service.ReactionService;
import lombok.RequiredArgsConstructor;
import org.springframework.http.ResponseEntity;
import org.springframework.security.core.Authentication;
import org.springframework.web.bind.annotation.*;
@RestController
@RequestMapping("/api")
@RequiredArgsConstructor
public class ReactionController {
private final ReactionService reactionService;
private final LevelService levelService;
private final ReactionMapper reactionMapper;
private final PointService pointService;
/**
* Get all available reaction types.
*/
@GetMapping("/reaction-types")
public ReactionType[] listReactionTypes() {
return ReactionType.values();
}
@PostMapping("/posts/{postId}/reactions")
public ResponseEntity<ReactionDto> reactToPost(@PathVariable Long postId,
@RequestBody ReactionRequest req,
Authentication auth) {
Reaction reaction = reactionService.reactToPost(auth.getName(), postId, req.getType());
if (reaction == null) {
pointService.deductForReactionOfPost(auth.getName(), postId);
return ResponseEntity.noContent().build();
}
ReactionDto dto = reactionMapper.toDto(reaction);
dto.setReward(levelService.awardForReaction(auth.getName()));
pointService.awardForReactionOfPost(auth.getName(), postId);
return ResponseEntity.ok(dto);
}
@PostMapping("/comments/{commentId}/reactions")
public ResponseEntity<ReactionDto> reactToComment(@PathVariable Long commentId,
@RequestBody ReactionRequest req,
Authentication auth) {
Reaction reaction = reactionService.reactToComment(auth.getName(), commentId, req.getType());
if (reaction == null) {
pointService.deductForReactionOfComment(auth.getName(), commentId);
return ResponseEntity.noContent().build();
}
ReactionDto dto = reactionMapper.toDto(reaction);
dto.setReward(levelService.awardForReaction(auth.getName()));
pointService.awardForReactionOfComment(auth.getName(), commentId);
return ResponseEntity.ok(dto);
}
@PostMapping("/messages/{messageId}/reactions")
public ResponseEntity<ReactionDto> reactToMessage(@PathVariable Long messageId,
@RequestBody ReactionRequest req,
Authentication auth) {
Reaction reaction = reactionService.reactToMessage(auth.getName(), messageId, req.getType());
if (reaction == null) {
return ResponseEntity.noContent().build();
}
ReactionDto dto = reactionMapper.toDto(reaction);
dto.setReward(levelService.awardForReaction(auth.getName()));
return ResponseEntity.ok(dto);
}
}

View File

@@ -0,0 +1,352 @@
package com.openisle.controller;
import com.openisle.model.Post;
import com.openisle.model.Comment;
import com.openisle.model.CommentSort;
import com.openisle.service.PostService;
import com.openisle.service.CommentService;
import lombok.RequiredArgsConstructor;
import org.jsoup.Jsoup;
import org.jsoup.nodes.Document;
import org.jsoup.nodes.Element;
import org.jsoup.safety.Safelist;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController;
import com.vladsch.flexmark.ext.autolink.AutolinkExtension;
import com.vladsch.flexmark.ext.tables.TablesExtension;
import com.vladsch.flexmark.ext.gfm.strikethrough.StrikethroughExtension;
import com.vladsch.flexmark.ext.gfm.tasklist.TaskListExtension;
import com.vladsch.flexmark.html.HtmlRenderer;
import com.vladsch.flexmark.parser.Parser;
import com.vladsch.flexmark.util.data.MutableDataSet;
import java.net.URI;
import java.time.ZoneId;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@RestController
@RequiredArgsConstructor
public class RssController {
private final PostService postService;
private final CommentService commentService;
@Value("${app.website-url:https://www.open-isle.com}")
private String websiteUrl;
// 兼容 Markdown/HTML 两类图片写法(用于 enclosure
private static final Pattern MD_IMAGE = Pattern.compile("!\\[[^\\]]*\\]\\(([^)]+)\\)");
private static final Pattern HTML_IMAGE = Pattern.compile("<BaseImage[^>]+src=[\"']?([^\"'>]+)[\"']?[^>]*>");
private static final DateTimeFormatter RFC1123 = DateTimeFormatter.RFC_1123_DATE_TIME;
// flexmarkMarkdown -> HTML
private static final Parser MD_PARSER;
private static final HtmlRenderer MD_RENDERER;
static {
MutableDataSet opts = new MutableDataSet();
opts.set(Parser.EXTENSIONS, Arrays.asList(
TablesExtension.create(),
AutolinkExtension.create(),
StrikethroughExtension.create(),
TaskListExtension.create()
));
// 允许内联 HTML下游再做 sanitize
opts.set(Parser.HTML_BLOCK_PARSER, true);
MD_PARSER = Parser.builder(opts).build();
MD_RENDERER = HtmlRenderer.builder(opts).escapeHtml(false).build();
}
@GetMapping(value = "/api/rss", produces = "application/rss+xml;charset=UTF-8")
public String feed() {
// 建议 20你现在是 10这里保留你的 10
List<Post> posts = postService.listLatestRssPosts(10);
String base = trimTrailingSlash(websiteUrl);
StringBuilder sb = new StringBuilder(4096);
sb.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
sb.append("<rss version=\"2.0\" xmlns:content=\"http://purl.org/rss/1.0/modules/content/\">");
sb.append("<channel>");
elem(sb, "title", cdata("OpenIsle RSS"));
elem(sb, "link", base + "/");
elem(sb, "description", cdata("Latest posts"));
ZonedDateTime updated = posts.stream()
.map(p -> p.getCreatedAt().atZone(ZoneId.systemDefault()))
.max(Comparator.naturalOrder())
.orElse(ZonedDateTime.now());
// channel lastBuildDateGMT
elem(sb, "lastBuildDate", toRfc1123Gmt(updated));
for (Post p : posts) {
String link = base + "/posts/" + p.getId();
// 1) Markdown -> HTML
String html = renderMarkdown(p.getContent());
// 2) Sanitize白名单增强
String safeHtml = sanitizeHtml(html);
// 3) 绝对化 href/src + 强制 rel/target
String absHtml = absolutifyHtml(safeHtml, base);
// 4) 纯文本摘要(用于 <description>
String plain = textSummary(absHtml, 180);
// 5) enclosure首图已绝对化
String enclosure = firstImage(p.getContent());
if (enclosure == null) {
// 如果 Markdown 没有图,尝试从渲染后的 HTML 再抓一次
enclosure = firstImage(absHtml);
}
if (enclosure != null) {
enclosure = absolutifyUrl(enclosure, base);
}
// 6) 构造优雅的附加区块(原文链接 + 精选评论),编入 <content:encoded>
List<Comment> topComments = commentService
.getCommentsForPost(p.getId(), CommentSort.MOST_INTERACTIONS);
topComments = topComments.subList(0, Math.min(10, topComments.size()));
String footerHtml = buildFooterHtml(base, link, topComments);
sb.append("<item>");
elem(sb, "title", cdata(nullSafe(p.getTitle())));
elem(sb, "link", link);
sb.append("<guid isPermaLink=\"true\">").append(link).append("</guid>");
elem(sb, "pubDate", toRfc1123Gmt(p.getCreatedAt().atZone(ZoneId.systemDefault())));
// 摘要
elem(sb, "description", cdata(plain));
// 全文HTML正文 + 优雅的 Markdown 区块(已转 HTML
sb.append("<content:encoded><![CDATA[")
.append(absHtml)
.append(footerHtml)
.append("]]></content:encoded>");
// 首图 enclosure图片类型
if (enclosure != null) {
sb.append("<enclosure url=\"").append(escapeXml(enclosure)).append("\" type=\"")
.append(getMimeType(enclosure)).append("\" />");
}
sb.append("</item>");
}
sb.append("</channel></rss>");
return sb.toString();
}
/* ===================== Markdown → HTML ===================== */
private static String renderMarkdown(String md) {
if (md == null || md.isEmpty()) return "";
return MD_RENDERER.render(MD_PARSER.parse(md));
}
/* ===================== Sanitize & 绝对化 ===================== */
private static String sanitizeHtml(String html) {
if (html == null) return "";
Safelist wl = Safelist.relaxed()
.addTags(
"pre","code","figure","figcaption","picture","source",
"table","thead","tbody","tr","th","td",
"h1","h2","h3","h4","h5","h6",
"hr","blockquote"
)
.addAttributes("a", "href", "title", "target", "rel")
.addAttributes("img", "src", "alt", "title", "width", "height")
.addAttributes("source", "srcset", "type", "media")
.addAttributes("code", "class")
.addAttributes("pre", "class")
.addProtocols("a", "href", "http", "https", "mailto")
.addProtocols("img", "src", "http", "https", "data")
.addProtocols("source", "srcset", "http", "https");
// 清除所有 on* 事件、style避免阅读器环境差异
return Jsoup.clean(html, wl);
}
private static String absolutifyHtml(String html, String baseUrl) {
if (html == null || html.isEmpty()) return "";
Document doc = Jsoup.parseBodyFragment(html, baseUrl);
// a[href]
for (Element a : doc.select("a[href]")) {
String href = a.attr("href");
String abs = absolutifyUrl(href, baseUrl);
a.attr("href", abs);
// 强制外链安全属性
a.attr("rel", "noopener noreferrer nofollow");
a.attr("target", "_blank");
}
// img[src]
for (Element img : doc.select("img[src]")) {
String src = img.attr("src");
String abs = absolutifyUrl(src, baseUrl);
img.attr("src", abs);
}
// source[srcset] picture/webp
for (Element s : doc.select("source[srcset]")) {
String srcset = s.attr("srcset");
s.attr("srcset", absolutifySrcset(srcset, baseUrl));
}
return doc.body().html();
}
private static String absolutifyUrl(String url, String baseUrl) {
if (url == null || url.isEmpty()) return url;
String u = url.trim();
if (u.startsWith("//")) {
return "https:" + u;
}
if (u.startsWith("#")) {
// 保留页面内锚点:拼接到首页(也可拼接到当前帖子的 link但此处无上下文
return baseUrl + "/" + u;
}
try {
URI base = URI.create(ensureTrailingSlash(baseUrl));
URI abs = base.resolve(u);
return abs.toString();
} catch (Exception e) {
return url;
}
}
private static String absolutifySrcset(String srcset, String baseUrl) {
if (srcset == null || srcset.isEmpty()) return srcset;
String[] parts = srcset.split(",");
List<String> out = new ArrayList<>(parts.length);
for (String part : parts) {
String p = part.trim();
if (p.isEmpty()) continue;
String[] seg = p.split("\\s+");
String url = seg[0];
String size = seg.length > 1 ? seg[1] : "";
out.add(absolutifyUrl(url, baseUrl) + (size.isEmpty() ? "" : " " + size));
}
return String.join(", ", out);
}
/* ===================== 摘要 & enclosure ===================== */
private static String textSummary(String html, int maxLen) {
if (html == null) return "";
String text = Jsoup.parse(html).text().replaceAll("\\s+", " ").trim();
if (text.length() <= maxLen) return text;
return text.substring(0, maxLen) + "";
}
private String firstImage(String content) {
if (content == null) return null;
Matcher m = MD_IMAGE.matcher(content);
if (m.find()) return m.group(1);
m = HTML_IMAGE.matcher(content);
if (m.find()) return m.group(1);
// 再从纯 HTML 里解析一次(如果传入的是渲染后的)
try {
Document doc = Jsoup.parse(content);
Element img = doc.selectFirst("img[src]");
if (img != null) return img.attr("src");
} catch (Exception ignored) {}
return null;
}
private static String getMimeType(String url) {
String lower = url == null ? "" : url.toLowerCase(Locale.ROOT);
if (lower.endsWith(".png")) return "image/png";
if (lower.endsWith(".gif")) return "image/gif";
if (lower.endsWith(".webp")) return "image/webp";
if (lower.endsWith(".svg")) return "image/svg+xml";
if (lower.endsWith(".avif")) return "image/avif";
if (lower.endsWith(".jpg") || lower.endsWith(".jpeg")) return "image/jpeg";
// 默认兜底
return "image/jpeg";
}
/* ===================== 附加区块(原文链接 + 精选评论) ===================== */
/**
* 将“原文链接 + 精选评论(最多 10 条)”以优雅的 Markdown 形式渲染为 HTML
* 并做 sanitize + 绝对化,然后拼入 content:encoded 尾部。
*/
private static String buildFooterHtml(String baseUrl, String originalLink, List<Comment> topComments) {
StringBuilder md = new StringBuilder(256);
// 分割线
md.append("\n\n---\n\n");
// 原文链接(强调 + 可点击)
md.append("**原文链接:** ")
.append("[").append(originalLink).append("](").append(originalLink).append(")")
.append("\n\n");
// 精选评论(仅当有评论时展示)
if (topComments != null && !topComments.isEmpty()) {
md.append("### 精选评论Top ").append(Math.min(10, topComments.size())).append("\n\n");
for (Comment c : topComments) {
String author = usernameOf(c);
String content = nullSafe(c.getContent()).replace("\r", "");
// 使用引用样式展示,提升可读性
md.append("> @").append(author).append(": ").append(content).append("\n\n");
}
}
// 渲染为 HTML并保持和正文一致的处理流程
String html = renderMarkdown(md.toString());
String safe = sanitizeHtml(html);
return absolutifyHtml(safe, baseUrl);
}
private static String usernameOf(Comment c) {
if (c == null) return "匿名";
try {
Object authorObj = c.getAuthor();
if (authorObj == null) return "匿名";
// 反射避免直接依赖实体字段名变化(也可直接强转到具体类型)
String username;
try {
username = (String) authorObj.getClass().getMethod("getUsername").invoke(authorObj);
} catch (Exception e) {
username = null;
}
if (username == null || username.isEmpty()) return "匿名";
return username;
} catch (Exception ignored) {
return "匿名";
}
}
/* ===================== 时间/字符串/XML ===================== */
private static String toRfc1123Gmt(ZonedDateTime zdt) {
return zdt.withZoneSameInstant(ZoneId.of("GMT")).format(RFC1123);
}
private static String cdata(String s) {
if (s == null) return "<![CDATA[]]>";
// 防止出现 "]]>" 终止标记破坏 CDATA
return "<![CDATA[" + s.replace("]]>", "]]]]><![CDATA[>") + "]]>";
}
private static void elem(StringBuilder sb, String name, String value) {
sb.append('<').append(name).append('>').append(value).append("</").append(name).append('>');
}
private static String escapeXml(String s) {
if (s == null) return "";
return s.replace("&", "&amp;").replace("<", "&lt;").replace(">", "&gt;")
.replace("\"", "&quot;").replace("'", "&apos;");
}
private static String trimTrailingSlash(String s) {
if (s == null) return "";
return s.endsWith("/") ? s.substring(0, s.length() - 1) : s;
}
private static String ensureTrailingSlash(String s) {
if (s == null || s.isEmpty()) return "/";
return s.endsWith("/") ? s : s + "/";
}
private static String nullSafe(String s) { return s == null ? "" : s; }
}

View File

@@ -1,10 +1,11 @@
package com.openisle.controller;
import com.openisle.model.Post;
import com.openisle.model.Comment;
import com.openisle.model.User;
import com.openisle.dto.PostSummaryDto;
import com.openisle.dto.SearchResultDto;
import com.openisle.dto.UserDto;
import com.openisle.mapper.PostMapper;
import com.openisle.mapper.UserMapper;
import com.openisle.service.SearchService;
import lombok.Data;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -19,32 +20,34 @@ import java.util.stream.Collectors;
@RequiredArgsConstructor
public class SearchController {
private final SearchService searchService;
private final UserMapper userMapper;
private final PostMapper postMapper;
@GetMapping("/users")
public List<UserDto> searchUsers(@RequestParam String keyword) {
return searchService.searchUsers(keyword).stream()
.map(this::toUserDto)
.map(userMapper::toDto)
.collect(Collectors.toList());
}
@GetMapping("/posts")
public List<PostDto> searchPosts(@RequestParam String keyword) {
public List<PostSummaryDto> searchPosts(@RequestParam String keyword) {
return searchService.searchPosts(keyword).stream()
.map(this::toPostDto)
.map(postMapper::toSummaryDto)
.collect(Collectors.toList());
}
@GetMapping("/posts/content")
public List<PostDto> searchPostsByContent(@RequestParam String keyword) {
public List<PostSummaryDto> searchPostsByContent(@RequestParam String keyword) {
return searchService.searchPostsByContent(keyword).stream()
.map(this::toPostDto)
.map(postMapper::toSummaryDto)
.collect(Collectors.toList());
}
@GetMapping("/posts/title")
public List<PostDto> searchPostsByTitle(@RequestParam String keyword) {
public List<PostSummaryDto> searchPostsByTitle(@RequestParam String keyword) {
return searchService.searchPostsByTitle(keyword).stream()
.map(this::toPostDto)
.map(postMapper::toSummaryDto)
.collect(Collectors.toList());
}
@@ -63,40 +66,4 @@ public class SearchController {
})
.collect(Collectors.toList());
}
private UserDto toUserDto(User user) {
UserDto dto = new UserDto();
dto.setId(user.getId());
dto.setUsername(user.getUsername());
return dto;
}
private PostDto toPostDto(Post post) {
PostDto dto = new PostDto();
dto.setId(post.getId());
dto.setTitle(post.getTitle());
return dto;
}
@Data
private static class UserDto {
private Long id;
private String username;
}
@Data
private static class PostDto {
private Long id;
private String title;
}
@Data
private static class SearchResultDto {
private String type;
private Long id;
private String text;
private String subText;
private String extra;
private Long postId;
}
}

View File

@@ -0,0 +1,69 @@
package com.openisle.controller;
import com.openisle.model.Post;
import com.openisle.model.PostStatus;
import com.openisle.repository.PostRepository;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
/**
* Controller for dynamic sitemap generation.
*/
@RestController
@RequiredArgsConstructor
@RequestMapping("/api")
public class SitemapController {
private final PostRepository postRepository;
@Value("${app.website-url}")
private String websiteUrl;
@GetMapping(value = "/sitemap.xml", produces = MediaType.APPLICATION_XML_VALUE)
public ResponseEntity<String> sitemap() {
List<Post> posts = postRepository.findByStatus(PostStatus.PUBLISHED);
StringBuilder body = new StringBuilder();
body.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
body.append("<urlset xmlns=\"http://www.sitemaps.org/schemas/sitemap/0.9\">\n");
List<String> staticRoutes = List.of(
"/",
"/about",
"/activities",
"/login",
"/signup"
);
for (String path : staticRoutes) {
body.append(" <url><loc>")
.append(websiteUrl)
.append(path)
.append("</loc></url>\n");
}
for (Post p : posts) {
body.append(" <url>\n")
.append(" <loc>")
.append(websiteUrl)
.append("/posts/")
.append(p.getId())
.append("</loc>\n")
.append(" <lastmod>")
.append(p.getCreatedAt().toLocalDate())
.append("</lastmod>\n")
.append(" </url>\n");
}
body.append("</urlset>");
return ResponseEntity.ok()
.contentType(MediaType.APPLICATION_XML)
.body(body.toString());
}
}

View File

@@ -0,0 +1,85 @@
package com.openisle.controller;
import com.openisle.service.UserVisitService;
import com.openisle.service.StatService;
import lombok.RequiredArgsConstructor;
import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.time.LocalDate;
import java.util.List;
import java.util.Map;
@RestController
@RequestMapping("/api/stats")
@RequiredArgsConstructor
public class StatController {
private final UserVisitService userVisitService;
private final StatService statService;
@GetMapping("/dau")
public Map<String, Long> dau(@RequestParam(value = "date", required = false)
@DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date) {
long count = userVisitService.countDau(date);
return Map.of("dau", count);
}
@GetMapping("/dau-range")
public List<Map<String, Object>> dauRange(@RequestParam(value = "days", defaultValue = "30") int days) {
if (days < 1) days = 1;
LocalDate end = LocalDate.now();
LocalDate start = end.minusDays(days - 1L);
var data = userVisitService.countDauRange(start, end);
return data.entrySet().stream()
.map(e -> Map.<String,Object>of(
"date", e.getKey().toString(),
"value", e.getValue()
))
.toList();
}
@GetMapping("/new-users-range")
public List<Map<String, Object>> newUsersRange(@RequestParam(value = "days", defaultValue = "30") int days) {
if (days < 1) days = 1;
LocalDate end = LocalDate.now();
LocalDate start = end.minusDays(days - 1L);
var data = statService.countNewUsersRange(start, end);
return data.entrySet().stream()
.map(e -> Map.<String,Object>of(
"date", e.getKey().toString(),
"value", e.getValue()
))
.toList();
}
@GetMapping("/posts-range")
public List<Map<String, Object>> postsRange(@RequestParam(value = "days", defaultValue = "30") int days) {
if (days < 1) days = 1;
LocalDate end = LocalDate.now();
LocalDate start = end.minusDays(days - 1L);
var data = statService.countPostsRange(start, end);
return data.entrySet().stream()
.map(e -> Map.<String,Object>of(
"date", e.getKey().toString(),
"value", e.getValue()
))
.toList();
}
@GetMapping("/comments-range")
public List<Map<String, Object>> commentsRange(@RequestParam(value = "days", defaultValue = "30") int days) {
if (days < 1) days = 1;
LocalDate end = LocalDate.now();
LocalDate start = end.minusDays(days - 1L);
var data = statService.countCommentsRange(start, end);
return data.entrySet().stream()
.map(e -> Map.<String,Object>of(
"date", e.getKey().toString(),
"value", e.getValue()
))
.toList();
}
}

View File

@@ -1,16 +1,21 @@
package com.openisle.controller;
import com.openisle.model.Tag;
import com.openisle.service.TagService;
import com.openisle.service.PostService;
import com.openisle.repository.UserRepository;
import com.openisle.dto.PostSummaryDto;
import com.openisle.dto.TagDto;
import com.openisle.dto.TagRequest;
import com.openisle.mapper.PostMapper;
import com.openisle.mapper.TagMapper;
import com.openisle.model.PublishMode;
import com.openisle.model.Role;
import lombok.Data;
import com.openisle.model.Tag;
import com.openisle.repository.UserRepository;
import com.openisle.service.PostService;
import com.openisle.service.TagService;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@RestController
@@ -20,6 +25,8 @@ public class TagController {
private final TagService tagService;
private final PostService postService;
private final UserRepository userRepository;
private final PostMapper postMapper;
private final TagMapper tagMapper;
@PostMapping
public TagDto create(@RequestBody TagRequest req, org.springframework.security.core.Authentication auth) {
@@ -38,14 +45,14 @@ public class TagController {
approved,
auth != null ? auth.getName() : null);
long count = postService.countPostsByTag(tag.getId());
return toDto(tag, count);
return tagMapper.toDto(tag, count);
}
@PutMapping("/{id}")
public TagDto update(@PathVariable Long id, @RequestBody TagRequest req) {
Tag tag = tagService.updateTag(id, req.getName(), req.getDescription(), req.getIcon(), req.getSmallIcon());
long count = postService.countPostsByTag(tag.getId());
return toDto(tag, count);
return tagMapper.toDto(tag, count);
}
@DeleteMapping("/{id}")
@@ -56,8 +63,11 @@ public class TagController {
@GetMapping
public List<TagDto> list(@RequestParam(value = "keyword", required = false) String keyword,
@RequestParam(value = "limit", required = false) Integer limit) {
List<TagDto> dtos = tagService.searchTags(keyword).stream()
.map(t -> toDto(t, postService.countPostsByTag(t.getId())))
List<Tag> tags = tagService.searchTags(keyword);
List<Long> tagIds = tags.stream().map(Tag::getId).toList();
Map<Long, Long> postCntByTagIds = postService.countPostsByTagIds(tagIds);
List<TagDto> dtos = tags.stream()
.map(t -> tagMapper.toDto(t, postCntByTagIds.getOrDefault(t.getId(), 0L)))
.sorted((a, b) -> Long.compare(b.getCount(), a.getCount()))
.collect(Collectors.toList());
if (limit != null && limit > 0 && dtos.size() > limit) {
@@ -70,7 +80,7 @@ public class TagController {
public TagDto get(@PathVariable Long id) {
Tag tag = tagService.getTag(id);
long count = postService.countPostsByTag(tag.getId());
return toDto(tag, count);
return tagMapper.toDto(tag, count);
}
@GetMapping("/{id}/posts")
@@ -79,47 +89,7 @@ public class TagController {
@RequestParam(value = "pageSize", required = false) Integer pageSize) {
return postService.listPostsByTags(java.util.List.of(id), page, pageSize)
.stream()
.map(p -> {
PostSummaryDto dto = new PostSummaryDto();
dto.setId(p.getId());
dto.setTitle(p.getTitle());
return dto;
})
.map(postMapper::toSummaryDto)
.collect(Collectors.toList());
}
private TagDto toDto(Tag tag, long count) {
TagDto dto = new TagDto();
dto.setId(tag.getId());
dto.setName(tag.getName());
dto.setIcon(tag.getIcon());
dto.setSmallIcon(tag.getSmallIcon());
dto.setDescription(tag.getDescription());
dto.setCount(count);
return dto;
}
@Data
private static class TagRequest {
private String name;
private String description;
private String icon;
private String smallIcon;
}
@Data
private static class TagDto {
private Long id;
private String name;
private String description;
private String icon;
private String smallIcon;
private Long count;
}
@Data
private static class PostSummaryDto {
private Long id;
private String title;
}
}

View File

@@ -74,4 +74,9 @@ public class UploadController {
return ResponseEntity.internalServerError().body(Map.of("code", 3, "msg", "Upload failed"));
}
}
@GetMapping("/presign")
public java.util.Map<String, String> presign(@RequestParam("filename") String filename) {
return imageUploader.presignUpload(filename);
}
}

View File

@@ -1,11 +1,13 @@
package com.openisle.controller;
import com.openisle.dto.*;
import com.openisle.exception.NotFoundException;
import com.openisle.mapper.TagMapper;
import com.openisle.mapper.UserMapper;
import com.openisle.model.User;
import com.openisle.service.*;
import org.springframework.beans.factory.annotation.Value;
import lombok.Data;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.ResponseEntity;
import org.springframework.security.core.Authentication;
import org.springframework.web.bind.annotation.*;
@@ -25,8 +27,10 @@ public class UserController {
private final ReactionService reactionService;
private final TagService tagService;
private final SubscriptionService subscriptionService;
private final PostReadService postReadService;
private final UserVisitService userVisitService;
private final LevelService levelService;
private final JwtService jwtService;
private final UserMapper userMapper;
private final TagMapper tagMapper;
@Value("${app.upload.check-type:true}")
private boolean checkImageType;
@@ -43,13 +47,10 @@ public class UserController {
@Value("${app.user.tags-limit:50}")
private int defaultTagsLimit;
@Value("${app.snippet-length:50}")
private int snippetLength;
@GetMapping("/me")
public ResponseEntity<UserDto> me(Authentication auth) {
User user = userService.findByUsername(auth.getName()).orElseThrow();
return ResponseEntity.ok(toDto(user, auth));
return ResponseEntity.ok(userMapper.toDto(user, auth));
}
@PostMapping("/me/avatar")
@@ -72,17 +73,26 @@ public class UserController {
}
@PutMapping("/me")
public ResponseEntity<UserDto> updateProfile(@RequestBody UpdateProfileDto dto,
Authentication auth) {
public ResponseEntity<?> updateProfile(@RequestBody UpdateProfileDto dto,
Authentication auth) {
User user = userService.updateProfile(auth.getName(), dto.getUsername(), dto.getIntroduction());
return ResponseEntity.ok(toDto(user, auth));
return ResponseEntity.ok(Map.of(
"token", jwtService.generateToken(user.getUsername()),
"user", userMapper.toDto(user, auth)
));
}
@PostMapping("/me/signin")
public Map<String, Integer> signIn(Authentication auth) {
int reward = levelService.awardForSignin(auth.getName());
return Map.of("reward", reward);
}
@GetMapping("/{identifier}")
public ResponseEntity<UserDto> getUser(@PathVariable("identifier") String identifier,
Authentication auth) {
User user = userService.findByIdentifier(identifier).orElseThrow(() -> new NotFoundException("User not found"));
return ResponseEntity.ok(toDto(user, auth));
return ResponseEntity.ok(userMapper.toDto(user, auth));
}
@GetMapping("/{identifier}/posts")
@@ -91,7 +101,18 @@ public class UserController {
int l = limit != null ? limit : defaultPostsLimit;
User user = userService.findByIdentifier(identifier).orElseThrow();
return postService.getRecentPostsByUser(user.getUsername(), l).stream()
.map(this::toMetaDto)
.map(userMapper::toMetaDto)
.collect(java.util.stream.Collectors.toList());
}
@GetMapping("/{identifier}/subscribed-posts")
public java.util.List<PostMetaDto> subscribedPosts(@PathVariable("identifier") String identifier,
@RequestParam(value = "limit", required = false) Integer limit) {
int l = limit != null ? limit : defaultPostsLimit;
User user = userService.findByIdentifier(identifier).orElseThrow();
return subscriptionService.getSubscribedPosts(user.getUsername()).stream()
.limit(l)
.map(userMapper::toMetaDto)
.collect(java.util.stream.Collectors.toList());
}
@@ -101,7 +122,7 @@ public class UserController {
int l = limit != null ? limit : defaultRepliesLimit;
User user = userService.findByIdentifier(identifier).orElseThrow();
return commentService.getRecentCommentsByUser(user.getUsername(), l).stream()
.map(this::toCommentInfoDto)
.map(userMapper::toCommentInfoDto)
.collect(java.util.stream.Collectors.toList());
}
@@ -112,7 +133,7 @@ public class UserController {
User user = userService.findByIdentifier(identifier).orElseThrow();
java.util.List<Long> ids = reactionService.topPostIds(user.getUsername(), l);
return postService.getPostsByIds(ids).stream()
.map(this::toMetaDto)
.map(userMapper::toMetaDto)
.collect(java.util.stream.Collectors.toList());
}
@@ -123,49 +144,29 @@ public class UserController {
User user = userService.findByIdentifier(identifier).orElseThrow();
java.util.List<Long> ids = reactionService.topCommentIds(user.getUsername(), l);
return commentService.getCommentsByIds(ids).stream()
.map(this::toCommentInfoDto)
.map(userMapper::toCommentInfoDto)
.collect(java.util.stream.Collectors.toList());
}
@GetMapping("/{identifier}/hot-tags")
public java.util.List<TagInfoDto> hotTags(@PathVariable("identifier") String identifier,
@RequestParam(value = "limit", required = false) Integer limit) {
public java.util.List<TagDto> hotTags(@PathVariable("identifier") String identifier,
@RequestParam(value = "limit", required = false) Integer limit) {
int l = limit != null ? limit : 10;
User user = userService.findByIdentifier(identifier).orElseThrow();
return tagService.getTagsByUser(user.getUsername()).stream()
.map(t -> {
TagInfoDto dto = new TagInfoDto();
dto.setId(t.getId());
dto.setName(t.getName());
dto.setDescription(t.getDescription());
dto.setIcon(t.getIcon());
dto.setSmallIcon(t.getSmallIcon());
dto.setCreatedAt(t.getCreatedAt());
dto.setCount(postService.countPostsByTag(t.getId()));
return dto;
})
.map(t -> tagMapper.toDto(t, postService.countPostsByTag(t.getId())))
.sorted((a, b) -> Long.compare(b.getCount(), a.getCount()))
.limit(l)
.collect(java.util.stream.Collectors.toList());
}
@GetMapping("/{identifier}/tags")
public java.util.List<TagInfoDto> userTags(@PathVariable("identifier") String identifier,
@RequestParam(value = "limit", required = false) Integer limit) {
public java.util.List<TagDto> userTags(@PathVariable("identifier") String identifier,
@RequestParam(value = "limit", required = false) Integer limit) {
int l = limit != null ? limit : defaultTagsLimit;
User user = userService.findByIdentifier(identifier).orElseThrow();
return tagService.getRecentTagsByUser(user.getUsername(), l).stream()
.map(t -> {
TagInfoDto dto = new TagInfoDto();
dto.setId(t.getId());
dto.setName(t.getName());
dto.setDescription(t.getDescription());
dto.setIcon(t.getIcon());
dto.setSmallIcon(t.getSmallIcon());
dto.setCreatedAt(t.getCreatedAt());
dto.setCount(postService.countPostsByTag(t.getId()));
return dto;
})
.map(t -> tagMapper.toDto(t, postService.countPostsByTag(t.getId())))
.collect(java.util.stream.Collectors.toList());
}
@@ -173,7 +174,7 @@ public class UserController {
public java.util.List<UserDto> following(@PathVariable("identifier") String identifier) {
User user = userService.findByIdentifier(identifier).orElseThrow();
return subscriptionService.getSubscribedUsers(user.getUsername()).stream()
.map(this::toDto)
.map(userMapper::toDto)
.collect(java.util.stream.Collectors.toList());
}
@@ -181,7 +182,14 @@ public class UserController {
public java.util.List<UserDto> followers(@PathVariable("identifier") String identifier) {
User user = userService.findByIdentifier(identifier).orElseThrow();
return subscriptionService.getSubscribers(user.getUsername()).stream()
.map(this::toDto)
.map(userMapper::toDto)
.collect(java.util.stream.Collectors.toList());
}
@GetMapping("/admins")
public java.util.List<UserDto> admins() {
return userService.getAdmins().stream()
.map(userMapper::toDto)
.collect(java.util.stream.Collectors.toList());
}
@@ -194,149 +202,15 @@ public class UserController {
int pLimit = postsLimit != null ? postsLimit : defaultPostsLimit;
int rLimit = repliesLimit != null ? repliesLimit : defaultRepliesLimit;
java.util.List<PostMetaDto> posts = postService.getRecentPostsByUser(user.getUsername(), pLimit).stream()
.map(this::toMetaDto)
.map(userMapper::toMetaDto)
.collect(java.util.stream.Collectors.toList());
java.util.List<CommentInfoDto> replies = commentService.getRecentCommentsByUser(user.getUsername(), rLimit).stream()
.map(this::toCommentInfoDto)
.map(userMapper::toCommentInfoDto)
.collect(java.util.stream.Collectors.toList());
UserAggregateDto dto = new UserAggregateDto();
dto.setUser(toDto(user, auth));
dto.setUser(userMapper.toDto(user, auth));
dto.setPosts(posts);
dto.setReplies(replies);
return ResponseEntity.ok(dto);
}
private UserDto toDto(User user, Authentication viewer) {
UserDto dto = new UserDto();
dto.setId(user.getId());
dto.setUsername(user.getUsername());
dto.setEmail(user.getEmail());
dto.setAvatar(user.getAvatar());
dto.setRole(user.getRole().name());
dto.setIntroduction(user.getIntroduction());
dto.setFollowers(subscriptionService.countSubscribers(user.getUsername()));
dto.setFollowing(subscriptionService.countSubscribed(user.getUsername()));
dto.setCreatedAt(user.getCreatedAt());
dto.setLastPostTime(postService.getLastPostTime(user.getUsername()));
dto.setTotalViews(postService.getTotalViews(user.getUsername()));
dto.setVisitedDays(userVisitService.countVisits(user.getUsername()));
dto.setReadPosts(postReadService.countReads(user.getUsername()));
dto.setLikesSent(reactionService.countLikesSent(user.getUsername()));
dto.setLikesReceived(reactionService.countLikesReceived(user.getUsername()));
if (viewer != null) {
dto.setSubscribed(subscriptionService.isSubscribed(viewer.getName(), user.getUsername()));
} else {
dto.setSubscribed(false);
}
return dto;
}
private UserDto toDto(User user) {
return toDto(user, null);
}
private PostMetaDto toMetaDto(com.openisle.model.Post post) {
PostMetaDto dto = new PostMetaDto();
dto.setId(post.getId());
dto.setTitle(post.getTitle());
String content = post.getContent();
if (content == null) {
content = "";
}
if (snippetLength >= 0) {
dto.setSnippet(content.length() > snippetLength ? content.substring(0, snippetLength) : content);
} else {
dto.setSnippet(content);
}
dto.setCreatedAt(post.getCreatedAt());
dto.setCategory(post.getCategory().getName());
dto.setViews(post.getViews());
return dto;
}
private CommentInfoDto toCommentInfoDto(com.openisle.model.Comment comment) {
CommentInfoDto dto = new CommentInfoDto();
dto.setId(comment.getId());
dto.setContent(comment.getContent());
dto.setCreatedAt(comment.getCreatedAt());
dto.setPost(toMetaDto(comment.getPost()));
if (comment.getParent() != null) {
ParentCommentDto pc = new ParentCommentDto();
pc.setId(comment.getParent().getId());
pc.setAuthor(comment.getParent().getAuthor().getUsername());
pc.setContent(comment.getParent().getContent());
dto.setParentComment(pc);
}
return dto;
}
@Data
private static class UserDto {
private Long id;
private String username;
private String email;
private String avatar;
private String role;
private String introduction;
private long followers;
private long following;
private java.time.LocalDateTime createdAt;
private java.time.LocalDateTime lastPostTime;
private long totalViews;
private long visitedDays;
private long readPosts;
private long likesSent;
private long likesReceived;
private boolean subscribed;
}
@Data
private static class PostMetaDto {
private Long id;
private String title;
private String snippet;
private java.time.LocalDateTime createdAt;
private String category;
private long views;
}
@Data
private static class CommentInfoDto {
private Long id;
private String content;
private java.time.LocalDateTime createdAt;
private PostMetaDto post;
private ParentCommentDto parentComment;
}
@Data
private static class TagInfoDto {
private Long id;
private String name;
private String description;
private String icon;
private String smallIcon;
private java.time.LocalDateTime createdAt;
private Long count;
}
@Data
private static class ParentCommentDto {
private Long id;
private String author;
private String content;
}
@Data
private static class UpdateProfileDto {
private String username;
private String introduction;
}
@Data
private static class UserAggregateDto {
private UserDto user;
private java.util.List<PostMetaDto> posts;
private java.util.List<CommentInfoDto> replies;
}
}

View File

@@ -0,0 +1,21 @@
package com.openisle.dto;
import com.openisle.model.ActivityType;
import lombok.Data;
import java.time.LocalDateTime;
/**
* DTO representing an activity without participant details.
*/
@Data
public class ActivityDto {
private Long id;
private String title;
private String icon;
private String content;
private LocalDateTime startTime;
private LocalDateTime endTime;
private ActivityType type;
private boolean ended;
}

View File

@@ -0,0 +1,16 @@
package com.openisle.dto;
import lombok.Data;
import com.openisle.model.MedalType;
/**
* DTO representing a post or comment author.
*/
@Data
public class AuthorDto {
private Long id;
private String username;
private String avatar;
private MedalType displayMedal;
}

View File

@@ -0,0 +1,17 @@
package com.openisle.dto;
import lombok.Data;
/**
* DTO representing a post category.
*/
@Data
public class CategoryDto {
private Long id;
private String name;
private String description;
private String icon;
private String smallIcon;
private Long count;
}

View File

@@ -0,0 +1,12 @@
package com.openisle.dto;
import lombok.Data;
/** Request body for creating or updating a category. */
@Data
public class CategoryRequest {
private String name;
private String description;
private String icon;
private String smallIcon;
}

View File

@@ -0,0 +1,17 @@
package com.openisle.dto;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
public class ChannelDto {
private Long id;
private String name;
private String description;
private String avatar;
private MessageDto lastMessage;
private long memberCount;
private boolean joined;
private long unreadCount;
}

View File

@@ -0,0 +1,23 @@
package com.openisle.dto;
import lombok.Data;
import java.time.LocalDateTime;
import java.util.List;
/**
* DTO representing a comment and its nested replies.
*/
@Data
public class CommentDto {
private Long id;
private String content;
private LocalDateTime createdAt;
private LocalDateTime pinnedAt;
private AuthorDto author;
private List<CommentDto> replies;
private List<ReactionDto> reactions;
private int reward;
private int pointReward;
}

View File

@@ -0,0 +1,15 @@
package com.openisle.dto;
import lombok.Data;
import java.time.LocalDateTime;
/** DTO for comment information in user profiles. */
@Data
public class CommentInfoDto {
private Long id;
private String content;
private LocalDateTime createdAt;
private PostMetaDto post;
private ParentCommentDto parentComment;
}

View File

@@ -0,0 +1,11 @@
package com.openisle.dto;
import lombok.Data;
import lombok.EqualsAndHashCode;
@Data
@EqualsAndHashCode(callSuper = true)
public class CommentMedalDto extends MedalDto {
private long currentCommentCount;
private long targetCommentCount;
}

View File

@@ -0,0 +1,10 @@
package com.openisle.dto;
import lombok.Data;
/** Request body for creating or replying to a comment. */
@Data
public class CommentRequest {
private String content;
private String captcha;
}

View File

@@ -0,0 +1,15 @@
package com.openisle.dto;
import com.openisle.model.PasswordStrength;
import com.openisle.model.PublishMode;
import com.openisle.model.RegisterMode;
import lombok.Data;
/** DTO for site configuration. */
@Data
public class ConfigDto {
private PublishMode publishMode;
private PasswordStrength passwordStrength;
private Integer aiFormatLimit;
private RegisterMode registerMode;
}

View File

@@ -0,0 +1,12 @@
package com.openisle.dto;
import lombok.Data;
import lombok.EqualsAndHashCode;
@Data
@EqualsAndHashCode(callSuper = true)
public class ContributorMedalDto extends MedalDto {
private long currentContributionLines;
private long targetContributionLines;
}

View File

@@ -0,0 +1,16 @@
package com.openisle.dto;
import lombok.Data;
import org.springframework.data.domain.Page;
import java.util.List;
@Data
public class ConversationDetailDto {
private Long id;
private String name;
private boolean channel;
private String avatar;
private List<UserSummaryDto> participants;
private Page<MessageDto> messages;
}

View File

@@ -0,0 +1,20 @@
package com.openisle.dto;
import lombok.Getter;
import lombok.Setter;
import java.time.LocalDateTime;
import java.util.List;
@Getter
@Setter
public class ConversationDto {
private Long id;
private String name;
private boolean channel;
private String avatar;
private MessageDto lastMessage;
private List<UserSummaryDto> participants;
private LocalDateTime createdAt;
private long unreadCount;
}

View File

@@ -0,0 +1,8 @@
package com.openisle.dto;
import lombok.Data;
@Data
public class CreateConversationRequest {
private Long recipientId;
}

View File

@@ -0,0 +1,12 @@
package com.openisle.dto;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
@AllArgsConstructor
@NoArgsConstructor
public class CreateConversationResponse {
private Long conversationId;
}

View File

@@ -0,0 +1,11 @@
package com.openisle.dto;
import lombok.Data;
/** Request for Discord OAuth login. */
@Data
public class DiscordLoginRequest {
private String code;
private String redirectUri;
private String inviteToken;
}

View File

@@ -0,0 +1,15 @@
package com.openisle.dto;
import lombok.Data;
import java.util.List;
/** DTO representing a saved draft. */
@Data
public class DraftDto {
private Long id;
private String title;
private String content;
private Long categoryId;
private List<Long> tagIds;
}

View File

@@ -0,0 +1,14 @@
package com.openisle.dto;
import lombok.Data;
import java.util.List;
/** Request body for saving a draft. */
@Data
public class DraftRequest {
private String title;
private String content;
private Long categoryId;
private List<Long> tagIds;
}

View File

@@ -0,0 +1,12 @@
package com.openisle.dto;
import lombok.Data;
import lombok.EqualsAndHashCode;
@Data
@EqualsAndHashCode(callSuper = true)
public class FeaturedMedalDto extends MedalDto {
private long currentFeaturedCount;
private long targetFeaturedCount;
}

View File

@@ -0,0 +1,9 @@
package com.openisle.dto;
import lombok.Data;
/** Request to trigger a forgot password email. */
@Data
public class ForgotPasswordRequest {
private String email;
}

View File

@@ -0,0 +1,11 @@
package com.openisle.dto;
import lombok.Data;
/** Request for GitHub OAuth login. */
@Data
public class GithubLoginRequest {
private String code;
private String redirectUri;
private String inviteToken;
}

View File

@@ -0,0 +1,10 @@
package com.openisle.dto;
import lombok.Data;
/** Request for Google OAuth login. */
@Data
public class GoogleLoginRequest {
private String idToken;
private String inviteToken;
}

View File

@@ -0,0 +1,11 @@
package com.openisle.dto;
import lombok.Data;
/** Request to login. */
@Data
public class LoginRequest {
private String username;
private String password;
private String captcha;
}

View File

@@ -0,0 +1,18 @@
package com.openisle.dto;
import lombok.Data;
import java.time.LocalDateTime;
import java.util.List;
/** Metadata for lottery posts. */
@Data
public class LotteryDto {
private String prizeDescription;
private String prizeIcon;
private int prizeCount;
private int pointCost;
private LocalDateTime startTime;
private LocalDateTime endTime;
private List<AuthorDto> participants;
private List<AuthorDto> winners;
}

View File

@@ -0,0 +1,10 @@
package com.openisle.dto;
import lombok.Data;
/** Request to submit a reason (e.g., for moderation). */
@Data
public class MakeReasonRequest {
private String token;
private String reason;
}

View File

@@ -0,0 +1,14 @@
package com.openisle.dto;
import com.openisle.model.MedalType;
import lombok.Data;
@Data
public class MedalDto {
private String icon;
private String title;
private String description;
private MedalType type;
private boolean completed;
private boolean selected;
}

View File

@@ -0,0 +1,9 @@
package com.openisle.dto;
import com.openisle.model.MedalType;
import lombok.Data;
@Data
public class MedalSelectRequest {
private MedalType type;
}

View File

@@ -0,0 +1,16 @@
package com.openisle.dto;
import lombok.Data;
import java.time.LocalDateTime;
import java.util.List;
@Data
public class MessageDto {
private Long id;
private String content;
private UserSummaryDto sender;
private Long conversationId;
private LocalDateTime createdAt;
private MessageDto replyTo;
private List<ReactionDto> reactions;
}

View File

@@ -0,0 +1,15 @@
package com.openisle.dto;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
@Data
@NoArgsConstructor
@AllArgsConstructor
public class MessageNotificationPayload implements Serializable {
private String targetUsername;
private Object payload;
}

View File

@@ -0,0 +1,10 @@
package com.openisle.dto;
import lombok.Data;
/** Info about the milk tea activity. */
@Data
public class MilkTeaInfoDto {
private long redeemCount;
private boolean ended;
}

Some files were not shown because too many files have changed in this diff Show More