From e7d439cfcc92b961f81446b88c240eaadf2956b6 Mon Sep 17 00:00:00 2001
From: ailanyin <ailanyin4j@163.com>
Date: Fri, 19 May 2023 17:43:21 +0800
Subject: [PATCH] 1

---
 src/api/system/user.js                       | 6 +++---
 src/components/FileUpload/index.vue          | 2 +-
 src/components/ImageUpload/index.vue         | 2 +-
 src/plugins/download.js                      | 4 ++--
 src/views/system/menu/index.vue              | 2 +-
 src/views/system/user/profile/userAvatar.vue | 4 ++--
 src/views/system/user/profile/userInfo.vue   | 6 +++---
 7 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/api/system/user.js b/src/api/system/user.js
index 2a4ace2..820e089 100644
--- a/src/api/system/user.js
+++ b/src/api/system/user.js
@@ -94,7 +94,7 @@ export function updateUserPwd(oldPassword, newPassword) {
     newPassword,
   };
   return request({
-    url: "/system/user/profile/updatePwd",
+    url: "/system/user/profile/update-password",
     method: "put",
     params: data,
   });
@@ -103,8 +103,8 @@ export function updateUserPwd(oldPassword, newPassword) {
 // 用户头像上传
 export function uploadAvatar(data) {
   return request({
-    url: "/system/user/profile/avatar",
-    method: "post",
+    url: "/system/user/profile/update-avatar",
+    method: "put",
     data: data,
   });
 }
diff --git a/src/components/FileUpload/index.vue b/src/components/FileUpload/index.vue
index e77672e..ccf2ced 100644
--- a/src/components/FileUpload/index.vue
+++ b/src/components/FileUpload/index.vue
@@ -88,7 +88,7 @@ const emit = defineEmits();
 const number = ref(0);
 const uploadList = ref([]);
 const baseUrl = import.meta.env.VITE_APP_BASE_API;
-const uploadFileUrl = ref(import.meta.env.VITE_APP_BASE_API + "/common/upload"); // 上传文件服务器地址
+const uploadFileUrl = ref(import.meta.env.VITE_APP_BASE_API + "/file/upload"); // 上传文件服务器地址
 const headers = ref({ Authorization: "Bearer " + getToken() });
 const fileList = ref([]);
 const showTip = computed(
diff --git a/src/components/ImageUpload/index.vue b/src/components/ImageUpload/index.vue
index d1976b8..8bb1a83 100644
--- a/src/components/ImageUpload/index.vue
+++ b/src/components/ImageUpload/index.vue
@@ -79,7 +79,7 @@ const uploadList = ref([]);
 const dialogImageUrl = ref("");
 const dialogVisible = ref(false);
 const baseUrl = import.meta.env.VITE_APP_BASE_API;
-const uploadImgUrl = ref(import.meta.env.VITE_APP_BASE_API + "/common/upload"); // 上传的图片服务器地址
+const uploadImgUrl = ref(import.meta.env.VITE_APP_BASE_API + "/file/upload"); // 上传的图片服务器地址
 const headers = ref({ Authorization: "Bearer " + getToken() });
 const fileList = ref([]);
 const showTip = computed(
diff --git a/src/plugins/download.js b/src/plugins/download.js
index 7533814..4604fb5 100644
--- a/src/plugins/download.js
+++ b/src/plugins/download.js
@@ -11,7 +11,7 @@ export default {
   name(name, isDelete = true) {
     var url =
       baseURL +
-      "/common/download?fileName=" +
+      "/file/download?fileName=" +
       encodeURIComponent(name) +
       "&delete=" +
       isDelete;
@@ -33,7 +33,7 @@ export default {
   resource(resource) {
     var url =
       baseURL +
-      "/common/download/resource?resource=" +
+      "/file/download/resource?resource=" +
       encodeURIComponent(resource);
     axios({
       method: "get",
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index 592c693..dad057b 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -478,7 +478,7 @@ function reset() {
     menuType: "M",
     orderNum: undefined,
     isFrame: "0",
-    isCache: "1",
+    isCache: "0",
     isVisible: "1",
     status: "1",
   };
diff --git a/src/views/system/user/profile/userAvatar.vue b/src/views/system/user/profile/userAvatar.vue
index 28a24c2..6e438ed 100644
--- a/src/views/system/user/profile/userAvatar.vue
+++ b/src/views/system/user/profile/userAvatar.vue
@@ -130,12 +130,12 @@ function beforeUpload(file) {
 function uploadImg() {
   proxy.$refs.cropper.getCropBlob((data) => {
     let formData = new FormData();
-    formData.append("avatarfile", data);
+    formData.append("file", data);
     uploadAvatar(formData).then((response) => {
       open.value = false;
       options.img = import.meta.env.VITE_APP_BASE_API + response.imgUrl;
       userStore.avatar = options.img;
-      proxy.$modal.msgSuccess("修改成功");
+      proxy.$modal.msgSuccess("修改成功, 重新登录后生效");
       visible.value = false;
     });
   });
diff --git a/src/views/system/user/profile/userInfo.vue b/src/views/system/user/profile/userInfo.vue
index ec217ee..93f22b7 100644
--- a/src/views/system/user/profile/userInfo.vue
+++ b/src/views/system/user/profile/userInfo.vue
@@ -3,8 +3,8 @@
     <el-form-item label="用户昵称" prop="nickname">
       <el-input v-model="user.nickname" maxlength="30" />
     </el-form-item>
-    <el-form-item label="手机号码" prop="phonenumber">
-      <el-input v-model="user.phonenumber" maxlength="11" />
+    <el-form-item label="手机号码" prop="phone">
+      <el-input v-model="user.phone" maxlength="11" />
     </el-form-item>
     <el-form-item label="邮箱" prop="email">
       <el-input v-model="user.email" maxlength="50" />
@@ -43,7 +43,7 @@ const rules = ref({
       trigger: ["blur", "change"],
     },
   ],
-  phonenumber: [
+  phone: [
     { required: true, message: "手机号码不能为空", trigger: "blur" },
     {
       pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,