-
-
-
+
+
+
-
+
+
{{site.meta.title}}
-
+
@@ -266,15 +267,16 @@ export default {
/* update_begin author:zhaoxin date:20191129 for: 让搜索框颜色能随主题颜色变换*/
/* update-begin author:sunjianlei date:20191220 for: 解决全局样式冲突问题 */
.user-wrapper .search-input {
- width: 180px;
+ width: 210px;
color: inherit;
/deep/ .ant-select-selection {
- background-color: inherit;
+ background-color: #F7F8FA !important;
border: 0;
border-bottom: 1px solid white;
+ color: #86909C ;
&__placeholder, &__field__placeholder {
- color: inherit;
+ color: #86909C ;
}
}
}
diff --git a/jero-web/src/components/tools/UserPassword.vue b/jero-web/src/components/tools/UserPassword.vue
index 0976dde5..4c5105b5 100644
--- a/jero-web/src/components/tools/UserPassword.vue
+++ b/jero-web/src/components/tools/UserPassword.vue
@@ -50,11 +50,13 @@
import { postAction } from '@/api/manage'
import { mapActions } from 'vuex'
-
+import { JSEncrypt } from 'jsencrypt'
+import { getRSAPublicKey } from '@/utils/encryption.js'
export default {
name: 'UserPassword',
data () {
return {
+ rsaPublicKey: '',
passwordType1: 'password',
passwordType2: 'password',
passwordType3: 'password',
@@ -118,30 +120,48 @@ export default {
this.disableSubmit = false
this.selectedRole = []
},
+ // 获取RSA公钥
+ getPublicKey () {
+ // 获取公钥
+ getRSAPublicKey().then(res => {
+ this.rsaPublicKey = res.result
+ })
+ },
handleOk () {
const that = this
// 触发表单验证
- this.form.validateFields((err, values) => {
- if (!err) {
- that.confirmLoading = true
- const params = Object.assign({ username: this.username }, values)
- console.log('修改密码提交数据', params)
- postAction(this.url, params).then((res) => {
- if (res.success) {
- console.log(res)
- that.$message.success(res.message)
- that.close()
- that.Logout().then(()=>{
- window.location.replace('/user/login')
- })
- } else {
- that.$message.warning(res.message)
- }
- }).finally(() => {
- that.confirmLoading = false
- })
- }
+ getRSAPublicKey().then(res => {
+ this.rsaPublicKey = res.result
+ this.form.validateFields((err, values) => {
+ if (!err) {
+ that.confirmLoading = true
+ const params = Object.assign({ username: this.username, rsaPublicKey:this.rsaPublicKey}, values)
+ console.log('修改密码提交数据', params)
+ const encrypt = new JSEncrypt()
+ encrypt.setPublicKey(this.rsaPublicKey)
+ // 公钥加密
+ params.confirmpassword = encrypt.encrypt(values.confirmpassword)
+ params.password = encrypt.encrypt(values.password)
+ params.oldpassword = encrypt.encrypt(values.oldpassword)
+
+ postAction(this.url, params).then((res) => {
+ if (res.success) {
+ console.log(res)
+ that.$message.success(res.message)
+ that.close()
+ that.Logout().then(()=>{
+ window.location.replace('/user/login')
+ })
+ } else {
+ that.$message.warning(res.message)
+ }
+ }).finally(() => {
+ that.confirmLoading = false
+ })
+ }
+ })
})
+
},
validateToNextPassword (rule, value, callback) {
const form = this.form
