合并冲突
xiyunfei 编写于 2021-08-15 10:21:33
NewLife.Cube
#if __CORE__
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Filters;
using NewLife.Cube.ViewModels;
#else
using System.Web;
using System.Web.Mvc;
#endif

namespace NewLife.Cube.Controllers
{
    /// <summary>主页面</summary>
    //[AllowAnonymous]
    public class CubeHomeController : ControllerBaseX
    {
        /// <summary>主页面</summary>
        /// <returns></returns>
        public ActionResult Index()
        {
            ViewBag.Message = "主页面";

            return View();
        }

#if __CORE__
        /// <summary>错误</summary>
        /// <returns></returns>
        [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)]
        public IActionResult Error()
        {
            var model = HttpContext.Items["Exception"] as ErrorModel;
            if (IsJsonRequest)
            {
                if (model?.Exception != null) return Json(500, null, model.Exception);
            }

            return View("Error", model);
        }
#endif
    }
}