引用升级

lixiaojun

2024-09-12 02f362e1db42f4315cf923f7643b09150585c52c

引用升级

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

@@ -4,7 +4,7 @@
-->
<Project>
  <PropertyGroup>
    <History>True|2024-08-21T11:27:37.7910399Z;True|2024-08-21T19:27:19.7031491+08:00;True|2024-08-21T19:26:43.3721874+08:00;True|2024-08-10T10:11:45.4227932+08:00;True|2024-06-19T17:12:45.5095576+08:00;True|2024-06-02T18:16:08.6703355+08:00;True|2024-05-31T14:22:59.9089412+08:00;True|2024-05-21T14:19:57.0327597+08:00;True|2024-05-13T09:32:47.5202940+08:00;True|2024-05-08T15:06:02.4935916+08:00;True|2024-04-11T11:48:27.6911791+08:00;True|2024-04-03T09:21:17.2938358+08:00;True|2024-03-30T14:43:35.7624433+08:00;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>
    <History>True|2024-09-12T05:13:17.0661017Z;True|2024-08-21T19:27:37.7910399+08:00;True|2024-08-21T19:27:19.7031491+08:00;True|2024-08-21T19:26:43.3721874+08:00;True|2024-08-10T10:11:45.4227932+08:00;True|2024-06-19T17:12:45.5095576+08:00;True|2024-06-02T18:16:08.6703355+08:00;True|2024-05-31T14:22:59.9089412+08:00;True|2024-05-21T14:19:57.0327597+08:00;True|2024-05-13T09:32:47.5202940+08:00;True|2024-05-08T15:06:02.4935916+08:00;True|2024-04-11T11:48:27.6911791+08:00;True|2024-04-03T09:21:17.2938358+08:00;True|2024-03-30T14:43:35.7624433+08:00;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>
    <LastFailureDetails />
  </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.1.3</Version>
    <Version>3.1.5</Version>
    <Description>引用升级</Description>
  </PropertyGroup>

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

  <ItemGroup>
    <PackageReference Include="Yw.Application.Core" Version="3.1.1" />
    <PackageReference Include="Yw.Dto.Unit.Core" Version="3.1.2" />
    <PackageReference Include="Yw.Application.Core" Version="3.1.2" />
    <PackageReference Include="Yw.Dto.Unit.Core" Version="3.1.3" />
  </ItemGroup>

</Project>

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

@@ -4,7 +4,7 @@
-->
<Project>
  <PropertyGroup>
    <History>True|2024-08-21T11:25:46.5070173Z;True|2024-08-10T10:11:01.9884919+08:00;True|2024-06-19T17:12:05.8503765+08:00;True|2024-06-02T18:15:21.5081941+08:00;True|2024-05-31T14:22:14.7558274+08:00;True|2024-05-21T14:13:16.7771524+08:00;True|2024-05-13T09:32:01.1736078+08:00;True|2024-05-08T15:05:05.7504044+08:00;True|2024-05-08T15:04:50.5790715+08:00;True|2024-04-11T11:47:05.2985116+08:00;True|2024-04-03T09:20:17.1118683+08:00;True|2024-04-03T09:20:14.2889343+08:00;True|2024-03-30T14:42:12.5290823+08:00;True|2024-03-24T15:58:01.8436381+08:00;True|2024-03-20T13:14:26.0945194+08:00;</History>
    <History>True|2024-09-12T05:12:32.1162405Z;True|2024-08-21T19:25:46.5070173+08:00;True|2024-08-10T10:11:01.9884919+08:00;True|2024-06-19T17:12:05.8503765+08:00;True|2024-06-02T18:15:21.5081941+08:00;True|2024-05-31T14:22:14.7558274+08:00;True|2024-05-21T14:13:16.7771524+08:00;True|2024-05-13T09:32:01.1736078+08:00;True|2024-05-08T15:05:05.7504044+08:00;True|2024-05-08T15:04:50.5790715+08:00;True|2024-04-11T11:47:05.2985116+08:00;True|2024-04-03T09:20:17.1118683+08:00;True|2024-04-03T09:20:14.2889343+08:00;True|2024-03-30T14:42:12.5290823+08:00;True|2024-03-24T15:58:01.8436381+08:00;True|2024-03-20T13:14:26.0945194+08:00;</History>
    <LastFailureDetails />
  </PropertyGroup>
</Project>

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

@@ -4,13 +4,13 @@
    <TargetFramework>net6.0</TargetFramework>
    <ImplicitUsings>enable</ImplicitUsings>
    <Nullable>disable</Nullable>
    <Version>3.1.2</Version>
    <Version>3.1.3</Version>
    <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
  </PropertyGroup>

  <ItemGroup>
    <PackageReference Include="Yw.Dto.Core" Version="3.1.1" />
    <PackageReference Include="Yw.Service.Unit.Core" Version="3.1.0" />
    <PackageReference Include="Yw.Dto.Core" Version="3.1.2" />
    <PackageReference Include="Yw.Service.Unit.Core" Version="3.1.1" />
  </ItemGroup>

</Project>

 Yw.Service.Unit.Core/00-core/ConfigHelper.cs

@@ -10,26 +10,22 @@
        {
            get
            {
                //SnowFlakeSingle.WorkId = Settings.SqlSugar.SnowFlakeWorkId; ä¸åŒæœºå™¨é…ç½®çš„唯一数字; // å•æœåŠ¡å™¨ä¸éœ€è¦æŒ‡å®š
                return new ConnectionConfig()
                ConnectionConfig connectConfig = null;
                switch (UnitParasHelper.Unit.DataBase.DbType)
                {
                    DbType = SqlSugar.DbType.PostgreSQL,//数据库类型
                    ConnectionString = UnitParasHelper.Unit.DataBase.PostgreSql.ConnectString,
                    IsAutoCloseConnection = true,//是否自动关闭
                    MoreSettings = new ConnMoreSettings()
                    {
                        //PgSqlIsAutoToLower = false //数据库存在大写字段的 ï¼Œéœ€è¦æŠŠè¿™ä¸ªè®¾ä¸ºfalse ï¼Œå¹¶ä¸”实体和字段名称要一样
                    },
                    AopEvents = new AopEvents
                    {
                        OnLogExecuting = (sql, p) =>
                    case DbType.PostgreSql:
                        {
                            // var sqlString = UtilMethods.GetNativeSql(sql, p);
                            //LogHelper.Debug(sqlString);
                            // Console.WriteLine(sql);
                            connectConfig = PostgreSqlConnectionConfig;
                        }
                    }
                };
                        break;
                    case DbType.SQLite:
                        {
                            connectConfig = SQLiteConnectionConfig;
                        }
                        break;
                    default: break;
                }
                return connectConfig;
            }
        }


 Yw.Service.Unit.Core/00-core/DbType.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,18 @@
namespace Yw.Unit
{
    /// <summary>
    /// 
    /// </summary>
    internal class DbType
    {
        /// <summary>
        /// 
        /// </summary>
        public const string SQLite = "SQLite";

        /// <summary>
        /// 
        /// </summary>
        public const string PostgreSql = "PostgreSql";
    }
}

 Yw.Service.Unit.Core/01-entity/01-lang/SysUnitLang.cs

@@ -25,11 +25,13 @@
        /// <summary>
        /// åç§°
        /// </summary>
        [SugarColumn(Length = 50, IsNullable = true)]
        public string Name { get; set; }

        /// <summary>
        /// ç¼–码
        /// </summary>
        [SugarColumn(Length = 100, IsNullable = true)]
        public string Code { get; set; }

        /// <summary>
@@ -40,6 +42,7 @@
        /// <summary>
        /// è¯´æ˜Ž
        /// </summary>
        [SugarColumn(ColumnDataType = StaticConfig.CodeFirst_BigString, IsNullable = true)]
        public string Description { get; set; }

        /// <summary>

 Yw.Service.Unit.Core/01-entity/02-type/SysUnitType.cs

@@ -25,11 +25,13 @@
        /// <summary>
        /// åç§°
        /// </summary>
        [SugarColumn(Length = 50, IsNullable = true)]
        public string Name { get; set; }

        /// <summary>
        /// ç¼–码
        /// </summary>
        [SugarColumn(Length = 100, IsNullable = true)]
        public string Code { get; set; }

        /// <summary>
@@ -40,6 +42,7 @@
        /// <summary>
        /// è¯´æ˜Ž
        /// </summary>
        [SugarColumn(ColumnDataType = StaticConfig.CodeFirst_BigString, IsNullable = true)]
        public string Description { get; set; }

        /// <summary>

 Yw.Service.Unit.Core/01-entity/03-value/SysUnitValue.cs

@@ -31,11 +31,13 @@
        /// <summary>
        /// åç§°
        /// </summary>
        [SugarColumn(Length = 50, IsNullable = true)]
        public string Name { get; set; }

        /// <summary>
        /// ç¼–码
        /// </summary>
        [SugarColumn(Length = 100, IsNullable = true)]
        public string Code { get; set; }

        /// <summary>
@@ -46,6 +48,7 @@
        /// <summary>
        /// è¯´æ˜Ž
        /// </summary>
        [SugarColumn(ColumnDataType = StaticConfig.CodeFirst_BigString, IsNullable = true)]
        public string Description { get; set; }

        /// <summary>

 Yw.Service.Unit.Core/01-entity/04-name/SysUnitName.cs

@@ -34,6 +34,7 @@
        /// <summary>
        /// åç§°
        /// </summary>
        [SugarColumn(Length = 50, IsNullable = true)]
        public string Name { get; set; }

        /// <summary>

 Yw.Service.Unit.Core/01-entity/05-transfer/SysUnitTransfer.cs

@@ -42,6 +42,7 @@
        /// <summary>
        /// è®¡ç®—表达式
        /// </summary>
        [SugarColumn(Length = 500, IsNullable = true)]
        public string Expression { get; set; }

        /// <summary>

 Yw.Service.Unit.Core/05-service/00-core/04-helper/DbFirstHelper.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,74 @@
namespace Yw.Service.Unit
{
    /// <summary>
    ///
    /// </summary>
    public class DbFirstHelper
    {
        /// <summary>
        /// åˆå§‹åŒ–
        /// </summary>
        public static bool Initial(out string msg)
        {
            msg = string.Empty;
            try
            {

                var connectConfig = Yw.Unit.ConfigHelper.DefaultConnectionConfig;
                if (connectConfig == null)
                {
                    msg = "连接配置初始化失败";
                    return false;
                }

                connectConfig.ConfigureExternalServices = new ConfigureExternalServices()
                {
                    EntityService = (property, column) =>
                    {
                        //除主键外其他列都可空
                        if (!column.IsPrimarykey)
                        {
                            column.IsNullable = true;
                        }
                        if (column.DataType == StaticConfig.CodeFirst_BigString)
                        {
                            if (UnitParasHelper.Unit.DataBase.DbType == Yw.Unit.DbType.PostgreSql)
                            {
                                column.DataType = "character varying";
                            }
                        }
                    }
                };

                var typeList = new List<Type>()
                {
                    typeof(Entity.SysUnitLang),
                    typeof(Entity.SysUnitType),
                    typeof(Entity.SysUnitValue),
                    typeof(Entity.SysUnitName),
                    typeof(Entity.SysUnitTransfer)
                };

                using (var db = new SqlSugarClient(connectConfig))
                {
                    //设置字符串默认长度
                    //db.CodeFirst.SetStringDefaultLength(250);
                    //db.CodeFirst.SetStringDefaultLength(int.MaxValue);
                    //建库：如果不存在创建数据库存在不会重复创建 createdb;注意 ï¼šOracle和个别国产库需不支持该方法，需要手动建库
                    db.DbMaintenance.CreateDatabase();
                    db.CodeFirst.InitTables
                        (
                           typeList.ToArray()
                        );
                }

                return true;
            }
            catch (Exception ex)
            {
                msg = ex.Message;
                return false;
            }
        }
    }
}

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

@@ -4,7 +4,7 @@
-->
<Project>
  <PropertyGroup>
    <History>True|2024-08-21T11:24:24.2009409Z;True|2024-08-10T10:10:14.4201511+08:00;True|2024-06-19T17:11:04.1467179+08:00;True|2024-06-02T18:14:27.1302271+08:00;True|2024-05-31T14:21:25.9548888+08:00;True|2024-05-21T14:10:07.7011142+08:00;True|2024-04-11T11:46:08.7351336+08:00;True|2024-04-03T09:19:28.3206735+08:00;True|2024-03-30T14:40:53.5629250+08:00;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>
    <History>True|2024-09-12T05:10:47.2381661Z;True|2024-08-21T19:24:24.2009409+08:00;True|2024-08-10T10:10:14.4201511+08:00;True|2024-06-19T17:11:04.1467179+08:00;True|2024-06-02T18:14:27.1302271+08:00;True|2024-05-31T14:21:25.9548888+08:00;True|2024-05-21T14:10:07.7011142+08:00;True|2024-04-11T11:46:08.7351336+08:00;True|2024-04-03T09:19:28.3206735+08:00;True|2024-03-30T14:40:53.5629250+08:00;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>
    <LastFailureDetails />
  </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.1.0</Version>
        <Version>3.1.1</Version>
        <Description>引用升级</Description>
    </PropertyGroup>

@@ -27,11 +27,11 @@
    </ItemGroup>

    <ItemGroup>
      <PackageReference Include="Yw.DAL.PostgreSql.Core" Version="3.0.8" />
      <PackageReference Include="Yw.DAL.SQLite.Core" Version="3.0.8" />
      <PackageReference Include="Yw.DAL.PostgreSql.Core" Version="3.0.9" />
      <PackageReference Include="Yw.DAL.SQLite.Core" Version="3.0.9" />
      <PackageReference Include="Yw.DALFactory.Core" Version="3.0.5" />
      <PackageReference Include="Yw.DynamicExpresso.Core" Version="3.0.0" />
      <PackageReference Include="Yw.Service.Core" Version="3.0.7" />
      <PackageReference Include="Yw.Service.Core" Version="3.0.8" />
    </ItemGroup>

    <ItemGroup>