marking
/
Learn.Archives
19
0
Fork 0
Code Pull Requests Actions Releases Activity

Merge pull request '修复 学生管理页面查询错误问题' (#29) from dev into master 

Reviewed-on: #29
This commit is contained in:
hy 2025-10-29 17:51:11 +08:00
parent 7bb3b2e663 ab4e9db779
commit 1f82aa960a
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Learn.Archives.API/Controllers/StudentController.cs
View File

@ -117,11 +117,11 @@ namespace Learn.Archives.API.Controllers
return e.Id; return e.Id;
} }
/// <summary> /// <summary>
/// 设置角色菜单 /// 获取学生列表
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
public new async Task<PageResult<StudentInfoRes>> PageList() public new async Task<PageResult<StudentInfoRes>> PageList(object data)
{ {
var apiRes =await _userCenterService.CallAPI_GetPageUserList(_httpContextAccessor.HttpContext); var apiRes =await _userCenterService.CallAPI_GetPageUserList(_httpContextAccessor.HttpContext);
var res= new PageResult<StudentInfoRes>() { Data = new List<StudentInfoRes>() }; var res= new PageResult<StudentInfoRes>() { Data = new List<StudentInfoRes>() };

4
Learn.Archives.API/Expand/HttpFilter.cs
View File

@ -153,7 +153,7 @@ namespace Learn.Archives.API.Expand
//特殊处理：ResultIgnore，不进行返回结果包装，原样输出 //特殊处理：ResultIgnore，不进行返回结果包装，原样输出
var endpoint = context.GetEndpoint(); var endpoint = context.GetEndpoint();
// 直接返回原始结果，不封装 // 直接返回原始结果，不封装
if (endpoint?.Metadata.GetMetadata<HttpLogEnable>() == null) return; if (endpoint?.Metadata.GetMetadata<HttpLogEnable>() == null&& e is null) return;
string request = null; string request = null;
var logId = Yitter.IdGenerator.YitIdHelper.NextId(); var logId = Yitter.IdGenerator.YitIdHelper.NextId();
@ -233,8 +233,6 @@ namespace Learn.Archives.API.Expand
/// <param name="context"></param> /// <param name="context"></param>
public override async void OnActionExecuted(ActionExecutedContext context) public override async void OnActionExecuted(ActionExecutedContext context)
{ {
try try
{ {
BaseReturn<object>? res = ApiResultFormatting(context); BaseReturn<object>? res = ApiResultFormatting(context);

6
Learn.Archives.API/appsettings.json
View File

@ -13,6 +13,8 @@
}, },
"DB": { "DB": {
"ConnectionString": "AllowLoadLocalInfile=true;Server=58.17.132.2;User ID=marking;Password=qwe123!@#;Database=learn.archives;CharSet=utf8mb4;Port=43306;pooling=true;SslMode=None;", "ConnectionString": "AllowLoadLocalInfile=true;Server=58.17.132.2;User ID=marking;Password=qwe123!@#;Database=learn.archives;CharSet=utf8mb4;Port=43306;pooling=true;SslMode=None;",
//正式库
//"ConnectionString": "AllowLoadLocalInfile=true;Server=rm-2vc20nd3d11g0oh6g2o.rwlb.cn-chengdu.rds.aliyuncs.com;User ID=marking;Password=poiuytPOIUYT098765)(*&^%;Port=3306;Database=learn.archives;CharSet=utf8mb4;pooling=true;SslMode=None",
"SqlType": "MySql", "SqlType": "MySql",
"UpdateTable": false "UpdateTable": false
}, },
@ -24,12 +26,14 @@
}, },
"UserCenterService": { "UserCenterService": {
"API": "https://dca.w.23544.com:8843/api" "API": "https://dca.w.23544.com:8843/api"
//"API": "https://dcb.23544.com/api"
}, },
"OtherDBArr": [ "OtherDBArr": [
{ {
"ConfigId": 1001, //用户中心 "ConfigId": 1001, //用户中心
//"ConnectionString": "AllowLoadLocalInfile=true;Server=192.168.2.9;User ID=root;Password=qwe123!@#;Port=3306;Database=usercenter;CharSet=utf8mb4;pooling=true;SslMode=None;",
"ConnectionString": "AllowLoadLocalInfile=true;Server=58.17.132.2;User ID=marking;Password=qwe123!@#;Port=3306;Database=usercenter_v1;CharSet=utf8mb4;Port=43306;pooling=true;SslMode=None;", "ConnectionString": "AllowLoadLocalInfile=true;Server=58.17.132.2;User ID=marking;Password=qwe123!@#;Port=3306;Database=usercenter_v1;CharSet=utf8mb4;Port=43306;pooling=true;SslMode=None;",
//"ConnectionString": "AllowLoadLocalInfile=true;Server=usercenter-mysql.23544.com;User ID=usercenter;Password=MPsSSNuvFO7wBqADXC9zweh9tdOPNwm6;Port=3306;Database=usercenter_v1;CharSet=utf8mb4;pooling=true;SslMode=None",
"SqlType": "MySql" "SqlType": "MySql"
} }
] ]

2
Learn.Archives.Core/Model/Dto/UserCenterServiceDto.cs
View File

@ -578,6 +578,6 @@ namespace Learn.Archives.Core.Model.Dto
/// <summary> /// <summary>
/// 职位状态 /// 职位状态
/// </summary> /// </summary>
public bool Status { get; set; } public object Status { get; set; }
} }
} }