diff --git a/24Hour/Controllers/Common/LawyerArchivesController.cs b/24Hour/Controllers/Common/LawyerArchivesController.cs index dcaaea9..b501674 100644 --- a/24Hour/Controllers/Common/LawyerArchivesController.cs +++ b/24Hour/Controllers/Common/LawyerArchivesController.cs @@ -502,63 +502,84 @@ namespace _24Hour.Controllers.Common } } /// - /// 加密二维码信息 + /// 加密字符串信息 /// + /// /// [HttpGet] [HiddenApi] [Route("EncodeData")] - public async Task EncodeData(string id) + public Task> EncodeData(string str) { - var data = await _db.Queryable().LeftJoin((lawyer, user) => lawyer.createuserId == user.Id) - .Where(lawyer => lawyer.Id == id) - .Select((lawyer, user) => new - { - info = lawyer, - user - }).FirstAsync(); - if (data != null) - { - var dto = new - { - info = mapper.Map(data.info), - user = mapper.Map(data.user) - }; - var encodingdata = Convert.ToBase64String(Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(dto))); + Result result = new(); + result.result = Convert.ToBase64String(Encoding.UTF8.GetBytes(str)); result.IsSucceed = true; - result.result = encodingdata; + + return Task.FromResult(result); } - return result; + public class DecodeQRDataModel + { + public string QRData { get; set; } } - /// - /// 解码二维码信息 - /// - /// - [HttpPost] - [HiddenApi] - [Route("DecodeQRData")] - public Task DecodeQRData(DecodeData data) - { - try - { - var basestr = Convert.FromBase64String(data.EncodingString); - var str = Encoding.UTF8.GetString(basestr); + ///// + ///// 加密二维码信息 + ///// + ///// + //[HttpGet] + //[HiddenApi] + //[Route("EncodeData")] + //public async Task EncodeData(string id) + //{ + // var data = await _db.Queryable().LeftJoin((lawyer, user) => lawyer.createuserId == user.Id) + // .Where(lawyer => lawyer.Id == id) + // .Select((lawyer, user) => new + // { + // info = lawyer, + // user + // }).FirstAsync(); + // if (data != null) + // { + // var dto = new + // { + // info = mapper.Map(data.info), + // user = mapper.Map(data.user) + // }; + // var encodingdata = Convert.ToBase64String(Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(dto))); + // result.IsSucceed = true; + // result.result = encodingdata; + // } + // return result; + //} - var model = str.ConvertToAnonymousType(new - { - info = default(QRLawyerServiceDto), - user = default(QRUserDto) - }); - result.IsSucceed = true; - result.result = model; - } - catch (System.Exception ex) - { - result.IsSucceed = false; - } - return Task.FromResult(result); - } + ///// + ///// 解码二维码信息 + ///// + ///// + //[HttpPost] + //[HiddenApi] + //[Route("DecodeQRData")] + //public Task DecodeQRData(DecodeData data) + //{ + // try + // { + // var basestr = Convert.FromBase64String(data.EncodingString); + // var str = Encoding.UTF8.GetString(basestr); + + // var model = str.ConvertToAnonymousType(new + // { + // info = default(QRLawyerServiceDto), + // user = default(QRUserDto) + // }); + // result.IsSucceed = true; + // result.result = model; + // } + // catch (System.Exception ex) + // { + // result.IsSucceed = false; + // } + // return Task.FromResult(result); + //} #endregion } }