xwl2023/Yi.Framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 完成合并

Browse Source
This commit is contained in:
陈淳
2023-02-22 19:21:21 +08:00
parent 49acf0c7c9
commit 8639372513
30 changed files with 61 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Yi.Framework.Net6/src/project/Template/Yi.Template.Application/School/StudentService.cs
View File

@@ -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;

2
Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application/Exhibition/BannerService.cs
View File

@@ -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;

2
Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application/Forum/ArticleService.cs
View File

@@ -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;

2
Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application/Forum/CommentService.cs
View File

@@ -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;

2
Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application/Forum/DiscussService.cs
View File

@@ -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;

2
Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application/Forum/MyTypeService.cs
View File

@@ -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;

2
Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application/Forum/PlateService.cs
View File

@@ -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;

2
Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application/GlobalSetting/SettingService.cs
View File

@@ -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;

2
Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application/GlobalSetting/TempService.cs
View File

@@ -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;

2
Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application/Dictionary/DictionaryService.cs
View File

@@ -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;

2
Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application/Dictionary/DictionaryTypeService.cs
View File

@@ -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;

2
Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application/Identity/AccountService.cs
View File

@@ -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;

3
Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application/Identity/DeptService.cs
View File

@@ -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
{

2
Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application/Identity/MenuService.cs
View File

@@ -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;

2
Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application/Identity/PostService.cs
View File

@@ -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;

2
Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application/Identity/RoleService.cs
View File

@@ -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;

13
Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application/Identity/UserService.cs
View File

@@ -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
/// <param name="input"></param>
/// <returns></returns>
/// <exception cref="UserFriendlyException"></exception>
[OperLog("添加用户", OperEnum.Insert)]
public async override Task<UserGetOutputDto> CreateAsync(UserCreateInputVo input)
{
if (string.IsNullOrEmpty(input.Password))
@@ -116,6 +118,7 @@ namespace Yi.RBAC.Application.Identity
/// <param name="id"></param>
/// <param name="input"></param>
/// <returns></returns>
[OperLog("更新用户", OperEnum.Update)]
public async override Task<UserGetOutputDto> 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
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
[OperLog("更新个人信息", OperEnum.Update)]
public async Task<UserGetOutputDto> UpdateProfileAsync(ProfileUpdateInputVo input)
{
var entity = await _repository.GetByIdAsync(_currentUser.Id);
@@ -161,6 +165,7 @@ namespace Yi.RBAC.Application.Identity
/// <param name="state"></param>
/// <returns></returns>
[Route("/api/user/{id}/{state}")]
[OperLog("更新用户状态", OperEnum.Update)]
public async Task<UserGetOutputDto> 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<bool> DeleteAsync(string id)
{
return base.DeleteAsync(id);
}
}
}

2
Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application/Logs/LoginLogService.cs
View File

@@ -1,5 +1,5 @@
using Microsoft.AspNetCore.Mvc;
using NET.AutoWebApi.Setting;
using Cike.AutoWebApi.Setting;
using SqlSugar;
using System;
using System.Collections.Generic;

2
Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application/Setting/ConfigService.cs
View File

@@ -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;

2
Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application/TestService.cs
View File

@@ -1,4 +1,4 @@
using NET.AutoWebApi.Setting;
using Cike.AutoWebApi.Setting;
using System;
using System.Collections.Generic;
using System.Linq;

7
Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Web/YiRBACWebModule.cs
View File

@@ -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<YiRBACApplicationModule>();
}

BIN
Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Web/yi-sqlsugar-dev.db
View File

Binary file not shown.

2
Yi.Framework.Net6/src/project/template/Yi.Template.Application/School/StudentService.cs
View File

@@ -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;