diff --git a/Yi.BBS.Vue3/src/stores/user.js b/Yi.BBS.Vue3/src/stores/user.js
index 7f8e43c7..8f8c194c 100644
--- a/Yi.BBS.Vue3/src/stores/user.js
+++ b/Yi.BBS.Vue3/src/stores/user.js
@@ -22,10 +22,11 @@ const useUserStore = defineStore('user',
const code = userInfo.code
const uuid = userInfo.uuid
return new Promise((resolve, reject) => {
- login(userName, password, code, uuid).then(res => {
+ login(userName, password, code, uuid).then(response => {
+ const res=response.data;
setToken(res.token);
this.token = res.token;
- resolve(res);
+ resolve(response);
}).catch(error => {
reject(error)
})
@@ -35,7 +36,7 @@ const useUserStore = defineStore('user',
getInfo() {
return new Promise((resolve, reject) => {
getInfo().then(response => {
- const res=response;
+ const res=response.data;
const user = res.user
const avatar = (user.icon == "" || user.icon == null) ? "/src/assets/logo.ico" : import.meta.env.VITE_APP_BASEAPI + "/file/"+user.icon;
diff --git a/Yi.BBS.Vue3/src/utils/request.js b/Yi.BBS.Vue3/src/utils/request.js
index 434551f2..652b830d 100644
--- a/Yi.BBS.Vue3/src/utils/request.js
+++ b/Yi.BBS.Vue3/src/utils/request.js
@@ -33,7 +33,7 @@ myaxios.interceptors.request.use(function (config) {
// 响应拦截器
myaxios.interceptors.response.use(function (response) {
- return response.data;
+ return response;
}, function (error) {
return Promise.reject(error);
});
diff --git a/Yi.BBS.Vue3/src/views/Login.vue b/Yi.BBS.Vue3/src/views/Login.vue
index 849be16f..0c4dc087 100644
--- a/Yi.BBS.Vue3/src/views/Login.vue
+++ b/Yi.BBS.Vue3/src/views/Login.vue
@@ -26,10 +26,15 @@ const guestlogin=async ()=>{
}
const login=async ()=>{
const response= await userStore.login(loginForm);
-if( response.code==undefined)
+console.log(response);
+if( response.status==200)
{
router.push("/index")
}
+else
+{
+ alert("登录失败")
+}
}
diff --git a/Yi.Framework.Net6/src/framework/Yi.Framework.AspNetCore/Microsoft/AspNetCore/Builder/ErrorHandExtensions.cs b/Yi.Framework.Net6/src/framework/Yi.Framework.AspNetCore/Microsoft/AspNetCore/Builder/ErrorHandExtensions.cs
index 4a4d8b93..85b05dc7 100644
--- a/Yi.Framework.Net6/src/framework/Yi.Framework.AspNetCore/Microsoft/AspNetCore/Builder/ErrorHandExtensions.cs
+++ b/Yi.Framework.Net6/src/framework/Yi.Framework.AspNetCore/Microsoft/AspNetCore/Builder/ErrorHandExtensions.cs
@@ -7,6 +7,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+using Yi.Framework.Core.Enums;
using Yi.Framework.Core.Exceptions;
namespace Microsoft.AspNetCore.Builder
@@ -37,7 +38,7 @@ namespace Microsoft.AspNetCore.Builder
catch (BusinessException businessEx)
{
context.Response.ContentType = "application/json;charset=utf-8";
- //context.Response.StatusCode = businessEx.Code.GetHashCode();
+ context.Response.StatusCode = (int)ResultCodeEnum.Denied;
var result = new ExceptionModle
{
@@ -59,7 +60,7 @@ namespace Microsoft.AspNetCore.Builder
//系统错误,记录日志
_logger.LogError(ex, $"授权失败:{ex.Message}");
//await _errorHandle.Invoer(context, ex);
- context.Response.StatusCode = (int)ex.Code;
+ context.Response.StatusCode = (int)ResultCodeEnum.NoPermission;
//系统错误,需要记录
var result = new ExceptionModle
{
@@ -80,7 +81,7 @@ namespace Microsoft.AspNetCore.Builder
//系统错误,记录日志
_logger.LogError(ex, $"系统错误:{ex.Message}");
//await _errorHandle.Invoer(context, ex);
- context.Response.StatusCode = 500;
+ context.Response.StatusCode = (int)ResultCodeEnum.NotSuccess;
//系统错误,需要记录
var result = new ExceptionModle
{
diff --git a/Yi.Framework.Net6/src/framework/Yi.Framework.Core/Enums/ResultCodeEnum.cs b/Yi.Framework.Net6/src/framework/Yi.Framework.Core/Enums/ResultCodeEnum.cs
index ecff5e35..e4197867 100644
--- a/Yi.Framework.Net6/src/framework/Yi.Framework.Core/Enums/ResultCodeEnum.cs
+++ b/Yi.Framework.Net6/src/framework/Yi.Framework.Core/Enums/ResultCodeEnum.cs
@@ -21,6 +21,11 @@ namespace Yi.Framework.Core.Enums
///
/// 无权限
///
- NoPermission = 401
+ NoPermission = 401,
+
+ ///
+ /// 被拒绝
+ ///
+ Denied = 403
}
}
diff --git a/Yi.Framework.Net6/src/framework/Yi.Framework.Core/Exceptions/BusinessException.cs b/Yi.Framework.Net6/src/framework/Yi.Framework.Core/Exceptions/BusinessException.cs
index 2c04d34d..64a8d54f 100644
--- a/Yi.Framework.Net6/src/framework/Yi.Framework.Core/Exceptions/BusinessException.cs
+++ b/Yi.Framework.Net6/src/framework/Yi.Framework.Core/Exceptions/BusinessException.cs
@@ -21,7 +21,7 @@ namespace Yi.Framework.Core.Exceptions
public LogLevel LogLevel { get; set; }
public BusinessException(
- int code = (int)ResultCodeEnum.NotSuccess,
+ int code = (int)ResultCodeEnum.Denied,
string? message = null,
string? details = null,
Exception? innerException = null,
diff --git a/Yi.Framework.Net6/src/framework/Yi.Framework.Core/Exceptions/UserFriendlyException.cs b/Yi.Framework.Net6/src/framework/Yi.Framework.Core/Exceptions/UserFriendlyException.cs
index 71b0a4a4..97a71782 100644
--- a/Yi.Framework.Net6/src/framework/Yi.Framework.Core/Exceptions/UserFriendlyException.cs
+++ b/Yi.Framework.Net6/src/framework/Yi.Framework.Core/Exceptions/UserFriendlyException.cs
@@ -13,7 +13,7 @@ namespace Yi.Framework.Core.Exceptions
{
public UserFriendlyException(
string message,
-int code = (int)ResultCodeEnum.NotSuccess,
+int code = (int)ResultCodeEnum.Denied,
string? details = null,
Exception? innerException = null,
LogLevel logLevel = LogLevel.Warning)
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 3b2fe58e..4995bb48 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 3b2fe58e..4995bb48 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