调整影响对象字段
This commit is contained in:
@@ -22,7 +22,12 @@ namespace WMS.Web.Core.Dto.InStockTask
|
||||
/// 来源单号
|
||||
/// </summary>
|
||||
public string SourceBillNo { get; set; }
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 仓库编码(对应金蝶和单点)
|
||||
/// </summary>
|
||||
public string StockCode { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 物料ID
|
||||
/// </summary>
|
||||
|
||||
@@ -223,13 +223,6 @@ namespace WMS.Web.Domain.Services.Public
|
||||
/// <returns></returns>
|
||||
public async Task<Result<LoginInDto>> GetUserInfo(string username, string password)
|
||||
{
|
||||
//JsonObject reqData = new JsonObject();
|
||||
//reqData.Add("client_id", _soaOptions.AppId);
|
||||
//reqData.Add("client_secret", _soaOptions.AppSecret);
|
||||
//reqData.Add("grant_type", "password");
|
||||
//reqData.Add("username", username);
|
||||
//reqData.Add("password", password);
|
||||
|
||||
var reqData = new LoginAuthorizeRequest();
|
||||
reqData.ClientId = _soaOptions.AppId;
|
||||
reqData.ClientSecret = _soaOptions.AppSecret;
|
||||
@@ -240,28 +233,20 @@ namespace WMS.Web.Domain.Services.Public
|
||||
var md5 = System.Security.Cryptography.MD5.Create();
|
||||
var md5Pwd= BitConverter.ToString(md5.ComputeHash(Encoding.Default.GetBytes(password)));
|
||||
md5Pwd = md5Pwd.Replace("-", string.Empty);
|
||||
|
||||
|
||||
|
||||
reqData.Password = md5Pwd.ToLower();
|
||||
|
||||
|
||||
//这个是登录的时候给前端验证的token,以及传给php单点那边的一个session值,用于单点退出时,通知ops退出
|
||||
string NewToken = Guid.NewGuid().ToString("N");
|
||||
try
|
||||
{
|
||||
_logger.LogInformation($"username1:" + username + ";password:" + password);
|
||||
string result = _httpClientHelp.PostHttp(_soaOptions.Url_V3 + "/uc/authorize", reqData);
|
||||
var jObject = JsonObject.Parse(result);
|
||||
_logger.LogInformation($"username2:" + username + ";password:" + password);
|
||||
LoginInDto r = new LoginInDto();
|
||||
r.UserInfo = new UserInfoDto();
|
||||
r.TokenInfo = new AccessTokenDto();
|
||||
var login_result = jObject["code"] == 0 ? "成功" : "失败";
|
||||
_logger.LogInformation($"登录信息APP和小程序:单点->{login_result}");
|
||||
|
||||
if (jObject["code"] == 0)
|
||||
{
|
||||
if (jObject["code"] == 0) {
|
||||
string datajson = jObject["data"].ToString();
|
||||
var _loginDto = JsonConvert.DeserializeObject<LoginTempV2Dto>(datajson);
|
||||
|
||||
@@ -274,12 +259,7 @@ namespace WMS.Web.Domain.Services.Public
|
||||
|
||||
//映射登录信息
|
||||
var userInfo_v3 = _mapper.Map<UserInfoV3Dto>(entity);
|
||||
//userInfo_v3.Orgs = _mapper.Map<List<TagInfoDto>>(entity.orgs);
|
||||
//userInfo_v3.Depts = _mapper.Map<List<TagInfoDto>>(entity.depts);
|
||||
//userInfo_v3.Roles = _mapper.Map<List<TagInfoDto>>(entity.roles);
|
||||
|
||||
_logger.LogInformation($"登录信息:用户ID->{entity.id}");
|
||||
|
||||
//HTTP请求获取登录信息:人员,客户,供应商,公司
|
||||
var loginRequest = new LoginSingleRequest()
|
||||
{
|
||||
@@ -343,7 +323,6 @@ namespace WMS.Web.Domain.Services.Public
|
||||
jObject = JsonObject.Parse(result);
|
||||
if (jObject["errno"] == 0)
|
||||
{
|
||||
_logger.LogInformation("用户信息登录:" + errno_text);
|
||||
return Result<LoginInDto>.ReFailure("拒绝用户证书试图访问此web站点,请与站点管理员联系以建立用户证书权限", 403);
|
||||
}
|
||||
else
|
||||
|
||||
@@ -163,6 +163,7 @@ namespace WMS.Web.Repositories
|
||||
DetailsId=s.detail.Id,
|
||||
SourceBillNo=s.order.SourceBillNo,
|
||||
MaterialId=s.detail.MaterialId,
|
||||
StockCode=s.detail.StockCode,
|
||||
MaterialName = "",
|
||||
MaterialNumber = "",
|
||||
Specifications = "",
|
||||
|
||||
Reference in New Issue
Block a user