Merge branch 'master' of http://47.108.235.38:8080/r/DocumentService

qwj

2023-07-27 dbb562890133eeb111f729241e0660239d3ebe18

Merge branch 'master' of http://47.108.235.38:8080/r/DocumentService

# Conflicts:
#	DocumentServiceAPI.Web.Entry/appsettings.json

 Document.Model/Document.Model.csproj

File was deleted

 Document.Model/SQL/Document_UserInfo.cs

File was deleted

 Document.Unility/Document.Unility.csproj

File was deleted

 Document.Unility/NLog.config

File was deleted

 Document.Unility/NLogProvider.cs

File was deleted

 Document.Unility/PageBaseSearch.cs

File was deleted

 Document.Unility/PageResult.cs

File was deleted

 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": {

 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>

 DocumentServiceAPI.Model/DocumentServiceAPI.Model.csproj

@@ -4,6 +4,7 @@
    <TargetFramework>net6.0</TargetFramework>
    <ImplicitUsings>enable</ImplicitUsings>
    <Nullable>enable</Nullable>
    <GenerateDocumentationFile>True</GenerateDocumentationFile>
  </PropertyGroup>

  <ItemGroup>

 DocumentServiceAPI.Model/User/JobInfo.cs

File was renamed from DocumentServiceAPI.Model/JobInfo.cs
@@ -7,19 +7,19 @@
using System.Text;
using System.Threading.Tasks;

namespace DocumentServiceAPI.Model
namespace DocumentServiceAPI.Model.User
{
    /// <summary>
    /// 岗位表
    /// </summary>
    [SugarTable(TableDescription = "岗位和User 中间表")]
    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; }
    }
}

 DocumentServiceAPI.Model/User/UnitInfo.cs

File was renamed from DocumentServiceAPI.Model/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; }
      

    }
}

 DocumentServiceAPI.Model/User/UserInfo.cs

New file
@@ -0,0 +1,92 @@
using 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; }


    }
}

 DocumentServiceAPI.Model/User/UserUnitInfo.cs

File was renamed from DocumentServiceAPI.Model/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

 DocumentServiceAPI.Model/UserInfo.cs

File was deleted

 DocumentServiceAPI.Utility/DocumentServiceAPI.Utility.csproj

@@ -4,6 +4,7 @@
    <TargetFramework>net6.0</TargetFramework>
    <ImplicitUsings>enable</ImplicitUsings>
    <Nullable>enable</Nullable>
    <GenerateDocumentationFile>True</GenerateDocumentationFile>
  </PropertyGroup>

</Project>

 DocumentServiceAPI.Web.Core/Startup.cs

@@ -12,8 +12,7 @@
    public void ConfigureServices(IServiceCollection services)
    {
        services.AddConsoleFormatter();
        services.AddJwt<JwtHandler>();
   
        services.AddJwt<JwtHandler>();  

        services.AddCorsAccessor();


 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>



 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()
        {