lsm/OpenAuth.Net
1
0
Fork 0
mirror of https://gitee.com/dotnetchina/OpenAuth.Net.git synced 2025-04-05 17:38:01 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix #I3SKUV 增加API和EF执行效率的监控

Browse Source 
新增流程修改接口
增加启动及撤销判定
This commit is contained in:
yubaolee 2021-05-25 00:49:12 +08:00
parent d78b60764c
commit 452de01fb8
14 changed files with 269 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Infrastructure/Helpers/ConfigHelper.cs Normal file
View File

@ -0,0 +1,22 @@
using System;
using Microsoft.Extensions.Configuration;
namespace Infrastructure.Helpers
{
public class ConfigHelper
{
public static IConfigurationRoot GetConfigRoot()
{
var configurationBuilder = new ConfigurationBuilder();
configurationBuilder.SetBasePath(System.IO.Directory.GetCurrentDirectory())
.AddJsonFile("appsettings.json", optional: false, reloadOnChange: true)
.AddJsonFile(
$"appsettings.{Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT") ?? "Development"}.json",
optional: true)
.AddEnvironmentVariables();
var configuration = configurationBuilder.Build();
return configuration;
}
}
}

37
OpenAuth.App/FlowInstance/FlowInstanceApp.cs
View File

@ -146,6 +146,29 @@ namespace OpenAuth.App
UnitWork.Save();
return true;
}
/// <summary>
/// 更新流程
/// <para>更新时可以修改表单内容，可以修改流程基本信息，但不能更换表单模版</para>
/// </summary>
/// <param name="req"></param>
public void Update(UpdateFlowInstanceReq req)
{
var flowinstance = Get(req.Id);
if (flowinstance.IsFinish != FlowInstanceStatus.Draft &&
flowinstance.IsFinish != FlowInstanceStatus.Rejected)
{
throw new Exception("只能修改【草稿】和【驳回】状态的流程");
}
flowinstance.Description = req.Description;
flowinstance.Code = req.Code;
flowinstance.FrmData = req.FrmData;
flowinstance.DbName = req.DbName;
flowinstance.CustomName = req.CustomName;
Repository.Update(flowinstance);
}
/// <summary>
/// 节点审核
@ -551,11 +574,6 @@ namespace OpenAuth.App
}
}
public void Update(FlowInstance flowScheme)
{
Repository.Update(flowScheme);
}
/// <summary>
/// 返回用于处理流程节点
/// </summary>
@ -667,6 +685,11 @@ namespace OpenAuth.App
{
var user = _auth.GetCurrentUser().User;
FlowInstance flowInstance = Get(request.FlowInstanceId);
if (flowInstance.IsFinish == FlowInstanceStatus.Draft
|| flowInstance.IsFinish == FlowInstanceStatus.Finished)
{
throw new Exception("当前流程状态不能召回");
}
FlowRuntime wfruntime = new FlowRuntime(flowInstance);
@ -702,6 +725,10 @@ namespace OpenAuth.App
public void Start(StartFlowInstanceReq request)
{
FlowInstance flowInstance = Get(request.FlowInstanceId);
if (flowInstance.IsFinish != FlowInstanceStatus.Draft)
{
throw new Exception("当前流程不是草稿状态，不能启动");
}
var wfruntime = new FlowRuntime(flowInstance);
var user = _auth.GetCurrentUser();

63
OpenAuth.App/FlowInstance/Request/UpdateFlowInstanceReq.cs Normal file
View File

@ -0,0 +1,63 @@
//------------------------------------------------------------------------------
// <autogenerated>
// This code was generated by a CodeSmith Template.
//
// DO NOT MODIFY contents of this file. Changes to this
// file will be lost if the code is regenerated.
// Author:Yubao Li
// </autogenerated>
//------------------------------------------------------------------------------
using System.ComponentModel;
namespace OpenAuth.App.Request
{
/// <summary>
/// 创建工作流请求
/// </summary>
public class UpdateFlowInstanceReq : NodeDesignateReq
{
/// <summary>
/// 待更改的流程实例ID
/// </summary>
public string Id { get; set; }
/// <summary>
/// 实例编号
/// </summary>
[Description("实例编号")]
public string Code { get; set; }
/// <summary>
/// 自定义名称
/// </summary>
[Description("自定义名称")]
public string CustomName { get; set; }
/// <summary>
/// 数据库名称
/// </summary>
[Description("数据库名称")]
public string DbName { get; set; }
/// <summary>
/// 表单数据
/// </summary>
[Description("表单数据")]
public string FrmData { get; set; }
/// <summary>
/// 所属部门
/// </summary>
[Description("所属部门")]
public string OrgId { get; set; }
/// <summary>
/// 实例备注
/// </summary>
[Description("实例备注")]
public string Description { get; set; }
}
}

2
OpenAuth.Mvc/Controllers/FlowInstancesController.cs
View File

@ -119,7 +119,7 @@ namespace OpenAuth.Mvc.Controllers
//添加或修改
[HttpPost]
public string Update(FlowInstance obj)
public string Update(UpdateFlowInstanceReq obj)
{
try
{

6
OpenAuth.Mvc/Program.cs
View File

@ -1,5 +1,6 @@
using System;
using Autofac.Extensions.DependencyInjection;
using Infrastructure.Helpers;
using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging;
@ -37,7 +38,10 @@ namespace OpenAuth.Mvc
.UseServiceProviderFactory(new AutofacServiceProviderFactory()) //将默认ServiceProviderFactory指定为AutofacServiceProviderFactory
.ConfigureWebHostDefaults(webBuilder =>
{
webBuilder.UseUrls("http://*:1802").UseStartup<Startup>();
var configuration = ConfigHelper.GetConfigRoot();
var httpHost = configuration["AppSetting:HttpHost"];
webBuilder.UseUrls(httpHost).UseStartup<Startup>();
Console.WriteLine($"启动成功，访问地址:{httpHost}");
});
}

4
OpenAuth.Mvc/appsettings.Production.json
View File

@ -16,6 +16,8 @@
"Version": "demo",
"DbTypes": {
"OpenAuthDBContext":"MySql" //数据库类型：SqlServer、MySql、Oracle
}
},
"RedisConf": "redistest.cq-p.com.cn:8001,password=share_redis@123", //redis配置
"HttpHost": "http://*:1802" //启动绑定地址及端口
}
}

4
OpenAuth.Mvc/appsettings.json
View File

@ -17,6 +17,8 @@
"Version": "1.0", //如果为demo，则可以防止post提交
"DbTypes": {
"OpenAuthDBContext":"SqlServer" //数据库类型：SqlServer、MySql、Oracle
}
},
"RedisConf": "redistest.cq-p.com.cn:8001,password=share_redis@123", //redis配置
"HttpHost": "http://*:1802" //启动绑定地址及端口
}
}

2
OpenAuth.Mvc/wwwroot/js/index.js
View File

@ -253,7 +253,7 @@ layui.config({
btn: ['火速围观'],
moveType: 1,
content: '<div style="padding:15px 20px; text-align:justify; line-height: 22px; text-indent:2em;border-bottom:1px solid #e2e2e2;">' +
'<p>郑重提示：OpenAuth.Core 2.0新版上线，如以前访问过本站点请清空缓存后访问</p>' +
'<p>郑重提示：OpenAuth.Core 3.1新版上线，如以前访问过本站点请清空缓存后访问</p>' +
'<p>喜欢的，快快star吧！</p></div>',
success: function(layero){
var btn = layero.find('.layui-layer-btn');

4
OpenAuth.Repository/Domain/FlowInstance.cs
View File

@ -162,9 +162,9 @@ namespace OpenAuth.Repository.Domain
[Description("实例备注")]
public string Description { get; set; }
/// <summary>
/// 是否完成
/// 是否完成，当前节点的状态也通过该值表示
/// </summary>
[Description("是否完成")]
[Description("是否完成，当前节点的状态也通过该值表示")]
public int IsFinish { get; set; }
/// <summary>
/// 执行人

10
OpenAuth.WebApi/Controllers/FlowInstancesController.cs
View File

@ -121,10 +121,14 @@ namespace OpenAuth.WebApi.Controllers
return result;
}
//添加或修改
/// <summary>
/// 更新流程
/// </summary>
/// <para>更新时可以修改表单内容，可以修改流程基本信息，但不能更换表单模版</para>
/// <returns></returns>
[HttpPost]
public Response Update(FlowInstance obj)
public Response Update(UpdateFlowInstanceReq obj)
{
var result = new Response();
try

7
OpenAuth.WebApi/OpenAuth.WebApi.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@ -21,6 +21,7 @@
<EmbeddedResource Remove="wwwroot\**" />
<None Remove="log\**" />
<None Remove="wwwroot\**" />
<EmbeddedResource Include="index.html" />
</ItemGroup>
<ItemGroup>
@ -30,6 +31,10 @@
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="3.1.2" />
<PackageReference Include="Microsoft.Extensions.Logging.Log4Net.AspNetCore" Version="3.1.0" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.1.0" />
<PackageReference Include="MiniProfiler" Version="4.2.22" />
<PackageReference Include="MiniProfiler.AspNetCore" Version="4.2.22" />
<PackageReference Include="MiniProfiler.AspNetCore.Mvc" Version="4.2.22" />
<PackageReference Include="MiniProfiler.EntityFrameworkCore" Version="4.2.22" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="NUnit" Version="3.13.1" />
<PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />

10
OpenAuth.WebApi/Program.cs
View File

@ -1,6 +1,7 @@
using System;
using Autofac.Extensions.DependencyInjection;
using Infrastructure;
using Infrastructure.Helpers;
using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Hosting;
@ -41,14 +42,7 @@ namespace OpenAuth.WebApi
new AutofacServiceProviderFactory()) //将默认ServiceProviderFactory指定为AutofacServiceProviderFactory
.ConfigureWebHostDefaults(webBuilder =>
{
var configurationBuilder = new ConfigurationBuilder();
configurationBuilder.SetBasePath(System.IO.Directory.GetCurrentDirectory())
.AddJsonFile("appsettings.json", optional: false, reloadOnChange: true)
.AddJsonFile($"appsettings.{Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT") ?? "Development"}.json",
optional: true)
.AddEnvironmentVariables();
var configuration = configurationBuilder.Build();
var configuration = ConfigHelper.GetConfigRoot();
var httpHost = configuration["AppSetting:HttpHost"];
webBuilder.UseUrls(httpHost).UseStartup<Startup>();

20
OpenAuth.WebApi/Startup.cs
View File

@ -62,6 +62,18 @@ namespace OpenAuth.WebApi
options.Audience = "openauthapi";
});
}
// 添加MiniProfiler服务
services.AddMiniProfiler(options =>
{
// 设定访问分析结果URL的路由基地址
options.RouteBasePath = "/profiler";
options.ColorScheme = StackExchange.Profiling.ColorScheme.Auto;
options.PopupRenderPosition = StackExchange.Profiling.RenderPosition.BottomLeft;
options.PopupShowTimeWithChildren = true;
options.PopupShowTrivial = true;
options.SqlFormatter = new StackExchange.Profiling.SqlFormatters.InlineFormatter();
}).AddEntityFramework();//显示SQL语句及耗时
//添加swagger
services.AddSwaggerGen(option =>
@ -160,6 +172,8 @@ namespace OpenAuth.WebApi
services.AddDataProtection().PersistKeysToFileSystem(new DirectoryInfo(Configuration["DataProtection"]));
//设置定时启动的任务
services.AddHostedService<QuartzService>();
}
@ -217,13 +231,17 @@ namespace OpenAuth.WebApi
//配置ServiceProvider
AutofacContainerModule.ConfigServiceProvider(app.ApplicationServices);
app.UseMiniProfiler();
app.UseSwagger();
// Enable middleware to serve swagger-ui (HTML, JS, CSS, etc.),
// specifying the Swagger JSON endpoint.
app.UseSwaggerUI(c =>
{
{
c.IndexStream = () => GetType().GetTypeInfo().Assembly.GetManifestResourceStream("OpenAuth.WebApi.index.html");
foreach (var controller in GetControllers())
{
c.SwaggerEndpoint($"/swagger/{controller.Name.Replace("Controller", "")}/swagger.json",

103
OpenAuth.WebApi/index.html Normal file
View File

@ -0,0 +1,103 @@
<script async id="mini-profiler" src="/profiler/includes.min.js?v=4.2.22+4563a9e1ab"
data-version="4.2.22+4563a9e1ab" data-path="/profiler/"
data-current-id="7a3d98bb-3968-41fb-8836-65f9923ee6eb" data-ids="7a3d98bb-3968-41fb-8836-65f9923ee6eb"
data-position="Left" data-scheme="Light" data-authorized="true" data-max-traces="15"
data-toggle-shortcut="Alt+P" data-trivial-milliseconds="2.0"
data-ignored-duplicate-execute-types="Open,OpenAsync,Close,CloseAsync"></script>
<!-- HTML for static distribution bundle build -->
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>OpenAuth.Net接口 - 最好用的.net权限工作流框架|.net core快速开发框架|.net core权限管理|.net core工作流</title>
<meta name="Keywords" content="openauth.net,.net开源工作流,.NET开源权限管理">
<meta name="Description" content="最好用的.net开源工作流框架,最好用的.NET开源权限管理框架">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link href="https://fonts.googleapis.com/css?family=Open+Sans:400,700|Source+Code+Pro:300,600|Titillium+Web:400,600,700" rel="stylesheet">
<link rel="stylesheet" type="text/css" href="./swagger-ui.css">
<link rel="icon" type="image/png" href="./favicon-32x32.png" sizes="32x32" />
<link rel="icon" type="image/png" href="./favicon-16x16.png" sizes="16x16" />
<style>
html {
box-sizing: border-box;
overflow: -moz-scrollbars-vertical;
overflow-y: scroll;
}
*,
*:before,
*:after {
box-sizing: inherit;
}
body {
margin: 0;
background: #fafafa;
}
</style>
%(HeadContent)
</head>
<body>
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" style="position:absolute;width:0;height:0">
<defs>
<symbol viewBox="0 0 20 20" id="unlocked">
<path d="M15.8 8H14V5.6C14 2.703 12.665 1 10 1 7.334 1 6 2.703 6 5.6V6h2v-.801C8 3.754 8.797 3 10 3c1.203 0 2 .754 2 2.199V8H4c-.553 0-1 .646-1 1.199V17c0 .549.428 1.139.951 1.307l1.197.387C5.672 18.861 6.55 19 7.1 19h5.8c.549 0 1.428-.139 1.951-.307l1.196-.387c.524-.167.953-.757.953-1.306V9.199C17 8.646 16.352 8 15.8 8z"></path>
</symbol>
<symbol viewBox="0 0 20 20" id="locked">
<path d="M15.8 8H14V5.6C14 2.703 12.665 1 10 1 7.334 1 6 2.703 6 5.6V8H4c-.553 0-1 .646-1 1.199V17c0 .549.428 1.139.951 1.307l1.197.387C5.672 18.861 6.55 19 7.1 19h5.8c.549 0 1.428-.139 1.951-.307l1.196-.387c.524-.167.953-.757.953-1.306V9.199C17 8.646 16.352 8 15.8 8zM12 8H8V5.199C8 3.754 8.797 3 10 3c1.203 0 2 .754 2 2.199V8z" />
</symbol>
<symbol viewBox="0 0 20 20" id="close">
<path d="M14.348 14.849c-.469.469-1.229.469-1.697 0L10 11.819l-2.651 3.029c-.469.469-1.229.469-1.697 0-.469-.469-.469-1.229 0-1.697l2.758-3.15-2.759-3.152c-.469-.469-.469-1.228 0-1.697.469-.469 1.228-.469 1.697 0L10 8.183l2.651-3.031c.469-.469 1.228-.469 1.697 0 .469.469.469 1.229 0 1.697l-2.758 3.152 2.758 3.15c.469.469.469 1.229 0 1.698z" />
</symbol>
<symbol viewBox="0 0 20 20" id="large-arrow">
<path d="M13.25 10L6.109 2.58c-.268-.27-.268-.707 0-.979.268-.27.701-.27.969 0l7.83 7.908c.268.271.268.709 0 .979l-7.83 7.908c-.268.271-.701.27-.969 0-.268-.269-.268-.707 0-.979L13.25 10z" />
</symbol>
<symbol viewBox="0 0 20 20" id="large-arrow-down">
<path d="M17.418 6.109c.272-.268.709-.268.979 0s.271.701 0 .969l-7.908 7.83c-.27.268-.707.268-.979 0l-7.908-7.83c-.27-.268-.27-.701 0-.969.271-.268.709-.268.979 0L10 13.25l7.418-7.141z" />
</symbol>
<symbol viewBox="0 0 24 24" id="jump-to">
<path d="M19 7v4H5.83l3.58-3.59L8 6l-6 6 6 6 1.41-1.41L5.83 13H21V7z" />
</symbol>
<symbol viewBox="0 0 24 24" id="expand">
<path d="M10 18h4v-2h-4v2zM3 6v2h18V6H3zm3 7h12v-2H6v2z" />
</symbol>
</defs>
</svg>
<div id="swagger-ui"></div>
<!-- Workaround for https://github.com/swagger-api/swagger-editor/issues/1371 -->
<script>
if (window.navigator.userAgent.indexOf("Edge") > -1) {
console.log("Removing native Edge fetch in favor of swagger-ui's polyfill")
window.fetch = undefined;
}
</script>
<script src="./swagger-ui-bundle.js"></script>
<script src="./swagger-ui-standalone-preset.js"></script>
<script>
window.onload = function () {
var configObject = JSON.parse('%(ConfigObject)');
var oauthConfigObject = JSON.parse('%(OAuthConfigObject)');
// Apply mandatory parameters
configObject.dom_id = "#swagger-ui";
configObject.presets = [SwaggerUIBundle.presets.apis, SwaggerUIStandalonePreset];
configObject.layout = "StandaloneLayout";
// If oauth2RedirectUrl isn't specified, use the built-in default
if (!configObject.hasOwnProperty("oauth2RedirectUrl"))
configObject.oauth2RedirectUrl = window.location.href.replace("index.html", "oauth2-redirect.html");
// Build a system
const ui = SwaggerUIBundle(configObject);
// Apply OAuth config
ui.initOAuth(oauthConfigObject);
}
</script>
</body>
</html>