From 47cb821ccf04b03974cd66182a404f2039d6ef46 Mon Sep 17 00:00:00 2001
From: binbin_pan <max_163email@163.com>
Date: Wed, 5 Jun 2024 10:43:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E8=A7=A3=E5=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sgzb-ui/src/views/resetPassword.vue                | 11 ++++-------
 sgzb-ui/src/views/system/user/index.vue            |  7 ++++---
 sgzb-ui/src/views/system/user/profile/resetPwd.vue |  5 ++++-
 sgzb-ui/vue.config.js                              |  2 +-
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/sgzb-ui/src/views/resetPassword.vue b/sgzb-ui/src/views/resetPassword.vue
index e95fe6bc..33930d30 100644
--- a/sgzb-ui/src/views/resetPassword.vue
+++ b/sgzb-ui/src/views/resetPassword.vue
@@ -26,6 +26,7 @@
 <script>
 import { updateUserPwd } from '@/api/system/user'
 import { validPassword } from '@/utils/validate'
+import { encrypt } from '@/utils/jsencrypt.js'
 
 export default {
   data() {
@@ -93,13 +94,12 @@ export default {
     submit() {
       this.$refs['form'].validate(valid => {
         if (valid) {
-          updateUserPwd(this.user.oldPassword, this.user.newPassword).then(response => {
+          const oldPassword = encrypt(this.user.oldPassword)
+          const newPassword = encrypt(this.user.newPassword)
+          updateUserPwd(oldPassword, newPassword).then(response => {
             this.$modal.msgSuccess('修改成功')
             // 进入首页
             this.$store.dispatch('LogOut').then(() => {
-              // location.href = '/login';
-              // location.href = '/gl/login';
-
               location.href = process.env.NODE_ENV === 'production' ? '/sgzbgl/login' : '/login'
               // location.href = process.env.NODE_ENV === 'production' ? '/gl/login' : '/login'
             })
@@ -109,9 +109,6 @@ export default {
     },
     close() {
       this.$store.dispatch('LogOut').then(() => {
-        // location.href = '/login';
-        // location.href = '/gl/login';
-
         location.href = process.env.NODE_ENV === 'production' ? '/sgzbgl/login' : '/login'
         // location.href = process.env.NODE_ENV === 'production-nw' ? '/gl/login' : '/login'
       })
diff --git a/sgzb-ui/src/views/system/user/index.vue b/sgzb-ui/src/views/system/user/index.vue
index f96ef246..3e27258f 100644
--- a/sgzb-ui/src/views/system/user/index.vue
+++ b/sgzb-ui/src/views/system/user/index.vue
@@ -429,7 +429,7 @@ import { getToken } from '@/utils/auth'
 import Treeselect from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 import { validPassword } from '@/utils/validate'
-import { decrypt } from '@/utils/jsencrypt'
+import { encrypt, decrypt } from '@/utils/jsencrypt'
 
 export default {
   name: 'User',
@@ -723,8 +723,9 @@ export default {
         inputErrorMessage: '用户密码长度必须介于 5 和 20 之间',
       })
         .then(({ value }) => {
-          resetUserPwd(row.userId, value).then(response => {
-            this.$modal.msgSuccess('修改成功，新密码是：' + value)
+          const password = encrypt(value)
+          resetUserPwd(row.userId, password).then(response => {
+            this.$modal.msgSuccess('修改成功')
           })
         })
         .catch(() => {})
diff --git a/sgzb-ui/src/views/system/user/profile/resetPwd.vue b/sgzb-ui/src/views/system/user/profile/resetPwd.vue
index 3dd669ec..962e83ab 100644
--- a/sgzb-ui/src/views/system/user/profile/resetPwd.vue
+++ b/sgzb-ui/src/views/system/user/profile/resetPwd.vue
@@ -19,6 +19,7 @@
 <script>
 import { updateUserPwd } from "@/api/system/user";
 import { validPassword } from '@/utils/validate'
+import { encrypt } from '@/utils/jsencrypt.js'
 
 export default {
   data() {
@@ -66,7 +67,9 @@ export default {
     submit() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          updateUserPwd(this.user.oldPassword, this.user.newPassword).then(response => {
+          const oldPassword = encrypt(this.user.oldPassword)
+          const newPassword = encrypt(this.user.newPassword)
+          updateUserPwd(oldPassword, newPassword).then(response => {
             this.$modal.msgSuccess("修改成功");
           });
         }
diff --git a/sgzb-ui/vue.config.js b/sgzb-ui/vue.config.js
index 0fdf7ea7..309166b1 100644
--- a/sgzb-ui/vue.config.js
+++ b/sgzb-ui/vue.config.js
@@ -46,7 +46,7 @@ module.exports = {
         // target: `http://10.40.92.8:8080`, //超
         // target: `http://10.40.92.81:8080`, //韩/
         // target: `http://10.40.92.74:8080`,//旭/
-        target: `http://10.40.92.136:28080`, //帅
+        target: `http://10.40.92.148:28080`, //帅
         // target: `http://10.40.92.5:28080`, //福
 
         //******** 注意事项  ********* */