Skip to content

P
performance
Commit 0671d0ba by ruyun.zhang
Options

Merge branch 'release/v23.2.19高县版' into develop

parents d6053c18 dfc66afe
Showing with 605 additions and 50 deletions
README.md 0 → 100644
### appsetting配置文件
```
Application:OpenAntiSqlInject Bollean // 是否开启反SQL注入 默认关闭 true 开启 false 关闭
Application:AntiSqlInjectRouteWhite String[] // 开启反SQL注入白名单地址
AppSQLEncrypt:IsEncryption Bollean // 是否加密数据库密码 默认明文 true 加密 false 明文
AppSQLEncrypt:TempMySqlConnectionString String // MySql连接模板字符串 不配置则使用默认
AppSQLEncrypt:TempSqlServerConnectionString String // SqlServer连接模板字符串 不配置则使用默认
AppSQLEncrypt:TempOracleConnectionString String // Oracle连接模板字符串 不配置则使用默认
oauth2:authorize_url String // 获取授权码URL（必填无默认值）
oauth2:token_url String // 获取令牌URL（必填无默认值）
oauth2:get_user_info_url String // 获取用户属性信息URL（必填无默认值）
oauth2:response_type String // 授权类型，此处的值固定为"code"。默认“code”
oauth2:redirect_uri String // 成功授权后的重定向地址，需要使用 urlencode 进行编码；默认空值
oauth2:scope String // 表示申请的权限范围；默认空值
oauth2:state String // 客户端请求中的 state 参数，返回的值和客户端请求时的值相同；默认随机
oauth2:grant_type String // 授权类型，此值固定为“authorization_code”。默认“authorization_code”
oauth2:client_id String // 客户端的 ID，在 IDTrust 上新建应用可以获取到。（必填无默认值）
oauth2:client_secret String // 客户端密钥，在 IDTrust 上新建应用可以获取到。（必填无默认值）
oauth2:test_mode Bollean // 测试模式；默认false
oauth2:default_mail String // 创建账号时默认邮箱；默认{0}@oauth.com
oauth2:default_password String // 创建账号时默认密码；默认123456
oauth2:default_hosid String // 创建账号时默认医院；默认自动获取，获取失败则0
oauth2:default_roleid String // 初始角色，逗号分割；默认绩效查询
```
```sql
SELECT HEX(AES_ENCRYPT('123456','Suvalue'));
SELECT AES_DECRYPT(UNHEX('2408EE50F599E340C19B68E0B5281585'),'Suvalue');
```
\ No newline at end of file
performance/Performance.Api/Controllers/AppController.cs 0 → 100644
using Microsoft.AspNetCore.Authorization;
using System.Threading.Tasks;
using System;
using Microsoft.AspNetCore.Mvc;
using Performance.DtoModels;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
using Performance.Services;
using Microsoft.Extensions.Configuration;
namespace Performance.Api.Controllers
{
public class AppController : Controller
{
private readonly ILogger<AppController> _logger;
private readonly IConfiguration _configuration;
public AppController(ILogger<AppController> logger, IConfiguration configuration)
{
_logger = logger;
_configuration = configuration;
}
[AllowAnonymous, HttpGet, Route("api/app/options")]
public ActionResult AppOptions()
{
var OpenOAuth = _configuration.GetValue<bool>("AppOptions:OpenOAuth", false);
return Ok(new ApiResponse(ResponseType.OK, "", new { OpenOAuth }));
}
}
}
\ No newline at end of file
performance/Performance.Api/Controllers/OauthController.cs 0 → 100644
using System;
using System.Net;
using System.Security.Claims;
using System.Security.Policy;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
using Performance.DtoModels;
using Performance.DtoModels.AppSettings;
using Performance.DtoModels.OAuth;
using Performance.Services;
namespace Performance.Api.Controllers
{
public class OAuthController : Controller
{
private readonly ILogger<OAuthController> _logger;
private readonly IOptions<Application> _options;
private readonly OAuthService _service;
public OAuthController(ILogger<OAuthController> logger, IOptions<Application> options, OAuthService service)
{
_logger = logger;
_options = options;
_service = service;
}
/// <summary>
/// 授权起始地址
/// </summary>
/// <returns></returns>
[AllowAnonymous, HttpGet, Route("api/oauth2/authorize")]
public async Task<ActionResult> Authorize()
{
_logger.LogInformation("OAuth授权启动");
try
{
var url = await _service.Authorize();
return Ok(new ApiResponse(ResponseType.OK, "", url));
}
catch (Exception ex)
{
_logger.LogError($"OAuth授权启动：请求异常={ex}");
}
return Ok(new ApiResponse(ResponseType.Fail, ""));
}
/// <summary>
/// 获取授权码，初始化登录信息
/// </summary>
/// <param name="code"></param>
/// <param name="state"></param>
/// <returns></returns>
[AllowAnonymous, HttpPost, Route("api/oauth2/token")]
public async Task<ApiResponse<JwtToken>> Token([FromQuery] string code, [FromQuery] string state)
{
_logger.LogInformation($"OAuth授权接受回调请求：code={code}&state={state}");
try
{
var tokenResponse = await _service.Token(code, state);
if (tokenResponse.StatusCode != (int)HttpStatusCode.OK)
return new ApiResponse<JwtToken>(ResponseType.Fail, "授权中心Token获取错误");
if (tokenResponse.Data is not TokenResponse)
return new ApiResponse<JwtToken>(ResponseType.Fail, "授权中心Token数据无法解析");
var tokenData = tokenResponse.Data as TokenResponse;
var userResponse = await _service.GetUserInfo(tokenData.access_token);
if (userResponse.StatusCode != (int)HttpStatusCode.OK)
return new ApiResponse<JwtToken>(ResponseType.Fail, "授权中心AccessToken获取错误");
if (userResponse.Data is not OAuthUserInfoResponse)
return new ApiResponse<JwtToken>(ResponseType.Fail, "授权中心AccessToken数据无法解析");
var userData = userResponse.Data as OAuthUserInfoResponse;
var user = _service.GetOrInitUserInfo(userData);
var claims = new Claim[]
{
new Claim(JwtClaimTypes.Id, user.UserID.ToString()),
new Claim(JwtClaimTypes.Login, user.Login),
new Claim(JwtClaimTypes.RealName, user.RealName),
new Claim(JwtClaimTypes.Mail, user.Mail??""),
new Claim(JwtClaimTypes.AppName, ""),
new Claim(JwtClaimTypes.Device, ""),
new Claim(JwtClaimTypes.Department, user.Department ?? ""),
new Claim(JwtClaimTypes.QuickLogin, EQuickLogin.SSO.ToString()),
};
var jwtToken = JwtTokenHelper.GenerateToken(claims, _options.Value.ExpirationMinutes);
return new ApiResponse<JwtToken>(ResponseType.OK, jwtToken);
}
catch (Exception ex)
{
_logger.LogError($"OAuth授权接受回调请求：请求异常：{ex}");
}
return new ApiResponse<JwtToken>(ResponseType.Fail, "授权失败");
}
}
}
\ No newline at end of file
performance/Performance.Api/Startup.cs
......@@ -33,7 +33,7 @@ public Startup(IConfiguration configuration)
public void ConfigureServices(IServiceCollection services)
{
Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
services.AddHttpClient();
// appsettings.json
services.AddAppSettingConfiguration(Configuration);
......
performance/Performance.Api/appsettings.Localhost.json
......@@ -7,16 +7,31 @@
},
"AppConnection": {
//"PerformanceConnectionString": "server=112.124.13.17;database=db_performance;uid=suvalue;pwd=suvalue2016;pooling=true;charset=utf8;convert zero datetime=true;port=3306;connection timeout=120;max pool size=512;allow user variables=true;",
"PerformanceConnectionString": "server=192.168.18.166;database=db_performance_screen;uid=root;pwd=1234qwer;pooling=true;charset=utf8;convert zero datetime=true;port=3306;connection timeout=120;max pool size=512;allow user variables=true;"
"PerformanceConnectionString": "server=192.168.18.166;database=db_test_beiliu;uid=root;pwd=1234qwer;pooling=true;charset=utf8;convert zero datetime=true;port=3306;connection timeout=120;max pool size=512;allow user variables=true;"
//"PerformanceConnectionString": "server=116.62.245.55;database=db_performance;uid=root;pwd=1234qwer;pooling=true;charset=utf8;convert zero datetime=true;port=3306;connection timeout=120;max pool size=512;allow user variables=true;"
},
"AppOptions": {
"OpenOAuth": true
},
"oauth2": {
"authorize_url": "http://192.168.18.166:8038/oauth2/authorize",
"token_url": "http://192.168.18.166:8038/oauth2/token",
"get_user_info_url": "http://192.168.18.166:8038/oauth2/get_user_info",
"client_id": 1,
"client_secret": 123456,
"redirect_uri": "www.baidu.com",
"default_mail": "",
"default_password": "222",
"default_hosid": "16"
},
"Application": {
// 是否开启反SQL注入 默认关闭 true 开启 false 关闭
"OpenAntiSqlInject": true,
// 开启反SQL注入白名单地址
"AntiSqlInjectRouteWhite": [
"/api/account/login",
"/api/account/quick/login"
"/api/graphql",
"/api/extract/type/[0-9]+/save",
"/api/account/updateuser"
],
//登录过期时间
"ExpirationMinutes": "1200",
......
performance/Performance.Api/wwwroot/Performance.Api.xml
......@@ -119,7 +119,7 @@
</member>
<member name="M:Performance.Api.Controllers.AccountController.DeleteUser(Performance.DtoModels.UserRequest)">
<summary>
新增用户
删除用户
</summary>
<param name="request"></param>
<returns></returns>
......@@ -1813,6 +1813,20 @@
<param name="hospitalId"></param>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.OAuthController.Authorize">
<summary>
授权起始地址
</summary>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.OAuthController.Token(System.String,System.String)">
<summary>
获取授权码，初始化登录信息
</summary>
<param name="code"></param>
<param name="state"></param>
<returns></returns>
</member>
<member name="T:Performance.Api.Controllers.OriginalController">
<summary>
原始数据修改
......
performance/Performance.Api/wwwroot/Performance.DtoModels.xml
......@@ -64,6 +64,16 @@
开启反SQL注入白名单地址
</summary>
</member>
<member name="T:Performance.DtoModels.AppSettings.AppSQLEncrypt">
<summary>
数据库密码加密
</summary>
</member>
<member name="P:Performance.DtoModels.AppSettings.AppSQLEncrypt.IsEncryption">
<summary>
是否加密 true 加密 false 明文
</summary>
</member>
<member name="P:Performance.DtoModels.AppSettings.RateLimitingConfig.Endpoints">
<summary>
路径
......@@ -197,6 +207,51 @@
结果值
</summary>
</member>
<member name="P:Performance.DtoModels.OAuth.OAuthUserInfoResponse.name">
<summary>
用户名，新建应用时，可以通过字段映射配置指定该名字。
</summary>
</member>
<member name="P:Performance.DtoModels.OAuth.OAuthUserInfoResponse.desc">
<summary>
用户描述，新建应用时，可以通过字段映射配置指定该名字。
</summary>
</member>
<member name="P:Performance.DtoModels.OAuth.OAuthUserInfoResponse.group">
<summary>
用户所属组，新建应用时，可以通过字段映射配置指定该名字。
</summary>
</member>
<member name="P:Performance.DtoModels.OAuth.OAuthUserInfoResponse.role">
<summary>
用户角色，新建应用时，可以通过字段映射配置指定该名字。
</summary>
</member>
<member name="P:Performance.DtoModels.OAuth.TokenResponse.access_token">
<summary>
表示访问令牌，必选项。
</summary>
</member>
<member name="P:Performance.DtoModels.OAuth.TokenResponse.token_type">
<summary>
表示令牌类型，该值大小写不敏感，必选项，可以是 bearer类型或 mac 类型，IDTrust 目前固定为 bearer 类型。
</summary>
</member>
<member name="P:Performance.DtoModels.OAuth.TokenResponse.expires_in">
<summary>
表示过期时间，单位为秒。IDTrust 设备 token 有效期为 1小时。
</summary>
</member>
<member name="P:Performance.DtoModels.OAuth.TokenResponse.refresh_token">
<summary>
表示更新令牌，用来获取下一次的访问令牌。
</summary>
</member>
<member name="P:Performance.DtoModels.OAuth.TokenResponse.scope">
<summary>
表示权限范围，如果与客户端申请的范围一致。
</summary>
</member>
<member name="P:Performance.DtoModels.PerAgainData.RowNumber">
<summary>
行号
......
performance/Performance.Api/wwwroot/Performance.EntityModels.xml
......@@ -9193,6 +9193,11 @@
初始密码 1 初始 2 改过
</summary>
</member>
<member name="P:Performance.EntityModels.sys_user.Remark">
<summary>
备注
</summary>
</member>
<member name="T:Performance.EntityModels.sys_user_hospital">
<summary>
......@@ -9548,11 +9553,6 @@
核算单元
</summary>
</member>
<member name="P:Performance.EntityModels.view_second_workload_result.HISDeptName">
<summary>
统计的HIS的原始科室名称
</summary>
</member>
<member name="P:Performance.DtoModels.view_allot_result.Source">
<summary>
来源
......
performance/Performance.DtoModels/OAuth/IOAuthResponse.cs 0 → 100644
namespace Performance.DtoModels.OAuth
{
public interface IOAuthResponse { }
}
performance/Performance.DtoModels/OAuth/OAuthErrorResponse.cs 0 → 100644
namespace Performance.DtoModels.OAuth
{
public class OAuthErrorResponse : IOAuthResponse
{
public int errcode { get; set; }
public string errmsg { get; set; }
}
}
performance/Performance.DtoModels/OAuth/OAuthResponse.cs 0 → 100644
namespace Performance.DtoModels.OAuth
{
public class OAuthResponse<T> where T : IOAuthResponse
{
public OAuthResponse(int statusCode, T? data)
{
StatusCode = statusCode;
Data = data;
}
public int StatusCode { get; set; }
public T? Data { get; set; }
}
}
performance/Performance.DtoModels/OAuth/OAuthUserInfoResponse.cs 0 → 100644
namespace Performance.DtoModels.OAuth
{
public class OAuthUserInfoResponse : IOAuthResponse
{
/// <summary>
/// 用户名，新建应用时，可以通过字段映射配置指定该名字。
/// </summary>
public string name { get; set; }
/// <summary>
/// 用户描述，新建应用时，可以通过字段映射配置指定该名字。
/// </summary>
public string desc { get; set; }
/// <summary>
/// 用户所属组，新建应用时，可以通过字段映射配置指定该名字。
/// </summary>
public string group { get; set; }
/// <summary>
/// 用户角色，新建应用时，可以通过字段映射配置指定该名字。
/// </summary>
public string role { get; set; }
}
}
performance/Performance.DtoModels/OAuth/TokenResponse.cs 0 → 100644
namespace Performance.DtoModels.OAuth
{
public class TokenResponse : IOAuthResponse
{
/// <summary>
/// 表示访问令牌，必选项。
/// </summary>
public string access_token { get; set; }
/// <summary>
/// 表示令牌类型，该值大小写不敏感，必选项，可以是 bearer类型或 mac 类型，IDTrust 目前固定为 bearer 类型。
/// </summary>
public string token_type { get; set; }
/// <summary>
/// 表示过期时间，单位为秒。IDTrust 设备 token 有效期为 1小时。
/// </summary>
public string? expires_in { get; set; }
/// <summary>
/// 表示更新令牌，用来获取下一次的访问令牌。
/// </summary>
public string refresh_token { get; set; }
/// <summary>
/// 表示权限范围，如果与客户端申请的范围一致。
/// </summary>
public string scope { get; set; }
}
}
performance/Performance.DtoModels/Request/UserRequest.cs
......@@ -53,6 +53,7 @@ public class UserRequest
/// 用户科室
/// </summary>
public string Department { get; set; }
public string Remark { get; set; }
}
public class UserRequestValidator : AbstractValidator<UserRequest>
......
performance/Performance.EntityModels/Entity/Sys_User.cs
......@@ -87,5 +87,9 @@ public class sys_user
/// 初始密码 1 初始 2 改过
/// </summary>
public int IsInitialPassword { get; set; }
/// <summary>
/// 备注
/// </summary>
public string Remark { get; set; }
}
}
performance/Performance.EntityModels/Enum.cs
......@@ -102,4 +102,5 @@ public enum EQuickLogin
{
YES = 1,
NO = 2,
SSO = 3,
}
performance/Performance.EntityModels/Other/view_second_workload_result.cs
......@@ -12,10 +12,6 @@ public class view_second_workload_result
/// 核算单元
/// </summary>
public string AccountingUnit { get; set; }
/// <summary>
/// 统计的HIS的原始科室名称
/// </summary>
public string HISDeptName { get; set; }
public string ItemId { get; set; }
public string ItemName { get; set; }
public decimal? FactorValue { get; set; }
......
performance/Performance.Repository/PerforPerAllotRepository.cs
......@@ -273,11 +273,11 @@ public IEnumerable<view_second_workload_result> GetSecondWorkload(int allotid, s
try
{
string query = $@"
SELECT TAB1.HospitalId,AllotId,TAB1.UnitType,AccountingUnit,HISDeptName,ItemId,ItemName,FactorValue,DoctorName,PersonnelNumber,Category,SUM(Fee) Value
SELECT TAB1.HospitalId,AllotId,TAB1.UnitType,AccountingUnit,ItemId,ItemName,FactorValue,DoctorName,PersonnelNumber,Category,SUM(Fee) Value
FROM view_second_workload TAB1
JOIN view_second_workload_his TAB2 ON TAB1.HospitalId = TAB2.HospitalId AND (TAB1.UnitType = TAB2.UnitType OR TAB2.UnitType = '通用工作量') AND TAB1.HISDeptName = TAB2.Department AND TAB1.SourceCategory = TAB2.Category
WHERE AllotId = @allotid AND TAB1.UnitType = @unittype AND AccountingUnit = @accountingunit
GROUP BY TAB1.HospitalId,AllotId,TAB1.UnitType,AccountingUnit,HISDeptName,ItemId,ItemName,FactorValue,DoctorName,PersonnelNumber,Category";
GROUP BY TAB1.HospitalId,AllotId,TAB1.UnitType,AccountingUnit,ItemId,ItemName,FactorValue,DoctorName,PersonnelNumber,Category";
return connection.Query<view_second_workload_result>(query, new { allotid, unittype, accountingunit }, commandTimeout: 60 * 60);
}
catch (Exception)
......
performance/Performance.Repository/PerforUserRepository.cs
......@@ -45,14 +45,14 @@ public UserInfoCenter GetUser(int userId)
/// </summary>
/// <param name="roleType"></param>
/// <returns></returns>
public List<sys_user> GetUsersByRoleType(params int[] roleType)
public List<sys_user> GetUsersByRoleType()
{
var users = from u in context.Set<sys_user>()
join ur in context.Set<sys_user_role>() on u.ID equals ur.UserID
join r in context.Set<sys_role>() on ur.RoleID equals r.ID
select new { u, r };
return users.Where(w => roleType.Contains(w.r.Type ?? w.r.ID)).Select(w => w.u).ToList();
return users.Select(w => w.u).ToList();
}
}
......
performance/Performance.Services/AllotCompute/ResultComputeService.cs
......@@ -702,6 +702,9 @@ public bool IssuedChangeSecond(per_allot allot, List<ag_secondallot> secondList)
}
}
perforAgsecondallotRepository.UpdateRange(updSeconds.ToArray());
_service.FreezeAllotSync(allot.ID);
_service.SecondUseTempRestore();
_service.RestoreSecondAllot();
}
_service.FreezeAllotSync(allot.ID);
_service.SecondUseTempRestore();
......
performance/Performance.Services/AttendanceService.cs
......@@ -256,7 +256,7 @@ public ApiResponse BatchCallIn(int allotId, int hospitalId, SaveCollectData requ
}
}
if (newAttendanceVacatione[i].CallInUnitType != cofaccounting.FirstOrDefault(t => t.AccountingUnit == newAttendanceVacatione[i].CallInAccountingUnit)?.UnitType)
if (!cofaccounting.Any(t => t.AccountingUnit == newAttendanceVacatione[i].CallInAccountingUnit && t.UnitType == newAttendanceVacatione[i].CallInUnitType))
{
error.Add(new Dictionary<string, string>
{
......
performance/Performance.Services/OAuthService.cs 0 → 100644
using System;
using System.Collections.Generic;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Net.Http.Json;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
using Performance.DtoModels;
using Performance.DtoModels.AppSettings;
using Performance.DtoModels.OAuth;
using Performance.Infrastructure;
using Performance.Infrastructure.Helper;
using Performance.Repository;
namespace Performance.Services
{
public class OAuthService : IAutoInjection
{
private readonly UserService _userService;
private readonly ILogger<OAuthService> _logger;
private readonly IConfiguration _configuration;
private readonly IHttpClientFactory _factory;
private readonly PerforUserRepository _userRepository;
private readonly PerforHospitalRepository _hospitalRepository;
public OAuthService(UserService userService,
ILogger<OAuthService> logger,
IConfiguration configuration,
IHttpClientFactory factory,
PerforUserRepository userRepository,
PerforHospitalRepository hospitalRepository)
{
_userService = userService;
_logger = logger;
_configuration = configuration;
_factory = factory;
_userRepository = userRepository;
_hospitalRepository = hospitalRepository;
}
public async Task<string> Authorize()
{
_logger.LogInformation("OAuth授权启动");
try
{
var client = _factory.CreateClient();
client.Timeout = TimeSpan.FromSeconds(20);
Dictionary<string, string> pairs = new Dictionary<string, string>()
{
{ "client_id", _configuration.GetValue<string>("oauth2:client_id", "") },
{ "response_type", _configuration.GetValue<string>("oauth2:response_type", "code") },
{ "redirect_uri", _configuration.GetValue<string>("oauth2:redirect_uri", "") },
{ "scope", _configuration.GetValue<string>("oauth2:scope", "") },
{ "state", _configuration.GetValue<string>("oauth2:state", Guid.NewGuid().ToString("N")) },
};
var queryParams = pairs.Where(w => !string.IsNullOrEmpty(w.Value)).Select(w => $"{w.Key}={w.Value}");
var authorize_url = _configuration.GetValue<string>("oauth2:authorize_url");
var url = $"{authorize_url}?{string.Join('&', queryParams)}";
_logger.LogInformation($"OAuth授权启动：authorize_url={url}");
return url;
}
catch (Exception ex)
{
_logger.LogError($"OAuth授权启动：请求异常：{ex}");
}
return "";
}
public async Task<OAuthResponse<IOAuthResponse>> Token(string code, string state)
{
_logger.LogInformation($"OAuth授权接受回调请求：code={code}&state={state}");
try
{
var client = _factory.CreateClient();
Dictionary<string, string> pairs = new Dictionary<string, string>()
{
{ "grant_type", _configuration.GetValue<string>("oauth2:grant_type", "authorization_code") },
{ "code", code },
{ "client_id", _configuration.GetValue<string>("oauth2:client_id", "") },
{ "client_secret", _configuration.GetValue<string>("oauth2:client_secret", "") },
{ "redirect_uri", _configuration.GetValue<string>("oauth2:redirect_uri", "") },
};
var queryParams = pairs.Where(w => !string.IsNullOrEmpty(w.Value)).Select(w => $"{w.Key}={w.Value}");
var token_url = _configuration.GetValue<string>("oauth2:token_url");
var url = $"{token_url}?{string.Join('&', queryParams)}";
// 测试模式直接返回URL用于调试
if (_configuration.GetValue("oauth2:test_mode", false))
{
throw new PerformanceException($"OAuth授权接受回调请求测试模式：{url}");
}
var response = await client.GetAsync(url);
var resContent = await response.Content.ReadAsStringAsync();
_logger.LogInformation($"OAuth授权接受回调请求：响应状态:{(int)response.StatusCode};{resContent}");
if (response.StatusCode != HttpStatusCode.OK)
{
var data = await response.Content.ReadFromJsonAsync<OAuthErrorResponse>();
_logger.LogInformation($"OAuth授权接受回调请求：请求结果={data}");
return new OAuthResponse<IOAuthResponse>((int)response.StatusCode, data);
}
else
{
var data = await response.Content.ReadFromJsonAsync<TokenResponse>();
_logger.LogInformation($"OAuth授权接受回调请求：请求结果={JsonHelper.Serialize(data)}");
return new OAuthResponse<IOAuthResponse>((int)response.StatusCode, data);
}
}
catch (Exception ex)
{
_logger.LogError($"OAuth授权接受回调请求：请求异常：{ex}");
}
return new OAuthResponse<IOAuthResponse>((int)HttpStatusCode.InternalServerError, null);
}
public async Task<OAuthResponse<IOAuthResponse>> GetUserInfo(string access_token)
{
_logger.LogInformation($"OAuth授权获取用户属性信息：access_token={access_token}");
try
{
var client = _factory.CreateClient();
var get_user_info_url = _configuration.GetValue<string>("oauth2:get_user_info_url");
var url = $"{get_user_info_url}?access_token={access_token}";
var response = await client.GetAsync(url);
var resContent = await response.Content.ReadAsStringAsync();
_logger.LogInformation($"OAuth授权获取用户属性信息：响应状态:{(int)response.StatusCode};{resContent}");
if (response.StatusCode != HttpStatusCode.OK)
{
var data = await response.Content.ReadFromJsonAsync<OAuthErrorResponse>();
_logger.LogInformation($"OAuth授权获取用户属性信息：请求结果={data}");
return new OAuthResponse<IOAuthResponse>((int)response.StatusCode, data);
}
else
{
var data = await response.Content.ReadFromJsonAsync<OAuthUserInfoResponse>();
_logger.LogInformation($"OAuth授权获取用户属性信息：请求结果={JsonHelper.Serialize(data)}");
return new OAuthResponse<IOAuthResponse>((int)response.StatusCode, data);
}
}
catch (Exception ex)
{
_logger.LogError($"OAuth授权获取用户属性信息：请求异常：{ex}");
}
return new OAuthResponse<IOAuthResponse>((int)HttpStatusCode.InternalServerError, null);
}
public UserIdentity GetOrInitUserInfo(OAuthUserInfoResponse userData)
{
var userId = 0;
var user = _userRepository.GetEntity(w => w.Login == userData.desc);
if (user != null)
{
userId = user.ID;
}
else
{
var roleid = _configuration.GetValue("oauth2:default_roleid", $"{(int)Role.绩效查询}");
var roleIds = Array.ConvertAll(roleid.Split(",", StringSplitOptions.RemoveEmptyEntries), item => int.Parse(item));
var mail = _configuration.GetValue("oauth2:default_mail", "{0}@oauth.com");
var password = _configuration.GetValue("oauth2:default_password", "123456");
var hosid = _configuration.GetValue("oauth2:default_hosid", 0);
if (hosid <= 0)
hosid = _hospitalRepository.GetEntity(w => !w.HosName.Contains("测试"))?.ID ?? 0;
var userRequest = new UserRequest
{
Login = userData.desc,
RealName = userData.name,
Password = PwdHelper.MD5(password),
HosIDArray = new int[] { hosid },
RoleArr = roleIds,
States = (int)States.Enabled,
Remark = JsonHelper.Serialize(userData),
Department = "",
Mail = string.Format(mail, userData.desc),
};
userId = _userService.InsertUser(userRequest, -1001).UserID;
}
return _userService.GetUserIdentity(userId);
}
}
}
performance/Performance.Services/RoleService.cs
......@@ -34,7 +34,7 @@ public class RoleService : IAutoInjection
/// <param name="userid"></param>
/// <returns></returns>
public List<RoleResponse> GetUserRole(int userid)
{
{
var roles = GetRole(userid);
return _mapper.Map<List<RoleResponse>>(roles);
}
......@@ -62,17 +62,26 @@ public List<sys_role> GetRole(int userid)
public List<RoleResponse> GetUsersRole(int userid)
{
List<RoleResponse> roleResponses = new List<RoleResponse>();
var user=_userRepository.GetEntity(c => c.ID == userid);
var ParentUser = _userRepository.GetEntities(c => c.ParentID == userid);
if (user.ParentID!=null && user.ParentID!=0)
var user = _userRepository.GetEntity(c => c.ID == userid);
var isParent = user.ParentID == null || user.ParentID == 0;
var roles = GetARole(isParent ? userid : (int)user.ParentID);
if (roles != null)
{
var role = _mapper.Map<RoleResponse>(roles);
role.Value = isParent ? userid : (int)user.ParentID;
roleResponses.Add(role);
}
var parentUser = _userRepository.GetEntities(c => c.ParentID == userid);
if (user.ParentID != null && user.ParentID != 0)
{
ParentUser=_userRepository.GetEntities(c => c.ParentID == user.ParentID);
parentUser = _userRepository.GetEntities(c => c.ParentID == user.ParentID);
}
if (ParentUser != null)
if (parentUser != null)
{
var userRole = _userroleRepository.GetEntities();
foreach (var sysUser in ParentUser)
foreach (var sysUser in parentUser)
{
var useRoles = GetARole(sysUser.ID);
var role = _mapper.Map<RoleResponse>(useRoles);
......@@ -82,16 +91,7 @@ public List<RoleResponse> GetUsersRole(int userid)
}
}
var isParent = user.ParentID == null || user.ParentID == 0;
var roles = GetARole(isParent ? userid : (int)user.ParentID);
if (roles != null)
{
var role = _mapper.Map<RoleResponse>(roles);
role.Value = isParent ? userid : (int)user.ParentID;
roleResponses.Add(role);
}
return roleResponses?.OrderBy(t => t.Type).ToList();
return roleResponses.ToList();
}
/// <summary>
......
performance/Performance.Services/UserService.cs
......@@ -110,6 +110,17 @@ public UserIdentity QuickLogin(int targetUserId, int loginUserId, string passwor
return data;
}
public UserIdentity GetUserIdentity(int userId)
{
var targetUser = _userRepository.GetEntity(t => t.ID == userId && t.IsDelete == 1);
if (targetUser == null)
throw new PerformanceException($"您要登录的用户信息有误，请检查后重试");
var data = _mapper.Map<UserIdentity>(targetUser);
data.Token = Guid.NewGuid().ToString("N");
return data;
}
/// <summary>
/// 获取用户第一个角色
/// </summary>
......@@ -147,11 +158,7 @@ public List<UserResponse> GetUserList(int userID, int roleType = 1)
if (userConter?.User == null) throw new PerformanceException("当前用户信息无效");
if (userConter?.URole == null) throw new PerformanceException("当前用户角色无效");
var roleTypes = (roleType == (int)Role.绩效查询)
? EnumHelper.GetItems<Role>().Where(w => w.Value == (int)Role.绩效查询).Select(w => w.Value).ToArray()
: EnumHelper.GetItems<Role>().Where(w => w.Value != (int)Role.绩效查询).Select(w => w.Value).ToArray();
var users = _userRepository.GetUsersByRoleType(roleTypes);
var users = _userRepository.GetUsersByRoleType();
var userRoles = _userroleRepository.GetEntities();
var userHospitals = _userhospitalRepository.GetEntities();
......@@ -229,7 +236,9 @@ public List<UserResponse> GetUserList(int userID, int roleType = 1)
item.RoleNameArr = roles?.Where(w => roleId.Contains(w.ID)).Select(w => w.RoleName).ToArray();
}
}
return result;
return (roleType == (int)Role.绩效查询)
? result.Where(w => w.RoleArr.Contains((int)Role.绩效查询)).ToList()
: result.Where(w => !(w.RoleArr.Length == 1 && w.RoleArr[0] == (int)Role.绩效查询)).ToList();
}
/// <summary>
......@@ -276,7 +285,7 @@ public UserResponse UpdateSelf(UserRequest request)
if (null == user)
throw new PerformanceException($"用户不存在 UserId：{request.ID}");
var vlist = _userRepository.GetEntities(t => t.ID != user.ID && t.Login == request.Login && t.IsDelete == 1);
var vlist = _userRepository.GetEntities(t => t.ID != user.ID && t.Login == request.Login && (t.ParentID == null || t.ParentID == 0) && t.IsDelete == 1);
if (null != vlist && vlist.Count() > 0)
throw new PerformanceException("登录名重复");
......@@ -438,7 +447,7 @@ public UserResponse ResetPwd(int userId, int loginUserId, string password)
/// <param name="request"></param>
public UserResponse InsertUser(UserRequest request, int userid)
{
if (null != _userRepository.GetEntity(t => t.Login == request.Login && t.IsDelete == 1))
if (null != _userRepository.GetEntity(t => t.Login == request.Login && (t.ParentID == null || t.ParentID == 0) && t.IsDelete == 1))
throw new PerformanceException("登录名重复");
int[] roleArray = UnitTypeUtil.Maps.Keys.ToArray();
......@@ -452,6 +461,8 @@ public UserResponse InsertUser(UserRequest request, int userid)
user.States = (int)States.Enabled;
user.IsInitialPassword = (int)InitialPassword.初始;
user.Department = UnitTypeUtil.Maps.ContainsKey(request.RoleArr[0]) ? request.Department : "";
user.Remark = request.Remark;
if (UnitTypeUtil.Maps.ContainsKey(request.RoleArr[0]))
{
var uninTypes = UnitTypeUtil.GetMaps(request.RoleArr[0]);
......@@ -472,7 +483,7 @@ public UserResponse InsertUser(UserRequest request, int userid)
var userID = user.ID;
for (int i = 1; i < request.RoleArr.Length; i++)
{
user.Login = request.Login + i;
user.Login = request.Login;
user.ParentID = userID;
user.Department = UnitTypeUtil.Maps.ContainsKey(request.RoleArr[i]) ? request.Department : "";
if (roleArray.Contains(request.RoleArr[i]))
......@@ -513,7 +524,7 @@ public UserResponse UpdateUser(UserRequest request, int userId)
if (null == user) throw new PerformanceException($"当前用户不存在");
var vlist = _userRepository.GetEntities(t => t.ID != user.ID && t.Login == request.Login && t.IsDelete == 1);
var vlist = _userRepository.GetEntities(t => t.ID != user.ID && t.Login == request.Login && (t.ParentID == null || t.ParentID == 0) && t.IsDelete == 1);
if (null != vlist && vlist.Count() > 0) throw new PerformanceException("登录名重复");
user.Login = request.Login;
......@@ -521,6 +532,7 @@ public UserResponse UpdateUser(UserRequest request, int userId)
user.RealName = request.RealName;
user.Mail = request.Mail;
user.States = request.States;
user.Remark = request.Remark;
//Md5小写加密
user.Password = string.IsNullOrEmpty(request.Password) ? user.Password : PwdHelper.MD5AndSalt(request.Password);
user.Department = UnitTypeUtil.Maps.ContainsKey(request.RoleArr[0]) ? request.Department : "";
......@@ -567,12 +579,13 @@ public UserResponse UpdateUser(UserRequest request, int userId)
diffUser.CreateDate = DateTime.Now;
diffUser.CreateUser = user.CreateUser;
diffUser.IsDelete = 1;
diffUser.Login = userLogin + i;
diffUser.Login = userLogin;
diffUser.ParentID = userID;
diffUser.Mobile = request.Mobile;
diffUser.RealName = request.RealName;
diffUser.Mail = request.Mail;
diffUser.States = request.States;
diffUser.Remark = request.Remark;
//Md5小写加密
diffUser.Password = string.IsNullOrEmpty(request.Password) ? user.Password : PwdHelper.MD5AndSalt(request.Password);
diffUser.Department = UnitTypeUtil.Maps.ContainsKey(request.RoleArr[i]) ? request.Department : "";
......
performance/performance.sln

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.28010.2026
# Visual Studio Version 17
VisualStudioVersion = 17.4.33403.182
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Performance.ConsoleApp", "Performance.ConsoleApp\Performance.ConsoleApp.csproj", "{59218B05-5CE3-4EC1-A304-28183F191A04}"
EndProject
......@@ -27,6 +27,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Performance.Api", "Performa
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Performance.Extract.Api", "Performance.Extract.Api\Performance.Extract.Api.csproj", "{A7AE6D0F-7B11-4EEF-9FEA-A279001EA54D}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "0.doc", "0.doc", "{A4520E21-1B77-47AA-9BDF-A61EEE005743}"
ProjectSection(SolutionItems) = preProject
..\README.md = ..\README.md
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment