diff --git a/src/WMS.Web.Api/Controllers/LoginController.cs b/src/WMS.Web.Api/Controllers/LoginController.cs index b8a64f99..2519723d 100644 --- a/src/WMS.Web.Api/Controllers/LoginController.cs +++ b/src/WMS.Web.Api/Controllers/LoginController.cs @@ -99,21 +99,6 @@ namespace WMS.Web.Api.Controllers if (!string.IsNullOrEmpty(value)) await _loginService.LoginOutSingleAsync(value); return Result.ReSuccess(); - } - - /// - /// 鍒锋柊token - /// - /// - [HttpPost] - [Route("RefreshToken")] - public async Task> RefreshToken() - { - var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]); - if (loginInfo == null || loginInfo.UserInfo == null) - return Result.ReFailure(BaseResultCodes.UnAuthorized); - var res = await _loginService.RefreshToken(loginInfo.TokenInfo.Token, loginInfo.TokenInfo.RefreshToken); - return res; - } + } } } diff --git a/src/WMS.Web.Api/appsettings.json b/src/WMS.Web.Api/appsettings.json index e8c97546..85a95e02 100644 --- a/src/WMS.Web.Api/appsettings.json +++ b/src/WMS.Web.Api/appsettings.json @@ -16,7 +16,6 @@ }, "AllowedHosts": "*", "AllowedCores": "localhost,http://localhost:8080,http://192.168.1.188:8080", - "RedisConnectionString": "47.110.156.96:16379,password=123456,DefaultDatabase=1", "AppOptions": { "DBConnectionString": "Server=192.168.1.253; Database=wms_db;User Id=root;password=bf69f5755f97e943;port=3306;CharSet=gb2312;Connect Timeout=150;", "RedisConnectionString": "47.110.156.96:16379,password=123456,DefaultDatabase=2", @@ -54,15 +53,6 @@ "Bucket": "orico-wms-test", //正式 orico-wms "Url": "https://wmstestfile.f2b211.com/" //测试 https://wmstestfile.f2b211.com/ 正式 https://wmsfile.f2b211.com/ }, - "HttpOptions": { - "Url": "dev.uc.f2b211.com", - "K3Url": "http://39.108.150.2:8066/api/k3-id32-mait/add-ces", - "K3UrlLogin": "http://39.108.150.2:8066/api/login", - "K3Enable": "false", - "EspUrl": "https://esp-test.itrusign.cn/esp", - "EspAppId": "ark", - "EspAppSecret": "e5499b392e099ecfe633af12993d0d5f" - }, //定时任务配置项 "QuartzJobOptions": { //存储类型:键和值 diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml index 908e5a72..21ee1e66 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml @@ -302,12 +302,6 @@ - - - 鍒锋柊token - - - 鍒楄〃 diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml index 5bc6e119..20811ea7 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml @@ -3184,13 +3184,6 @@ - - - 寰楀埌鍗曠偣鐢ㄦ埛淇℃伅 - - - - @@ -3206,13 +3199,6 @@ - - - 鐧诲綍閫鍑 - - - - 鐧诲綍閫鍑 @@ -3220,12 +3206,6 @@ - - - 鍒锋柊token - - - 鍒锋柊token @@ -3234,15 +3214,6 @@ - - - 鍗曠偣閫鍑洪氱煡token澶辨晥 - - - - - - 鍗曠偣閫鍑洪氱煡token澶辨晥 @@ -3257,20 +3228,6 @@ - - - 鍗曠偣-鍦ㄧ嚎鎺ュ彛 - - - - - - - 鍗曠偣-涓嬬嚎鎺ュ彛 - - - - 鍑哄簱浠诲姟 @@ -4803,13 +4760,6 @@ - - - 寰楀埌鍗曠偣鐢ㄦ埛淇℃伅 - - - - 鑾峰彇鍗曠偣鐧诲綍淇℃伅 @@ -4825,12 +4775,6 @@ - - - 鐧诲綍閫鍑 - - - 鐧诲綍閫鍑 @@ -4838,12 +4782,6 @@ - - - 鍒锋柊token - - - 鍒锋柊token @@ -4852,15 +4790,6 @@ - - - 鍗曠偣閫鍑洪氱煡token澶辨晥 - - - - - - 鍗曠偣閫鍑洪氱煡token澶辨晥 @@ -4888,20 +4817,6 @@ - - - 鍗曠偣-鍦ㄧ嚎鎺ュ彛 - - - - - - - 鍗曠偣-涓嬬嚎鎺ュ彛 - - - - ops鏈嶅姟 diff --git a/src/WMS.Web.Core/Help/HttpClientHelp.cs b/src/WMS.Web.Core/Help/HttpClientHelp.cs index 4bceedb3..02e5250e 100644 --- a/src/WMS.Web.Core/Help/HttpClientHelp.cs +++ b/src/WMS.Web.Core/Help/HttpClientHelp.cs @@ -16,74 +16,12 @@ namespace WMS.Web.Core.Help { public class HttpClientHelp { - private HttpOptions _options; private ILogger _logger; - public HttpClientHelp(IOptions options, ILogger logger) + public HttpClientHelp(ILogger logger) { - this._options = options?.Value; this._logger = logger; - } - public string PostHttp(string url, JsonObject reqData, bool isHaveCookie = false, string cookieValue = "", string appSecret = "") - { - HttpWebRequest request = (HttpWebRequest)WebRequest.Create(url); - - HMACSHA1 hmacsha1 = new HMACSHA1(); - if (!string.IsNullOrEmpty(appSecret)) - { - byte[] secret = Encoding.UTF8.GetBytes(appSecret); - hmacsha1.Key = secret; - } - byte[] dataBuffer = Encoding.UTF8.GetBytes(reqData.ToString()); - byte[] hashBytes = hmacsha1.ComputeHash(dataBuffer); - - int contentLength = dataBuffer.Length; - string rawHmac = Convert.ToBase64String(hashBytes); - request.Method = "POST"; - request.ContentType = "application/json; charset=utf-8"; - request.ContentLength = contentLength; - request.Accept = "application/json; charset=utf-8"; - request.Headers.Add("Content-Signature", "HMAC-SHA1 " + rawHmac); - if (isHaveCookie) - { - var cook = new Cookie(); - cook.Domain = _options.Url; - cook.Name = "PHPSESSID"; - cook.Value = cookieValue; - request.CookieContainer = new CookieContainer(); - request.CookieContainer.Add(cook); - } - - Stream writer; - try - { - writer = request.GetRequestStream(); - } - catch (Exception ex) - { - writer = null; - Console.WriteLine("閾炬帴鍗曠偣閿欒寮傚父:" + ex.ToString()); - } - writer.Write(dataBuffer, 0, dataBuffer.Length); - writer.Close(); - - Stream responseStream; - try - { - HttpWebResponse response = (HttpWebResponse)request.GetResponse(); - responseStream = response.GetResponseStream(); - } - catch (Exception ex) - { - responseStream = null; - //WriteLog("鏈嶅姟鍣ㄥ紓甯" + ex.Message); - } - StreamReader streamReader = new StreamReader(responseStream, Encoding.GetEncoding("utf-8")); - - string respData = streamReader.ReadToEnd(); - responseStream.Close(); - return respData; - } + } public string PostHttp(string url, LoginAuthorizeRequest reqData) { @@ -201,142 +139,6 @@ namespace WMS.Web.Core.Help { return ""; } - } - - public string PostHttpNoData(string url, string cookieValue = "") - { - HttpWebRequest request = (HttpWebRequest)WebRequest.Create(url); - - request.Method = "POST"; - request.ContentType = "application/json; charset=utf-8"; - request.Accept = "application/json; charset=utf-8"; - if (!string.IsNullOrEmpty(cookieValue)) - { - var cook = new Cookie(); - cook.Domain = _options.Url; - cook.Name = "PHPSESSID"; - cook.Value = cookieValue; - request.CookieContainer = new CookieContainer(); - request.CookieContainer.Add(cook); - } - - Stream writer; - try - { - writer = request.GetRequestStream(); - } - catch (Exception ex) - { - writer = null; - Console.WriteLine("閾炬帴鍗曠偣閿欒寮傚父:" + ex.ToString()); - } - writer.Close(); - - Stream responseStream; - try - { - HttpWebResponse response = (HttpWebResponse)request.GetResponse(); - responseStream = response.GetResponseStream(); - } - catch (Exception ex) - { - responseStream = null; - //WriteLog("鏈嶅姟鍣ㄥ紓甯" + ex.Message); - } - StreamReader streamReader = new StreamReader(responseStream, Encoding.GetEncoding("utf-8")); - - string respData = streamReader.ReadToEnd(); - responseStream.Close(); - return respData; - } - - public string GetHttp(string url, bool isHaveCookie = false, string cookieValue = "") - { - HttpWebRequest request = (HttpWebRequest)WebRequest.Create(url); - - HMACSHA1 hmacsha1 = new HMACSHA1(); - - request.Method = "Get"; - request.ContentType = "application/json; charset=utf-8"; - request.Accept = "application/json; charset=utf-8"; - if (isHaveCookie) - { - var cook = new Cookie(); - cook.Domain = _options.Url; - cook.Name = "PHPSESSID"; - cook.Value = cookieValue; - request.CookieContainer = new CookieContainer(); - request.CookieContainer.Add(cook); - } - - Stream writer; - try - { - writer = request.GetRequestStream(); - } - catch (Exception) - { - writer = null; - //WriteLog("杩炴帴鏈嶅姟鍣ㄥ紓甯"); - } - - Stream responseStream; - try - { - HttpWebResponse response = (HttpWebResponse)request.GetResponse(); - responseStream = response.GetResponseStream(); - } - catch (Exception ex) - { - responseStream = null; - //WriteLog("鏈嶅姟鍣ㄥ紓甯" + ex.Message); - } - StreamReader streamReader = new StreamReader(responseStream, Encoding.GetEncoding("utf-8")); - - string respData = streamReader.ReadToEnd(); - responseStream.Close(); - return respData; - } - - - private static readonly DateTime Jan1st1970 = new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc); - - public static long CurrentTimeMillis() - { - return (long)(DateTime.UtcNow - Jan1st1970).TotalMilliseconds; - } - - - - public async Task Post(string url, string param, string token) - { - HttpClient _client = new HttpClient(); - //璇诲彇杩斿洖娑堟伅 - string res = string.Empty; - try - { - //濉厖formData - if (param == null) param = ""; - HttpContent hc = new StringContent(param, Encoding.UTF8) - { - Headers = - { - ContentType = new MediaTypeHeaderValue("application/json")//application/x-www-form-urlencoded - } - }; - _client.DefaultRequestHeaders.Add("Authorization", "Bearer " + token); - var responseMessage = _client.PostAsync(url, hc).Result; - var msg = await responseMessage.Content.ReadAsStringAsync(); - if (msg.Equals("")) - return null; - else - return JsonObject.Parse(msg); - - } - catch (Exception ex) - { - } - return null; - } + } } } diff --git a/src/WMS.Web.Core/Help/HttpOptions.cs b/src/WMS.Web.Core/Help/HttpOptions.cs deleted file mode 100644 index 4ad7d37e..00000000 --- a/src/WMS.Web.Core/Help/HttpOptions.cs +++ /dev/null @@ -1,20 +0,0 @@ -锘縰sing System; -using System.Collections.Generic; -using System.Text; - -namespace WMS.Web.Core.Help -{ - public class HttpOptions - { - public string Url { get; set; } - - public string K3Url { get; set; } - public string K3UrlLogin { get; set; } - public bool K3Enable { get; set; } = false; - - public string EspUrl { get; set; } - - public string EspAppId { get; set; } - public string EspAppSecret { get; set; } - } -} diff --git a/src/WMS.Web.Domain/IService/Public/ILoginService.cs b/src/WMS.Web.Domain/IService/Public/ILoginService.cs index 750c6abd..dbf47fe5 100644 --- a/src/WMS.Web.Domain/IService/Public/ILoginService.cs +++ b/src/WMS.Web.Domain/IService/Public/ILoginService.cs @@ -23,13 +23,6 @@ namespace WMS.Web.Domain.IService.Public /// Task CreateToken(UserInfoDto data, LoginTempDto tempDto, string NewToken); - /// - /// 寰楀埌鍗曠偣鐢ㄦ埛淇℃伅 - /// - /// - /// - Task> GetUserInfoAsync(string code); - /// /// /// @@ -45,13 +38,6 @@ namespace WMS.Web.Domain.IService.Public /// Task> GetUserInfo(string username, string password); - /// - /// 鐧诲綍閫鍑 - /// - /// - /// - Task LoginOutAsync(LoginOutDto dto); - /// /// 鐧诲綍閫鍑 /// @@ -59,13 +45,6 @@ namespace WMS.Web.Domain.IService.Public /// Task LoginOut(LoginOutDto dto); - - /// - /// 鍒锋柊token - /// - /// - Task> RefreshToken(string OldToken, string RefreshToken); - /// /// 鍒锋柊token /// @@ -74,15 +53,6 @@ namespace WMS.Web.Domain.IService.Public /// Task> RefreshTokenNew(string Token, string RefreshToken); - /// - /// 鍗曠偣閫鍑洪氱煡token澶辨晥 - /// - /// - /// - /// - /// - Task LoginOutSingleAsync(int ucid, string token, int expires_in); - /// /// 鍗曠偣閫鍑洪氱煡token澶辨晥 /// @@ -96,19 +66,5 @@ namespace WMS.Web.Domain.IService.Public /// /// LoginInDto GetLoginInfo(string authorization); - - /// - /// 鍗曠偣-鍦ㄧ嚎鎺ュ彛 - /// - /// - /// - Task Online(string sessionId); - - /// - /// 鍗曠偣-涓嬬嚎鎺ュ彛 - /// - /// - /// - Task Offline(string sessionId); } } diff --git a/src/WMS.Web.Domain/Services/Public/LoginService.cs b/src/WMS.Web.Domain/Services/Public/LoginService.cs index abfd9bcb..1d3083d0 100644 --- a/src/WMS.Web.Domain/Services/Public/LoginService.cs +++ b/src/WMS.Web.Domain/Services/Public/LoginService.cs @@ -93,129 +93,6 @@ namespace WMS.Web.Domain.Services.Public }); } - /// - /// 寰楀埌鍗曠偣鐢ㄦ埛淇℃伅 - /// - /// - /// - public async Task> GetUserInfoAsync(string code) - { - JsonObject reqData = new JsonObject(); - reqData.Add("app_id", _soaOptions.AppId); - reqData.Add("app_secret", _soaOptions.AppSecret); - reqData.Add("code", code); - //杩欎釜鏄櫥褰曠殑鏃跺欑粰鍓嶇楠岃瘉鐨則oken,浠ュ強浼犵粰php鍗曠偣閭ｈ竟鐨勪竴涓猻ession鍊硷紝鐢ㄤ簬鍗曠偣閫鍑烘椂锛岄氱煡ops閫鍑 - string NewToken = Guid.NewGuid().ToString("N"); - try - { - string result = _httpClientHelp.PostHttp(_soaOptions.Url + "/uc/authorize/access_token", reqData, true, NewToken); - var jObject = JsonObject.Parse(result); - - LoginInDto r = new LoginInDto(); - r.UserInfo = new UserInfoDto(); - r.TokenInfo = new AccessTokenDto(); - var login_result = jObject["errno"] == 0 ? "鎴愬姛" : "澶辫触"; - _logger.LogInformation($"鐧诲綍淇℃伅锛氬崟鐐->{login_result}"); - - if (jObject["errno"] == 0) - { - string datajson = jObject["data"].ToString(); - var _loginDto = JsonConvert.DeserializeObject(datajson); - - #region 瑙ｇ爜 - string enptStr = _loginDto.encryptedData; - List enptlist = enptStr.Trim().Split(',').ToList(); - string str = RSA.DecryptSection(_soaOptions.PrivateKey, enptlist); - var entity = JsonConvert.DeserializeObject(str); - #endregion - - //鏄犲皠鐧诲綍淇℃伅 - r.UserInfo = _mapper.Map(entity); - _logger.LogInformation($"鐧诲綍淇℃伅锛氱敤鎴稩D->{entity.uc_id}"); - - //HTTP璇锋眰鑾峰彇鐧诲綍淇℃伅锛氫汉鍛橈紝瀹㈡埛锛屼緵搴斿晢锛屽叕鍙 - var loginRequest = new LoginSingleRequest() - { - UserId = entity.uc_id, - SupplierId = entity.supplier_id ?? 0, - CustomerId = entity.customer_id ?? 0 - }; - var loginResponse_result = await _singleDataService.GetSingleDataNoCache, LoginSingleRequest, SingleLoginAction> - (loginRequest, SingleLoginAction.All, type: SingleControllerType.Login); - - //缁戝畾杩斿洖瀵硅薄鐨勭櫥褰曚俊鎭 - var staffName = "Null"; - var token = await CreateToken(r.UserInfo, _loginDto, NewToken); - r.TokenInfo = token; - if (loginResponse_result.Success && loginResponse_result.Data != null) - { - var loginResponse = loginResponse_result.Data; - if (loginResponse.Supplier != null) - r.UserInfo.SupplierName = loginResponse.Supplier.Name; - if (loginResponse.Customer != null) - r.UserInfo.CustomerName = loginResponse.Customer.Name; - if (loginResponse.Staff != null) - { - r.UserInfo.StaffId = loginResponse.Staff.Id; - staffName = loginResponse.Staff.Name; - } - if (loginResponse.Company != null) - r.UserInfo.CompanyName = loginResponse.Company.Name; - } - r.UserInfo.UcId = entity.uc_id; - r.UserInfo.SeesionId = _loginDto?.uc_sessid; - r.UserInfo.CompanyId = entity.company_id.Value; - r.UserInfo.Identity = entity.identity; - r.UserInfo.OrgId = entity.org_id; - r.UserInfo.CustomerId = entity.customer_id; - r.UserInfo.SupplierId = entity.supplier_id; - r.SignedIn = true; - _logger.LogInformation($"鐧诲綍淇℃伅锛氱敤鎴蜂汉鍛樹俊鎭->{staffName}锛坽r.UserInfo.StaffId}锛夛紝鍏徃鍚嶇О->{r.UserInfo.CompanyName}"); - - //鐧诲綍鍚庣紦瀛樼櫥褰曠殑鐢ㄦ埛淇℃伅鍜宼oken淇℃伅 - var loginInfo = new LoginInDto(); - loginInfo.UserInfo = r.UserInfo; - loginInfo.TokenInfo = token; - - var ops_login_time = token.Expired.AddDays(1) - DateTime.Now;//鐢ㄤ簬姝ｅ紡 - _redisClientService.SetStringKey($"wms_login_{token.Token}", loginInfo, ops_login_time); - - //鐧诲綍鎴愬姛绉诲嚭瀵瑰簲鐨勭敤鎴穞oken榛戝悕鍗曪細搴斾负鏂扮殑token浜х敓,绉婚櫎鐧诲綍鐨勪俊鎭 - string blacktoken = _redisClientService.GetStringKey($"wms_black_token_{r.UserInfo.UcId}"); - if (!string.IsNullOrEmpty(blacktoken)) - { - this.RemoveLoginInfo(blacktoken); - _redisClientService.RemoveStringKey($"wms_black_token_{r.UserInfo.UcId}"); - } - if (r == null || r.UserInfo == null || r.TokenInfo == null) - return Result.ReFailure("鎺堟潈澶辫触锛岃閲嶆柊鐧诲綍", 401); - return Result.ReSuccess(r); - } - else - { - var errno_text = "鐧婚檰澶辫触:" + jObject["errmsg"]; - r.SignedIn = false; - string datajson_sessid = jObject["data"]["uc_sessid"]; - //璋冪敤鍗曠偣鐨勯鍑烘帴鍙 - result = _httpClientHelp.GetHttp(_soaOptions.Url + "/uc/authorize/signin_out", true, cookieValue: datajson_sessid); - jObject = JsonObject.Parse(result); - if (jObject["errno"] == 0) - { - _logger.LogInformation("鐢ㄦ埛淇℃伅鐧诲綍锛" + errno_text); - return Result.ReFailure("鎷掔粷鐢ㄦ埛璇佷功璇曞浘璁块棶姝eb绔欑偣锛岃涓庣珯鐐圭鐞嗗憳鑱旂郴浠ュ缓绔嬬敤鎴疯瘉涔︽潈闄", 403); - } - else - { - return Result.ReFailure(jObject["errmsg"], jObject["errno"]); - } - } - } - catch (Exception ex) - { - return Result.ReFailure("鎺堟潈澶辫触锛岃閲嶆柊鐧诲綍", 401); - } - } - /// /// 鑾峰彇鍗曠偣鐧诲綍淇℃伅 /// @@ -450,33 +327,6 @@ namespace WMS.Web.Domain.Services.Public } } - /// - /// 鐧诲綍閫鍑 - /// - /// - public async Task LoginOutAsync(LoginOutDto dto) - { - _logger.LogInformation("dto_SessionId:" + dto.SessionId); - //2.璇锋眰PHP鍗曠偣鐧诲嚭鎺ュ彛 - JsonObject reqData = new JsonObject(); - reqData.Add("app_id", _soaOptions.AppId); - reqData.Add("app_secret", _soaOptions.AppSecret); - reqData.Add("access_token", dto.AccessToken); - string result = _httpClientHelp.PostHttp(_soaOptions.Url_V3 + "/uc/authorize/signin_out", reqData, true, dto.SessionId); - _logger.LogInformation("閫鍑虹櫥褰曡繑鍥:" + result); - var jObject = JsonObject.Parse(result); - if (jObject["errno"] == 0) - { - //璁剧疆鏈湴token鐨勭紦瀛橈細涓洪粦鍚嶅崟鐨則oken鍋氬瓨鍌 - await CacheOutToken(dto); - return Result.ReSuccess(); - } - else - { - return Result.ReFailure(BaseResultCodes.UnAuthorized); - } - } - /// /// 鐧诲綍閫鍑 /// @@ -503,68 +353,6 @@ namespace WMS.Web.Domain.Services.Public } } - /// - /// 鍒锋柊token - /// - /// - public async Task> RefreshToken(string Token, string RefreshToken) - { - - //1.鏍规嵁鏃oken 鎵惧埌鐧诲綍瀵硅薄 - var loginInfo = _redisClientService.GetStringKey($"wms_login_{Token}"); - //2.璇锋眰PHP鍗曠偣鐧诲嚭鎺ュ彛 - JsonObject reqData = new JsonObject(); - reqData.Add("app_id", _soaOptions.AppId); - reqData.Add("app_secret", _soaOptions.AppSecret); - reqData.Add("refresh_token", RefreshToken); - string result = _httpClientHelp.PostHttp(_soaOptions.Url + "/uc/authorize/refresh_token", reqData, true, Token); - var jObject = JsonObject.Parse(result); - - LoginInDto r = new LoginInDto(); - r.UserInfo = new UserInfoDto(); - r.TokenInfo = new AccessTokenDto(); - - if (jObject["errno"] == 0) - { - string datajson = jObject["data"].ToString(); - var _loginDto = JsonConvert.DeserializeObject(datajson); - r.UserInfo = loginInfo.UserInfo; - r.SignedIn = true; - var token = await CreateToken(loginInfo.UserInfo, _loginDto, Token); - r.TokenInfo = token; - loginInfo.TokenInfo = token; - _logger.LogInformation("RefreshToken:鎴戝湪鍒锋柊鐧诲綍锛氬埛鏂板悗鐨勮繃鏈熸椂闂-1>" + token.Expired.ToString()); - var ops_login_time = token.Expired.AddDays(1) - DateTime.Now;//鐢ㄤ簬姝ｅ紡 - _redisClientService.SetStringKey($"wms_login_{token.Token}", loginInfo, ops_login_time); - _logger.LogInformation("RefreshToken:鎴戝湪鍒锋柊鐧诲綍锛氬埛鏂板悗鐨勮繃鏈熸椂闂-灏忔椂->" + ops_login_time.Hours); - return Result.ReSuccess(r); - } - //else if (jObject["code"] == 0) - //{ - // string datajson = jObject["data"].ToString(); - // var _loginDto = JsonConvert.DeserializeObject(datajson); - - // r.UserInfo = loginInfo.UserInfo; - // r.SignedIn = true; - // var token = await CreateToken(loginInfo.UserInfo, _loginDto, Token); - // r.TokenInfo = token; - // loginInfo.TokenInfo = token; - - // var ops_login_time = token.Expired.AddDays(1) - DateTime.Now;//鐢ㄤ簬姝ｅ紡 - // _redisClientService.SetStringKey($"wms_login_{token.Token}", loginInfo, ops_login_time); - // return Result.ReSuccess(r); - //} - else - { - //澶辫触浜1锛氬氨鎶婄櫥褰曠殑token娓呴櫎 2锛 ucid娣诲姞鍒伴粦鍚嶅崟 - var time = new TimeSpan(r.TokenInfo.Expired.Day, r.TokenInfo.Expired.Hour, r.TokenInfo.Expired.Minute, r.TokenInfo.Expired.Second, r.TokenInfo.Expired.Millisecond); - _redisClientService.SetStringKey($"wms_black_token_{r.UserInfo.UcId}", r.TokenInfo.Token, time); - this.RemoveLoginInfo(r.TokenInfo.Token); - r.SignedIn = false; - return Result.ReFailure(jObject["errmsg"], jObject["errno"]); - } - } - /// /// 鍒锋柊token /// @@ -616,28 +404,6 @@ namespace WMS.Web.Domain.Services.Public } } - /// - /// 鍗曠偣閫鍑洪氱煡token澶辨晥 - /// - /// - /// - /// - /// - public async Task LoginOutSingleAsync(int ucid, string token, int expires_in) - { - await Task.Run(() => - { - var cache_token = _redisClientService.GetStringKey($"wms_black_token_{ucid}"); - if (string.IsNullOrEmpty(cache_token)) - { - DateTime expires_time = TimeZone.CurrentTimeZone.ToLocalTime(new System.DateTime(1970, 1, 1)).AddSeconds(expires_in); - var time = new TimeSpan(expires_time.Day, expires_time.Hour, expires_time.Minute, expires_time.Second, expires_time.Millisecond); - _redisClientService.SetStringKey($"wms_black_token_{ucid}", token, time); - this.RemoveLoginInfo(token); - } - }); - } - /// /// 鍗曠偣閫鍑洪氱煡token澶辨晥 /// @@ -712,29 +478,5 @@ namespace WMS.Web.Domain.Services.Public } } } - - /// - /// 鍗曠偣-鍦ㄧ嚎鎺ュ彛 - /// - /// - /// - public async Task Online(string sessionId) - { - var request = new { PHPSESSID = sessionId }; - string result = _httpClientHelp.PostHttpNoData(_soaOptions.Url + "/uc/user/online.html?app_id=" + _soaOptions.AppId, sessionId); - return Result.ReSuccess(); - } - - /// - /// 鍗曠偣-涓嬬嚎鎺ュ彛 - /// - /// - /// - public async Task Offline(string sessionId) - { - var request = new { PHPSESSID = sessionId }; - string result = _httpClientHelp.PostHttpNoData(_soaOptions.Url + "/uc/user/offline.html?app_id=" + _soaOptions.AppId, sessionId); - return Result.ReSuccess(); - } } } diff --git a/src/WMS.Web.Repositories/DependencyInjection/AppBuilder.cs b/src/WMS.Web.Repositories/DependencyInjection/AppBuilder.cs index d5dfd564..6b7efb83 100644 --- a/src/WMS.Web.Repositories/DependencyInjection/AppBuilder.cs +++ b/src/WMS.Web.Repositories/DependencyInjection/AppBuilder.cs @@ -171,8 +171,6 @@ namespace WMS.Web.Repositories.DependencyInjection Services.Configure(Configuration.GetSection("AppOptions")); Services.AddOptions(); Services.Configure(Configuration.GetSection("SoaOptions")); - Services.AddOptions(); - Services.Configure(Configuration.GetSection("HttpOptions")); Services.AddOptions(); Services.Configure(Configuration.GetSection("ErpOptions")); Services.AddOptions();