Merge branch 'master' of https://gitee.com/izory/ZrAdminNetCore

ZR.Admin.WebApi/Controllers/System/SysUserController.cs

@@ -174,7 +174,7 @@ namespace ZR.Admin.WebApi.Controllers.System
         /// <param name="formFile">使用IFromFile必须使用name属性否则获取不到文件</param>
         /// <returns></returns>
         [HttpPost("importData")]
-        [Log(Title = "用户导入", BusinessType = BusinessType.IMPORT)]
+        [Log(Title = "用户导入", BusinessType = BusinessType.IMPORT, IsSaveRequestData = false, IsSaveResponseData = false)]
         [ActionPermissionFilter(Permission = "system:user:import")]
         public IActionResult ImportData([FromForm(Name = "file")] IFormFile formFile)
         {
@@ -189,7 +189,7 @@ namespace ZR.Admin.WebApi.Controllers.System
         /// </summary>
         /// <returns></returns>
         [HttpGet("importTemplate")]
-        [Log(Title = "用户模板", BusinessType = BusinessType.EXPORT)]
+        [Log(Title = "用户模板", BusinessType = BusinessType.EXPORT, IsSaveRequestData = false, IsSaveResponseData = false)]
         [AllowAnonymous]
         public IActionResult ImportTemplateExcel()
         {

ZR.Vue/src/views/system/user/index.vue

@@ -279,7 +279,7 @@ export default {
         // 设置上传的请求头部
         headers: { Authorization: "Bearer " + getToken() },
         // 上传的地址
-        url: process.env.VUE_APP_BASE_API + "system/user/importData",
+        url: process.env.VUE_APP_BASE_API + "/system/user/importData",
       },
       // 查询参数
       queryParams: {

ZR.Vue/src/views/tool/email/sendEmail.vue

@@ -42,7 +42,7 @@ export default {
           },
         ],
       },
-      uploadActionUrl: process.env.VUE_APP_BASE_API + "common/uploadFile",
+      uploadActionUrl: process.env.VUE_APP_BASE_API + "/common/uploadFile",
       rules: {
         subject: [{ required: true, message: "主题不能为空", trigger: "blur" }],
         content: [{ required: true, message: "内容不能为空", trigger: "blur" }],