feat:登录三改
This commit is contained in:
parent
46802f3d27
commit
38b3dbe5ce
3
.env
3
.env
@ -1,3 +0,0 @@
|
||||
VITE_API_BASE_URL=http://47.94.224.191:8080
|
||||
|
||||
VITE_FRONT_DEVELOP=http://localhost:5173
|
2
.env.development
Normal file
2
.env.development
Normal file
@ -0,0 +1,2 @@
|
||||
VITE_API_BASE_URL=http://47.94.224.191:8080
|
||||
VITE_FRONTEND_CALLBACK_URL=http://localhost:5173/callback
|
3
.env.production
Normal file
3
.env.production
Normal file
@ -0,0 +1,3 @@
|
||||
# .env.production (生产环境)
|
||||
VITE_API_BASE_URL=http://47.94.224.191:8080
|
||||
VITE_FRONTEND_CALLBACK_URL=http://47.94.224.191:8080/callback # 或者你的生产环境前端URL
|
@ -1,4 +1,3 @@
|
||||
import { APP_ID, END_POINT }from '@/utils/secret';
|
||||
// 样式引入
|
||||
import "@/assets/styles/reset.scss";
|
||||
import "@/assets/styles/common.scss";
|
||||
@ -12,7 +11,6 @@ import 'vfonts/Lato.css'// 通用字体
|
||||
import 'vfonts/FiraCode.css'// 等宽字体
|
||||
import 'virtual:svg-icons-register'; //SVG精灵图册
|
||||
// 登录授权相关
|
||||
import { createLogto, LogtoConfig } from '@logto/vue';
|
||||
import { createApp } from 'vue'
|
||||
import App from './App.vue';
|
||||
// 全局组件
|
||||
@ -24,12 +22,6 @@ const app = createApp(App);
|
||||
app.component('svg-icon',SvgIcon); //图标组件
|
||||
app.use(LsComponent); //零枢封装组件
|
||||
|
||||
// 鉴权
|
||||
const config: LogtoConfig = {
|
||||
endpoint: END_POINT,
|
||||
appId: APP_ID,
|
||||
};
|
||||
app.use(createLogto, config);
|
||||
|
||||
app.use(pinia);
|
||||
app.use(router);
|
||||
|
@ -13,7 +13,7 @@ import Dict from '@/views/system/dict/index.vue'; //用户字典
|
||||
import GlobalSys from '@/views/system/globalSys/index.vue'; //全局参数
|
||||
import { getToken } from "@/utils/auth";
|
||||
|
||||
const whiteList = ["/callback",'/layout/dict','/layout/globalSys'];
|
||||
const whiteList = ["/callback"];
|
||||
|
||||
const routes: Array<RouteRecordRaw> = [
|
||||
{
|
||||
|
@ -19,7 +19,7 @@
|
||||
|
||||
<script setup lang='ts'>
|
||||
import { removeToken } from '@/utils/auth';
|
||||
import { useLogto } from '@logto/vue';
|
||||
|
||||
|
||||
import {
|
||||
Pencil as EditIcon,
|
||||
@ -28,7 +28,7 @@ import {
|
||||
CaretDownOutline
|
||||
} from '@vicons/ionicons5';
|
||||
import { NIcon } from 'naive-ui';
|
||||
const { signOut } = useLogto();
|
||||
|
||||
const router = useRouter();
|
||||
function renderIcon(icon: Component) {
|
||||
return () => {
|
||||
@ -57,8 +57,7 @@ const options = [
|
||||
|
||||
const handleSelect = (key: string | number) => {
|
||||
if (key === 'logout') {
|
||||
removeToken()
|
||||
signOut(import.meta.env.VITE_FRONT_DEVELOP);
|
||||
removeToken();
|
||||
router.push('/');
|
||||
}
|
||||
}
|
||||
|
@ -6,21 +6,18 @@
|
||||
|
||||
<script setup lang="ts">
|
||||
import { removeToken, setToken } from '@/utils/auth';
|
||||
import { useLogto } from '@logto/vue';
|
||||
import { useMessage } from 'naive-ui';
|
||||
import { isNewUser, getUserInfo } from '@/api/userApi';
|
||||
const { getAccessToken } = useLogto();
|
||||
const router = useRouter();
|
||||
const message = useMessage();
|
||||
const init = async () => {
|
||||
try {
|
||||
const accessToken = await getAccessToken('https://wf2eyr.logto.app/api');
|
||||
console.log(accessToken);
|
||||
setToken(accessToken);
|
||||
const isCompleteInfo = await isNewUser(); //表示是否完成信息登记 true表示完成
|
||||
if (!isCompleteInfo) return router.push('/register');
|
||||
const result = await getUserInfo();
|
||||
console.log(result, 'result'); //后面userInfo要存到store里面
|
||||
const route = useRoute();
|
||||
const token = route.query.token as string; // 获取token参数
|
||||
console.log('Token:', token);
|
||||
setToken(token)
|
||||
// const result = await getUserInfo();
|
||||
// console.log(result, 'result'); //后面userInfo要存到store里面
|
||||
//TODO
|
||||
message.success('登录成功!');
|
||||
router.push('/layout');
|
||||
|
@ -204,10 +204,10 @@
|
||||
|
||||
<script setup lang="ts">
|
||||
import { ChevronForward, GitCompare, BarChartSharp, Server } from '@vicons/ionicons5';
|
||||
import { useLogto } from '@logto/vue';
|
||||
import { useDialog, useMessage } from 'naive-ui';
|
||||
const dialog = useDialog();
|
||||
const message = useMessage();
|
||||
const router = useRouter();
|
||||
const handleDemo = async () => {
|
||||
// try {
|
||||
// const data = await loginApiTest(); //data 就是 后端返回: { data:data,code:200,msg:'ok' } 的data
|
||||
@ -215,11 +215,11 @@ const handleDemo = async () => {
|
||||
// message.error(error.message); //error.message 就是 后端返回: { data:null,code:400,msg:'报错' }的msg
|
||||
// }
|
||||
console.log('代码演示一下!!!');
|
||||
message.warning('演示一下!');
|
||||
}
|
||||
|
||||
const { signIn } = useLogto();
|
||||
const handleLogin = () => {
|
||||
signIn(`${import.meta.env.VITE_FRONT_DEVELOP}/callback`);
|
||||
window.location.href = `${import.meta.env.VITE_API_BASE_URL}/Identity/Account/Login?frontendCallback=${import.meta.env.VITE_FRONTEND_CALLBACK_URL}`;
|
||||
}
|
||||
|
||||
// 联系我们
|
||||
|
Loading…
x
Reference in New Issue
Block a user