diff --git a/package.json b/package.json index 70e8ff3..2df9be8 100644 --- a/package.json +++ b/package.json @@ -40,6 +40,7 @@ "axios": "0.24.0", "clipboard": "2.0.8", "core-js": "3.25.3", + "crypto-js": "4.1.1", "echarts": "5.4.0", "element-ui": "2.15.14", "file-saver": "2.0.5", diff --git a/src/api/login.js b/src/api/login.js index 7b7388f..d414e48 100644 --- a/src/api/login.js +++ b/src/api/login.js @@ -1,12 +1,11 @@ import request from '@/utils/request' // 登录方法 -export function login(username, password, code, uuid) { +export function login(username, password, code) { const data = { username, password, - code, - uuid + code } return request({ url: '/login', @@ -47,14 +46,10 @@ export function logout() { }) } -// 获取验证码 -export function getCodeImg() { +// 获取验证码开关 +export function isCaptchaEnabled() { return request({ - url: '/captchaImage', - headers: { - isToken: false - }, - method: 'get', - timeout: 20000 + url: '/captchaEnabled', + method: 'get' }) -} \ No newline at end of file +} diff --git a/src/assets/images/default.jpg b/src/assets/images/default.jpg new file mode 100644 index 0000000..aa0237b Binary files /dev/null and b/src/assets/images/default.jpg differ diff --git a/src/components/Verifition/Verify.vue b/src/components/Verifition/Verify.vue new file mode 100644 index 0000000..88c3c34 --- /dev/null +++ b/src/components/Verifition/Verify.vue @@ -0,0 +1,501 @@ + + + diff --git a/src/components/Verifition/Verify/VerifyPoints.vue b/src/components/Verifition/Verify/VerifyPoints.vue new file mode 100644 index 0000000..e2c8b5b --- /dev/null +++ b/src/components/Verifition/Verify/VerifyPoints.vue @@ -0,0 +1,290 @@ + + \ No newline at end of file diff --git a/src/components/Verifition/Verify/VerifySlide.vue b/src/components/Verifition/Verify/VerifySlide.vue new file mode 100644 index 0000000..a5770ad --- /dev/null +++ b/src/components/Verifition/Verify/VerifySlide.vue @@ -0,0 +1,433 @@ + + + diff --git a/src/components/Verifition/api/index.js b/src/components/Verifition/api/index.js new file mode 100644 index 0000000..13c04ce --- /dev/null +++ b/src/components/Verifition/api/index.js @@ -0,0 +1,19 @@ +import request from '@/utils/request' + +//获取验证图片 +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/src/components/Verifition/utils/ase.js b/src/components/Verifition/utils/ase.js new file mode 100644 index 0000000..2bfb114 --- /dev/null +++ b/src/components/Verifition/utils/ase.js @@ -0,0 +1,11 @@ +import CryptoJS from 'crypto-js' +/** + * @word 要加密的内容 + * @keyWord String 服务器随机返回的关键字 + * */ +export function aesEncrypt(word, keyWord = "XwKsGlMcdPMEhR1B") { + var key = CryptoJS.enc.Utf8.parse(keyWord); + var srcs = CryptoJS.enc.Utf8.parse(word); + var encrypted = CryptoJS.AES.encrypt(srcs, key, { mode: CryptoJS.mode.ECB, padding: CryptoJS.pad.Pkcs7 }); + return encrypted.toString(); +} diff --git a/src/components/Verifition/utils/util.js b/src/components/Verifition/utils/util.js new file mode 100644 index 0000000..d38fe94 --- /dev/null +++ b/src/components/Verifition/utils/util.js @@ -0,0 +1,36 @@ +export function resetSize(vm) { + var img_width, img_height, bar_width, bar_height; //图片的宽度、高度，移动条的宽度、高度 + + var parentWidth = vm.$el.parentNode.offsetWidth || window.offsetWidth + var 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'] \ No newline at end of file diff --git a/src/store/modules/user.js b/src/store/modules/user.js index cdbab1e..3d5382b 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -38,9 +38,8 @@ const user = { const username = userInfo.username.trim() const password = userInfo.password const code = userInfo.code - const uuid = userInfo.uuid return new Promise((resolve, reject) => { - login(username, password, code, uuid).then(res => { + login(username, password, code).then(res => { setToken(res.token) commit('SET_TOKEN', res.token) resolve() @@ -50,6 +49,7 @@ const user = { }) }, + // 获取用户信息 GetInfo({ commit, state }) { return new Promise((resolve, reject) => { diff --git a/src/views/login.vue b/src/views/login.vue index 0d35195..49b671e 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -23,20 +23,13 @@ - - - - - - + 记住密码 @@ -192,15 +172,6 @@ export default { text-align: center; color: #bfbfbf; } -.login-code { - width: 33%; - height: 38px; - float: right; - img { - cursor: pointer; - vertical-align: middle; - } -} .el-login-footer { height: 40px; line-height: 40px; @@ -213,7 +184,4 @@ export default { font-size: 12px; letter-spacing: 1px; } -.login-code-img { - height: 38px; -} diff --git a/src/views/register.vue b/src/views/register.vue index f00da7d..501591f 100644 --- a/src/views/register.vue +++ b/src/views/register.vue @@ -39,7 +39,7 @@ - +