测试

Controllers/ApiGroupController.cs

@@ -1,122 +0,0 @@
-using Attribute;
-using Common;
-using Dto;
-using Vo;
-using Enums;
-using Filters;
-using Infrastructure;
-using Infrastructure.Model;
-using Mapster;
-using Microsoft.AspNetCore.Mvc;
-using Middleware;
-using Model;
-using Services;
-using Model.Base;
-
-namespace Controllers
-{
-    /// <summary>
-    /// ApiGroup)Controller
-    /// </summary>
-    // [Route("ApiGroup")]
-    // [ApiExplorerSettings(GroupName = "ApiGroup")]
-    public class ApiGroupController : BaseController
-    {
-        /// <summary>
-        /// api分组接口
-        /// </summary>
-        private readonly IApiGroupService _ApiGroupService;
-
-
-        public ApiGroupController(IApiGroupService ApiGroupService)
-        {
-            _ApiGroupService = ApiGroupService;
-
-        }
-
-        /// <summary>
-        /// api接口分组列表
-        /// </summary>
-        /// <param name="parm">请求参数</param>
-        /// <returns>api接口分组列表</returns>
-        [HttpGet]
-        [Route("/v1/api/ApiGroup/list")]
-        public IActionResult List([FromQuery] PagerInfo page, [FromQuery] ApiGroupListDto parm)
-        {
-            var response = _ApiGroupService.List(page, parm);
-            return SUCCESS(response);
-        }
-
-
-
-
-        /// <summary>
-        /// api接口分组详情
-        /// </summary>
-        /// <param name="parm">请求参数</param>
-        /// <returns>api接口分组详情</returns>
-        [HttpGet]
-        [Route("/v1/api/ApiGroup/query")]
-        public IActionResult Query([FromQuery] ApiGroupQueryDto parm)
-        {
-            var response = _ApiGroupService.GetFirst(x => x.id == parm.id).Adapt<ApiGroupQueryVo>();
-            return SUCCESS(response);
-        }
-
-
-
-
-        /// <summary>
-        /// api接口分组添加
-        /// </summary>
-        /// <param name="parm">请求参数</param>
-        /// <returns>api接口分组添加</returns>
-        [HttpPost]
-        [Route("/v1/api/ApiGroup/add")]
-        public IActionResult Add([FromBody] ApiGroupAddDto parm)
-        {
-            var modal = parm.Adapt<ApiGroup>().ToCreate(HttpContext);
-            var response = _ApiGroupService.Add(modal);
-            return SUCCESS(response);
-        }
-
-
-
-
-        /// <summary>
-        /// api接口分组修改
-        /// </summary>
-        /// <param name="parm">请求参数</param>
-        /// <returns>api接口分组修改</returns>
-        [HttpPut]
-        [Route("/v1/api/ApiGroup/update")]
-        public IActionResult Update([FromBody] ApiGroupUpdateDto parm)
-        {
-            var modal = parm.Adapt<ApiGroup>().ToUpdate(HttpContext);
-            var response = _ApiGroupService.Update(modal, true);
-            return SUCCESS(response);
-        }
-
-
-
-
-        /// <summary>
-        /// api接口分组删除
-        /// </summary>
-        /// <param name="Id">ID</param>
-        /// <returns>api接口分组删除</returns>
-        [HttpDelete]
-        [Route("/v1/api/ApiGroup/delete/{id}")]
-        public IActionResult Delete(int id)
-        {
-            var response = _ApiGroupService.Delete(id);
-            return SUCCESS(response);
-        }
-
-
-
-
-
-
-    }
-}

Controllers/Base/SysLoginController.cs

@@ -53,9 +53,9 @@ namespace Controllers
         public IActionResult Login([FromBody] LoginBodyDto loginBody)
         {
             if (loginBody == null) { throw new CustomException("请求参数错误"); }
-            loginBody.LoginIP = HttpContextExtension.GetClientUserIp(HttpContext);
+            loginBody.loginIP = HttpContextExtension.GetClientUserIp(HttpContext);
 
-            sysLoginService.CheckLockUser(loginBody.Username);
+            sysLoginService.CheckLockUser(loginBody.username);
             string location = ""; //HttpContextExtension.GetIpInfo(loginBody.LoginIP);
             var user = sysLoginService.Login(loginBody, new SysLogininfor() { LoginLocation = location });
 

Extensions/AppServiceExtensions.cs

@@ -38,7 +38,7 @@ namespace Infrastructure
             services.AddTransient<ISysRoleDeptService, SysRoleDeptService>();
             services.AddTransient<ISysUserService, SysUserService>();
             services.AddTransient<ISysOauthClientDetailsService, SysOauthClientDetailsService>();
-            services.AddTransient<IApiGroupService, ApiGroupService>();
+            // services.AddTransient<IApiGroupService, ApiGroupService>();
         }
 
         private static void Register(IServiceCollection services, string item)

Model/Database/ApiGroup.cs

@@ -1,82 +0,0 @@
-namespace Model
-{
-    /// <summary>
-    /// api接口分组 api_group
-    /// </summary>
-    [SugarTable("api_group", "api接口分组")]
-    [Tenant("0")]
-    public class ApiGroup
-    {
-        /// <summary>
-        /// 名称
-        /// </summary>
-        [SugarColumn(ColumnDescription = "名称", Length = 50, ColumnName = "group_name")]
-        public string groupName { get; set; }
-
-
-        /// <summary>
-        /// 说明
-        /// </summary>
-        [SugarColumn(ColumnDescription = "说明", Length = 200, ColumnName = "group_remark")]
-        public string groupRemark { get; set; }
-
-
-        /// <summary>
-        /// 版本号
-        /// </summary>
-        [SugarColumn(ColumnDescription = "版本号", Length = 20, ColumnName = "group_version")]
-        public string groupVersion { get; set; }
-
-
-        /// <summary>
-        /// ID
-        /// </summary>
-        [SugarColumn(ColumnDescription = "ID", IsPrimaryKey = true, IsIdentity = true, ColumnName = "id")]
-        public int id { get; set; }
-
-
-        /// <summary>
-        /// 状态
-        /// </summary>
-        [SugarColumn(ColumnDescription = "状态", ColumnName = "status")]
-        public int status { get; set; }
-
-
-        /// <summary>
-        /// 排序
-        /// </summary>
-        [SugarColumn(ColumnDescription = "排序", ColumnName = "sort")]
-        public int sort { get; set; }
-
-
-        /// <summary>
-        /// 版本号
-        /// </summary>
-        [SugarColumn(ColumnDescription = "版本号", ColumnName = "version")]
-        public int version { get; set; }
-
-
-        /// <summary>
-        /// 创建时间
-        /// </summary>
-        [SugarColumn(ColumnDescription = "创建时间", ColumnName = "create_date")]
-        public DateTime? createDate { get; set; }
-
-
-        /// <summary>
-        /// 更新时间
-        /// </summary>
-        [SugarColumn(ColumnDescription = "更新时间", ColumnName = "update_date")]
-        public DateTime? updateDate { get; set; }
-
-
-        /// <summary>
-        /// 类型
-        /// </summary>
-        [SugarColumn(ColumnDescription = "类型", ColumnName = "group_kind")]
-        public int groupKind { get; set; }
-
-
-
-    }
-}

Model/Dto/ApiGroupAddDto.cs

@@ -1,33 +0,0 @@
-using System;
-using System.ComponentModel.DataAnnotations;
-using Model.Base;
-
-namespace Dto
-{
-    /// <summary>
-    /// 添加
-    /// </summary>
-    public class ApiGroupAddDto
-    {
-        /// <summary>
-        /// 名称
-        /// </summary>
-        public string? groupName { get; set; }
-
-
-        /// <summary>
-        /// 说明
-        /// </summary>
-        public string? groupRemark { get; set; }
-
-
-        /// <summary>
-        /// 版本号
-        /// </summary>
-        [Required(ErrorMessage = "版本号不能为空")]
-        public string? groupVersion { get; set; }
-
-
-
-    }
-}

Model/Dto/ApiGroupListDto.cs

@@ -1,20 +0,0 @@
-using System;
-using System.ComponentModel.DataAnnotations;
-using Model.Base;
-
-namespace Dto
-{
-    /// <summary>
-    /// 列表
-    /// </summary>
-    public class ApiGroupListDto
-    {
-        /// <summary>
-        /// 名称
-        /// </summary>
-        public string? groupName { get; set; }
-
-
-
-    }
-}

Model/Dto/ApiGroupQueryDto.cs

@@ -1,20 +0,0 @@
-using System;
-using System.ComponentModel.DataAnnotations;
-using Model.Base;
-
-namespace Dto
-{
-    /// <summary>
-    /// 详情
-    /// </summary>
-    public class ApiGroupQueryDto
-    {
-        /// <summary>
-        /// ID
-        /// </summary>
-        public int id { get; set; }
-
-
-
-    }
-}

Model/Dto/ApiGroupUpdateDto.cs

@@ -1,39 +0,0 @@
-using System;
-using System.ComponentModel.DataAnnotations;
-using Model.Base;
-
-namespace Dto
-{
-    /// <summary>
-    /// 修改
-    /// </summary>
-    public class ApiGroupUpdateDto
-    {
-        /// <summary>
-        /// 名称
-        /// </summary>
-        public string? groupName { get; set; }
-
-
-        /// <summary>
-        /// 说明
-        /// </summary>
-        public string? groupRemark { get; set; }
-
-
-        /// <summary>
-        /// 版本号
-        /// </summary>
-        [Required(ErrorMessage = "版本号不能为空")]
-        public string? groupVersion { get; set; }
-
-
-        /// <summary>
-        /// ID
-        /// </summary>
-        public int id { get; set; }
-
-
-
-    }
-}

Model/Dto/Base/LoginBodyDto.cs

@@ -8,24 +8,24 @@ namespace Dto
         /// 用户名
         /// </summary>
         [Required(ErrorMessage = "用户名不能为空")]
-        public string Username { get; set; }
+        public string username { get; set; }
 
         /// <summary>
         /// 用户密码
         /// </summary>
         [Required(ErrorMessage = "密码不能为空")]
-        public string Password { get; set; }
+        public string password { get; set; }
 
         /// <summary>
         /// 验证码
         /// </summary>
-        public string? Code { get; set; }
+        public string? code { get; set; }
 
         /// <summary>
         /// 唯一标识
         /// </summary>
-        public string? Uuid { get; set; } = "";
-        public string? LoginIP { get; set; }
-        public string? ClientId { get; set; }
+        public string? uuid { get; set; } = "";
+        public string? loginIP { get; set; }
+        public string? clientId { get; set; }
     }
 }

Model/Vo/ApiGroupAddVo.cs

@@ -1,18 +0,0 @@
-using Newtonsoft.Json;
-
-namespace Vo
-{
-    /// <summary>
-    /// 添加
-    /// </summary>
-    public class ApiGroupAddVo
-    {
-        /// <summary>
-        /// ID
-        /// </summary>
-        public int id { get; set; }
-
-
-
-    }
-}

Model/Vo/ApiGroupListVo.cs

@@ -1,30 +0,0 @@
-using Newtonsoft.Json;
-
-namespace Vo
-{
-    /// <summary>
-    /// 列表
-    /// </summary>
-    public class ApiGroupListVo
-    {
-        /// <summary>
-        /// 名称
-        /// </summary>
-        public string groupName { get; set; }
-
-
-        /// <summary>
-        /// 版本号
-        /// </summary>
-        public string groupVersion { get; set; }
-
-
-        /// <summary>
-        /// ID
-        /// </summary>
-        public int id { get; set; }
-
-
-
-    }
-}

Model/Vo/ApiGroupQueryVo.cs

@@ -1,25 +0,0 @@
-using Newtonsoft.Json;
-
-namespace Vo
-{
-    /// <summary>
-    /// 详情
-    /// </summary>
-    public class ApiGroupQueryVo
-    {
-        /// <summary>
-        /// 名称
-        /// </summary>
-        public string groupName { get; set; }
-
-
-        /// <summary>
-        /// 版本号
-        /// </summary>
-        public string groupVersion { get; set; }
-
-        public int id { get; set; }
-
-
-    }
-}

Services/ApiGroupService.cs

@@ -1,48 +0,0 @@
-using Attribute;
-using Dto;
-using Vo;
-using Model;
-using Model.Base;
-using Repository;
-using Service;
-using Microsoft.AspNetCore.Mvc;
-
-namespace Services
-{
-    /// <summary>
-    /// api接口分组Service业务层处理
-    /// </summary>
-    [AppService(ServiceType = typeof(IApiGroupService), ServiceLifetime = LifeTime.Transient)]
-    public class ApiGroupService : BaseService<ApiGroup>, IApiGroupService
-    {
-        /// <summary>
-        /// api接口分组-列表
-        /// </summary>
-        /// <param name="parm">请求参数</param>
-        /// <returns>api接口分组列表</returns>
-        public PagedInfo<ApiGroupListVo> List([FromQuery] PagerInfo page, [FromQuery] ApiGroupListDto parm)
-        {
-            //开始拼装查询条件
-            var predicate = Expressionable.Create<ApiGroup>();
-            predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.groupName), m => m.groupName.Contains(parm.groupName));
-            var response = Queryable()
-                .Where(predicate.ToExpression())
-                .OrderByDescending(m => m.id)
-                .ToPage<ApiGroup, ApiGroupListVo>(page);
-            return response;
-        }
-
-
-
-
-
-
-
-
-
-
-
-
-
-    }
-}

Services/Base/SysLoginService.cs

@@ -85,13 +85,13 @@ namespace Services
         /// <returns></returns>
         public SysUser Login(LoginBodyDto loginBody, SysLogininfor logininfor)
         {
-            SysUser user = SysUserService.GetFirst(m => m.Username == loginBody.Username);
-            loginBody.Password = Function.MD532(loginBody.Password + user.Salt);
+            SysUser user = SysUserService.GetFirst(m => m.Username == loginBody.username);
+            loginBody.password = Function.MD532(loginBody.password + user.Salt);
             user = SysUserService.Login(loginBody);
-            logininfor.UserName = loginBody.Username;
+            logininfor.UserName = loginBody.username;
             logininfor.Status = "1";
             logininfor.LoginTime = DateTime.Now;
-            logininfor.Ipaddr = loginBody.LoginIP;
+            logininfor.Ipaddr = loginBody.loginIP;
 
             ClientInfo clientInfo = httpContextAccessor.HttpContext.GetClientInfo();
             logininfor.Browser = clientInfo.ToString();
@@ -113,7 +113,7 @@ namespace Services
             logininfor.Status = "0";
             logininfor.Msg = "登录成功";
             AddLoginInfo(logininfor);
-            SysUserService.UpdateLoginInfo(loginBody.LoginIP, user.UserId);
+            SysUserService.UpdateLoginInfo(loginBody.loginIP, user.UserId);
             return user;
         }
         /// <summary>

Services/Base/SysUserService.cs

@@ -321,7 +321,7 @@ namespace Services
         /// <returns></returns>
         public SysUser Login(LoginBodyDto user)
         {
-            return GetFirst(it => it.Username == user.Username && it.Password.ToLower() == user.Password.ToLower());
+            return GetFirst(it => it.Username == user.username && it.Password.ToLower() == user.password.ToLower());
         }
 
         /// <summary>

Services/IService/IApiGroupService.cs

@@ -1,29 +0,0 @@
-using Dto;
-using Vo;
-using Model;
-using Model.Base;
-using Microsoft.AspNetCore.Mvc;
-
-namespace Services
-{
-    public interface IApiGroupService : IBaseService<ApiGroup>
-    {
-        /// <summary>
-        /// api接口分组-列表
-        /// </summary>
-        /// <param name="parm">请求参数</param>
-        /// <returns>api接口分组列表</returns>
-        PagedInfo<ApiGroupListVo> List([FromQuery] PagerInfo page, [FromQuery] ApiGroupListDto parm);
-
-
-
-
-
-
-
-
-
-
-
-    }
-}