Skip to content

L
llm-bp
提交 96121ad7 authored 作者: yanyalin's avatar yanyalin
浏览文件
操作

修改登陆功能

上级 5d4719f7
显示空白字符变更
内嵌 并排
正在显示 包含 24 行增加 和 149 行删除
package.json
浏览文件 @ 96121ad7
...@@ -15,8 +15,8 @@ ...@@ -15,8 +15,8 @@
"dependencies": { "dependencies": {
"@ctrl/tinycolor": "^4.1.0", "@ctrl/tinycolor": "^4.1.0",
"@element-plus/icons-vue": "^2.3.1", "@element-plus/icons-vue": "^2.3.1",
"@logicflow/core": "^1.2.27", "@logicflow/core": "~1.2.28",
"@logicflow/extension": "^1.2.27", "@logicflow/extension": "~1.2.28",
"@vueuse/core": "^11.0.3", "@vueuse/core": "^11.0.3",
"axios": "^1.7.7", "axios": "^1.7.7",
"codemirror": "^6.0.1", "codemirror": "^6.0.1",
...@@ -34,7 +34,6 @@ ...@@ -34,7 +34,6 @@
"medium-zoom": "^1.1.0", "medium-zoom": "^1.1.0",
"mermaid": "^10.9.0", "mermaid": "^10.9.0",
"mitt": "^3.0.0", "mitt": "^3.0.0",
"moment": "^2.30.1",
"nprogress": "^0.2.0", "nprogress": "^0.2.0",
"pinia": "^2.1.6", "pinia": "^2.1.6",
"pinyin-pro": "^3.18.2", "pinyin-pro": "^3.18.2",
......
pnpm-lock.yaml
浏览文件 @ 96121ad7
...@@ -71,9 +71,6 @@ importers: ...@@ -71,9 +71,6 @@ importers:
mitt: mitt:
specifier: ^3.0.0 specifier: ^3.0.0
version: 3.0.1 version: 3.0.1
moment:
specifier: ^2.30.1
version: 2.30.1
nprogress: nprogress:
specifier: ^0.2.0 specifier: ^0.2.0
version: 0.2.0 version: 0.2.0
...@@ -3033,9 +3030,6 @@ packages: ...@@ -3033,9 +3030,6 @@ packages:
mlly@1.7.1: mlly@1.7.1:
resolution: {integrity: sha512-rrVRZRELyQzrIUAVMHxP97kv+G786pHmOKzuFII8zDYahFBS7qnHh2AlYSl1GAHhaMPCz6/oHjVMcfFYgFYHgA==} resolution: {integrity: sha512-rrVRZRELyQzrIUAVMHxP97kv+G786pHmOKzuFII8zDYahFBS7qnHh2AlYSl1GAHhaMPCz6/oHjVMcfFYgFYHgA==}
moment@2.30.1:
resolution: {integrity: sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==}
mousetrap@1.6.5: mousetrap@1.6.5:
resolution: {integrity: sha512-QNo4kEepaIBwiT8CDhP98umTetp+JNfQYBWvC1pc6/OAibuXtRcxZ58Qz8skvEHYvURne/7R8T5VoOI7rDsEUA==} resolution: {integrity: sha512-QNo4kEepaIBwiT8CDhP98umTetp+JNfQYBWvC1pc6/OAibuXtRcxZ58Qz8skvEHYvURne/7R8T5VoOI7rDsEUA==}
...@@ -7719,8 +7713,6 @@ snapshots: ...@@ -7719,8 +7713,6 @@ snapshots:
pkg-types: 1.2.0 pkg-types: 1.2.0
ufo: 1.5.4 ufo: 1.5.4
moment@2.30.1: {}
mousetrap@1.6.5: {} mousetrap@1.6.5: {}
mri@1.2.0: {} mri@1.2.0: {}
......
src/App.vue
浏览文件 @ 96121ad7
<script setup lang="ts"></script>
<template> <template>
<router-view /> <router-view />
</template> </template>
\ No newline at end of file
<style scoped></style>
src/api/type/user.ts
浏览文件 @ 96121ad7
...@@ -31,7 +31,7 @@ interface LoginRequest { ...@@ -31,7 +31,7 @@ interface LoginRequest {
/** /**
* 用户名 * 用户名
*/ */
username: string email: string
/** /**
* 密码 * 密码
*/ */
......
src/api/user.ts
浏览文件 @ 96121ad7
import {Result} from '@/request/Result' import {Result} from '@/request/Result'
import {get, post} from '@/request/index' import {get, post} from '@/request'
import type { import type {
LoginRequest, LoginRequest,
RegisterRequest, RegisterRequest,
...@@ -12,20 +12,15 @@ import type {Ref} from 'vue' ...@@ -12,20 +12,15 @@ import type {Ref} from 'vue'
/** /**
* 登录 * 登录
* @param auth_type
* @param request 登录接口请求表单 * @param request 登录接口请求表单
* @param loading 接口加载器 * @param loading 接口加载器
* @returns 认证数据 * @returns 认证数据
*/ */
const login: (auth_type: string, request: LoginRequest, loading?: Ref<boolean>) => Promise<Result<string>> = ( const login: (request: LoginRequest, loading?: Ref<boolean>) => Promise<Result<string>> = (
auth_type,
request, request,
loading loading
) => { ) => {
if (auth_type !== '') { return post(`/login/`, request, undefined, loading)
return post(`/${auth_type}/login`, request, undefined, loading)
}
return post('/user/login', request, undefined, loading)
} }
/** /**
* 登出 * 登出
......
src/request/index.ts
浏览文件 @ 96121ad7
import axios, { type AxiosRequestConfig } from 'axios' import axios, { type InternalAxiosRequestConfig } from 'axios'
import { MsgError } from '@/utils/message' import { MsgError } from '@/utils/message'
import type { NProgress } from 'nprogress' import type { NProgress } from 'nprogress'
import type { Ref } from 'vue' import type { Ref } from 'vue'
...@@ -19,10 +19,7 @@ const instance = axios.create(axiosConfig) ...@@ -19,10 +19,7 @@ const instance = axios.create(axiosConfig)
/* 设置请求拦截器 */ /* 设置请求拦截器 */
instance.interceptors.request.use( instance.interceptors.request.use(
(config: AxiosRequestConfig) => { (config: InternalAxiosRequestConfig) => {
if (config.headers === undefined) {
config.headers = {}
}
const { user } = useStore() const { user } = useStore()
const token = user.getToken() const token = user.getToken()
if (token) { if (token) {
...@@ -56,11 +53,11 @@ instance.interceptors.response.use( ...@@ -56,11 +53,11 @@ instance.interceptors.response.use(
MsgError(err.message) MsgError(err.message)
console.error(err) console.error(err)
} }
if (err.response?.status === 404) { /*if (err.response?.status === 404) {
if (!err.response.config.url.includes('/application/authentication')) { if (!err.response.config.url.includes('/application/authentication')) {
router.push('/404 ') router.push('/404 ')
} }
} }*/
if (err.response?.status === 401) { if (err.response?.status === 401) {
if ( if (
!err.response.config.url.includes('chat/open') && !err.response.config.url.includes('chat/open') &&
...@@ -70,11 +67,11 @@ instance.interceptors.response.use( ...@@ -70,11 +67,11 @@ instance.interceptors.response.use(
} }
} }
if (err.response?.status === 403 && !err.response.config.url.includes('chat/open')) { /*if (err.response?.status === 403 && !err.response.config.url.includes('chat/open')) {
MsgError( MsgError(
err.response.data && err.response.data.message ? err.response.data.message : '没有权限访问' err.response.data && err.response.data.message ? err.response.data.message : '没有权限访问'
) )
} }*/
return Promise.reject(err) return Promise.reject(err)
} }
) )
......
src/router/index.ts
浏览文件 @ 96121ad7
import { hasPermission } from '@/utils/permission/index'
import { import {
createRouter, createRouter,
createWebHistory, createWebHistory,
...@@ -39,13 +38,7 @@ router.beforeEach( ...@@ -39,13 +38,7 @@ router.beforeEach(
await user.profile() await user.profile()
} }
} }
// 判断是否有菜单权限
if (to.meta.permission ? hasPermission(to.meta.permission as any, 'OR') : true) {
next() next()
} else {
// 如果没有权限则直接取404页面
next('404')
}
} }
) )
......
src/stores/modules/user.ts
浏览文件 @ 96121ad7
...@@ -117,8 +117,8 @@ const useUserStore = defineStore({ ...@@ -117,8 +117,8 @@ const useUserStore = defineStore({
}) })
}, },
async login(auth_type: string, username: string, password: string) { async login(username: string, password: string) {
return UserApi.login(auth_type, { username, password }).then((ok) => { return UserApi.login({ username, password }).then((ok) => {
this.token = ok.data this.token = ok.data
localStorage.setItem('token', ok.data) localStorage.setItem('token', ok.data)
return this.profile() return this.profile()
......
src/utils/time.ts
浏览文件 @ 96121ad7
import moment from 'moment' import dayjs from 'dayjs'
import 'moment/dist/locale/zh-cn' import 'dayjs/locale/zh-cn';
moment.locale('zh-cn') dayjs.locale('zh-cn')
// 当天日期 YYYY-MM-DD // 当天日期 YYYY-MM-DD
export const nowDate = moment().format('YYYY-MM-DD') export const nowDate = dayjs().format('YYYY-MM-DD')
// 当前时间的前n天 // 当前时间的前n天
export function beforeDay(n: number | string) { export function beforeDay(n: number | string) {
return moment().subtract(n, 'days').format('YYYY-MM-DD') return dayjs().subtract(Number(n), 'days').format('YYYY-MM-DD')
} }
const getCheckDate = (timestamp: any) => { const getCheckDate = (timestamp: any) => {
......
src/views/login/index.vue
浏览文件 @ 96121ad7
<template> <template>
<login-layout v-if="user.isEnterprise() ? user.themeInfo : true" v-loading="loading"> <login-layout v-if="user.isEnterprise() ? user.themeInfo : true" v-loading="loading">
<LoginContainer :subTitle="user.themeInfo?.slogan || '欢迎使用 MaxKB 智能知识库'"> <LoginContainer :subTitle="user.themeInfo?.slogan || '欢迎使用 MaxKB 智能知识库'">
<h2 class="mb-24">{{ loginMode || '普通登录' }}</h2>
<el-form <el-form
class="login-form" class="login-form"
:rules="rules" :rules="rules"
...@@ -14,7 +13,7 @@ ...@@ -14,7 +13,7 @@
<el-input <el-input
size="large" size="large"
class="input-item" class="input-item"
v-model="loginForm.username" v-model="loginForm.email"
placeholder="请输入用户名" placeholder="请输入用户名"
> >
</el-input> </el-input>
...@@ -48,55 +47,26 @@ ...@@ -48,55 +47,26 @@
忘记密码? 忘记密码?
</el-button> </el-button>
</div> </div>
<div class="login-gradient-divider lighter mt-24" v-if="modeList.length > 1">
<span>更多登录方式</span>
</div>
<div class="text-center mt-16">
<template v-for="item in modeList">
<el-button
v-if="item !== '' && loginMode !== item"
circle
:key="item"
class="login-button-circle color-secondary"
@click="changeMode(item)"
>{{ item }}
</el-button>
<el-button
v-if="item === '' && loginMode !== ''"
circle
:key="item"
class="login-button-circle color-secondary"
style="font-size: 24px"
icon="UserFilled"
@click="changeMode('')"
/>
</template>
</div>
</LoginContainer> </LoginContainer>
</login-layout> </login-layout>
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import {onMounted, ref, onBeforeMount} from 'vue' import {ref, onBeforeMount} from 'vue'
import type {LoginRequest} from '@/api/type/user' import type {LoginRequest} from '@/api/type/user'
import {useRouter} from 'vue-router' import {useRouter} from 'vue-router'
import type {FormInstance, FormRules} from 'element-plus' import type {FormInstance, FormRules} from 'element-plus'
import useStore from '@/stores' import useStore from '@/stores'
import authApi from "@/api/auth-setting";
import {MsgConfirm, MsgSuccess} from "@/utils/message";
import {t} from "@/locales";
import systemKeyApi from "@/api/system-api-key";
const loading = ref<boolean>(false) const loading = ref<boolean>(false)
const {user} = useStore() const {user} = useStore()
const router = useRouter() const router = useRouter()
const loginForm = ref<LoginRequest>({ const loginForm = ref<LoginRequest>({
username: '', email: '',
password: '' password: ''
}) })
const rules = ref<FormRules<LoginRequest>>({ const rules = ref<FormRules<LoginRequest>>({
username: [ email: [
{ {
required: true, required: true,
message: '请输入用户名', message: '请输入用户名',
...@@ -113,64 +83,11 @@ const rules = ref<FormRules<LoginRequest>>({ ...@@ -113,64 +83,11 @@ const rules = ref<FormRules<LoginRequest>>({
}) })
const loginFormRef = ref<FormInstance>() const loginFormRef = ref<FormInstance>()
const modeList = ref<string[]>([''])
const loginMode = ref('')
function redirectAuth(authType: string) {
if (authType === 'LDAP' || authType === '') {
return;
}
authApi.getAuthSetting(authType, loading).then((res: any) => {
if (!res.data) {
return;
}
MsgConfirm(
`${t('login.jump_tip')}`,
t(''),
{
confirmButtonText: t('login.jump'),
cancelButtonText: t('views.applicationOverview.appInfo.APIKeyDialog.cancel'),
confirmButtonClass: ''
}
)
.then(() => {
if (!res.data.config_data) {
return;
}
const config = res.data.config_data
const redirectUrl = eval(`\`${config.redirectUrl}\``);
let url;
if (authType === 'CAS') {
url = `${config.ldpUri}?service=${encodeURIComponent(redirectUrl)}`;
}
if (authType === 'OIDC') {
url = `${config.authEndpoint}?client_id=${config.clientId}&redirect_uri=${redirectUrl}&response_type=code&scope=openid+profile+email`;
}
if (url) {
window.location.href = url;
}
})
.catch(() => {
})
});
}
function changeMode(val: string) {
loginMode.value = val === 'LDAP' ? val : '';
loginForm.value = {
username: '',
password: ''
}
redirectAuth(val)
loginFormRef.value?.clearValidate()
}
const login = () => { const login = () => {
loginFormRef.value?.validate().then(() => { loginFormRef.value?.validate().then(() => {
loading.value = true loading.value = true
user user
.login(loginMode.value, loginForm.value.username, loginForm.value.password) .login(loginForm.value.email, loginForm.value.password)
.then(() => { .then(() => {
router.push({name: 'home'}) router.push({name: 'home'})
}) })
...@@ -178,19 +95,6 @@ const login = () => { ...@@ -178,19 +95,6 @@ const login = () => {
}) })
} }
onMounted(() => {
user.asyncGetProfile().then((res) => {
if (user.isEnterprise()) {
loading.value = true
user
.getAuthType()
.then((res) => {
modeList.value = [...modeList.value, ...res]
})
.finally(() => (loading.value = false))
}
})
})
onBeforeMount(() => { onBeforeMount(() => {
if (user.isEnterprise()) { if (user.isEnterprise()) {
user.theme(loading) user.theme(loading)
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论