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 {