优化更新

lixiaojun

2024-03-30 9324f054ec09984fe7c82ca6db6e6776eafc6983

优化更新

 Yw.Application.Unit.Core/01-sys-unit-lang/SysUnitLang_Controller.cs

@@ -61,7 +61,7 @@
        {
            if (_service.IsExistCode(input.Code))
            {
                throw YOops.Oh(eResultCode.Alert, ErrorCodes.V001, $"Code:{input.Code} ç¼–码已存在");
                throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.V001, $"Code:{input.Code} ç¼–码已存在");
            }
            var model = input.Adapt<AddSysUnitLangInput, Model.SysUnitLang>();
            model.SortCode = _service.GetMaxSortCode() + 1;
@@ -82,12 +82,12 @@
        {
            if (_service.IsExistCodeExceptID(input.Code, input.ID))
            {
                throw YOops.Oh(eResultCode.Alert, ErrorCodes.V001, $"Code:{input.Code} ç¼–码已存在");
                throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.V001, $"Code:{input.Code} ç¼–码已存在");
            }
            var model = _service.GetByID(input.ID);
            if (model == null)
            {
                throw YOops.Oh(eResultCode.Alert, ErrorCodes.D001, $"ID:{input.ID} æ•°æ®ä¸å­˜åœ¨");
                throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.D001, $"ID:{input.ID} æ•°æ®ä¸å­˜åœ¨");
            }
            var rhs = new Model.SysUnitLang(model);
            input.Adapt(rhs);
@@ -159,7 +159,7 @@
            var bol = _service.DeleteByID(input.ID, out string msg);
            if (!bol)
            {
                throw YOops.Oh(eResultCode.Alert, ErrorCodes.D999, msg);
                throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.D999, msg);
            }
            return bol;
        }

 Yw.Application.Unit.Core/02-type/SysUnitType_Controller.cs

@@ -73,7 +73,7 @@
        {
            if (_service.IsExistCode(input.Code))
            {
                throw YOops.Oh(eResultCode.Alert, ErrorCodes.V001, $"Code:{input.Code} ç¼–码已存在");
                throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.V001, $"Code:{input.Code} ç¼–码已存在");
            }
            var model = input.Adapt<AddSysUnitTypeInput, Model.SysUnitType>();
            model.SortCode = _service.GetMaxSortCode() + 1;
@@ -95,11 +95,11 @@
            var model = _service.GetByID(input.ID);
            if (model == null)
            {
                throw YOops.Oh(eResultCode.Alert, ErrorCodes.D001, $"ID:{input.ID} æ•°æ®ä¸å­˜åœ¨");
                throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.D001, $"ID:{input.ID} æ•°æ®ä¸å­˜åœ¨");
            }
            if (_service.IsExistCodeExceptID(input.Code, input.ID))
            {
                throw YOops.Oh(eResultCode.Alert, ErrorCodes.V001, $"Code:{input.Code} ç¼–码已存在");
                throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.V001, $"Code:{input.Code} ç¼–码已存在");
            }
            var rhs = new Model.SysUnitType(model);
            input.Adapt(rhs);
@@ -171,7 +171,7 @@
            var bol = _service.DeleteByID(input.ID, out string msg);
            if (!bol)
            {
                throw YOops.Oh(eResultCode.Alert, ErrorCodes.D999, msg);
                throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.D999, msg);
            }
            return bol;
        }

 Yw.Application.Unit.Core/03-value/SysUnitValue_Controller.cs

@@ -77,11 +77,11 @@
            var type = new Service.SysUnitType().GetByID(input.TypeID);
            if (type == null)
            {
                throw YOops.Oh(eResultCode.Alert, ErrorCodes.D001, $"TypeID:{input.TypeID} æ•°æ®ä¸å­˜åœ¨");
                throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.D001, $"TypeID:{input.TypeID} æ•°æ®ä¸å­˜åœ¨");
            }
            if (_service.IsExistCode(input.TypeID, input.Code))
            {
                throw YOops.Oh(eResultCode.Alert, ErrorCodes.V001, $"Code:{input.Code} ç¼–码已存在");
                throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.V001, $"Code:{input.Code} ç¼–码已存在");
            }
            var model = input.Adapt<AddSysUnitValueInput, Model.SysUnitValue>();
            model.SortCode = _service.GetMaxSortCode(input.TypeID) + 1;
@@ -104,11 +104,11 @@
            var model = _service.GetByID(input.ID);
            if (model == null)
            {
                throw YOops.Oh(eResultCode.Alert, ErrorCodes.D001, $"ID:{input.ID} æ•°æ®ä¸å­˜åœ¨");
                throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.D001, $"ID:{input.ID} æ•°æ®ä¸å­˜åœ¨");
            }
            if (_service.IsExistCodeExceptID(model.TypeID, input.Code, input.ID))
            {
                throw YOops.Oh(eResultCode.Alert, ErrorCodes.V001, $"Code:{input.Code} ç¼–码已存在");
                throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.V001, $"Code:{input.Code} ç¼–码已存在");
            }
            var rhs = new Model.SysUnitValue(model);
            input.Adapt(rhs);
@@ -180,7 +180,7 @@
            var bol = _service.DeleteByID(input.ID, out string msg);
            if (!bol)
            {
                throw YOops.Oh(eResultCode.Alert, ErrorCodes.D999, msg);
                throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.D999, msg);
            }
            return bol;
        }

 Yw.Application.Unit.Core/Properties/PublishProfiles/FolderProfile.pubxml.user

@@ -4,6 +4,6 @@
-->
<Project>
  <PropertyGroup>
    <History>True|2024-03-24T08:04:31.1520708Z;True|2024-03-20T13:28:31.4429012+08:00;True|2024-03-08T16:08:21.6186021+08:00;True|2024-01-27T09:16:19.1123592+08:00;True|2024-01-21T14:04:53.3821335+08:00;True|2024-01-20T18:00:33.8425629+08:00;True|2024-01-20T17:58:31.8270324+08:00;True|2024-01-20T12:19:49.4239246+08:00;True|2024-01-14T13:50:48.6498781+08:00;True|2023-12-02T14:29:46.1910954+08:00;True|2023-11-15T09:23:23.1277615+08:00;True|2023-11-13T11:14:23.7047654+08:00;True|2023-11-07T15:28:54.3174797+08:00;True|2023-10-27T13:22:55.8696581+08:00;True|2023-10-21T18:17:31.4681547+08:00;True|2023-10-18T17:29:57.6963038+08:00;True|2023-09-15T12:09:34.4888678+08:00;True|2023-09-14T15:15:33.6113596+08:00;True|2023-08-21T13:09:54.7440181+08:00;True|2023-07-25T15:08:42.3375388+08:00;True|2023-07-17T10:31:53.5181752+08:00;True|2023-07-17T10:31:44.6652344+08:00;True|2023-07-13T12:10:11.2591498+08:00;True|2023-05-25T18:02:16.3580168+08:00;True|2023-05-25T15:44:32.4909866+08:00;</History>
    <History>True|2024-03-30T06:43:35.7624433Z;True|2024-03-24T16:04:31.1520708+08:00;True|2024-03-20T13:28:31.4429012+08:00;True|2024-03-08T16:08:21.6186021+08:00;True|2024-01-27T09:16:19.1123592+08:00;True|2024-01-21T14:04:53.3821335+08:00;True|2024-01-20T18:00:33.8425629+08:00;True|2024-01-20T17:58:31.8270324+08:00;True|2024-01-20T12:19:49.4239246+08:00;True|2024-01-14T13:50:48.6498781+08:00;True|2023-12-02T14:29:46.1910954+08:00;True|2023-11-15T09:23:23.1277615+08:00;True|2023-11-13T11:14:23.7047654+08:00;True|2023-11-07T15:28:54.3174797+08:00;True|2023-10-27T13:22:55.8696581+08:00;True|2023-10-21T18:17:31.4681547+08:00;True|2023-10-18T17:29:57.6963038+08:00;True|2023-09-15T12:09:34.4888678+08:00;True|2023-09-14T15:15:33.6113596+08:00;True|2023-08-21T13:09:54.7440181+08:00;True|2023-07-25T15:08:42.3375388+08:00;True|2023-07-17T10:31:53.5181752+08:00;True|2023-07-17T10:31:44.6652344+08:00;True|2023-07-13T12:10:11.2591498+08:00;True|2023-05-25T18:02:16.3580168+08:00;True|2023-05-25T15:44:32.4909866+08:00;</History>
  </PropertyGroup>
</Project>

 Yw.Application.Unit.Core/Yw.Application.Unit.Core.csproj

@@ -7,7 +7,7 @@
    <RootNamespace>Yw.Application</RootNamespace>
    <GenerateDocumentationFile>True</GenerateDocumentationFile>
    <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
    <Version>3.0.0</Version>
    <Version>3.0.1</Version>
    <Description>引用升级</Description>
  </PropertyGroup>

@@ -33,8 +33,8 @@
  </ItemGroup>

  <ItemGroup>
    <PackageReference Include="Yw.Application.Core" Version="3.0.1" />
    <PackageReference Include="Yw.Dto.Unit.Core" Version="3.0.0" />
    <PackageReference Include="Yw.Application.Core" Version="3.0.5" />
    <PackageReference Include="Yw.Dto.Unit.Core" Version="3.0.1" />
  </ItemGroup>

</Project>

 Yw.Dto.Unit.Core/Properties/PublishProfiles/FolderProfile.pubxml.user

@@ -4,6 +4,6 @@
-->
<Project>
  <PropertyGroup>
    <History>True|2024-03-24T07:58:01.8436381Z;True|2024-03-20T13:14:26.0945194+08:00;</History>
    <History>True|2024-03-30T06:42:12.5290823Z;True|2024-03-24T15:58:01.8436381+08:00;True|2024-03-20T13:14:26.0945194+08:00;</History>
  </PropertyGroup>
</Project>

 Yw.Dto.Unit.Core/Yw.Dto.Unit.Core.csproj

@@ -4,12 +4,12 @@
    <TargetFramework>net6.0</TargetFramework>
    <ImplicitUsings>enable</ImplicitUsings>
    <Nullable>disable</Nullable>
    <Version>3.0.0</Version>
    <Version>3.0.1</Version>
  </PropertyGroup>

  <ItemGroup>
    <PackageReference Include="Yw.Dto.Core" Version="3.0.1" />
    <PackageReference Include="Yw.Service.Unit.Core" Version="3.0.0" />
    <PackageReference Include="Yw.Dto.Core" Version="3.0.5" />
    <PackageReference Include="Yw.Service.Unit.Core" Version="3.0.1" />
  </ItemGroup>

</Project>

 Yw.Service.Unit.Core/02-model/01-lang/SysUnitLang.cs

@@ -3,7 +3,7 @@
    /// <summary>
    /// ç³»ç»Ÿå•ä½è¯­è¨€
    /// </summary>
    public class SysUnitLang : BaseModel, System.ICloneable
    public class SysUnitLang : BaseModel, ICode, ISorter, System.ICloneable
    {
        /// <summary>
        /// 

 Yw.Service.Unit.Core/02-model/02-type/SysUnitType.cs

@@ -3,7 +3,7 @@
    /// <summary>
    /// ç³»ç»Ÿå•ä½ç±»åž‹
    /// </summary>
    public class SysUnitType : BaseModel, System.ICloneable
    public class SysUnitType : BaseModel, ICode, ISorter, System.ICloneable
    {
        /// <summary>
        /// 

 Yw.Service.Unit.Core/02-model/03-value/SysUnitValue.cs

@@ -3,7 +3,7 @@
    /// <summary>
    /// ç³»ç»Ÿå•ä½å€¼
    /// </summary>
    public class SysUnitValue : BaseModel, System.ICloneable
    public class SysUnitValue : BaseModel, ICode, ISorter, System.ICloneable
    {
        /// <summary>
        /// 

 Yw.Service.Unit.Core/03-settings/paras/Paras_Unit.cs

@@ -10,5 +10,10 @@
        /// æ•°æ®åº“
        /// </summary>
        public Paras_Unit_DataBase DataBase { get; set; }

        /// <summary>
        /// CAL
        /// </summary>
        public Paras_Unit_CAL CAL { get; set; }
    }
}

 Yw.Service.Unit.Core/03-settings/paras/Paras_Unit_CAL.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,26 @@
namespace Yw.Settings
{
    /// <summary>
    /// 
    /// </summary>
    public class Paras_Unit_CAL
    {
        /// <summary>
        /// CAL类型
        /// </summary>
        public string CALType { get; set; }

        /// <summary>
        /// HttpClient
        /// </summary>
        public Paras_Unit_CAL_HttpClient HttpClient { get; set; }

        /// <summary>
        /// LocalClient
        /// </summary>
        public Paras_Unit_CAL_LocalClient LocalClient { get; set; }


    }

}

 Yw.Service.Unit.Core/03-settings/paras/Paras_Unit_CAL_HttpClient.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,13 @@
namespace Yw.Settings
{
    /// <summary>
    /// 
    /// </summary>
    public class Paras_Unit_CAL_HttpClient
    {
        /// <summary>
        /// 
        /// </summary>
        public string HttpUrl { get; set; }
    }
}

 Yw.Service.Unit.Core/03-settings/paras/Paras_Unit_CAL_LocalClient.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,10 @@
namespace Yw.Settings
{
    /// <summary>
    /// 
    /// </summary>
    public class Paras_Unit_CAL_LocalClient
    {

    }
}

 Yw.Service.Unit.Core/Properties/PublishProfiles/FolderProfile.pubxml.user

@@ -4,6 +4,6 @@
-->
<Project>
  <PropertyGroup>
    <History>True|2024-03-24T07:57:00.6285019Z;True|2024-03-20T20:29:28.4545096+08:00;True|2024-03-20T11:57:05.1553144+08:00;True|2024-03-08T16:07:15.2641115+08:00;True|2024-01-21T14:04:10.1964644+08:00;True|2024-01-20T17:53:52.5924005+08:00;True|2024-01-20T12:18:53.6738460+08:00;True|2024-01-14T13:38:56.7132086+08:00;True|2023-12-02T14:19:36.0851107+08:00;True|2023-11-13T11:13:38.2876503+08:00;True|2023-11-07T15:26:15.8664916+08:00;True|2023-10-27T13:21:57.8245827+08:00;True|2023-10-21T18:15:57.8975745+08:00;True|2023-10-18T17:28:42.7347523+08:00;True|2023-09-15T12:08:33.6892307+08:00;True|2023-09-14T15:13:47.6095636+08:00;True|2023-08-21T13:08:28.2298969+08:00;True|2023-07-17T10:30:15.0370305+08:00;True|2023-07-13T11:54:33.7989040+08:00;True|2023-07-13T11:54:23.3967174+08:00;True|2023-07-06T09:49:52.7407983+08:00;True|2023-05-25T15:37:23.5406830+08:00;False|2023-05-25T15:36:09.3589239+08:00;</History>
    <History>True|2024-03-30T06:40:53.5629250Z;True|2024-03-24T15:57:00.6285019+08:00;True|2024-03-20T20:29:28.4545096+08:00;True|2024-03-20T11:57:05.1553144+08:00;True|2024-03-08T16:07:15.2641115+08:00;True|2024-01-21T14:04:10.1964644+08:00;True|2024-01-20T17:53:52.5924005+08:00;True|2024-01-20T12:18:53.6738460+08:00;True|2024-01-14T13:38:56.7132086+08:00;True|2023-12-02T14:19:36.0851107+08:00;True|2023-11-13T11:13:38.2876503+08:00;True|2023-11-07T15:26:15.8664916+08:00;True|2023-10-27T13:21:57.8245827+08:00;True|2023-10-21T18:15:57.8975745+08:00;True|2023-10-18T17:28:42.7347523+08:00;True|2023-09-15T12:08:33.6892307+08:00;True|2023-09-14T15:13:47.6095636+08:00;True|2023-08-21T13:08:28.2298969+08:00;True|2023-07-17T10:30:15.0370305+08:00;True|2023-07-13T11:54:33.7989040+08:00;True|2023-07-13T11:54:23.3967174+08:00;True|2023-07-06T09:49:52.7407983+08:00;True|2023-05-25T15:37:23.5406830+08:00;False|2023-05-25T15:36:09.3589239+08:00;</History>
  </PropertyGroup>
</Project>

 Yw.Service.Unit.Core/Yw.Service.Unit.Core.csproj

@@ -7,7 +7,7 @@
        <RootNamespace>Yw</RootNamespace>
        <GenerateDocumentationFile>True</GenerateDocumentationFile>
        <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
        <Version>3.0.0</Version>
        <Version>3.0.1</Version>
        <Description>引用升级</Description>
    </PropertyGroup>

@@ -31,7 +31,7 @@
      <PackageReference Include="Yw.DAL.SQLite.Core" Version="3.0.0" />
      <PackageReference Include="Yw.DALFactory.Core" Version="3.0.0" />
      <PackageReference Include="Yw.DynamicExpresso.Core" Version="3.0.0" />
      <PackageReference Include="Yw.Service.Core" Version="3.0.0" />
      <PackageReference Include="Yw.Service.Core" Version="3.0.2" />
    </ItemGroup>

    <ItemGroup>

 Yw.Service.Unit.Core/paras_unit_settings.json

@@ -11,6 +11,14 @@
      "SQLite": {
        "ConnectString": "Data Source=yw_unit.db;"
      }
    },
    "CAL": {
      "CALType": "HttpClient", //HttpClient、LocalClient
      "HttpClient": {
        "HttpUrl": "http://47.100.245.85:8190"
      },
      "LocalClient": {
      }
    }
  }