wenyongda/ZrAdminNetCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
不做码农 2022-04-14 09:32:22 +08:00
commit c5e6cfd771
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ZR.Admin.WebApi/Controllers/System/SysUserController.cs
View File

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

2
ZR.Vue/src/views/system/user/index.vue
View File

@ -279,7 +279,7 @@ export default {
// 设置上传的请求头部 // 设置上传的请求头部
headers: { Authorization: "Bearer " + getToken() }, 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: { queryParams: {

2
ZR.Vue/src/views/tool/email/sendEmail.vue
View File

@ -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: { rules: {
subject: [{ required: true, message: "主题不能为空", trigger: "blur" }], subject: [{ required: true, message: "主题不能为空", trigger: "blur" }],
content: [{ required: true, message: "内容不能为空", trigger: "blur" }], content: [{ required: true, message: "内容不能为空", trigger: "blur" }],