diff --git a/backend/apps/dashboard/crud/dashboard_service.py b/backend/apps/dashboard/crud/dashboard_service.py index 566636af..4154024d 100644 --- a/backend/apps/dashboard/crud/dashboard_service.py +++ b/backend/apps/dashboard/crud/dashboard_service.py @@ -33,11 +33,11 @@ def load_resource(session: SessionDep, dashboard: QueryDashboard): sql = text(""" SELECT cd.*, creator.name AS create_name, - updator.name AS update_name + updater.name AS update_name FROM core_dashboard cd LEFT JOIN sys_user creator ON cd.create_by = creator.id::varchar - LEFT JOIN sys_user updator - ON cd.update_by = updator.id:: varchar + LEFT JOIN sys_user updater + ON cd.update_by = updater.id:: varchar WHERE cd.id = :dashboard_id """) result = session.execute(sql, {"dashboard_id": dashboard.id}).mappings().first() diff --git a/backend/common/core/config.py b/backend/common/core/config.py index 4e09c201..df7efba0 100644 --- a/backend/common/core/config.py +++ b/backend/common/core/config.py @@ -28,7 +28,9 @@ class Settings(BaseSettings): extra="ignore", ) PROJECT_NAME: str = "SQLBot" - API_V1_STR: str = "/api/v1" + #CONTEXT_PATH: str = "/sqlbot" + CONTEXT_PATH: str = "" + API_V1_STR: str = CONTEXT_PATH + "/api/v1" SECRET_KEY: str = secrets.token_urlsafe(32) # 60 minutes * 24 hours * 8 days = 8 days ACCESS_TOKEN_EXPIRE_MINUTES: int = 60 * 24 * 8 diff --git a/backend/common/utils/whitelist.py b/backend/common/utils/whitelist.py index 8a11d1d2..9080062e 100644 --- a/backend/common/utils/whitelist.py +++ b/backend/common/utils/whitelist.py @@ -67,6 +67,13 @@ def is_whitelisted(self, path: str) -> bool: prefix = settings.API_V1_STR if path.startswith(prefix): path = path[len(prefix):] + + context_prefix = settings.CONTEXT_PATH + if context_prefix and path.startswith(context_prefix): + path = path[len(context_prefix):] + + if not path: + path = '/' if path in self.whitelist: return True diff --git a/frontend/src/components/layout/Person.vue b/frontend/src/components/layout/Person.vue index 75b6a657..160ffa4e 100644 --- a/frontend/src/components/layout/Person.vue +++ b/frontend/src/components/layout/Person.vue @@ -34,6 +34,11 @@ const account = computed(() => userStore.getAccount) const currentLanguage = computed(() => userStore.getLanguage) const isAdmin = computed(() => userStore.isAdmin) const isLocalUser = computed(() => !userStore.getOrigin) + +const platFlag = computed(() => { + const platformInfo = userStore.getPlatformInfo + return platformInfo?.flag || 0 +}) const dialogVisible = ref(false) const apikeyDialogVisible = ref(false) const aboutRef = ref() @@ -125,7 +130,7 @@ const logout = async () => {