From a8f575fe6f4440ca62bb2ad850bbc0baf77ded5d Mon Sep 17 00:00:00 2001
From: 三个三 <2029364173@qq.com>
Date: 星期日, 02 七月 2023 15:29:28 +0800
Subject: [PATCH] !20 统一登录授权 * 统一授权登录 * 对接后端更改做了适配， * 前端实现切换租户选择第三方授权登录，和优化第三方页面登录注册
---
src/views/index.vue | 2
src/views/system/client/index.vue | 344 ++++++++++++++++++
.gitignore | 1
src/api/system/client/types.ts | 138 +++++++
src/views/system/user/profile/index.vue | 16
src/api/login.ts | 25 +
src/assets/icons/svg/gitee.svg | 1
src/types/env.d.ts | 2
src/store/modules/user.ts | 4
src/api/system/client/index.ts | 80 ++++
src/views/system/user/profile/thirdParty.vue | 140 +++++++
src/api/types.ts | 13
src/api/system/social/auth.ts | 24 +
src/permission.ts | 2
.env.development | 4
src/views/system/menu/index.vue | 2
src/views/login.vue | 194 ++++++---
src/layout/components/SocialLogin/index.vue | 82 ++++
src/utils/auth.ts | 2
.env.production | 4
src/views/monitor/powerjob/index.vue | 2
src/router/index.ts | 6
22 files changed, 992 insertions(+), 96 deletions(-)
diff --git a/.env.development b/.env.development
index 4ec5afb..6ca0e51 100644
--- a/.env.development
+++ b/.env.development
@@ -13,7 +13,7 @@
# 鐩戞帶鍦板潃
VITE_APP_MONITRO_ADMIN = 'http://localhost:9090/admin/applications'
-# xxl-job 鎺у埗鍙板湴鍧�
-VITE_APP_XXL_JOB_ADMIN = 'http://localhost:9100/xxl-job-admin'
+# powerjob 鎺у埗鍙板湴鍧�
+VITE_APP_POWERJOB_ADMIN = 'http://localhost:7700/'
VITE_APP_PORT = 80
diff --git a/.env.production b/.env.production
index 6e6510a..a5e77b3 100644
--- a/.env.production
+++ b/.env.production
@@ -10,8 +10,8 @@
# 鐩戞帶鍦板潃
VITE_APP_MONITRO_ADMIN = '/admin/applications'
-# 鐩戞帶鍦板潃
-VITE_APP_XXL_JOB_ADMIN = '/xxl-job-admin'
+# powerjob 鎺у埗鍙板湴鍧�
+VITE_APP_POWERJOB_ADMIN = '/powerjob'
# 鐢熶骇鐜
VITE_APP_BASE_API = '/prod-api'
diff --git a/.gitignore b/.gitignore
index 79e7fd9..40df474 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
.DS_Store
+.history
node_modules/
dist/
npm-debug.log*
diff --git a/src/api/login.ts b/src/api/login.ts
index b95a0c0..d4ceb49 100644
--- a/src/api/login.ts
+++ b/src/api/login.ts
@@ -2,6 +2,7 @@
import { AxiosPromise } from 'axios';
import { LoginData, LoginResult, VerifyCodeResult, TenantInfo } from './types';
import { UserInfo } from '@/api/system/user/types';
+import { da } from 'element-plus/es/locale';
/**
* @param data {LoginData}
@@ -9,11 +10,9 @@
*/
export function login(data: LoginData): AxiosPromise<LoginResult> {
const params = {
- tenantId: data.tenantId,
- username: data.username.trim(),
- password: data.password,
- code: data.code,
- uuid: data.uuid
+ ...data,
+ clientId: data.clientId || 'e5cd7e4891bf95d1d19206ce24a7b32e',
+ grantType: data.grantType || 'password'
};
return request({
url: '/auth/login',
@@ -60,6 +59,22 @@
timeout: 20000
});
}
+/**
+ * 绗笁鏂圭櫥褰�
+ * @param source 绗笁鏂圭櫥褰曠被鍨�
+ * */
+export function callback(data: LoginData): AxiosPromise<any> {
+ const LoginData = {
+ ...data,
+ clientId: 'e5cd7e4891bf95d1d19206ce24a7b32e',
+ grantType: 'social'
+ };
+ return request({
+ url: '/auth/social/callback',
+ method: 'post',
+ data: LoginData
+ });
+}
// 鑾峰彇鐢ㄦ埛璇︾粏淇℃伅
export function getInfo(): AxiosPromise<UserInfo> {
diff --git a/src/api/system/client/index.ts b/src/api/system/client/index.ts
new file mode 100644
index 0000000..06544da
--- /dev/null
+++ b/src/api/system/client/index.ts
@@ -0,0 +1,80 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { ClientVO, ClientForm, ClientQuery } from '@/api/system/client/types';
+
+/**
+ * 鏌ヨ瀹㈡埛绔鐞嗗垪琛�
+ * @param query
+ * @returns {*}
+ */
+
+export const listClient = (query?: ClientQuery): AxiosPromise<ClientVO[]> => {
+ return request({
+ url: '/system/client/list',
+ method: 'get',
+ params: query
+ });
+};
+
+/**
+ * 鏌ヨ瀹㈡埛绔鐞嗚缁�
+ * @param id
+ */
+export const getClient = (id: string | number): AxiosPromise<ClientVO> => {
+ return request({
+ url: '/system/client/' + id,
+ method: 'get'
+ });
+};
+
+/**
+ * 鏂板瀹㈡埛绔鐞�
+ * @param data
+ */
+export const addClient = (data: ClientForm) => {
+ return request({
+ url: '/system/client',
+ method: 'post',
+ data: data
+ });
+};
+
+/**
+ * 淇敼瀹㈡埛绔鐞�
+ * @param data
+ */
+export const updateClient = (data: ClientForm) => {
+ return request({
+ url: '/system/client',
+ method: 'put',
+ data: data
+ });
+};
+
+/**
+ * 鍒犻櫎瀹㈡埛绔鐞�
+ * @param id
+ */
+export const delClient = (id: string | number | Array<string | number>) => {
+ return request({
+ url: '/system/client/' + id,
+ method: 'delete'
+ });
+};
+
+/**
+ * 鐘舵�佷慨鏀�
+ * @param id ID
+ * @param status 鐘舵��
+ */
+export function changeStatus(id: number | string, status: string) {
+ const data = {
+ id,
+ status
+ };
+ return request({
+ url: '/system/client/changeStatus',
+ method: 'put',
+ data: data
+ });
+}
diff --git a/src/api/system/client/types.ts b/src/api/system/client/types.ts
new file mode 100644
index 0000000..e67f95f
--- /dev/null
+++ b/src/api/system/client/types.ts
@@ -0,0 +1,138 @@
+export interface ClientVO {
+ /**
+ * id
+ */
+ id: string | number;
+
+ /**
+ * 瀹㈡埛绔痠d
+ */
+ clientId: string | number;
+
+ /**
+ * 瀹㈡埛绔痥ey
+ */
+ clientKey: string;
+
+ /**
+ * 瀹㈡埛绔閽�
+ */
+ clientSecret: string;
+
+ /**
+ * 鎺堟潈绫诲瀷
+ */
+ grantTypeList: string[];
+
+ /**
+ * 璁惧绫诲瀷
+ */
+ deviceType: string;
+
+ /**
+ * token娲昏穬瓒呮椂鏃堕棿
+ */
+ activeTimeout: number;
+
+ /**
+ * token鍥哄畾瓒呮椂
+ */
+ timeout: number;
+
+ /**
+ * 鐘舵�侊紙0姝ｅ父 1鍋滅敤锛�
+ */
+ status: string;
+
+}
+
+export interface ClientForm extends BaseEntity {
+ /**
+ * id
+ */
+ id?: string | number;
+
+ /**
+ * 瀹㈡埛绔痠d
+ */
+ clientId?: string | number;
+
+ /**
+ * 瀹㈡埛绔痥ey
+ */
+ clientKey?: string;
+
+ /**
+ * 瀹㈡埛绔閽�
+ */
+ clientSecret?: string;
+
+ /**
+ * 鎺堟潈绫诲瀷
+ */
+ grantTypeList?: string[];
+
+ /**
+ * 璁惧绫诲瀷
+ */
+ deviceType?: string;
+
+ /**
+ * token娲昏穬瓒呮椂鏃堕棿
+ */
+ activeTimeout?: number;
+
+ /**
+ * token鍥哄畾瓒呮椂
+ */
+ timeout?: number;
+
+ /**
+ * 鐘舵�侊紙0姝ｅ父 1鍋滅敤锛�
+ */
+ status?: string;
+
+}
+
+export interface ClientQuery extends PageQuery {
+ /**
+ * 瀹㈡埛绔痠d
+ */
+ clientId?: string | number;
+
+ /**
+ * 瀹㈡埛绔痥ey
+ */
+ clientKey?: string;
+
+ /**
+ * 瀹㈡埛绔閽�
+ */
+ clientSecret?: string;
+
+ /**
+ * 鎺堟潈绫诲瀷
+ */
+ grantType?: string;
+
+ /**
+ * 璁惧绫诲瀷
+ */
+ deviceType?: string;
+
+ /**
+ * token娲昏穬瓒呮椂鏃堕棿
+ */
+ activeTimeout?: number;
+
+ /**
+ * token鍥哄畾瓒呮椂
+ */
+ timeout?: number;
+
+ /**
+ * 鐘舵�侊紙0姝ｅ父 1鍋滅敤锛�
+ */
+ status?: string;
+
+}
diff --git a/src/api/system/social/auth.ts b/src/api/system/social/auth.ts
new file mode 100644
index 0000000..17a46d3
--- /dev/null
+++ b/src/api/system/social/auth.ts
@@ -0,0 +1,24 @@
+import request from '@/utils/request';
+
+// 缁戝畾璐﹀彿
+export function authBinding(source: string) {
+ return request({
+ url: '/auth/binding/' + source,
+ method: 'get'
+ });
+}
+
+// 瑙ｇ粦璐﹀彿
+export function authUnlock(authId: string) {
+ return request({
+ url: '/auth/unlock/' + authId,
+ method: 'delete'
+ });
+}
+//鑾峰彇鎺堟潈鍒楄〃
+export function getAuthList() {
+ return request({
+ url: '/system/social/list',
+ method: 'get'
+ });
+}
diff --git a/src/api/types.ts b/src/api/types.ts
index 68fb427..e02e645 100644
--- a/src/api/types.ts
+++ b/src/api/types.ts
@@ -15,19 +15,24 @@
* 鐧诲綍璇锋眰
*/
export interface LoginData {
- tenantId: string;
- username: string;
- password: string;
+ tenantId?: string;
+ username?: string;
+ password?: string;
rememberMe?: boolean;
+ socialCode?: string,
+ socialState?: string,
+ source?: string,
code?: string;
uuid?: string;
+ clientId: string;
+ grantType: string;
}
/**
* 鐧诲綍鍝嶅簲
*/
export interface LoginResult {
- token: string;
+ access_token: string;
}
/**
diff --git a/src/assets/icons/svg/gitee.svg b/src/assets/icons/svg/gitee.svg
new file mode 100644
index 0000000..6324608
--- /dev/null
+++ b/src/assets/icons/svg/gitee.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1686919908144" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2521" width="200" height="200" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M512 992C246.895625 992 32 777.104375 32 512S246.895625 32 512 32s480 214.895625 480 480-214.895625 480-480 480z m242.9521875-533.3278125h-272.56875a23.7121875 23.7121875 0 0 0-23.71125 23.7121875l-0.024375 59.255625c0 13.08 10.6078125 23.7121875 23.6878125 23.7121875h165.96c13.104375 0 23.7121875 10.6078125 23.7121875 23.6878125v11.855625a71.1121875 71.1121875 0 0 1-71.1121875 71.1121875h-225.215625a23.7121875 23.7121875 0 0 1-23.6878125-23.7121875V423.1278125a71.1121875 71.1121875 0 0 1 71.0878125-71.1121875h331.824375a23.7121875 23.7121875 0 0 0 23.6878125-23.71125l0.0721875-59.2565625a23.7121875 23.7121875 0 0 0-23.68875-23.7121875H423.08a177.76875 177.76875 0 0 0-177.76875 177.7921875V754.953125c0 13.1034375 10.60875 23.7121875 23.713125 23.7121875h349.63125a159.984375 159.984375 0 0 0 159.984375-159.984375V482.36a23.7121875 23.7121875 0 0 0-23.7121875-23.6878125z" fill="#515151" p-id="2522"></path></svg>
diff --git a/src/layout/components/SocialLogin/index.vue b/src/layout/components/SocialLogin/index.vue
new file mode 100644
index 0000000..7656673
--- /dev/null
+++ b/src/layout/components/SocialLogin/index.vue
@@ -0,0 +1,82 @@
+<template>
+ <div v-loading="loading" class="social-login"></div>
+</template>
+
+<script setup lang="ts">
+import { login, callback } from '@/api/login';
+import { setToken } from '@/utils/auth';
+import Cookies from 'js-cookie';
+import { getToken } from '@/utils/auth';
+import { LoginData } from '@/api/types';
+
+const route = useRoute();
+const loading = ref(true);
+
+
+/**
+ * 鎺ユ敹Route浼犻�掔殑鍙傛暟
+ * @param {Object} route.query.
+ */
+const code = route.query.code as string;
+const state = route.query.state as string;
+const source = route.query.source as string;
+const tenantId = Cookies.get("tenantId") ? Cookies.get("tenantId") as string : '000000';
+
+
+const processResponse = async (res: any) => {
+ if (res.code !== 200) {
+ throw new Error(res.msg);
+ }
+ setToken(res.data.access_token);
+ ElMessage.success(res.msg);
+ location.href = import.meta.env.VITE_APP_CONTEXT_PATH + 'index';
+};
+
+const handleError = (error: any) => {
+ ElMessage.error(error.message);
+ location.href = import.meta.env.VITE_APP_CONTEXT_PATH + 'index';
+};
+
+const callbackByCode = async (data: LoginData) => {
+ try {
+ const res = await callback(data);
+ await processResponse(res);
+ loading.value = false;
+ } catch (error) {
+ handleError(error);
+ }
+};
+
+const loginByCode = async (data: LoginData) => {
+ try {
+ const res = await login(data);
+ await processResponse(res);
+ loading.value = false;
+ } catch (error) {
+ handleError(error);
+ }
+};
+
+const init = async () => {
+ const data: LoginData = {
+ socialCode: code,
+ socialState: state,
+ tenantId: tenantId,
+ source: source,
+ clientId: 'e5cd7e4891bf95d1d19206ce24a7b32e',
+ grantType: 'social'
+ };
+
+ if (!getToken()) {
+ await loginByCode(data);
+ } else {
+ await callbackByCode(data);
+ }
+};
+
+onMounted(() => {
+ nextTick(() => {
+ init();
+ });
+});
+</script>
diff --git a/src/permission.ts b/src/permission.ts
index 4713383..c2743eb 100644
--- a/src/permission.ts
+++ b/src/permission.ts
@@ -10,7 +10,7 @@
import usePermissionStore from '@/store/modules/permission';
NProgress.configure({ showSpinner: false });
-const whiteList = ['/login', '/register'];
+const whiteList = ['/login', '/register', '/social-login'];
router.beforeEach(async (to, from, next) => {
NProgress.start();
diff --git a/src/router/index.ts b/src/router/index.ts
index 9540ab2..dfd0547 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -38,6 +38,11 @@
]
},
{
+ path: '/social-login',
+ hidden: true,
+ component: () => import('@/layout/components/SocialLogin/index.vue')
+ },
+ {
path: '/login',
component: () => import('@/views/login.vue'),
hidden: true
@@ -176,4 +181,5 @@
}
});
+
export default router;
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 6f30437..2593d1a 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -23,8 +23,8 @@
const [err, res] = await to(loginApi(userInfo));
if (res) {
const data = res.data;
- setToken(data.token);
- token.value = data.token;
+ setToken(data.access_token);
+ token.value = data.access_token;
return Promise.resolve();
}
return Promise.reject(err);
diff --git a/src/types/env.d.ts b/src/types/env.d.ts
index 7e5134a..032f52b 100644
--- a/src/types/env.d.ts
+++ b/src/types/env.d.ts
@@ -65,7 +65,7 @@
VITE_APP_BASE_URL: string;
VITE_APP_CONTEXT_PATH: string;
VITE_APP_MONITRO_ADMIN: string;
- VITE_APP_XXL_JOB_ADMIN: string;
+ VITE_APP_POWERJOB_ADMIN: string;
VITE_APP_ENV: string;
}
interface ImportMeta {
diff --git a/src/utils/auth.ts b/src/utils/auth.ts
index 4020003..db50ac9 100644
--- a/src/utils/auth.ts
+++ b/src/utils/auth.ts
@@ -4,6 +4,6 @@
export const getToken = () => tokenStorage.value;
-export const setToken = (token: string) => (tokenStorage.value = token);
+export const setToken = (access_token: string) => (tokenStorage.value = access_token);
export const removeToken = () => (tokenStorage.value = null);
diff --git a/src/views/index.vue b/src/views/index.vue
index 70912af..4b3bebd 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -21,7 +21,7 @@
* 鍒嗗竷寮忛攣 Lock4j 娉ㄨВ閿併�佸伐鍏烽攣 澶氱澶氭牱<br />
* 鍒嗗竷寮忓箓绛� Lock4j 鍩轰簬鍒嗗竷寮忛攣瀹炵幇<br />
* 鍒嗗竷寮忛摼璺拷韪� SkyWalking 鏀寔閾捐矾杩借釜銆佺綉鏍煎垎鏋愩�佸害閲忚仛鍚堛�佸彲瑙嗗寲<br />
- * 鍒嗗竷寮忎换鍔¤皟搴� Xxl-Job 楂樻�ц兘 楂樺彲闈� 鏄撴墿灞�<br />
+ * 鍒嗗竷寮忎换鍔¤皟搴� PowerJob 楂樻�ц兘 楂樺彲闈� 鏄撴墿灞�<br />
* 鏂囦欢瀛樺偍 Minio 鏈湴瀛樺偍<br />
* 鏂囦欢瀛樺偍 涓冪墰銆侀樋閲屻�佽吘璁� 浜戝瓨鍌�<br />
* 鐩戞帶妗嗘灦 SpringBoot-Admin 鍏ㄦ柟浣嶆湇鍔＄洃鎺�<br />
diff --git a/src/views/login.vue b/src/views/login.vue
index 9559f9b..3234864 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -4,7 +4,8 @@
<h3 class="title">RuoYi-Vue-Plus澶氱鎴风鐞嗙郴缁�</h3>
<el-form-item prop="tenantId" v-if="tenantEnabled">
<el-select v-model="loginForm.tenantId" filterable placeholder="璇烽�夋嫨/杈撳叆鍏徃鍚嶇О" style="width: 100%">
- <el-option v-for="item in tenantList" :key="item.tenantId" :label="item.companyName" :value="item.tenantId"> </el-option>
+ <el-option v-for="item in tenantList" :key="item.tenantId" :label="item.companyName"
+ :value="item.tenantId"></el-option>
<template #prefix><svg-icon icon-class="company" class="el-input__icon input-icon" /></template>
</el-select>
</el-form-item>
@@ -14,12 +15,14 @@
</el-input>
</el-form-item>
<el-form-item prop="password">
- <el-input v-model="loginForm.password" type="password" size="large" auto-complete="off" placeholder="瀵嗙爜" @keyup.enter="handleLogin">
+ <el-input v-model="loginForm.password" type="password" size="large" auto-complete="off" placeholder="瀵嗙爜"
+ @keyup.enter="handleLogin">
<template #prefix><svg-icon icon-class="password" class="el-input__icon input-icon" /></template>
</el-input>
</el-form-item>
<el-form-item prop="code" v-if="captchaEnabled">
- <el-input v-model="loginForm.code" size="large" auto-complete="off" placeholder="楠岃瘉鐮�" style="width: 63%" @keyup.enter="handleLogin">
+ <el-input v-model="loginForm.code" size="large" auto-complete="off" placeholder="楠岃瘉鐮�" style="width: 63%"
+ @keyup.enter="handleLogin">
<template #prefix><svg-icon icon-class="validCode" class="el-input__icon input-icon" /></template>
</el-input>
<div class="login-code">
@@ -36,6 +39,20 @@
<router-link class="link-type" :to="'/register'">绔嬪嵆娉ㄥ唽</router-link>
</div>
</el-form-item>
+ <div style="display: flex;justify-content: flex-end;flex-direction: row;">
+ <el-button circle>
+ <svg-icon icon-class="qq" @click="doSocialLogin('qq')" />
+ </el-button>
+ <el-button circle>
+ <svg-icon icon-class="wechat" @click="doSocialLogin('wechat')" />
+ </el-button>
+ <el-button circle>
+ <svg-icon icon-class="gitee" @click="doSocialLogin('gitee')" />
+ </el-button>
+ <el-button circle>
+ <svg-icon icon-class="github" @click="doSocialLogin('github')" />
+ </el-button>
+ </div>
</el-form>
<!-- 搴曢儴 -->
<div class="el-login-footer">
@@ -46,30 +63,31 @@
<script setup lang="ts">
import { getCodeImg, getTenantList } from '@/api/login';
+import { authBinding } from '@/api/system/social/auth';
import Cookies from 'js-cookie';
import { encrypt, decrypt } from '@/utils/jsencrypt';
import { useUserStore } from '@/store/modules/user';
import { LoginData, TenantVO } from '@/api/types';
-import { FormRules } from 'element-plus';
+import { ElForm, FormRules } from 'element-plus';
import { to } from 'await-to-js';
const userStore = useUserStore();
const router = useRouter();
const loginForm = ref<LoginData>({
- tenantId: "000000",
- username: 'admin',
- password: 'admin123',
- rememberMe: false,
- code: '',
- uuid: ''
+ tenantId: "000000",
+ username: 'admin',
+ password: 'admin123',
+ rememberMe: false,
+ code: '',
+ uuid: ''
});
const loginRules: FormRules = {
- tenantId: [{ required: true, trigger: "blur", message: "璇疯緭鍏ユ偍鐨勭鎴风紪鍙�" }],
- username: [{ required: true, trigger: 'blur', message: '璇疯緭鍏ユ偍鐨勮处鍙�' }],
- password: [{ required: true, trigger: 'blur', message: '璇疯緭鍏ユ偍鐨勫瘑鐮�' }],
- code: [{ required: true, trigger: 'change', message: '璇疯緭鍏ラ獙璇佺爜' }]
+ tenantId: [{ required: true, trigger: "blur", message: "璇疯緭鍏ユ偍鐨勭鎴风紪鍙�" }],
+ username: [{ required: true, trigger: 'blur', message: '璇疯緭鍏ユ偍鐨勮处鍙�' }],
+ password: [{ required: true, trigger: 'blur', message: '璇疯緭鍏ユ偍鐨勫瘑鐮�' }],
+ code: [{ required: true, trigger: 'change', message: '璇疯緭鍏ラ獙璇佺爜' }]
};
const codeUrl = ref('');
@@ -88,64 +106,64 @@
const tenantList = ref<TenantVO[]>([]);
const handleLogin = () => {
- loginRef.value.validate(async (valid:boolean, fields: any) => {
- if (valid) {
- loading.value = true;
- // 鍕鹃�変簡闇�瑕佽浣忓瘑鐮佽缃湪 cookie 涓缃浣忕敤鎴峰悕鍜屽瘑鐮�
- if (loginForm.value.rememberMe) {
- Cookies.set("tenantId", loginForm.value.tenantId, { expires: 30 });
- Cookies.set('username', loginForm.value.username, { expires: 30 });
- Cookies.set('password', String(encrypt(loginForm.value.password)), { expires: 30 });
- Cookies.set('rememberMe', String(loginForm.value.rememberMe), { expires: 30 });
- } else {
- // 鍚﹀垯绉婚櫎
- Cookies.remove("tenantId");
- Cookies.remove('username');
- Cookies.remove('password');
- Cookies.remove('rememberMe');
- }
- // 璋冪敤action鐨勭櫥褰曟柟娉�
- // prittier-ignore
- const [err] = await to(userStore.login(loginForm.value));
- if (!err) {
- await router.push({ path: redirect.value || '/' });
- } else {
- loading.value = false;
- // 閲嶆柊鑾峰彇楠岃瘉鐮�
- if (captchaEnabled.value) {
- await getCode();
- }
- }
- } else {
- console.log('error submit!', fields);
+ loginRef.value.validate(async (valid: boolean, fields: any) => {
+ if (valid) {
+ loading.value = true;
+ // 鍕鹃�変簡闇�瑕佽浣忓瘑鐮佽缃湪 cookie 涓缃浣忕敤鎴峰悕鍜屽瘑鐮�
+ if (loginForm.value.rememberMe) {
+ Cookies.set("tenantId", loginForm.value.tenantId, { expires: 30 });
+ Cookies.set('username', loginForm.value.username, { expires: 30 });
+ Cookies.set('password', String(encrypt(loginForm.value.password)), { expires: 30 });
+ Cookies.set('rememberMe', String(loginForm.value.rememberMe), { expires: 30 });
+ } else {
+ // 鍚﹀垯绉婚櫎
+ Cookies.remove("tenantId");
+ Cookies.remove('username');
+ Cookies.remove('password');
+ Cookies.remove('rememberMe');
+ }
+ // 璋冪敤action鐨勭櫥褰曟柟娉�
+ // prittier-ignore
+ const [err] = await to(userStore.login(loginForm.value));
+ if (!err) {
+ await router.push({ path: redirect.value || '/' });
+ } else {
+ loading.value = false;
+ // 閲嶆柊鑾峰彇楠岃瘉鐮�
+ if (captchaEnabled.value) {
+ await getCode();
}
- });
+ }
+ } else {
+ console.log('error submit!', fields);
+ }
+ });
};
/**
* 鑾峰彇楠岃瘉鐮�
*/
const getCode = async () => {
- const res = await getCodeImg();
- const { data } = res;
- captchaEnabled.value = data.captchaEnabled === undefined ? true : data.captchaEnabled;
- if (captchaEnabled.value) {
- codeUrl.value = 'data:image/gif;base64,' + data.img;
- loginForm.value.uuid = data.uuid;
- }
+ const res = await getCodeImg();
+ const { data } = res;
+ captchaEnabled.value = data.captchaEnabled === undefined ? true : data.captchaEnabled;
+ if (captchaEnabled.value) {
+ codeUrl.value = 'data:image/gif;base64,' + data.img;
+ loginForm.value.uuid = data.uuid;
+ }
};
const getCookie = () => {
- const tenantId = Cookies.get("tenantId");
- const username = Cookies.get('username');
- const password = Cookies.get('password');
- const rememberMe = Cookies.get('rememberMe');
- loginForm.value = {
- tenantId: tenantId === undefined ? loginForm.value.tenantId : tenantId,
- username: username === undefined ? loginForm.value.username : username,
- password: password === undefined ? loginForm.value.password : (decrypt(password) as string),
- rememberMe: rememberMe === undefined ? false : Boolean(rememberMe)
- };
+ const tenantId = Cookies.get("tenantId");
+ const username = Cookies.get('username');
+ const password = Cookies.get('password');
+ const rememberMe = Cookies.get('rememberMe');
+ loginForm.value = {
+ tenantId: tenantId === undefined ? loginForm.value.tenantId : tenantId,
+ username: username === undefined ? loginForm.value.username : username,
+ password: password === undefined ? loginForm.value.password : (decrypt(password) as string),
+ rememberMe: rememberMe === undefined ? false : Boolean(rememberMe)
+ };
}
@@ -153,20 +171,41 @@
* 鑾峰彇绉熸埛鍒楄〃
*/
const initTenantList = async () => {
- const { data } = await getTenantList();
- tenantEnabled.value = data.tenantEnabled === undefined ? true : data.tenantEnabled;
- if (tenantEnabled.value) {
- tenantList.value = data.voList;
- if (tenantList.value != null && tenantList.value.length !== 0) {
- loginForm.value.tenantId = tenantList.value[0].tenantId;
- }
+ const { data } = await getTenantList();
+ tenantEnabled.value = data.tenantEnabled === undefined ? true : data.tenantEnabled;
+ if (tenantEnabled.value) {
+ tenantList.value = data.voList;
+ if (tenantList.value != null && tenantList.value.length !== 0) {
+ loginForm.value.tenantId = tenantList.value[0].tenantId;
}
+ }
}
+//妫�娴嬬鎴烽�夋嫨妗嗙殑鍙樺寲
+watch(() => loginForm.value.tenantId, (val: string) => {
+ Cookies.set("tenantId", loginForm.value.tenantId, { expires: 30 })
+});
+
+/**
+ * 绗笁鏂圭櫥褰�
+ * @param type
+ */
+const doSocialLogin = (type: string) => {
+ authBinding(type).then((res: any) => {
+ if (res.code === 200) {
+ window.location.href = res.msg;
+ } else {
+ ElMessage.error(res.msg);
+ }
+ });
+};
+
+
+
onMounted(() => {
- getCode();
- initTenantList();
- getCookie();
+ getCode();
+ initTenantList();
+ getCookie();
});
</script>
@@ -179,6 +218,7 @@
background-image: url("../assets/images/login-background.jpg");
background-size: cover;
}
+
.title {
margin: 0px auto 30px auto;
text-align: center;
@@ -190,32 +230,39 @@
background: #ffffff;
width: 400px;
padding: 25px 25px 5px 25px;
+
.el-input {
height: 40px;
+
input {
height: 40px;
}
}
+
.input-icon {
height: 39px;
width: 14px;
margin-left: 0px;
}
}
+
.login-tip {
font-size: 13px;
text-align: center;
color: #bfbfbf;
}
+
.login-code {
width: 33%;
height: 40px;
float: right;
+
img {
cursor: pointer;
vertical-align: middle;
}
}
+
.el-login-footer {
height: 40px;
line-height: 40px;
@@ -224,10 +271,11 @@
width: 100%;
text-align: center;
color: #fff;
- font-family: Arial,serif;
+ font-family: Arial, serif;
font-size: 12px;
letter-spacing: 1px;
}
+
.login-code-img {
height: 40px;
padding-left: 12px;
diff --git a/src/views/monitor/xxljob/index.vue b/src/views/monitor/powerjob/index.vue
similarity index 67%
rename from src/views/monitor/xxljob/index.vue
rename to src/views/monitor/powerjob/index.vue
index 9349081..0319e97 100644
--- a/src/views/monitor/xxljob/index.vue
+++ b/src/views/monitor/powerjob/index.vue
@@ -5,5 +5,5 @@
</template>
<script setup lang="ts">
-const url = ref(import.meta.env.VITE_APP_XXL_JOB_ADMIN);
+const url = ref(import.meta.env.VITE_APP_POWERJOB_ADMIN);
</script>
diff --git a/src/views/system/client/index.vue b/src/views/system/client/index.vue
new file mode 100644
index 0000000..2130d03
--- /dev/null
+++ b/src/views/system/client/index.vue
@@ -0,0 +1,344 @@
+<template>
+ <div class="p-2">
+ <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+ <div class="search" v-show="showSearch">
+ <el-form :model="queryParams" ref="queryFormRef" :inline="true" label-width="100px">
+ <el-form-item label="瀹㈡埛绔痥ey" prop="clientKey">
+ <el-input v-model="queryParams.clientKey" placeholder="璇疯緭鍏ュ鎴风key" clearable @keyup.enter="handleQuery" />
+ </el-form-item>
+ <el-form-item label="瀹㈡埛绔閽�" prop="clientSecret">
+ <el-input v-model="queryParams.clientSecret" placeholder="璇疯緭鍏ュ鎴风绉橀挜" clearable @keyup.enter="handleQuery" />
+ </el-form-item>
+ <el-form-item label="鐘舵��" prop="status">
+ <el-select v-model="queryParams.status" placeholder="鐘舵��" clearable>
+ <el-option v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.label" :value="dict.value" />
+ </el-select>
+ </el-form-item>
+ <el-form-item>
+ <el-button type="primary" icon="Search" @click="handleQuery">鎼滅储</el-button>
+ <el-button icon="Refresh" @click="resetQuery">閲嶇疆</el-button>
+ </el-form-item>
+ </el-form>
+ </div>
+ </transition>
+
+ <el-card shadow="never">
+ <template #header>
+ <el-row :gutter="10" class="mb8">
+ <el-col :span="1.5">
+ <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['system:client:add']">鏂板</el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['system:client:edit']">淇敼</el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['system:client:remove']">鍒犻櫎</el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['system:client:export']">瀵煎嚭</el-button>
+ </el-col>
+ <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+ </el-row>
+ </template>
+
+ <el-table v-loading="loading" :data="clientList" @selection-change="handleSelectionChange">
+ <el-table-column type="selection" width="55" align="center" />
+ <el-table-column label="id" align="center" prop="id" v-if="true" />
+ <el-table-column label="瀹㈡埛绔痠d" align="center" prop="clientId" />
+ <el-table-column label="瀹㈡埛绔痥ey" align="center" prop="clientKey" />
+ <el-table-column label="瀹㈡埛绔閽�" align="center" prop="clientSecret" />
+ <el-table-column label="鎺堟潈绫诲瀷" align="center">
+ <template #default="scope">
+ <div>
+ <template v-for="type in scope.row.grantTypeList">
+ <dict-tag class="el-check-tag" :options="sys_grant_type" :value="type" />
+ </template>
+ </div>
+ </template>
+ </el-table-column>
+ <el-table-column label="璁惧绫诲瀷" align="center">
+ <template #default="scope">
+ <dict-tag :options="sys_device_type" :value="scope.row.deviceType" />
+ </template>
+ </el-table-column>
+ <el-table-column label="Token娲昏穬瓒呮椂鏃堕棿" align="center" prop="activeTimeout" />
+ <el-table-column label="Token鍥哄畾瓒呮椂鏃堕棿" align="center" prop="timeout" />
+ <el-table-column label="鐘舵��" align="center" key="status">
+ <template #default="scope">
+ <el-switch v-model="scope.row.status" active-value="0" inactive-value="1" @change="handleStatusChange(scope.row)"></el-switch>
+ </template>
+ </el-table-column>
+ <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
+ <template #default="scope">
+ <el-tooltip content="淇敼" placement="top">
+ <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:client:edit']"></el-button>
+ </el-tooltip>
+ <el-tooltip content="鍒犻櫎" placement="top">
+ <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:client:remove']"></el-button>
+ </el-tooltip>
+ </template>
+ </el-table-column>
+ </el-table>
+
+ <pagination
+ v-show="total>0"
+ :total="total"
+ v-model:page="queryParams.pageNum"
+ v-model:limit="queryParams.pageSize"
+ @pagination="getList"
+ />
+ </el-card>
+ <!-- 娣诲姞鎴栦慨鏀瑰鎴风绠＄悊瀵硅瘽妗� -->
+ <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
+ <el-form ref="clientFormRef" :model="form" :rules="rules" label-width="100px">
+ <el-form-item label="瀹㈡埛绔痥ey" prop="clientKey">
+ <el-input v-model="form.clientKey" :disabled="form.id != null" placeholder="璇疯緭鍏ュ鎴风key" />
+ </el-form-item>
+ <el-form-item label="瀹㈡埛绔閽�" prop="clientSecret">
+ <el-input v-model="form.clientSecret" :disabled="form.id != null" placeholder="璇疯緭鍏ュ鎴风绉橀挜" />
+ </el-form-item>
+ <el-form-item label="鎺堟潈绫诲瀷" prop="grantTypeList">
+ <el-select v-model="form.grantTypeList" multiple placeholder="璇疯緭鍏ユ巿鏉冪被鍨�">
+ <el-option
+ v-for="dict in sys_grant_type"
+ :key="dict.value" :label="dict.label" :value="dict.value"
+ ></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="璁惧绫诲瀷" prop="deviceType">
+ <el-select v-model="form.deviceType" placeholder="璇疯緭鍏ヨ澶囩被鍨�">
+ <el-option
+ v-for="dict in sys_device_type"
+ :key="dict.value" :label="dict.label" :value="dict.value"
+ ></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item prop="activeTimeout" label-width="auto">
+ <template #label>
+ <span>
+ <el-tooltip content="鎸囧畾鏃堕棿鏃犳搷浣滃垯杩囨湡锛堝崟浣嶏細绉掞級锛岄粯璁�30鍒嗛挓锛�1800绉掞級" placement="top">
+ <el-icon><question-filled /></el-icon>
+ </el-tooltip>
+ Token娲昏穬瓒呮椂鏃堕棿
+ </span>
+ </template>
+ <el-input v-model="form.activeTimeout" placeholder="璇疯緭鍏oken娲昏穬瓒呮椂鏃堕棿" />
+ </el-form-item>
+ <el-form-item prop="timeout" label-width="auto">
+ <template #label>
+ <span>
+ <el-tooltip content="鎸囧畾鏃堕棿蹇呭畾杩囨湡锛堝崟浣嶏細绉掞級锛岄粯璁や竷澶╋紙604800绉掞級" placement="top">
+ <el-icon><question-filled /></el-icon>
+ </el-tooltip>
+ Token鍥哄畾瓒呮椂鏃堕棿
+ </span>
+ </template>
+ <el-input v-model="form.timeout" placeholder="璇疯緭鍏oken鍥哄畾瓒呮椂鏃堕棿" />
+ </el-form-item>
+ <el-form-item label="鐘舵��">
+ <el-radio-group v-model="form.status">
+ <el-radio v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.value">
+ {{ dict.label }}
+ </el-radio>
+ </el-radio-group>
+ </el-form-item>
+ </el-form>
+ <template #footer>
+ <div class="dialog-footer">
+ <el-button :loading="buttonLoading" type="primary" @click="submitForm">纭� 瀹�</el-button>
+ <el-button @click="cancel">鍙� 娑�</el-button>
+ </div>
+ </template>
+ </el-dialog>
+ </div>
+</template>
+
+<script setup name="Client" lang="ts">
+import { listClient, getClient, delClient, addClient, updateClient, changeStatus } from '@/api/system/client';
+import { ClientVO, ClientQuery, ClientForm } from '@/api/system/client/types';
+import { ComponentInternalInstance } from 'vue';
+import { ElForm } from 'element-plus';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { sys_normal_disable } = toRefs<any>(proxy?.useDict("sys_normal_disable"));
+const { sys_grant_type } = toRefs<any>(proxy?.useDict("sys_grant_type"));
+const { sys_device_type } = toRefs<any>(proxy?.useDict("sys_device_type"));
+
+const clientList = ref<ClientVO[]>([]);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+
+const queryFormRef = ref(ElForm);
+const clientFormRef = ref(ElForm);
+
+const dialog = reactive<DialogOption>({
+ visible: false,
+ title: ''
+});
+
+const initFormData: ClientForm = {
+ id: undefined,
+ clientId: undefined,
+ clientKey: undefined,
+ clientSecret: undefined,
+ grantTypeList: undefined,
+ deviceType: undefined,
+ activeTimeout: undefined,
+ timeout: undefined,
+ status: undefined,
+}
+const data = reactive<PageData<ClientForm, ClientQuery>>({
+ form: {...initFormData},
+ queryParams: {
+ pageNum: 1,
+ pageSize: 10,
+ clientId: undefined,
+ clientKey: undefined,
+ clientSecret: undefined,
+ grantType: undefined,
+ deviceType: undefined,
+ activeTimeout: undefined,
+ timeout: undefined,
+ status: undefined,
+ },
+ rules: {
+ id: [
+ { required: true, message: "id涓嶈兘涓虹┖", trigger: "blur" }
+ ],
+ clientId: [
+ { required: true, message: "瀹㈡埛绔痠d涓嶈兘涓虹┖", trigger: "blur" }
+ ],
+ clientKey: [
+ { required: true, message: "瀹㈡埛绔痥ey涓嶈兘涓虹┖", trigger: "blur" }
+ ],
+ clientSecret: [
+ { required: true, message: "瀹㈡埛绔閽ヤ笉鑳戒负绌�", trigger: "blur" }
+ ],
+ grantTypeList: [
+ { required: true, message: "鎺堟潈绫诲瀷涓嶈兘涓虹┖", trigger: "change" }
+ ],
+ deviceType: [
+ { required: true, message: "璁惧绫诲瀷涓嶈兘涓虹┖", trigger: "change" }
+ ],
+ }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 鏌ヨ瀹㈡埛绔鐞嗗垪琛� */
+const getList = async () => {
+ loading.value = true;
+ const res = await listClient(queryParams.value);
+ clientList.value = res.rows;
+ total.value = res.total;
+ loading.value = false;
+}
+
+/** 鍙栨秷鎸夐挳 */
+const cancel = () => {
+ reset();
+ dialog.visible = false;
+}
+
+/** 琛ㄥ崟閲嶇疆 */
+const reset = () => {
+ form.value = {...initFormData};
+ clientFormRef.value.resetFields();
+}
+
+/** 鎼滅储鎸夐挳鎿嶄綔 */
+const handleQuery = () => {
+ queryParams.value.pageNum = 1;
+ getList();
+}
+
+/** 閲嶇疆鎸夐挳鎿嶄綔 */
+const resetQuery = () => {
+ queryFormRef.value.resetFields();
+ handleQuery();
+}
+
+/** 澶氶�夋閫変腑鏁版嵁 */
+const handleSelectionChange = (selection: ClientVO[]) => {
+ ids.value = selection.map(item => item.id);
+ single.value = selection.length != 1;
+ multiple.value = !selection.length;
+}
+
+/** 鏂板鎸夐挳鎿嶄綔 */
+const handleAdd = () => {
+ dialog.visible = true;
+ dialog.title = "娣诲姞瀹㈡埛绔鐞�";
+ nextTick(() => {
+ reset();
+ });
+}
+
+/** 淇敼鎸夐挳鎿嶄綔 */
+const handleUpdate = (row?: ClientVO) => {
+ loading.value = true
+ dialog.visible = true;
+ dialog.title = "淇敼瀹㈡埛绔鐞�";
+ nextTick(async () => {
+ reset();
+ const _id = row?.id || ids.value[0]
+ const res = await getClient(_id);
+ loading.value = false;
+ Object.assign(form.value, res.data);
+ });
+}
+
+/** 鎻愪氦鎸夐挳 */
+const submitForm = () => {
+ clientFormRef.value.validate(async (valid: boolean) => {
+ if (valid) {
+ buttonLoading.value = true;
+ if (form.value.id) {
+ await updateClient(form.value).finally(() => buttonLoading.value = false);
+ } else {
+ await addClient(form.value).finally(() => buttonLoading.value = false);
+ }
+ proxy?.$modal.msgSuccess("淇敼鎴愬姛");
+ dialog.visible = false;
+ await getList();
+ }
+ });
+}
+
+/** 鍒犻櫎鎸夐挳鎿嶄綔 */
+const handleDelete = async (row?: ClientVO) => {
+ const _ids = row?.id || ids.value;
+ await proxy?.$modal.confirm('鏄惁纭鍒犻櫎瀹㈡埛绔鐞嗙紪鍙蜂负"' + _ids + '"鐨勬暟鎹」锛�').finally(() => loading.value = false);
+ await delClient(_ids);
+ proxy?.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ await getList();
+}
+
+/** 瀵煎嚭鎸夐挳鎿嶄綔 */
+const handleExport = () => {
+ proxy?.download('system/client/export', {
+ ...queryParams.value
+ }, `client_${new Date().getTime()}.xlsx`)
+}
+
+/** 鐘舵�佷慨鏀� */
+const handleStatusChange = async (row: ClientVO) => {
+ let text = row.status === "0" ? "鍚敤" : "鍋滅敤"
+ try {
+ await proxy?.$modal.confirm('纭瑕�"' + text + '"鍚�?');
+ await changeStatus(row.id, row.status);
+ proxy?.$modal.msgSuccess(text + "鎴愬姛");
+ } catch (err) {
+ row.status = row.status === "0" ? "1" : "0";
+ }
+}
+
+onMounted(() => {
+ getList();
+});
+</script>
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index f06b0b3..e282f81 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -180,7 +180,7 @@
</el-col>
<el-col :span="12" v-if="form.menuType === 'C'">
<el-form-item>
- <el-input v-model="form.query" placeholder="璇疯緭鍏ヨ矾鐢卞弬鏁�" maxlength="255" />
+ <el-input v-model="form.queryParam" placeholder="璇疯緭鍏ヨ矾鐢卞弬鏁�" maxlength="255" />
<template #label>
<span>
<el-tooltip content='璁块棶璺敱鐨勯粯璁や紶閫掑弬鏁帮紝濡傦細`{"id": 1, "name": "ry"}`' placement="top">
diff --git a/src/views/system/user/profile/index.vue b/src/views/system/user/profile/index.vue
index 341c08d..b06da65 100644
--- a/src/views/system/user/profile/index.vue
+++ b/src/views/system/user/profile/index.vue
@@ -55,6 +55,9 @@
<el-tab-pane label="淇敼瀵嗙爜" name="resetPwd">
<resetPwd />
</el-tab-pane>
+ <el-tab-pane label="绗笁鏂瑰簲鐢�" name="thirdParty">
+ <thirdParty :auths="state.auths" />
+ </el-tab-pane>
</el-tabs>
</el-card>
</el-col>
@@ -66,13 +69,16 @@
import userAvatar from "./userAvatar.vue";
import userInfo from "./userInfo.vue";
import resetPwd from "./resetPwd.vue";
+import thirdParty from "./thirdParty.vue";
+import { getAuthList } from "@/api/system/social/auth";
import { getUserProfile } from "@/api/system/user";
const activeTab = ref("userinfo");
-const state = ref<{ user: any; roleGroup: string; postGroup: string}>({
+const state = ref<{ user: any; roleGroup: string; postGroup: string; auths:any[]}>({
user: {},
roleGroup: '',
- postGroup: ''
+ postGroup: '',
+ auths: [],
});
const userForm = ref({});
@@ -85,7 +91,13 @@
state.value.postGroup = res.data.postGroup;
};
+const getAuths = async () => {
+ const res = await getAuthList();
+ state.value.auths = res.data;
+};
+
onMounted(() => {
getUser();
+ getAuths();
})
</script>
diff --git a/src/views/system/user/profile/thirdParty.vue b/src/views/system/user/profile/thirdParty.vue
new file mode 100644
index 0000000..e5791ef
--- /dev/null
+++ b/src/views/system/user/profile/thirdParty.vue
@@ -0,0 +1,140 @@
+<template>
+ <div>
+ <el-table :data="auths" style="width: 100%; height: 100%; font-size: 10px">
+ <el-table-column label="搴忓彿" width="50" type="index"></el-table-column>
+ <el-table-column label="缁戝畾璐﹀彿骞冲彴" width="140" align="center" prop="source" show-overflow-tooltip />
+ <el-table-column label="澶村儚" width="120" align="center" prop="avatar">
+ <template v-slot="scope">
+ <img :src="scope.row.avatar" style="width: 45px; height: 45px" />
+ </template>
+ </el-table-column>
+ <el-table-column label="绯荤粺璐﹀彿" width="180" align="center" prop="userName" :show-overflow-tooltip="true" />
+ <el-table-column label="缁戝畾鏃堕棿" width="180" align="center" prop="createTime" />
+ <el-table-column label="鎿嶄綔" width="80" align="center" class-name="small-padding fixed-width">
+ <template v-slot="scope">
+ <el-button size="small" type="text" @click="unlockAuth(scope.row)">瑙ｇ粦</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+
+ <div id="git-user-binding">
+ <h4 class="provider-desc">浣犲彲浠ョ粦瀹氫互涓嬬涓夋柟甯愬彿</h4>
+ <div id="authlist" class="user-bind">
+ <a class="third-app" href="#" @click="authUrl('gitee');" title="浣跨敤 Gitee 璐﹀彿鎺堟潈鐧诲綍">
+ <div class="git-other-login-icon">
+ <svg-icon icon-class="gitee" />
+ </div>
+ <span class="app-name">Gitee</span>
+ </a>
+
+ <a class="third-app" href="#" @click="authUrl('github');" title="浣跨敤 GitHub 璐﹀彿鎺堟潈鐧诲綍">
+ <div class="git-other-login-icon">
+ <svg-icon icon-class="github" />
+ </div>
+ <span class="app-name">Github</span>
+ </a>
+
+ <a class="third-app" href="#" @click="authUrl('wechar');" title="浣跨敤 寰俊 璐﹀彿鎺堟潈鐧诲綍">
+ <div class="git-other-login-icon">
+ <svg-icon icon-class="wechat" />
+ </div>
+ <span class="app-name">WeiXin</span>
+ </a>
+
+ <a class="third-app" href="#" @click="authUrl('qq');" title="浣跨敤 QQ 璐﹀彿鎺堟潈鐧诲綍">
+ <div class="git-other-login-icon">
+ <svg-icon icon-class="qq" />
+ </div>
+ <span class="app-name">QQ</span>
+ </a>
+ </div>
+ </div>
+ </div>
+</template>
+
+<script lang="ts" setup>
+import { authUnlock, authBinding } from "@/api/system/social/auth";
+import { PropType } from "vue";
+
+const props = defineProps({
+ auths: {
+ type: Object as PropType<any>,
+ }
+});
+const auths = computed(() => props.auths);
+
+
+const unlockAuth = (row: any) => {
+ ElMessageBox.confirm('鎮ㄧ‘瀹氳瑙ｉ櫎"' + row.source + '"鐨勮处鍙风粦瀹氬悧锛�')
+ .then(() => {
+ return authUnlock(row.id);
+ }).then((res: any) => {
+ if (res.code === 200) {
+ ElMessage.success("瑙ｇ粦鎴愬姛");
+ } else {
+ ElMessage.error(res.msg);
+ }
+ }).catch(() => { });
+};
+
+const authUrl = (source: string) => {
+ authBinding(source).then((res: any) => {
+ if (res.code === 200) {
+ window.location.href = res.msg;
+ } else {
+ ElMessage.error(res.msg);
+ }
+ });
+};
+</script>
+
+<style type="text/css">
+.user-bind .third-app {
+ display: -webkit-box;
+ display: -ms-flexbox;
+ display: flex;
+ -webkit-box-orient: vertical;
+ -webkit-box-direction: normal;
+ -ms-flex-direction: column;
+ flex-direction: column;
+ -webkit-box-align: center;
+ -ms-flex-align: center;
+ align-items: center;
+ min-width: 80px;
+ float: left;
+}
+
+.user-bind {
+ font-size: 1rem;
+ text-align: start;
+ height: 50px;
+ margin-top: 10px;
+}
+
+.git-other-login-icon>img {
+ height: 32px;
+}
+
+a {
+ text-decoration: none;
+ cursor: pointer;
+ color: #005980;
+}
+
+.provider-desc {
+ font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial,
+ "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Liberation Sans",
+ "PingFang SC", "Microsoft YaHei", "Hiragino Sans GB", "Wenquanyi Micro Hei",
+ "WenQuanYi Zen Hei", "ST Heiti", SimHei, SimSun, "WenQuanYi Zen Hei Sharp",
+ sans-serif;
+ font-size: 1.071rem;
+}
+
+td>img {
+ height: 20px;
+ width: 20px;
+ display: inline-block;
+ border-radius: 50%;
+ margin-right: 5px;
+}
+</style>
--
Gitblit v1.9.3