diff --git a/LearningOfficer.OA.Mobile.Api/AntDeploy.json b/LearningOfficer.OA.Mobile.Api/AntDeploy.json
index d9f85b9..85f2336 100644
--- a/LearningOfficer.OA.Mobile.Api/AntDeploy.json
+++ b/LearningOfficer.OA.Mobile.Api/AntDeploy.json
@@ -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"
}
]
},
diff --git a/LearningOfficer.OA.Mobile.Api/Controllers/V1/FollowStudentInfoController.cs b/LearningOfficer.OA.Mobile.Api/Controllers/V1/FollowStudentInfoController.cs
index c196476..14c4adb 100644
--- a/LearningOfficer.OA.Mobile.Api/Controllers/V1/FollowStudentInfoController.cs
+++ b/LearningOfficer.OA.Mobile.Api/Controllers/V1/FollowStudentInfoController.cs
@@ -41,12 +41,12 @@ namespace LearningOfficer.OA.Mobile.Api.Controllers.V1
///
[HttpPost]
[AllowAnonymous]
- public async Task> userLogin([FromQuery] LoginRequest request)
+ public async Task userLogin([FromQuery] LoginRequest request)
{
request.Pwd = MD5EncryptionHelper.MD5Encryption(request.Pwd).ToUpper();
UserResult model = await _loginMobilAppService.userLogin(request);
- return Ok(model);
+ return model;
}
///
diff --git a/LearningOfficer.OA.Mobile.Api/appsettings.Development.json b/LearningOfficer.OA.Mobile.Api/appsettings.Development.json
index cfd53ca..e4b324c 100644
--- a/LearningOfficer.OA.Mobile.Api/appsettings.Development.json
+++ b/LearningOfficer.OA.Mobile.Api/appsettings.Development.json
@@ -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;"