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

dev #30

Merged
hy merged 2 commits from dev into staging 2025-11-11 18:36:13 +08:00
Conversation 0 Commits 2 Files Changed 7 +9 -7
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ab4e9db779 - Show all commits

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

@ -117,11 +117,11 @@ namespace Learn.Archives.API.Controllers
return e.Id;
}
/// <summary>
/// 设置角色菜单
/// 获取学生列表
/// </summary>
/// <returns></returns>
[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 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，不进行返回结果包装，原样输出
var endpoint = context.GetEndpoint();
// 直接返回原始结果，不封装
if (endpoint?.Metadata.GetMetadata<HttpLogEnable>() == null) return;
if (endpoint?.Metadata.GetMetadata<HttpLogEnable>() == null&& e is null) return;
string request = null;
var logId = Yitter.IdGenerator.YitIdHelper.NextId();
@ -233,8 +233,6 @@ namespace Learn.Archives.API.Expand
/// <param name="context"></param>
public override async void OnActionExecuted(ActionExecutedContext context)
{
try
{
BaseReturn<object>? res = ApiResultFormatting(context);

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

@ -13,6 +13,8 @@
},
"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=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",
"UpdateTable": false
},
@ -24,12 +26,14 @@
},
"UserCenterService": {
"API": "https://dca.w.23544.com:8843/api"
//"API": "https://dcb.23544.com/api"
},
"OtherDBArr": [
{
"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=usercenter-mysql.23544.com;User ID=usercenter;Password=MPsSSNuvFO7wBqADXC9zweh9tdOPNwm6;Port=3306;Database=usercenter_v1;CharSet=utf8mb4;pooling=true;SslMode=None",
"SqlType": "MySql"
}
]

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

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