优化数据返回

ZR.Admin.WebApi/Controllers/BaseController.cs

@@ -18,18 +18,18 @@ namespace ZR.Admin.WebApi.Controllers
         public static string TIME_FORMAT_FULL = "yyyy-MM-dd HH:mm:ss";
         public static string TIME_FORMAT_FULL_2 = "MM-dd HH:mm:ss";
 
+        /// <summary>
+        /// 返回成功封装
+        /// </summary>
+        /// <param name="data"></param>
+        /// <param name="timeFormatStr"></param>
+        /// <returns></returns>
         protected IActionResult SUCCESS(object data, string timeFormatStr = "yyyy-MM-dd HH:mm:ss")
         {
             string jsonStr = GetJsonStr(GetApiResult(data != null ? ResultCode.SUCCESS : ResultCode.FAIL, data), timeFormatStr);
             return Content(jsonStr, "application/json");
         }
 
-        protected IActionResult ToResponse(ResultCode resultCode, object data = null)
-        {
-            string jsonStr = GetJsonStr(GetApiResult(resultCode, data), "");
-            return Content(jsonStr, "application/json");
-        }
-
         /// <summary>
         /// json输出带时间格式的
         /// </summary>
@@ -42,6 +42,7 @@ namespace ZR.Admin.WebApi.Controllers
 
             return Content(jsonStr, "application/json");
         }
+
         protected IActionResult ToResponse(long rows, string timeFormatStr = "yyyy-MM-dd HH:mm:ss")
         {
             string jsonStr = GetJsonStr(ToJson(rows), timeFormatStr);
@@ -49,6 +50,13 @@ namespace ZR.Admin.WebApi.Controllers
             return Content(jsonStr, "application/json");
         }
 
+        protected IActionResult ToResponse(ResultCode resultCode, string msg = "")
+        {
+            return ToResponse(GetApiResult(resultCode, msg));
+        }
+
+        #region 方法
+
         /// <summary>
         /// 响应返回结果
         /// </summary>
@@ -96,11 +104,7 @@ namespace ZR.Admin.WebApi.Controllers
 
             return JsonConvert.SerializeObject(apiResult, Formatting.Indented, serializerSettings);
         }
-
+        #endregion
-        protected IActionResult CustomError(ResultCode resultCode, string msg = "")
-        {
-            return ToResponse(GetApiResult(resultCode, msg));
-        }
 
         /// <summary>
         /// 导出Excel

ZR.Admin.WebApi/Controllers/CommonController.cs

@@ -140,7 +140,7 @@ namespace ZR.Admin.WebApi.Controllers
                 FileType = formFile.ContentType
             };
             long fileId = SysFileService.InsertFile(file);
-            return ToResponse(ResultCode.SUCCESS, new
+            return SUCCESS(new
             {
                 url = uploadType == 1 ? finalFilePath : accessPath,
                 fileName,
@@ -188,7 +188,7 @@ namespace ZR.Admin.WebApi.Controllers
                 Create_time = DateTime.Now,
                 FileType = formFile.ContentType
             });
-            return ToResponse(ResultCode.SUCCESS, new
+            return SUCCESS(new
             {
                 url = result.Item2,
                 fileName = result.Item3,

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

@@ -185,7 +185,7 @@ namespace ZR.Admin.WebApi.Controllers
                 }
             }
 
-            return ToResponse(ResultCode.FAIL);
+            return ToResponse(ResultCode.FAIL, "生成失败");
         }
 
         /// <summary>

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

@@ -74,7 +74,7 @@ namespace ZR.Admin.WebApi.Controllers.System
             SysConfig sysConfig = sysConfigService.GetSysConfigByKey("sys.account.captchaOnOff");
             if (sysConfig?.ConfigValue != "off" && CacheHelper.Get(loginBody.Uuid) is string str && !str.ToLower().Equals(loginBody.Code.ToLower()))
             {
-                return CustomError(ResultCode.CAPTCHA_ERROR, "验证码错误");
+                return ToResponse(ResultCode.CAPTCHA_ERROR, "验证码错误");
             }
 
             var user = sysLoginService.Login(loginBody, AsyncFactory.RecordLogInfo(httpContextAccessor.HttpContext, "0", "login"));

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

@@ -7,7 +7,6 @@ using ZR.Admin.WebApi.Extensions;
 using ZR.Admin.WebApi.Filters;
 using ZR.Model.System.Dto;
 using ZR.Model.System;
-using ZR.Service;
 using ZR.Service.System.IService;
 
 namespace ZR.Admin.WebApi.Controllers.System
@@ -151,11 +150,11 @@ namespace ZR.Admin.WebApi.Controllers.System
         {
             if (sysMenuService.HasChildByMenuId(menuId))
             {
-                return CustomError(ResultCode.CUSTOM_ERROR, "存在子菜单,不允许删除");
+                return ToResponse(ResultCode.CUSTOM_ERROR, "存在子菜单,不允许删除");
             }
             if (sysMenuService.CheckMenuExistRole(menuId))
             {
-                return CustomError(ResultCode.CUSTOM_ERROR, "菜单已分配,不允许删除");
+                return ToResponse(ResultCode.CUSTOM_ERROR, "菜单已分配,不允许删除");
             }
             int result = sysMenuService.DeleteMenuById(menuId);