From 33616de6c86575ad0237c8980eec654d99503590 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=B7=B3?= <chenchun@hymson.com>
Date: Mon, 27 Feb 2023 08:52:45 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dcurrenuser=E4=B8=BA?=
 =?UTF-8?q?=E7=A9=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Yi.BBS.Vue2/src/main.js                       |   2 +-
 .../CurrentUsers/CurrentUser.cs               |   2 +-
 .../project/BBS/Yi.BBS.Web/yi-sqlsugar-dev.db | Bin 229376 -> 237568 bytes
 .../project/bbs/Yi.BBS.Web/yi-sqlsugar-dev.db | Bin 229376 -> 237568 bytes
 .../Identity/IUserService.cs                  |  18 ------------------
 .../Identity/UserService.cs                   |  17 -----------------
 6 files changed, 2 insertions(+), 37 deletions(-)
 delete mode 100644 Yi.Framework.Net6/src/project/bbs/Yi.RBAC.Application.Contracts/Identity/IUserService.cs
 delete mode 100644 Yi.Framework.Net6/src/project/bbs/Yi.RBAC.Application/Identity/UserService.cs

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 1516839bd898822ba9be143c7fa317f8c9ed5637..73b23d961cb851a6e5aae7343a57359aedac7658 100644
GIT binary patch
delta 246
zcmZo@;A=R*H$hs^g@J*=3W#Aqd!mjpqf28#YXale1g0hHmG~L?7&tvSHgYtuujg=Q
z^<=MN4rAqEv}cy(o6pF{%g$G}U2OxCA14#@)b0NkFivFFXv#5W7Z(*}Y_%>)Ov*`h
z%Y<M{=O9<d5Lbl|M<*Xw1tqu4>5Y4tw7Edi&iQ#Isd>{Kw=juLzp#jrQw1a#oLQBs
zq>z%DoSB=Lqu}QsqTm<m<D;OU!^;KKoRd0<Ns$9Y2PBqcOjq2(Bs=}XHl{8nb(86d
Z%Nb?3K~nLCAku34{C!M`2Nwk>004(!M)v>!

delta 97
zcmZoTz}L{gH$hs^nSp`90*GNiYod-ZqjO_IYXale1g0hHm3SHX7&tvSHgYtuujg=Q
r^<=MN4rAqEv}cy(n-7!%g6(P>nEW`ISarAmTfnHvx_$mWro@8)&tMiL

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 1516839bd898822ba9be143c7fa317f8c9ed5637..73b23d961cb851a6e5aae7343a57359aedac7658 100644
GIT binary patch
delta 246
zcmZo@;A=R*H$hs^g@J*=3W#Aqd!mjpqf28#YXale1g0hHmG~L?7&tvSHgYtuujg=Q
z^<=MN4rAqEv}cy(o6pF{%g$G}U2OxCA14#@)b0NkFivFFXv#5W7Z(*}Y_%>)Ov*`h
z%Y<M{=O9<d5Lbl|M<*Xw1tqu4>5Y4tw7Edi&iQ#Isd>{Kw=juLzp#jrQw1a#oLQBs
zq>z%DoSB=Lqu}QsqTm<m<D;OU!^;KKoRd0<Ns$9Y2PBqcOjq2(Bs=}XHl{8nb(86d
Z%Nb?3K~nLCAku34{C!M`2Nwk>004(!M)v>!

delta 97
zcmZoTz}L{gH$hs^nSp`90*GNiYod-ZqjO_IYXale1g0hHm3SHX7&tvSHgYtuujg=Q
r^<=MN4rAqEv}cy(n-7!%g6(P>nEW`ISarAmTfnHvx_$mWro@8)&tMiL

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
-{
-    /// <summary>
-    /// User服务抽象
-    /// </summary>
-    public interface IUserService : ICrudAppService<UserGetOutputDto, UserGetListOutputDto, long, UserGetListInputVo, UserCreateInputVo, UserUpdateInputVo>
-    {
-
-    }
-}
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
-{
-    /// <summary>
-    /// User服务实现
-    /// </summary>
-    [AppService]
-    public class UserService : CrudAppService<UserEntity, UserGetOutputDto, UserGetListOutputDto, long, UserGetListInputVo, UserCreateInputVo, UserUpdateInputVo>,
-       IUserService, IAutoApiService
-    {
-    }
-}