From 47a9ce5843678e8416b57613f8549efd68437983 Mon Sep 17 00:00:00 2001 From: Tim Date: Wed, 13 Aug 2025 14:02:32 +0800 Subject: [PATCH 1/6] =?UTF-8?q?fix:=20=E5=90=8E=E7=AB=AF=E5=8F=96=E6=B6=88?= =?UTF-8?q?=E7=BD=91=E5=9D=80hardcode?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/src/main/java/com/openisle/config/SecurityConfig.java | 2 +- .../main/java/com/openisle/controller/AdminUserController.java | 2 +- .../main/java/com/openisle/controller/SitemapController.java | 2 +- .../src/main/java/com/openisle/service/NotificationService.java | 2 +- backend/src/main/java/com/openisle/service/ReactionService.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/backend/src/main/java/com/openisle/config/SecurityConfig.java b/backend/src/main/java/com/openisle/config/SecurityConfig.java index 55cfaf547..7701d3df7 100644 --- a/backend/src/main/java/com/openisle/config/SecurityConfig.java +++ b/backend/src/main/java/com/openisle/config/SecurityConfig.java @@ -41,7 +41,7 @@ public class SecurityConfig { private final UserRepository userRepository; private final AccessDeniedHandler customAccessDeniedHandler; private final UserVisitService userVisitService; - @Value("${app.website-url:https://www.open-isle.com}") + @Value("${app.website-url}") private String websiteUrl; @Bean diff --git a/backend/src/main/java/com/openisle/controller/AdminUserController.java b/backend/src/main/java/com/openisle/controller/AdminUserController.java index 2e43e6188..4beed5ce5 100644 --- a/backend/src/main/java/com/openisle/controller/AdminUserController.java +++ b/backend/src/main/java/com/openisle/controller/AdminUserController.java @@ -18,7 +18,7 @@ public class AdminUserController { private final UserRepository userRepository; private final NotificationRepository notificationRepository; private final EmailSender emailSender; - @Value("${app.website-url:https://www.open-isle.com}") + @Value("${app.website-url}") private String websiteUrl; @PostMapping("/{id}/approve") diff --git a/backend/src/main/java/com/openisle/controller/SitemapController.java b/backend/src/main/java/com/openisle/controller/SitemapController.java index 4b8b0818c..e7e03f40a 100644 --- a/backend/src/main/java/com/openisle/controller/SitemapController.java +++ b/backend/src/main/java/com/openisle/controller/SitemapController.java @@ -22,7 +22,7 @@ import java.util.List; public class SitemapController { private final PostRepository postRepository; - @Value("${app.website-url:https://www.open-isle.com}") + @Value("${app.website-url}") private String websiteUrl; @GetMapping(value = "/sitemap.xml", produces = MediaType.APPLICATION_XML_VALUE) diff --git a/backend/src/main/java/com/openisle/service/NotificationService.java b/backend/src/main/java/com/openisle/service/NotificationService.java index aabdb5b03..b459456b7 100644 --- a/backend/src/main/java/com/openisle/service/NotificationService.java +++ b/backend/src/main/java/com/openisle/service/NotificationService.java @@ -36,7 +36,7 @@ public class NotificationService { private final ReactionRepository reactionRepository; private final Executor notificationExecutor; - @Value("${app.website-url:https://www.open-isle.com}") + @Value("${app.website-url}") private String websiteUrl; private static final Pattern MENTION_PATTERN = Pattern.compile("@\\[([^\\]]+)\\]"); diff --git a/backend/src/main/java/com/openisle/service/ReactionService.java b/backend/src/main/java/com/openisle/service/ReactionService.java index ae336bad9..b6cda46f5 100644 --- a/backend/src/main/java/com/openisle/service/ReactionService.java +++ b/backend/src/main/java/com/openisle/service/ReactionService.java @@ -27,7 +27,7 @@ public class ReactionService { private final NotificationService notificationService; private final EmailSender emailSender; - @Value("${app.website-url:https://www.open-isle.com}") + @Value("${app.website-url}") private String websiteUrl; @Transactional From 5d7ca3d29a6d86097d62298561cbdaece33d2628 Mon Sep 17 00:00:00 2001 From: Tim <135014430+nagisa77@users.noreply.github.com> Date: Wed, 13 Aug 2025 16:00:26 +0800 Subject: [PATCH 2/6] feat: use runtime config for API and OAuth client IDs --- frontend_nuxt/.env | 5 +++++ frontend_nuxt/main.js | 17 +++++++++-------- frontend_nuxt/nuxt.config.ts | 9 +++++++++ 3 files changed, 23 insertions(+), 8 deletions(-) create mode 100644 frontend_nuxt/.env diff --git a/frontend_nuxt/.env b/frontend_nuxt/.env new file mode 100644 index 000000000..409b7d1b2 --- /dev/null +++ b/frontend_nuxt/.env @@ -0,0 +1,5 @@ +NUXT_PUBLIC_API_BASE_URL=https://www.open-isle.com +NUXT_PUBLIC_GOOGLE_CLIENT_ID=777830451304-xxx.apps.googleusercontent.com +NUXT_PUBLIC_GITHUB_CLIENT_ID=Ov23liVkO1NPAX5JyWxJ +NUXT_PUBLIC_DISCORD_CLIENT_ID=1394985417044000779 +NUXT_PUBLIC_TWITTER_CLIENT_ID=ZTRTU05KSk9KTTJrTTdrVC1tc1E6MTpjaQ diff --git a/frontend_nuxt/main.js b/frontend_nuxt/main.js index d620ba1cc..8e27fe64e 100644 --- a/frontend_nuxt/main.js +++ b/frontend_nuxt/main.js @@ -1,11 +1,12 @@ -export const API_BASE_URL = 'https://www.open-isle.com' -// export const API_BASE_URL = 'http://127.0.0.1:8081' -// export const API_BASE_URL = 'http://30.211.97.238:8081' -export const GOOGLE_CLIENT_ID = - '777830451304-nt8afkkap18gui4f9entcha99unal744.apps.googleusercontent.com' -export const GITHUB_CLIENT_ID = 'Ov23liVkO1NPAX5JyWxJ' -export const DISCORD_CLIENT_ID = '1394985417044000779' -export const TWITTER_CLIENT_ID = 'ZTRTU05KSk9KTTJrTTdrVC1tc1E6MTpjaQ' +import { useRuntimeConfig } from '#app' + +const config = useRuntimeConfig() + +export const API_BASE_URL = config.public.apiBaseUrl +export const GOOGLE_CLIENT_ID = config.public.googleClientId +export const GITHUB_CLIENT_ID = config.public.githubClientId +export const DISCORD_CLIENT_ID = config.public.discordClientId +export const TWITTER_CLIENT_ID = config.public.twitterClientId // 重新导出 toast 功能,使用 composable 方式 export { toast } from './composables/useToast' diff --git a/frontend_nuxt/nuxt.config.ts b/frontend_nuxt/nuxt.config.ts index 7d94847ba..865bcfb86 100644 --- a/frontend_nuxt/nuxt.config.ts +++ b/frontend_nuxt/nuxt.config.ts @@ -2,6 +2,15 @@ import { defineNuxtConfig } from 'nuxt/config' export default defineNuxtConfig({ ssr: true, + runtimeConfig: { + public: { + apiBaseUrl: process.env.NUXT_PUBLIC_API_BASE_URL || '', + googleClientId: process.env.NUXT_PUBLIC_GOOGLE_CLIENT_ID || '', + githubClientId: process.env.NUXT_PUBLIC_GITHUB_CLIENT_ID || '', + discordClientId: process.env.NUXT_PUBLIC_DISCORD_CLIENT_ID || '', + twitterClientId: process.env.NUXT_PUBLIC_TWITTER_CLIENT_ID || '', + }, + }, // Ensure Vditor styles load before our overrides in global.css css: ['vditor/dist/index.css', '~/assets/global.css'], app: { From 0034839e8d29285f0f5cadeb2b0df5bb3936e05d Mon Sep 17 00:00:00 2001 From: Tim Date: Wed, 13 Aug 2025 17:49:51 +0800 Subject: [PATCH 3/6] =?UTF-8?q?fix:=20=E8=BF=81=E7=A7=BB=E9=83=A8=E5=88=86?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=B8=BAsetup?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend_nuxt/components/AchievementList.vue | 4 +- frontend_nuxt/components/CategorySelect.vue | 68 +- frontend_nuxt/components/CommentItem.vue | 360 +++++----- frontend_nuxt/components/GlobalPopups.vue | 156 +++-- frontend_nuxt/components/MenuComponent.vue | 196 +++--- .../components/MilkTeaActivityComponent.vue | 113 ++-- frontend_nuxt/components/ReactionsGroup.vue | 261 ++++---- frontend_nuxt/components/SearchDropdown.vue | 150 ++--- frontend_nuxt/components/TagSelect.vue | 193 +++--- frontend_nuxt/main.js | 11 - frontend_nuxt/pages/about/stats.vue | 3 +- frontend_nuxt/pages/activities.vue | 43 +- frontend_nuxt/pages/forgot-password.vue | 186 +++--- frontend_nuxt/pages/index.vue | 583 ++++++++--------- frontend_nuxt/pages/login.vue | 107 ++- frontend_nuxt/pages/message.vue | 613 +++++++++--------- frontend_nuxt/pages/new-post.vue | 582 ++++++++--------- frontend_nuxt/pages/posts/[id]/edit.vue | 303 ++++----- frontend_nuxt/pages/settings.vue | 309 +++++---- frontend_nuxt/pages/signup-reason.vue | 102 ++- frontend_nuxt/pages/signup.vue | 235 ++++--- 21 files changed, 2152 insertions(+), 2426 deletions(-) diff --git a/frontend_nuxt/components/AchievementList.vue b/frontend_nuxt/components/AchievementList.vue index f69c1fb21..a58e4b4a2 100644 --- a/frontend_nuxt/components/AchievementList.vue +++ b/frontend_nuxt/components/AchievementList.vue @@ -37,8 +37,10 @@