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
1c5746f3ac bb8cb03009
commit
a0f79f8003
5 changed files with 417 additions and 410 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. 46
      24Hour/Controllers/Common/LawyerArchivesController.cs
  2. 648
      24Hour/Controllers/LoginController.cs
  3. 124
      24Hour/Controllers/system/SystemControllerController.cs
  4. 5
      Elight.Entity/AppMode/App_LawyerServicesModel.cs
  5. 4
      Elight.Entity/SystemModel/App_Sys_UserModel.cs

46
24Hour/Controllers/Common/LawyerArchivesController.cs
Unescape View File

@ -1059,10 +1059,12 @@ namespace _24Hour.Controllers.Common
if (System.IO.File.Exists(filepath)) if (System.IO.File.Exists(filepath))
{ {
var basestr = Elight.Utility.Encrypt.DataEncryption.Decryptiones(filepath); var basestr = Elight.Utility.Encrypt.DataEncryption.Decryptiones(filepath);
var filename = Path.GetFileName(filepath);
filename = Path.ChangeExtension(filename, ".jpg");
await twentyClient.UploadImage(new UploadDto() await twentyClient.UploadImage(new UploadDto()
{ {
Bmsah = registerinfo.bmsah, Bmsah = registerinfo.bmsah,
FileName = Path.GetFileName(filepath), FileName = filename,
Code = typecode, Code = typecode,
Bhdlbm = registerinfo.bhdlbh, Bhdlbm = registerinfo.bhdlbh,
UnitCode = registerinfo.dwbm, UnitCode = registerinfo.dwbm,
@ -1077,7 +1079,7 @@ namespace _24Hour.Controllers.Common
await UploadPhoto(lawyer.identityphoto, "1423000000100"); await UploadPhoto(lawyer.identityphoto, "1423000000100");
await UploadPhoto(lawyer.departmentPhoto, "1423000000200"); await UploadPhoto(lawyersvc.departmentPhoto, "1423000000200");
await UploadPhoto(lawyersvc.annex, "1423000000300"); await UploadPhoto(lawyersvc.annex, "1423000000300");
await UploadPhoto(lawyersvc.legalAidPhoto, "1423000000400"); await UploadPhoto(lawyersvc.legalAidPhoto, "1423000000400");
await UploadPhoto(lawyer.cardIdphoto, "1423000000500"); await UploadPhoto(lawyer.cardIdphoto, "1423000000500");
@ -1822,7 +1824,7 @@ namespace _24Hour.Controllers.Common
{ {
userim.cardIdphoto = cardids; userim.cardIdphoto = cardids;
userim.identityphoto = files; userim.identityphoto = files;
userim.departmentPhoto = departments;
userim.unitCode = _userdata.unitCode; userim.unitCode = _userdata.unitCode;
userim.identity = "律师"; userim.identity = "律师";
userim.IsDeleted = 0; userim.IsDeleted = 0;
@ -1834,7 +1836,6 @@ namespace _24Hour.Controllers.Common
{ {
user.cardIdphoto = cardids; user.cardIdphoto = cardids;
user.identityphoto = files; user.identityphoto = files;
user.departmentPhoto = departments;
user.unitCode = _userdata.unitCode; user.unitCode = _userdata.unitCode;
user.identity = "律师"; user.identity = "律师";
user.IsDeleted = 0; user.IsDeleted = 0;
@ -1844,7 +1845,6 @@ namespace _24Hour.Controllers.Common
{ {
x.cardIdphoto, x.cardIdphoto,
x.identityphoto, x.identityphoto,
x.departmentPhoto,
x.unitCode, x.unitCode,
x.identity, x.identity,
x.IsDeleted x.IsDeleted
@ -1892,6 +1892,14 @@ namespace _24Hour.Controllers.Common
.ToList() .ToList()
.ConvertToJsonStr(); .ConvertToJsonStr();
var departmentPhoto = Path.Combine(ziplawyersvcs, lawyersvc.Id, "departmentPhoto");
var departmentPhotos = new DirectoryInfo(departmentPhoto)
.GetFiles()
.Select(x => "/CaseFile/imports/" + Path.GetRelativePath(dir, x.FullName)
.Replace(@"\", @"/"))
.ToList()
.ConvertToJsonStr();
if (svc == null) if (svc == null)
{ {
var lawyer = await _db.Queryable<App_Sys_UserModel>() var lawyer = await _db.Queryable<App_Sys_UserModel>()
@ -1906,6 +1914,7 @@ namespace _24Hour.Controllers.Common
lawyersvc.legalAidPhoto = legalAidPhotos; lawyersvc.legalAidPhoto = legalAidPhotos;
lawyersvc.relationshipProofPhoto = relationshipProofPhotos; lawyersvc.relationshipProofPhoto = relationshipProofPhotos;
lawyersvc.otherPhoto = otherPhotos; lawyersvc.otherPhoto = otherPhotos;
lawyersvc.departmentPhoto = departmentPhotos;
lawyersvc.IsAssigned = false; lawyersvc.IsAssigned = false;
_db.BeginTran(); _db.BeginTran();
var num = await _db.Insertable(lawyersvc).ExecuteCommandAsync(); var num = await _db.Insertable(lawyersvc).ExecuteCommandAsync();
@ -2025,6 +2034,7 @@ namespace _24Hour.Controllers.Common
packetPhotoField(item?.legalAidPhoto, "legalAidPhoto"); packetPhotoField(item?.legalAidPhoto, "legalAidPhoto");
packetPhotoField(item?.relationshipProofPhoto, "relationshipProofPhoto"); packetPhotoField(item?.relationshipProofPhoto, "relationshipProofPhoto");
packetPhotoField(item?.otherPhoto, "otherPhoto"); packetPhotoField(item?.otherPhoto, "otherPhoto");
packetPhotoField(item?.departmentPhoto, "departmentPhoto");
} }
//存储用户的相关附件 //存储用户的相关附件
foreach (var item in users) foreach (var item in users)
@ -2060,19 +2070,19 @@ namespace _24Hour.Controllers.Common
} }
} }
var departmentPhotos = item.departmentPhoto.ConvertToModel<List<string>>(); ////var departmentPhotos = item.departmentPhoto.ConvertToModel<List<string>>();
var departmentPhotosDir = Path.Combine(userdir, "departmentPhotos"); ////var departmentPhotosDir = Path.Combine(userdir, "departmentPhotos");
if (Directory.Exists(departmentPhotosDir) == false) Directory.CreateDirectory(departmentPhotosDir); ////if (Directory.Exists(departmentPhotosDir) == false) Directory.CreateDirectory(departmentPhotosDir);
foreach (var file in departmentPhotos) ////foreach (var file in departmentPhotos)
{ ////{
//var filepath = Path.Combine(Environment.CurrentDirectory, "wwwroot") + file.Replace("/", @"\"); //// //var filepath = Path.Combine(Environment.CurrentDirectory, "wwwroot") + file.Replace("/", @"\");
var urlpath = file.Split('/'); //// var urlpath = file.Split('/');
var filepath = Path.Combine(Environment.CurrentDirectory, "wwwroot", Path.Combine(urlpath)); //// var filepath = Path.Combine(Environment.CurrentDirectory, "wwwroot", Path.Combine(urlpath));
if (System.IO.File.Exists(filepath)) //// if (System.IO.File.Exists(filepath))
{ //// {
System.IO.File.Copy(filepath, Path.Combine(departmentPhotosDir, Path.GetFileName(filepath)), true); //// System.IO.File.Copy(filepath, Path.Combine(departmentPhotosDir, Path.GetFileName(filepath)), true);
} //// }
} ////}
} }
logger.LogInformation("step4"); logger.LogInformation("step4");
ZipFile.CreateFromDirectory(packegdir, packegzipname); ZipFile.CreateFromDirectory(packegdir, packegzipname);

648
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,22 +372,22 @@ 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)
{ {
@ -403,103 +403,102 @@ namespace _24Hour.Controllers
ret.Message = "用户信息审核中！"; ret.Message = "用户信息审核中！";
ret.result = "用户信息审核中"; 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 = "该账号已被禁用"; ret.result = "该账号已被禁用";
return ret; return ret;
} }
if (date.usertype == 0 && date.becurrent == 1) if (date.usertype == 0 && date.becurrent == 1)
{ {
ret.IsSucceed = false; ret.IsSucceed = false;
ret.Message = $"账号未授权无法登录，请联系管理员！"; ret.Message = $"账号未授权无法登录，请联系管理员！";
ret.result = "账号未授权无法登录"; ret.result = "账号未授权无法登录";
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,
usertype = date.usertype, usertype = date.usertype,
unitCode = date.unitCode, unitCode = date.unitCode,
token = tokenString, token = tokenString,
openId = date.wechatId, openId = date.wechatId,
departmentPhoto = date.departmentPhoto, identityphoto = date.identityphoto,
identityphoto = date.identityphoto, cardIdphoto = date.cardIdphoto,
cardIdphoto = date.cardIdphoto, departmentName = date.departmentName,
departmentName = date.departmentName, identitycardId = date.identitycardId,
identitycardId = date.identitycardId, departmentSCC = date.departmentUnifiedSocialCreditCode
departmentSCC = date.departmentUnifiedSocialCreditCode };
}; #endregion
#endregion ret.IsSucceed = true;
ret.IsSucceed = true; }
} else
else {
{ ret.IsSucceed = false;
ret.IsSucceed = false; ret.Message = "微信未授权，请先注册账号！";
ret.Message = "微信未授权，请先注册账号！";
ret.result = "微信未授权"; ret.result = "微信未授权";
} }
return ret; return ret;
} }
/// <summary> /// <summary>
/// APP添加用户 /// APP添加用户
/// </summary> /// </summary>
/// <param name="info"></param> /// <param name="info"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
[Route("AddUser1")] [Route("AddUser1")]
public async Task<Result> AddUser1(App_Sys_UserModel UserModel) public async Task<Result> AddUser1(App_Sys_UserModel UserModel)
{ {
try 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;
@ -528,7 +527,6 @@ namespace _24Hour.Controllers
data.Password = Elight.Utility.Encrypt.Md5.Encrypt32($"{UserModel.Password}").ToLower(); data.Password = Elight.Utility.Encrypt.Md5.Encrypt32($"{UserModel.Password}").ToLower();
data.cardIdphoto = UserModel.cardIdphoto; data.cardIdphoto = UserModel.cardIdphoto;
data.identityphoto = UserModel.identityphoto; data.identityphoto = UserModel.identityphoto;
data.departmentPhoto = UserModel.departmentPhoto;
var num = await _db.Updateable(data).IgnoreColumns(true).ExecuteCommandAsync(); var num = await _db.Updateable(data).IgnoreColumns(true).ExecuteCommandAsync();
_db.CommitTran(); _db.CommitTran();
if (num > 0) if (num > 0)
@ -586,7 +584,7 @@ namespace _24Hour.Controllers
ret.IsSucceed = true; ret.IsSucceed = true;
ret.result = "添加成功"; ret.result = "添加成功";
} }
} }
} }
else else
{ {
@ -612,57 +610,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)
// { // {
@ -677,52 +675,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;
@ -743,15 +741,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
@ -775,17 +773,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; }
} }
} }

124
24Hour/Controllers/system/SystemControllerController.cs
Unescape View File

@ -695,74 +695,74 @@ namespace _24Hour.Controllers.system
/// </summary> /// </summary>
/// <param name="info"></param> /// <param name="info"></param>
/// <returns></returns> /// <returns></returns>
[HttpGet] //[HttpGet]
[Route("EditDepartmentPhoto")] //[Route("EditDepartmentPhoto")]
public async Task<Result> EditDepartmentPhoto(string photo) //public async Task<Result> EditDepartmentPhoto(string photo)
{ //{
try // try
{ // {
_db.BeginTran(); // _db.BeginTran();
var userlist = await _db.Queryable<App_Sys_UserModel>().Where(q => q.IsDeleted == 0 && q.Id == _userdata.Id).ToListAsync(); // var userlist = await _db.Queryable<App_Sys_UserModel>().Where(q => q.IsDeleted == 0 && q.Id == _userdata.Id).ToListAsync();
userlist.ForEach(q => // userlist.ForEach(q =>
{ // {
//头像地址 // //头像地址
q.departmentPhoto = photo; // q.departmentPhoto = photo;
}); // });
var num = await _db.Updateable(userlist).ExecuteCommandAsync(); // var num = await _db.Updateable(userlist).ExecuteCommandAsync();
_db.CommitTran(); // _db.CommitTran();
if (num > 0) // if (num > 0)
{ // {
result.IsSucceed = true; // result.IsSucceed = true;
result.result = "替换成功"; // result.result = "替换成功";
} // }
} // }
catch (System.Exception ex) // catch (System.Exception ex)
{ // {
_db.RollbackTran(); // _db.RollbackTran();
result.IsSucceed = false; // result.IsSucceed = false;
result.Message = ex.Message; // result.Message = ex.Message;
LogService.WriteLog(ex, "用户部门证件替换"); // LogService.WriteLog(ex, "用户部门证件替换");
} // }
_logs.WriteSysLogadd("用户管理", "用户部门证件替换", result, _db); // _logs.WriteSysLogadd("用户管理", "用户部门证件替换", result, _db);
return result; // return result;
} //}
/// <summary> /// <summary>
/// 根据律师id修改律师事务所证明图片 /// 根据律师id修改律师事务所证明图片
/// </summary> /// </summary>
/// <param name="photo"></param> /// <param name="photo"></param>
/// <param name="lawyerid"></param> /// <param name="lawyerid"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost] //[HttpPost]
[Route("EditLawyerDepartmentPhoto")] //[Route("EditLawyerDepartmentPhoto")]
public async Task<Result> EditLawyerDepartmentPhoto(EditLawyerInput input) //public async Task<Result> EditLawyerDepartmentPhoto(EditLawyerInput input)
{ //{
try // try
{ // {
_db.BeginTran(); // _db.BeginTran();
var userlist = await _db.Queryable<App_Sys_UserModel>().Where(q => q.IsDeleted == 0 && q.Id ==input.lawyerid).ToListAsync(); // var userlist = await _db.Queryable<App_Sys_UserModel>().Where(q => q.IsDeleted == 0 && q.Id ==input.lawyerid).ToListAsync();
userlist.ForEach(q => // userlist.ForEach(q =>
{ // {
//头像地址 // //头像地址
q.departmentPhoto = input.photo.ConvertToJsonStr(); // q.departmentPhoto = input.photo.ConvertToJsonStr();
}); // });
var num = await _db.Updateable(userlist).ExecuteCommandAsync(); // var num = await _db.Updateable(userlist).ExecuteCommandAsync();
_db.CommitTran(); // _db.CommitTran();
if (num > 0) // if (num > 0)
{ // {
result.IsSucceed = true; // result.IsSucceed = true;
result.result = "替换成功"; // result.result = "替换成功";
} // }
} // }
catch (System.Exception ex) // catch (System.Exception ex)
{ // {
_db.RollbackTran(); // _db.RollbackTran();
result.IsSucceed = false; // result.IsSucceed = false;
result.Message = ex.Message; // result.Message = ex.Message;
LogService.WriteLog(ex, "用户部门证件替换"); // LogService.WriteLog(ex, "用户部门证件替换");
} // }
_logs.WriteSysLogadd("用户管理", "用户部门证件替换", result, _db); // _logs.WriteSysLogadd("用户管理", "用户部门证件替换", result, _db);
return result; // return result;
} //}
public class EditLawyerInput public class EditLawyerInput
{ {
public string[] photo { get; set; } public string[] photo { get; set; }

5
Elight.Entity/AppMode/App_LawyerServicesModel.cs
Unescape View File

@ -165,7 +165,10 @@ namespace Elight.Entity
/// </summary> /// </summary>
[DataMember] [DataMember]
public string? legalAidPhoto { get; set; } public string? legalAidPhoto { get; set; }
/// <summary>
/// 单位证明 律师事务所证明
/// </summary>
public string? departmentPhoto { get; set; }
/// <summary> /// <summary>
/// 关系证明图片 /// 关系证明图片
/// </summary> /// </summary>

4
Elight.Entity/SystemModel/App_Sys_UserModel.cs
Unescape View File

@ -37,10 +37,6 @@ namespace Elight.Entity
/// </summary> /// </summary>
[DataMember] [DataMember]
public string? departmentName { get; set; } public string? departmentName { get; set; }
/// <summary>
/// 单位证明 律师事务所证明
/// </summary>
public string? departmentPhoto { get; set; }
/// <summary> /// <summary>
/// 单位同意信用代码 /// 单位同意信用代码

Write Preview
Loading…
Cancel
Save