From 034267534fe3a2a94f24ffdd21cb40f87dae5d0d Mon Sep 17 00:00:00 2001
From: dhy1725534722 <1725534722@qq.com>
Date: Thu, 14 Dec 2023 14:10:53 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E4=BF=AE=E6=94=B9=E5=8A=A0?=
 =?UTF-8?q?=E5=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                           |  3 +-
 src/api/login.js                           |  2 +
 src/layout/components/Navbar.vue           |  1 +
 src/views/system/user/profile/resetPwd.vue | 55 ++++++++++++++++------
 vue.config.js                              |  2 +
 5 files changed, 47 insertions(+), 16 deletions(-)

diff --git a/.env.development b/.env.development
index 42831e1..105d0c5 100644
--- a/.env.development
+++ b/.env.development
@@ -5,11 +5,12 @@ VUE_APP_TITLE = 数据中台系统
 ENV = 'development'
 
 # 若依管理系统/开发环境
-# VUE_APP_BASE_API = 'http://39.101.188.84:9035'
+VUE_APP_BASE_API = 'http://192.168.0.104:9035'
 # VUE_APP_BASE_API = 'https://vue.ruoyi.vip/prod-api'
 # VUE_APP_BASE_API = 'http://39.101.188.84:9035'
 
 
 
+
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
diff --git a/src/api/login.js b/src/api/login.js
index 649f59c..ad21fc7 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -1,7 +1,9 @@
 import request from '@/utils/request'
+import {encrypt} from '@/utils/jsencrypt'
 
 // 登录方法
 export function login(username, password, code, uuid) {
+  password = encrypt(password);
   const data = {
     username,
     password,
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index f65eb01..5a9b202 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -103,6 +103,7 @@ export default {
       }).then(() => {
         this.$store.dispatch('LogOut').then(() => {
           location.href = '/tczzpc';
+          // location.href = '/demo/tczzpc';
         })
       }).catch(() => {});
     }
diff --git a/src/views/system/user/profile/resetPwd.vue b/src/views/system/user/profile/resetPwd.vue
index 64e8f8c..4e3b3d2 100644
--- a/src/views/system/user/profile/resetPwd.vue
+++ b/src/views/system/user/profile/resetPwd.vue
@@ -1,13 +1,28 @@
 <template>
   <el-form ref="form" :model="user" :rules="rules" label-width="80px">
     <el-form-item label="旧密码" prop="oldPassword">
-      <el-input v-model="user.oldPassword" placeholder="请输入旧密码" type="password" show-password/>
+      <el-input
+        v-model="user.oldPassword"
+        placeholder="请输入旧密码"
+        type="password"
+        show-password
+      />
     </el-form-item>
     <el-form-item label="新密码" prop="newPassword">
-      <el-input v-model="user.newPassword" placeholder="请输入新密码" type="password" show-password/>
+      <el-input
+        v-model="user.newPassword"
+        placeholder="请输入新密码"
+        type="password"
+        show-password
+      />
     </el-form-item>
     <el-form-item label="确认密码" prop="confirmPassword">
-      <el-input v-model="user.confirmPassword" placeholder="请确认新密码" type="password" show-password/>
+      <el-input
+        v-model="user.confirmPassword"
+        placeholder="请确认新密码"
+        type="password"
+        show-password
+      />
     </el-form-item>
     <el-form-item>
       <el-button type="primary" size="mini" @click="submit">保存</el-button>
@@ -18,6 +33,7 @@
 
 <script>
 import { updateUserPwd } from "@/api/system/user";
+import {encrypt} from '@/utils/jsencrypt'
 
 export default {
   data() {
@@ -32,37 +48,46 @@ export default {
       user: {
         oldPassword: undefined,
         newPassword: undefined,
-        confirmPassword: undefined
+        confirmPassword: undefined,
       },
       // 表单校验
       rules: {
         oldPassword: [
-          { required: true, message: "旧密码不能为空", trigger: "blur" }
+          { required: true, message: "旧密码不能为空", trigger: "blur" },
         ],
         newPassword: [
           { required: true, message: "新密码不能为空", trigger: "blur" },
-          { min: 6, max: 20, message: "长度在 6 到 20 个字符", trigger: "blur" }
+          {
+            min: 6,
+            max: 20,
+            message: "长度在 6 到 20 个字符",
+            trigger: "blur",
+          },
         ],
         confirmPassword: [
           { required: true, message: "确认密码不能为空", trigger: "blur" },
-          { required: true, validator: equalToPassword, trigger: "blur" }
-        ]
-      }
+          { required: true, validator: equalToPassword, trigger: "blur" },
+        ],
+      },
     };
   },
   methods: {
     submit() {
-      this.$refs["form"].validate(valid => {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
-          updateUserPwd(this.user.oldPassword, this.user.newPassword).then(response => {
-            this.$modal.msgSuccess("修改成功");
-          });
+          const oldPassword = encrypt(this.user.oldPassword);
+          const newPassword = encrypt(this.user.newPassword);
+          updateUserPwd(oldPassword, newPassword).then(
+            (response) => {
+              this.$modal.msgSuccess("修改成功");
+            }
+          );
         }
       });
     },
     close() {
       this.$tab.closePage();
-    }
-  }
+    },
+  },
 };
 </script>
diff --git a/vue.config.js b/vue.config.js
index 6100d4e..2556f09 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -25,6 +25,8 @@ module.exports = {
   // 默认情况下，Vue CLI 会假设你的应用是被部署在一个域名的根路径上
   // 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.ruoyi.vip/admin/，则设置 baseUrl 为 /admin/。
   publicPath: process.env.NODE_ENV === "production" ? "/tczzpc/" : "/",
+  // publicPath: process.env.NODE_ENV === "production" ? "/demo/tczzpc/" : "/",
+
   // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist）
   outputDir: "dist",
   // 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下）