yangqiang
/
Quanxue.Zhanghao.Daochu
1
0
Fork 0
Code Pull Requests Actions Releases Activity

新增10楼服务器部署环境及接口返回类型调整 

- AntDeploy.json 新增“10楼服务器”环境及相关 Linux、Docker 配置，调整端口、启动参数等
- userLogin 接口返回类型由 ActionResult 包装改为直接返回 UserResult
- 注释掉开发环境下的 Redis 连接字符串
This commit is contained in:
Q 2026-01-26 17:36:17 +08:00
parent a8bc53f3b1
commit 2695f4cde6
3 changed files with 62 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
LearningOfficer.OA.Mobile.Api/AntDeploy.json
View File

@ -17,6 +17,24 @@
],
"IgnoreList": [],
"WindowsBackUpIgnoreList": []
},
{
"Name": "10楼服务器",
"ServerList": [],
"LinuxServerList": [
{
"UserName": "yq",
"Pwd": "CE09921E2AD09E56095579DF1F7C614B",
"Host": "10.127.127.107",
"NickName": "107服务器",
"IIsFireUrl": null,
"DockerFireUrl": "",
"WindowsServiceFireUrl": null,
"LinuxServiceFireUrl": null
}
],
"IgnoreList": [],
"WindowsBackUpIgnoreList": []
}
],
"IIsConfig": {
@ -32,6 +50,15 @@
"DockerEnvName": null,
"DockerVolume": null,
"DockerOther": null
},
{
"EnvName": "10楼服务器",
"ConfigName": "",
"LinuxEnvParam": null,
"DockerPort": null,
"DockerEnvName": null,
"DockerVolume": null,
"DockerOther": null
}
]
},
@ -48,6 +75,15 @@
"DockerEnvName": null,
"DockerVolume": null,
"DockerOther": null
},
{
"EnvName": "10楼服务器",
"ConfigName": "",
"LinuxEnvParam": null,
"DockerPort": null,
"DockerEnvName": null,
"DockerVolume": null,
"DockerOther": null
}
]
},
@ -64,26 +100,44 @@
"DockerEnvName": null,
"DockerVolume": null,
"DockerOther": null
},
{
"EnvName": "10楼服务器",
"ConfigName": "",
"LinuxEnvParam": null,
"DockerPort": null,
"DockerEnvName": null,
"DockerVolume": null,
"DockerOther": null
}
]
},
"DockerConfig": {
"Prot": "17288",
"Prot": "29892",
"AspNetCoreEnv": "",
"LastEnvName": "2.7",
"LastEnvName": "10楼服务器",
"RemoveDaysFromPublished": "10",
"WorkDir": "",
"Volume": "",
"Other": "--name oa.newmobile.api -e ASPNETCORE_ENVIRONMENT=Development -e TZ=Asia/Shanghai",
"Other": "--name quanxue.account.export -e ASPNETCORE_ENVIRONMENT=Production -e TZ=Asia/Shanghai",
"EnvPairList": [
{
"EnvName": "2.7",
"ConfigName": null,
"LinuxEnvParam": null,
"DockerPort": "17288",
"DockerPort": "29892",
"DockerEnvName": "",
"DockerVolume": "",
"DockerOther": "--name oa.newmobile.api -e ASPNETCORE_ENVIRONMENT=Development -e TZ=Asia/Shanghai"
"DockerOther": "--name quanxue.account.export -e ASPNETCORE_ENVIRONMENT=Development -e TZ=Asia/Shanghai"
},
{
"EnvName": "10楼服务器",
"ConfigName": null,
"LinuxEnvParam": null,
"DockerPort": "29892",
"DockerEnvName": "",
"DockerVolume": "",
"DockerOther": "--name quanxue.account.export -e ASPNETCORE_ENVIRONMENT=Production -e TZ=Asia/Shanghai"
}
]
},

4
LearningOfficer.OA.Mobile.Api/Controllers/V1/FollowStudentInfoController.cs
View File

@ -41,12 +41,12 @@ namespace LearningOfficer.OA.Mobile.Api.Controllers.V1
/// <returns></returns>
[HttpPost]
[AllowAnonymous]
public async Task<ActionResult<userLoginResult>> userLogin([FromQuery] LoginRequest request)
public async Task<UserResult> userLogin([FromQuery] LoginRequest request)
{
request.Pwd = MD5EncryptionHelper.MD5Encryption(request.Pwd).ToUpper();
UserResult model = await _loginMobilAppService.userLogin(request);
return Ok(model);
return model;
}
/// <summary>

2
LearningOfficer.OA.Mobile.Api/appsettings.Development.json
View File

@ -4,7 +4,7 @@
"TenantId": "yWgrM7mi"
},
"ConnectionStrings": {
"Redis": "192.168.2.7:6379,password=qwe123!@#,defaultDatabase=14,name=oa,prefix=oa:",
//"Redis": "192.168.2.7:6379,password=qwe123!@#,defaultDatabase=14,name=oa,prefix=oa:",
"Db": "Database=learningofficer.oa;Server=58.17.132.2;Port=43306;Uid=marking;Pwd=qwe123!@#;AllowZeroDateTime=True;ConvertZeroDateTime=True;AllowLoadLocalInfile=true;",
"UserCenterDb": "Database=usercenter_v1;Server=58.17.132.2;Port=43306;Uid=marking;Pwd=qwe123!@#;AllowZeroDateTime=True;ConvertZeroDateTime=True;"