Skip to content

Self-hosted personal gallery application with online photo management and albums, supporting Live/Motion Photos, EXIF parsing, geolocation recognition, and an explore map.

fix(settings): add user tracking for settings updates

Timothy Yinef65f3d30e70
diff --git a/app/composables/useSettingsForm.ts b/app/composables/useSettingsForm.ts
index 0c244e73..8eae7c6f 100644
--- a/app/composables/useSettingsForm.ts
+++ b/app/composables/useSettingsForm.ts
@@ -81,6 +81,9 @@ export function useSettingsForm(namespace: string) {
body: { updates },
})
+ // 刷新全局设置状态,确保所有使用 getSetting() 的地方都能获取到最新值
+ await refreshSettings()
+
// 重新加载字段以获取最新值
await fetchFields()
diff --git a/server/api/system/settings/[namespace]/[key].ts b/server/api/system/settings/[namespace]/[key].ts
index dd93a942..4a0a0329 100644
--- a/server/api/system/settings/[namespace]/[key].ts
+++ b/server/api/system/settings/[namespace]/[key].ts
@@ -4,6 +4,7 @@ import {
settingNamespaces,
} from '~~/server/services/settings/contants'
import { settingsManager } from '~~/server/services/settings/settingsManager'
+import { useDB, tables, eq } from '~~/server/utils/db'
export default eventHandler(async (event) => {
const { namespace, key } = await getValidatedRouterParams(
@@ -42,8 +43,15 @@ export default eventHandler(async (event) => {
}).parse,
)
+ // 获取当前用户ID,如果用户不存在于数据库则返回null
+ const db = useDB()
+ const currentUser = session.user.id
+ ? db.select().from(tables.users).where(eq(tables.users.id, session.user.id)).get()
+ : null
+ const updatedBy = currentUser ? currentUser.id : undefined
+
try {
- await settingsManager.set(namespace, key, value, session.user.id)
+ await settingsManager.set(namespace, key, value, updatedBy)
return { namespace, key, value }
} catch (err) {
throw createError({
diff --git a/server/api/system/settings/batch.put.ts b/server/api/system/settings/batch.put.ts
index 715b34c9..2b0ff959 100644
--- a/server/api/system/settings/batch.put.ts
+++ b/server/api/system/settings/batch.put.ts
@@ -4,6 +4,7 @@ import {
settingNamespaces,
} from '~~/server/services/settings/contants'
import { settingsManager } from '~~/server/services/settings/settingsManager'
+import { useDB, tables, eq } from '~~/server/utils/db'
/**
* PUT /api/system/settings/batch
@@ -49,6 +50,13 @@ export default eventHandler(async (event) => {
let successCount = 0
const errors: Array<{ namespace: string; key: string; error: string }> = []
+ // 获取当前用户ID,如果用户不存在于数据库则返回null
+ const db = useDB()
+ const currentUser = session.user.id
+ ? db.select().from(tables.users).where(eq(tables.users.id, session.user.id)).get()
+ : null
+ const updatedBy = currentUser ? currentUser.id : undefined
+
// 逐个更新设置
for (const update of body.updates) {
try {
@@ -56,7 +64,7 @@ export default eventHandler(async (event) => {
update.namespace,
update.key,
update.value,
- session.user.id,
+ updatedBy,
)
successCount++
} catch (err) {