From 7af54c3c396c42391abd20f491c07a945a4393dc Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Fri, 25 Aug 2023 15:14:35 +0800 Subject: [PATCH] update --- .../AuthServer/AuthServerHostModule.cs | 32 +- .../SettleAccount.HttpApi.Host/Startup.cs | 30 +- .../SettleAccount.HttpApi.Host/wwwroot/app.js | 2 +- .../wwwroot/components/form/form-input.js | 6 +- .../wwwroot/components/list/index.js | 1 + .../wwwroot/models/settle/commerce.js | 1 - .../wwwroot/router/business.js | 2 +- .../wwwroot/styles/site.css | 2 +- .../wwwroot/views/settle/_check.js | 8 +- .../Entities/BQ/VmiAppService.cs | 82 +- .../Entities/BQ/Vmi/VmiBalance.cs | 78 +- .../Entities/BQ/Vmi/VmiBalanceBase.cs | 83 + .../Entities/BQ/Vmi/VmiLog.cs | 79 +- .../Entities/BQ/Vmi/VmiReplenished.cs | 36 +- .../Entities/BQ/Vmi/VmiShardingRecord.cs | 2 + .../SettleAccount.Domain.csproj | 1 + .../OrderVirtualTableRoute.cs | 38 + .../SettleAccountDbContext.cs | 13 +- .../20230825061422_vmi15.Designer.cs | 5686 ++++++++++++++++ .../Migrations/20230825061422_vmi15.cs | 499 ++ .../20230825063729_vmi16.Designer.cs | 5842 +++++++++++++++++ .../Migrations/20230825063729_vmi16.cs | 849 +++ .../SettleAccountDbContextModelSnapshot.cs | 161 +- .../SettleAccount.EntityFrameworkCore.csproj | 1 + 24 files changed, 13294 insertions(+), 240 deletions(-) create mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Vmi/VmiBalanceBase.cs create mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/OrderVirtualTableRoute.cs create mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Migrations/20230825061422_vmi15.Designer.cs create mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Migrations/20230825061422_vmi15.cs create mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Migrations/20230825063729_vmi16.Designer.cs create mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Migrations/20230825063729_vmi16.cs diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/AuthServer/AuthServerHostModule.cs b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/AuthServer/AuthServerHostModule.cs index 3e71211a..c7f6e4bb 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/AuthServer/AuthServerHostModule.cs +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/AuthServer/AuthServerHostModule.cs @@ -67,22 +67,22 @@ namespace AuthServer.Host // options.Configuration = configuration["Redis:Configuration"]; //}); - context.Services.AddCors(options => - { - options.AddPolicy(DefaultCorsPolicyName, - builder => - { - builder.WithOrigins(configuration["App:CorsOrigins"] - .Split(",", StringSplitOptions.RemoveEmptyEntries) - .Select(o => o.RemovePostFix("/")) - .ToArray()) - .WithAbpExposedHeaders() - .SetIsOriginAllowedToAllowWildcardSubdomains() - .AllowAnyHeader() - .AllowAnyMethod() - .AllowCredentials(); - }); - }); + //context.Services.AddCors(options => + //{ + // options.AddPolicy(DefaultCorsPolicyName, + // builder => + // { + // builder.WithOrigins(configuration["App:CorsOrigins"] + // .Split(",", StringSplitOptions.RemoveEmptyEntries) + // .Select(o => o.RemovePostFix("/")) + // .ToArray()) + // .WithAbpExposedHeaders() + // .SetIsOriginAllowedToAllowWildcardSubdomains() + // .AllowAnyHeader() + // .AllowAnyMethod() + // .AllowCredentials(); + // }); + //}); Configure(options => { diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/Startup.cs b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/Startup.cs index 5ac1d194..461b0e19 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/Startup.cs +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/Startup.cs @@ -1,3 +1,4 @@ +using System; using System.IO.Compression; using System.Linq; using System.Text.RegularExpressions; @@ -9,16 +10,26 @@ using Microsoft.AspNetCore.ResponseCompression; using Microsoft.AspNetCore.Routing; using Microsoft.AspNetCore.Server.Kestrel.Core; using Microsoft.AspNetCore.StaticFiles; +using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using SettleAccount.Job.SignalR; +using ShardingCore; using Win.Sfs.SettleAccount.Entities.BQ; using Win.Sfs.SettleAccount.Entities.BQ.Syncs; +using Win.Sfs.SettleAccount.EntityFrameworkCore; namespace Win.Sfs.SettleAccount; public class Startup { + public Startup(IConfiguration configuration) + { + Configuration = configuration; + } + + public IConfiguration Configuration { get; } public void ConfigureServices(IServiceCollection services) { services.Configure(options => options.Level = CompressionLevel.Fastest); @@ -44,7 +55,24 @@ public class Startup services.AddSignalR(o => o.EnableDetailedErrors = true); JobHostdService.AddService(services); services.AddSingleton(); - services.AddHostedService(o => o.GetRequiredService()); + //services.AddHostedService(o => o.GetRequiredService()); + services.AddShardingDbContext() + .UseRouteConfig(options => options.AddShardingTableRoute()) + .UseConfig(op => + { + op.UseShardingQuery((connStr, builder) => + { + builder.UseSqlServer(connStr); + }); + op.UseShardingTransaction((connection, builder) => + { + //connection is delegate input param + builder.UseSqlServer(connection); + }); + //use your data base connection string + op.AddDefaultDataSource("SettleAccountService",Configuration.GetConnectionString("SettleAccountService")); + }) + .AddShardingCore(); services.AddRouting(options => options.ConstraintMap["slugify"] = typeof(SlugifyParameterTransformer)); services.AddMvc(options => options.Conventions.Add(new RouteTokenTransformerConvention(new SlugifyParameterTransformer()))); services.AddApplication(); diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/app.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/app.js index 49a2b872..aa78870f 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/app.js +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/app.js @@ -9,7 +9,7 @@ import { dayjs } from "element-plus"; export default { components: { ElConfigProvider }, template: html` - + `, diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/form/form-input.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/form/form-input.js index b4400236..848f81ac 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/form/form-input.js +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/form/form-input.js @@ -25,13 +25,13 @@ export default {