{{ cvTemplate.resumeTemplateName }}
diff --git a/src/components/SingleSelect.vue b/src/components/SingleSelect.vue index 13a59fa..fffaa99 100644 --- a/src/components/SingleSelect.vue +++ b/src/components/SingleSelect.vue @@ -1,27 +1,40 @@ -
+
-
-
diff --git a/src/main.ts b/src/main.ts
index d6327c1..6b82771 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -2,6 +2,8 @@ import './index.css'
import { createApp } from 'vue'
import { createPinia } from 'pinia'
import piniaPluginPersistedstate from 'pinia-plugin-persistedstate'
+import * as ElementPlusIconsVue from '@element-plus/icons-vue'
+import 'element-plus/dist/index.css'
const pinia = createPinia()
pinia.use(piniaPluginPersistedstate)
@@ -10,6 +12,9 @@ import App from './App.vue'
import router from './router'
const app = createApp(App)
+for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
+ app.component(key, component)
+}
app.use(pinia)
app.use(router)
diff --git a/src/router/index.ts b/src/router/index.ts
index 17de4ea..fe6db42 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -1,5 +1,6 @@
import { createRouter, createWebHashHistory } from 'vue-router'
import { useUserStore } from '@/stores/useUserStore'
+import { ElMessage } from 'element-plus';
const router = createRouter({
history: createWebHashHistory(),
@@ -70,12 +71,12 @@ export default router
router.beforeEach((to) => {
const userStore = useUserStore()
- if(to.path.includes('/user') && !userStore.isLoggedIn) {
- alert('当前未登录')
+ if(to.path.includes('/user') && !userStore.userStatus.isLoggedIn) {
+ ElMessage.error('当前未登录')
return { name: 'login' }
}
- if(to.path.includes('/edit') && !userStore.isLoggedIn) {
- alert('当前未登录')
+ if(to.path.includes('/edit') && !userStore.userStatus.isLoggedIn) {
+ ElMessage.error('当前未登录')
return { name: 'login' }
}
})
diff --git a/src/stores/useUserStore.ts b/src/stores/useUserStore.ts
index c5025c4..b69c076 100644
--- a/src/stores/useUserStore.ts
+++ b/src/stores/useUserStore.ts
@@ -1,74 +1,55 @@
import { defineStore } from 'pinia'
-import { ref, computed } from 'vue'
-import { userLogin, getUserInfoApi, userRegister } from '@/api/user.ts'
+import { ref } from 'vue'
import { useRouter } from 'vue-router'
-export const useUserStore = defineStore('user', () => {
- const userId = ref(localStorage.getItem('userId') || '0')
- const accessToken = ref(localStorage.getItem('cp-accessToken') || '')
- const refreshToken = ref(localStorage.getItem('cp-refreshToken') || '')
- let userInfo = ref({})
- const router = useRouter()
+export interface UserInfo {
+ userId: string,
+ userEmail: string,
+ userPhoneNumber?: string,
+ userAuth: number,
+ userResumeId?: number,
+ userStatus: number,
+ userEmailId?: number,
+ lastLoginIp?: string,
+ userName: string,
+ sex: number,
+ avatar: string,
+}
- // 根据 accessToken 是否存在来判断登录状态
- const isLoggedIn = computed(() => !!accessToken.value)
+export interface UserState {
+ userId: string
+ accessToken: string
+ isLoggedIn: boolean
+ userInfo: UserInfo
+}
- // 用户登录
- const login = async (userName: string, userPassword: string) => {
- try {
- const { data } = await userLogin(userName, userPassword)
- accessToken.value = data.access_token
- refreshToken.value = data.refresh_token
- userId.value = String(data.userId)
- localStorage.setItem('userId', userId.value)
- localStorage.setItem('cp-accessToken', accessToken.value)
- localStorage.setItem('cp-refreshToken', refreshToken.value)
- await getUserInfo(userId.value)
- router.replace('/')
- } catch (error) {
- console.error('Login failed:', error)
- }
- }
+const router = useRouter()
- // 用户注册
- const register = async (userName: string, userEmail: string, userPassword: string, confirmPassword:string) => {
- try {
- const res = await userRegister(userName, userEmail, userPassword, confirmPassword)
- // console.log('注册成功res',res)
- return res
- } catch (error) {
- console.error('Register failed:', error)
- }
- }
+export const useUserStore = defineStore('user', () => {
+ // 使用一个单独的响应式对象来存储用户状态
+ const userStatus = ref({
+ userId: localStorage.getItem('userId') || '',
+ accessToken: localStorage.getItem('cp-accessToken') || '',
+ isLoggedIn: !!localStorage.getItem('cp-accessToken'),
+ userInfo: {} as UserInfo
+ })
- // 用户登出
+ // 在store中仅仅提供logout方法，其余方法由组件提供
const logout = () => {
- accessToken.value = ''
- refreshToken.value = ''
- userId.value = ''
+ userStatus.value = {
+ userId: '',
+ accessToken: '',
+ isLoggedIn: false,
+ userInfo: {} as UserInfo
+ }
localStorage.removeItem('cp-accessToken')
- localStorage.removeItem('cp-refreshToken')
localStorage.removeItem('userId')
router.push('/login')
}
- // 用户信息
- const getUserInfo = async (userId: string) => {
- try {
- const res = await getUserInfoApi(userId)
- userInfo.value = res.data
- } catch (error) {
- console.error('获取用户信息失败:', error)
- }
- }
+
+ // 对外暴露store
return {
- accessToken,
- refreshToken,
- isLoggedIn,
- userId,
- userInfo,
- getUserInfo,
- login,
- register,
- logout
+ userStatus,
+ logout,
}
})
diff --git a/src/utils/request.ts b/src/utils/request.ts
index b979573..a70ac81 100644
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@@ -1,22 +1,22 @@
import axios from 'axios'
-import router from '@/router'
+import { useUserStore } from '@/stores/useUserStore'
+import { ElMessage } from 'element-plus'
const service = axios.create({
- baseURL: 'https://cp-center-server.hub.feashow.cn', // ✔ 把 /api 放到这里
+ baseURL: 'https://cp-center-server.hub.feashow.cn',
timeout: 50000,
})
-let isRefreshing = false
-let requestQueue: Array<(newAT: string) => void> = []
+
+const userStore = useUserStore()
service.interceptors.request.use(
(config) => {
- let accessToken = localStorage.getItem('cp-accessToken')
- let refreshToken = localStorage.getItem('cp-refreshToken')
+ let accessToken = userStore.userStatus.accessToken
if (config?.url?.endsWith('/auth/login') && config.method === 'post') {
return config
}
if (config?.url?.includes('/auth/refresh')) {
- config.headers['Authorization'] = `Bearer ${refreshToken}`
+ config.headers['Authorization'] = `Bearer ${accessToken}`
} else {
config.headers['Authorization'] = `Bearer ${accessToken}`
}
@@ -29,66 +29,18 @@ service.interceptors.response.use(
(response) => {
return response.data
},
-
- async (error) => {
- const { config, response } = error
- // 如果是/auth/login并且是401就返回登录失败
- if (config?.url?.endsWith('/auth/login') && response && response.status === 401) {
- alert('登录失败')
- return Promise.reject('登录失败')
- } else if (config?.url?.endsWith('/auth/login') && response && response.status === 500){
- alert('请输入正确的用户名')
- return Promise.reject('登录失败')
- }
-
+ (error) => {
+ const { response } = error
+ console.log('response', response)
if (response && response.status === 401) {
- if (!isRefreshing) {
- isRefreshing = true
- try {
- const newAT = await doRefresh()
- requestQueue.forEach((cb: (newAT: string) => void) => cb(newAT))
- requestQueue = []
- config.headers['Authorization'] = `Bearer ${newAT}`
- console.log('重试请求', config)
- return service.request(config)
- } catch (_) {
- console.error('刷新 Token 失败')
- localStorage.removeItem('cp-accessToken')
- localStorage.setItem('cp-refreshToken', '')
- router.replace('/login')
- return Promise.reject(error)
- } finally {
- isRefreshing = false
- }
- } else {
- return new Promise((resolve) => {
- requestQueue.push((newAT: string) => {
- config.headers['Authorization'] = `Bearer ${newAT}`
- resolve(service.request(config))
- })
- })
- }
+ ElMessage.error('登录过期，请重新登录')
+ userStore.logout()
+ return Promise.reject(error)
+ } else if (response && response.status === 500) {
+ ElMessage.error('服务器错误，请稍后再试')
+ return Promise.reject(error)
}
return Promise.reject(error)
},
)
-
-async function doRefresh() {
- let refreshToken = localStorage.getItem('cp-refreshToken')
- try {
- const resp = await axios.get('http://47.109.193.161:8543/api/auth/refresh', {
- params: {
- refreshToken,
- },
- })
- const { access_token: newAT, refresh_token: newRT } = resp.data.data
- console.log('Token 刷新成功', newAT, newRT)
- localStorage.setItem('cp-accessToken', newAT)
- return newAT
- } catch (e) {
- alert('当前未登录！')
- router.replace('/login')
- throw e
- }
-}
export default service
diff --git a/src/views/home/HomePage.vue b/src/views/home/HomePage.vue
index 5bdbcec..0a53f8c 100644
--- a/src/views/home/HomePage.vue
+++ b/src/views/home/HomePage.vue
@@ -70,7 +70,7 @@ onMounted(() => {
-
- {{ selectedOption || '请选择' }}
+ :class="{
+ 'w-30 text-sm flex pr-8 items-center relative border rounded-sm focus:outline-none py-1.5 px-3 bg-white cursor-pointer select-none': true,
+ 'border-blue-500': isOpen,
+ 'border-gray-400': !isOpen,
+ }"
+ @click="toggleDropdown"
+ >
+ {{
+ selectedOption || '请选择'
+ }}
-
-
+
+
diff --git a/src/views/login/indexPage.vue b/src/views/login/indexPage.vue
index c0e7964..cc7c68a 100644
--- a/src/views/login/indexPage.vue
+++ b/src/views/login/indexPage.vue
@@ -1,264 +1,214 @@
-
+
-
- CP-ResumeTools
+ 
+
+
+ CP-ResumeTools
-
- {{ isLoginMode ? '登录' : '注册' }}
-
-
-
-
-
diff --git a/src/views/nav/indexPage.vue b/src/views/nav/indexPage.vue
index 0fb1bf6..6958f0d 100644
--- a/src/views/nav/indexPage.vue
+++ b/src/views/nav/indexPage.vue
@@ -1,11 +1,9 @@
-
- {{ loginError }}
-
-
- {{ registerError }}
-
-
-
-
-
-
-
- 注册账户
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
- 已有账户？
-
- 立即登录
-
-
+ class="bg-white w-[45rem] h-[30rem] p-[2rem] shadow-2xl flex justify-between items-center flex-col"
+ >
+
+ 密码要求:
- -
-
- 长度6-12位字符 -
- 必须包含字母和数字 -
- 可以包含特殊符号 -
+ {{ formType === FormType.Login ? '登录' : '注册' }} +
+ + +
+ {{ formType === FormType.Login ? '没有账户？' : '已经有账户？' }}
+
+ {{ formType === FormType.Login ? '立即注册' : '立即登录' }}
+
-
-
-
-
+
diff --git a/src/views/user/indexPage.vue b/src/views/user/indexPage.vue
index d220584..df54b3d 100644
--- a/src/views/user/indexPage.vue
+++ b/src/views/user/indexPage.vue
@@ -5,11 +5,9 @@
您不是管理员，无权管理！
diff --git a/src/views/user/components/UserCv.vue b/src/views/user/components/UserCv.vue
index ac931f1..650ad8b 100644
--- a/src/views/user/components/UserCv.vue
+++ b/src/views/user/components/UserCv.vue
@@ -20,7 +20,7 @@ const fetchResumeList = async () => {
try {
const res = await getResumeList(currentPage.value, pageSize.value)
resumes.value = res.data.items
- resumes.value = resumes.value.filter(item => String(item.resumeUserId) === userStore.userId)
+ resumes.value = resumes.value.filter(item => String(item.resumeUserId) === userStore.userStatus.userInfo.userId)
total.value = res.data.total
} catch (error) {
alert('获取简历列表失败')
diff --git a/src/views/user/components/UserInformation.vue b/src/views/user/components/UserInformation.vue
index 9d5945d..85723d5 100644
--- a/src/views/user/components/UserInformation.vue
+++ b/src/views/user/components/UserInformation.vue
@@ -1,6 +1,7 @@
+
@@ -52,7 +61,7 @@ onMounted(async () => {
-
我的简历
账户信息
简历模板管理
-