Skip to content

Chatopera OpenSource / ferry_web

Go to a project
Commit cb39f04d by lyl_task Committed by GitHub
Options

Merge pull request #5 from lanyulei/dev 

ldap登陆校验。
parents beea0349 7f77654c
Inline Side-by-side
Showing with 27 additions and 10 deletions
src/api/system/sysuser.js
...@@ -103,10 +103,11 @@ export function updateUserProfile(data) { ...@@ -103,10 +103,11 @@ export function updateUserProfile(data) {
} }
// 用户密码重置 // 用户密码重置
export function updateUserPwd(oldPassword, newPassword) { export function updateUserPwd(oldPassword, newPassword, passwordType) {
const data = { const data = {
oldPassword, oldPassword,
newPassword newPassword,
passwordType
} }
return request({ return request({
url: '/api/v1/user/pwd', url: '/api/v1/user/pwd',
......
src/api/user.js
...@@ -2,7 +2,7 @@ import request from '@/utils/request' ...@@ -2,7 +2,7 @@ import request from '@/utils/request'
export function login(data) { export function login(data) {
return request({ return request({
url: '/login', url: `/login`,
method: 'post', method: 'post',
data data
}) })
......
src/views/login/index.vue
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
</span> </span>
</el-form-item> </el-form-item>
</el-tooltip> </el-tooltip>
<el-form-item prop="code" style="width: 66%;float: left;"> <el-form-item prop="code" style="width: 66%;float: left; margin-bottom: 13px">
<span class="svg-container"> <span class="svg-container">
<svg-icon icon-class="validCode" /> <svg-icon icon-class="validCode" />
</span> </span>
...@@ -88,7 +88,9 @@ ...@@ -88,7 +88,9 @@
<div class="login-code" style="cursor:pointer; width: 30%;height: 48px;float: right;background-color: #f0f1f5;"> <div class="login-code" style="cursor:pointer; width: 30%;height: 48px;float: right;background-color: #f0f1f5;">
<img style="height: 48px;width: 100%;border: 1px solid rgba(0,0,0, 0.1);border-radius:5px;" :src="codeUrl" @click="getCode"> <img style="height: 48px;width: 100%;border: 1px solid rgba(0,0,0, 0.1);border-radius:5px;" :src="codeUrl" @click="getCode">
</div> </div>
<div prop="code" style="width: 100%;float: left;margin-bottom: 13px">
<el-checkbox v-model="loginTypeStatus">LDAP登陆</el-checkbox>
</div>
<el-button :loading="loading" type="primary" style="width:100%;padding:12px 20px;margin-bottom:30px;" @click.native.prevent="handleLogin"> <el-button :loading="loading" type="primary" style="width:100%;padding:12px 20px;margin-bottom:30px;" @click.native.prevent="handleLogin">
<span v-if="!loading">登 录</span> <span v-if="!loading">登 录</span>
<span v-else>登 录 中...</span> <span v-else>登 录 中...</span>
...@@ -120,6 +122,7 @@ export default { ...@@ -120,6 +122,7 @@ export default {
components: { SocialSign }, components: { SocialSign },
data() { data() {
return { return {
loginTypeStatus: true,
codeUrl: '', codeUrl: '',
cookiePassword: '', cookiePassword: '',
loginForm: { loginForm: {
...@@ -127,7 +130,8 @@ export default { ...@@ -127,7 +130,8 @@ export default {
password: '123456', password: '123456',
rememberMe: false, rememberMe: false,
code: '', code: '',
uuid: '' uuid: '',
loginType: 1
}, },
loginRules: { loginRules: {
username: [ username: [
...@@ -218,6 +222,10 @@ export default { ...@@ -218,6 +222,10 @@ export default {
handleLogin() { handleLogin() {
this.$refs.loginForm.validate(valid => { this.$refs.loginForm.validate(valid => {
if (valid) { if (valid) {
if (!this.loginTypeStatus) {
this.loginForm.loginType = 0
}
this.loading = true this.loading = true
this.$store.dispatch('user/login', this.loginForm) this.$store.dispatch('user/login', this.loginForm)
.then(() => { .then(() => {
......
src/views/profile/resetPwd.vue
...@@ -6,9 +6,12 @@ ...@@ -6,9 +6,12 @@
<el-form-item label="新密码" prop="newPassword"> <el-form-item label="新密码" prop="newPassword">
<el-input v-model="user.newPassword" placeholder="请输入新密码" type="password" /> <el-input v-model="user.newPassword" placeholder="请输入新密码" type="password" />
</el-form-item> </el-form-item>
<el-form-item label="确认密码" prop="confirmPassword"> <el-form-item label="确认密码" prop="confirmPassword" style="/* margin-bottom: 10px */">
<el-input v-model="user.confirmPassword" placeholder="请确认密码" type="password" /> <el-input v-model="user.confirmPassword" placeholder="请确认密码" type="password" />
</el-form-item> </el-form-item>
<!-- <el-form-item style="margin-bottom: 5px">
<el-checkbox v-model="passwordTyleStatus">LDAP密码</el-checkbox>
</el-form-item> -->
<el-form-item> <el-form-item>
<el-button type="primary" size="mini" @click="submit">保存</el-button> <el-button type="primary" size="mini" @click="submit">保存</el-button>
<el-button type="danger" size="mini" @click="close">关闭</el-button> <el-button type="danger" size="mini" @click="close">关闭</el-button>
...@@ -29,11 +32,12 @@ export default { ...@@ -29,11 +32,12 @@ export default {
} }
} }
return { return {
test: '1test', passwordTyleStatus: true,
user: { user: {
oldPassword: undefined, oldPassword: undefined,
newPassword: undefined, newPassword: undefined,
confirmPassword: undefined confirmPassword: undefined,
passwordType: 1
}, },
// 表单校验 // 表单校验
rules: { rules: {
...@@ -55,7 +59,11 @@ export default { ...@@ -55,7 +59,11 @@ export default {
submit() { submit() {
this.$refs['form'].validate(valid => { this.$refs['form'].validate(valid => {
if (valid) { if (valid) {
updateUserPwd(this.user.oldPassword, this.user.newPassword).then( if (!this.passwordTyleStatus) {
this.user.passwordType = 0
}
this.user.passwordType = 0
updateUserPwd(this.user.oldPassword, this.user.newPassword, this.user.passwordType).then(
response => { response => {
if (response.code === 200) { if (response.code === 200) {
this.msgSuccess('修改成功') this.msgSuccess('修改成功')
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment