liujiaqiang 2 years ago
parent
commit
d4bec67215
  1. 14
      24Hour/24Hour.csproj.user
  2. 41
      24Hour/Controllers/LoginController.cs
  3. 36
      24Hour/Properties/PublishProfiles/FolderProfile.pubxml
  4. 16
      24Hour/Properties/PublishProfiles/FolderProfile.pubxml.user

14
24Hour/24Hour.csproj.user

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<Controller_SelectedScaffolderID>MvcControllerEmptyScaffolder</Controller_SelectedScaffolderID> <Controller_SelectedScaffolderID>MvcControllerEmptyScaffolder</Controller_SelectedScaffolderID>
<Controller_SelectedScaffolderCategoryPath>root/Common/MVC/Controller</Controller_SelectedScaffolderCategoryPath> <Controller_SelectedScaffolderCategoryPath>root/Common/MVC/Controller</Controller_SelectedScaffolderCategoryPath>
<NameOfLastUsedPublishProfile>E:\Code\24Hour.Service\24Hour\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile> <NameOfLastUsedPublishProfile>E:\24Hour.Service\24Hour\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
</PropertyGroup> </PropertyGroup>
</Project> </Project>

41
24Hour/Controllers/LoginController.cs

@ -142,6 +142,13 @@ namespace _24Hour.Controllers
try try
{ {
var Passmd5 = Md5.Encrypt32(login.Password).ToLower(); var Passmd5 = Md5.Encrypt32(login.Password).ToLower();
var model = await _db.Queryable<App_Sys_UserModel>().Where(x => x.phone== login.phone && x.IsDeleted==0).FirstAsync();
if (model == null)
{
ret.IsSucceed = false;
ret.Message = "账号不存在,请先注册!";
return ret;
}
var date = await _db.Queryable<App_Sys_UserModel>().Where(q => q.IsDeleted == 0 && q.isdeactivate == 0 && q.phone == login.phone && q.Password == Passmd5).FirstAsync(); var date = await _db.Queryable<App_Sys_UserModel>().Where(q => q.IsDeleted == 0 && q.isdeactivate == 0 && q.phone == login.phone && q.Password == Passmd5).FirstAsync();
if (date != null) if (date != null)
{ {
@ -197,7 +204,7 @@ namespace _24Hour.Controllers
phone = date.phone, phone = date.phone,
photo = date.photo, photo = date.photo,
duties = date.duties, duties = date.duties,
identity=date.identity, identity = date.identity,
usertype = date.usertype, usertype = date.usertype,
unitCode = date.unitCode, unitCode = date.unitCode,
department = "", department = "",
@ -371,25 +378,25 @@ namespace _24Hour.Controllers
[HttpGet] [HttpGet]
[Route("cardIdLogin")] [Route("cardIdLogin")]
public async Task<Result> cardIdLogin(string cardId,string name) public async Task<Result> cardIdLogin(string cardId, string name)
{ {
var date = await _db.Queryable<App_Sys_UserModel>().Where(q => q.IsDeleted == 0 && q.isdeactivate == 0 && q.cardId == cardId).FirstAsync(); var date = await _db.Queryable<App_Sys_UserModel>().Where(q => q.IsDeleted == 0 && q.isdeactivate == 0 && q.cardId == cardId).FirstAsync();
if (date != null) if (date != null)
{ {
//if (date.usertype == 1 && date.audit == null) //if (date.usertype == 1 && date.audit == null)
// { // {
// ret.IsSucceed = false; // ret.IsSucceed = false;
// ret.Message = "用户审核中!"; // ret.Message = "用户审核中!";
// return ret; // return ret;
// } // }
// else if (date.usertype == 1 && date.audit == 1) // else if (date.usertype == 1 && date.audit == 1)
// { // {
// ret.IsSucceed = false; // ret.IsSucceed = false;
// ret.Message = $"用户审核未通过,原因:{date.describe}!"; // ret.Message = $"用户审核未通过,原因:{date.describe}!";
// return ret; // return ret;
// } // }
// else // else
if (date.usertype == 0 && date.becurrent == 1) if (date.usertype == 0 && date.becurrent == 1)
{ {
ret.IsSucceed = false; ret.IsSucceed = false;
ret.Message = $"用户未授权无法登录,请联系管理员!"; ret.Message = $"用户未授权无法登录,请联系管理员!";

36
24Hour/Properties/PublishProfiles/FolderProfile.pubxml

@ -1,21 +1,21 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!-- <!--
https://go.microsoft.com/fwlink/?LinkID=208121. https://go.microsoft.com/fwlink/?LinkID=208121.
--> -->
<Project> <Project>
<PropertyGroup> <PropertyGroup>
<DeleteExistingFiles>true</DeleteExistingFiles> <DeleteExistingFiles>true</DeleteExistingFiles>
<ExcludeApp_Data>false</ExcludeApp_Data> <ExcludeApp_Data>false</ExcludeApp_Data>
<LaunchSiteAfterPublish>true</LaunchSiteAfterPublish> <LaunchSiteAfterPublish>true</LaunchSiteAfterPublish>
<LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration> <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
<LastUsedPlatform>Any CPU</LastUsedPlatform> <LastUsedPlatform>Any CPU</LastUsedPlatform>
<PublishProvider>FileSystem</PublishProvider> <PublishProvider>FileSystem</PublishProvider>
<PublishUrl>C:\Users\Administrator\Desktop\新建文件夹 (4)</PublishUrl> <PublishUrl>D:\24小时发布</PublishUrl>
<WebPublishMethod>FileSystem</WebPublishMethod> <WebPublishMethod>FileSystem</WebPublishMethod>
<_TargetId>Folder</_TargetId> <_TargetId>Folder</_TargetId>
<SiteUrlToLaunchAfterPublish /> <SiteUrlToLaunchAfterPublish />
<TargetFramework>net6.0</TargetFramework> <TargetFramework>net6.0</TargetFramework>
<ProjectGuid>9cc60d58-cc75-4bf7-a854-3220e725cd8c</ProjectGuid> <ProjectGuid>9cc60d58-cc75-4bf7-a854-3220e725cd8c</ProjectGuid>
<SelfContained>false</SelfContained> <SelfContained>false</SelfContained>
</PropertyGroup> </PropertyGroup>
</Project> </Project>

16
24Hour/Properties/PublishProfiles/FolderProfile.pubxml.user

@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!-- <!--
https://go.microsoft.com/fwlink/?LinkID=208121. https://go.microsoft.com/fwlink/?LinkID=208121.
--> -->
<Project> <Project>
<PropertyGroup> <PropertyGroup>
<_PublishTargetUrl>C:\Users\Administrator\Desktop\新建文件夹 (4)</_PublishTargetUrl> <_PublishTargetUrl>D:\24小时发布</_PublishTargetUrl>
<History>True|2023-06-27T10:06:12.3724487Z;True|2023-06-27T17:22:11.4211972+08:00;True|2023-06-27T15:48:34.1728433+08:00;True|2023-06-13T18:05:11.2568840+08:00;False|2023-06-13T18:04:56.9546003+08:00;</History> <History>True|2023-06-29T08:07:09.3334291Z;True|2023-06-29T15:56:52.9510718+08:00;True|2023-06-29T15:49:16.8161173+08:00;True|2023-06-27T18:06:12.3724487+08:00;True|2023-06-27T17:22:11.4211972+08:00;True|2023-06-27T15:48:34.1728433+08:00;True|2023-06-13T18:05:11.2568840+08:00;False|2023-06-13T18:04:56.9546003+08:00;</History>
<LastFailureDetails /> <LastFailureDetails />
</PropertyGroup> </PropertyGroup>
</Project> </Project>
Loading…
Cancel
Save