diff --git a/Yi.Framework.Net6/src/framework/Yi.Framework.AspNetCore/Yi.Framework.AspNetCore.csproj b/Yi.Framework.Net6/src/framework/Yi.Framework.AspNetCore/Yi.Framework.AspNetCore.csproj index 20d2b889..c37d68fb 100644 --- a/Yi.Framework.Net6/src/framework/Yi.Framework.AspNetCore/Yi.Framework.AspNetCore.csproj +++ b/Yi.Framework.Net6/src/framework/Yi.Framework.AspNetCore/Yi.Framework.AspNetCore.csproj @@ -7,10 +7,10 @@ + - diff --git a/Yi.Framework.Net6/src/framework/Yi.Framework.Ddd/Entities/Entity.cs b/Yi.Framework.Net6/src/framework/Yi.Framework.Ddd/Entities/Entity.cs index abf618ea..5a05f2dd 100644 --- a/Yi.Framework.Net6/src/framework/Yi.Framework.Ddd/Entities/Entity.cs +++ b/Yi.Framework.Net6/src/framework/Yi.Framework.Ddd/Entities/Entity.cs @@ -1,5 +1,4 @@ -using NET.AutoWebApi.Helper; -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Security.Principal; diff --git a/Yi.Framework.Net6/src/framework/Yi.Framework.Ddd/Services/CrudAppService.cs b/Yi.Framework.Net6/src/framework/Yi.Framework.Ddd/Services/CrudAppService.cs index e71b6b01..007fe9ab 100644 --- a/Yi.Framework.Net6/src/framework/Yi.Framework.Ddd/Services/CrudAppService.cs +++ b/Yi.Framework.Net6/src/framework/Yi.Framework.Ddd/Services/CrudAppService.cs @@ -122,7 +122,7 @@ namespace Yi.Framework.Ddd.Services /// /// /// - public async Task DeleteAsync(string id) + public virtual async Task DeleteAsync(string id) { if (id is null) { diff --git a/Yi.Framework.Net6/src/module/Yi.Framework.OperLogManager/OperationLogService.cs b/Yi.Framework.Net6/src/module/Yi.Framework.OperLogManager/OperationLogService.cs index 5dab47fb..de954789 100644 --- a/Yi.Framework.Net6/src/module/Yi.Framework.OperLogManager/OperationLogService.cs +++ b/Yi.Framework.Net6/src/module/Yi.Framework.OperLogManager/OperationLogService.cs @@ -1,16 +1,16 @@ -using NET.AutoWebApi.Setting; using Yi.Framework.Ddd.Services; using Yi.Framework.Ddd.Dtos; using Yi.Framework.Core.Attributes; using Microsoft.AspNetCore.Mvc; using SqlSugar; +using Cike.AutoWebApi.Setting; namespace Yi.Framework.OperLogManager { /// /// OperationLog服务实现 /// - [AppService] + //[AppService] public class OperationLogService : CrudAppService, IOperationLogService, IAutoApiService { diff --git a/Yi.Framework.Net6/src/module/Yi.Framework.OperLogManager/YiFrameworkOperLogManagerModule.cs b/Yi.Framework.Net6/src/module/Yi.Framework.OperLogManager/YiFrameworkOperLogManagerModule.cs index 973f80e5..653d1a11 100644 --- a/Yi.Framework.Net6/src/module/Yi.Framework.OperLogManager/YiFrameworkOperLogManagerModule.cs +++ b/Yi.Framework.Net6/src/module/Yi.Framework.OperLogManager/YiFrameworkOperLogManagerModule.cs @@ -15,17 +15,21 @@ namespace Yi.Framework.OperLogManager public void ConfigureServices(IServiceCollection services, ConfigureServicesContext context) { - services.AddControllers(options => { + + services.AddControllers(options => + { options.Filters.Add(); }); - services.AddAutoApiService(opt => - { - //NETServiceTest所在程序集添加进动态api配置 - opt.CreateConventional(typeof(YiFrameworkOperLogManagerModule).Assembly, option => option.RootPath = string.Empty); + //services.AddAutoApiService(opt => + //{ + // //NETServiceTest所在程序集添加进动态api配置 + // opt.CreateConventional(typeof(YiFrameworkOperLogManagerModule).Assembly, option => option.RootPath = string.Empty); + + //}); - }); - services.AddSingleton(); + services.AddTransient(); + services.AddTransient(); } } } \ No newline at end of file diff --git a/Yi.Framework.Net6/src/module/Yi.Framework.Template/Template/Server/ServiceTemplate.txt b/Yi.Framework.Net6/src/module/Yi.Framework.Template/Template/Server/ServiceTemplate.txt index e058e170..9daff1d8 100644 --- a/Yi.Framework.Net6/src/module/Yi.Framework.Template/Template/Server/ServiceTemplate.txt +++ b/Yi.Framework.Net6/src/module/Yi.Framework.Template/Template/Server/ServiceTemplate.txt @@ -1,5 +1,5 @@ using #NameSpaces#.Application.Contracts.#ModelName#; -using NET.AutoWebApi.Setting; +using Cike.AutoWebApi.Setting; using #NameSpaces#.Application.Contracts.#ModelName#.Dtos; using #NameSpaces#.Domain.#ModelName#.Entities; using Yi.Framework.Ddd.Services; diff --git a/Yi.Framework.Net6/src/project/Template/Yi.Template.Application/School/StudentService.cs b/Yi.Framework.Net6/src/project/Template/Yi.Template.Application/School/StudentService.cs index 1d851255..cd961206 100644 --- a/Yi.Framework.Net6/src/project/Template/Yi.Template.Application/School/StudentService.cs +++ b/Yi.Framework.Net6/src/project/Template/Yi.Template.Application/School/StudentService.cs @@ -1,5 +1,5 @@ using Yi.Template.Application.Contracts.School; -using NET.AutoWebApi.Setting; +using Cike.AutoWebApi.Setting; using Yi.Template.Application.Contracts.School.Dtos; using Yi.Template.Domain.School.Entities; using Yi.Framework.Ddd.Services; diff --git a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application/Exhibition/BannerService.cs b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application/Exhibition/BannerService.cs index db630b4e..94b25c30 100644 --- a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application/Exhibition/BannerService.cs +++ b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application/Exhibition/BannerService.cs @@ -1,5 +1,5 @@ using Yi.BBS.Application.Contracts.Exhibition; -using NET.AutoWebApi.Setting; +using Cike.AutoWebApi.Setting; using Yi.BBS.Application.Contracts.Exhibition.Dtos; using Yi.BBS.Domain.Exhibition.Entities; using Yi.Framework.Ddd.Services; diff --git a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application/Forum/ArticleService.cs b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application/Forum/ArticleService.cs index 200ef445..12eb207a 100644 --- a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application/Forum/ArticleService.cs +++ b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application/Forum/ArticleService.cs @@ -1,5 +1,5 @@ using Yi.BBS.Application.Contracts.Forum; -using NET.AutoWebApi.Setting; +using Cike.AutoWebApi.Setting; using Yi.BBS.Application.Contracts.Forum.Dtos; using Yi.BBS.Domain.Forum.Entities; using Yi.Framework.Ddd.Services; diff --git a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application/Forum/CommentService.cs b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application/Forum/CommentService.cs index 9f12340c..46fc1955 100644 --- a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application/Forum/CommentService.cs +++ b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application/Forum/CommentService.cs @@ -1,5 +1,5 @@ using Yi.BBS.Application.Contracts.Forum; -using NET.AutoWebApi.Setting; +using Cike.AutoWebApi.Setting; using Yi.BBS.Application.Contracts.Forum.Dtos; using Yi.BBS.Domain.Forum.Entities; using Yi.Framework.Ddd.Services; diff --git a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application/Forum/DiscussService.cs b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application/Forum/DiscussService.cs index a92e459a..317af4f7 100644 --- a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application/Forum/DiscussService.cs +++ b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application/Forum/DiscussService.cs @@ -1,5 +1,5 @@ using Yi.BBS.Application.Contracts.Forum; -using NET.AutoWebApi.Setting; +using Cike.AutoWebApi.Setting; using Yi.BBS.Application.Contracts.Forum.Dtos; using Yi.BBS.Domain.Forum.Entities; using Yi.Framework.Ddd.Services; diff --git a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application/Forum/MyTypeService.cs b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application/Forum/MyTypeService.cs index 903e92c2..ac557727 100644 --- a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application/Forum/MyTypeService.cs +++ b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application/Forum/MyTypeService.cs @@ -1,5 +1,5 @@ using Yi.BBS.Application.Contracts.Forum; -using NET.AutoWebApi.Setting; +using Cike.AutoWebApi.Setting; using Yi.BBS.Application.Contracts.Forum.Dtos; using Yi.BBS.Domain.Forum.Entities; using Yi.Framework.Ddd.Services; diff --git a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application/Forum/PlateService.cs b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application/Forum/PlateService.cs index 9d062aee..43a67b8a 100644 --- a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application/Forum/PlateService.cs +++ b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application/Forum/PlateService.cs @@ -1,5 +1,5 @@ using Yi.BBS.Application.Contracts.Forum; -using NET.AutoWebApi.Setting; +using Cike.AutoWebApi.Setting; using Yi.BBS.Application.Contracts.Forum.Dtos; using Yi.BBS.Domain.Forum.Entities; using Yi.Framework.Ddd.Services; diff --git a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application/GlobalSetting/SettingService.cs b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application/GlobalSetting/SettingService.cs index 598cffde..0e759e92 100644 --- a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application/GlobalSetting/SettingService.cs +++ b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application/GlobalSetting/SettingService.cs @@ -1,5 +1,5 @@ using Yi.BBS.Application.Contracts.GlobalSetting; -using NET.AutoWebApi.Setting; +using Cike.AutoWebApi.Setting; using Yi.BBS.Domain.GlobalSetting.Entities; using Yi.Framework.Ddd.Services; diff --git a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application/GlobalSetting/TempService.cs b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application/GlobalSetting/TempService.cs index eea37a3d..e2e04b84 100644 --- a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application/GlobalSetting/TempService.cs +++ b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application/GlobalSetting/TempService.cs @@ -1,5 +1,5 @@ using Yi.BBS.Application.Contracts.GlobalSetting; -using NET.AutoWebApi.Setting; +using Cike.AutoWebApi.Setting; using Yi.BBS.Domain.GlobalSetting.Entities; using Yi.Framework.Ddd.Services; using Microsoft.AspNetCore.Mvc; diff --git a/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application/Dictionary/DictionaryService.cs b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application/Dictionary/DictionaryService.cs index 419a4448..5dfd2e6c 100644 --- a/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application/Dictionary/DictionaryService.cs +++ b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application/Dictionary/DictionaryService.cs @@ -1,5 +1,5 @@ using Yi.RBAC.Application.Contracts.Dictionary; -using NET.AutoWebApi.Setting; +using Cike.AutoWebApi.Setting; using Yi.RBAC.Application.Contracts.Dictionary.Dtos; using Yi.RBAC.Domain.Dictionary.Entities; using Yi.Framework.Ddd.Services; diff --git a/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application/Dictionary/DictionaryTypeService.cs b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application/Dictionary/DictionaryTypeService.cs index f1d7af3d..16071eb1 100644 --- a/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application/Dictionary/DictionaryTypeService.cs +++ b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application/Dictionary/DictionaryTypeService.cs @@ -1,5 +1,5 @@ using Yi.RBAC.Application.Contracts.Dictionary; -using NET.AutoWebApi.Setting; +using Cike.AutoWebApi.Setting; using Yi.RBAC.Application.Contracts.Dictionary.Dtos; using Yi.RBAC.Domain.Dictionary.Entities; using Yi.Framework.Ddd.Services; diff --git a/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application/Identity/AccountService.cs b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application/Identity/AccountService.cs index e0ea1e91..399b23e5 100644 --- a/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application/Identity/AccountService.cs +++ b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application/Identity/AccountService.cs @@ -4,7 +4,7 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Mvc; -using NET.AutoWebApi.Setting; +using Cike.AutoWebApi.Setting; using SqlSugar; using System; using System.Collections.Generic; diff --git a/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application/Identity/DeptService.cs b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application/Identity/DeptService.cs index 624a2110..0d032dad 100644 --- a/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application/Identity/DeptService.cs +++ b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application/Identity/DeptService.cs @@ -1,11 +1,12 @@ using Yi.RBAC.Application.Contracts.Identity; -using NET.AutoWebApi.Setting; +using Cike.AutoWebApi.Setting; using Yi.RBAC.Application.Contracts.Identity.Dtos; using Yi.RBAC.Domain.Identity.Entities; using Yi.Framework.Ddd.Services; using Yi.Framework.Ddd.Dtos; using SqlSugar; using Microsoft.AspNetCore.Mvc; +using Cike.AutoWebApi.Setting; namespace Yi.RBAC.Application.Identity { diff --git a/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application/Identity/MenuService.cs b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application/Identity/MenuService.cs index 1fa8d6ab..036a0a0e 100644 --- a/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application/Identity/MenuService.cs +++ b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application/Identity/MenuService.cs @@ -1,5 +1,5 @@ using Yi.RBAC.Application.Contracts.Identity; -using NET.AutoWebApi.Setting; +using Cike.AutoWebApi.Setting; using Yi.RBAC.Application.Contracts.Identity.Dtos; using Yi.RBAC.Domain.Identity.Entities; using Yi.Framework.Ddd.Services; diff --git a/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application/Identity/PostService.cs b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application/Identity/PostService.cs index f2ce0baa..ab2eaccc 100644 --- a/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application/Identity/PostService.cs +++ b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application/Identity/PostService.cs @@ -1,5 +1,5 @@ using Yi.RBAC.Application.Contracts.Identity; -using NET.AutoWebApi.Setting; +using Cike.AutoWebApi.Setting; using Yi.RBAC.Application.Contracts.Identity.Dtos; using Yi.RBAC.Domain.Identity.Entities; using Yi.Framework.Ddd.Services; diff --git a/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application/Identity/RoleService.cs b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application/Identity/RoleService.cs index a9af44dc..ddc08fd7 100644 --- a/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application/Identity/RoleService.cs +++ b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application/Identity/RoleService.cs @@ -1,5 +1,5 @@ using Yi.RBAC.Application.Contracts.Identity; -using NET.AutoWebApi.Setting; +using Cike.AutoWebApi.Setting; using Yi.RBAC.Application.Contracts.Identity.Dtos; using Yi.RBAC.Domain.Identity.Entities; using Yi.Framework.Ddd.Services; diff --git a/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application/Identity/UserService.cs b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application/Identity/UserService.cs index aa1ce658..91911800 100644 --- a/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application/Identity/UserService.cs +++ b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application/Identity/UserService.cs @@ -1,5 +1,5 @@ using Yi.RBAC.Application.Contracts.Identity; -using NET.AutoWebApi.Setting; +using Cike.AutoWebApi.Setting; using Yi.RBAC.Application.Contracts.Identity.Dtos; using Yi.RBAC.Domain.Identity.Entities; using Yi.Framework.Ddd.Services; @@ -14,6 +14,7 @@ using Microsoft.AspNetCore.Mvc; using Yi.Framework.Auth.JwtBearer.Authorization; using Yi.RBAC.Application.Contracts.Identity.Dtos.User; using Yi.Framework.Core.CurrentUsers; +using Yi.Framework.OperLogManager; namespace Yi.RBAC.Application.Identity { @@ -72,6 +73,7 @@ namespace Yi.RBAC.Application.Identity /// /// /// + [OperLog("添加用户", OperEnum.Insert)] public async override Task CreateAsync(UserCreateInputVo input) { if (string.IsNullOrEmpty(input.Password)) @@ -116,6 +118,7 @@ namespace Yi.RBAC.Application.Identity /// /// /// + [OperLog("更新用户", OperEnum.Update)] public async override Task UpdateAsync(long id, UserUpdateInputVo input) { if (await _repository.IsAnyAsync(u => input.UserName!.Equals(u.UserName) && !id.Equals(u.Id))) @@ -145,6 +148,7 @@ namespace Yi.RBAC.Application.Identity /// /// /// + [OperLog("更新个人信息", OperEnum.Update)] public async Task UpdateProfileAsync(ProfileUpdateInputVo input) { var entity = await _repository.GetByIdAsync(_currentUser.Id); @@ -161,6 +165,7 @@ namespace Yi.RBAC.Application.Identity /// /// [Route("/api/user/{id}/{state}")] + [OperLog("更新用户状态", OperEnum.Update)] public async Task UpdateStateAsync([FromRoute] long id, [FromRoute] bool state) { var entity = await _repository.GetByIdAsync(id); @@ -170,7 +175,13 @@ namespace Yi.RBAC.Application.Identity } entity.State = state; + await _repository.UpdateAsync(entity); return await MapToGetOutputDtoAsync(entity); } + [OperLog("删除用户", OperEnum.Delete)] + public override Task DeleteAsync(string id) + { + return base.DeleteAsync(id); + } } } diff --git a/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application/Logs/LoginLogService.cs b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application/Logs/LoginLogService.cs index a0a34d8f..52ba4d68 100644 --- a/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application/Logs/LoginLogService.cs +++ b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application/Logs/LoginLogService.cs @@ -1,5 +1,5 @@ using Microsoft.AspNetCore.Mvc; -using NET.AutoWebApi.Setting; +using Cike.AutoWebApi.Setting; using SqlSugar; using System; using System.Collections.Generic; diff --git a/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application/Setting/ConfigService.cs b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application/Setting/ConfigService.cs index c996a43a..aab40d6f 100644 --- a/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application/Setting/ConfigService.cs +++ b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application/Setting/ConfigService.cs @@ -1,5 +1,5 @@ using Yi.RBAC.Application.Contracts.Setting; -using NET.AutoWebApi.Setting; +using Cike.AutoWebApi.Setting; using Yi.RBAC.Application.Contracts.Setting.Dtos; using Yi.RBAC.Domain.Setting.Entities; using Yi.Framework.Ddd.Services; diff --git a/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application/TestService.cs b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application/TestService.cs index 5eff6736..5cf13672 100644 --- a/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application/TestService.cs +++ b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application/TestService.cs @@ -1,4 +1,4 @@ -using NET.AutoWebApi.Setting; +using Cike.AutoWebApi.Setting; using System; using System.Collections.Generic; using System.Linq; diff --git a/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Web/YiRBACWebModule.cs b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Web/YiRBACWebModule.cs index 59fcbaad..6db43adc 100644 --- a/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Web/YiRBACWebModule.cs +++ b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Web/YiRBACWebModule.cs @@ -29,13 +29,16 @@ namespace Yi.RBAC.Web opt.JsonSerializerOptions.Converters.Add(new DateTimeJsonConverter("yyyy-MM-dd HH:mm:ss")); }); + + + services.AddAutoApiService(opt => { - //NETServiceTest所在程序集添加进动态api配置 - opt.CreateConventional(typeof(YiRBACApplicationModule).Assembly, option => option.RootPath = string.Empty); + opt.CreateConventional(AssemblyHelper.GetAllLoadAssembly(), option => option.RootPath = string.Empty); }); + //添加swagger services.AddSwaggerServer(); } diff --git a/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Web/yi-sqlsugar-dev.db b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Web/yi-sqlsugar-dev.db index ecff1f8f..3025232e 100644 Binary files a/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Web/yi-sqlsugar-dev.db and b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Web/yi-sqlsugar-dev.db differ diff --git a/Yi.Framework.Net6/src/project/template/Yi.Template.Application/School/StudentService.cs b/Yi.Framework.Net6/src/project/template/Yi.Template.Application/School/StudentService.cs index 1d851255..cd961206 100644 --- a/Yi.Framework.Net6/src/project/template/Yi.Template.Application/School/StudentService.cs +++ b/Yi.Framework.Net6/src/project/template/Yi.Template.Application/School/StudentService.cs @@ -1,5 +1,5 @@ using Yi.Template.Application.Contracts.School; -using NET.AutoWebApi.Setting; +using Cike.AutoWebApi.Setting; using Yi.Template.Application.Contracts.School.Dtos; using Yi.Template.Domain.School.Entities; using Yi.Framework.Ddd.Services; diff --git a/Yi.RuoYi.Vue3/src/views/monitor/operlog/index.vue b/Yi.RuoYi.Vue3/src/views/monitor/operlog/index.vue index 4e152056..915dd42b 100644 --- a/Yi.RuoYi.Vue3/src/views/monitor/operlog/index.vue +++ b/Yi.RuoYi.Vue3/src/views/monitor/operlog/index.vue @@ -34,8 +34,8 @@ /> - - + + @@ -100,9 +100,9 @@ - + @@ -163,7 +163,7 @@ {{ parseTime(form.createTime) }} - {{ form.errorMsg }} + {{ form.errorMsg }} @@ -202,7 +202,7 @@ const data = reactive({ title: undefined, operUser: undefined, operType: undefined, - isDeleted: undefined + state: undefined } });