From 5df5f2c3fe7d185b2e0442296b083370503724f5 Mon Sep 17 00:00:00 2001
From: liaoxujun@qq.com <liaoxujun@qq.com>
Date: 星期三, 26 七月 2023 16:59:17 +0800
Subject: [PATCH] 修改了模型位置
---
DocumentServiceAPI.Model/User/UserInfo.cs | 92 ++++++++++++++++++
DocumentServiceAPI.Web.Entry/appsettings.json | 7
DocumentServiceAPI.Model/User/UnitInfo.cs | 6
DocumentServiceAPI.Utility/DocumentServiceAPI.Utility.csproj | 1
DocumentServiceAPI.Enum/DocumentServiceAPI.Enum.csproj | 3
DocumentServiceAPI.Application/applicationsettings.json | 31 +++---
/dev/null | 92 ------------------
DocumentServiceAPI.Model/User/JobInfo.cs | 8
DocumentServiceAPI.Web.Core/Startup.cs | 3
DocumentServiceAPI.Model/User/UserUnitInfo.cs | 6
DocumentServiceAPI.Web.Entry/HomeController.cs | 7 +
DocumentServiceAPI.Web.Entry/DocumentServiceAPI.Web.Entry.csproj | 1
DocumentServiceAPI.Model/DocumentServiceAPI.Model.csproj | 1
13 files changed, 134 insertions(+), 124 deletions(-)
diff --git a/DocumentServiceAPI.Application/applicationsettings.json b/DocumentServiceAPI.Application/applicationsettings.json
index fe875bc..8911167 100644
--- a/DocumentServiceAPI.Application/applicationsettings.json
+++ b/DocumentServiceAPI.Application/applicationsettings.json
@@ -3,22 +3,23 @@
"SpecificationDocumentSettings": {
"DocumentTitle": "Furion | 瑙勮寖鍖栨帴鍙�",
"GroupOpenApiInfos": [
- {
- "Group": "Default",
- "Title": "瑙勮寖鍖栨帴鍙ｆ紨绀�",
- "Description": "璁� .NET 寮�鍙戞洿绠�鍗曪紝鏇撮�氱敤锛屾洿娴佽銆�",
- "Version": "1.0.0",
- "TermsOfService": "http://furion.baiqian.ltd",
- "Contact": {
- "Name": "鐧惧皬鍍�",
- "Url": "https://gitee.com/monksoul",
- "Email": "monksoul@outlook.com"
- },
- "License": {
- "Name": "Apache-2.0",
- "Url": "https://gitee.com/dotnetchina/Furion/blob/rc1/LICENSE"
+
+
+ {
+ "Group": "Default",
+ "Title": "鏍囦功绠＄悊绯荤粺鏈嶅姟",
+ "Description": "杩欎釜涓�涓緢濂界敤鏍囦功绠＄悊绯荤粺鏈嶅姟杞欢",
+ "Version": "1.0.0",
+ "Contact": {
+ "Name": "鏀块噰鍜ㄨ鏈夐檺鍏徃",
+ "Url": "http://www.51zhengcai.com"
+
+ },
+ "License": {
+ "Name": "鏀块噰鍜ㄨ鏈夐檺鍏徃",
+ "Url": "http://www.51zhengcai.com"
+ }
}
- }
]
},
"CorsAccessorSettings": {
diff --git a/DocumentServiceAPI.Enum/DocumentServiceAPI.Enum.csproj b/DocumentServiceAPI.Enum/DocumentServiceAPI.Enum.csproj
index f56d384..55698f3 100644
--- a/DocumentServiceAPI.Enum/DocumentServiceAPI.Enum.csproj
+++ b/DocumentServiceAPI.Enum/DocumentServiceAPI.Enum.csproj
@@ -1,9 +1,10 @@
-锘�<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
+ <GenerateDocumentationFile>True</GenerateDocumentationFile>
</PropertyGroup>
<ItemGroup>
diff --git a/DocumentServiceAPI.Model/DocumentServiceAPI.Model.csproj b/DocumentServiceAPI.Model/DocumentServiceAPI.Model.csproj
index 0ee5a97..9924798 100644
--- a/DocumentServiceAPI.Model/DocumentServiceAPI.Model.csproj
+++ b/DocumentServiceAPI.Model/DocumentServiceAPI.Model.csproj
@@ -4,6 +4,7 @@
<TargetFramework>net6.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
+ <GenerateDocumentationFile>True</GenerateDocumentationFile>
</PropertyGroup>
<ItemGroup>
diff --git a/DocumentServiceAPI.Model/JobInfo.cs b/DocumentServiceAPI.Model/User/JobInfo.cs
similarity index 80%
rename from DocumentServiceAPI.Model/JobInfo.cs
rename to DocumentServiceAPI.Model/User/JobInfo.cs
index 0771383..b9e846e 100644
--- a/DocumentServiceAPI.Model/JobInfo.cs
+++ b/DocumentServiceAPI.Model/User/JobInfo.cs
@@ -7,19 +7,19 @@
using System.Text;
using System.Threading.Tasks;
-namespace DocumentServiceAPI.Model
+namespace DocumentServiceAPI.Model.User
{
/// <summary>
/// 宀椾綅琛�
/// </summary>
[SugarTable(TableDescription = "宀椾綅鍜孶ser 涓棿琛�")]
- public class JobInfo: BaseModel
+ public class JobInfo : BaseModel
{
/// <summary>
/// ID
/// </summary>
[Display(Name = "ID ")]
- [SugarColumn(ColumnDescription = "ID ",IsPrimaryKey =true,IsIdentity =true)]
+ [SugarColumn(ColumnDescription = "ID ", IsPrimaryKey = true, IsIdentity = true)]
public int ID { get; set; }
/// <summary>
@@ -35,6 +35,6 @@
/// </summary>
[Display(Name = "鍏徃鍚嶇О ")]
[SugarColumn(ColumnDescription = "鍏徃鍚嶇О ")]
- public int UntilID { get; set; }
+ public int UntilID { get; set; }
}
}
diff --git a/DocumentServiceAPI.Model/UnitInfo.cs b/DocumentServiceAPI.Model/User/UnitInfo.cs
similarity index 97%
rename from DocumentServiceAPI.Model/UnitInfo.cs
rename to DocumentServiceAPI.Model/User/UnitInfo.cs
index e7650f7..bbd651d 100644
--- a/DocumentServiceAPI.Model/UnitInfo.cs
+++ b/DocumentServiceAPI.Model/User/UnitInfo.cs
@@ -7,14 +7,14 @@
using System.Text;
using System.Threading.Tasks;
-namespace DocumentServiceAPI.Model
+namespace DocumentServiceAPI.Model.User
{
/// <summary>
/// 鍗曚綅淇℃伅
/// </summary>
[SugarTable(TableDescription = "鍗曚綅淇℃伅")]
- public class UnitInfo: BaseModel
+ public class UnitInfo : BaseModel
{
[DisplayName("鍗曚綅ID")]
@@ -95,6 +95,6 @@
[DisplayName("寤鸿鏍囧織")]
public int? AdviseFlag { get; set; }
-
+
}
}
diff --git a/DocumentServiceAPI.Model/User/UserInfo.cs b/DocumentServiceAPI.Model/User/UserInfo.cs
new file mode 100644
index 0000000..9f802a8
--- /dev/null
+++ b/DocumentServiceAPI.Model/User/UserInfo.cs
@@ -0,0 +1,92 @@
+锘縰sing DocumentServiceAPI.Enum;
+using SqlSugar;
+using System.ComponentModel;
+
+namespace DocumentServiceAPI.Model.User
+{
+ /// <summary>
+ /// 鐢ㄦ埛璇︽儏琛�
+ /// </summary>
+
+ [SugarTable(TableDescription = "鐢ㄦ埛璇︽儏琛�")]
+ public class UserInfo : BaseModel
+ {
+
+ /// <summary>
+ /// 鍛樺伐ID 鑷ID
+ /// </summary>
+
+ [DisplayName("鍛樺伐ID")]
+ [SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
+ public int Id { get; set; }
+ /// <summary>
+ /// 鍛樺伐濮撳悕
+ /// </summary>
+ [DisplayName("鍛樺伐濮撳悕")]
+ public string EmployeeName { get; set; }
+
+ /// <summary>
+ /// 鐢佃瘽
+ /// </summary>
+ [DisplayName("鐢佃瘽")]
+ public string Phone { get; set; }
+ /// <summary>
+ /// 鏄惁鍦ㄨ亴
+ /// </summary>
+ [DisplayName("鏄惁鍦ㄨ亴")]
+ public int? IsWork { get; set; }
+ /// <summary>
+ /// 绂昏亴鏃堕棿
+ /// </summary>
+ [DisplayName("绂昏亴鏃堕棿")]
+ public DateTime? LeaveTime { get; set; }
+ /// <summary>
+ /// 韬唤璇佹闈�
+ /// </summary>
+ [DisplayName("韬唤璇佹闈�")]
+ public string CardPositive { get; set; }
+ /// <summary>
+ /// 韬唤璇佹闈㈢増鏈彿
+ /// </summary>
+ [DisplayName("韬唤璇佹闈㈢増鏈彿")]
+ public string CardPositiveVersionNo { get; set; }
+ /// <summary>
+ /// 韬唤璇佹闈㈠昂瀵�
+ /// </summary>
+ [DisplayName("韬唤璇佹闈㈠昂瀵�")]
+ public int? CardPositiveSize { get; set; }
+
+ /// <summary>
+ /// 鐢ㄦ埛鍚�
+ /// </summary>
+ [DisplayName("鐢ㄦ埛鍚�")]
+ public string UserName { get; set; }
+ /// <summary>
+ /// 鐢ㄦ埛瀵嗙爜
+ /// </summary>
+ [DisplayName("鐢ㄦ埛瀵嗙爜")]
+ public string UserPassWord { get; set; }
+ /// <summary>
+ /// 鐧诲綍鏃堕棿
+ /// </summary>
+ [DisplayName("鐧诲綍鏃堕棿")]
+ public DateTime? LoginTime { get; set; }
+ /// <summary>
+ /// 鏄惁鐧诲綍
+ /// </summary>
+ [DisplayName("鏄惁鐧诲綍")]
+ public bool? IsLogin { get; set; }
+ /// <summary>
+ /// 寤鸿鏍囧織
+ /// </summary>
+ [DisplayName("寤鸿鏍囧織")]
+ public int? AdviseFlag { get; set; }
+ /// <summary>
+ /// 鐢ㄦ埛ID
+ /// </summary>
+ [DisplayName("鐢ㄦ埛ID")]
+ public int? UserId { get; set; }
+
+
+ }
+}
\ No newline at end of file
diff --git a/DocumentServiceAPI.Model/UserUnitInfo.cs b/DocumentServiceAPI.Model/User/UserUnitInfo.cs
similarity index 88%
rename from DocumentServiceAPI.Model/UserUnitInfo.cs
rename to DocumentServiceAPI.Model/User/UserUnitInfo.cs
index 91cb2e7..7357460 100644
--- a/DocumentServiceAPI.Model/UserUnitInfo.cs
+++ b/DocumentServiceAPI.Model/User/UserUnitInfo.cs
@@ -7,13 +7,13 @@
using System.Text;
using System.Threading.Tasks;
-namespace DocumentServiceAPI.Model
+namespace DocumentServiceAPI.Model.User
{
/// <summary>
/// 鍛樺伐鍜屽叕鍙告墍鍏崇郴琛� 涓棿琛�
/// </summary>
[SugarTable(TableDescription = "鍛樺伐鍜屽叕鍙告墍鍏崇郴琛�")]
- public class UserUnitInfo: BaseModel
+ public class UserUnitInfo : BaseModel
{
/// <summary>
/// ID
@@ -26,7 +26,7 @@
/// </summary>
[Display(Name = "鍛樺伐ID ")]
[SugarColumn(ColumnDescription = "鍛樺伐ID ")]
- public int UserID { get; set; }
+ public int UserID { get; set; }
/// <summary>
/// 鍏徃ID
diff --git a/DocumentServiceAPI.Model/UserInfo.cs b/DocumentServiceAPI.Model/UserInfo.cs
deleted file mode 100644
index 10f95a7..0000000
--- a/DocumentServiceAPI.Model/UserInfo.cs
+++ /dev/null
@@ -1,92 +0,0 @@
-锘縰sing DocumentServiceAPI.Enum;
-using SqlSugar;
-using System.ComponentModel;
-
-namespace DocumentServiceAPI.Model
-{
- /// <summary>
- /// 鐢ㄦ埛璇︽儏琛�
- /// </summary>
-
- [SugarTable(TableDescription = "鐢ㄦ埛璇︽儏琛�")]
- public class UserInfo: BaseModel
- {
-
- /// <summary>
- /// 鍛樺伐ID 鑷ID
- /// </summary>
-
- [DisplayName("鍛樺伐ID")]
- [SugarColumn(IsPrimaryKey =true,IsIdentity =true)]
- public int Id { get; set; }
- /// <summary>
- /// 鍛樺伐濮撳悕
- /// </summary>
- [DisplayName("鍛樺伐濮撳悕")]
- public string EmployeeName { get; set; }
-
- /// <summary>
- /// 鐢佃瘽
- /// </summary>
- [DisplayName("鐢佃瘽")]
- public string Phone { get; set; }
- /// <summary>
- /// 鏄惁鍦ㄨ亴
- /// </summary>
- [DisplayName("鏄惁鍦ㄨ亴")]
- public int? IsWork { get; set; }
- /// <summary>
- /// 绂昏亴鏃堕棿
- /// </summary>
- [DisplayName("绂昏亴鏃堕棿")]
- public DateTime? LeaveTime { get; set; }
- /// <summary>
- /// 韬唤璇佹闈�
- /// </summary>
- [DisplayName("韬唤璇佹闈�")]
- public string CardPositive { get; set; }
- /// <summary>
- /// 韬唤璇佹闈㈢増鏈彿
- /// </summary>
- [DisplayName("韬唤璇佹闈㈢増鏈彿")]
- public string CardPositiveVersionNo { get; set; }
- /// <summary>
- /// 韬唤璇佹闈㈠昂瀵�
- /// </summary>
- [DisplayName("韬唤璇佹闈㈠昂瀵�")]
- public int? CardPositiveSize { get; set; }
-
- /// <summary>
- /// 鐢ㄦ埛鍚�
- /// </summary>
- [DisplayName("鐢ㄦ埛鍚�")]
- public string UserName { get; set; }
- /// <summary>
- /// 鐢ㄦ埛瀵嗙爜
- /// </summary>
- [DisplayName("鐢ㄦ埛瀵嗙爜")]
- public string UserPassWord { get; set; }
- /// <summary>
- /// 鐧诲綍鏃堕棿
- /// </summary>
- [DisplayName("鐧诲綍鏃堕棿")]
- public DateTime? LoginTime { get; set; }
- /// <summary>
- /// 鏄惁鐧诲綍
- /// </summary>
- [DisplayName("鏄惁鐧诲綍")]
- public bool? IsLogin { get; set; }
- /// <summary>
- /// 寤鸿鏍囧織
- /// </summary>
- [DisplayName("寤鸿鏍囧織")]
- public int? AdviseFlag { get; set; }
- /// <summary>
- /// 鐢ㄦ埛ID
- /// </summary>
- [DisplayName("鐢ㄦ埛ID")]
- public int? UserId { get; set; }
-
-
-}
-}
\ No newline at end of file
diff --git a/DocumentServiceAPI.Utility/DocumentServiceAPI.Utility.csproj b/DocumentServiceAPI.Utility/DocumentServiceAPI.Utility.csproj
index 132c02c..ca61dfe 100644
--- a/DocumentServiceAPI.Utility/DocumentServiceAPI.Utility.csproj
+++ b/DocumentServiceAPI.Utility/DocumentServiceAPI.Utility.csproj
@@ -4,6 +4,7 @@
<TargetFramework>net6.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
+ <GenerateDocumentationFile>True</GenerateDocumentationFile>
</PropertyGroup>
</Project>
diff --git a/DocumentServiceAPI.Web.Core/Startup.cs b/DocumentServiceAPI.Web.Core/Startup.cs
index bc0d34b..3b828ae 100644
--- a/DocumentServiceAPI.Web.Core/Startup.cs
+++ b/DocumentServiceAPI.Web.Core/Startup.cs
@@ -12,8 +12,7 @@
public void ConfigureServices(IServiceCollection services)
{
services.AddConsoleFormatter();
- services.AddJwt<JwtHandler>();
-
+ services.AddJwt<JwtHandler>();
services.AddCorsAccessor();
diff --git a/DocumentServiceAPI.Web.Entry/DocumentServiceAPI.Web.Entry.csproj b/DocumentServiceAPI.Web.Entry/DocumentServiceAPI.Web.Entry.csproj
index 25a503a..f971233 100644
--- a/DocumentServiceAPI.Web.Entry/DocumentServiceAPI.Web.Entry.csproj
+++ b/DocumentServiceAPI.Web.Entry/DocumentServiceAPI.Web.Entry.csproj
@@ -6,6 +6,7 @@
<ImplicitUsings>enable</ImplicitUsings>
<SatelliteResourceLanguages>en-US</SatelliteResourceLanguages>
<PublishReadyToRunComposite>true</PublishReadyToRunComposite>
+ <GenerateDocumentationFile>True</GenerateDocumentationFile>
</PropertyGroup>
diff --git a/DocumentServiceAPI.Web.Entry/HomeController.cs b/DocumentServiceAPI.Web.Entry/HomeController.cs
index 7b98c19..3dda75f 100644
--- a/DocumentServiceAPI.Web.Entry/HomeController.cs
+++ b/DocumentServiceAPI.Web.Entry/HomeController.cs
@@ -2,10 +2,17 @@
namespace DocumentServiceAPI.Web.Entry
{
+ /// <summary>
+ /// 娴嬭瘯
+ /// </summary>
[ApiDescriptionSettings("Group1")]
[Route("api/[controller]")]
public class HomeController : ControllerBase
{
+ /// <summary>
+ /// 娴嬭瘯
+ /// </summary>
+ /// <returns></returns>
[HttpGet("aaa")]
public IActionResult aaa()
{
diff --git a/DocumentServiceAPI.Web.Entry/appsettings.json b/DocumentServiceAPI.Web.Entry/appsettings.json
index b0992fc..597be0a 100644
--- a/DocumentServiceAPI.Web.Entry/appsettings.json
+++ b/DocumentServiceAPI.Web.Entry/appsettings.json
@@ -18,13 +18,12 @@
}
],
- //swags 鍚嶇О閰嶇疆 榛樿鍒嗙粍
- "[openapi:Default]": {
- "Title": "鏍囦功绠＄悊绯荤粺鏈嶅姟",
+ //swags 鍚嶇О閰嶇疆 榛樿鍒嗙粍 搴旇鍙互閰嶇疆鍒癮pplicationsettings.josn
+ "[openapi:Group1]": {
+ "Title": "Group1",
"Order": 0,
"Description": "杩欎釜涓�涓緢濂界敤鏍囦功绠＄悊绯荤粺鏈嶅姟杞欢",
"Version": "1.0.0",
- "TermsOfService": "http://www.51zhengcai.com",
"Contact": {
"Name": "鏀块噰鍜ㄨ鏈夐檺鍏徃",
"Url": "http://www.51zhengcai.com"
--
Gitblit v1.9.1