diff --git a/Yi.BBS.Vue2/src/main.js b/Yi.BBS.Vue2/src/main.js index 4d251fa7..d5afdd66 100644 --- a/Yi.BBS.Vue2/src/main.js +++ b/Yi.BBS.Vue2/src/main.js @@ -13,7 +13,7 @@ import signalr from './utils/signalR' // import "mavon-editor/dist/css/index.css"; import store from './store/index' -import "./permission" +// import "./permission" // Vue.component("mavon-editor", mavonEditor); Vue.use(signalr); diff --git a/Yi.Framework.Net6/src/framework/Yi.Framework.Core/CurrentUsers/CurrentUser.cs b/Yi.Framework.Net6/src/framework/Yi.Framework.Core/CurrentUsers/CurrentUser.cs index ea961dd5..051fcb3d 100644 --- a/Yi.Framework.Net6/src/framework/Yi.Framework.Core/CurrentUsers/CurrentUser.cs +++ b/Yi.Framework.Net6/src/framework/Yi.Framework.Core/CurrentUsers/CurrentUser.cs @@ -62,7 +62,7 @@ namespace Yi.Framework.Core.CurrentUsers public long FindUserId() { - var userIdOrNull = _principalAccessor.Principal.Claims?.FirstOrDefault(c => c.Type == TokenTypeConst.Id); + var userIdOrNull = _principalAccessor.Principal?.Claims?.FirstOrDefault(c => c.Type == TokenTypeConst.Id); if (userIdOrNull == null || string.IsNullOrWhiteSpace(userIdOrNull.Value)) { return 0; diff --git a/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Web/yi-sqlsugar-dev.db b/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Web/yi-sqlsugar-dev.db index 1516839b..73b23d96 100644 Binary files a/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Web/yi-sqlsugar-dev.db and b/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Web/yi-sqlsugar-dev.db differ diff --git a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/yi-sqlsugar-dev.db b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/yi-sqlsugar-dev.db index 1516839b..73b23d96 100644 Binary files a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/yi-sqlsugar-dev.db and b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/yi-sqlsugar-dev.db differ diff --git a/Yi.Framework.Net6/src/project/bbs/Yi.RBAC.Application.Contracts/Identity/IUserService.cs b/Yi.Framework.Net6/src/project/bbs/Yi.RBAC.Application.Contracts/Identity/IUserService.cs deleted file mode 100644 index 4d44405c..00000000 --- a/Yi.Framework.Net6/src/project/bbs/Yi.RBAC.Application.Contracts/Identity/IUserService.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Yi.RBAC.Application.Contracts.Identity.Dtos; -using Yi.Framework.Ddd.Services.Abstract; - -namespace Yi.RBAC.Application.Contracts.Identity -{ - /// - /// User服务抽象 - /// - public interface IUserService : ICrudAppService - { - - } -} diff --git a/Yi.Framework.Net6/src/project/bbs/Yi.RBAC.Application/Identity/UserService.cs b/Yi.Framework.Net6/src/project/bbs/Yi.RBAC.Application/Identity/UserService.cs deleted file mode 100644 index 6ddc6c96..00000000 --- a/Yi.Framework.Net6/src/project/bbs/Yi.RBAC.Application/Identity/UserService.cs +++ /dev/null @@ -1,17 +0,0 @@ -using Yi.RBAC.Application.Contracts.Identity; -using NET.AutoWebApi.Setting; -using Yi.RBAC.Application.Contracts.Identity.Dtos; -using Yi.RBAC.Domain.Identity.Entities; -using Yi.Framework.Ddd.Services; - -namespace Yi.RBAC.Application.Identity -{ - /// - /// User服务实现 - /// - [AppService] - public class UserService : CrudAppService, - IUserService, IAutoApiService - { - } -}