SimpleDapper导入

1 year ago · 0f0aa4ef34
parent b9461aefdc
commit 0f0aa4ef34
8 changed files with 417 additions and 322 deletions
--- a/Lib/SimpleDapper.dll
+++ b/Lib/SimpleDapper.dll
--- a/Tiobon.Core.Api/Controllers/TestController.cs
+++ b/Tiobon.Core.Api/Controllers/TestController.cs
@ -0,0 +1,26 @@
+using System.Data;
+using SimpleDapper;
+
+namespace Tiobon.Core.Api.Controllers;
+
+/// <summary>
+/// Ghra_Grade
+/// </summary>
+[Route("api/[controller]")]
+[ApiController, GlobalActionFilter]
+[Authorize(Permissions.Name), ApiExplorerSettings(GroupName = Grouping.GroupName_Ghra)]
+public class TestController : BaseController<IGhra_GradeServices, Ghra_Grade, Ghra_GradeDto, InsertGhra_GradeInput, EditGhra_GradeInput>
+{
+    public TestController(IGhra_GradeServices service) : base(service)
+    {
+    }
+
+    [HttpGet]
+    public async Task<ServiceResult> Test()
+    {
+
+        string sql = "SELECT * FROM Ghra_Grade";
+        DataTable dt = await DbAccess.GetDataTableAsync(sql);
+        return Success();
+    }
+}
--- a/Tiobon.Core.Api/Program.cs
+++ b/Tiobon.Core.Api/Program.cs
@ -9,6 +9,7 @@ using Microsoft.IdentityModel.Logging;
 using Newtonsoft.Json.Converters;
 using Newtonsoft.Json.Serialization;
 using Serilog;
+using SimpleDapper.Extensions;
 using Tiobon.Core;
 using Tiobon.Core.Common.Core;
 using Tiobon.Core.Extensions;
@ -55,6 +56,7 @@ builder.Services.AddCacheSetup();
 builder.Services.AddSqlsugarSetup();
 builder.Services.AddDbSetup();
 builder.Services.AddInitializationHostServiceSetup();
+builder.Services.AddSimpleDapperSetup();

 builder.Host.AddSerilogSetup();

--- a/Tiobon.Core.Api/Tiobon.Core.Api.csproj
+++ b/Tiobon.Core.Api/Tiobon.Core.Api.csproj
@ -108,6 +108,12 @@
    <ProjectReference Include="..\Tiobon.Core.Extensions\Tiobon.Core.Extensions.csproj" />
  </ItemGroup>

+  <ItemGroup>
+    <Reference Include="SimpleDapper">
+      <HintPath>..\Lib\SimpleDapper.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+
  <ProjectExtensions>
    <VisualStudio>
      <UserProperties appsettings_1json__JsonSchema="" />
--- a/Tiobon.Core.Api/Tiobon.Core.xml
+++ b/Tiobon.Core.Api/Tiobon.Core.xml
@ -1593,6 +1593,11 @@
            </summary>
            <returns></returns>
        </member>
+        <member name="T:Tiobon.Core.Api.Controllers.TestController">
+            <summary>
+            Ghra_Grade
+            </summary>
+        </member>
        <member name="T:Tiobon.Core.Api.Filter.GlobalActionFilter">
            <summary>
            全局请求验证
--- a/Tiobon.Core.Tests/Common_Test/DbAccess_Should.cs
+++ b/Tiobon.Core.Tests/Common_Test/DbAccess_Should.cs
@ -0,0 +1,27 @@
+using System.Data;
+using SimpleDapper;
+using Tiobon.Core.Model.Models;
+using Xunit;
+
+namespace Tiobon.Core.Tests.Common_Test
+{
+    public class DbAccess_Should
+    {
+
+        [Fact]
+        public async void Test()
+        {
+            AppSetting.Init();
+
+            string sql = "SELECT * FROM Ghra_Grade";
+            DataTable dt = await DbAccess.GetDataTableAsync(sql);
+
+            //var list = await DbAccess.QueryListAsync<Ghra_Grade>(sql);
+
+            //var entity = new Ghra_Grade();
+            //DbAccess.Add(entity);
+
+        }
+         
+    }
+}
--- a/Tiobon.Core.Tests/Tiobon.Core.Tests.csproj
+++ b/Tiobon.Core.Tests/Tiobon.Core.Tests.csproj
@ -18,10 +18,11 @@
  </ItemGroup>

  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="Moq" Version="4.20.69" />
-    <PackageReference Include="xunit" Version="2.6.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="Moq" Version="4.20.70" />
+    <PackageReference Include="System.Data.SqlClient" Version="4.8.6" />
+    <PackageReference Include="xunit" Version="2.7.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.8">
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>
@ -31,6 +32,12 @@
    <ProjectReference Include="..\Tiobon.Core.Api\Tiobon.Core.Api.csproj" />
  </ItemGroup>

+  <ItemGroup>
+    <Reference Include="SimpleDapper">
+      <HintPath>..\Lib\SimpleDapper.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+
  <ItemGroup>
    <None Update="WMBlog.db">
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
--- a/Tiobon.Core.Tests/appsettings.json
+++ b/Tiobon.Core.Tests/appsettings.json
@ -23,11 +23,12 @@
        "InstanceName": "" //前缀
    },
    "RabbitMQ": {
-    "Enabled": false,
-    "Connection": "118.25.251.13",
-    "UserName": "",
-    "Password": "!",
-    "RetryCount": 3
+        "Enabled": true,
+        "Connection": "101xxxx57",
+        "UserName": "xxxx",
+        "Password": "xxxxx",
+        "Port": "5672",
+        "RetryCount": 2
    },
    "Kafka": {
        "Enabled": false,
@ -73,8 +74,8 @@
            }
        },
        "Date": "2018-08-28",
-    "SeedDBEnabled": true, //只生成表结构
-    "SeedDBDataEnabled": true, //生成表,并初始化数据
+        "SeedDBEnabled": false, //只生成表结构
+        "SeedDBDataEnabled": false, //生成表,并初始化数据
        "Author": "Tiobon.Core",
        "SvcName": "", // /svc/Tiobon
        "UseLoadTest": false
@ -90,7 +91,7 @@
    //备用连接的ConnId配置为主库的ConnId+数字即可,比如主库的ConnId为Main,那么备用连接的ConnId为Mian1
    //主库、备用库无需数据库类型一致!
    //备用库不会有程序维护,需要手动维护
-  "MainDB": "Main", //当前项目的主库，所对应的连接字符串的Enabled必须为true
+    "MainDB": "WMTiobon_MSSQL_Main", //当前项目的主库，所对应的连接字符串的Enabled必须为true
    "DBS": [
        /*
      对应下边的 DBType
@ -102,10 +103,17 @@
      Dm = 5,//达梦
      Kdbndp = 6,//人大金仓
    */
+        {
+            "ConnId": "WMTiobon_MSSQL_Main",
+            "DBType": 1,
+            "Enabled": true,
+            "Connection": "Data Source=116.204.98.209;User ID=Tiobon;Password=&($!4UGUyU#$2sp9O;Database=Tiobon;Encrypt=True;TrustServerCertificate=True;",
+            "ProviderName": "System.Data.SqlClient"
+        },
        {
            "ConnId": "Main",
            "DBType": 2,
-      "Enabled": true,
+            "Enabled": false,
            "Connection": "WMTiobon.db", //sqlite只写数据库名就行
            "Slaves": [
                {
@ -117,7 +125,7 @@
        {
            "ConnId": "Main2",
            "DBType": 2,
-      "Enabled": true,
+            "Enabled": false,
            "Connection": "WMTiobon3.db", //sqlite只写数据库名就行
            "Slaves": [
                {
@ -128,10 +136,11 @@
        },
        {
            "ConnId": "Log", //日志库连接固定名称，不要改,其他的可以改
-      "DBType": 2,
+            "DBType": 1,
            "Enabled": true,
            "HitRate": 50,
-      "Connection": "WMTiobonLog.db" //sqlite只写数据库名就行
+            "Connection": "Data Source=116.204.98.209;User ID=Tiobon;Password=&($!4UGUyU#$2sp9O;Database=Tiobon;Encrypt=True;TrustServerCertificate=True;",
+            "ProviderName": "System.Data.SqlClient"
        },
        {
            "ConnId": "WMTiobon_MSSQL_1",
@ -181,8 +190,8 @@
    "Audience": {
        "Secret": "sdfsdfsrty45634kkhllghtdgdfss345t678fs", //不要太短，16位+
        "SecretFile": "C:\\my-file\\Tiobon.core.audience.secret.txt", //安全。内容就是Secret
-    "Issuer": "Tiobon.Core",
-    "Audience": "wr"
+        "Issuer": "Tiobon.Core", //这个值一定要在自己的项目里修改！！
+        "Audience": "wr" //这个值一定要在自己的项目里修改！！
    },
    "Mongo": {
        "ConnectionString": "mongodb://nosql.data",
@ -200,7 +209,6 @@
        "AppConfigAlert": {
            "Enabled": true
        },
-    "ApiName": "Tiobon.Core",
        "IdentityServer4": {
            "Enabled": false, // 这里默认是false，表示使用jwt，如果设置为true，则表示系统使用Ids4模式
            "AuthorizationUrl": "http://localhost:5004", // 认证中心域名
@ -265,10 +273,24 @@
        },
        "IpRateLimit": {
            "Enabled": true
+        },
+        "EncryptionResponse": {
+            "Enabled": true,
+            "AllApis": false,
+            "LimitApis": [
+                "/api/Login/GetJwtTokenSecret"
+            ]
+        },
+        "EncryptionRequest": {
+            "Enabled": true,
+            "AllApis": false,
+            "LimitApis": [
+                "/api/Login/GetJwtTokenSecret"
+            ]
        }
    },
    "IpRateLimiting": {
-    "EnableEndpointRateLimiting": true, //False: globally executed, true: executed for each
+        "EnableEndpointRateLimiting": false, //False: globally executed, true: executed for each
        "StackBlockedRequests": false, //False: Number of rejections should be recorded on another counter
        "RealIpHeader": "X-Real-IP",
        "ClientIdHeader": "X-ClientId",