Commit 422facc2 by 赵剑炜

1.删除配置文件中后续不会用到的内容

2.调整swagger,配置swagger中注释内容
3.调整代码批量生成接口
parent 5cfe4766
......@@ -113,25 +113,12 @@
<param name="fieldName">列名</param>
<param name="textEnum">类型枚举,键值以英文冒号隔开,组之间用英文逗号隔开,如男:0,女:1,第三性别:2</param>
</member>
<member name="T:Admin.Net.Common.Class.Extensions.ListExport">
<summary>
List导出拓展类
</summary>
</member>
<member name="M:Admin.Net.Common.Class.Extensions.ListExport.Export``1(System.Collections.Generic.List{``0})">
<summary>
导出字典集
</summary>
<typeparam name="T">数据类型</typeparam>
<param name="list">集合</param>
<returns>字典集</returns>
</member>
<member name="T:Admin.Net.Common.Class.Extensions.ListRemove">
<member name="T:Admin.Net.Common.Class.Extensions.ListSort">
<summary>
list删除扩展
list操作扩展
</summary>
</member>
<member name="M:Admin.Net.Common.Class.Extensions.ListRemove.RemoveRange``1(System.Collections.Generic.List{``0},System.Collections.Generic.List{``0})">
<member name="M:Admin.Net.Common.Class.Extensions.ListSort.RemoveRange``1(System.Collections.Generic.List{``0},System.Collections.Generic.List{``0})">
<summary>
list删除
</summary>
......@@ -140,11 +127,6 @@
<param name="arr">删除的数据集合</param>
<returns>集合</returns>
</member>
<member name="T:Admin.Net.Common.Class.Extensions.ListSort">
<summary>
list排序扩展
</summary>
</member>
<member name="M:Admin.Net.Common.Class.Extensions.ListSort.Sort``1(System.Collections.Generic.List{``0},System.String)">
<summary>
List排序
......@@ -153,6 +135,14 @@
<param name="strSort">排序字段</param>
<returns>list</returns>
</member>
<member name="M:Admin.Net.Common.Class.Extensions.ListSort.Export``1(System.Collections.Generic.List{``0})">
<summary>
导出字典集
</summary>
<typeparam name="T">数据类型</typeparam>
<param name="list">集合</param>
<returns>字典集</returns>
</member>
<member name="T:Admin.Net.Common.Enum.MomType">
<summary>
消息中间件类型
......@@ -198,11 +188,6 @@
<param name="message">异常信息</param>
<param name="innerException">内部异常</param>
</member>
<member name="T:Junmp.Platform.Common.Class.RabbitMQ.MqConfigInfo">
<summary>
RabbitMQ 客户端定义。
</summary>
</member>
<member name="T:Junmp.Platform.Common.Global.AdminGlobalContext">
<summary>
全局配置
......
......@@ -13,15 +13,6 @@ namespace Junmp.Platform.Common.Global
/// </summary>
public class SystemConfig
{
/// <summary>
/// Pem格式Rsa公钥
/// </summary>
public String RsaPublicKey { get; set; }
/// <summary>
/// Pem格式Rsa私钥
/// </summary>
public String RsaPrivateKey { get; set; }
/// <summary>
/// 白名单
......@@ -48,15 +39,6 @@ namespace Junmp.Platform.Common.Global
/// </summary>
public String AesKey { get; set; }
/// <summary>
/// 登录上限
/// </summary>
public int LogonCountLimit { get; set; }
/// <summary>
/// TokenKey
/// </summary>
public String TokenKey { get; set; }
/// <summary>
/// 检测Token开关
......
......@@ -8,7 +8,7 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<NoWarn>1701;1702;1591</NoWarn>
<DocumentationFile>..\Admin.Net.WebApi\Junmp.Platform.Common.xml</DocumentationFile>
<DocumentationFile>..\Junmp.Platform.WebApi\Junmp.Platform.Common.xml</DocumentationFile>
</PropertyGroup>
<ItemGroup>
......@@ -50,9 +50,6 @@
<ItemGroup>
<None Update="C:\Users\pangmingjun\.nuget\packages\tesseract\4.1.1\build\\..\x64\tesseract41.dll" Link="Lib\Tesseract\x64\tesseract41.dll" />
<None Update="Library\Tesseract\chi_sim.traineddata">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>
<ItemGroup>
......@@ -115,4 +112,8 @@
<None Remove="C:\Users\DELL\.nuget\packages\tesseract\5.2.0\build\\..\x64\leptonica-1.82.0.dll" />
</ItemGroup>
<ItemGroup>
<Folder Include="Library\Tesseract\" />
</ItemGroup>
</Project>
......@@ -7,7 +7,6 @@ using System.Linq;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
using Junmp.Platform.Common.Class.RabbitMQ;
using Microsoft.Extensions.Hosting;
using Junmp.Platform.Common.Global;
......
......@@ -113,25 +113,12 @@
<param name="fieldName">列名</param>
<param name="textEnum">类型枚举,键值以英文冒号隔开,组之间用英文逗号隔开,如男:0,女:1,第三性别:2</param>
</member>
<member name="T:Admin.Net.Common.Class.Extensions.ListExport">
<summary>
List导出拓展类
</summary>
</member>
<member name="M:Admin.Net.Common.Class.Extensions.ListExport.Export``1(System.Collections.Generic.List{``0})">
<summary>
导出字典集
</summary>
<typeparam name="T">数据类型</typeparam>
<param name="list">集合</param>
<returns>字典集</returns>
</member>
<member name="T:Admin.Net.Common.Class.Extensions.ListRemove">
<member name="T:Admin.Net.Common.Class.Extensions.ListSort">
<summary>
list删除扩展
list操作扩展
</summary>
</member>
<member name="M:Admin.Net.Common.Class.Extensions.ListRemove.RemoveRange``1(System.Collections.Generic.List{``0},System.Collections.Generic.List{``0})">
<member name="M:Admin.Net.Common.Class.Extensions.ListSort.RemoveRange``1(System.Collections.Generic.List{``0},System.Collections.Generic.List{``0})">
<summary>
list删除
</summary>
......@@ -140,11 +127,6 @@
<param name="arr">删除的数据集合</param>
<returns>集合</returns>
</member>
<member name="T:Admin.Net.Common.Class.Extensions.ListSort">
<summary>
list排序扩展
</summary>
</member>
<member name="M:Admin.Net.Common.Class.Extensions.ListSort.Sort``1(System.Collections.Generic.List{``0},System.String)">
<summary>
List排序
......@@ -153,6 +135,14 @@
<param name="strSort">排序字段</param>
<returns>list</returns>
</member>
<member name="M:Admin.Net.Common.Class.Extensions.ListSort.Export``1(System.Collections.Generic.List{``0})">
<summary>
导出字典集
</summary>
<typeparam name="T">数据类型</typeparam>
<param name="list">集合</param>
<returns>字典集</returns>
</member>
<member name="T:Admin.Net.Common.Enum.MomType">
<summary>
消息中间件类型
......@@ -198,11 +188,6 @@
<param name="message">异常信息</param>
<param name="innerException">内部异常</param>
</member>
<member name="T:Junmp.Platform.Common.Class.RabbitMQ.MqConfigInfo">
<summary>
RabbitMQ 客户端定义。
</summary>
</member>
<member name="T:Junmp.Platform.Common.Global.AdminGlobalContext">
<summary>
全局配置
......
6d6d313e235cde70fe58917405145a3de68e068d
85e9d44ad0200e212aa04866a6fc64a1712f08b0
......@@ -2,16 +2,15 @@ C:\项目\JYZB-Git\JYZB3.0\审核\Junmp.Process\Junmp.Platform.Common\bin\Debug\
C:\项目\JYZB-Git\JYZB3.0\审核\Junmp.Process\Junmp.Platform.Common\bin\Debug\net7.0\x86\tesseract50.dll
C:\项目\JYZB-Git\JYZB3.0\审核\Junmp.Process\Junmp.Platform.Common\bin\Debug\net7.0\x64\leptonica-1.82.0.dll
C:\项目\JYZB-Git\JYZB3.0\审核\Junmp.Process\Junmp.Platform.Common\bin\Debug\net7.0\x64\tesseract50.dll
C:\项目\JYZB-Git\JYZB3.0\审核\Junmp.Process\Junmp.Platform.Common\bin\Debug\net7.0\Library\Tesseract\chi_sim.traineddata
C:\项目\JYZB-Git\JYZB3.0\审核\Junmp.Process\Junmp.Platform.Common\bin\Debug\net7.0\Junmp.Platform.Common.deps.json
C:\项目\JYZB-Git\JYZB3.0\审核\Junmp.Process\Junmp.Platform.Common\bin\Debug\net7.0\Junmp.Platform.Common.dll
C:\项目\JYZB-Git\JYZB3.0\审核\Junmp.Process\Junmp.Platform.Common\bin\Debug\net7.0\Junmp.Platform.Common.pdb
C:\项目\JYZB-Git\JYZB3.0\审核\Junmp.Process\Junmp.Platform.Common\bin\Debug\net7.0\Junmp.Platform.Common.xml
C:\项目\JYZB-Git\JYZB3.0\审核\Junmp.Process\Junmp.Platform.Common\obj\Debug\net7.0\Junmp.Platform.Common.csproj.AssemblyReference.cache
C:\项目\JYZB-Git\JYZB3.0\审核\Junmp.Process\Junmp.Platform.Common\obj\Debug\net7.0\Junmp.Platform.Common.GeneratedMSBuildEditorConfig.editorconfig
C:\项目\JYZB-Git\JYZB3.0\审核\Junmp.Process\Junmp.Platform.Common\obj\Debug\net7.0\Junmp.Platform.Common.AssemblyInfoInputs.cache
C:\项目\JYZB-Git\JYZB3.0\审核\Junmp.Process\Junmp.Platform.Common\obj\Debug\net7.0\Junmp.Platform.Common.AssemblyInfo.cs
C:\项目\JYZB-Git\JYZB3.0\审核\Junmp.Process\Junmp.Platform.Common\obj\Debug\net7.0\Junmp.Platform.Common.csproj.CoreCompileInputs.cache
C:\项目\JYZB-Git\JYZB3.0\审核\Junmp.Process\Junmp.Platform.Common\bin\Debug\net7.0\Junmp.Platform.Common.deps.json
C:\项目\JYZB-Git\JYZB3.0\审核\Junmp.Process\Junmp.Platform.Common\bin\Debug\net7.0\Junmp.Platform.Common.dll
C:\项目\JYZB-Git\JYZB3.0\审核\Junmp.Process\Junmp.Platform.Common\bin\Debug\net7.0\Junmp.Platform.Common.pdb
C:\项目\JYZB-Git\JYZB3.0\审核\Junmp.Process\Junmp.Platform.Common\bin\Debug\net7.0\Junmp.Platform.Common.xml
C:\项目\JYZB-Git\JYZB3.0\审核\Junmp.Process\Junmp.Platform.Common\obj\Debug\net7.0\Junmp.Platform.Common.dll
C:\项目\JYZB-Git\JYZB3.0\审核\Junmp.Process\Junmp.Platform.Common\obj\Debug\net7.0\refint\Junmp.Platform.Common.dll
C:\项目\JYZB-Git\JYZB3.0\审核\Junmp.Process\Junmp.Platform.Common\obj\Debug\net7.0\Junmp.Platform.Common.pdb
......
......@@ -25,7 +25,7 @@ namespace Junmp.Platform.Entity.CoreEntity
public class QueryCondition
{
/// <summary>
/// 起始页
/// 起始页11
/// </summary>
public int PageIndex { get; set; }
......
......@@ -8,7 +8,7 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<NoWarn>1701;1702;1591</NoWarn>
<DocumentationFile>..\Admin.Net.WebApi\Junmp.Platform.Entity.xml</DocumentationFile>
<DocumentationFile>..\Junmp.Platform.WebApi\Junmp.Platform.Entity.xml</DocumentationFile>
</PropertyGroup>
<ItemGroup>
......
......@@ -113,25 +113,12 @@
<param name="fieldName">列名</param>
<param name="textEnum">类型枚举,键值以英文冒号隔开,组之间用英文逗号隔开,如男:0,女:1,第三性别:2</param>
</member>
<member name="T:Admin.Net.Common.Class.Extensions.ListExport">
<summary>
List导出拓展类
</summary>
</member>
<member name="M:Admin.Net.Common.Class.Extensions.ListExport.Export``1(System.Collections.Generic.List{``0})">
<summary>
导出字典集
</summary>
<typeparam name="T">数据类型</typeparam>
<param name="list">集合</param>
<returns>字典集</returns>
</member>
<member name="T:Admin.Net.Common.Class.Extensions.ListRemove">
<member name="T:Admin.Net.Common.Class.Extensions.ListSort">
<summary>
list删除扩展
list操作扩展
</summary>
</member>
<member name="M:Admin.Net.Common.Class.Extensions.ListRemove.RemoveRange``1(System.Collections.Generic.List{``0},System.Collections.Generic.List{``0})">
<member name="M:Admin.Net.Common.Class.Extensions.ListSort.RemoveRange``1(System.Collections.Generic.List{``0},System.Collections.Generic.List{``0})">
<summary>
list删除
</summary>
......@@ -140,11 +127,6 @@
<param name="arr">删除的数据集合</param>
<returns>集合</returns>
</member>
<member name="T:Admin.Net.Common.Class.Extensions.ListSort">
<summary>
list排序扩展
</summary>
</member>
<member name="M:Admin.Net.Common.Class.Extensions.ListSort.Sort``1(System.Collections.Generic.List{``0},System.String)">
<summary>
List排序
......@@ -153,6 +135,14 @@
<param name="strSort">排序字段</param>
<returns>list</returns>
</member>
<member name="M:Admin.Net.Common.Class.Extensions.ListSort.Export``1(System.Collections.Generic.List{``0})">
<summary>
导出字典集
</summary>
<typeparam name="T">数据类型</typeparam>
<param name="list">集合</param>
<returns>字典集</returns>
</member>
<member name="T:Admin.Net.Common.Enum.MomType">
<summary>
消息中间件类型
......@@ -198,11 +188,6 @@
<param name="message">异常信息</param>
<param name="innerException">内部异常</param>
</member>
<member name="T:Junmp.Platform.Common.Class.RabbitMQ.MqConfigInfo">
<summary>
RabbitMQ 客户端定义。
</summary>
</member>
<member name="T:Junmp.Platform.Common.Global.AdminGlobalContext">
<summary>
全局配置
......
......@@ -1586,7 +1586,7 @@
</member>
<member name="P:Junmp.Platform.Entity.CoreEntity.QueryCondition.PageIndex">
<summary>
起始页
起始页11
</summary>
</member>
<member name="P:Junmp.Platform.Entity.CoreEntity.QueryCondition.PageSize">
......
......@@ -2,14 +2,6 @@ C:\项目\JYZB-Git\JYZB3.0\审核\Junmp.Process\Junmp.Platform.Entity\bin\Debug\
C:\项目\JYZB-Git\JYZB3.0\审核\Junmp.Process\Junmp.Platform.Entity\bin\Debug\net7.0\x86\tesseract50.dll
C:\项目\JYZB-Git\JYZB3.0\审核\Junmp.Process\Junmp.Platform.Entity\bin\Debug\net7.0\x64\leptonica-1.82.0.dll
C:\项目\JYZB-Git\JYZB3.0\审核\Junmp.Process\Junmp.Platform.Entity\bin\Debug\net7.0\x64\tesseract50.dll
C:\项目\JYZB-Git\JYZB3.0\审核\Junmp.Process\Junmp.Platform.Entity\bin\Debug\net7.0\Library\Tesseract\chi_sim.traineddata
C:\项目\JYZB-Git\JYZB3.0\审核\Junmp.Process\Junmp.Platform.Entity\obj\Debug\net7.0\Junmp.Platform.Entity.csproj.AssemblyReference.cache
C:\项目\JYZB-Git\JYZB3.0\审核\Junmp.Process\Junmp.Platform.Entity\obj\Debug\net7.0\Junmp.Platform.Entity.GeneratedMSBuildEditorConfig.editorconfig
C:\项目\JYZB-Git\JYZB3.0\审核\Junmp.Process\Junmp.Platform.Entity\obj\Debug\net7.0\Junmp.Platform.Entity.AssemblyInfoInputs.cache
C:\项目\JYZB-Git\JYZB3.0\审核\Junmp.Process\Junmp.Platform.Entity\obj\Debug\net7.0\Junmp.Platform.Entity.AssemblyInfo.cs
C:\项目\JYZB-Git\JYZB3.0\审核\Junmp.Process\Junmp.Platform.Entity\obj\Debug\net7.0\Junmp.Platform.Entity.csproj.CoreCompileInputs.cache
C:\项目\JYZB-Git\JYZB3.0\审核\Junmp.Process\Junmp.Platform.Entity\obj\Debug\net7.0\Junmp.Platform.Entity.csproj.CopyComplete
C:\项目\JYZB-Git\JYZB3.0\审核\Junmp.Process\Junmp.Platform.Entity\obj\Debug\net7.0\Junmp.Platform.Entity.genruntimeconfig.cache
C:\项目\JYZB-Git\JYZB3.0\审核\Junmp.Process\Junmp.Platform.Entity\bin\Debug\net7.0\Junmp.Platform.Entity.deps.json
C:\项目\JYZB-Git\JYZB3.0\审核\Junmp.Process\Junmp.Platform.Entity\bin\Debug\net7.0\Junmp.Platform.Entity.runtimeconfig.json
C:\项目\JYZB-Git\JYZB3.0\审核\Junmp.Process\Junmp.Platform.Entity\bin\Debug\net7.0\Junmp.Platform.Entity.dll
......@@ -18,7 +10,14 @@ C:\项目\JYZB-Git\JYZB3.0\审核\Junmp.Process\Junmp.Platform.Entity\bin\Debug\
C:\项目\JYZB-Git\JYZB3.0\审核\Junmp.Process\Junmp.Platform.Entity\bin\Debug\net7.0\Junmp.Platform.Common.dll
C:\项目\JYZB-Git\JYZB3.0\审核\Junmp.Process\Junmp.Platform.Entity\bin\Debug\net7.0\Junmp.Platform.Common.pdb
C:\项目\JYZB-Git\JYZB3.0\审核\Junmp.Process\Junmp.Platform.Entity\bin\Debug\net7.0\Junmp.Platform.Common.xml
C:\项目\JYZB-Git\JYZB3.0\审核\Junmp.Process\Junmp.Platform.Entity\obj\Debug\net7.0\Junmp.Platform.Entity.csproj.AssemblyReference.cache
C:\项目\JYZB-Git\JYZB3.0\审核\Junmp.Process\Junmp.Platform.Entity\obj\Debug\net7.0\Junmp.Platform.Entity.GeneratedMSBuildEditorConfig.editorconfig
C:\项目\JYZB-Git\JYZB3.0\审核\Junmp.Process\Junmp.Platform.Entity\obj\Debug\net7.0\Junmp.Platform.Entity.AssemblyInfoInputs.cache
C:\项目\JYZB-Git\JYZB3.0\审核\Junmp.Process\Junmp.Platform.Entity\obj\Debug\net7.0\Junmp.Platform.Entity.AssemblyInfo.cs
C:\项目\JYZB-Git\JYZB3.0\审核\Junmp.Process\Junmp.Platform.Entity\obj\Debug\net7.0\Junmp.Platform.Entity.csproj.CoreCompileInputs.cache
C:\项目\JYZB-Git\JYZB3.0\审核\Junmp.Process\Junmp.Platform.Entity\obj\Debug\net7.0\Junmp.Platform.Entity.csproj.CopyComplete
C:\项目\JYZB-Git\JYZB3.0\审核\Junmp.Process\Junmp.Platform.Entity\obj\Debug\net7.0\Junmp.Platform.Entity.dll
C:\项目\JYZB-Git\JYZB3.0\审核\Junmp.Process\Junmp.Platform.Entity\obj\Debug\net7.0\refint\Junmp.Platform.Entity.dll
C:\项目\JYZB-Git\JYZB3.0\审核\Junmp.Process\Junmp.Platform.Entity\obj\Debug\net7.0\Junmp.Platform.Entity.pdb
C:\项目\JYZB-Git\JYZB3.0\审核\Junmp.Process\Junmp.Platform.Entity\obj\Debug\net7.0\Junmp.Platform.Entity.genruntimeconfig.cache
C:\项目\JYZB-Git\JYZB3.0\审核\Junmp.Process\Junmp.Platform.Entity\obj\Debug\net7.0\ref\Junmp.Platform.Entity.dll
......@@ -113,25 +113,12 @@
<param name="fieldName">列名</param>
<param name="textEnum">类型枚举,键值以英文冒号隔开,组之间用英文逗号隔开,如男:0,女:1,第三性别:2</param>
</member>
<member name="T:Admin.Net.Common.Class.Extensions.ListExport">
<summary>
List导出拓展类
</summary>
</member>
<member name="M:Admin.Net.Common.Class.Extensions.ListExport.Export``1(System.Collections.Generic.List{``0})">
<summary>
导出字典集
</summary>
<typeparam name="T">数据类型</typeparam>
<param name="list">集合</param>
<returns>字典集</returns>
</member>
<member name="T:Admin.Net.Common.Class.Extensions.ListRemove">
<member name="T:Admin.Net.Common.Class.Extensions.ListSort">
<summary>
list删除扩展
list操作扩展
</summary>
</member>
<member name="M:Admin.Net.Common.Class.Extensions.ListRemove.RemoveRange``1(System.Collections.Generic.List{``0},System.Collections.Generic.List{``0})">
<member name="M:Admin.Net.Common.Class.Extensions.ListSort.RemoveRange``1(System.Collections.Generic.List{``0},System.Collections.Generic.List{``0})">
<summary>
list删除
</summary>
......@@ -140,11 +127,6 @@
<param name="arr">删除的数据集合</param>
<returns>集合</returns>
</member>
<member name="T:Admin.Net.Common.Class.Extensions.ListSort">
<summary>
list排序扩展
</summary>
</member>
<member name="M:Admin.Net.Common.Class.Extensions.ListSort.Sort``1(System.Collections.Generic.List{``0},System.String)">
<summary>
List排序
......@@ -153,6 +135,14 @@
<param name="strSort">排序字段</param>
<returns>list</returns>
</member>
<member name="M:Admin.Net.Common.Class.Extensions.ListSort.Export``1(System.Collections.Generic.List{``0})">
<summary>
导出字典集
</summary>
<typeparam name="T">数据类型</typeparam>
<param name="list">集合</param>
<returns>字典集</returns>
</member>
<member name="T:Admin.Net.Common.Enum.MomType">
<summary>
消息中间件类型
......@@ -198,11 +188,6 @@
<param name="message">异常信息</param>
<param name="innerException">内部异常</param>
</member>
<member name="T:Junmp.Platform.Common.Class.RabbitMQ.MqConfigInfo">
<summary>
RabbitMQ 客户端定义。
</summary>
</member>
<member name="T:Junmp.Platform.Common.Global.AdminGlobalContext">
<summary>
全局配置
......
......@@ -1586,7 +1586,7 @@
</member>
<member name="P:Junmp.Platform.Entity.CoreEntity.QueryCondition.PageIndex">
<summary>
起始页
起始页11
</summary>
</member>
<member name="P:Junmp.Platform.Entity.CoreEntity.QueryCondition.PageSize">
......
......@@ -2,13 +2,6 @@ C:\项目\JYZB-Git\JYZB3.0\审核\Junmp.Process\Junmp.Platform.Repository\bin\De
C:\项目\JYZB-Git\JYZB3.0\审核\Junmp.Process\Junmp.Platform.Repository\bin\Debug\net7.0\x86\tesseract50.dll
C:\项目\JYZB-Git\JYZB3.0\审核\Junmp.Process\Junmp.Platform.Repository\bin\Debug\net7.0\x64\leptonica-1.82.0.dll
C:\项目\JYZB-Git\JYZB3.0\审核\Junmp.Process\Junmp.Platform.Repository\bin\Debug\net7.0\x64\tesseract50.dll
C:\项目\JYZB-Git\JYZB3.0\审核\Junmp.Process\Junmp.Platform.Repository\bin\Debug\net7.0\Library\Tesseract\chi_sim.traineddata
C:\项目\JYZB-Git\JYZB3.0\审核\Junmp.Process\Junmp.Platform.Repository\obj\Debug\net7.0\Junmp.Platform.Repository.csproj.AssemblyReference.cache
C:\项目\JYZB-Git\JYZB3.0\审核\Junmp.Process\Junmp.Platform.Repository\obj\Debug\net7.0\Junmp.Platform.Repository.GeneratedMSBuildEditorConfig.editorconfig
C:\项目\JYZB-Git\JYZB3.0\审核\Junmp.Process\Junmp.Platform.Repository\obj\Debug\net7.0\Junmp.Platform.Repository.AssemblyInfoInputs.cache
C:\项目\JYZB-Git\JYZB3.0\审核\Junmp.Process\Junmp.Platform.Repository\obj\Debug\net7.0\Junmp.Platform.Repository.AssemblyInfo.cs
C:\项目\JYZB-Git\JYZB3.0\审核\Junmp.Process\Junmp.Platform.Repository\obj\Debug\net7.0\Junmp.Platform.Repository.csproj.CoreCompileInputs.cache
C:\项目\JYZB-Git\JYZB3.0\审核\Junmp.Process\Junmp.Platform.Repository\obj\Debug\net7.0\Junmp.Platform.Repository.csproj.CopyComplete
C:\项目\JYZB-Git\JYZB3.0\审核\Junmp.Process\Junmp.Platform.Repository\bin\Debug\net7.0\Junmp.Platform.Repository.deps.json
C:\项目\JYZB-Git\JYZB3.0\审核\Junmp.Process\Junmp.Platform.Repository\bin\Debug\net7.0\Junmp.Platform.Repository.dll
C:\项目\JYZB-Git\JYZB3.0\审核\Junmp.Process\Junmp.Platform.Repository\bin\Debug\net7.0\Junmp.Platform.Repository.pdb
......@@ -18,6 +11,12 @@ C:\项目\JYZB-Git\JYZB3.0\审核\Junmp.Process\Junmp.Platform.Repository\bin\De
C:\项目\JYZB-Git\JYZB3.0\审核\Junmp.Process\Junmp.Platform.Repository\bin\Debug\net7.0\Junmp.Platform.Common.xml
C:\项目\JYZB-Git\JYZB3.0\审核\Junmp.Process\Junmp.Platform.Repository\bin\Debug\net7.0\Junmp.Platform.Entity.pdb
C:\项目\JYZB-Git\JYZB3.0\审核\Junmp.Process\Junmp.Platform.Repository\bin\Debug\net7.0\Junmp.Platform.Entity.xml
C:\项目\JYZB-Git\JYZB3.0\审核\Junmp.Process\Junmp.Platform.Repository\obj\Debug\net7.0\Junmp.Platform.Repository.csproj.AssemblyReference.cache
C:\项目\JYZB-Git\JYZB3.0\审核\Junmp.Process\Junmp.Platform.Repository\obj\Debug\net7.0\Junmp.Platform.Repository.GeneratedMSBuildEditorConfig.editorconfig
C:\项目\JYZB-Git\JYZB3.0\审核\Junmp.Process\Junmp.Platform.Repository\obj\Debug\net7.0\Junmp.Platform.Repository.AssemblyInfoInputs.cache
C:\项目\JYZB-Git\JYZB3.0\审核\Junmp.Process\Junmp.Platform.Repository\obj\Debug\net7.0\Junmp.Platform.Repository.AssemblyInfo.cs
C:\项目\JYZB-Git\JYZB3.0\审核\Junmp.Process\Junmp.Platform.Repository\obj\Debug\net7.0\Junmp.Platform.Repository.csproj.CoreCompileInputs.cache
C:\项目\JYZB-Git\JYZB3.0\审核\Junmp.Process\Junmp.Platform.Repository\obj\Debug\net7.0\Junmp.Platform.Repository.csproj.CopyComplete
C:\项目\JYZB-Git\JYZB3.0\审核\Junmp.Process\Junmp.Platform.Repository\obj\Debug\net7.0\Junmp.Platform.Repository.dll
C:\项目\JYZB-Git\JYZB3.0\审核\Junmp.Process\Junmp.Platform.Repository\obj\Debug\net7.0\refint\Junmp.Platform.Repository.dll
C:\项目\JYZB-Git\JYZB3.0\审核\Junmp.Process\Junmp.Platform.Repository\obj\Debug\net7.0\Junmp.Platform.Repository.pdb
......
......@@ -22,6 +22,6 @@ namespace Admin.Net.Service.BusinessService.SystemManagement.CodeGeneratorServic
/// </summary>
/// <param name="codeGenerator">参数</param>
/// <returns>zipId</returns>
Task<Guid> CodeGenerate(CodeGeneratorDTO codeGenerator);
Task CodeGenerate(CodeGeneratorDTO codeGenerator);
}
}
......@@ -113,25 +113,12 @@
<param name="fieldName">列名</param>
<param name="textEnum">类型枚举,键值以英文冒号隔开,组之间用英文逗号隔开,如男:0,女:1,第三性别:2</param>
</member>
<member name="T:Admin.Net.Common.Class.Extensions.ListExport">
<summary>
List导出拓展类
</summary>
</member>
<member name="M:Admin.Net.Common.Class.Extensions.ListExport.Export``1(System.Collections.Generic.List{``0})">
<summary>
导出字典集
</summary>
<typeparam name="T">数据类型</typeparam>
<param name="list">集合</param>
<returns>字典集</returns>
</member>
<member name="T:Admin.Net.Common.Class.Extensions.ListRemove">
<member name="T:Admin.Net.Common.Class.Extensions.ListSort">
<summary>
list删除扩展
list操作扩展
</summary>
</member>
<member name="M:Admin.Net.Common.Class.Extensions.ListRemove.RemoveRange``1(System.Collections.Generic.List{``0},System.Collections.Generic.List{``0})">
<member name="M:Admin.Net.Common.Class.Extensions.ListSort.RemoveRange``1(System.Collections.Generic.List{``0},System.Collections.Generic.List{``0})">
<summary>
list删除
</summary>
......@@ -140,11 +127,6 @@
<param name="arr">删除的数据集合</param>
<returns>集合</returns>
</member>
<member name="T:Admin.Net.Common.Class.Extensions.ListSort">
<summary>
list排序扩展
</summary>
</member>
<member name="M:Admin.Net.Common.Class.Extensions.ListSort.Sort``1(System.Collections.Generic.List{``0},System.String)">
<summary>
List排序
......@@ -153,6 +135,14 @@
<param name="strSort">排序字段</param>
<returns>list</returns>
</member>
<member name="M:Admin.Net.Common.Class.Extensions.ListSort.Export``1(System.Collections.Generic.List{``0})">
<summary>
导出字典集
</summary>
<typeparam name="T">数据类型</typeparam>
<param name="list">集合</param>
<returns>字典集</returns>
</member>
<member name="T:Admin.Net.Common.Enum.MomType">
<summary>
消息中间件类型
......@@ -198,11 +188,6 @@
<param name="message">异常信息</param>
<param name="innerException">内部异常</param>
</member>
<member name="T:Junmp.Platform.Common.Class.RabbitMQ.MqConfigInfo">
<summary>
RabbitMQ 客户端定义。
</summary>
</member>
<member name="T:Junmp.Platform.Common.Global.AdminGlobalContext">
<summary>
全局配置
......
......@@ -1586,7 +1586,7 @@
</member>
<member name="P:Junmp.Platform.Entity.CoreEntity.QueryCondition.PageIndex">
<summary>
起始页
起始页11
</summary>
</member>
<member name="P:Junmp.Platform.Entity.CoreEntity.QueryCondition.PageSize">
......
......@@ -2,13 +2,6 @@ C:\项目\JYZB-Git\JYZB3.0\审核\Junmp.Process\Junmp.Platform.Service\bin\Debug
C:\项目\JYZB-Git\JYZB3.0\审核\Junmp.Process\Junmp.Platform.Service\bin\Debug\net7.0\x86\tesseract50.dll
C:\项目\JYZB-Git\JYZB3.0\审核\Junmp.Process\Junmp.Platform.Service\bin\Debug\net7.0\x64\leptonica-1.82.0.dll
C:\项目\JYZB-Git\JYZB3.0\审核\Junmp.Process\Junmp.Platform.Service\bin\Debug\net7.0\x64\tesseract50.dll
C:\项目\JYZB-Git\JYZB3.0\审核\Junmp.Process\Junmp.Platform.Service\bin\Debug\net7.0\Library\Tesseract\chi_sim.traineddata
C:\项目\JYZB-Git\JYZB3.0\审核\Junmp.Process\Junmp.Platform.Service\obj\Debug\net7.0\Junmp.Platform.Service.csproj.AssemblyReference.cache
C:\项目\JYZB-Git\JYZB3.0\审核\Junmp.Process\Junmp.Platform.Service\obj\Debug\net7.0\Junmp.Platform.Service.GeneratedMSBuildEditorConfig.editorconfig
C:\项目\JYZB-Git\JYZB3.0\审核\Junmp.Process\Junmp.Platform.Service\obj\Debug\net7.0\Junmp.Platform.Service.AssemblyInfoInputs.cache
C:\项目\JYZB-Git\JYZB3.0\审核\Junmp.Process\Junmp.Platform.Service\obj\Debug\net7.0\Junmp.Platform.Service.AssemblyInfo.cs
C:\项目\JYZB-Git\JYZB3.0\审核\Junmp.Process\Junmp.Platform.Service\obj\Debug\net7.0\Junmp.Platform.Service.csproj.CoreCompileInputs.cache
C:\项目\JYZB-Git\JYZB3.0\审核\Junmp.Process\Junmp.Platform.Service\obj\Debug\net7.0\Junmp.Platform.Service.csproj.CopyComplete
C:\项目\JYZB-Git\JYZB3.0\审核\Junmp.Process\Junmp.Platform.Service\bin\Debug\net7.0\Junmp.Platform.Service.deps.json
C:\项目\JYZB-Git\JYZB3.0\审核\Junmp.Process\Junmp.Platform.Service\bin\Debug\net7.0\Junmp.Platform.Service.dll
C:\项目\JYZB-Git\JYZB3.0\审核\Junmp.Process\Junmp.Platform.Service\bin\Debug\net7.0\Junmp.Platform.Service.pdb
......@@ -20,6 +13,12 @@ C:\项目\JYZB-Git\JYZB3.0\审核\Junmp.Process\Junmp.Platform.Service\bin\Debug
C:\项目\JYZB-Git\JYZB3.0\审核\Junmp.Process\Junmp.Platform.Service\bin\Debug\net7.0\Junmp.Platform.Repository.pdb
C:\项目\JYZB-Git\JYZB3.0\审核\Junmp.Process\Junmp.Platform.Service\bin\Debug\net7.0\Junmp.Platform.Common.pdb
C:\项目\JYZB-Git\JYZB3.0\审核\Junmp.Process\Junmp.Platform.Service\bin\Debug\net7.0\Junmp.Platform.Common.xml
C:\项目\JYZB-Git\JYZB3.0\审核\Junmp.Process\Junmp.Platform.Service\obj\Debug\net7.0\Junmp.Platform.Service.csproj.AssemblyReference.cache
C:\项目\JYZB-Git\JYZB3.0\审核\Junmp.Process\Junmp.Platform.Service\obj\Debug\net7.0\Junmp.Platform.Service.GeneratedMSBuildEditorConfig.editorconfig
C:\项目\JYZB-Git\JYZB3.0\审核\Junmp.Process\Junmp.Platform.Service\obj\Debug\net7.0\Junmp.Platform.Service.AssemblyInfoInputs.cache
C:\项目\JYZB-Git\JYZB3.0\审核\Junmp.Process\Junmp.Platform.Service\obj\Debug\net7.0\Junmp.Platform.Service.AssemblyInfo.cs
C:\项目\JYZB-Git\JYZB3.0\审核\Junmp.Process\Junmp.Platform.Service\obj\Debug\net7.0\Junmp.Platform.Service.csproj.CoreCompileInputs.cache
C:\项目\JYZB-Git\JYZB3.0\审核\Junmp.Process\Junmp.Platform.Service\obj\Debug\net7.0\Junmp.Platform.Service.csproj.CopyComplete
C:\项目\JYZB-Git\JYZB3.0\审核\Junmp.Process\Junmp.Platform.Service\obj\Debug\net7.0\Junmp.Platform.Service.dll
C:\项目\JYZB-Git\JYZB3.0\审核\Junmp.Process\Junmp.Platform.Service\obj\Debug\net7.0\refint\Junmp.Platform.Service.dll
C:\项目\JYZB-Git\JYZB3.0\审核\Junmp.Process\Junmp.Platform.Service\obj\Debug\net7.0\Junmp.Platform.Service.pdb
......
......@@ -15,7 +15,7 @@ using Admin.Net.Service.BusinessService.SystemManagement.LogService;
using System;
using System.IO;
namespace Admin.Net.WebApi.AppCode.ActionFilters
namespace Junmp.Platform.WebApi.AppCode.ActionFilters
{
/// <summary>
/// 审计日志过滤器
......
......@@ -15,7 +15,7 @@ using System;
using System.Collections.Generic;
using System.Linq;
namespace Admin.Net.WebApi.AppCode.ActionFilters
namespace Junmp.Platform.WebApi.AppCode.ActionFilters
{
/// <summary>
/// 动作权限过滤器
......
using Microsoft.OpenApi.Models;
using Swashbuckle.AspNetCore.SwaggerGen;
using System;
using System.Linq;
namespace Junmp.Platform.WebApi.AppCode.ActionFilters
{
/// <summary>
/// ignore some api on swagger.json
/// </summary>
[AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, AllowMultiple = false, Inherited = false)]
public class SwaggerIgnoreAttribute : Attribute
{
}
/// <summary>
/// 过滤具备SwaggerIgnore特性的api
/// </summary>
public class SwaggerIgnoreFilter : IDocumentFilter
{
public void Apply(OpenApiDocument swaggerDoc, DocumentFilterContext context)
{
var ignoreApis = context.ApiDescriptions.Where(wh => wh.CustomAttributes().Any(any => any is SwaggerIgnoreAttribute));
if (ignoreApis != null)
{
foreach (var ignoreApi in ignoreApis)
{
swaggerDoc.Paths.Remove("/" + ignoreApi.RelativePath);
}
}
}
}
}
......@@ -17,7 +17,7 @@ using Junmp.Platform.Entity.BusinessEnum;
using Admin.Net.Service.BusinessService.SystemManagement.LogService;
using System;
namespace Admin.Net.WebApi.AppCode.AuthorizationFilter
namespace Junmp.Platform.WebApi.AppCode.AuthorizationFilter
{
//[AttributeUsage(AttributeTargets.Class)]
public class ActionAuthorization : ActionFilterAttribute
......
......@@ -12,8 +12,8 @@ using Junmp.Platform.Entity.Base;
using Junmp.Platform.Entity.BusinessEnum;
using Junmp.Platform.Entity.CoreEntity;
using Junmp.Platform.Service.Base;
using Admin.Net.WebApi.AppCode.ActionFilters;
using Admin.Net.WebApi.AppCode.AuthorizationFilter;
using Junmp.Platform.WebApi.AppCode.ActionFilters;
using Junmp.Platform.WebApi.AppCode.AuthorizationFilter;
using System;
using System.IO;
using System.Threading.Tasks;
......
......@@ -15,7 +15,7 @@ using System.IO;
using System.Threading.Tasks;
using Junmp.Platform.Repository.Base;
namespace Admin.Net.WebApi.AppCode.FrameworkClass
namespace Junmp.Platform.WebApi.AppCode.FrameworkClass
{
public class AdminApplication
{
......
......@@ -8,7 +8,7 @@ using Microsoft.AspNetCore.SignalR;
using Junmp.Platform.Common.Global;
using System.Threading.Tasks;
namespace Admin.Net.WebApi.AppCode.FrameworkClass
namespace Junmp.Platform.WebApi.AppCode.FrameworkClass
{
public class ChatHub : Hub
{
......
......@@ -16,7 +16,7 @@ using System;
using System.Threading;
using System.Threading.Tasks;
namespace Admin.Net.WebApi.AppCode.FrameworkClass
namespace Junmp.Platform.WebApi.AppCode.FrameworkClass
{
/// <summary>
/// 分布式消息订阅器
......
......@@ -7,7 +7,7 @@
using System;
using System.Text.Json;
namespace Admin.Net.WebApi.AppCode.FrameworkClass
namespace Junmp.Platform.WebApi.AppCode.FrameworkClass
{
/// <summary>
/// 错误应答信息
......
......@@ -14,13 +14,13 @@ using Junmp.Platform.Entity.BusinessEntity.System;
using Junmp.Platform.Entity.BusinessEnum;
using Admin.Net.Service.BusinessService.MQService;
using Admin.Net.Service.BusinessService.SystemManagement.LogService;
using Admin.Net.WebApi.AppCode.FrameworkClass;
using Junmp.Platform.WebApi.AppCode.FrameworkClass;
using System;
using System.Net;
using System.Text;
using System.Threading.Tasks;
namespace Admin.Net.WebApi.AppCode.FrameworkExtensions
namespace Junmp.Platform.WebApi.AppCode.FrameworkExtensions
{
/// <summary>
/// 全局异常处理中间件
......
......@@ -14,7 +14,7 @@ using System.Net;
using System.Net.Http;
using System.Threading.Tasks;
namespace Admin.Net.WebApi.AppCode.FrameworkExtensions
namespace Junmp.Platform.WebApi.AppCode.FrameworkExtensions
{
public static class PollyHttpClientServiceCollectionExtensions
{
......
......@@ -8,7 +8,7 @@ using Microsoft.Extensions.Configuration;
using Quartz;
using System;
namespace Admin.Net.WebApi.AppCode.FrameworkExtensions
namespace Junmp.Platform.WebApi.AppCode.FrameworkExtensions
{
public static class QuartzConfiguratorExtensions
{
......
......@@ -11,7 +11,7 @@ using Junmp.Platform.Common.Global;
using System;
using System.Linq;
namespace Admin.Net.WebApi.AppCode.FrameworkExtensions
namespace Junmp.Platform.WebApi.AppCode.FrameworkExtensions
{
public static class RegisterConsulExtensions
{
......
......@@ -11,7 +11,7 @@ using Junmp.Platform.Common.Utility;
using System;
using System.Threading.Tasks;
namespace Admin.Net.WebApi.AppCode.FrameworkQuartz
namespace Junmp.Platform.WebApi.AppCode.FrameworkQuartz
{
[DisallowConcurrentExecution]
public class AdminFrameworkJob : IJob
......
......@@ -8,7 +8,7 @@ using Autofac;
using System.Linq;
using System.Reflection;
namespace Admin.Net.WebApi.AppCode.IoCDependencyInjection
namespace Junmp.Platform.WebApi.AppCode.IoCDependencyInjection
{
/// <summary>
/// 依赖自动注入
......
//-----------------------------------------------------------------------
// <Copyright>
// * Copyright (C) 2022 Admin All Rights Reserved
// </Copyright>
//-----------------------------------------------------------------------
using Microsoft.IdentityModel.Logging;
using Microsoft.IdentityModel.Tokens;
using Junmp.Platform.Common.Global;
using System;
using System.ComponentModel.DataAnnotations;
using System.IdentityModel.Tokens.Jwt;
using System.Security.Claims;
using System.Text;
namespace Admin.Net.WebApi.AppCode.JwtSecurity
{
[Serializable]
public class JwtAuthentication
{
/// <summary>
/// 登录名
/// </summary>
[Required]
public String UserName { get; set; }
/// <summary>
/// 密码
/// </summary>
[Required]
public String Password { get; set; }
/// <summary>
/// 盐
/// </summary>
[Required]
public String Salt { get; set; }
/// <summary>
/// 获取jwt口令
/// </summary>
/// <param name="userName">用户名</param>
/// <returns>JwtSecurityToken</returns>
public static JwtSecurityToken GetJwtSecurityToken(String userName)
{
//创建claim
var authClaims = new[] {
new Claim(JwtRegisteredClaimNames.Sub,userName),
new Claim(JwtRegisteredClaimNames.Jti,Guid.NewGuid().ToString())
};
IdentityModelEventSource.ShowPII = true;
//签名秘钥
var ecurityKey = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(AdminGlobalContext.JwtSettings.SecurityKey));
var token = new JwtSecurityToken(
issuer: AdminGlobalContext.JwtSettings.Issuer,
audience: AdminGlobalContext.JwtSettings.Audience,
expires: DateTime.Now.AddMinutes(AdminGlobalContext.JwtSettings.TokenExpiration),
claims: authClaims,
signingCredentials: new SigningCredentials(ecurityKey, SecurityAlgorithms.HmacSha256)
);
return token;
}
}
}
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
using Admin.Net.Common.Class.CaptchaPicture;
using Admin.Net.Service.BusinessService.RedisService;
using Admin.Net.WebApi.AppCode.ActionFilters;
using Junmp.Platform.WebApi.AppCode.ActionFilters;
using Junmp.Platform.Entity.BusinessEntity.BusinessModule;
using Junmp.Platform.Service.BusinessService.BusinessModule.BusinessTestService;
using Junmp.Platform.Common.Global;
......
......@@ -3,12 +3,12 @@ using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Logging;
using Junmp.Platform.Common.Global;
using Admin.Net.WebApi.AppCode.AuthorizationFilter;
using Junmp.Platform.WebApi.AppCode.AuthorizationFilter;
using System;
// For more information on enabling Web API for empty projects, visit https://go.microsoft.com/fwlink/?LinkID=397860
namespace Admin.Net.WebApi.Controllers.CoreControllers
namespace Junmp.Platform.WebApi.Controllers.CoreControllers
{
[ActionAuthorization]
[ApiController]
......
......@@ -2,13 +2,13 @@
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Junmp.Platform.Common.Global;
using Admin.Net.WebApi.AppCode.AuthorizationFilter;
using Junmp.Platform.WebApi.AppCode.AuthorizationFilter;
using System;
using System.Collections.Generic;
// For more information on enabling Web API for empty projects, visit https://go.microsoft.com/fwlink/?LinkID=397860
namespace Admin.Net.WebApi.Controllers.CoreControllers
namespace Junmp.Platform.WebApi.Controllers.CoreControllers
{
[ActionAuthorization]
[ApiController]
......
using Lazy.Captcha.Core;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Admin.Net.Common.Class.CaptchaPicture;
using Junmp.Platform.Common.Global;
using Admin.Net.Service.BusinessService.RedisService;
using System;
using System.Net;
using Junmp.Platform.Common.Tools;
// For more information on enabling Web API for empty projects, visit https://go.microsoft.com/fwlink/?LinkID=397860
namespace Admin.Net.WebApi.Controllers.CoreControllers
{
[Route(AdminGlobalContext.RouteTemplate)]
[ApiController]
public class AdminCaptchaController : ControllerBase
{
#region 属性及其构造函数
/// <summary>
/// Lazy.Captcha接口实例
/// </summary>
private readonly ICaptcha lazyCaptcha;
/// <summary>
/// Redis服务接口实例
/// </summary>
private readonly IRedisService redisService;
/// <summary>
/// 构造函数
/// </summary>
/// <param name="lazyCaptcha"></param>
/// <param name="redisService"></param>
public AdminCaptchaController(ICaptcha lazyCaptcha, IRedisService redisService)
{
this.lazyCaptcha = lazyCaptcha;
this.redisService = redisService;
}
#endregion
#region 获取登录验证码
/// <summary>
/// 获取登录验证码
/// </summary>
/// <returns>ActionResult</returns>
[HttpGet]
[AllowAnonymous]
public IActionResult GetCaptcha()
{
var captcha = new Captcha();
captcha.Id = Guid.NewGuid();
CaptchaData lazyCaptchaInfo = this.lazyCaptcha.Generate(captcha.Id.ToString());
captcha.CaptchaPicture = "data:image/gif;base64," + lazyCaptchaInfo.Base64;
this.redisService.Set(captcha.Id.ToString(), lazyCaptchaInfo.Code, AdminGlobalContext.JwtSettings.SaltExpiration);
var actionResult = new Junmp.Platform.Entity.CoreEntity.ActionResult();
actionResult.code = ResultCode.OPERATE_SUCCESS.Code;
actionResult.msg =ResultCode.OPERATE_SUCCESS.Msg;
actionResult.data = captcha;
return Ok(actionResult);
}
#endregion
}
}
......@@ -9,7 +9,7 @@ using Microsoft.AspNetCore.Mvc;
using Junmp.Platform.Common.Global;
using System.Threading.Tasks;
namespace Admin.Net.WebApi.Controllers.CoreControllers
namespace Junmp.Platform.WebApi.Controllers.CoreControllers
{
/// <summary>
/// 健康检查控制器
......
......@@ -6,7 +6,7 @@ using Junmp.Platform.Entity.BusinessEnum;
using Junmp.Platform.Entity.CoreEntity;
using Junmp.Platform.Entity.CoreEnum;
using Admin.Net.Service.BusinessService.SystemManagement.AttachmentService;
using Admin.Net.WebApi.AppCode.ActionFilters;
using Junmp.Platform.WebApi.AppCode.ActionFilters;
using System;
using System.Collections.Generic;
using System.IO;
......@@ -15,7 +15,7 @@ using Junmp.Platform.WebApi.AppCode.FrameworkBase;
// For more information on enabling Web API for empty projects, visit https://go.microsoft.com/fwlink/?LinkID=397860
namespace Admin.Net.WebApi.Controllers.SystemManagement
namespace Junmp.Platform.WebApi.Controllers.SystemManagement
{
/// <summary>
/// 业务附件管理控制器
......
......@@ -5,13 +5,13 @@ using Junmp.Platform.Entity.BusinessDTO.SystemManagement;
using Junmp.Platform.Entity.BusinessEnum;
using Junmp.Platform.Entity.CoreDTO;
using Admin.Net.Service.BusinessService.SystemManagement.CodeGeneratorService;
using Admin.Net.WebApi.AppCode.ActionFilters;
using Admin.Net.WebApi.AppCode.AuthorizationFilter;
using Junmp.Platform.WebApi.AppCode.ActionFilters;
using Junmp.Platform.WebApi.AppCode.AuthorizationFilter;
using System.Threading.Tasks;
// For more information on enabling Web API for empty projects, visit https://go.microsoft.com/fwlink/?LinkID=397860
namespace Admin.Net.WebApi.Controllers.SystemManagement
namespace Junmp.Platform.WebApi.Controllers.SystemManagement
{
[ActionAuthorization]
[ApiController]
......@@ -59,14 +59,30 @@ namespace Admin.Net.WebApi.Controllers.SystemManagement
/// 生成代码
/// </summary>
/// <param name="codeGenerator">生成器对象</param>
/// <remarks>
///
/// ## 例子
///
///{
/// "entityNamespace": "string",
/// "dtoNamespace": "string",
/// "controllerNamespace": "string",
/// "serviceNamespace": "string",
/// "repositoryNamespace": "string",
/// "tables": "table1/table2/table3",使用/符号对需要生成的表进行添加和生成
/// "layoutMode": 0
///
/// }
///
/// </remarks>
/// <returns>ActionResult</returns>
[HttpPost]
[Log(OperationType.GenerateCode)]
public async Task<IActionResult> CodeGenerate([FromBody] CodeGeneratorDTO codeGenerator)
{
var result = await this.CodeGeneratorService.CodeGenerate(codeGenerator);
var actionResult = Junmp.Platform.Entity.CoreEntity.ActionResult.Success(result);
return Ok(actionResult);
await this.CodeGeneratorService.CodeGenerate(codeGenerator);
//var actionResult = Junmp.Platform.Entity.CoreEntity.ActionResult.Success(result);
return Ok();
}
#endregion
......
......@@ -13,7 +13,7 @@ using Junmp.Platform.Entity.CoreEntity;
using Junmp.Platform.Entity.CoreEnum;
using Admin.Net.Service.BusinessService.SystemManagement.ImportDetailService;
using Admin.Net.Service.BusinessService.SystemManagement.ImportService;
using Admin.Net.WebApi.AppCode.ActionFilters;
using Junmp.Platform.WebApi.AppCode.ActionFilters;
using System;
using System.Collections.Generic;
using System.Linq;
......@@ -24,7 +24,7 @@ using Junmp.Platform.WebApi.AppCode.FrameworkBase;
// For more information on enabling Web API for empty projects, visit https://go.microsoft.com/fwlink/?LinkID=397860
namespace Admin.Net.WebApi.Controllers.SystemManagement
namespace Junmp.Platform.WebApi.Controllers.SystemManagement
{
/// <summary>
/// 导入配置管理控制器
......
......@@ -16,7 +16,7 @@ using Junmp.Platform.Entity.CoreEntity;
using Admin.Net.Service.BusinessService.MongoDBService;
using Admin.Net.Service.BusinessService.NestService;
using Admin.Net.Service.BusinessService.SystemManagement.LogService;
using Admin.Net.WebApi.AppCode.ActionFilters;
using Junmp.Platform.WebApi.AppCode.ActionFilters;
using SqlSugar;
using System;
using System.IO;
......@@ -26,7 +26,7 @@ using Junmp.Platform.WebApi.AppCode.FrameworkBase;
// For more information on enabling Web API for empty projects, visit https://go.microsoft.com/fwlink/?LinkID=397860
namespace Admin.Net.WebApi.Controllers.SystemManagement
namespace Junmp.Platform.WebApi.Controllers.SystemManagement
{
/// <summary>
/// 审计日志管理控制器
......
......@@ -17,7 +17,7 @@ using Junmp.Platform.Entity.BusinessEnum;
using Junmp.Platform.Entity.CoreEntity;
using Admin.Net.Service.BusinessService.RedisService;
using Admin.Net.Service.BusinessService.SystemManagement.ScheduleJobService;
using Admin.Net.WebApi.AppCode.ActionFilters;
using Junmp.Platform.WebApi.AppCode.ActionFilters;
using System;
using System.Collections.Generic;
using System.Linq;
......@@ -29,7 +29,7 @@ using Junmp.Platform.WebApi.AppCode.FrameworkBase;
// For more information on enabling Web API for empty projects, visit https://go.microsoft.com/fwlink/?LinkID=397860
namespace Admin.Net.WebApi.Controllers.SystemManagement
namespace Junmp.Platform.WebApi.Controllers.SystemManagement
{
[AllowAnonymous]
/// <summary>
......
......@@ -9,14 +9,14 @@ using Microsoft.AspNetCore.Mvc;
using Junmp.Platform.Common.Global;
using Junmp.Platform.Common.Utility;
using Junmp.Platform.Entity.BusinessEnum;
using Admin.Net.WebApi.AppCode.ActionFilters;
using Admin.Net.WebApi.AppCode.AuthorizationFilter;
using Junmp.Platform.WebApi.AppCode.ActionFilters;
using Junmp.Platform.WebApi.AppCode.AuthorizationFilter;
using System;
using System.Net;
using System.Threading.Tasks;
using Junmp.Platform.Common.Tools;
namespace Admin.Net.WebApi.Controllers.SystemManagement
namespace Junmp.Platform.WebApi.Controllers.SystemManagement
{
[ActionAuthorization]
[ApiController]
......
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Caching.Memory;
using Microsoft.Extensions.Logging;
using Junmp.Platform.Common.Global;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
namespace Admin.Net.WebApi.Controllers
{
/// <summary>
/// 天气信息
/// </summary>
[ApiController]
[AllowAnonymous]
[Route(AdminGlobalContext.RouteTemplate)]
public class WeatherForecastController : ControllerBase
{
private static readonly string[] Summaries = new[]
{
"Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching"
};
private readonly ILogger<WeatherForecastController> logger;
private readonly IMemoryCache memoryCache;
public WeatherForecastController(ILogger<WeatherForecastController> logger, IMemoryCache memoryCache)
{
this.logger = logger;
this.memoryCache = memoryCache;
}
/// <summary>
/// 获取天气信息
/// </summary>
/// <returns>天气信息</returns>
[HttpGet]
public async Task<IEnumerable<WeatherForecast>> Get()
{
return await Task.Run(() =>
{
var rng = new Random();
this.memoryCache.Set("Random", rng.Next(-20, 55), TimeSpan.FromSeconds(120));
this.logger.LogInformation(this.memoryCache.Get("Random").ToString());
return Enumerable.Range(1, 5).Select(index => new WeatherForecast
{
Date = DateTime.Now.AddDays(index),
TemperatureC = rng.Next(-20, 55),
Summary = Summaries[rng.Next(Summaries.Length)]
})
.ToArray();
});
}
}
}
......@@ -6,20 +6,20 @@ EXPOSE 5000
FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
WORKDIR /src
COPY ["Admin.Net.WebApi/Admin.Net.WebApi.csproj", "Admin.Net.WebApi/"]
COPY ["Junmp.Platform.WebApi/Junmp.Platform.WebApi.csproj", "Junmp.Platform.WebApi/"]
COPY ["Junmp.Platform.Entity/Junmp.Platform.Entity.csproj", "Junmp.Platform.Entity/"]
COPY ["Admin.Net.Common/Admin.Net.Common.csproj", "Admin.Net.Common/"]
COPY ["Admin.Net.Repository/Admin.Net.Repository.csproj", "Admin.Net.Repository/"]
COPY ["Admin.Net.Service/Admin.Net.Service.csproj", "Admin.Net.Service/"]
RUN dotnet restore "Admin.Net.WebApi/Admin.Net.WebApi.csproj"
RUN dotnet restore "Junmp.Platform.WebApi/Junmp.Platform.WebApi.csproj"
COPY . .
WORKDIR "/src/Admin.Net.WebApi"
RUN dotnet build "Admin.Net.WebApi.csproj" -c Release -o /app/build
WORKDIR "/src/Junmp.Platform.WebApi"
RUN dotnet build "Junmp.Platform.WebApi.csproj" -c Release -o /app/build
FROM build AS publish
RUN dotnet publish "Admin.Net.WebApi.csproj" -c Release -o /app/publish
RUN dotnet publish "Junmp.Platform.WebApi.csproj" -c Release -o /app/publish
FROM base AS final
WORKDIR /app
COPY --from=publish /app/publish .
ENTRYPOINT ["dotnet", "Admin.Net.WebApi.dll"]
\ No newline at end of file
ENTRYPOINT ["dotnet", "Junmp.Platform.WebApi.dll"]
\ No newline at end of file
......@@ -6,20 +6,20 @@ EXPOSE 5000
FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build
WORKDIR /src
COPY ["Admin.Net.WebApi/Admin.Net.WebApi.csproj", "Admin.Net.WebApi/"]
COPY ["Junmp.Platform.WebApi/Junmp.Platform.WebApi.csproj", "Junmp.Platform.WebApi/"]
COPY ["Junmp.Platform.Entity/Junmp.Platform.Entity.csproj", "Junmp.Platform.Entity/"]
COPY ["Admin.Net.Common/Admin.Net.Common.csproj", "Admin.Net.Common/"]
COPY ["Admin.Net.Repository/Admin.Net.Repository.csproj", "Admin.Net.Repository/"]
COPY ["Admin.Net.Service/Admin.Net.Service.csproj", "Admin.Net.Service/"]
RUN dotnet restore "Admin.Net.WebApi/Admin.Net.WebApi.csproj"
RUN dotnet restore "Junmp.Platform.WebApi/Junmp.Platform.WebApi.csproj"
COPY . .
WORKDIR "/src/Admin.Net.WebApi"
RUN dotnet build "Admin.Net.WebApi.csproj" -c Release -o /app/build
WORKDIR "/src/Junmp.Platform.WebApi"
RUN dotnet build "Junmp.Platform.WebApi.csproj" -c Release -o /app/build
FROM build AS publish
RUN dotnet publish "Admin.Net.WebApi.csproj" -c Release -o /app/publish
RUN dotnet publish "Junmp.Platform.WebApi.csproj" -c Release -o /app/publish
FROM base AS final
WORKDIR /app
COPY --from=publish /app/publish .
ENTRYPOINT ["dotnet", "Admin.Net.WebApi.dll"]
\ No newline at end of file
ENTRYPOINT ["dotnet", "Junmp.Platform.WebApi.dll"]
\ No newline at end of file
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论