From 319b37fe98d04df1e3af0f0d956ab42cb057680c Mon Sep 17 00:00:00 2001
From: LiuHao <liuhaoai545@gmail.com>
Date: 星期二, 20 六月 2023 19:15:58 +0800
Subject: [PATCH] 合并 ts
---
src/views/index.vue | 2
.gitignore | 1
src/views/system/user/profile/index.vue | 30 +++-
src/api/login.ts | 15 ++
src/assets/icons/svg/gitee.svg | 1
src/types/env.d.ts | 2
src/views/system/user/profile/thirdParty.vue | 140 +++++++++++++++++++++++
src/api/system/social/auth.ts | 24 ++++
src/permission.ts | 2
.env.development | 4
src/views/login.vue | 38 +++++
src/layout/components/SocialLogin/index.vue | 36 ++++++
.env.production | 4
src/views/monitor/powerjob/index.vue | 2
src/router/index.ts | 5
15 files changed, 285 insertions(+), 21 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..9d6d1b7 100644
--- a/src/api/login.ts
+++ b/src/api/login.ts
@@ -60,6 +60,21 @@
timeout: 20000
});
}
+/**
+ * 绗笁鏂圭櫥褰�
+ * @param source 绗笁鏂圭櫥褰曠被鍨�
+ * */
+export function socialLogin(source: string, code: any, state: any): AxiosPromise<any> {
+ const data = {
+ code,
+ state
+ };
+ return request({
+ url: '/auth/social-login/' + source,
+ method: 'get',
+ params: data
+ });
+}
// 鑾峰彇鐢ㄦ埛璇︾粏淇℃伅
export function getInfo(): AxiosPromise<UserInfo> {
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/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..fad8286
--- /dev/null
+++ b/src/layout/components/SocialLogin/index.vue
@@ -0,0 +1,36 @@
+<template>
+ <div v-loading="loading" class="social-login"></div>
+</template>
+
+<script setup lang="ts">
+import {socialLogin} from '@/api/login';
+import {setToken} from '@/utils/auth';
+
+const route = useRoute();
+const router = useRouter();
+
+
+/**
+ * 鎺ユ敹Route浼犻�掔殑鍙傛暟
+ * @param {Object} route.query.
+ */
+const code = route.query.code;
+const state = route.query.state;
+const source = route.query.source as string;
+const loading = ref(true);
+await socialLogin(source, code, state)
+ .then(async (res) => {
+ if (res.code !== 200) {
+ ElMessage.error(res.msg);
+ router.go(-2);
+ return;
+ }
+ loading.value = false;
+ setToken(res.msg);
+ ElMessage.success('鐧诲綍鎴愬姛');
+ router.go(-2);
+ })
+ .catch(() => {
+ loading.value = false;
+ });
+</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..76a81bc 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
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/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 11f3aae..709b0ce 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -4,7 +4,7 @@
<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>
@@ -36,6 +36,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,11 +60,13 @@
<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 { to } from 'await-to-js';
+import { HttpStatus } from "@/enums/RespEnum";
const userStore = useUserStore();
const router = useRouter();
@@ -82,12 +98,12 @@
// 娉ㄥ唽寮�鍏�
const register = ref(false);
const redirect = ref(undefined);
-const loginRef = ref(ElForm);
+const loginRef = ref<ElFormInstance>();
// 绉熸埛鍒楄〃
const tenantList = ref<TenantVO[]>([]);
const handleLogin = () => {
- loginRef.value.validate(async (valid: boolean, fields: any) => {
+ loginRef.value?.validate(async (valid: boolean, fields: any) => {
if (valid) {
loading.value = true;
// 鍕鹃�変簡闇�瑕佽浣忓瘑鐮佽缃湪 cookie 涓缃浣忕敤鎴峰悕鍜屽瘑鐮�
@@ -104,7 +120,6 @@
Cookies.remove('rememberMe');
}
// 璋冪敤action鐨勭櫥褰曟柟娉�
- // prittier-ignore
const [err] = await to(userStore.login(loginForm.value));
if (!err) {
await router.push({ path: redirect.value || '/' });
@@ -161,6 +176,21 @@
}
}
}
+/**
+ * 绗笁鏂圭櫥褰�
+ * @param type
+ */
+const doSocialLogin = (type: string) => {
+ authBinding(type).then((res: any) => {
+ if (res.code === HttpStatus.SUCCESS) {
+ window.location.href = res.msg;
+ } else {
+ ElMessage.error(res.msg);
+ }
+ });
+};
+
+
onMounted(() => {
getCode();
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/user/profile/index.vue b/src/views/system/user/profile/index.vue
index 21638e3..31dc6ea 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,26 +69,35 @@
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<Record<string, any>>({
- user: {},
- roleGroup: '',
- postGroup: ''
+ user: {},
+ roleGroup: '',
+ postGroup: '',
+ auths: []
});
const userForm = ref({});
const getUser = async () => {
- const res = await getUserProfile();
- state.value.user = res.data.user;
- userForm.value = { ...res.data.user }
- state.value.roleGroup = res.data.roleGroup;
- state.value.postGroup = res.data.postGroup;
+ const res = await getUserProfile();
+ state.value.user = res.data.user;
+ userForm.value = { ...res.data.user }
+ state.value.roleGroup = res.data.roleGroup;
+ state.value.postGroup = res.data.postGroup;
+};
+
+const getAuths = async () => {
+ const res = await getAuthList();
+ state.value.auths = res.data;
};
onMounted(() => {
- getUser();
+ 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