Compare commits
3 Commits
3ae151404b
..
main
| Author | SHA1 | Date | |
|---|---|---|---|
| 1c5dfb12e1 | |||
| ad2f49de11 | |||
| 34466a1ae9 |
@@ -1,5 +1,5 @@
|
|||||||
from typing import Optional
|
from typing import Optional
|
||||||
from fastapi import APIRouter, Depends, Query
|
from fastapi import APIRouter, Depends, Query, HTTPException, status
|
||||||
from sqlalchemy.orm import Session
|
from sqlalchemy.orm import Session
|
||||||
|
|
||||||
from app.core.database import get_db
|
from app.core.database import get_db
|
||||||
@@ -89,7 +89,6 @@ def delete_project(
|
|||||||
):
|
):
|
||||||
p = project_service.get_project(db, project_id)
|
p = project_service.get_project(db, project_id)
|
||||||
if not p:
|
if not p:
|
||||||
from fastapi import HTTPException, status
|
|
||||||
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="项目不存在")
|
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="项目不存在")
|
||||||
# Only admin or project creator can delete
|
# Only admin or project creator can delete
|
||||||
if not _is_admin(current_user) and p.created_by != current_user.id:
|
if not _is_admin(current_user) and p.created_by != current_user.id:
|
||||||
@@ -110,13 +109,14 @@ def project_auto_classify(
|
|||||||
|
|
||||||
project = project_service.get_project(db, project_id)
|
project = project_service.get_project(db, project_id)
|
||||||
if not project:
|
if not project:
|
||||||
from fastapi import HTTPException, status
|
|
||||||
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="项目不存在")
|
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="项目不存在")
|
||||||
|
|
||||||
|
try:
|
||||||
if background:
|
if background:
|
||||||
# Check if already running
|
# Check if already running
|
||||||
if project.celery_task_id:
|
if project.celery_task_id:
|
||||||
existing = AsyncResult(project.celery_task_id)
|
from app.tasks.worker import celery_app
|
||||||
|
existing = AsyncResult(project.celery_task_id, app=celery_app)
|
||||||
if existing.state in ("PENDING", "PROGRESS", "STARTED"):
|
if existing.state in ("PENDING", "PROGRESS", "STARTED"):
|
||||||
return ResponseModel(data={"task_id": project.celery_task_id, "status": existing.state})
|
return ResponseModel(data={"task_id": project.celery_task_id, "status": existing.state})
|
||||||
|
|
||||||
@@ -136,6 +136,13 @@ def project_auto_classify(
|
|||||||
project.status = "created"
|
project.status = "created"
|
||||||
db.commit()
|
db.commit()
|
||||||
return ResponseModel(data=result)
|
return ResponseModel(data=result)
|
||||||
|
except Exception as e:
|
||||||
|
import logging
|
||||||
|
logging.exception("Auto classify failed")
|
||||||
|
raise HTTPException(
|
||||||
|
status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
|
||||||
|
detail=f"自动分类执行失败: {str(e)}"
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
@router.get("/{project_id}/auto-classify-status")
|
@router.get("/{project_id}/auto-classify-status")
|
||||||
@@ -149,7 +156,6 @@ def project_auto_classify_status(
|
|||||||
|
|
||||||
project = project_service.get_project(db, project_id)
|
project = project_service.get_project(db, project_id)
|
||||||
if not project:
|
if not project:
|
||||||
from fastapi import HTTPException, status
|
|
||||||
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="项目不存在")
|
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="项目不存在")
|
||||||
|
|
||||||
task_id = project.celery_task_id
|
task_id = project.celery_task_id
|
||||||
@@ -158,7 +164,8 @@ def project_auto_classify_status(
|
|||||||
progress = json.loads(project.scan_progress) if project.scan_progress else None
|
progress = json.loads(project.scan_progress) if project.scan_progress else None
|
||||||
return ResponseModel(data={"status": project.status, "progress": progress})
|
return ResponseModel(data={"status": project.status, "progress": progress})
|
||||||
|
|
||||||
result = AsyncResult(task_id)
|
from app.tasks.worker import celery_app
|
||||||
|
result = AsyncResult(task_id, app=celery_app)
|
||||||
progress = None
|
progress = None
|
||||||
if result.state == "PROGRESS" and result.info:
|
if result.state == "PROGRESS" and result.info:
|
||||||
progress = result.info
|
progress = result.info
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ from fastapi import HTTPException, status
|
|||||||
|
|
||||||
from app.models.user import User, Role, Dept, UserRole
|
from app.models.user import User, Role, Dept, UserRole
|
||||||
from app.schemas.user import UserCreate, UserUpdate
|
from app.schemas.user import UserCreate, UserUpdate
|
||||||
from app.core.security import get_password_hash
|
from app.core.security import get_password_hash, verify_password
|
||||||
|
|
||||||
|
|
||||||
def get_user_by_id(db: Session, user_id: int) -> Optional[User]:
|
def get_user_by_id(db: Session, user_id: int) -> Optional[User]:
|
||||||
@@ -105,9 +105,10 @@ def create_initial_data(db: Session):
|
|||||||
|
|
||||||
db.commit()
|
db.commit()
|
||||||
|
|
||||||
# Create superuser
|
# Create or sync the configured bootstrap superuser.
|
||||||
from app.core.config import settings
|
from app.core.config import settings
|
||||||
if not get_user_by_username(db, settings.FIRST_SUPERUSER_USERNAME):
|
superuser = get_user_by_username(db, settings.FIRST_SUPERUSER_USERNAME)
|
||||||
|
if not superuser:
|
||||||
superuser = User(
|
superuser = User(
|
||||||
username=settings.FIRST_SUPERUSER_USERNAME,
|
username=settings.FIRST_SUPERUSER_USERNAME,
|
||||||
email=settings.FIRST_SUPERUSER_EMAIL,
|
email=settings.FIRST_SUPERUSER_EMAIL,
|
||||||
@@ -121,7 +122,28 @@ def create_initial_data(db: Session):
|
|||||||
db.commit()
|
db.commit()
|
||||||
db.refresh(superuser)
|
db.refresh(superuser)
|
||||||
|
|
||||||
|
else:
|
||||||
|
changed = False
|
||||||
|
if not verify_password(settings.FIRST_SUPERUSER_PASSWORD, superuser.hashed_password):
|
||||||
|
superuser.hashed_password = get_password_hash(settings.FIRST_SUPERUSER_PASSWORD)
|
||||||
|
changed = True
|
||||||
|
if superuser.email != settings.FIRST_SUPERUSER_EMAIL:
|
||||||
|
superuser.email = settings.FIRST_SUPERUSER_EMAIL
|
||||||
|
changed = True
|
||||||
|
if not superuser.is_active:
|
||||||
|
superuser.is_active = True
|
||||||
|
changed = True
|
||||||
|
if not superuser.is_superuser:
|
||||||
|
superuser.is_superuser = True
|
||||||
|
changed = True
|
||||||
|
if superuser.dept_id is None:
|
||||||
|
superuser.dept_id = 1
|
||||||
|
changed = True
|
||||||
|
if changed:
|
||||||
|
db.commit()
|
||||||
|
db.refresh(superuser)
|
||||||
|
|
||||||
superadmin_role = db.query(Role).filter(Role.code == "superadmin").first()
|
superadmin_role = db.query(Role).filter(Role.code == "superadmin").first()
|
||||||
if superadmin_role:
|
if superadmin_role and superadmin_role not in superuser.roles:
|
||||||
db.add(UserRole(user_id=superuser.id, role_id=superadmin_role.id))
|
db.add(UserRole(user_id=superuser.id, role_id=superadmin_role.id))
|
||||||
db.commit()
|
db.commit()
|
||||||
|
|||||||
@@ -35,7 +35,7 @@ export function deleteProject(id: number) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export function autoClassifyProject(id: number, background: boolean = true) {
|
export function autoClassifyProject(id: number, background: boolean = true) {
|
||||||
return request.post(`/projects/${id}/auto-classify`, null, { params: { background } })
|
return request.post(`/projects/${id}/auto-classify`, undefined, { params: { background } })
|
||||||
}
|
}
|
||||||
|
|
||||||
export function getAutoClassifyStatus(id: number) {
|
export function getAutoClassifyStatus(id: number) {
|
||||||
|
|||||||
+40
-12
@@ -1,15 +1,38 @@
|
|||||||
import axios, { type AxiosError, type InternalAxiosRequestConfig } from 'axios'
|
import axios, { type AxiosError, type InternalAxiosRequestConfig } from 'axios'
|
||||||
import { ElMessage } from 'element-plus'
|
import { ElMessage } from 'element-plus'
|
||||||
|
|
||||||
|
type HandledError = Error & {
|
||||||
|
handled?: boolean
|
||||||
|
status?: number
|
||||||
|
}
|
||||||
|
|
||||||
const request = axios.create({
|
const request = axios.create({
|
||||||
baseURL: (import.meta as any).env?.VITE_API_BASE_URL || '/api/v1',
|
baseURL: (import.meta as any).env?.VITE_API_BASE_URL || '/api/v1',
|
||||||
timeout: 30000,
|
timeout: 30000,
|
||||||
})
|
})
|
||||||
|
|
||||||
|
function isAuthEndpoint(url?: string) {
|
||||||
|
return !!url && ['/auth/login', '/auth/refresh'].some((path) => url.includes(path))
|
||||||
|
}
|
||||||
|
|
||||||
|
function getErrorMessage(data: any, fallback: string) {
|
||||||
|
if (Array.isArray(data?.detail)) {
|
||||||
|
return data.detail.map((d: any) => d.msg || JSON.stringify(d)).join(', ')
|
||||||
|
}
|
||||||
|
return data?.detail || data?.message || fallback
|
||||||
|
}
|
||||||
|
|
||||||
|
function makeHandledError(message: string, status?: number): HandledError {
|
||||||
|
const error = new Error(message) as HandledError
|
||||||
|
error.handled = true
|
||||||
|
error.status = status
|
||||||
|
return error
|
||||||
|
}
|
||||||
|
|
||||||
request.interceptors.request.use(
|
request.interceptors.request.use(
|
||||||
(config: InternalAxiosRequestConfig) => {
|
(config: InternalAxiosRequestConfig) => {
|
||||||
const token = localStorage.getItem('dp_token')
|
const token = localStorage.getItem('dp_token')
|
||||||
if (token && config.headers) {
|
if (token && config.headers && !isAuthEndpoint(config.url)) {
|
||||||
config.headers.Authorization = `Bearer ${token}`
|
config.headers.Authorization = `Bearer ${token}`
|
||||||
}
|
}
|
||||||
return config
|
return config
|
||||||
@@ -23,26 +46,31 @@ request.interceptors.response.use(
|
|||||||
(response) => {
|
(response) => {
|
||||||
const res = response.data
|
const res = response.data
|
||||||
if (res.code !== 200) {
|
if (res.code !== 200) {
|
||||||
ElMessage.error(res.message || '请求失败')
|
const message = res.message || '请求失败'
|
||||||
return Promise.reject(new Error(res.message))
|
ElMessage.error(message)
|
||||||
|
return Promise.reject(makeHandledError(message))
|
||||||
}
|
}
|
||||||
return res
|
return res
|
||||||
},
|
},
|
||||||
(error: AxiosError) => {
|
(error: AxiosError) => {
|
||||||
const status = error.response?.status
|
const status = error.response?.status
|
||||||
|
const data = error.response?.data as any
|
||||||
|
const message = getErrorMessage(data, error.message || '网络错误')
|
||||||
if (status === 401) {
|
if (status === 401) {
|
||||||
ElMessage.error('登录已过期,请重新登录')
|
|
||||||
localStorage.removeItem('dp_token')
|
localStorage.removeItem('dp_token')
|
||||||
localStorage.removeItem('dp_refresh')
|
localStorage.removeItem('dp_refresh')
|
||||||
window.location.href = '/login'
|
|
||||||
} else {
|
if (isAuthEndpoint(error.config?.url)) {
|
||||||
const data = error.response?.data as any
|
return Promise.reject(new Error(message || '用户名或密码错误'))
|
||||||
const detail = Array.isArray(data?.detail)
|
|
||||||
? data.detail.map((d: any) => d.msg || JSON.stringify(d)).join(', ')
|
|
||||||
: data?.detail
|
|
||||||
ElMessage.error(detail || data?.message || error.message || '网络错误')
|
|
||||||
}
|
}
|
||||||
return Promise.reject(error)
|
|
||||||
|
const expiredMessage = '登录已过期,请重新登录'
|
||||||
|
ElMessage.error(expiredMessage)
|
||||||
|
return Promise.reject(makeHandledError(expiredMessage, status))
|
||||||
|
}
|
||||||
|
|
||||||
|
ElMessage.error(message)
|
||||||
|
return Promise.reject(makeHandledError(message, status))
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -129,7 +129,7 @@ const router = createRouter({
|
|||||||
routes,
|
routes,
|
||||||
})
|
})
|
||||||
|
|
||||||
router.beforeEach((to, from, next) => {
|
router.beforeEach(async (to, from, next) => {
|
||||||
const userStore = useUserStore()
|
const userStore = useUserStore()
|
||||||
|
|
||||||
// Public routes (login)
|
// Public routes (login)
|
||||||
@@ -144,12 +144,26 @@ router.beforeEach((to, from, next) => {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!userStore.userInfo) {
|
||||||
|
try {
|
||||||
|
const userInfo = await userStore.fetchUserInfo()
|
||||||
|
if (!userInfo) {
|
||||||
|
userStore.logout()
|
||||||
|
next('/login')
|
||||||
|
return
|
||||||
|
}
|
||||||
|
} catch {
|
||||||
|
next('/login')
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Check role permissions
|
// Check role permissions
|
||||||
const allowedRoles = to.meta.roles as string[] | undefined
|
const allowedRoles = to.meta.roles as string[] | undefined
|
||||||
if (allowedRoles && allowedRoles.length > 0) {
|
if (allowedRoles && allowedRoles.length > 0) {
|
||||||
const hasPermission = userStore.hasAnyRole(allowedRoles)
|
const hasPermission = userStore.hasAnyRole(allowedRoles)
|
||||||
if (!hasPermission) {
|
if (!hasPermission) {
|
||||||
next('/dashboard')
|
next(to.path === '/dashboard' ? '/login' : '/dashboard')
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -28,6 +28,7 @@ export const useUserStore = defineStore('user', () => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async function login(username: string, password: string) {
|
async function login(username: string, password: string) {
|
||||||
|
logout()
|
||||||
const res = await apiLogin(username, password)
|
const res = await apiLogin(username, password)
|
||||||
token.value = res.access_token
|
token.value = res.access_token
|
||||||
localStorage.setItem('dp_token', res.access_token)
|
localStorage.setItem('dp_token', res.access_token)
|
||||||
@@ -37,14 +38,21 @@ export const useUserStore = defineStore('user', () => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async function fetchUserInfo() {
|
async function fetchUserInfo() {
|
||||||
if (!token.value) return
|
if (!token.value) return null
|
||||||
try {
|
try {
|
||||||
const res = await getMe()
|
const res = await getMe()
|
||||||
userInfo.value = res
|
userInfo.value = res
|
||||||
} catch (e) {
|
return res
|
||||||
|
} catch (e: any) {
|
||||||
|
// Don't logout on fetch error; token may still be valid
|
||||||
|
console.error('Failed to fetch user info:', e?.message || e)
|
||||||
|
// Only logout on 401
|
||||||
|
if (e?.response?.status === 401 || e?.status === 401) {
|
||||||
logout()
|
logout()
|
||||||
throw e
|
throw e
|
||||||
}
|
}
|
||||||
|
return null
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function logout() {
|
function logout() {
|
||||||
|
|||||||
@@ -81,9 +81,11 @@ async function handleLogin() {
|
|||||||
try {
|
try {
|
||||||
await userStore.login(form.username, form.password)
|
await userStore.login(form.username, form.password)
|
||||||
ElMessage.success('登录成功')
|
ElMessage.success('登录成功')
|
||||||
router.push('/')
|
await router.push('/')
|
||||||
} catch (e: any) {
|
} catch (e: any) {
|
||||||
|
if (!e?.handled) {
|
||||||
ElMessage.error(e?.message || '登录失败')
|
ElMessage.error(e?.message || '登录失败')
|
||||||
|
}
|
||||||
} finally {
|
} finally {
|
||||||
loading.value = false
|
loading.value = false
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -220,7 +220,8 @@ async function handleAutoClassify(p: ProjectItem) {
|
|||||||
}
|
}
|
||||||
fetchData()
|
fetchData()
|
||||||
} catch (e: any) {
|
} catch (e: any) {
|
||||||
ElMessage.error(e?.message || '自动分类失败')
|
const msg = e?.response?.data?.detail || e?.response?.data?.message || e?.message || '自动分类失败'
|
||||||
|
ElMessage.error(msg)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user