linyang
/
24Hour.Service
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

修改登录接口返回值，供前端判断

develop-FileUpload-test
胡超1 2 years ago
parent
9430e19021
commit
1c5746f3ac
1 changed files with 330 additions and 324 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 654
      24Hour/Controllers/LoginController.cs

654
24Hour/Controllers/LoginController.cs
Unescape View File

@ -1,57 +1,57 @@
using _24Hour.Model; using _24Hour.Model;
using com.sun.org.apache.bcel.@internal.generic; using com.sun.org.apache.bcel.@internal.generic;
using com.sun.xml.@internal.ws.api.model; using com.sun.xml.@internal.ws.api.model;
using Elight.Entity; using Elight.Entity;
using Elight.Logic; using Elight.Logic;
using Elight.Logic.SystemModel; using Elight.Logic.SystemModel;
using Elight.Utility; using Elight.Utility;
using Elight.Utility.Code; using Elight.Utility.Code;
using Elight.Utility.Encrypt; using Elight.Utility.Encrypt;
using Elight.Utility.Extensions; using Elight.Utility.Extensions;
using Elight.Utility.logs; using Elight.Utility.logs;
using java.security; using java.security;
using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using Microsoft.IdentityModel.Tokens; using Microsoft.IdentityModel.Tokens;
using Newtonsoft.Json; using Newtonsoft.Json;
using SqlSugar; using SqlSugar;
using System.IdentityModel.Tokens.Jwt; using System.IdentityModel.Tokens.Jwt;
using System.Runtime.Serialization; using System.Runtime.Serialization;
using System.Security.Claims; using System.Security.Claims;
using System.Text; using System.Text;
namespace _24Hour.Controllers namespace _24Hour.Controllers
{ {
/// <summary> /// <summary>
/// 登录 /// 登录
/// </summary> /// </summary>
#if DEBUG #if DEBUG
#else #else
[HiddenApi] [HiddenApi]
#endif #endif
[ApiController] [ApiController]
[Route("api/APP")] [Route("api/APP")]
public class LoginController : ControllerBase public class LoginController : ControllerBase
{ {
private readonly IConfiguration _configuration; private readonly IConfiguration _configuration;
private readonly SqlSugarClient _db;//数据库 private readonly SqlSugarClient _db;//数据库
private readonly WriteSysLog _logs;//操作日志 private readonly WriteSysLog _logs;//操作日志
private readonly ILogger<LoginController> _logger;//日志 private readonly ILogger<LoginController> _logger;//日志
private readonly WechatMessagerClient wechatMessagerClient; private readonly WechatMessagerClient wechatMessagerClient;
Result ret = new Result(); Result ret = new Result();
public LoginController(ILogger<LoginController> logger, SqlSugarClient db, IConfiguration configuration, WechatMessagerClient _wechatMessagerClient) public LoginController(ILogger<LoginController> logger, SqlSugarClient db, IConfiguration configuration, WechatMessagerClient _wechatMessagerClient)
{ {
_logger = logger; _logger = logger;
_db = db; _db = db;
_configuration = configuration; _configuration = configuration;
this.wechatMessagerClient = _wechatMessagerClient; this.wechatMessagerClient = _wechatMessagerClient;
} }
[HttpPost] [HttpPost]
[Route("LoginDefault")] [Route("LoginDefault")]
[CustomCorsActionFilterAttribute] [CustomCorsActionFilterAttribute]
public async Task<Result> LoginDefault() public async Task<Result> LoginDefault()
{ {
@ -77,10 +77,10 @@ namespace _24Hour.Controllers
date.departmentName = dept.departname; date.departmentName = dept.departname;
} }
} }
#region jwt生成token #region jwt生成token
var tokenHandler = new JwtSecurityTokenHandler(); var tokenHandler = new JwtSecurityTokenHandler();
var claims = new Claim[] var claims = new Claim[]
{ {
new Claim(ClaimTypes.UserData,JsonConvert.SerializeObject(date)), new Claim(ClaimTypes.UserData,JsonConvert.SerializeObject(date)),
}; };
@ -116,23 +116,23 @@ namespace _24Hour.Controllers
#endregion #endregion
ret.IsSucceed = true; ret.IsSucceed = true;
return ret; return ret;
} }
/// <summary> /// <summary>
/// 系统登录 /// 系统登录
/// </summary> /// </summary>
/// <param name="login"></param> /// <param name="login"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
[Route("SystemLogin")] [Route("SystemLogin")]
[CustomCorsActionFilterAttribute] [CustomCorsActionFilterAttribute]
public async Task<Result> SystemLogin(UserLogin login) public async Task<Result> SystemLogin(UserLogin login)
{ {
try try
{ {
var Passmd5 = Md5.Encrypt32(login.Password).ToLower(); var Passmd5 = Md5.Encrypt32(login.Password).ToLower();
var date = await _db.Queryable<App_Sys_UserModel>().Where(x => x.phone == login.phone && x.IsDeleted == 0).FirstAsync(); var date = await _db.Queryable<App_Sys_UserModel>().Where(x => x.phone == login.phone && x.IsDeleted == 0).FirstAsync();
if (date == null) if (date == null)
{ {
ret.IsSucceed = false; ret.IsSucceed = false;
@ -154,10 +154,10 @@ namespace _24Hour.Controllers
} }
} }
#region jwt生成token #region jwt生成token
var tokenHandler = new JwtSecurityTokenHandler(); var tokenHandler = new JwtSecurityTokenHandler();
var claims = new Claim[] var claims = new Claim[]
{ {
new Claim(ClaimTypes.UserData,JsonConvert.SerializeObject(date)), new Claim(ClaimTypes.UserData,JsonConvert.SerializeObject(date)),
}; };
@ -184,7 +184,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,
openId = date.wechatId, openId = date.wechatId,
unitCode = date.unitCode, unitCode = date.unitCode,
unitname = Unitdate?.unitname, unitname = Unitdate?.unitname,
@ -192,31 +192,31 @@ namespace _24Hour.Controllers
departmentName = date.departmentName, departmentName = date.departmentName,
token = tokenString token = tokenString
}; };
#endregion #endregion
} }
catch (Exception ex) catch (Exception ex)
{ {
ret.IsSucceed = false; ret.IsSucceed = false;
ret.Message = $"{ex.Message}"; ret.Message = $"{ex.Message}";
LogService.WriteLog(ex, "登录"); LogService.WriteLog(ex, "登录");
} }
return ret; return ret;
} }
/// <summary> /// <summary>
/// app--登录 /// app--登录
/// </summary> /// </summary>
/// <param name="login"></param> /// <param name="login"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
[Route("Login")] [Route("Login")]
[CustomCorsActionFilterAttribute] [CustomCorsActionFilterAttribute]
public async Task<Result> Login(UserLogin login) public async Task<Result> Login(UserLogin login)
{ {
try try
{ {
var Passmd5 = Md5.Encrypt32(login.Password).ToLower(); var Passmd5 = Md5.Encrypt32(login.Password).ToLower();
var date = await _db.Queryable<App_Sys_UserModel>().Where(x => x.phone == login.phone && x.IsDeleted == 0).FirstAsync(); var date = await _db.Queryable<App_Sys_UserModel>().Where(x => x.phone == login.phone && x.IsDeleted == 0).FirstAsync();
if (date == null) if (date == null)
{ {
ret.IsSucceed = false; ret.IsSucceed = false;
@ -267,10 +267,10 @@ namespace _24Hour.Controllers
date.departmentName = dept.departname; date.departmentName = dept.departname;
} }
} }
#region jwt生成token #region jwt生成token
var tokenHandler = new JwtSecurityTokenHandler(); var tokenHandler = new JwtSecurityTokenHandler();
var claims = new Claim[] var claims = new Claim[]
{ {
new Claim(ClaimTypes.UserData,JsonConvert.SerializeObject(date)), new Claim(ClaimTypes.UserData,JsonConvert.SerializeObject(date)),
}; };
@ -295,7 +295,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,
openId = date.wechatId, openId = date.wechatId,
usertype = date.usertype, usertype = date.usertype,
unitCode = date.unitCode, unitCode = date.unitCode,
@ -303,16 +303,16 @@ namespace _24Hour.Controllers
departmentName = date.departmentName, departmentName = date.departmentName,
token = tokenString token = tokenString
}; };
#endregion #endregion
ret.IsSucceed = true; ret.IsSucceed = true;
} }
catch (Exception ex) catch (Exception ex)
{ {
ret.IsSucceed = false; ret.IsSucceed = false;
ret.Message = $"{ex.Message}"; ret.Message = $"{ex.Message}";
LogService.WriteLog(ex, "登录"); LogService.WriteLog(ex, "登录");
} }
return ret; return ret;
} }
/// <summary> /// <summary>
@ -320,8 +320,8 @@ namespace _24Hour.Controllers
/// </summary> /// </summary>
/// <param name="code"></param> /// <param name="code"></param>
/// <returns></returns> /// <returns></returns>
[HttpGet] [HttpGet]
[Route("WeChatLoginCode")] [Route("WeChatLoginCode")]
public async Task<Result> WeChatLoginByCode(string code) public async Task<Result> WeChatLoginByCode(string code)
{ {
var opendata = await GetOpenId(code); var opendata = await GetOpenId(code);
@ -339,8 +339,8 @@ namespace _24Hour.Controllers
/// </summary> /// </summary>
/// <param name="code"></param> /// <param name="code"></param>
/// <returns></returns> /// <returns></returns>
[HttpGet] [HttpGet]
[Route("WeChatLoginByGzhCode")] [Route("WeChatLoginByGzhCode")]
public async Task<Result> WeChatLoginByGzhCode(string code) public async Task<Result> WeChatLoginByGzhCode(string code)
{ {
var opendata = await GetGzhOpenId(code); var opendata = await GetGzhOpenId(code);
@ -359,8 +359,8 @@ namespace _24Hour.Controllers
///// </summary> ///// </summary>
///// <param name="code"></param> ///// <param name="code"></param>
///// <returns></returns> ///// <returns></returns>
//[HttpGet] //[HttpGet]
//[Route("GetCode")] //[Route("GetCode")]
//public async Task<Result> GetCode(string code,string state) //public async Task<Result> GetCode(string code,string state)
//{ //{
// var opendata = await GetGzhOpenId(code); // var opendata = await GetGzhOpenId(code);
@ -372,128 +372,134 @@ namespace _24Hour.Controllers
// { // {
// return opendata; // return opendata;
// } // }
//} //}
/// <summary> /// <summary>
/// 微信授权登录 /// 微信授权登录
/// </summary> /// </summary>
/// <param name="openId"></param> /// <param name="openId"></param>
/// <returns></returns> /// <returns></returns>
[HttpGet] [HttpGet]
[Route("WeChatLogin")] [Route("WeChatLogin")]
public async Task<Result> WeChatLogin(string openId) public async Task<Result> WeChatLogin(string openId)
{ {
var date = await _db.Queryable<App_Sys_UserModel>() var date = await _db.Queryable<App_Sys_UserModel>()
.Where(q => q.IsDeleted == 0 && q.wechatId == openId) .Where(q => q.IsDeleted == 0 && q.wechatId == openId)
.OrderByDescending(x => x.createtime) .OrderByDescending(x => x.createtime)
.FirstAsync(); .FirstAsync();
if (date != null) if (date != null)
{ {
if (date.identity == "律师" && date.audit == 1) if (date.identity == "律师" && date.audit == 1)
{ {
ret.IsSucceed = false; ret.IsSucceed = false;
ret.Message = $"用户信息审核未通过，原因：{date.describe}，请重新注册！"; ret.Message = $"用户信息审核未通过，原因：{date.describe}，请重新注册！";
ret.result = "用户信息审核未通过";
return ret; return ret;
} }
else if (date.identity == "律师" && date.audit == 2) else if (date.identity == "律师" && date.audit == 2)
{ {
ret.IsSucceed = false; ret.IsSucceed = false;
ret.Message = "用户信息审核中！"; ret.Message = "用户信息审核中！";
ret.result = "用户信息审核中";
return ret; return ret;
} }
if (date.isdeactivate == 1) if (date.isdeactivate == 1)
{ {
ret.IsSucceed = false; ret.IsSucceed = false;
ret.Message = "该账号已被禁用，请联系管理员！"; ret.Message = "该账号已被禁用，请联系管理员！";
ret.result = "该账号已被禁用";
return ret;
}
if (date.usertype == 0 && date.becurrent == 1)
{
ret.IsSucceed = false;
ret.Message = $"账号未授权无法登录，请联系管理员！";
ret.result = "账号未授权无法登录";
return ret; return ret;
} }
if (date.usertype == 0 && date.becurrent == 1) #region jwt生成token
{ var tokenHandler = new JwtSecurityTokenHandler();
ret.IsSucceed = false; var claims = new Claim[]
ret.Message = $"账号未授权无法登录，请联系管理员！"; {
return ret; new Claim(ClaimTypes.UserData,JsonConvert.SerializeObject(date)),
} };
#region jwt生成token
var tokenHandler = new JwtSecurityTokenHandler(); var key = new SymmetricSecurityKey(Encoding.ASCII.GetBytes(_configuration.GetSection("JwtConfiguration:Jwtkey").Value));
var claims = new Claim[] var signingCredentials = new SigningCredentials(key, SecurityAlgorithms.HmacSha256);
{ //Token
new Claim(ClaimTypes.UserData,JsonConvert.SerializeObject(date)), var jwttoken = new JwtSecurityToken(
}; issuer: _configuration.GetSection("JwtConfiguration:Issuer").Value,
audience: _configuration.GetSection("JwtConfiguration:Audience").Value,
var key = new SymmetricSecurityKey(Encoding.ASCII.GetBytes(_configuration.GetSection("JwtConfiguration:Jwtkey").Value)); claims: claims,
var signingCredentials = new SigningCredentials(key, SecurityAlgorithms.HmacSha256); notBefore: DateTime.Now,
//Token expires: DateTime.Now.AddDays(1),
var jwttoken = new JwtSecurityToken( signingCredentials: signingCredentials
issuer: _configuration.GetSection("JwtConfiguration:Issuer").Value, );
audience: _configuration.GetSection("JwtConfiguration:Audience").Value, //var token = new JwtSecurityTokenHandler().CreateToken(jwttoken);
claims: claims, var tokenString = new JwtSecurityTokenHandler().WriteToken(jwttoken);
notBefore: DateTime.Now, ret.result = new
expires: DateTime.Now.AddDays(1), {
signingCredentials: signingCredentials Id = date.Id,
); name = date.name,
//var token = new JwtSecurityTokenHandler().CreateToken(jwttoken); sex = date.sex,
var tokenString = new JwtSecurityTokenHandler().WriteToken(jwttoken); phone = date.phone,
ret.result = new photo = date.photo,
{ duties = date.duties,
Id = date.Id, identity = date.identity,
name = date.name, usertype = date.usertype,
sex = date.sex, unitCode = date.unitCode,
phone = date.phone, token = tokenString,
photo = date.photo, openId = date.wechatId,
duties = date.duties, departmentPhoto = date.departmentPhoto,
identity = date.identity, identityphoto = date.identityphoto,
usertype = date.usertype, cardIdphoto = date.cardIdphoto,
unitCode = date.unitCode, departmentName = date.departmentName,
token = tokenString, identitycardId = date.identitycardId,
openId = date.wechatId, departmentSCC = date.departmentUnifiedSocialCreditCode
departmentPhoto = date.departmentPhoto, };
identityphoto = date.identityphoto, #endregion
cardIdphoto = date.cardIdphoto, ret.IsSucceed = true;
departmentName = date.departmentName, }
identitycardId = date.identitycardId, else
departmentSCC = date.departmentUnifiedSocialCreditCode {
}; ret.IsSucceed = false;
#endregion ret.Message = "微信未授权，请先注册账号！";
ret.IsSucceed = true; ret.result = "微信未授权";
} }
else return ret;
{ }
ret.IsSucceed = false;
ret.Message = "微信未授权，请先注册账号！"; /// <summary>
} /// APP添加用户
return ret; /// </summary>
} /// <param name="info"></param>
/// <returns></returns>
/// <summary> [HttpPost]
/// APP添加用户 [Route("AddUser1")]
/// </summary> public async Task<Result> AddUser1(App_Sys_UserModel UserModel)
/// <param name="info"></param> {
/// <returns></returns> try
[HttpPost]
[Route("AddUser1")]
public async Task<Result> AddUser1(App_Sys_UserModel UserModel)
{
try
{ {
_logger.LogInformation(UserModel.ConvertToJsonStr()); _logger.LogInformation(UserModel.ConvertToJsonStr());
//if (string.IsNullOrEmpty(UserModel.wechatId) && await _db.Queryable<App_Sys_UserModel>().AnyAsync(x => x.wechatId == UserModel.wechatId && x.IsDeleted == 0)) //if (string.IsNullOrEmpty(UserModel.wechatId) && await _db.Queryable<App_Sys_UserModel>().AnyAsync(x => x.wechatId == UserModel.wechatId && x.IsDeleted == 0))
//{ //{
// ret.IsSucceed = false; // ret.IsSucceed = false;
// ret.Message = "当前微信已与其他账号绑定"; // ret.Message = "当前微信已与其他账号绑定";
// return ret; // return ret;
//} //}
if (string.IsNullOrEmpty(UserModel.wechatId) == false) if (string.IsNullOrEmpty(UserModel.wechatId) == false)
{ {
if (await _db.Queryable<App_Sys_UserModel>().AnyAsync(x => x.wechatId == UserModel.wechatId && x.IsDeleted == 0 && x.audit != 1 && x.isdeactivate == 0)) if (await _db.Queryable<App_Sys_UserModel>().AnyAsync(x => x.wechatId == UserModel.wechatId && x.IsDeleted == 0 && x.audit != 1 && x.isdeactivate == 0))
{ {
ret.IsSucceed = false; ret.IsSucceed = false;
ret.Message = "当前微信已与其他账号绑定"; ret.Message = "当前微信已与其他账号绑定";
return ret; return ret;
} }
} }
var data = await _db.Queryable<App_Sys_UserModel>().Where(q => q.phone == UserModel.phone && q.IsDeleted == 0).FirstAsync(); var data = await _db.Queryable<App_Sys_UserModel>().Where(q => q.phone == UserModel.phone && q.IsDeleted == 0).FirstAsync();
if (UserModel.identity == "律师") if (UserModel.identity == "律师")
{ {
if (data != null && (data.identity != "律师" || data.audit == 0)) if (data != null && (data.identity != "律师" || data.audit == 0))
{ {
ret.IsSucceed = false; ret.IsSucceed = false;
@ -580,7 +586,7 @@ namespace _24Hour.Controllers
ret.IsSucceed = true; ret.IsSucceed = true;
ret.result = "添加成功"; ret.result = "添加成功";
} }
} }
} }
else else
{ {
@ -606,57 +612,57 @@ namespace _24Hour.Controllers
{ {
ret.IsSucceed = true; ret.IsSucceed = true;
ret.result = "添加成功"; ret.result = "添加成功";
} }
} }
} }
catch (System.Exception ex) catch (System.Exception ex)
{ {
_db.RollbackTran(); _db.RollbackTran();
ret.IsSucceed = false; ret.IsSucceed = false;
ret.Message = ex.Message; ret.Message = ex.Message;
} }
return ret; return ret;
} }
/// <summary> /// <summary>
/// 单位list集合 /// 单位list集合
/// </summary> /// </summary>
/// <param name="info"></param> /// <param name="info"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
[Route("QueryUnitlist")] [Route("QueryUnitlist")]
public async Task<Result> QueryUnitlist(App_Sys_UnitInput Unitdata) public async Task<Result> QueryUnitlist(App_Sys_UnitInput Unitdata)
{ {
var list = await _db.Queryable<App_Sys_UnitModel>() var list = await _db.Queryable<App_Sys_UnitModel>()
.WhereIF(!Unitdata.unitCode.IsNull(), q => q.unitCode.Contains(Unitdata.unitCode)) .WhereIF(!Unitdata.unitCode.IsNull(), q => q.unitCode.Contains(Unitdata.unitCode))
.WhereIF(!Unitdata.unitname.IsNull(), q => q.unitname.Contains(Unitdata.unitname)) .WhereIF(!Unitdata.unitname.IsNull(), q => q.unitname.Contains(Unitdata.unitname))
.WhereIF(!Unitdata.unitjc.IsNull(), q => q.unitjc.Contains(Unitdata.unitjc)) .WhereIF(!Unitdata.unitjc.IsNull(), q => q.unitjc.Contains(Unitdata.unitjc))
.Where(q => q.IsDelete == 0).ToListAsync(); .Where(q => q.IsDelete == 0).ToListAsync();
ret.IsSucceed = true; ret.IsSucceed = true;
ret.result = list; ret.result = list;
return ret; return ret;
} }
/// <summary> /// <summary>
/// 获取设备视频流地址 /// 获取设备视频流地址
/// </summary> /// </summary>
/// <param name="Sendingdata"></param> /// <param name="Sendingdata"></param>
/// <returns></returns> /// <returns></returns>
[HttpGet] [HttpGet]
[Route("getrtsp")] [Route("getrtsp")]
public async Task<Result> getrtsp(string str) public async Task<Result> getrtsp(string str)
{ {
ret.IsSucceed = true; ret.IsSucceed = true;
ret.result = $"{_configuration.GetSection($"Videoaddress:{str}").Value}"; ret.result = $"{_configuration.GetSection($"Videoaddress:{str}").Value}";
return ret; return ret;
} }
[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.cardId == cardId && q.name == name).FirstAsync(); var date = await _db.Queryable<App_Sys_UserModel>().Where(q => q.IsDeleted == 0 && q.cardId == cardId && q.name == name).FirstAsync();
if (date != null) if (date != null)
{ {
//if (date.usertype == 1 && date.audit == null) //if (date.usertype == 1 && date.audit == null)
// { // {
@ -671,52 +677,52 @@ namespace _24Hour.Controllers
// return ret; // return ret;
// } // }
// else // else
if (date.usertype == 0 && date.becurrent == 1 && date.isdeactivate == 1) if (date.usertype == 0 && date.becurrent == 1 && date.isdeactivate == 1)
{ {
ret.IsSucceed = false; ret.IsSucceed = false;
ret.Message = $"用户未授权无法登录，请联系管理员！"; ret.Message = $"用户未授权无法登录，请联系管理员！";
return ret; return ret;
} }
#region jwt生成token #region jwt生成token
var tokenHandler = new JwtSecurityTokenHandler(); var tokenHandler = new JwtSecurityTokenHandler();
var claims = new Claim[] var claims = new Claim[]
{ {
new Claim(ClaimTypes.UserData,JsonConvert.SerializeObject(date)), new Claim(ClaimTypes.UserData,JsonConvert.SerializeObject(date)),
}; };
var key = new SymmetricSecurityKey(Encoding.ASCII.GetBytes(_configuration.GetSection("JwtConfiguration:Jwtkey").Value)); var key = new SymmetricSecurityKey(Encoding.ASCII.GetBytes(_configuration.GetSection("JwtConfiguration:Jwtkey").Value));
var signingCredentials = new SigningCredentials(key, SecurityAlgorithms.HmacSha256); var signingCredentials = new SigningCredentials(key, SecurityAlgorithms.HmacSha256);
//Token //Token
var jwttoken = new JwtSecurityToken( var jwttoken = new JwtSecurityToken(
issuer: _configuration.GetSection("JwtConfiguration:Issuer").Value, issuer: _configuration.GetSection("JwtConfiguration:Issuer").Value,
audience: _configuration.GetSection("JwtConfiguration:Audience").Value, audience: _configuration.GetSection("JwtConfiguration:Audience").Value,
claims: claims, claims: claims,
notBefore: DateTime.Now, notBefore: DateTime.Now,
expires: DateTime.Now.AddDays(1), expires: DateTime.Now.AddDays(1),
signingCredentials: signingCredentials signingCredentials: signingCredentials
); );
//var token = new JwtSecurityTokenHandler().CreateToken(jwttoken); //var token = new JwtSecurityTokenHandler().CreateToken(jwttoken);
var tokenString = new JwtSecurityTokenHandler().WriteToken(jwttoken); var tokenString = new JwtSecurityTokenHandler().WriteToken(jwttoken);
ret.result = new ret.result = new
{ {
Id = date.Id, Id = date.Id,
name = date.name, name = date.name,
sex = date.sex, sex = date.sex,
phone = date.phone, phone = date.phone,
photo = date.photo, photo = date.photo,
duties = date.duties, duties = date.duties,
identity = date.identity, identity = date.identity,
openId = date.wechatId, openId = date.wechatId,
usertype = date.usertype, usertype = date.usertype,
unitCode = date.unitCode, unitCode = date.unitCode,
token = tokenString token = tokenString
}; };
#endregion #endregion
ret.IsSucceed = true; ret.IsSucceed = true;
} }
else else
{ {
var datea = await _db.Queryable<App_Sys_UserModel>().Where(q => q.IsDeleted == 0 && q.cardId == cardId).FirstAsync(); var datea = await _db.Queryable<App_Sys_UserModel>().Where(q => q.IsDeleted == 0 && q.cardId == cardId).FirstAsync();
if (datea == null) if (datea == null)
{ {
var unitcode = _configuration.GetSection("CaseTwenty:UnitCode").Value; var unitcode = _configuration.GetSection("CaseTwenty:UnitCode").Value;
@ -737,15 +743,15 @@ namespace _24Hour.Controllers
ret.IsSucceed = true; ret.IsSucceed = true;
ret.result = "添加成功"; ret.result = "添加成功";
} }
} }
else else
{ {
ret.IsSucceed = false; ret.IsSucceed = false;
ret.Message = $"用户未授权无法登录，请联系管理员！"; ret.Message = $"用户未授权无法登录，请联系管理员！";
return ret; return ret;
} }
} }
return ret; return ret;
} }
/// <summary> /// <summary>
/// 小程序AppID /// 小程序AppID
@ -769,17 +775,17 @@ namespace _24Hour.Controllers
/// <returns></returns> /// <returns></returns>
[HttpGet("GetGzhOpenId")] [HttpGet("GetGzhOpenId")]
public Task<Result> GetGzhOpenId(string code) => wechatMessagerClient.GetGzhOpenId(code); public Task<Result> GetGzhOpenId(string code) => wechatMessagerClient.GetGzhOpenId(code);
} }
public class UserLogin public class UserLogin
{ {
[DataMember] [DataMember]
public string phone { get; set; } public string phone { get; set; }
/// <summary> /// <summary>
/// 登录密码 /// 登录密码
/// </summary> /// </summary>
[DataMember] [DataMember]
public string Password { get; set; } public string Password { get; set; }
} }
} }
Write Preview
Loading…
Cancel
Save