Update README.md

README.md

@@ -12,6 +12,8 @@
 ### 简介:
 **中文：意框架**（和他的名字一样“简易”）
 
+正在持续更进业务模块
+
 **英文：YiFramework**
 
 Yi框架-一套与SqlSugar一样爽的.Net6低代码开源框架。
@@ -20,6 +22,10 @@ Yi框架-一套与SqlSugar一样爽的.Net6低代码开源框架。
 适合.Net6学习、Sqlsugar学习 、项目二次开发。
 集大成者，终究轮子
 
+Yi框架最新版本标签：`v1.1.5`，具体版本可以查看标签迭代
+
+（项目与Sqlsugar同步更新，但这作者老杰哥代码天天爆肝到凌晨两点，我们也尽量会跟上他的脚步。更新频繁，所以可watching持续关注。）
+
 ————这不仅仅是一个程序，更是一个艺术品，面向艺术的开发！
 
 **分支**：
@@ -122,16 +128,19 @@ WebFirst开发：所有代码生成器已经配置完成，无需任何操作数
 - [x] 支持`单表多租户`常用功能
 - [x] 支持`逻辑删除`常用功能
 - [x] 支持`操作日志`常用功能
+- [x] 支持`自动分表`
 - [x] 支持 太多了忘了
 
 ****
 ### 目录结构:
 
-![图片](https://s1.ax1x.com/2022/04/09/LCTleH.png)
+![image](https://s1.ax1x.com/2022/04/09/LCTleH.png)
+![image](https://s1.ax1x.com/2022/04/24/L4qlSs.png)
+![image](https://s1.ax1x.com/2022/04/24/L4q1ln.png)
 
 我们大致依照DDD领域驱动设计分层
 
-什么？感觉太复杂了？用户只需关注Api、Service其他都是轮子啊！
+分层如此清晰！什么？还感觉太复杂了？用户只需关注Api、Service其他都是轮子啊！
 
 ~~- BackGround：后台进程（目前可以无视，等待更新）~~
 - Client：客户端（测试、客户端）
@@ -183,7 +192,9 @@ WebFirst开发：所有代码生成器已经配置完成，无需任何操作数
 ****
 ### 联系我们：
 
-作者QQ：454313500
+作者QQ：`454313500`，2029年之前作者24小时在线，时刻保持活跃更新。
+
+QQ交流群：官方一群（已满）、官方二群（已满）、官方三群：`786308927`（加作者QQ后同意）
 
 联系作者，这里人人都是顾问
 

Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Config/SwaggerDoc.xml

@@ -4,6 +4,45 @@
         <name>Yi.Framework.ApiMicroservice</name>
     </assembly>
     <members>
+        <member name="T:Yi.Framework.ApiMicroservice.Controllers.AccountController">
+            <summary>
+            账户管理
+            </summary>
+        </member>
+        <member name="M:Yi.Framework.ApiMicroservice.Controllers.AccountController.Login(Yi.Framework.DTOModel.LoginDto)">
+            <summary>
+            没啥说，登录
+            </summary>
+            <param name="loginDto"></param>
+            <returns></returns>
+        </member>
+        <member name="M:Yi.Framework.ApiMicroservice.Controllers.AccountController.Register(Yi.Framework.DTOModel.RegisterDto)">
+            <summary>
+            没啥说，注册
+            </summary>
+            <param name="registerDto"></param>
+            <returns></returns>
+        </member>
+        <member name="M:Yi.Framework.ApiMicroservice.Controllers.AccountController.GetUserAllInfo">
+            <summary>
+            通过已登录的用户获取用户信息及菜单
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:Yi.Framework.ApiMicroservice.Controllers.AccountController.UpdatePassword(Yi.Framework.DTOModel.UpdatePasswordDto)">
+            <summary>
+            更新登录的用户密码
+            </summary>
+            <param name="updatePasswordDto"></param>
+            <returns></returns>
+        </member>
+        <member name="M:Yi.Framework.ApiMicroservice.Controllers.AccountController.UpdateUserByHttp(Yi.Framework.Model.Models.UserEntity)">
+            <summary>
+            更新已登录用户的用户信息
+            </summary>
+            <param name="user"></param>
+            <returns></returns>
+        </member>
         <member name="T:Yi.Framework.ApiMicroservice.Controllers.BaseCrudController`1">
             <summary>
             Json To Sql 类比模式，通用模型
@@ -51,6 +90,80 @@
             <param name="ids"></param>
             <returns></returns>
         </member>
+        <member name="T:Yi.Framework.ApiMicroservice.Controllers.FileController">
+            <summary>
+            文件
+            </summary>
+        </member>
+        <member name="M:Yi.Framework.ApiMicroservice.Controllers.FileController.#ctor(Yi.Framework.Interface.IUserService,Microsoft.Extensions.Hosting.IHostEnvironment)">
+            <summary>
+            使用本地存储，未进行数据库记录
+            </summary>
+            <param name="iUserService"></param>
+            <param name="env"></param>
+        </member>
+        <member name="M:Yi.Framework.ApiMicroservice.Controllers.FileController.Get(System.String,System.String)">
+            <summary>
+            文件下载
+            </summary>
+            <param name="type"></param>
+            <param name="fileName"></param>
+            <returns></returns>
+        </member>
+        <member name="M:Yi.Framework.ApiMicroservice.Controllers.FileController.Upload(System.String,Microsoft.AspNetCore.Http.IFormFile)">
+            <summary>
+            文件上传
+            </summary>
+            <param name="type"></param>
+            <param name="file"></param>
+            <returns></returns>
+        </member>
+        <member name="M:Yi.Framework.ApiMicroservice.Controllers.LogController.Add">
+            <summary>
+            自动分表，日志添加
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:Yi.Framework.ApiMicroservice.Controllers.LogController.GetList">
+            <summary>
+            查询近20年与21年的日志表
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="T:Yi.Framework.ApiMicroservice.Controllers.MenuController">
+            <summary>
+            菜单管理
+            </summary>
+        </member>
+        <member name="M:Yi.Framework.ApiMicroservice.Controllers.MenuController.GetMenuTree">
+            <summary>
+            得到树形菜单
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="T:Yi.Framework.ApiMicroservice.Controllers.RoleController">
+            <summary>
+            角色管理
+            </summary>
+        </member>
+        <member name="M:Yi.Framework.ApiMicroservice.Controllers.RoleController.GiveRoleSetMenu(Yi.Framework.DTOModel.GiveRoleSetMenuDto)">
+            <summary>
+            给多用户设置多角色
+            </summary>
+            <param name="giveRoleSetMenuDto"></param>
+            <returns></returns>
+        </member>
+        <member name="M:Yi.Framework.ApiMicroservice.Controllers.RoleController.GetInMenuByRoleId(System.Int64)">
+            <summary>
+            通过角色id来获取菜单列表
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="T:Yi.Framework.ApiMicroservice.Controllers.TestController">
+            <summary>
+            测试控制器
+            </summary>
+        </member>
         <member name="M:Yi.Framework.ApiMicroservice.Controllers.TestController.DbTest">
             <summary>
             仓储上下文对象测试
@@ -87,5 +200,48 @@
             </summary>
             <returns></returns>
         </member>
+        <member name="M:Yi.Framework.ApiMicroservice.Controllers.TestController.IncludeTest">
+            <summary>
+            极爽导航属性
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:Yi.Framework.ApiMicroservice.Controllers.TestController.JobTest">
+            <summary>
+            启动一个定时任务
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:Yi.Framework.ApiMicroservice.Controllers.TestController.stopJob">
+            <summary>
+            停止任务
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="T:Yi.Framework.ApiMicroservice.Controllers.UserController">
+            <summary>
+            用户管理
+            </summary>
+        </member>
+        <member name="M:Yi.Framework.ApiMicroservice.Controllers.UserController.Add(Yi.Framework.Model.Models.UserEntity)">
+            <summary>
+            添加用户，去重，密码加密
+            </summary>
+            <param name="entity"></param>
+            <returns></returns>
+        </member>
+        <member name="M:Yi.Framework.ApiMicroservice.Controllers.UserController.GiveUserSetRole(Yi.Framework.DTOModel.GiveUserSetRoleDto)">
+            <summary>
+            给多用户设置多角色
+            </summary>
+            <param name="giveUserSetRoleDto"></param>
+            <returns></returns>
+        </member>
+        <member name="M:Yi.Framework.ApiMicroservice.Controllers.UserController.GetRoleListByUserId(System.Int64)">
+            <summary>
+            通过用户id得到角色列表
+            </summary>
+            <returns></returns>
+        </member>
     </members>
 </doc>

Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/AccountController.cs

@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using Yi.Framework.Common.Helper;
 using Yi.Framework.Common.Models;
 using Yi.Framework.Core;
 using Yi.Framework.DTOModel;
@@ -17,30 +18,46 @@ using Yi.Framework.WebCore.AuthorizationPolicy;
 
 namespace Yi.Framework.ApiMicroservice.Controllers
 {
+    /// <summary>
+    /// 账户管理
+    /// </summary>
     [ApiController]
     [Route("api/[controller]/[action]")]
-    public class AccountController :ControllerBase
+    public class AccountController : ControllerBase
     {
-        private  IUserService _iUserService;
+        private IUserService _iUserService;
         private JwtInvoker _jwtInvoker;
+       private ILogger _logger;
         public AccountController(ILogger<UserEntity> logger, IUserService iUserService, JwtInvoker jwtInvoker)
         {
             _iUserService = iUserService;
             _jwtInvoker = jwtInvoker;
+           _logger = logger;
         }
 
+        /// <summary>
+        /// 没啥说，登录
+        /// </summary>
+        /// <param name="loginDto"></param>
+        /// <returns></returns>
         [AllowAnonymous]
         [HttpPost]
         public async Task<Result> Login(LoginDto loginDto)
         {
-            UserEntity user=new();
-            if (await _iUserService.Login(loginDto.UserName, loginDto.Password,o=> user=o))
+            UserEntity user = new();
+            if (await _iUserService.Login(loginDto.UserName, loginDto.Password, o => user = o))
             {
-                return Result.Success("登录成功！").SetData(new { user, token = _jwtInvoker.GetAccessToken(user)});
+             var userRoleMenu= await  _iUserService.GetUserAllInfo(user.Id);
+                return Result.Success("登录成功！").SetData(new { token = _jwtInvoker.GetAccessToken(userRoleMenu.User,userRoleMenu.Menus) });
             }
             return Result.SuccessError("登录失败！用户名或者密码错误！");
         }
 
+        /// <summary>
+        /// 没啥说，注册
+        /// </summary>
+        /// <param name="registerDto"></param>
+        /// <returns></returns>
         [AllowAnonymous]
         [HttpPost]
         public async Task<Result> Register(RegisterDto registerDto)
@@ -52,5 +69,64 @@ namespace Yi.Framework.ApiMicroservice.Controllers
             }
             return Result.SuccessError("注册失败！用户名已存在！");
         }
+
+        [HttpPost]
+        public  Result Logout()
+        {
+            return Result.Success("安全登出成功！");
+        }
+
+        /// <summary>
+        /// 通过已登录的用户获取用户信息及菜单
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        [Authorize]
+        public async Task<Result> GetUserAllInfo()
+        {
+            //通过鉴权jwt获取到用户的id
+            var userId = HttpContext.GetCurrentUserEntityInfo(out _).Id;
+
+            return Result.Success().SetData(await _iUserService.GetUserAllInfo(userId));
+        }
+
+
+        /// <summary>
+        /// 更新登录的用户密码
+        /// </summary>
+        /// <param name="updatePasswordDto"></param>
+        /// <returns></returns>
+        [HttpPut]
+        public async Task<Result> UpdatePassword(UpdatePasswordDto updatePasswordDto)
+        {
+            var userId = HttpContext.GetCurrentUserEntityInfo(out _).Id;
+            var userEntiy = await _iUserService._repository.GetByIdAsync(userId);
+
+            //判断输入的老密码是否和原密码相同
+            if (_iUserService.JudgePassword(userEntiy, updatePasswordDto.OldPassword))
+            {
+                userEntiy.Password = updatePasswordDto.NewPassword;
+                userEntiy.BuildPassword();
+                return Result.Success().SetStatus(await _iUserService._repository.UpdateAsync(userEntiy));
+            }
+            return Result.SuccessError("原密码错误！");
+        }
+
+        /// <summary>
+        /// 更新已登录用户的用户信息
+        /// </summary>
+        /// <param name="user"></param>
+        /// <returns></returns>
+        [HttpPut]
+        public async Task<Result> UpdateUserByHttp(UserEntity user)
+        {
+            //当然，密码是不能给他修改的
+            user.Password = null;
+            user.Salt = null;
+
+            //修改需要赋值上主键哦
+            user.Id = HttpContext.GetCurrentUserEntityInfo(out _).Id;
+            return Result.Success().SetStatus(await _iUserService._repository.UpdateIgnoreNullAsync(user));
+        }
     }
 }

Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/BaseController/BaseCrudController.cs

@@ -15,12 +15,11 @@ namespace Yi.Framework.ApiMicroservice.Controllers
     /// </summary>
     /// <typeparam name="T"></typeparam>
     [ApiController]
-    [Route("api/[controller]/[action]")]
-    public class BaseCrudController<T> : ControllerBase where T : BaseModelEntity,new()
+    public class BaseCrudController<T> : ControllerBase where T : class, IBaseModelEntity,new()
     {
-        public readonly ILogger<T> _logger;
-        public IBaseService<T> _baseService;
-        public IRepository<T> _repository;
+        private readonly ILogger<T> _logger;
+        private IBaseService<T> _baseService;
+        private IRepository<T> _repository;
         public BaseCrudController(ILogger<T> logger, IBaseService<T> iBaseService)
         {
             _logger = logger;
@@ -33,9 +32,9 @@ namespace Yi.Framework.ApiMicroservice.Controllers
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
-        [Permission($"{nameof(T)}:get:one")]
+        [Permission($"{nameof(T)}:get")]
         [HttpGet]
-        public async Task<Result> GetById(long id)
+        public virtual async Task<Result> GetById(long id)
         {
             return Result.Success().SetData(await _repository.GetByIdAsync(id));
         }
@@ -44,9 +43,9 @@ namespace Yi.Framework.ApiMicroservice.Controllers
         /// 列表查询
         /// </summary>
         /// <returns></returns>
-        [Permission($"{nameof(T)}:get:list")]
+        [Permission($"{nameof(T)}:get")]
         [HttpPost]
-        public async Task<Result> GetList(QueryCondition queryCondition)
+        public virtual async Task<Result> GetList(QueryCondition queryCondition)
         {
             return Result.Success().SetData(await _repository.GetListAsync(queryCondition));
         }
@@ -56,9 +55,9 @@ namespace Yi.Framework.ApiMicroservice.Controllers
         /// </summary>
         /// <param name="queryCondition"></param>
         /// <returns></returns>
-        [Permission($"{nameof(T)}:get:page")]
+        [Permission($"{nameof(T)}:get")]
         [HttpPost]
-        public async  Task<Result> PageList(QueryPageCondition queryCondition)
+        public virtual async  Task<Result> PageList(QueryPageCondition queryCondition)
         {
             return Result.Success().SetData(await _repository.CommonPageAsync(queryCondition));
         }
@@ -70,7 +69,7 @@ namespace Yi.Framework.ApiMicroservice.Controllers
         /// <returns></returns>
         [Permission($"{nameof(T)}:add")]
         [HttpPost]
-        public async Task<Result> Add(T entity)
+        public  virtual async Task<Result> Add(T entity)
         {
             return Result.Success().SetData(await _repository.InsertReturnSnowflakeIdAsync(entity));
         }
@@ -82,7 +81,7 @@ namespace Yi.Framework.ApiMicroservice.Controllers
         /// <returns></returns>
         [Permission($"{nameof(T)}:update")]
         [HttpPut]
-        public async Task<Result> Update(T entity)
+        public virtual async Task<Result> Update(T entity)
         {
             return Result.Success().SetStatus(await _repository.UpdateIgnoreNullAsync(entity));
         }
@@ -92,9 +91,9 @@ namespace Yi.Framework.ApiMicroservice.Controllers
         /// </summary>
         /// <param name="ids"></param>
         /// <returns></returns>
-        [Permission($"{nameof(T)}:delete:list")]
+        [Permission($"{nameof(T)}:del")]
         [HttpDelete]
-        public async Task<Result> DeleteList(List<long> ids)
+        public virtual async Task<Result> DeleteList(List<long> ids)
         {
             return Result.Success().SetStatus(await _repository.DeleteByLogicAsync(ids));
         }

Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/FileController.cs

@@ -0,0 +1,95 @@
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Hosting;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using Yi.Framework.Common.Models;
+using Yi.Framework.Interface;
+using Yi.Framework.WebCore;
+
+namespace Yi.Framework.ApiMicroservice.Controllers
+{
+    /// <summary>
+    /// 文件
+    /// </summary>
+    [Route("api/[controller]/[action]")]
+    [ApiController]
+    public class FileController : ControllerBase
+    {
+        private IUserService _iUserService;
+        private readonly IHostEnvironment _env;
+        /// <summary>
+        /// 使用本地存储，未进行数据库记录
+        /// </summary>
+        /// <param name="iUserService"></param>
+        /// <param name="env"></param>
+        public FileController(IUserService iUserService, IHostEnvironment env)
+        {
+            _iUserService = iUserService;
+            _env = env;
+        }
+
+        /// <summary>
+        /// 文件下载
+        /// </summary>
+        /// <param name="type"></param>
+        /// <param name="fileName"></param>
+        /// <returns></returns>
+        [Route("/api/{type}/{fileName}")]
+        [HttpGet]
+        public IActionResult Get(string type, string fileName)
+        {
+            try
+            {
+                var path = Path.Combine($"wwwroot/{type}", fileName);
+                var stream = System.IO.File.OpenRead(path);
+                var MimeType = Common.Helper.MimeHelper.GetMimeMapping(fileName);
+                return new FileStreamResult(stream, MimeType);
+            }
+            catch
+            {
+                return new NotFoundResult();
+            }
+        }
+
+        /// <summary>
+        /// 文件上传
+        /// </summary>
+        /// <param name="type"></param>
+        /// <param name="file"></param>
+        /// <returns></returns>
+        [Route("/api/Upload/{type}")]
+        [HttpPost]
+        public async Task<Result> Upload(string type, IFormFile file)
+        {
+            try
+            {
+                string filename = Guid.NewGuid().ToString() + Path.GetExtension(file.FileName);
+                using (var stream = new FileStream(Path.Combine($"wwwroot/{type}", filename), FileMode.CreateNew, FileAccess.Write))
+                {
+                    await file.CopyToAsync(stream);
+                }
+                return Result.Success().SetData(filename);
+            }
+            catch
+            {
+                return Result.Error();
+            }
+        }
+
+        //[HttpGet]
+        //public async Task<IActionResult> ExportFile()
+        //{
+        //    var userdata = await _userService.GetAllEntitiesTrueAsync();
+        //    var userList = userdata.ToList();
+        //    List<string> header = new() { "用户", "密码", "头像", "昵称", "邮箱", "ip", "年龄", "个人介绍", "地址", "手机", "角色" };
+        //    var filename = Common.Helper.ExcelHelper.CreateExcelFromList(userList, header, _env.ContentRootPath.ToString());
+        //    var MimeType = Common.Helper.MimeHelper.GetMimeMapping(filename);
+        //    return new FileStreamResult(new FileStream(Path.Combine(_env.ContentRootPath+@"/wwwroot/excel", filename), FileMode.Open),MimeType);
+        //}
+    }
+}

Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/LogController.cs

@@ -0,0 +1,55 @@
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Logging;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Yi.Framework.Common.Models;
+using Yi.Framework.Interface;
+using Yi.Framework.Model.Models;
+using Yi.Framework.Repository;
+using Yi.Framework.WebCore;
+using Yi.Framework.WebCore.AttributeExtend;
+using Yi.Framework.WebCore.AuthorizationPolicy;
+
+namespace Yi.Framework.ApiMicroservice.Controllers
+{
+    [ApiController]
+    [Route("api/[controller]/[action]")]
+    public class LogController : ControllerBase
+    {
+        private ILogService _iLogService;
+        //大量日志，将采用自动分表形式，默认1年分一次表
+        public LogController(ILogger<LogEntity> logger, ILogService iLogService)
+        {
+            _iLogService = iLogService;
+        }
+
+        /// <summary>
+        /// 自动分表，日志添加
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task<Result> Add()
+        {
+            Random random = new Random();
+            var logList = new List<LogEntity>() {
+                new LogEntity() { LogCreateTime = Convert.ToDateTime("2019-12-1"), Message = "jack"+random.Next() } ,
+                new LogEntity() { LogCreateTime = Convert.ToDateTime("2022-02-1"), Message = "jack"+random.Next() },
+                new LogEntity() { LogCreateTime = Convert.ToDateTime("2020-02-1"), Message = "jack"+random.Next() },
+                new LogEntity() { LogCreateTime = Convert.ToDateTime("2021-12-1"), Message = "jack"+random.Next() } };
+            return Result.Success().SetData(await _iLogService.AddListTest(logList));
+        }
+  
+        /// <summary>
+        /// 查询近20年与21年的日志表
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        public async Task<Result> GetList()
+        {
+            return Result.Success().SetData(await _iLogService.GetListTest());
+        }
+    }
+}

Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/MenuController.cs

@@ -0,0 +1,44 @@
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Logging;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Yi.Framework.Common.Models;
+using Yi.Framework.Interface;
+using Yi.Framework.Model.Models;
+using Yi.Framework.Repository;
+using Yi.Framework.WebCore;
+using Yi.Framework.WebCore.AttributeExtend;
+using Yi.Framework.WebCore.AuthorizationPolicy;
+
+namespace Yi.Framework.ApiMicroservice.Controllers
+{
+    /// <summary>
+    /// 菜单管理
+    /// </summary>
+    [ApiController]
+    [Route("api/[controller]/[action]")]
+    public class MenuController : BaseCrudController<MenuEntity>
+    {
+        private IMenuService _iMenuService;
+        public MenuController(ILogger<MenuEntity> logger, IMenuService iMenuService) : base(logger, iMenuService)
+        {
+            _iMenuService = iMenuService;
+        }
+
+
+
+        /// <summary>
+        /// 得到树形菜单
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        //暂未制作逻辑删除与多租户的过滤
+        public async Task<Result> GetMenuTree()
+        { 
+             return Result.Success().SetData(await _iMenuService. GetMenuTreeAsync());
+        }
+    }
+}

Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/RoleController.cs

@@ -0,0 +1,53 @@
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Logging;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Yi.Framework.Common.Models;
+using Yi.Framework.DTOModel;
+using Yi.Framework.Interface;
+using Yi.Framework.Model.Models;
+using Yi.Framework.Repository;
+using Yi.Framework.WebCore;
+using Yi.Framework.WebCore.AttributeExtend;
+using Yi.Framework.WebCore.AuthorizationPolicy;
+
+namespace Yi.Framework.ApiMicroservice.Controllers
+{
+    /// <summary>
+    /// 角色管理
+    /// </summary>
+    [ApiController]
+    [Route("api/[controller]/[action]")]
+    public class RoleController : BaseCrudController<RoleEntity>
+    {
+        private IRoleService _iRoleService;
+        public RoleController(ILogger<RoleEntity> logger, IRoleService iRoleService) : base(logger, iRoleService)
+        {
+            _iRoleService = iRoleService;
+        }
+
+        /// <summary>
+        /// 给多用户设置多角色
+        /// </summary>
+        /// <param name="giveRoleSetMenuDto"></param>
+        /// <returns></returns>
+        [HttpPut]
+        public async Task<Result> GiveRoleSetMenu(GiveRoleSetMenuDto giveRoleSetMenuDto)
+        {
+            return Result.Success().SetStatus(await _iRoleService.GiveRoleSetMenu(giveRoleSetMenuDto.RoleIds, giveRoleSetMenuDto.MenuIds));
+        }
+
+        /// <summary>
+        /// 通过角色id来获取菜单列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        public async Task<Result> GetInMenuByRoleId(long RoleId)
+        {
+            return Result.Success().SetData(await _iRoleService.GetInMenuByRoleId(RoleId));
+        }
+    }
+}

Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/TestController.cs

@@ -6,7 +6,9 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using Yi.Framework.Common.Const;
 using Yi.Framework.Common.Models;
+using Yi.Framework.Core;
 using Yi.Framework.Interface;
 using Yi.Framework.Language;
 using Yi.Framework.Model.Models;
@@ -17,17 +19,24 @@ using Yi.Framework.WebCore.AuthorizationPolicy;
 
 namespace Yi.Framework.ApiMicroservice.Controllers
 {
+    /// <summary>
+    /// 测试控制器
+    /// </summary>
     [ApiController]
     [Route("api/[controller]/[action]")]
     public class TestController : ControllerBase
     {
         private IStringLocalizer<LocalLanguage> _local;
         private IUserService _iUserService;
+        private IRoleService _iRoleService;
+        private QuartzInvoker _quartzInvoker;
         //你可以依赖注入服务层各各接口，也可以注入其他仓储层，怎么爽怎么来！
-        public TestController(ILogger<UserEntity> logger, IUserService iUserService, IStringLocalizer<LocalLanguage> local)
+        public TestController(ILogger<UserEntity> logger, IRoleService iRoleService, IUserService iUserService, IStringLocalizer<LocalLanguage> local, QuartzInvoker quartzInvoker)
         {
             _local = local;
             _iUserService = iUserService;
+            _iRoleService = iRoleService;
+            _quartzInvoker = quartzInvoker;
         }
 
         /// <summary>
@@ -36,25 +45,25 @@ namespace Yi.Framework.ApiMicroservice.Controllers
         /// <returns></returns>
         [HttpGet]
         // 特点：化繁为简！意框架仓储代理上下文对象，用起来就是爽，但最好按规范来爽！
-        // 规范：控制器不建议使用切换仓储方法、控制器严禁使用DB上下文对象，其它怎么爽怎么来！
+        // 规范：控制器严禁使用DB上下文对象，其它怎么爽怎么来！
         public async Task<Result> DbTest()
         {
             //非常好，使用UserService的特有方法
             await _iUserService.DbTest();
 
-            //非常好，依赖注入使用其他Service的特有方法(就tm一张表，现在自己注入自己)
-            await _iUserService.DbTest();
+            //非常好，依赖注入使用其他Service的特有方法
+            await _iRoleService.DbTest();
 
             //很核理，使用仓储的通用方法
             await _iUserService._repository.GetListAsync();
 
-            //挺不错，依赖注入其他仓储(就tm一张表，现在自己注入自己)
-            await _iUserService._repository.GetListAsync();
+            //挺不错，依赖注入其他仓储
+            await _iRoleService._repository.GetListAsync();
 
-            //不建议操作，直接切换其他仓储(就tm一张表，现在自己切换自己)
-            await _iUserService._repository.ChangeRepository<Repository<UserEntity>>().GetListAsync();
+            //还行，直接切换其他仓储，怎么爽怎么来
+            await _iUserService._repository.ChangeRepository<Repository<RoleEntity>>().GetListAsync();
 
-            //恭喜你已经毕业了！此后将有一天，接手到这个的软件的程序员将破口大骂。
+            //最好不要直接操作Db对象
             await _iUserService._repository._Db.Queryable<UserEntity>().ToListAsync();
 
             return Result.Success().SetData(await _iUserService.DbTest());
@@ -65,7 +74,7 @@ namespace Yi.Framework.ApiMicroservice.Controllers
         /// </summary>
         /// <returns></returns>
         [HttpGet]
-        //简单语句不推荐！
+        //简单语句不推荐使用sql！
         public async Task<Result> SqlTest()
         {
             return Result.Success().SetData(await _iUserService._repository.UseSqlAsync<UserEntity>("select * from User"));
@@ -132,6 +141,43 @@ namespace Yi.Framework.ApiMicroservice.Controllers
 
         }
 
-        //emmmm，看来一张表已经满足不了，接下来将要大更新一波
+        /// <summary>
+        /// 极爽导航属性
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        //Sqlsugar精髓之一！必学！最新版本
+        public async Task<Result> IncludeTest()
+        {
+            return Result.Success().SetData(await _iUserService.GetListInRole());
+        }
+
+        /// <summary>
+        /// 启动一个定时任务
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        //每5秒访问一次百度，可查看控制台
+        public async Task<Result> JobTest()
+        {
+            Dictionary<string, object> data = new Dictionary<string, object>()
+            {
+                {JobConst.method,"get" },
+                {JobConst.url,"https://www.baidu.com" }
+            };
+            await _quartzInvoker.start("*/5 * * * * ?", new Quartz.JobKey("test", "my"), "Yi.Framework.Job", "HttpJob", data: data);
+            return Result.Success();
+        }
+
+        /// <summary>
+        /// 停止任务
+        /// </summary>
+        /// <returns></returns>
+        [HttpPut]
+        public async Task<Result> stopJob()
+        {
+            await _quartzInvoker.Stop(new Quartz.JobKey("test", "my"));
+            return Result.Success();
+        }
     }
 }

Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/UserController.cs

@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using Yi.Framework.Common.Models;
+using Yi.Framework.DTOModel;
 using Yi.Framework.Interface;
 using Yi.Framework.Model.Models;
 using Yi.Framework.Repository;
@@ -15,6 +16,9 @@ using Yi.Framework.WebCore.AuthorizationPolicy;
 
 namespace Yi.Framework.ApiMicroservice.Controllers
 {
+    /// <summary>
+    /// 用户管理
+    /// </summary>
     [ApiController]
     [Route("api/[controller]/[action]")]
     public class UserController : BaseCrudController<UserEntity>
@@ -24,5 +28,44 @@ namespace Yi.Framework.ApiMicroservice.Controllers
         {
             _iUserService = iUserService;
         }
+
+        /// <summary>
+        /// 添加用户，去重，密码加密
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <returns></returns>
+        [Permission($"{nameof(UserEntity)}:add")]
+        [HttpPost]
+        public  override async Task<Result> Add(UserEntity entity)
+        {
+            if (!await _iUserService.Exist(entity.UserName))
+            {
+                entity.BuildPassword();
+                return Result.Success().SetData(await _iUserService._repository.InsertReturnSnowflakeIdAsync(entity));
+            }
+            return Result.SuccessError("用户已存在");
+        }
+
+        /// <summary>
+        /// 给多用户设置多角色
+        /// </summary>
+        /// <param name="giveUserSetRoleDto"></param>
+        /// <returns></returns>
+        [HttpPut]
+        public async Task<Result> GiveUserSetRole(GiveUserSetRoleDto giveUserSetRoleDto)
+        {
+            return Result.Success().SetStatus(await _iUserService.GiveUserSetRole(giveUserSetRoleDto.UserIds, giveUserSetRoleDto.RoleIds));
+        }
+
+
+        /// <summary>
+        /// 通过用户id得到角色列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        public async Task<Result> GetRoleListByUserId(long userId)
+        {
+            return Result.Success().SetData(await _iUserService.GetRoleListByUserId(userId));
+        }
     }
 }

Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Program.cs

@@ -130,7 +130,7 @@ ServiceLocator.Instance = app.Services;
 #region
 //错误抓取反馈注入
 #endregion
-//app.UseErrorHandlingService();
+app.UseErrorHandlingService();
 #region
 //静态文件注入
 #endregion

Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Yi.Framework.ApiMicroservice.csproj

@@ -20,6 +20,16 @@
     <None Remove="wwwrooot\**" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Remove="yi-sqlsugar-dev.db" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Content Include="yi-sqlsugar-dev.db">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\Yi.Framework.DTOModel\Yi.Framework.DTOModel.csproj" />
     <ProjectReference Include="..\Yi.Framework.Interface\Yi.Framework.Interface.csproj" />

Yi.Framework.Net6/Yi.Framework.ApiMicroservice/appsettings.Production.json

@@ -1,5 +1,5 @@
 {
-  "StartUrl": "http://localohost:19001",
+  "StartUrl": "http://*:19001",
   "Logging": {
     "LogLevel": {
       "Default": "Information",

Yi.Framework.Net6/Yi.Framework.ApiMicroservice/appsettings.Staging.json

@@ -1,5 +1,5 @@
 {
-  "StartUrl": "http://localohost:19001",
+  "StartUrl": "http://*:19001",
   "Logging": {
     "LogLevel": {
       "Default": "Information",

Yi.Framework.Net6/Yi.Framework.ApiMicroservice/appsettings.json

@@ -41,7 +41,7 @@
     "PolicyName": "permission",
     "DefaultScheme": "Bearer",
     "IsHttps": false,
-    "Expiration": 30,
+    "Expiration": 300,
     "ReExpiration": 3000
   },
   "RedisConnOptions": {

Yi.Framework.Net6/Yi.Framework.Common/Helper/HttpHelper.cs

@@ -61,6 +61,7 @@ namespace Yi.Framework.Common.Helper
             request.ContentType = "application/x-www-form-urlencoded";
             request.ContentLength = Encoding.UTF8.GetByteCount(postDataStr);
             request.CookieContainer = cookie;
+
             Stream myRequestStream = request.GetRequestStream();
             StreamWriter myStreamWriter = new StreamWriter(myRequestStream, Encoding.GetEncoding("gb2312"));
             myStreamWriter.Write(postDataStr);

Yi.Framework.Net6/Yi.Framework.Common/IOCOptions/ElasticSearchOptions.cs

@@ -10,5 +10,7 @@ namespace Yi.Framework.Common.IOCOptions
     {
         public string Url { get; set; }
         public string IndexName { get; set; }
+        public string UserName { get; set; }
+        public string PassWord { get; set; }
     }
 }

Yi.Framework.Net6/Yi.Framework.Common/Models/Result.cs

@@ -36,6 +36,14 @@ namespace Yi.Framework.Common.Models
         }
         public Result SetStatus(bool _status)
         {
+            if (_status)
+            {
+                this.message = "操作成功";
+            }
+            else
+            {
+                this.message = "操作失败";
+            }
             this.status = _status;
             return this;
         }

Yi.Framework.Net6/Yi.Framework.Core/ElasticSearchInvoker.cs

@@ -16,7 +16,7 @@ namespace Yi.Framework.Core
         public ElasticSearchInvoker(IOptionsMonitor<ElasticSearchOptions> optionsMonitor)
         {
             _elasticSearchOptions = optionsMonitor.CurrentValue;
-            var settings = new ConnectionSettings(new Uri(_elasticSearchOptions.Url)).DefaultIndex(this._elasticSearchOptions.IndexName);
+            var settings = new ConnectionSettings(new Uri(_elasticSearchOptions.Url)).DefaultIndex(this._elasticSearchOptions.IndexName).BasicAuthentication(this._elasticSearchOptions.UserName, this._elasticSearchOptions.PassWord); ;
             Client = new ElasticClient(settings);
         }
         private ElasticClient Client;

Yi.Framework.Net6/Yi.Framework.Core/JwtInvoker.cs

@@ -23,15 +23,15 @@ namespace Yi.Framework.Core
         }
         public string GetRefreshToken(UserEntity user)
         {
-            return this.GetToken(_JWTTokenOptions.ReExpiration, user, true);
+            return this.GetToken(_JWTTokenOptions.ReExpiration, user,null, true);
         }
 
-        public string GetAccessToken(UserEntity user)
+        public string GetAccessToken(UserEntity user,HashSet<MenuEntity> menus)
         {
-            return this.GetToken(_JWTTokenOptions.Expiration, user);
+            return this.GetToken(_JWTTokenOptions.Expiration, user, menus);
         }
 
-        private string GetToken(int minutes, UserEntity user, bool isRefresh = false)
+        private string GetToken(int minutes, UserEntity user, HashSet<MenuEntity> menus,bool isRefresh = false)
         {
             List<Claim> claims = new List<Claim>();
             claims.Add(new Claim(JwtRegisteredClaimNames.Nbf, $"{new DateTimeOffset(DateTime.Now).ToUnixTimeSeconds()}"));
@@ -39,8 +39,11 @@ namespace Yi.Framework.Core
             claims.Add(new Claim(JwtRegisteredClaimNames.Sid, user.Id.ToString()));
 
             //-----------------------------以下从user的权限表中添加权限-----------------------例如：
-            claims.Add(new Claim("permission", "userentity:get:list"));
-            claims.Add(new Claim("permission", "userentity:get:one"));
+
+            foreach (var m in menus)
+            {
+                claims.Add(new Claim("permission", m.PermissionCode.ToString()));
+            }
 
             if (isRefresh)
             {

Yi.Framework.Net6/Yi.Framework.DTOModel/GiveRoleSetMenuDto.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Yi.Framework.DTOModel
+{
+    public class GiveRoleSetMenuDto
+    {
+        public List<long> RoleIds { get; set; }
+        public List<long> MenuIds { get; set; }
+    }
+}

Yi.Framework.Net6/Yi.Framework.DTOModel/GiveUserSetRoleDto.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Yi.Framework.DTOModel
+{
+    public class GiveUserSetRoleDto
+    {
+        public List<long> UserIds { get; set; }
+        public List<long> RoleIds { get; set;}
+    }
+}

Yi.Framework.Net6/Yi.Framework.DTOModel/UpdatePasswordDto.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Yi.Framework.DTOModel
+{
+    public class UpdatePasswordDto
+    {
+        public string NewPassword { get; set; }
+        public string OldPassword { get; set; }
+    }
+}

Yi.Framework.Net6/Yi.Framework.DTOModel/UserRoleMenuDto.cs

@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Yi.Framework.Model.Models;
+
+namespace Yi.Framework.DTOModel
+{
+    public class UserRoleMenuDto
+    {
+        public UserEntity User { get; set; }=new ();
+        public HashSet<RoleEntity> Roles { get; set; } = new();
+        public HashSet<MenuEntity> Menus { get; set; }=new();
+
+    }
+}

Yi.Framework.Net6/Yi.Framework.Interface/IBaseService.cs

@@ -8,7 +8,7 @@ using Yi.Framework.Repository;
 
 namespace Yi.Framework.Interface
 {
-    public interface IBaseService<T> where T:BaseModelEntity,new()
+    public interface IBaseService<T> where T: class, IBaseModelEntity,new()
     {
         public IRepository<T> _repository { get; set; }
     }

Yi.Framework.Net6/Yi.Framework.Interface/ILogService.cs

@@ -0,0 +1,13 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Yi.Framework.Model.Models;
+using Yi.Framework.Repository;
+
+namespace Yi.Framework.Interface
+{
+    public partial interface ILogService 
+    {
+        Task<List<long>> AddListTest(List<LogEntity> logEntities);
+        Task<List<LogEntity>> GetListTest();
+    }
+}

Yi.Framework.Net6/Yi.Framework.Interface/IMenuService.cs

@@ -0,0 +1,12 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Yi.Framework.Model.Models;
+using Yi.Framework.Repository;
+
+namespace Yi.Framework.Interface
+{
+   public partial interface IMenuService:IBaseService<MenuEntity>
+    {
+        Task<List<MenuEntity>> GetMenuTreeAsync();
+    }
+}

Yi.Framework.Net6/Yi.Framework.Interface/IRoleService.cs

@@ -0,0 +1,31 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Yi.Framework.Model.Models;
+using Yi.Framework.Repository;
+
+namespace Yi.Framework.Interface
+{
+   public partial interface IRoleService
+    {
+        /// <summary>
+        /// DbTest
+        /// </summary>
+        /// <returns></returns>
+        Task<List<RoleEntity>> DbTest();
+
+        /// <summary>
+        /// 通过角色id获取角色实体包含菜单
+        /// </summary>
+        /// <param name="roleId"></param>
+        /// <returns></returns>
+        Task<RoleEntity> GetInMenuByRoleId(long roleId);
+
+        /// <summary>
+        /// 给角色设置菜单，多角色，多菜单
+        /// </summary>
+        /// <param name="roleIds"></param>
+        /// <param name="menuIds"></param>
+        /// <returns></returns>
+        Task<bool> GiveRoleSetMenu(List<long> roleIds, List<long> menuIds);
+    }
+}

Yi.Framework.Net6/Yi.Framework.Interface/IServiceTemplate/ILogService.cs

@@ -0,0 +1,12 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Yi.Framework.Model.Models;
+using Yi.Framework.Repository;
+
+namespace Yi.Framework.Interface
+{
+    public partial interface ILogService : IBaseService<LogEntity>
+    {
+
+    }
+}

Yi.Framework.Net6/Yi.Framework.Interface/IServiceTemplate/IMenuService.cs

@@ -0,0 +1,11 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Yi.Framework.Model.Models;
+using Yi.Framework.Repository;
+
+namespace Yi.Framework.Interface
+{
+    public partial interface IMenuService : IBaseService<MenuEntity>
+    {
+    }
+}

Yi.Framework.Net6/Yi.Framework.Interface/IServiceTemplate/IRoleService.cs

@@ -0,0 +1,9 @@
+using Yi.Framework.Model.Models;
+using Yi.Framework.Repository;
+
+namespace Yi.Framework.Interface
+{
+   public partial interface IRoleService:IBaseService<RoleEntity>
+    {   
+    }
+}

Yi.Framework.Net6/Yi.Framework.Interface/IUserService.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
+using Yi.Framework.DTOModel;
 using Yi.Framework.Model.Models;
 using Yi.Framework.Repository;
 
@@ -12,7 +13,7 @@ namespace Yi.Framework.Interface
         /// 测试仓储的上下文对象
         /// </summary>
         /// <returns></returns>
-        public Task<List<UserEntity>> DbTest();
+        Task<List<UserEntity>> DbTest();
 
         /// <summary>
         /// 登录方法
@@ -21,7 +22,7 @@ namespace Yi.Framework.Interface
         /// <param name="password"></param>
         /// <param name="userAction"></param>
         /// <returns></returns>
-        public Task<bool> Login(string userName, string password, Action<UserEntity> userAction = null);
+        Task<bool> Login(string userName, string password, Action<UserEntity> userAction = null);
 
         /// <summary>
         /// 注册方法
@@ -29,6 +30,50 @@ namespace Yi.Framework.Interface
         /// <param name="userEntity"></param>
         /// <param name="userAction"></param>
         /// <returns></returns>
-        public Task<bool> Register(UserEntity userEntity, Action<UserEntity> userAction = null);
+        Task<bool> Register(UserEntity userEntity, Action<UserEntity> userAction = null);
+
+        /// <summary>
+        /// 导航属性关联角色
+        /// </summary>
+        /// <returns></returns>
+        Task<List<UserEntity>> GetListInRole();
+
+        /// <summary>
+        /// 给用户设置角色，多用户，多角色
+        /// </summary>
+        /// <param name="userIds"></param>
+        /// <param name="roleIds"></param>
+        /// <returns></returns>
+        Task<bool> GiveUserSetRole(List<long> userIds, List<long> roleIds);
+
+        /// <summary>
+        /// 判断用户名是否存在，如果存在可返回该用户
+        /// </summary>
+        /// <param name="userName"></param>
+        /// <param name="userAction"></param>
+        /// <returns></returns>
+        Task<bool> Exist(string userName, Action<UserEntity> userAction = null);
+
+        /// <summary>
+        /// 通过用户id得到角色列表
+        /// </summary>
+        /// <param name="userId"></param>
+        /// <returns></returns>
+        Task<List<RoleEntity>> GetRoleListByUserId(long userId);
+
+        /// <summary>
+        /// 获取当前登录用户的所有信息
+        /// </summary>
+        /// <param name="userId"></param>
+        /// <returns></returns>
+        Task<UserRoleMenuDto> GetUserAllInfo(long userId);
+
+        /// <summary>
+        /// 判断用户密码是否和原密码相同
+        /// </summary>
+        /// <param name="user"></param>
+        /// <param name="password"></param>
+        /// <returns></returns>
+        bool JudgePassword(UserEntity user, string password);
     }
 }

Yi.Framework.Net6/Yi.Framework.Model/LogEntity.cs

@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using SqlSugar;
+namespace Yi.Framework.Model.Models
+{
+    /// <summary>
+    /// 日志表
+    ///</summary>
+    [SplitTable(SplitType.Year)]
+    [SugarTable("SplitLog_{year}{month}{day}")]
+    public  partial class LogEntity
+    {
+        [SplitField] //分表字段 在插入的时候会根据这个字段插入哪个表，在更新删除的时候用这个字段找出相关表
+        public DateTime? LogCreateTime { get; set; }
+
+    }
+}

Yi.Framework.Net6/Yi.Framework.Model/MenuEntity.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using SqlSugar;
+namespace Yi.Framework.Model.Models
+{
+    /// <summary>
+    /// 菜单表
+    ///</summary>
+    public partial class MenuEntity
+    {
+        [SqlSugar.SugarColumn(IsIgnore = true)]
+        public List<MenuEntity> Children { get; set; }
+    }
+}

Yi.Framework.Net6/Yi.Framework.Model/Models/BaseModel/BaseModelEntity.cs

@@ -1,48 +0,0 @@
-using SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Yi.Framework.Model.Models
-{
-    public abstract class BaseModelEntity
-    {
-        public BaseModelEntity()
-        {
-            this.IsDeleted = false;
-            this.CreateTime = DateTime.Now;
-        }
-        /// <summary>
-        /// 1 
-        ///</summary>
-        [SugarColumn(ColumnName = "Id", IsPrimaryKey = true)]
-        public long Id { get; set; }
-        /// <summary>
-        /// 创建者
-        /// </summary>
-        [SugarColumn(ColumnName = "CreateUser")]
-        public long? CreateUser { get; set; }
-        /// <summary>
-        /// 修改者 
-        ///</summary>
-        [SugarColumn(ColumnName = "ModifyUser")]
-        public long? ModifyUser { get; set; }
-        /// <summary>
-        /// 创建时间 
-        ///</summary>
-        [SugarColumn(ColumnName = "CreateTime")]
-        public DateTime? CreateTime { get; set; }
-        /// <summary>
-        /// 修改时间 
-        ///</summary>
-        [SugarColumn(ColumnName = "ModifyTime")]
-        public DateTime? ModifyTime { get; set; }
-        /// <summary>
-        /// 是否删除 
-        ///</summary>
-        [SugarColumn(ColumnName = "IsDeleted")]
-        public bool? IsDeleted { get; set; }
-    }
-}

Yi.Framework.Net6/Yi.Framework.Model/Models/UserEntity.cs

@@ -1,44 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using SqlSugar;
-namespace Yi.Framework.Model.Models
-{
-    /// <summary>
-    /// 
-    ///</summary>
-    [SugarTable("User")]
-    public partial class UserEntity:BaseModelEntity
-    {
-        /// <summary>
-        ///  
-        ///</summary>
-         [SugarColumn(ColumnName="Name"    )]
-         public string Name { get; set; }
-        /// <summary>
-        ///  
-        ///</summary>
-         [SugarColumn(ColumnName="Age"    )]
-         public int? Age { get; set; }
-        /// <summary>
-        ///  
-        ///</summary>
-         [SugarColumn(ColumnName="TenantId"    )]
-         public long? TenantId { get; set; }
-        /// <summary>
-        ///  
-        ///</summary>
-         [SugarColumn(ColumnName="UserName"    )]
-         public string UserName { get; set; }
-        /// <summary>
-        ///  
-        ///</summary>
-         [SugarColumn(ColumnName="Password"    )]
-         public string Password { get; set; }
-        /// <summary>
-        ///  
-        ///</summary>
-         [SugarColumn(ColumnName="Salt"    )]
-         public string Salt { get; set; }
-    }
-}

Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/BaseModel/IBaseModelEntity.cs

@@ -0,0 +1,23 @@
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Yi.Framework.Model.Models
+{
+    public  interface IBaseModelEntity
+    {
+        public long Id { get; set; }
+
+        public long? CreateUser { get; set; }
+
+        public long? ModifyUser { get; set; }
+
+        public DateTime? CreateTime { get; set; }
+
+        public DateTime? ModifyTime { get; set; }
+        public bool? IsDeleted { get; set; }
+    }
+}

Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/LogEntity.cs

@@ -0,0 +1,59 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using SqlSugar;
+namespace Yi.Framework.Model.Models
+{
+    /// <summary>
+    /// 日志表
+    ///</summary>
+    public partial class LogEntity:IBaseModelEntity
+    {
+        public LogEntity()
+        {
+            this.IsDeleted = false;
+            this.CreateTime = DateTime.Now;
+        }
+        /// <summary>
+        /// 1 
+        ///</summary>
+         [SugarColumn(ColumnName="Id" ,IsPrimaryKey = true   )]
+         public long Id { get; set; }
+
+        /// <summary>
+        /// 创建者 
+        ///</summary>
+         [SugarColumn(ColumnName="CreateUser"    )]
+         public long? CreateUser { get; set; }
+        /// <summary>
+        /// 创建时间 
+        ///</summary>
+         [SugarColumn(ColumnName="CreateTime"    )]
+         public DateTime? CreateTime { get; set; }
+        /// <summary>
+        /// 修改者 
+        ///</summary>
+         [SugarColumn(ColumnName="ModifyUser"    )]
+         public long? ModifyUser { get; set; }
+        /// <summary>
+        /// 修改时间 
+        ///</summary>
+         [SugarColumn(ColumnName="ModifyTime"    )]
+         public DateTime? ModifyTime { get; set; }
+        /// <summary>
+        /// 是否删除 
+        ///</summary>
+         [SugarColumn(ColumnName="IsDeleted"    )]
+         public bool? IsDeleted { get; set; }
+        /// <summary>
+        /// 租户Id 
+        ///</summary>
+         [SugarColumn(ColumnName="TenantId"    )]
+         public long? TenantId { get; set; }
+        /// <summary>
+        /// 消息 
+        ///</summary>
+         [SugarColumn(ColumnName="Message"    )]
+         public string Message { get; set; }
+    }
+}

Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/MenuEntity.cs

@@ -0,0 +1,83 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.Json.Serialization;
+using SqlSugar;
+namespace Yi.Framework.Model.Models
+{
+    /// <summary>
+    /// 菜单表
+    ///</summary>
+    [SugarTable("Menu")]
+    public partial class MenuEntity:IBaseModelEntity
+    {
+        public MenuEntity()
+        {
+            this.IsDeleted = false;
+            this.CreateTime = DateTime.Now;
+        }
+        [JsonConverter(typeof(ValueToStringConverter))]
+        [SugarColumn(ColumnName="Id" ,IsPrimaryKey = true   )]
+         public long Id { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
+         [SugarColumn(ColumnName="MenuName"    )]
+         public string MenuName { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
+         [SugarColumn(ColumnName="MenuType"    )]
+         public int? MenuType { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
+         [SugarColumn(ColumnName="PermissionCode"    )]
+         public string PermissionCode { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
+         [SugarColumn(ColumnName="ParentId"    )]
+         public long? ParentId { get; set; }
+        /// <summary>
+        /// 创建者 
+        ///</summary>
+         [SugarColumn(ColumnName="CreateUser"    )]
+         public long? CreateUser { get; set; }
+        /// <summary>
+        /// 创建时间 
+        ///</summary>
+         [SugarColumn(ColumnName="CreateTime"    )]
+         public DateTime? CreateTime { get; set; }
+        /// <summary>
+        /// 修改者 
+        ///</summary>
+         [SugarColumn(ColumnName="ModifyUser"    )]
+         public long? ModifyUser { get; set; }
+        /// <summary>
+        /// 修改时间 
+        ///</summary>
+         [SugarColumn(ColumnName="ModifyTime"    )]
+         public DateTime? ModifyTime { get; set; }
+        /// <summary>
+        /// 是否删除 
+        ///</summary>
+         [SugarColumn(ColumnName="IsDeleted"    )]
+         public bool? IsDeleted { get; set; }
+        /// <summary>
+        /// 租户Id 
+        ///</summary>
+         [SugarColumn(ColumnName="TenantId"    )]
+         public long? TenantId { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
+         [SugarColumn(ColumnName="MenuIcon"    )]
+         public string MenuIcon { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
+         [SugarColumn(ColumnName="Router"    )]
+         public string Router { get; set; }
+    }
+}

Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/RoleEntity.cs

@@ -0,0 +1,63 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.Json.Serialization;
+using SqlSugar;
+namespace Yi.Framework.Model.Models
+{
+    /// <summary>
+    /// 角色表
+    ///</summary>
+    [SugarTable("Role")]
+    public partial class RoleEntity:IBaseModelEntity
+    {
+        public RoleEntity()
+        {
+            this.IsDeleted = false;
+            this.CreateTime = DateTime.Now;
+        }
+        [JsonConverter(typeof(ValueToStringConverter))]
+        [SugarColumn(ColumnName="Id" ,IsPrimaryKey = true   )]
+         public long Id { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
+         [SugarColumn(ColumnName="RoleName"    )]
+         public string RoleName { get; set; }
+        /// <summary>
+        /// 创建者 
+        ///</summary>
+         [SugarColumn(ColumnName="CreateUser"    )]
+         public long? CreateUser { get; set; }
+        /// <summary>
+        /// 创建时间 
+        ///</summary>
+         [SugarColumn(ColumnName="CreateTime"    )]
+         public DateTime? CreateTime { get; set; }
+        /// <summary>
+        /// 修改时间 
+        ///</summary>
+         [SugarColumn(ColumnName="ModifyTime"    )]
+         public DateTime? ModifyTime { get; set; }
+        /// <summary>
+        /// 是否删除 
+        ///</summary>
+         [SugarColumn(ColumnName="IsDeleted"    )]
+         public bool? IsDeleted { get; set; }
+        /// <summary>
+        /// 租户Id 
+        ///</summary>
+         [SugarColumn(ColumnName="TenantId"    )]
+         public long? TenantId { get; set; }
+        /// <summary>
+        /// 修改者 
+        ///</summary>
+         [SugarColumn(ColumnName="ModifyUser"    )]
+         public long? ModifyUser { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
+         [SugarColumn(ColumnName="RoleCode"    )]
+         public string RoleCode { get; set; }
+    }
+}

Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/RoleMenuEntity.cs

@@ -0,0 +1,63 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.Json.Serialization;
+using SqlSugar;
+namespace Yi.Framework.Model.Models
+{
+    /// <summary>
+    /// 角色菜单关系表
+    ///</summary>
+    [SugarTable("RoleMenu")]
+    public partial class RoleMenuEntity:IBaseModelEntity
+    {
+        public RoleMenuEntity()
+        {
+            this.IsDeleted = false;
+            this.CreateTime = DateTime.Now;
+        }
+        [JsonConverter(typeof(ValueToStringConverter))]
+        [SugarColumn(ColumnName="Id" ,IsPrimaryKey = true   )]
+         public long Id { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
+         [SugarColumn(ColumnName="RoleId"    )]
+         public long? RoleId { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
+         [SugarColumn(ColumnName="MenuId"    )]
+         public long? MenuId { get; set; }
+        /// <summary>
+        /// 创建者 
+        ///</summary>
+         [SugarColumn(ColumnName="CreateUser"    )]
+         public long? CreateUser { get; set; }
+        /// <summary>
+        /// 创建时间 
+        ///</summary>
+         [SugarColumn(ColumnName="CreateTime"    )]
+         public DateTime? CreateTime { get; set; }
+        /// <summary>
+        /// 修改者 
+        ///</summary>
+         [SugarColumn(ColumnName="ModifyUser"    )]
+         public long? ModifyUser { get; set; }
+        /// <summary>
+        /// 修改时间 
+        ///</summary>
+         [SugarColumn(ColumnName="ModifyTime"    )]
+         public DateTime? ModifyTime { get; set; }
+        /// <summary>
+        /// 是否删除 
+        ///</summary>
+         [SugarColumn(ColumnName="IsDeleted"    )]
+         public bool? IsDeleted { get; set; }
+        /// <summary>
+        /// 租户Id 
+        ///</summary>
+         [SugarColumn(ColumnName="TenantId"    )]
+         public long? TenantId { get; set; }
+    }
+}

Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/TenantEntity.cs

@@ -0,0 +1,58 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.Json.Serialization;
+using SqlSugar;
+namespace Yi.Framework.Model.Models
+{
+    /// <summary>
+    /// 租户表
+    ///</summary>
+    [SugarTable("Tenant")]
+    public partial class TenantEntity:IBaseModelEntity
+    {
+        public TenantEntity()
+        {
+            this.IsDeleted = false;
+            this.CreateTime = DateTime.Now;
+        }
+        [JsonConverter(typeof(ValueToStringConverter))]
+        [SugarColumn(ColumnName="Id" ,IsPrimaryKey = true   )]
+         public long Id { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
+         [SugarColumn(ColumnName="TenantName"    )]
+         public string TenantName { get; set; }
+        /// <summary>
+        /// 创建者 
+        ///</summary>
+         [SugarColumn(ColumnName="CreateUser"    )]
+         public long? CreateUser { get; set; }
+        /// <summary>
+        /// 创建时间 
+        ///</summary>
+         [SugarColumn(ColumnName="CreateTime"    )]
+         public DateTime? CreateTime { get; set; }
+        /// <summary>
+        /// 修改者 
+        ///</summary>
+         [SugarColumn(ColumnName="ModifyUser"    )]
+         public long? ModifyUser { get; set; }
+        /// <summary>
+        /// 修改时间 
+        ///</summary>
+         [SugarColumn(ColumnName="ModifyTime"    )]
+         public DateTime? ModifyTime { get; set; }
+        /// <summary>
+        /// 是否删除 
+        ///</summary>
+         [SugarColumn(ColumnName="IsDeleted"    )]
+         public bool? IsDeleted { get; set; }
+        /// <summary>
+        /// 租户Id 
+        ///</summary>
+         [SugarColumn(ColumnName="TenantId"    )]
+         public long? TenantId { get; set; }
+    }
+}

Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/UserEntity.cs

@@ -0,0 +1,113 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.Json.Serialization;
+using SqlSugar;
+namespace Yi.Framework.Model.Models
+{
+    /// <summary>
+    /// 用户表
+    ///</summary>
+    [SugarTable("User")]
+    public partial class UserEntity:IBaseModelEntity
+    {
+        public UserEntity()
+        {
+            this.IsDeleted = false;
+            this.CreateTime = DateTime.Now;
+        }
+        [JsonConverter(typeof(ValueToStringConverter))]
+        [SugarColumn(ColumnName="Id" ,IsPrimaryKey = true   )]
+         public long Id { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
+         [SugarColumn(ColumnName="Name"    )]
+         public string Name { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
+         [SugarColumn(ColumnName="Age"    )]
+         public int? Age { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
+         [SugarColumn(ColumnName="CreateUser"    )]
+         public long? CreateUser { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
+         [SugarColumn(ColumnName="CreateTime"    )]
+         public DateTime? CreateTime { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
+         [SugarColumn(ColumnName="ModifyUser"    )]
+         public long? ModifyUser { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
+         [SugarColumn(ColumnName="ModifyTime"    )]
+         public DateTime? ModifyTime { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
+         [SugarColumn(ColumnName="IsDeleted"    )]
+         public bool? IsDeleted { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
+         [SugarColumn(ColumnName="TenantId"    )]
+         public long? TenantId { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
+         [SugarColumn(ColumnName="UserName"    )]
+         public string UserName { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
+         [SugarColumn(ColumnName="Password"    )]
+         public string Password { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
+         [SugarColumn(ColumnName="Salt"    )]
+         public string Salt { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
+         [SugarColumn(ColumnName="Icon"    )]
+         public string Icon { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
+         [SugarColumn(ColumnName="Nick"    )]
+         public string Nick { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
+         [SugarColumn(ColumnName="Email"    )]
+         public string Email { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
+         [SugarColumn(ColumnName="Ip"    )]
+         public string Ip { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
+         [SugarColumn(ColumnName="Address"    )]
+         public string Address { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
+         [SugarColumn(ColumnName="Phone"    )]
+         public string Phone { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
+         [SugarColumn(ColumnName="Introduction"    )]
+         public string Introduction { get; set; }
+    }
+}

Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/UserRoleEntity.cs

@@ -0,0 +1,63 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.Json.Serialization;
+using SqlSugar;
+namespace Yi.Framework.Model.Models
+{
+    /// <summary>
+    /// 用户角色关系表
+    ///</summary>
+    [SugarTable("UserRole")]
+    public partial class UserRoleEntity:IBaseModelEntity
+    {
+        public UserRoleEntity()
+        {
+            this.IsDeleted = false;
+            this.CreateTime = DateTime.Now;
+        }
+        [JsonConverter(typeof(ValueToStringConverter))]
+        [SugarColumn(ColumnName="Id" ,IsPrimaryKey = true   )]
+         public long Id { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
+         [SugarColumn(ColumnName="RoleId"    )]
+         public long? RoleId { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
+         [SugarColumn(ColumnName="UserId"    )]
+         public long? UserId { get; set; }
+        /// <summary>
+        /// 创建者 
+        ///</summary>
+         [SugarColumn(ColumnName="CreateUser"    )]
+         public long? CreateUser { get; set; }
+        /// <summary>
+        /// 创建时间 
+        ///</summary>
+         [SugarColumn(ColumnName="CreateTime"    )]
+         public DateTime? CreateTime { get; set; }
+        /// <summary>
+        /// 修改时间 
+        ///</summary>
+         [SugarColumn(ColumnName="ModifyTime"    )]
+         public DateTime? ModifyTime { get; set; }
+        /// <summary>
+        /// 是否删除 
+        ///</summary>
+         [SugarColumn(ColumnName="IsDeleted"    )]
+         public bool? IsDeleted { get; set; }
+        /// <summary>
+        /// 租户Id 
+        ///</summary>
+         [SugarColumn(ColumnName="TenantId"    )]
+         public long? TenantId { get; set; }
+        /// <summary>
+        /// 修改者 
+        ///</summary>
+         [SugarColumn(ColumnName="ModifyUser"    )]
+         public long? ModifyUser { get; set; }
+    }
+}

Yi.Framework.Net6/Yi.Framework.Model/RoleEntity.cs

@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.Json.Serialization;
+using SqlSugar;
+namespace Yi.Framework.Model.Models
+{
+
+    public partial class RoleEntity
+    {
+        //[Navigate(typeof(UserRoleEntity), nameof(UserRoleEntity.RoleId), nameof(UserRoleEntity.UserId))]
+        //public List<UserEntity> Users { get; set; }
+        [Navigate(typeof(RoleMenuEntity),nameof(RoleMenuEntity.RoleId),nameof(RoleMenuEntity.MenuId))]
+        public List<MenuEntity> Menus { get; set; }
+    }
+}

Yi.Framework.Net6/Yi.Framework.Model/UserEntity.cs

@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using SqlSugar;
+namespace Yi.Framework.Model.Models
+{
+    public partial class UserEntity
+    {
+        /// <summary>
+        ///  看好啦！ORM精髓，导航属性
+        ///</summary>
+        [Navigate(typeof(UserRoleEntity), nameof(UserRoleEntity.UserId), nameof(UserRoleEntity.RoleId))]
+        public List<RoleEntity> Roles { get; set; }
+
+
+        /// <summary>
+        /// 构建密码，MD5盐值加密
+        /// </summary>
+        public void BuildPassword(string password = null)
+        {
+            //如果不传值，那就把自己的password当作传进来的password
+            if (password == null)
+            {
+                password = this.Password;
+            }
+            this.Salt = Common.Helper.MD5Helper.GenerateSalt();
+            this.Password = Common.Helper.MD5Helper.SHA2Encode(password, this.Salt);
+        }
+    }
+}

Yi.Framework.Net6/Yi.Framework.Model/Yi.Framework.Model.csproj

@@ -6,7 +6,7 @@
 
   <ItemGroup>
     <PackageReference Include="NEST" Version="7.16.0" />
-    <PackageReference Include="SqlSugarCore" Version="5.0.7.2" />
+    <PackageReference Include="SqlSugarCore" Version="5.0.7.8" />
   </ItemGroup>
 
   <ItemGroup>

Yi.Framework.Net6/Yi.Framework.Repository/DataContext.cs

@@ -1,15 +1,15 @@
-using SqlSugar;
-using Yi.Framework.Common.Models;
+//using SqlSugar;
+//using Yi.Framework.Common.Models;
+//using Yi.Framework.Model.Models;
 
-namespace Yi.Framework.Repository
-{
-    public class DataContext<T> : SimpleClient<T> where T : class, new()
-    {
-        public DataContext(ISqlSugarClient context) : base(context)
-        {
-            Db =base.Context;
-        }
+//namespace Yi.Framework.Repository
+//{
+//    public class DataContext<T> : SimpleClient<T> where T : class, IBaseModelEntity, new()
+//    {
+//        public DataContext(ISqlSugarClient context) : base(context)
+//        {
+//        }
         
-        public ISqlSugarClient Db;
-    }
-}
+//    }
+//}
+//简化已被弃用

Yi.Framework.Net6/Yi.Framework.Repository/IRepository.cs

@@ -11,7 +11,7 @@ using Yi.Framework.Model.Query;
 
 namespace Yi.Framework.Repository
 {
-    public interface IRepository<T> : ISimpleClient<T> where T : BaseModelEntity,new()
+    public interface IRepository<T> : ISimpleClient<T> where T : class, IBaseModelEntity, new()
     {
         public ISqlSugarClient _Db { get; set; }
         public Task<bool> UseTranAsync(Func<Task> func);
@@ -21,8 +21,8 @@ namespace Yi.Framework.Repository
         public  Task<List<T>> GetListAsync(QueryCondition pars);
         public Task<bool> DeleteByLogicAsync(List<long> ids);
         public  Task<bool> UpdateIgnoreNullAsync(T entity);
-        public  Task<List<S>> UseSqlAsync<S>(string sql);
-        public  Task<bool> UseSqlAsync(string sql);
-
+        public  Task<List<S>> UseSqlAsync<S>(string sql, object parameters = null);
+        public  Task<bool> UseSqlAsync(string sql, object parameters = null);
+        ISugarQueryable<T> QueryConditionHandler(QueryCondition pars);
     }
 }

Yi.Framework.Net6/Yi.Framework.Repository/Repository.cs

@@ -12,16 +12,15 @@ namespace Yi.Framework.Repository
     /// 仓储模式
     /// </summary>
     /// <typeparam name="T"></typeparam>
-    public class Repository<T> : DataContext<T>, IRepository<T> where T : BaseModelEntity,new()
+    public class Repository<T> : SimpleClient<T>, IRepository<T> where T : class, IBaseModelEntity, new()
     {
-        public ISqlSugarClient _Db { get; set; }
+        public ISqlSugarClient _Db { get { return base.Context; } set { } }
         /// <summary>
         /// 构造函数
         /// </summary>
         /// <param name="context"></param>
         public Repository(ISqlSugarClient context) : base(context)//注意这里要有默认值等于null
         {
-            _Db = context;
         }
 
         /// <summary>
@@ -31,7 +30,8 @@ namespace Yi.Framework.Repository
         /// <returns></returns>
         public async Task<bool> UseTranAsync(Func<Task> func)
         {
-            var res = await Db.AsTenant().UseTranAsync(func);
+            var con = Context;
+            var res = await _Db.AsTenant().UseTranAsync(func);
             return res.IsSuccess;
 
         }
@@ -42,24 +42,21 @@ namespace Yi.Framework.Repository
         /// <typeparam name="S"></typeparam>
         /// <param name="sql"></param>
         /// <returns></returns>
-        public async Task<List<S>> UseSqlAsync<S>(string sql)
+        public async Task<List<S>> UseSqlAsync<S>(string sql, object parameters = null)
         {
-            return await Db.Ado.SqlQueryAsync<S>(sql);
+            return await _Db.Ado.SqlQueryAsync<S>(sql, parameters);
         }
 
-
         /// <summary>
         /// 执行增删改sql返回状态
         /// </summary>
         /// <param name="sql"></param>
         /// <returns></returns>
-        public async Task<bool> UseSqlAsync(string sql)
+        public async Task<bool> UseSqlAsync(string sql, object parameters)
         {
-            return await Db.Ado.ExecuteCommandAsync(sql)>0;
+            return await _Db.Ado.ExecuteCommandAsync(sql,  parameters) >0;
         }
 
-
-
         /// <summary>
         /// 添加返回实体
         /// </summary>
@@ -68,7 +65,7 @@ namespace Yi.Framework.Repository
         public async Task<T> InsertReturnEntityAsync(T entity)
         {
             entity.Id =SnowFlakeSingle.instance.getID();
-            return await Db.Insertable(entity).ExecuteReturnEntityAsync();
+            return await _Db.Insertable(entity).ExecuteReturnEntityAsync();
         }
 
         /// <summary>
@@ -78,7 +75,7 @@ namespace Yi.Framework.Repository
         /// <returns></returns>
         public async Task<bool> UpdateIgnoreNullAsync(T entity)
         {
-            return await Db.Updateable(entity).IgnoreColumns(true).ExecuteCommandAsync()>0;
+            return await _Db.Updateable(entity).IgnoreColumns(true).ExecuteCommandAsync()>0;
         }
 
 
@@ -88,9 +85,9 @@ namespace Yi.Framework.Repository
         /// <returns></returns>
         public async Task<bool> DeleteByLogicAsync(List<long> ids)
         {
-            var entitys = await Db.Queryable<T>().Where(u => ids.Contains(u.Id)).ToListAsync();
+            var entitys = await _Db.Queryable<T>().Where(u => ids.Contains(u.Id)).ToListAsync();
             entitys.ForEach(u=>u.IsDeleted=true);
-            return await Db.Updateable(entitys).ExecuteCommandAsync()>0;
+            return await _Db.Updateable(entitys).ExecuteCommandAsync()>0;
         }
 
 
@@ -103,7 +100,7 @@ namespace Yi.Framework.Repository
         /// <returns></returns>
         public async Task<List<S>> StoreAsync<S>(string storeName, object para)
         {
-            return await Db.Ado.UseStoredProcedure().SqlQueryAsync<S>(storeName, para);
+            return await _Db.Ado.UseStoredProcedure().SqlQueryAsync<S>(storeName, para);
         }
 
 
@@ -134,7 +131,7 @@ namespace Yi.Framework.Repository
 
 
 
-        private ISugarQueryable<T> QueryConditionHandler(QueryCondition pars)
+        public ISugarQueryable<T> QueryConditionHandler(QueryCondition pars)
         {
             var sugarParamters = pars.Parameters.Select(it => (IConditionalModel)new ConditionalModel()
             {
@@ -142,7 +139,7 @@ namespace Yi.Framework.Repository
                 FieldName = it.Key,
                 FieldValue = it.Value
             }).ToList();
-            var query = Db.Queryable<T>();
+            var query = _Db.Queryable<T>();
             if (pars.OrderBys != null)
             {
                 foreach (var item in pars.OrderBys)

Yi.Framework.Net6/Yi.Framework.Service/BaseService.cs

@@ -9,7 +9,7 @@ using Yi.Framework.Repository;
 
 namespace Yi.Framework.Service
 {
-    public class BaseService<T>:IBaseService<T> where T:BaseModelEntity,new()
+    public class BaseService<T>:IBaseService<T> where T:class, IBaseModelEntity,new()
     {
         public IRepository<T> _repository { get; set; }
         public BaseService(IRepository<T> iRepository)

Yi.Framework.Net6/Yi.Framework.Service/LogService.cs

@@ -0,0 +1,23 @@
+using SqlSugar;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Yi.Framework.Interface;
+using Yi.Framework.Model.Models;
+using Yi.Framework.Repository;
+
+namespace Yi.Framework.Service
+{
+    public partial class LogService 
+    {
+        public async Task<List<long>> AddListTest(List<LogEntity> logEntities)
+        {
+            return await _repository._Db.Insertable(logEntities).SplitTable().ExecuteReturnSnowflakeIdListAsync();
+        }
+
+        public async Task<List<LogEntity>> GetListTest()
+        {
+            return await _repository._Db.Queryable<LogEntity>().SplitTable(tas => tas.Where(u => u.TableName.Contains("2020") || u.TableName.Contains("2021"))).ToListAsync();
+        }
+    }
+}

Yi.Framework.Net6/Yi.Framework.Service/MenuService.cs

@@ -0,0 +1,19 @@
+using SqlSugar;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Yi.Framework.Interface;
+using Yi.Framework.Model.Models;
+using Yi.Framework.Repository;
+
+namespace Yi.Framework.Service
+{
+    public partial class MenuService : BaseService<MenuEntity>, IMenuService
+    {
+        public async Task<List<MenuEntity>> GetMenuTreeAsync()
+        {
+            //ParentId 0,代表为根目录，只能存在一个
+            //复杂查询直接使用db代理
+            return await _repository._Db.Queryable<MenuEntity>().Where(u=>u.IsDeleted==false).ToTreeAsync(it=>it.Children,it=>it.ParentId,0);
+        }
+    }
+}

Yi.Framework.Net6/Yi.Framework.Service/RoleService.cs

@@ -0,0 +1,50 @@
+using SqlSugar;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Yi.Framework.Interface;
+using Yi.Framework.Model.Models;
+using Yi.Framework.Repository;
+
+namespace Yi.Framework.Service
+{
+    public partial class RoleService 
+    {
+        public async Task<List<RoleEntity>> DbTest()
+        {
+            return await _repository._Db.Queryable<RoleEntity>().ToListAsync();
+        }
+        public async Task<bool> GiveRoleSetMenu(List<long> roleIds, List<long> menuIds)
+        {
+          var _repositoryRoleMenu=  _repository.ChangeRepository<Repository<RoleMenuEntity>>();
+            //多次操作，需要事务确保原子性
+            return await _repositoryRoleMenu.UseTranAsync(async () =>
+            {
+
+                //遍历用户
+                foreach (var roleId in roleIds)
+                {
+                    //删除用户之前所有的用户角色关系（物理删除，没有恢复的必要）
+                    await _repositoryRoleMenu.DeleteAsync(u => u.RoleId==roleId);
+
+                    //添加新的关系
+                    List<RoleMenuEntity> roleMenuEntity = new();
+                    foreach (var menu in menuIds)
+                    {
+                        roleMenuEntity.Add(new RoleMenuEntity() { RoleId = roleId,MenuId=menu });
+                    }
+
+                    //一次性批量添加
+                    await _repositoryRoleMenu.InsertReturnSnowflakeIdAsync(roleMenuEntity);
+                }
+            });
+
+
+        }
+
+        public async Task<RoleEntity> GetInMenuByRoleId(long roleId)
+        {
+            return await _repository._Db.Queryable<RoleEntity>().Includes(u => u.Menus).InSingleAsync(roleId);
+        
+        }
+    }
+}

Yi.Framework.Net6/Yi.Framework.Service/ServiceTemplate/LogService.cs

@@ -0,0 +1,14 @@
+using SqlSugar;
+using Yi.Framework.Interface;
+using Yi.Framework.Model.Models;
+using Yi.Framework.Repository;
+
+namespace Yi.Framework.Service
+{
+    public partial class LogService : BaseService<LogEntity>, ILogService
+    {
+        public LogService(IRepository<LogEntity> repository) : base(repository)
+        {
+        }
+    }
+}

Yi.Framework.Net6/Yi.Framework.Service/ServiceTemplate/MenuService.cs

@@ -0,0 +1,14 @@
+using SqlSugar;
+using Yi.Framework.Interface;
+using Yi.Framework.Model.Models;
+using Yi.Framework.Repository;
+
+namespace Yi.Framework.Service
+{
+    public partial class MenuService : BaseService<MenuEntity>, IMenuService
+    {
+        public MenuService(IRepository<MenuEntity> repository) : base(repository)
+        {
+        }
+    }
+}

Yi.Framework.Net6/Yi.Framework.Service/ServiceTemplate/RoleService.cs

@@ -0,0 +1,14 @@
+using SqlSugar;
+using Yi.Framework.Interface;
+using Yi.Framework.Model.Models;
+using Yi.Framework.Repository;
+
+namespace Yi.Framework.Service
+{
+    public partial class RoleService : BaseService<RoleEntity>, IRoleService
+    {
+        public RoleService(IRepository<RoleEntity> repository) : base(repository)
+        {
+        }
+    }
+}

Yi.Framework.Net6/Yi.Framework.Service/UserService.cs

@@ -1,8 +1,11 @@
 using SqlSugar;
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using Yi.Framework.Common.Helper;
+using Yi.Framework.DTOModel;
 using Yi.Framework.Interface;
 using Yi.Framework.Model.Models;
 using Yi.Framework.Repository;
@@ -15,7 +18,7 @@ namespace Yi.Framework.Service
         {
             return await _repository._Db.Queryable<UserEntity>().ToListAsync();
         }
-        public async Task<bool> Exist(Guid id, Action<UserEntity> userAction = null)
+        public async Task<bool> Exist(long id, Action<UserEntity> userAction = null)
         {
             var user = await _repository.GetByIdAsync(id);
             userAction.Invoke(user);
@@ -27,7 +30,7 @@ namespace Yi.Framework.Service
         }
         public async Task<bool> Exist(string userName, Action<UserEntity> userAction = null)
         {
-            var user = await _repository.GetFirstAsync(u=>u.UserName== userName);
+            var user = await _repository.GetFirstAsync(u => u.UserName == userName);
             if (userAction != null)
             {
                 userAction.Invoke(user);
@@ -38,18 +41,18 @@ namespace Yi.Framework.Service
             }
             return true;
         }
-        public async Task<bool> Login(string userName, string password,Action<UserEntity> userAction = null)
+        public async Task<bool> Login(string userName, string password, Action<UserEntity> userAction = null)
         {
-           var user=new UserEntity();
+            var user = new UserEntity();
             if (await Exist(userName, o => user = o))
             {
                 userAction.Invoke(user);
-                if (user.Password== Common.Helper.MD5Helper.SHA2Encode(password, user.Salt))
+                if (user.Password == Common.Helper.MD5Helper.SHA2Encode(password, user.Salt))
                 {
                     return true;
                 }
             }
-          return false;
+            return false;
         }
 
         public async Task<bool> Register(UserEntity userEntity, Action<UserEntity> userAction = null)
@@ -57,13 +60,89 @@ namespace Yi.Framework.Service
             var user = new UserEntity();
             if (!await Exist(userEntity.UserName))
             {
-                user.UserName= userEntity.UserName;
-                user.Salt = Common.Helper.MD5Helper.GenerateSalt();
-                user.Password = Common.Helper.MD5Helper.SHA2Encode(userEntity.Password,user.Salt);
+                user.UserName = userEntity.UserName;
+                user.BuildPassword();
                 userAction.Invoke(await _repository.InsertReturnEntityAsync(user));
                 return true;
             }
             return false;
         }
+
+        public async Task<List<UserEntity>> GetListInRole()
+        {
+            return await _repository._Db.Queryable<UserEntity>().Includes(u => u.Roles).ToListAsync();
+        }
+
+        public async Task<bool> GiveUserSetRole(List<long> userIds, List<long> roleIds)
+        {
+            var _repositoryUserRole = _repository.ChangeRepository<Repository<UserRoleEntity>>();
+
+            //多次操作，需要事务确保原子性
+            return await _repositoryUserRole.UseTranAsync(async () =>
+             {
+
+                 //遍历用户
+                 foreach (var userId in userIds)
+                 {
+                     //删除用户之前所有的用户角色关系（物理删除，没有恢复的必要）
+                     await _repositoryUserRole.DeleteAsync(u => u.UserId == userId);
+
+                     //添加新的关系
+                     List<UserRoleEntity> userRoleEntities = new();
+                     foreach (var roleId in roleIds)
+                     {
+                         userRoleEntities.Add(new UserRoleEntity() { UserId = userId, RoleId = roleId });
+                     }
+
+                     //一次性批量添加
+                     await _repositoryUserRole.InsertReturnSnowflakeIdAsync(userRoleEntities);
+                 }
+             });
+        }
+
+
+        public async Task<List<RoleEntity>> GetRoleListByUserId(long userId)
+        {
+            return (await _repository._Db.Queryable<UserEntity>().Includes(u => u.Roles).InSingleAsync(userId)).Roles;
+        }
+
+        public async Task<UserRoleMenuDto> GetUserAllInfo(long userId)
+        {
+
+            var userRoleMenu = new UserRoleMenuDto();
+            //首先获取到该用户全部信息，导航到角色、菜单，(菜单需要去重,完全交给Set来处理即可)
+
+            //得到用户
+            var user = await _repository._Db.Queryable<UserEntity>().Includes(u => u.Roles.Where(r=>r.IsDeleted==false).ToList(), r => r.Menus.Where(m=>m.IsDeleted==false).ToList()).InSingleAsync(userId);
+
+            //得到角色集合
+            var roleList = user.Roles;
+
+            //得到菜单集合
+            foreach (var role in roleList)
+            {
+                foreach (var menu in role.Menus)
+                {
+                    userRoleMenu.Menus.Add(menu);
+                }
+                //刚好可以去除一下多余的导航属性
+                role.Menus = null;
+                userRoleMenu.Roles.Add(role);
+            }
+
+            user.Roles = null;
+            userRoleMenu.User = user;
+
+            return userRoleMenu;
+        }
+
+        public bool JudgePassword(UserEntity user,string password)
+        {
+            if (user.Password == MD5Helper.SHA2Encode(password, user.Salt))
+            {
+                return true;
+            }
+            return false;
+        }
     }
 }

Yi.Framework.Net6/Yi.Framework.WebCore/AttributeExtend/PermissionAttribute.cs

@@ -3,6 +3,7 @@ using Microsoft.IdentityModel.JsonWebTokens;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 
 namespace Yi.Framework.WebCore.AttributeExtend
@@ -40,11 +41,24 @@ namespace Yi.Framework.WebCore.AttributeExtend
             var perList = context.HttpContext.User.Claims.Where(u => u.Type == "permission").Select(u=> u.Value.ToString().ToLower()). ToList();
             //判断权限是否存在Redis中,或者jwt中
 
-            //if (perList.Contains(permission.ToLower()))
-            //{
-            //    result = true;
-            //}
-             result = true;
+            //进行正则表达式的匹配，以code开头
+            Regex regex = new Regex($"^{permission.ToLower()}");
+            foreach (var p in perList)
+            {
+                //过滤多余的标签
+                p.Replace("Entity","");
+                p.Replace("entity","");
+                if (regex.IsMatch(p))
+                {
+                    result = true;
+                    break;
+                }
+            }
+            //用户的增删改查直接可以user:*即可
+
+
+            //这里暂时全部放行即可
+            result = true;
 
 
             if (!result)

Yi.Framework.Net6/Yi.Framework.WebCore/BuilderExtend/JsonExtension.cs

@@ -1,4 +1,6 @@
 using Microsoft.Extensions.DependencyInjection;
+using Newtonsoft.Json.Serialization;
+using SqlSugar;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -15,6 +17,8 @@ namespace Yi.Framework.WebCore.BuilderExtend
              {
                  options.SerializerSettings.ReferenceLoopHandling = Newtonsoft.Json.ReferenceLoopHandling.Ignore;
                  options.SerializerSettings.DateFormatString = "yyyy-MM-dd HH:mm";
+ 
+                 //options.SerializerSettings.Converters.Add(new ValueToStringConverter());
              });
 
         }

Yi.Framework.Net6/Yi.Framework.WebCore/BuilderExtend/JsonFileExtension.cs

@@ -13,7 +13,7 @@ namespace Yi.Framework.WebCore.BuilderExtend
         {
             if (JsonFile==null)
             {
-                string[] myJsonFile = new string[] { "appsettings.json", "configuration.json" };
+                string[] myJsonFile = new string[] { "appsettings.json", "Config/configuration.json" };
                 foreach (var item in myJsonFile)
                 {
                     builder.AddJsonFile(item, optional: true, reloadOnChange: false);

Yi.Framework.Net6/Yi.Framework.WebCore/CommonExtend.cs

@@ -8,6 +8,7 @@ using System.Security.Claims;
 using System.Text;
 using System.Threading.Tasks;
 using Yi.Framework.Model.Models;
+using System.IdentityModel.Tokens.Jwt;
 
 namespace Yi.Framework.WebCore
 {
@@ -32,17 +33,22 @@ namespace Yi.Framework.WebCore
         /// <returns></returns>
         public static UserEntity GetCurrentUserEntityInfo(this HttpContext httpContext, out List<Guid> menuIds)
         {
-            IEnumerable<Claim> claimlist = httpContext.AuthenticateAsync().Result.Principal.Claims;
-              
-       long.TryParse(claimlist.FirstOrDefault(u => u.Type == ClaimTypes.Sid).Value,out var resId)  ;
-
+            IEnumerable<Claim> claimlist = null;
+            long resId = 0;
+            try
+            {
+                claimlist = httpContext.AuthenticateAsync().Result.Principal.Claims;
+                resId = Convert.ToInt64(claimlist.FirstOrDefault(u => u.Type == JwtRegisteredClaimNames.Sid).Value);
+            }
+            catch
+            {
+                throw new Exception("未授权，Token鉴权失败！");
+            }
             menuIds = claimlist.Where(u => u.Type == "menuIds").ToList().Select(u => new Guid(u.Value)).ToList();
-
-
             return new UserEntity()
             {
                 Id = resId,
-                Name = claimlist.FirstOrDefault(u => u.Type == ClaimTypes.Name).Value 
+                //Name = claimlist.FirstOrDefault(u => u.Type == JwtRegisteredClaimNames.Name).Value
             };
         }
     }

Yi.Framework.Net6/Yi.Framework.WebCore/MiddlewareExtend/SqlsugarExtension.cs

@@ -12,6 +12,9 @@ namespace Yi.Framework.WebCore.MiddlewareExtend
     {
         public static void AddSqlsugarServer(this IServiceCollection services)
         {
+
+           
+
             DbType dbType;
             var slavaConFig = new List<SlaveConnectionConfig>();
             if (Appsettings.appBool("MutiDB_Enabled"))
@@ -42,7 +45,19 @@ namespace Yi.Framework.WebCore.MiddlewareExtend
                     DisableNvarchar = true 
                 },
                 SlaveConnectionConfigs = slavaConFig,
-               
+                //设置codefirst非空值判断
+                ConfigureExternalServices = new ConfigureExternalServices
+                {
+                    EntityService = (c, p) =>
+                    {
+                        // int?  decimal?这种 isnullable=true
+                        if (c.PropertyType.IsGenericType &&
+                        c.PropertyType.GetGenericTypeDefinition() == typeof(Nullable<>))
+                        {
+                            p.IsNullable = true;
+                        }
+                    }
+                }
             },
          db =>
          {
@@ -80,6 +95,10 @@ namespace Yi.Framework.WebCore.MiddlewareExtend
 
                  Console.WriteLine("_______________________________________________");
                  Console.WriteLine("执行SQL:"+s.ToString());
+                 foreach (var i in p)
+                 {
+                     Console.WriteLine("参数:" +i.ParameterName+",参数值"+i.Value);
+                 }
                  Console.WriteLine("_______________________________________________");
              };
 

Yi.Framework.Net6/Yi.Framework.WebCore/MiddlewareExtend/SwaggerExtension.cs

@@ -34,7 +34,7 @@ namespace Yi.Framework.WebCore.MiddlewareExtend
                 var apiXmlPath = Path.Combine(basePath, @"SwaggerDoc.xml");//控制器层注释
                 //var entityXmlPath = Path.Combine(basePath, @"SwaggerDoc.xml");//实体注释
                 //c.IncludeXmlComments(apiXmlPath, true);//true表示显示控制器注释
-                c.IncludeXmlComments(apiXmlPath,true);
+                c.IncludeXmlComments(apiXmlPath, true);
 
                 //添加控制器注释
                 //c.DocumentFilter<SwaggerDocTag>();
@@ -42,36 +42,51 @@ namespace Yi.Framework.WebCore.MiddlewareExtend
                 //添加header验证信息
                 //c.OperationFilter<SwaggerHeader>();
                 //var security = new Dictionary<string, IEnumerable<string>> { { "Bearer", new string[] { } }, };
+                c.AddSecurityDefinition("JwtBearer", new OpenApiSecurityScheme()
+                {
+                    Description = "直接输入Token即可",
+                    Name = "Authorization",
+                    In = ParameterLocation.Header,
+                    Type = SecuritySchemeType.Http,
+                    Scheme = "bearer"
+                });
+                var scheme = new OpenApiSecurityScheme()
+                {
+                    Reference = new OpenApiReference() { Type = ReferenceType.SecurityScheme, Id = "JwtBearer" }
+                };
+                c.AddSecurityRequirement(new OpenApiSecurityRequirement()
+                {
+                    [scheme] = new string[0]
+                });
+                //c.AddSecurityDefinition("Bearer", new OpenApiSecurityScheme()
+                //{
+                //    Description = "文本框里输入从服务器获取的Token。格式为：Bearer + 空格+token",//JWT授权(数据将在请求头中进行传输) 参数结构: \"Authorization: Bearer {token}\"
+                //    Name = "Authorization",////jwt默认的参数名称
+                //    In = ParameterLocation.Header,////jwt默认存放Authorization信息的位置(请求头中)
+                //    Type = SecuritySchemeType.ApiKey,
+                //});
+                //c.AddSecurityRequirement(new OpenApiSecurityRequirement
+                //{
+                //    { new OpenApiSecurityScheme
+                //    {
+                //        Reference = new OpenApiReference()
+                //        {
+                //            Id = "Bearer",
+                //            Type = ReferenceType.SecurityScheme
+                //        }
+                //    }, Array.Empty<string>() }
+                //});
 
-                c.AddSecurityDefinition("Bearer", new OpenApiSecurityScheme()
-                {
-                    Description = "文本框里输入从服务器获取的Token。格式为：Bearer + 空格+token",//JWT授权(数据将在请求头中进行传输) 参数结构: \"Authorization: Bearer {token}\"
-                    Name = "Authorization",////jwt默认的参数名称
-                    In = ParameterLocation.Header,////jwt默认存放Authorization信息的位置(请求头中)
-                    Type = SecuritySchemeType.ApiKey,
-                });
-                c.AddSecurityRequirement(new OpenApiSecurityRequirement
-                {
-                    { new OpenApiSecurityScheme
-                    {
-                        Reference = new OpenApiReference()
-                        {
-                            Id = "Bearer",
-                            Type = ReferenceType.SecurityScheme
-                        }
-                    }, Array.Empty<string>() }
-                });
-
-                c.AddServer(new OpenApiServer()
-                {
-                    Url = "https://ccnetcore.com",
-                    Description = "Yi-Framework"
-                });
-                c.CustomOperationIds(apiDesc =>
-                {
-                    var controllerAction = apiDesc.ActionDescriptor as ControllerActionDescriptor;
-                    return controllerAction.ActionName;
-                });
+                //c.AddServer(new OpenApiServer()
+                //{
+                //    Url = "https://ccnetcore.com",
+                //    Description = "Yi-Framework"
+                //});
+                //c.CustomOperationIds(apiDesc =>
+                //{
+                //    var controllerAction = apiDesc.ActionDescriptor as ControllerActionDescriptor;
+                //    return controllerAction.ActionName;
+                //});
             });
             #endregion
 
@@ -85,27 +100,12 @@ namespace Yi.Framework.WebCore.MiddlewareExtend
             app.UseSwagger();
 
 
-            app.UseKnife4UI(c =>
-            {
-                c.RoutePrefix = "swagger"; // serve the UI at root
-                if (swaggerModels.Length == 0)
-                {
-                    c.SwaggerEndpoint("/v1/swagger.json", "Yi.Framework");
-                }
-                else
-                {
-                    foreach (var k in swaggerModels)
-                    {
-                        c.SwaggerEndpoint(k.url, k.name);
-                    }
-                }
-            });
-
-            //app.UseSwaggerUI(c =>
+            //app.UseKnife4UI(c =>
             //{
+            //    c.RoutePrefix = "swagger"; // serve the UI at root
             //    if (swaggerModels.Length == 0)
             //    {
-            //        c.SwaggerEndpoint("/swagger/v1/swagger.json", "Yi.Framework");
+            //        c.SwaggerEndpoint("/v1/swagger.json", "Yi.Framework");
             //    }
             //    else
             //    {
@@ -114,10 +114,25 @@ namespace Yi.Framework.WebCore.MiddlewareExtend
             //            c.SwaggerEndpoint(k.url, k.name);
             //        }
             //    }
+            //});
 
-            //}
+            app.UseSwaggerUI(c =>
+            {
+                if (swaggerModels.Length == 0)
+                {
+                    c.SwaggerEndpoint("/swagger/v1/swagger.json", "Yi.Framework");
+                }
+                else
+                {
+                    foreach (var k in swaggerModels)
+                    {
+                        c.SwaggerEndpoint(k.url, k.name);
+                    }
+                }
 
-            //);
+            }
+
+            );
         }
 
     }

Yi.Vue2.x/.browserslistrc

@@ -0,0 +1,3 @@
+> 1%
+last 2 versions
+not dead

Yi.Vue2.x/.env.development

@@ -0,0 +1,4 @@
+#接口服务地址
+VUE_APP_SERVICE_URL='http://localhost:19001/api'
+#开发环境路径前缀
+VUE_APP_BASE_API='/dev-apis'

Yi.Vue2.x/.env.production

@@ -0,0 +1,2 @@
+#生成环境路径前缀
+VUE_APP_BASE_API='/prod-apis'

Yi.Vue2.x/.gitignore

@@ -0,0 +1,23 @@
+.DS_Store
+node_modules
+/dist
+
+
+# local env files
+.env.local
+.env.*.local
+
+# Log files
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+
+# Editor directories and files
+.idea
+.vscode
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?

Yi.Vue2.x/README.md

@@ -0,0 +1,19 @@
+# vuetify-test
+
+## Project setup
+```
+npm install
+```
+
+### Compiles and hot-reloads for development
+```
+npm run serve
+```
+
+### Compiles and minifies for production
+```
+npm run build
+```
+
+### Customize configuration
+See [Configuration Reference](https://cli.vuejs.org/config/).

Yi.Vue2.x/package.json

@@ -0,0 +1,30 @@
+{
+  "name": "vuetify-test",
+  "version": "0.1.0",
+  "private": true,
+  "scripts": {
+    "serve": "vue-cli-service serve",
+    "build": "vue-cli-service build"
+  },
+  "dependencies": {
+    "@mdi/font": "^6.6.96",
+    "axios": "^0.22.0",
+    "json-bigint": "^1.0.0",
+    "typeface-roboto": "^1.1.13",
+    "vue": "^2.6.11",
+    "vue-chartist": "^2.3.1",
+    "vue-router": "^3.2.0",
+    "vuetify": "^2.4.0",
+    "vuetify-dialog": "^2.0.17",
+    "vuex": "^3.6.2"
+  },
+  "devDependencies": {
+    "@vue/cli-plugin-router": "~4.5.0",
+    "@vue/cli-service": "~4.5.0",
+    "sass": "~1.32.0",
+    "sass-loader": "^10.0.0",
+    "vue-cli-plugin-vuetify": "~2.4.2",
+    "vue-template-compiler": "^2.6.11",
+    "vuetify-loader": "^1.7.0"
+  }
+}

Yi.Vue2.x/public/index.html

@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width,initial-scale=1.0">
+    <link rel="icon" href="<%= BASE_URL %>favicon.ico">
+    <title>Yi-Vue</title>
+</head>
+
+<body>
+    <noscript>
+      <strong>We're sorry but Yi-Vue doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
+    </noscript>
+    <div id="app"></div>
+    <!-- built files will be auto injected -->
+</body>
+
+</html>

Yi.Vue2.x/src/App.vue

@@ -0,0 +1,23 @@
+<template>
+  <v-fade-transition mode="out-in">
+    <router-view />
+  </v-fade-transition>
+</template>
+
+<script>
+  // Styles
+  import '@/styles/overrides.sass'
+
+  export default {
+    name: 'App',
+    metaInfo: {
+      title: 'App',
+      titleTemplate: '%s | Material Dashboard Free',
+      htmlAttrs: { lang: 'en' },
+      meta: [
+        { charset: 'utf-8' },
+        { name: 'viewport', content: 'width=device-width, initial-scale=1' },
+      ],
+    },
+  }
+</script>

Yi.Vue2.x/src/api/accountApi.js

@@ -0,0 +1,61 @@
+import myaxios from '@/util/myaxios'
+export default {
+    login(username, password) {
+        return myaxios({
+            url: '/Account/login',
+            method: 'post',
+            data: {
+                username,
+                password
+            }
+        })
+    },
+    logout() {
+        return myaxios({
+            url: '/Account/logout',
+            method: 'post',
+        })
+    },
+    register(username, password, phone, code) {
+        return myaxios({
+            url: `/Account/register?code=${code}`,
+            method: 'post',
+            data: { username, password, phone }
+        })
+    },
+    email(emailAddress) {
+        return myaxios({
+            url: `/Account/email?emailAddress=${emailAddress}`,
+            method: 'post',
+        })
+    },
+    SendSMS(smsAddress) {
+        return myaxios({
+            url: `/Account/SendSMS?SMSAddress=${smsAddress}`,
+            method: 'post',
+        })
+    },
+    updatePassword(oldPassword, newPassword) {
+        return myaxios({
+            url: `/Account/updatePassword`,
+            method: 'put',
+            data: { oldPassword, newPassword }
+        })
+    },
+    getUserAllInfo()
+    {
+        return myaxios({
+            url: `/Account/getUserAllInfo`,
+            method: 'get'
+        })  
+    },
+    updateUserByHttp(user)
+    {
+        return myaxios({
+            url: `/Account/updateUserByHttp`,
+            method: 'put',
+            data:user
+        })  
+    }
+
+}

Yi.Vue2.x/src/api/fileApi.js

@@ -0,0 +1,11 @@
+import myaxios from '@/util/myaxios'
+export default {
+    UploadImage(file) {
+        return myaxios({
+            url: '/Upload/image',
+            method: 'post',
+            headers: { "Content-Type": "multipart/form-data" },
+            data: file
+        })
+    }
+}

Yi.Vue2.x/src/api/menuApi.js

@@ -0,0 +1,30 @@
+import myaxios from '@/util/myaxios'
+export default {
+    getMenuTree() {
+        return myaxios({
+            url: '/Menu/getMenuTree',
+            method: 'get'
+        })
+    },
+    Update(data) {
+        return myaxios({
+            url: '/Menu/Update',
+            method: 'put',
+            data: data
+        })
+    },
+    DeleteList(ids) {
+        return myaxios({
+            url: '/Menu/DeleteList',
+            method: 'delete',
+            data: ids
+        })
+    },
+    Add(data) {
+        return myaxios({
+            url: '/Menu/Add',
+            method: 'post',
+            data: data
+        })
+    }
+}

Yi.Vue2.x/src/api/mouldApi.js

@@ -0,0 +1,10 @@
+import myaxios from '@/util/myaxios'
+export default {
+    getMould() {
+        return myaxios({
+            url: '/Mould/GetMould',
+            method: 'get'
+        })
+    }
+
+}

Yi.Vue2.x/src/api/panApi.js

@@ -0,0 +1,19 @@
+import myaxios from '@/util/myaxios'
+export default {
+    GetPanFiles(dirName) {
+        return myaxios({
+            url: '/Pan/GetPanFiles',
+            method: 'post',
+            data: { dirName}
+        })
+    },
+   Download(dirName,allName)
+   {
+    return myaxios({
+        url: '/Pan/Download',
+        method: 'post',
+        data: { dirName,allName}
+    })
+
+   }
+}

Yi.Vue2.x/src/api/roleApi.js

@@ -0,0 +1,26 @@
+import myaxios from '@/util/myaxios'
+import {objctToDic} from '@/util/objctHandle'
+export default {
+    getList() {
+        return myaxios({
+            url: '/Role/GetList',
+            method: 'post',
+            data: objctToDic()
+        })
+    },
+    giveRoleSetMenu(roleList, menuList) {
+        return myaxios({
+            url: '/Role/GiveRoleSetMenu',
+            method: 'put',
+            data: { RoleIds: roleList, menuIds: menuList }
+        })
+    },
+
+    getInMenuByRoleId(roleId) {
+        return myaxios({
+            url: `/Role/GetInMenuByRoleId?roleId=${roleId}`,
+            method: 'get'
+        })
+    }
+
+}

Yi.Vue2.x/src/api/userApi.js

@@ -0,0 +1,30 @@
+import myaxios from '@/util/myaxios'
+export default {
+
+    GetUserInRolesByHttpUser() {
+        return myaxios({
+            url: `/User/GetUserInRolesByHttpUser`,
+            method: 'get'
+        })
+    },
+    GetMenuByHttpUser() {
+        return myaxios({
+            url: `/User/GetMenuByHttpUser`,
+            method: 'get'
+        })
+    },
+    GetRoleListByUserId(userId) {
+        return myaxios({
+            url: `/User/GetRoleListByUserId?userId=${userId}`,
+            method: 'get'
+        })
+    },
+    GiveUserSetRole(UserIds,RoleIds)
+    {
+        return myaxios({
+            url: `/User/GiveUserSetRole`,
+            method: 'put',
+            data:{UserIds,RoleIds}
+        })
+    }
+}

Yi.Vue2.x/src/assets/logo.svg

@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 87.5 100"><defs><style>.cls-1{fill:#1697f6;}.cls-2{fill:#7bc6ff;}.cls-3{fill:#1867c0;}.cls-4{fill:#aeddff;}</style></defs><title>Artboard 46</title><polyline class="cls-1" points="43.75 0 23.31 0 43.75 48.32"/><polygon class="cls-2" points="43.75 62.5 43.75 100 0 14.58 22.92 14.58 43.75 62.5"/><polyline class="cls-3" points="43.75 0 64.19 0 43.75 48.32"/><polygon class="cls-4" points="64.58 14.58 87.5 14.58 43.75 100 43.75 62.5 64.58 14.58"/></svg>