1. 雪花ID使用配置项

2. 使用自定义日志格式 3. 修复数据模型和新建流程的bug
2023-03-14 20:36:51 +08:00
parent 1d73df3235
commit a4ed390e82
12 changed files with 445 additions and 397 deletions
--- a/apihost/Tnb.API.Entry/Configurations/AppSetting.json
+++ b/apihost/Tnb.API.Entry/Configurations/AppSetting.json
@@ -1,7 +1,7 @@
 {
  "AppSettings": {
    "InjectMiniProfiler": true,
-    "SupportPackageNamePrefixs": ["Tnb"]
+    "SupportPackageNamePrefixs": [ "Tnb" ]
  },
  "Kestrel": {
    "Endpoints": {
@@ -9,5 +9,13 @@
        "Url": "http://localhost:9231"
      }
    }
+  },
+  "YitId": {
+    "WorkerId": 1, //必须 全局唯一,必须 程序设定,理论最大值 2^WorkerIdBitLength-1
+    "WorkerIdBitLength": 4, //机器码位长,决定 WorkerId 的最大值,默认值6,取值范围 [1, 16]
+    "SeqBitLength": 4 //序列数位长,默认值6,取值范围 [3, 21](建议不小于4),决定每毫秒基础生成的ID个数
+  },
+  "UnifyResultSettings": {
+    "ShowExceptionDetail": true
  }
 }
--- a/apihost/Tnb.API.Entry/Configurations/ConnectionStrings.json
+++ b/apihost/Tnb.API.Entry/Configurations/ConnectionStrings.json
@@ -1,7 +1,7 @@
 {
  "ConnectionStrings": {
    "ConfigId": "default",
-    "DBName": "tnb",
+    "DBName": "tnb_bas",
    "DBType": "PostgreSQL", //MySql;SqlServer;Oracle;PostgreSQL;Dm;Kdbndp;Sqlite;
    "Host": "localhost",
    "Port": "9202",
@@ -17,7 +17,7 @@
    //"DefaultConnection": "Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=192.168.0.19)(PORT=1521))(CONNECT_DATA=(SERVER = DEDICATED)(SERVICE_NAME=JNPFCLOUD)));User Id=JNPFCLOUD;Password=JNPFCLOUD"
    //PostgreSQL
    //"DefaultConnection": "PORT=5432;DATABASE=java_boot_dev_postgresql;HOST=192.168.0.103;PASSWORD=123456;USER ID=postgres"
-    "DefaultConnection": "server=localhost;port=9202;database=tnb;uid=totong;pwd=IPANyxGSKxIXg0dBM;pooling=true;"
+    "DefaultConnection": "server=localhost;port=9202;database=tnb_bas;uid=totong;pwd=IPANyxGSKxIXg0dBM;pooling=true;"
    //MySql
    //"DefaultConnection": "server=192.168.0.10;Database=netcore_test;Uid=netcore_test;Pwd=jhpGB3A88CF57fBC;AllowLoadLocalInfile=true"
  }
--- a/apihost/Tnb.API.Entry/Extensions/SqlSugarConfigureExtensions.cs
+++ b/apihost/Tnb.API.Entry/Extensions/SqlSugarConfigureExtensions.cs
@@ -1,6 +1,8 @@
 using System.ComponentModel.DataAnnotations;
 using System.Reflection;
 using JNPF;
+using JNPF.Logging;
+using Spire.Xls;
 using SqlSugar;

 namespace Microsoft.Extensions.DependencyInjection;
@@ -49,21 +51,21 @@ public static class SqlSugarConfigureExtensions
          //  // 打印SQL语句
          //  db.Aop.OnLogExecuting = (sql, pars) =>
          //    {
-            //        if (sql.StartsWith("SELECT", StringComparison.OrdinalIgnoreCase))
+          //      var oldColor = Console.ForegroundColor;
          //      Console.ForegroundColor = ConsoleColor.Green;
-            //        if (sql.StartsWith("UPDATE", StringComparison.OrdinalIgnoreCase) || sql.StartsWith("INSERT", StringComparison.OrdinalIgnoreCase))
-            //            Console.ForegroundColor = ConsoleColor.White;
-            //        if (sql.StartsWith("DELETE", StringComparison.OrdinalIgnoreCase))
-            //            Console.ForegroundColor = ConsoleColor.Blue;
-            //        Console.WriteLine("【" + DateTime.Now + "——执行SQL】\r\n" + UtilMethods.GetSqlString(config.DbType, sql, pars) + "\r\n");
-            //        App.PrintToMiniProfiler("SqlSugar", "Info", sql + "\r\n" + db.Utilities.SerializeObject(pars.ToDictionary(it => it.ParameterName, it => it.Value)));
+          //      var finalSql = UtilMethods.GetSqlString(db.CurrentConnectionConfig.DbType, sql, pars);
+          //      Console.WriteLine($"【{DateTime.Now.ToString("HH:mm:ss.fff")}——SQL执行完成】{db.Ado.SqlExecutionTime.TotalMilliseconds} ms");
+          //      Console.WriteLine(finalSql);
+          //      Console.ForegroundColor = oldColor;
+          //      if (db.Ado.SqlExecutionTime.TotalMilliseconds > 3000)
+          //      {
+          //        Log.Warning($"慢查询: {db.Ado.SqlExecutionTime.TotalMilliseconds}ms, SQL: " + finalSql);
+          //      }
+          //      Console.WriteLine();
          //    };
          //  db.Aop.OnError = (ex) =>
          //    {
-            //        Console.ForegroundColor = ConsoleColor.Red;
-            //        var pars = db.Utilities.SerializeObject(((SugarParameter[])ex.Parametres).ToDictionary(it => it.ParameterName, it => it.Value));
-            //        Console.WriteLine("【" + DateTime.Now + "——错误SQL】\r\n" + UtilMethods.GetSqlString(config.DbType, ex.Sql, (SugarParameter[])ex.Parametres) + "\r\n");
-            //        App.PrintToMiniProfiler("SqlSugar", "Error", $"{ex.Message}{Environment.NewLine}{ex.Sql}{pars}{Environment.NewLine}");
+          //      Log.Error(UtilMethods.GetSqlString(db.CurrentConnectionConfig.DbType, ex.Sql, (SugarParameter[])ex.Parametres));
          //    };
          //});
        });
--- a/apihost/Tnb.API.Entry/Program.cs
+++ b/apihost/Tnb.API.Entry/Program.cs
@@ -1,3 +1,5 @@
+using JNPF.Common.Security;
+
 Serve.Run(RunOptions.Default
    .AddWebComponent<WebComponent>().WithArgs(args));

--- a/apihost/Tnb.API.Entry/Startup.cs
+++ b/apihost/Tnb.API.Entry/Startup.cs
@@ -24,6 +24,7 @@ using System.Xml;
 using System;
 using System.Text;
 using Top.Api;
+using JNPF.Common.Security;

 namespace JNPF.API.Entry;

@@ -207,6 +208,8 @@ public class Startup : AppStartup
      endpoints.MapControllerRoute(name: "default", pattern: "{controller=Home}/{action=Index}/{id?}");
    });

+    SnowflakeIdHelper.InitYitIdWorker();
+
    serviceProvider.GetRequiredService<ITimeTaskService>().StartTimerJob();
  }

@@ -226,7 +229,13 @@ public class Startup : AppStartup
  }
  private string LoggerFileFormat(LogMessage msg)
  {
-    return $"{LoggerLevelName(msg.LogLevel)} {msg.LogDateTime.ToString(DATEFORMAT)} {msg.ThreadId}# {msg.Message}";
+    var txt = $"{LoggerLevelName(msg.LogLevel)} {msg.LogDateTime.ToString(DATEFORMAT)} {msg.ThreadId}# {msg.Message}";
+    if (msg.Exception != null)
+    {
+      //var EXCEPTION_SEPARATOR_WITHCOLOR = AppendWithColor(default, EXCEPTION_SEPARATOR, logLevelColors).ToString();
+      txt += $"{Environment.NewLine}{msg.Exception}";
+    }
+    return txt;
  }
  private string LoggerConsoleFormat(LogMessage msg)
  {
@@ -236,7 +245,12 @@ public class Startup : AppStartup
      LogLevel.Error => "\u001b[1m\u001b[31m",
      _ => "\u001b[39m\u001b[22m"
    };
-    return $"{fclr}{LoggerLevelName(msg.LogLevel)}\u001b[49m \u001b[36m{msg.LogDateTime.ToString(DATEFORMAT)}\u001b[49m \u001b[39m\u001b[22m{msg.ThreadId}#\u001b[49m {fclr}{msg.Message}\u001b[49m";
+    var txt = $"{fclr}{LoggerLevelName(msg.LogLevel)}\u001b[49m \u001b[36m{msg.LogDateTime.ToString(DATEFORMAT)}\u001b[49m \u001b[39m\u001b[22m{msg.ThreadId}#\u001b[49m {fclr}{msg.Message}\u001b[49m";
+    if (msg.Exception != null)
+    {
+      //var EXCEPTION_SEPARATOR_WITHCOLOR = AppendWithColor(default, EXCEPTION_SEPARATOR, logLevelColors).ToString();
+      txt += $"{Environment.NewLine}{fclr}{msg.Exception}\u001b[49m";
+    }
+    return txt;
  }
-
 }
--- a/apihost/Tnb.API.Entry/Tnb.API.Entry.csproj
+++ b/apihost/Tnb.API.Entry/Tnb.API.Entry.csproj
@@ -8,7 +8,7 @@
    <SatelliteResourceLanguages>none</SatelliteResourceLanguages>
  </PropertyGroup>
  
-  <ItemGroup>
+  <!--<ItemGroup>
    <None Remove="lib\regworkerid_lib_v1.3.1\yitidgengo.dll" />
    <None Remove="lib\regworkerid_lib_v1.3.1\yitidgengo.so" />
    <None Remove="sensitive-words.txt" />
@@ -18,7 +18,7 @@
    <EmbeddedResource Include="lib\regworkerid_lib_v1.3.1\yitidgengo.dll" />
    <EmbeddedResource Include="lib\regworkerid_lib_v1.3.1\yitidgengo.so" />
    <EmbeddedResource Include="sensitive-words.txt" />
-  </ItemGroup>
+  </ItemGroup>-->

  <ItemGroup>
    <PackageReference Include="IGeekFan.AspNetCore.Knife4jUI" Version="0.0.13" />
@@ -42,10 +42,4 @@
    </Content>
  </ItemGroup>

-
-
-
-
-
-
 </Project>
--- a/apihost/Tnb.API.Entry/_install.bat
+++ b/apihost/Tnb.API.Entry/_install.bat
@@ -0,0 +1,25 @@
+@echo off
+%1 %2
+ver|find "5.">nul&&goto :Admin
+mshta vbscript:createobject("shell.application").shellexecute("%~s0","goto :Admin","","runas",1)(window.close)&goto :eof
+
+:Admin
+cd /d %~dp0
+echo --------------------------------
+echo 1 --- install
+echo 2 --- uninstall
+echo --------------------------------
+setlocal
+    set svcName=ToTong.TNB.Master
+    set binPath=Tnb.API.Entry.exe
+    set /p mode=input number to choise: 
+    if %mode%==1 (
+        sc create %svcName% binpath=%~dp0%binPath% displayname=%svcName% start= auto  
+        sc description %svcName% %svcName%
+        net start %svcName%
+    ) else if %mode%==2 (
+        net stop %svcName%
+        sc delete %svcName%
+    )
+endlocal
+pause
--- a/common/Tnb.Common.Core/Manager/DataBase/DataBaseManager.cs
+++ b/common/Tnb.Common.Core/Manager/DataBase/DataBaseManager.cs
@@ -28,7 +28,7 @@ public class DataBaseManager : IDataBaseManager, ITransient
    /// <summary>
    /// 初始化客户端.
    /// </summary>
-    private static SqlSugarScope? _sqlSugarClient;
+    private static SqlSugarScope _sqlSugarClient;

    /// <summary>
    /// 用户管理器.
@@ -785,7 +785,7 @@ public class DataBaseManager : IDataBaseManager, ITransient
                sb.Append(@"select a.relname F_TABLE,a.n_live_tup F_SUM,b.description F_TABLENAME from sys_stat_user_tables a left outer join sys_description b on a.relid = b.objoid where a.schemaname='public' and b.objsubid='0'");
                break;
            case "postgresql":
-                sb.Append(@"select cast(relname as varchar) as F_TABLE,reltuples as F_SUM, cast(obj_description(relfilenode,'pg_class') as varchar) as F_TABLENAME from pg_class c inner join pg_namespace n on n.oid = c.relnamespace and nspname='public' inner join pg_tables z on z.tablename=c.relname where relkind = 'r' and relname not like 'pg_%' and relname not like 'sql_%' and schemaname='public' order by relname");
+                sb.Append(@"select cast(relname as varchar) as F_TABLE, cast(reltuples as varchar) as F_SUM, cast(obj_description(relfilenode,'pg_class') as varchar) as F_TABLENAME from pg_class c inner join pg_namespace n on n.oid = c.relnamespace and nspname='public' inner join pg_tables z on z.tablename=c.relname where relkind = 'r' and relname not like 'pg_%' and relname not like 'sql_%' and schemaname='public' order by relname");
                break;
            default:
                throw new Exception("不支持");
--- a/common/Tnb.Common/Security/SnowflakeIdHelper.cs
+++ b/common/Tnb.Common/Security/SnowflakeIdHelper.cs
@@ -1,5 +1,7 @@
 using System.Runtime.InteropServices;
 using JNPF.Common.Cache;
+using JNPF.Common.Const;
+using JNPF.FriendlyException;
 using Yitter.IdGenerator;

 namespace JNPF.Common.Security;
@@ -31,9 +33,27 @@ public class SnowflakeIdHelper
  private static extern int Validate(int workerId);

  /// <summary>
-    /// 缓存配置.
+  /// 初始化YitId配置
  /// </summary>
-    private static CacheOptions _cacheOptions = App.GetConfig<CacheOptions>("Cache", true);
+  public static void InitYitIdWorker()
+  {
+    //var option = new IdGeneratorOptions
+    //{
+    //  WorkerId = 1, //必须 全局唯一,必须 程序设定,理论最大值 2^WorkerIdBitLength-1
+    //  //BaseTime = new DateTime(2023, 1, 1, 0, 0, 0, DateTimeKind.Utc), //用生成ID时的系统时间与基础时间的差值(毫秒数)作为生成ID的时间戳
+    //  WorkerIdBitLength = 16, //机器码位长,决定 WorkerId 的最大值,默认值6,取值范围 [1, 16]
+    //  //SeqBitLength = 4, //序列数位长,默认值6,取值范围 [3, 21](建议不小于4),决定每毫秒基础生成的ID个数
+    //  //MinSeqNumber = 5, //最小序列数,默认值5,取值范围 [5, MaxSeqNumber]
+    //  //MaxSeqNumber 最大序列数，设置范围 [MinSeqNumber, 2^SeqBitLength-1]，默认值0
+    //};
+    var option = App.GetConfig<IdGeneratorOptions>("YitId");
+    if (option.WorkerId == 0)
+    {
+      CacheOptions _cacheOptions = App.GetConfig<CacheOptions>("Cache", true);
+      option.WorkerId = RegisterOne(_cacheOptions.ip, _cacheOptions.port, _cacheOptions.password, 63);
+    }
+    YitIdHelper.SetIdGenerator(option);
+  }

  /// <summary>
  /// 生成ID.
@@ -41,27 +61,6 @@ public class SnowflakeIdHelper
  /// <returns></returns>
  public static string NextId()
  {
-        // 这个if判断在高并发的情况下可能会有问题
-        if (YitIdHelper.IdGenInstance == null)
-        {
-            UnRegister();
-
-            // 如果不用自动注册WorkerId的话，直接传一个数值就可以了
-            var workerId = RegisterOne(_cacheOptions.ip, _cacheOptions.port, _cacheOptions.password, 63);
-
-            // 创建 IdGeneratorOptions 对象，可在构造函数中输入 WorkerId：
-            var options = new IdGeneratorOptions(workerId);
-            options.WorkerIdBitLength = 16; // 默认值6，限定 WorkerId 最大值为2^6-1，即默认最多支持64个节点。
-            options.SeqBitLength = 6; // 默认值6，限制每毫秒生成的ID个数。若生成速度超过5万个/秒，建议加大 SeqBitLength 到 10。
-            // options.BaseTime = Your_Base_Time; // 如果要兼容老系统的雪花算法，此处应设置为老系统的BaseTime。
-            // ...... 其它参数参考 IdGeneratorOptions 定义。
-
-            // 保存参数（务必调用，否则参数设置不生效）：
-            YitIdHelper.SetIdGenerator(options);
-
-            // 以上过程只需全局一次，且应在生成ID之前完成。
-        }
-
    return YitIdHelper.NextId().ToString();
  }
 }
--- a/common/Tnb.Common/Tnb.Common.csproj
+++ b/common/Tnb.Common/Tnb.Common.csproj
@@ -17,12 +17,16 @@
    <PackageReference Include="System.Diagnostics.PerformanceCounter" Version="6.0.0" />
    <PackageReference Include="System.Management" Version="6.0.0" />
    <PackageReference Include="NPOI" Version="2.5.5" />
-    <PackageReference Include="Tnb.SqlSugar" Version="2023.3.10.2014" />
    <PackageReference Include="UAParser" Version="3.1.47" />
    <PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />
    <PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="2.88.0" />
  </ItemGroup>

+  <ItemGroup>
+    <PackageReference Include="Tnb.SqlSugar" Version="2023.3.14.2031" />
+    <!--<ProjectReference Include="..\..\..\Tnb.Core\src\Tnb.SqlSugar\Tnb.SqlSugar.csproj" />-->
+  </ItemGroup>
+
  <!--<ItemGroup>
    <PackageReference Update="Roslynator.Analyzers" Version="4.1.0">
      <PrivateAssets>all</PrivateAssets>
--- a/system/Tnb.Systems/System/DataBaseService.cs
+++ b/system/Tnb.Systems/System/DataBaseService.cs
@@ -85,8 +85,6 @@ public class DataBaseService : IDynamicApiController, ITransient
  /// <returns></returns>
  [HttpGet("{id}/Tables")]
  public async Task<dynamic> GetList(string id, [FromQuery] KeywordInput input)
-    {
-        try
  {
    var link = await _dbLinkService.GetInfo(id);
    var tenantLink = link ?? _dataBaseManager.GetTenantDbLink(_userManager.TenantId, _userManager.TenantDbName);
@@ -100,11 +98,13 @@ public class DataBaseService : IDynamicApiController, ITransient
      GetTableCount(tables, tenantLink);
    }
    return new { list = tables.OrderBy(x => x.table).ToList() };
-        }
-        catch (Exception ex)
-        {
-            return new { list = new List<DatabaseTableListOutput>() };
-        }
+    //try
+    //{
+    //}
+    //catch (Exception ex)
+    //{
+    //    return new { list = new List<DatabaseTableListOutput>() };
+    //}
  }

  /// <summary>
--- a/workflow/Tnb.WorkFlow/Service/FlowTemplateService.cs
+++ b/workflow/Tnb.WorkFlow/Service/FlowTemplateService.cs
@@ -166,11 +166,11 @@ public class FlowTemplateService : IFlowTemplateService, IDynamicApiController,
    /// </summary>
    /// <param name="input">请求参数.</param>
    /// <returns></returns>
-    [HttpGet("{id}/FlowJsonList")]
+    [HttpGet("FlowJsonList/{id}")]
    public async Task<dynamic> GetFlowJsonList(string id, [FromQuery] FlowTemplateListQuery input)
    {
        var whereLambda = LinqExpression.And<FlowTemplateJsonEntity>();
-        whereLambda = whereLambda.And(x => x.DeleteMark == null && x.TemplateId == id);
+        whereLambda = whereLambda.And(x => x.DeleteMark == null && x.Id == id);
        var start = new DateTime();
        var end = new DateTime();
        if (input.endTime != null && input.startTime != null)