Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improve timezone information in login notification #6309

Merged
merged 6 commits into from
Jul 17, 2024
Merged

Improve timezone information in login notification #6309

Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
39a52a3
feat: convert UTC to System TimeZone
ShiinaKin Jul 10, 2024
67b9194
refactor: rename test method
ShiinaKin Jul 10, 2024
808f377
feat: append timeZone
ShiinaKin Jul 15, 2024
ce0d6fb
feat: format ISO8601 as custom format
ShiinaKin Jul 15, 2024
cf33d98
fix: wrong timeZone display
ShiinaKin Jul 16, 2024
31f9e83
feat:
ShiinaKin Jul 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions application/src/main/resources/extensions/notification-templates.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ spec:
[(${subscriber.displayName})] 你好：

你的 [(${site.title})] 账号被用于在 [(${os})] 的 [(${browser})] 上登录。
时间：[(${loginTime})]
时间：[(${#temporals.format(loginTime, 'yyyy/MM/dd HH:mm:ss O')})]
ShiinaKin marked this conversation as resolved.
Show resolved Hide resolved
IP 地址：[(${ipAddress})]
如果你知悉上述信息，请忽略此电子邮件。
如果你最近没有使用你的 Halo 账号登录并相信有人可能访问了你的账户，请尽快重设你的密码。
Expand All @@ -180,8 +180,8 @@ spec:
<div class="body">
<p th:text="|你的 ${site.title} 账号被用于在 ${os} 的 ${browser} 上登录：|"></p>
<div class="device-info">
<p th:text="|时间： ${loginTime}。|"></p>
<p th:text="|IP 地址： ${ipAddress}。|"></p>
<p th:text="|时间： ${#temporals.format(loginTime, 'yyyy/MM/dd HH:mm:ss O')}|"></p>
<p th:text="|IP 地址： ${ipAddress}|"></p>
</div>
<p>如果你知悉上述信息，请忽略此电子邮件。</p>
<p th:text="|如果你最近没有使用你的 ${site.title} 账号登录并相信有人可能访问了你的账户，请尽快重设你的密码。|"></p>
Expand Down