版本更新，兼容CAL

lixiaojun

2024-04-01 a7aa312c22953f53aaae63c587b68a21c8e13556

版本更新，兼容CAL

 Yw.Application.Run.Core/01-configure/RunAnalyConfigure_Controller.cs

@@ -71,7 +71,7 @@
        {
            if (_service.IsExist(input.ObjectType, input.ObjectID))
            {
                throw YOops.Oh(eResultCode.Alert, ErrorCodes.V001, $"ObjectType:{input.ObjectType},ObjectID:{input.ObjectID} æ•°æ®å·²å­˜åœ¨");
                throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.V001, $"ObjectType:{input.ObjectType},ObjectID:{input.ObjectID} æ•°æ®å·²å­˜åœ¨");
            }
            var model = input.Adapt<AddRunAnalyConfigureInput, Model.RunAnalyConfigure>();
            var id = _service.Insert(model);
@@ -92,7 +92,7 @@
            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.RunAnalyConfigure(model);
            input.Adapt(rhs);
@@ -146,7 +146,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.Run.Core/Properties/PublishProfiles/FolderProfile.pubxml.user

@@ -4,6 +4,6 @@
-->
<Project>
  <PropertyGroup>
    <History>True|2024-03-26T01:54:08.7672773Z;True|2024-02-01T15:13:33.2518157+08:00;True|2024-01-27T11:05:20.5193198+08:00;True|2024-01-21T14:54:51.3939785+08:00;True|2024-01-08T17:00:51.0941947+08:00;True|2023-12-16T15:43:21.8065953+08:00;True|2023-12-11T11:56:46.3121435+08:00;True|2023-12-11T11:27:23.3317604+08:00;True|2023-12-11T11:27:14.6709240+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-04-01T03:40:26.8126073Z;True|2024-03-26T09:54:08.7672773+08:00;True|2024-02-01T15:13:33.2518157+08:00;True|2024-01-27T11:05:20.5193198+08:00;True|2024-01-21T14:54:51.3939785+08:00;True|2024-01-08T17:00:51.0941947+08:00;True|2023-12-16T15:43:21.8065953+08:00;True|2023-12-11T11:56:46.3121435+08:00;True|2023-12-11T11:27:23.3317604+08:00;True|2023-12-11T11:27:14.6709240+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.Run.Core/Yw.Application.Run.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>
  </PropertyGroup>

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

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

</Project>

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

@@ -4,6 +4,6 @@
-->
<Project>
  <PropertyGroup>
    <History>True|2024-03-26T01:51:34.4055575Z;</History>
    <History>True|2024-04-01T03:39:12.7290526Z;True|2024-03-26T09:51:34.4055575+08:00;</History>
  </PropertyGroup>
</Project>

 Yw.Dto.Run.Core/Yw.Dto.Run.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.Run.Core" Version="3.0.0" />
    <PackageReference Include="Yw.Dto.Core" Version="3.0.5" />
    <PackageReference Include="Yw.Service.Run.Core" Version="3.0.1" />
  </ItemGroup>

</Project>

 Yw.Service.Run.Core/03-settings/paras/Paras_Run.cs

@@ -35,5 +35,10 @@
        /// ä»»åŠ¡
        /// </summary>
        public Paras_Run_Task Task { get; set; }

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

 Yw.Service.Run.Core/03-settings/paras/Paras_Run_CAL.cs

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

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

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


    }

}

 Yw.Service.Run.Core/03-settings/paras/Paras_Run_CAL_HttpClient.cs

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

 Yw.Service.Run.Core/03-settings/paras/Paras_Run_CAL_LocalClient.cs

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

    }
}

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

@@ -4,6 +4,6 @@
-->
<Project>
  <PropertyGroup>
    <History>True|2024-03-26T01:45:14.8395625Z;True|2024-01-21T14:51:15.9123805+08:00;True|2024-01-08T16:59:10.2219250+08:00;True|2023-12-16T15:42:50.6196932+08:00;True|2023-12-11T11:51:25.0044564+08:00;True|2023-12-11T11:25:16.9392998+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-04-01T03:38:17.4702370Z;True|2024-03-26T09:45:14.8395625+08:00;True|2024-01-21T14:51:15.9123805+08:00;True|2024-01-08T16:59:10.2219250+08:00;True|2023-12-16T15:42:50.6196932+08:00;True|2023-12-11T11:51:25.0044564+08:00;True|2023-12-11T11:25:16.9392998+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.Run.Core/Yw.Service.Run.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,14 +31,13 @@
      <PackageReference Include="Yw.DAL.SQLite.Core" Version="3.0.0" />
      <PackageReference Include="Yw.DALFactory.Core" Version="3.0.0" />
      <PackageReference Include="Yw.ExchangeFactory.Core" Version="3.0.0" />
      <PackageReference Include="Yw.IDAL.Core" Version="3.0.0" />
      <PackageReference Include="Yw.LCacheFactory.Core" Version="3.0.0" />
      <PackageReference Include="Yw.Medis.Core" Version="3.0.0" />
      <PackageReference Include="Yw.MemoryQueue.Core" Version="3.0.0" />
      <PackageReference Include="Yw.QueueFactory.Core" Version="3.0.0" />
      <PackageReference Include="Yw.RabbitMq.Core" Version="3.0.0" />
      <PackageReference Include="Yw.Redis.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.Run.Core/paras_run_settings.json

@@ -45,6 +45,14 @@
    },
    "Task": {
      "Frequency": 60
    },
    "CAL": {
      "CALType": "HttpClient", //HttpClient、LocalClient
      "HttpClient": {
        "HttpUrl": "http://101.133.133.173:97"
      },
      "LocalClient": {
      }
    }
  }