-
+
+
+
+
diff --git a/yudao-ui-admin-vue3/src/components/Verifition/src/Verify/VerifyPoints.vue b/yudao-ui-admin-vue3/src/components/Verifition/src/Verify/VerifyPoints.vue
new file mode 100644
index 000000000..ea02b7834
--- /dev/null
+++ b/yudao-ui-admin-vue3/src/components/Verifition/src/Verify/VerifyPoints.vue
@@ -0,0 +1,281 @@
+
+
+
+
+ {{ t('captcha.verification') }}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/yudao-ui-admin-vue3/src/components/Verifition/src/Verify/VerifySlide.vue b/yudao-ui-admin-vue3/src/components/Verifition/src/Verify/VerifySlide.vue
new file mode 100644
index 000000000..2d59023bd
--- /dev/null
+++ b/yudao-ui-admin-vue3/src/components/Verifition/src/Verify/VerifySlide.vue
@@ -0,0 +1,426 @@
+
+
+
+
+
+
+ ![]()
+
+
+
+
+
+
+ {{ index + 1 }}
+
+
+
+
+
diff --git a/yudao-ui-admin-vue3/src/components/Verifition/src/Verify/index.ts b/yudao-ui-admin-vue3/src/components/Verifition/src/Verify/index.ts
new file mode 100644
index 000000000..0daa63a56
--- /dev/null
+++ b/yudao-ui-admin-vue3/src/components/Verifition/src/Verify/index.ts
@@ -0,0 +1,4 @@
+import VerifySlide from './VerifySlide.vue'
+import VerifyPoints from './VerifyPoints.vue'
+
+export { VerifySlide, VerifyPoints }
diff --git a/yudao-ui-admin-vue3/src/components/Verifition/src/api/index.ts b/yudao-ui-admin-vue3/src/components/Verifition/src/api/index.ts
new file mode 100644
index 000000000..6a67b7119
--- /dev/null
+++ b/yudao-ui-admin-vue3/src/components/Verifition/src/api/index.ts
@@ -0,0 +1,24 @@
+/**
+ * 此处可直接引用自己项目封装好的 axios 配合后端联调
+ */
+
+import request from './../utils/axios' //组件内部封装的axios
+// import request from "@/api/axios.js" //调用项目封装的axios
+
+//获取验证图片 以及token
+export function reqGet(data) {
+ return request({
+ url: '/captcha/get',
+ method: 'post',
+ data
+ })
+}
+
+//滑动或者点选验证
+export function reqCheck(data) {
+ return request({
+ url: '/captcha/check',
+ method: 'post',
+ data
+ })
+}
diff --git a/yudao-ui-admin-vue3/src/components/Verifition/src/utils/ase.ts b/yudao-ui-admin-vue3/src/components/Verifition/src/utils/ase.ts
new file mode 100644
index 000000000..d2e6b988f
--- /dev/null
+++ b/yudao-ui-admin-vue3/src/components/Verifition/src/utils/ase.ts
@@ -0,0 +1,14 @@
+import CryptoJS from 'crypto-js'
+/**
+ * @word 要加密的内容
+ * @keyWord String 服务器随机返回的关键字
+ * */
+export function aesEncrypt(word, keyWord = 'XwKsGlMcdPMEhR1B') {
+ const key = CryptoJS.enc.Utf8.parse(keyWord)
+ const srcs = CryptoJS.enc.Utf8.parse(word)
+ const encrypted = CryptoJS.AES.encrypt(srcs, key, {
+ mode: CryptoJS.mode.ECB,
+ padding: CryptoJS.pad.Pkcs7
+ })
+ return encrypted.toString()
+}
diff --git a/yudao-ui-admin-vue3/src/components/Verifition/src/utils/axios.ts b/yudao-ui-admin-vue3/src/components/Verifition/src/utils/axios.ts
new file mode 100644
index 000000000..ca68097e7
--- /dev/null
+++ b/yudao-ui-admin-vue3/src/components/Verifition/src/utils/axios.ts
@@ -0,0 +1,26 @@
+import axios from 'axios'
+
+axios.defaults.baseURL = import.meta.env.VITE_BASE_URL
+
+const service = axios.create({
+ timeout: 40000,
+ headers: {
+ 'X-Requested-With': 'XMLHttpRequest',
+ 'Content-Type': 'application/json; charset=UTF-8'
+ }
+})
+service.interceptors.request.use(
+ (config) => {
+ return config
+ },
+ (error) => {
+ Promise.reject(error)
+ }
+)
+
+// response interceptor
+service.interceptors.response.use((response) => {
+ const res = response.data
+ return res
+})
+export default service
diff --git a/yudao-ui-admin-vue3/src/components/Verifition/src/utils/util.ts b/yudao-ui-admin-vue3/src/components/Verifition/src/utils/util.ts
new file mode 100644
index 000000000..15c16270d
--- /dev/null
+++ b/yudao-ui-admin-vue3/src/components/Verifition/src/utils/util.ts
@@ -0,0 +1,97 @@
+export function resetSize(vm) {
+ let img_width, img_height, bar_width, bar_height //图片的宽度、高度，移动条的宽度、高度
+ const EmployeeWindow = window as any
+ const parentWidth = vm.$el.parentNode.offsetWidth || EmployeeWindow.offsetWidth
+ const parentHeight = vm.$el.parentNode.offsetHeight || EmployeeWindow.offsetHeight
+ if (vm.imgSize.width.indexOf('%') != -1) {
+ img_width = (parseInt(vm.imgSize.width) / 100) * parentWidth + 'px'
+ } else {
+ img_width = vm.imgSize.width
+ }
+
+ if (vm.imgSize.height.indexOf('%') != -1) {
+ img_height = (parseInt(vm.imgSize.height) / 100) * parentHeight + 'px'
+ } else {
+ img_height = vm.imgSize.height
+ }
+
+ if (vm.barSize.width.indexOf('%') != -1) {
+ bar_width = (parseInt(vm.barSize.width) / 100) * parentWidth + 'px'
+ } else {
+ bar_width = vm.barSize.width
+ }
+
+ if (vm.barSize.height.indexOf('%') != -1) {
+ bar_height = (parseInt(vm.barSize.height) / 100) * parentHeight + 'px'
+ } else {
+ bar_height = vm.barSize.height
+ }
+
+ return { imgWidth: img_width, imgHeight: img_height, barWidth: bar_width, barHeight: bar_height }
+}
+
+export const _code_chars = [
+ 1,
+ 2,
+ 3,
+ 4,
+ 5,
+ 6,
+ 7,
+ 8,
+ 9,
+ 'a',
+ 'b',
+ 'c',
+ 'd',
+ 'e',
+ 'f',
+ 'g',
+ 'h',
+ 'i',
+ 'j',
+ 'k',
+ 'l',
+ 'm',
+ 'n',
+ 'o',
+ 'p',
+ 'q',
+ 'r',
+ 's',
+ 't',
+ 'u',
+ 'v',
+ 'w',
+ 'x',
+ 'y',
+ 'z',
+ 'A',
+ 'B',
+ 'C',
+ 'D',
+ 'E',
+ 'F',
+ 'G',
+ 'H',
+ 'I',
+ 'J',
+ 'K',
+ 'L',
+ 'M',
+ 'N',
+ 'O',
+ 'P',
+ 'Q',
+ 'R',
+ 'S',
+ 'T',
+ 'U',
+ 'V',
+ 'W',
+ 'X',
+ 'Y',
+ 'Z'
+]
+export const _code_color1 = ['#fffff0', '#f0ffff', '#f0fff0', '#fff0f0']
+export const _code_color2 = ['#FF0033', '#006699', '#993366', '#FF9900', '#66CC66', '#FF33CC']
diff --git a/yudao-ui-admin-vue3/src/config/axios/config.ts b/yudao-ui-admin-vue3/src/config/axios/config.ts
index 050ce251b..811650873 100644
--- a/yudao-ui-admin-vue3/src/config/axios/config.ts
+++ b/yudao-ui-admin-vue3/src/config/axios/config.ts
@@ -1,10 +1,5 @@
const config: {
- base_url: {
- base: string
- dev: string
- pro: string
- test: string
- }
+ base_url: string
result_code: number | string
default_headers: AxiosHeaders
request_timeout: number
@@ -12,20 +7,7 @@ const config: {
/**
* api请求基础路径
*/
- base_url: {
- // 开发环境接口前缀
- base: '',
-
- // 打包开发环境接口前缀
- dev: '',
-
- // 打包生产环境接口前缀
- pro: '',
-
- // 打包测试环境接口前缀
- test: ''
- },
-
+ base_url: import.meta.env.VITE_BASE_URL + import.meta.env.VITE_API_URL,
/**
* 接口成功返回状态码
*/
diff --git a/yudao-ui-admin-vue3/src/config/axios/index.ts b/yudao-ui-admin-vue3/src/config/axios/index.ts
index 14bd90bad..75d4139d1 100644
--- a/yudao-ui-admin-vue3/src/config/axios/index.ts
+++ b/yudao-ui-admin-vue3/src/config/axios/index.ts
@@ -1,15 +1,15 @@
import axios, { AxiosInstance, AxiosRequestConfig, AxiosResponse, AxiosError } from 'axios'
-import { ElMessage, ElNotification } from 'element-plus'
+import { ElMessage, ElMessageBox, ElNotification } from 'element-plus'
import qs from 'qs'
import { config } from '@/config/axios/config'
-import { getAccessToken, getTenantId, removeToken } from '@/utils/auth'
+import { getAccessToken, getRefreshToken, getTenantId, removeToken, setToken } from '@/utils/auth'
import errorCode from './errorCode'
import { useI18n } from '@/hooks/web/useI18n'
+import { resetRouter } from '@/router'
+import { useCache } from '@/hooks/web/useCache'
const tenantEnable = import.meta.env.VITE_APP_TENANT_ENABLE
-const BASE_URL = import.meta.env.VITE_BASE_URL
-const BASE_API = import.meta.env.VITE_API_URL
-const { result_code, base_url } = config
+const { result_code, base_url, request_timeout } = config
// 需要忽略的提示。忽略后，自动 Promise.reject('error')
const ignoreMsgs = [
@@ -20,16 +20,14 @@ const ignoreMsgs = [
export const isRelogin = { show: false }
// Axios 无感知刷新令牌，参考 https://www.dashingdog.cn/article/11 与 https://segmentfault.com/a/1190000020210980 实现
// 请求队列
-// const requestList = []
+let requestList: any[] = []
// 是否正在刷新中
-// const isRefreshToken = false
-
-export const PATH_URL = base_url[import.meta.env.VITE_API_BASEPATH]
+let isRefreshToken = false
// 创建axios实例
const service: AxiosInstance = axios.create({
- baseURL: BASE_URL + BASE_API, // api 的 base_url
- timeout: config.request_timeout, // 请求超时时间
+ baseURL: base_url, // api 的 base_url
+ timeout: request_timeout, // 请求超时时间
withCredentials: false // 禁用 Cookie 等信息
})
@@ -112,16 +110,38 @@ service.interceptors.response.use(
return Promise.reject(msg)
} else if (code === 401) {
// 如果未认证，并且未进行刷新令牌，说明可能是访问令牌过期了
- return handleAuthorized()
- // if (!isRefreshToken) {
- // isRefreshToken = true
- // // 1. 如果获取不到刷新令牌，则只能执行登出操作
- // if (!getRefreshToken()) {
- // return handleAuthorized()
- // }
- // // 2. 进行刷新访问令牌
- // // TODO: 引入refreshToken会循环依赖报错
- // }
+ if (!isRefreshToken) {
+ isRefreshToken = true
+ // 1. 如果获取不到刷新令牌，则只能执行登出操作
+ if (!getRefreshToken()) {
+ return handleAuthorized()
+ }
+ // 2. 进行刷新访问令牌
+ try {
+ const refreshTokenRes = await refreshToken()
+ // 2.1 刷新成功，则回放队列的请求 + 当前请求
+ setToken(refreshTokenRes.data)
+ requestList.forEach((cb: any) => cb())
+ return service(response.config)
+ } catch (e) {
+ // 为什么需要 catch 异常呢？刷新失败时，请求因为 Promise.reject 触发异常。
+ // 2.2 刷新失败，只回放队列的请求
+ requestList.forEach((cb: any) => cb())
+ // 提示是否要登出。即不回放当前请求！不然会形成递归
+ return handleAuthorized()
+ } finally {
+ requestList = []
+ isRefreshToken = false
+ }
+ } else {
+ // 添加到队列，等待刷新获取到新的令牌
+ return new Promise((resolve) => {
+ requestList.push(() => {
+ ;(config as Recordable).headers.Authorization = 'Bearer ' + getAccessToken() // 让每个请求携带自定义token 请根据实际情况自行修改
+ resolve(service(response.config))
+ })
+ })
+ }
} else if (code === 500) {
ElMessage.error(t('sys.api.errMsg500'))
return Promise.reject(new Error(msg))
@@ -165,12 +185,33 @@ service.interceptors.response.use(
return Promise.reject(error)
}
)
+
+const refreshToken = async () => {
+ return await service({
+ url: '/system/auth/refresh-token?refreshToken=' + getRefreshToken(),
+ method: 'post'
+ })
+}
const handleAuthorized = () => {
const { t } = useI18n()
if (!isRelogin.show) {
- removeToken()
isRelogin.show = true
- ElNotification.error(t('sys.api.timeoutMessage'))
+ ElMessageBox.confirm(t('sys.api.timeoutMessage'), t('common.confirmTitle'), {
+ confirmButtonText: t('login.relogin'),
+ cancelButtonText: t('common.cancel'),
+ type: 'warning'
+ })
+ .then(() => {
+ const { wsCache } = useCache()
+ resetRouter() // 重置静态路由表
+ wsCache.clear()
+ removeToken()
+ isRelogin.show = false
+ window.location.href = '/'
+ })
+ .catch(() => {
+ isRelogin.show = false
+ })
}
return Promise.reject(t('sys.api.timeoutMessage'))
}
diff --git a/yudao-ui-admin-vue3/src/hooks/web/useCrudSchemas.ts b/yudao-ui-admin-vue3/src/hooks/web/useCrudSchemas.ts
index e26d2dbac..b75c7db88 100644
--- a/yudao-ui-admin-vue3/src/hooks/web/useCrudSchemas.ts
+++ b/yudao-ui-admin-vue3/src/hooks/web/useCrudSchemas.ts
@@ -80,6 +80,8 @@ const filterSearchSchema = (crudSchema: CrudSchema[]): FormSchema[] => {
const options: ComponentOptions[] = []
let comonentProps = {}
if (schemaItem.dictType) {
+ const allOptions: ComponentOptions = { label: '全部', value: '' }
+ options.push(allOptions)
getIntDictOptions(schemaItem.dictType).forEach((dict) => {
options.push(dict)
})
diff --git a/yudao-ui-admin-vue3/src/locales/en.ts b/yudao-ui-admin-vue3/src/locales/en.ts
index b31226dad..a7463a4f3 100644
--- a/yudao-ui-admin-vue3/src/locales/en.ts
+++ b/yudao-ui-admin-vue3/src/locales/en.ts
@@ -128,6 +128,13 @@ export default {
btnRegister: 'Sign up',
SmsSendMsg: 'code has been sent'
},
+ captcha: {
+ verification: 'Please complete security verification',
+ slide: 'Swipe right to complete verification',
+ point: 'Please click',
+ success: 'Verification succeeded',
+ fail: 'verification failed'
+ },
router: {
login: 'Login',
home: 'Home',
@@ -191,7 +198,6 @@ export default {
yield: 'Yield',
dynamic: 'Dynamic',
push: 'push',
- pushCode: 'push code to Github',
follow: 'Follow'
},
form: {
diff --git a/yudao-ui-admin-vue3/src/locales/zh-CN.ts b/yudao-ui-admin-vue3/src/locales/zh-CN.ts
index 9659babc3..57a684c00 100644
--- a/yudao-ui-admin-vue3/src/locales/zh-CN.ts
+++ b/yudao-ui-admin-vue3/src/locales/zh-CN.ts
@@ -128,6 +128,13 @@ export default {
btnRegister: '注册',
SmsSendMsg: '验证码已发送'
},
+ captcha: {
+ verification: '请完成安全验证',
+ slide: '向右滑动完成验证',
+ point: '请依次点击',
+ success: '验证成功',
+ fail: '验证失败'
+ },
router: {
login: '登录',
home: '首页',
@@ -191,7 +198,6 @@ export default {
yield: '产量',
dynamic: '动态',
push: '推送',
- pushCode: '推送 代码到 Github',
follow: '关注'
},
form: {
diff --git a/yudao-ui-admin-vue3/src/router/index.ts b/yudao-ui-admin-vue3/src/router/index.ts
index 812ec4f7a..6cdec5ee1 100644
--- a/yudao-ui-admin-vue3/src/router/index.ts
+++ b/yudao-ui-admin-vue3/src/router/index.ts
@@ -2,20 +2,16 @@ import type { App } from 'vue'
import { getAccessToken } from '@/utils/auth'
import type { RouteRecordRaw } from 'vue-router'
import remainingRouter from './modules/remaining'
-import { useCache } from '@/hooks/web/useCache'
import { useTitle } from '@/hooks/web/useTitle'
import { useNProgress } from '@/hooks/web/useNProgress'
import { usePageLoading } from '@/hooks/web/usePageLoading'
import { createRouter, createWebHashHistory } from 'vue-router'
import { usePermissionStoreWithOut } from '@/store/modules/permission'
import { useDictStoreWithOut } from '@/store/modules/dict'
+import { useUserStoreWithOut } from '@/store/modules/user'
import { listSimpleDictDataApi } from '@/api/system/dict/dict.data'
-
-const permissionStore = usePermissionStoreWithOut()
-
-const dictStore = useDictStoreWithOut()
-
-const { wsCache } = useCache()
+import { isRelogin } from '@/config/axios'
+import { getInfoApi } from '@/api/login'
const { start, done } = useNProgress()
@@ -23,7 +19,7 @@ const { loadStart, loadDone } = usePageLoading()
// 创建路由实例
const router = createRouter({
- history: createWebHashHistory(),
+ history: createWebHashHistory(), // createWebHashHistory URL带#，createWebHistory URL不带#
strict: true,
routes: remainingRouter as RouteRecordRaw[],
scrollBehavior: () => ({ left: 0, top: 0 })
@@ -47,37 +43,37 @@ router.beforeEach(async (to, from, next) => {
if (to.path === '/login') {
next({ path: '/' })
} else {
- if (!dictStore.getIsSetDict) {
- // 获取所有字典
+ // 获取所有字典
+ const dictStore = useDictStoreWithOut()
+ const userStore = useUserStoreWithOut()
+ const permissionStore = usePermissionStoreWithOut()
+ if (!dictStore.getHasDictData) {
const res = await listSimpleDictDataApi()
- if (res) {
- dictStore.setDictMap(res)
- dictStore.setIsSetDict(true)
- }
+ dictStore.setDictMap(res)
}
- if (permissionStore.getIsAddRouters) {
+ if (userStore.getRoles.length === 0) {
+ isRelogin.show = true
+ const res = await getInfoApi()
+ await userStore.setUserInfoAction(res)
+ isRelogin.show = false
+ // 后端过滤菜单
+ await permissionStore.generateRoutes()
+ permissionStore.getAddRouters.forEach((route) => {
+ router.addRoute(route as unknown as RouteRecordRaw) // 动态添加可访问路由表
+ })
+ const redirectPath = from.query.redirect || to.path
+ const redirect = decodeURIComponent(redirectPath as string)
+ const nextData = to.path === redirect ? { ...to, replace: true } : { path: redirect }
+ next(nextData)
+ } else {
next()
- return
}
- // 开发者可根据实际情况进行修改
- const roleRouters = wsCache.get('roleRouters') || []
-
- await permissionStore.generateRoutes(roleRouters as AppCustomRouteRecordRaw[])
-
- permissionStore.getAddRouters.forEach((route) => {
- router.addRoute(route as unknown as RouteRecordRaw) // 动态添加可访问路由表
- })
- const redirectPath = from.query.redirect || to.path
- const redirect = decodeURIComponent(redirectPath as string)
- const nextData = to.path === redirect ? { ...to, replace: true } : { path: redirect }
- permissionStore.setIsAddRouters(true)
- next(nextData)
}
} else {
if (whiteList.indexOf(to.path) !== -1) {
next()
} else {
- next(`/login?redirect=${to.path}`) // 否则全部重定向到登录页
+ next(`/login?redirect=${to.fullPath}`) // 否则全部重定向到登录页
}
}
})
diff --git a/yudao-ui-admin-vue3/src/store/modules/dict.ts b/yudao-ui-admin-vue3/src/store/modules/dict.ts
index 11ee352c1..7cd1d725b 100644
--- a/yudao-ui-admin-vue3/src/store/modules/dict.ts
+++ b/yudao-ui-admin-vue3/src/store/modules/dict.ts
@@ -13,14 +13,12 @@ export interface DictTypeType {
dictValue: DictValueType[]
}
export interface DictState {
- isSetDict: boolean
dictMap: Recordable
}
export const useDictStore = defineStore({
id: 'dict',
state: (): DictState => ({
- isSetDict: false,
dictMap: {}
}),
persist: {
@@ -30,8 +28,12 @@ export const useDictStore = defineStore({
getDictMap(): Recordable {
return this.dictMap
},
- getIsSetDict(): boolean {
- return this.isSetDict
+ getHasDictData(): boolean {
+ if (this.dictMap.length > 0) {
+ return true
+ } else {
+ return false
+ }
}
},
actions: {
@@ -53,9 +55,6 @@ export const useDictStore = defineStore({
})
})
this.dictMap = dictMap
- },
- setIsSetDict(isSetDict: boolean) {
- this.isSetDict = isSetDict
}
}
})
diff --git a/yudao-ui-admin-vue3/src/store/modules/permission.ts b/yudao-ui-admin-vue3/src/store/modules/permission.ts
index dfce2949c..cb76ef6f5 100644
--- a/yudao-ui-admin-vue3/src/store/modules/permission.ts
+++ b/yudao-ui-admin-vue3/src/store/modules/permission.ts
@@ -2,12 +2,15 @@ import { defineStore } from 'pinia'
import { store } from '../index'
import { cloneDeep } from 'lodash-es'
import remainingRouter from '@/router/modules/remaining'
-import { generateRoutes, flatMultiLevelRoutes } from '@/utils/routerHelper'
+import { generateRoute, flatMultiLevelRoutes } from '@/utils/routerHelper'
+import { getAsyncRoutesApi } from '@/api/login'
+import { useCache } from '@/hooks/web/useCache'
+
+const { wsCache } = useCache()
export interface PermissionState {
routers: AppRouteRecordRaw[]
addRouters: AppRouteRecordRaw[]
- isAddRouters: boolean
menuTabRouters: AppRouteRecordRaw[]
}
@@ -16,7 +19,6 @@ export const usePermissionStore = defineStore({
state: (): PermissionState => ({
routers: [],
addRouters: [],
- isAddRouters: false,
menuTabRouters: []
}),
persist: {
@@ -29,18 +31,21 @@ export const usePermissionStore = defineStore({
getAddRouters(): AppRouteRecordRaw[] {
return flatMultiLevelRoutes(cloneDeep(this.addRouters))
},
- getIsAddRouters(): boolean {
- return this.isAddRouters
- },
getMenuTabRouters(): AppRouteRecordRaw[] {
return this.menuTabRouters
}
},
actions: {
- generateRoutes(routers?: AppCustomRouteRecordRaw[] | string[]): Promise
+
+
+
+ ![]()
+
+
+ {{ tipWords }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ![]()
+
+
- ![]()
-
-
- ![]( "点击上传头像")
+ ![]( "点击上传头像")
{{ item.code }}
diff --git a/yudao-ui-admin-vue3/src/views/infra/fileList/index.vue b/yudao-ui-admin-vue3/src/views/infra/fileList/index.vue
index 855efb667..8a207c2e5 100644
--- a/yudao-ui-admin-vue3/src/views/infra/fileList/index.vue
+++ b/yudao-ui-admin-vue3/src/views/infra/fileList/index.vue
@@ -1,5 +1,5 @@
@@ -117,6 +130,9 @@ getList()
{{ dayjs(row.createTime).format('YYYY-MM-DD HH:mm:ss') }}
+
+
+
+
+
diff --git a/yudao-ui-admin/src/components/Verifition/Verify/VerifyPoints.vue b/yudao-ui-admin/src/components/Verifition/Verify/VerifyPoints.vue
new file mode 100644
index 000000000..aa8c16f9d
--- /dev/null
+++ b/yudao-ui-admin/src/components/Verifition/Verify/VerifyPoints.vue
@@ -0,0 +1,266 @@
+
+
+
+
+ 请完成安全验证
+
+
+
+
+
+
+
+
+
+
+
diff --git a/yudao-ui-admin/src/components/Verifition/Verify/VerifySlide.vue b/yudao-ui-admin/src/components/Verifition/Verify/VerifySlide.vue
new file mode 100644
index 000000000..b75db24ce
--- /dev/null
+++ b/yudao-ui-admin/src/components/Verifition/Verify/VerifySlide.vue
@@ -0,0 +1,377 @@
+
+
+
+
+
+
+ ![]()
+
+
+
+
+
+
+ {{ index + 1 }}
+
+
+
+
+
+
diff --git a/yudao-ui-admin/src/components/Verifition/api/index.js b/yudao-ui-admin/src/components/Verifition/api/index.js
new file mode 100644
index 000000000..7b650f8a4
--- /dev/null
+++ b/yudao-ui-admin/src/components/Verifition/api/index.js
@@ -0,0 +1,25 @@
+/**
+ * 此处可直接引用自己项目封装好的 axios 配合后端联调
+ */
+
+import request from './../utils/axios' // 组件内部封装的axios
+// import request from "@/api/axios.js" //调用项目封装的axios
+
+// 获取验证图片 以及token
+export function reqGet(data) {
+ return request({
+ url: '/captcha/get',
+ method: 'post',
+ data
+ })
+}
+
+// 滑动或者点选验证
+export function reqCheck(data) {
+ return request({
+ url: '/captcha/check',
+ method: 'post',
+ data
+ })
+}
+
diff --git a/yudao-ui-admin/src/components/Verifition/utils/axios.js b/yudao-ui-admin/src/components/Verifition/utils/axios.js
new file mode 100644
index 000000000..40ba2de78
--- /dev/null
+++ b/yudao-ui-admin/src/components/Verifition/utils/axios.js
@@ -0,0 +1,30 @@
+import axios from 'axios'
+
+axios.defaults.baseURL = process.env.VUE_APP_BASE_API
+
+const service = axios.create({
+ timeout: 40000,
+ headers: {
+ 'X-Requested-With': 'XMLHttpRequest',
+ 'Content-Type': 'application/json; charset=UTF-8'
+ },
+})
+service.interceptors.request.use(
+ config => {
+ return config
+ },
+ error => {
+ Promise.reject(error)
+ }
+)
+
+// response interceptor
+service.interceptors.response.use(
+ response => {
+ const res = response.data
+ return res
+ },
+ error => {
+ }
+)
+export default service
diff --git a/yudao-ui-admin/src/components/Verifition/utils/util.js b/yudao-ui-admin/src/components/Verifition/utils/util.js
new file mode 100644
index 000000000..bc0e3d997
--- /dev/null
+++ b/yudao-ui-admin/src/components/Verifition/utils/util.js
@@ -0,0 +1,36 @@
+export function resetSize(vm) {
+ let img_width, img_height, bar_width, bar_height // 图片的宽度、高度，移动条的宽度、高度
+
+ let parentWidth = vm.$el.parentNode.offsetWidth || window.offsetWidth
+ let parentHeight = vm.$el.parentNode.offsetHeight || window.offsetHeight
+
+ if (vm.imgSize.width.indexOf('%') !== -1) {
+ img_width = parseInt(this.imgSize.width) / 100 * parentWidth + 'px'
+ } else {
+ img_width = this.imgSize.width
+ }
+
+ if (vm.imgSize.height.indexOf('%') !== -1) {
+ img_height = parseInt(this.imgSize.height) / 100 * parentHeight + 'px'
+ } else {
+ img_height = this.imgSize.height
+ }
+
+ if (vm.barSize.width.indexOf('%') !== -1) {
+ bar_width = parseInt(this.barSize.width) / 100 * parentWidth + 'px'
+ } else {
+ bar_width = this.barSize.width
+ }
+
+ if (vm.barSize.height.indexOf('%') !== -1) {
+ bar_height = parseInt(this.barSize.height) / 100 * parentHeight + 'px'
+ } else {
+ bar_height = this.barSize.height
+ }
+
+ return { imgWidth: img_width, imgHeight: img_height, barWidth: bar_width, barHeight: bar_height }
+}
+
+export const _code_chars = [1, 2, 3, 4, 5, 6, 7, 8, 9, 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z']
+export const _code_color1 = ['#fffff0', '#f0ffff', '#f0fff0', '#fff0f0']
+export const _code_color2 = ['#FF0033', '#006699', '#993366', '#FF9900', '#66CC66', '#FF33CC']
diff --git a/yudao-ui-admin/src/store/modules/user.js b/yudao-ui-admin/src/store/modules/user.js
index aed5535bf..7981df71c 100644
--- a/yudao-ui-admin/src/store/modules/user.js
+++ b/yudao-ui-admin/src/store/modules/user.js
@@ -36,14 +36,12 @@ const user = {
Login({ commit }, userInfo) {
const username = userInfo.username.trim()
const password = userInfo.password
- const code = userInfo.code
- const uuid = userInfo.uuid
+ const captchaVerification = userInfo.captchaVerification
const socialCode = userInfo.socialCode
const socialState = userInfo.socialState
const socialType = userInfo.socialType
return new Promise((resolve, reject) => {
- login(username, password, code, uuid,
- socialType, socialCode, socialState).then(res => {
+ login(username, password, captchaVerification, socialType, socialCode, socialState).then(res => {
res = res.data;
// 设置 token
setToken(res)
diff --git a/yudao-ui-admin/src/utils/ase.js b/yudao-ui-admin/src/utils/ase.js
new file mode 100644
index 000000000..abcf15fff
--- /dev/null
+++ b/yudao-ui-admin/src/utils/ase.js
@@ -0,0 +1,21 @@
+import CryptoJS from 'crypto-js'
+/**
+ * @word 要加密的内容
+ * @keyWord String 服务器随机返回的关键字
+ */
+export function aesEncrypt(word, keyWord = 'XwKsGlMcdPMEhR1B') {
+ const key = CryptoJS.enc.Utf8.parse(keyWord)
+ const secs = CryptoJS.enc.Utf8.parse(word)
+ const encrypted = CryptoJS.AES.encrypt(secs, key, { mode: CryptoJS.mode.ECB, padding: CryptoJS.pad.Pkcs7 })
+ return encrypted.toString()
+}
+
+/**
+ * @word 要解密的内容
+ * @keyWord String 服务器随机返回的关键字
+ */
+export function aesDecrypt(word, keyWord = 'XwKsGlMcdPMEhR1B') {
+ const key = CryptoJS.enc.Utf8.parse(keyWord)
+ const decrypt = CryptoJS.AES.decrypt(word, key, { mode: CryptoJS.mode.ECB, padding: CryptoJS.pad.Pkcs7 })
+ return CryptoJS.enc.Utf8.stringify(decrypt).toString()
+}
diff --git a/yudao-ui-admin/src/utils/ruoyi.js b/yudao-ui-admin/src/utils/ruoyi.js
index 7096e1fdc..a05266d67 100644
--- a/yudao-ui-admin/src/utils/ruoyi.js
+++ b/yudao-ui-admin/src/utils/ruoyi.js
@@ -185,6 +185,19 @@ export function getTenantEnable() {
return process.env.VUE_APP_TENANT_ENABLE || true;
}
+/**
+ * 获得验证码功能是否开启
+ */
+export function getCaptchaEnable() {
+ if (process.env.VUE_APP_CAPTCHA_ENABLE === "true") {
+ return true;
+ }
+ if (process.env.VUE_APP_CAPTCHA_ENABLE === "false") {
+ return false;
+ }
+ return process.env.VUE_APP_CAPTCHA_ENABLE || true;
+}
+
/**
* 获得文档是否开启
*/
diff --git a/yudao-ui-admin/src/views/login.vue b/yudao-ui-admin/src/views/login.vue
index 88a7b4abd..1024577b6 100644
--- a/yudao-ui-admin/src/views/login.vue
+++ b/yudao-ui-admin/src/views/login.vue
@@ -36,19 +36,10 @@
+
+
+
+ ![]()
+
+ {{ tipWords }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ![]()
+
+
- ![]()
-
-