From 6ccbadd1ea5e0bd053a6923ffaf789b9b565d5ac Mon Sep 17 00:00:00 2001 From: Argo-Lenovo Date: Wed, 1 Jun 2022 17:02:34 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E6=9B=B4=E6=96=B0=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BootstrapAdmin.sln | 2 +- .../Extensions/ServiceCollectionExtensions.cs | 2 +- .../appsettings.Development.json | 241 +----------------- .../admin/BootstrapAdmin.Web/appsettings.json | 44 +--- .../appsettings.Development.json | 31 +-- .../BootstrapClient.Web/appsettings.json | 30 +-- 6 files changed, 6 insertions(+), 344 deletions(-) diff --git a/BootstrapAdmin.sln b/BootstrapAdmin.sln index fc6f1cfd..43c20609 100644 --- a/BootstrapAdmin.sln +++ b/BootstrapAdmin.sln @@ -157,7 +157,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BootstrapClient.Web", "src\ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BootStarpAdmin.DataAccess.FreeSql", "src\blazor\admin\BootStarpAdmin.DataAccess.FreeSql\BootStarpAdmin.DataAccess.FreeSql.csproj", "{11122D97-B349-4A3E-B7DD-73B8B363C47C}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BootStarpAdmin.DataAccess.SqlSugar", "src\blazor\admin\BootStarpAdmin.DataAccess.SqlSugar\BootStarpAdmin.DataAccess.SqlSugar.csproj", "{1D20E6CF-9825-4CDE-B732-AE586BD1AABA}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BootStarpAdmin.DataAccess.SqlSugar", "src\blazor\admin\BootStarpAdmin.DataAccess.SqlSugar\BootStarpAdmin.DataAccess.SqlSugar.csproj", "{1D20E6CF-9825-4CDE-B732-AE586BD1AABA}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BootstrapClient.Web.Core", "src\blazor\client\BootstrapClient.Web.Core\BootstrapClient.Web.Core.csproj", "{FFDF9FF9-0B29-47D3-AD42-53A476B570EC}" EndProject diff --git a/src/blazor/admin/BootstrapAdmin.Web/Extensions/ServiceCollectionExtensions.cs b/src/blazor/admin/BootstrapAdmin.Web/Extensions/ServiceCollectionExtensions.cs index b2b30344..fa92ef03 100644 --- a/src/blazor/admin/BootstrapAdmin.Web/Extensions/ServiceCollectionExtensions.cs +++ b/src/blazor/admin/BootstrapAdmin.Web/Extensions/ServiceCollectionExtensions.cs @@ -76,7 +76,7 @@ namespace Microsoft.Extensions.DependencyInjection services.AddPetaPocoDataAccessServices((provider, builder) => { var configuration = provider.GetRequiredService(); - var connString = configuration.GetConnectionString("bb"); + var connString = configuration.GetConnectionString("ba"); builder.UsingProvider() .UsingConnectionString(connString); }); diff --git a/src/blazor/admin/BootstrapAdmin.Web/appsettings.Development.json b/src/blazor/admin/BootstrapAdmin.Web/appsettings.Development.json index 47155e1f..9b4fcb0f 100644 --- a/src/blazor/admin/BootstrapAdmin.Web/appsettings.Development.json +++ b/src/blazor/admin/BootstrapAdmin.Web/appsettings.Development.json @@ -16,59 +16,9 @@ } }, "SimulateUserName": "", - "AutoGenerateDatabase": true, "BootstrapAdminAuthenticationOptions": { "KeyPath": "..\\..\\keys" }, - "DB": [ - { - "Enabled": false, - "ProviderName": "SqlServer", - "SqlFolder": "..\\..\\..\\db\\SqlServer", - "ConnectionStrings": { - "ba": "Data Source=.;Initial Catalog=BootstrapAdmin;User ID=sa;Password=sa" - } - }, - { - "Enabled": true, - "ProviderName": "Sqlite", - "SqlFolder": "..\\..\\..\\db\\SQLite", - "ConnectionStrings": { - "ba": "Data Source=BootstrapAdmin.db;" - } - }, - { - "Enabled": false, - "ProviderName": "MySql", - "SqlFolder": "..\\..\\..\\db\\MySQL", - "ConnectionStrings": { - "ba": "Server=localhost;Database=BA;Uid=argozhang;Pwd=argo@163.com;SslMode=none;" - } - }, - { - "Enabled": false, - "ProviderName": "Oracle", - "ConnectionStrings": { - "ba": "Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=tcp)(HOST=XXXXXX)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=ORCL)));User Id=XX;Password=XX" - } - }, - { - "Enabled": false, - "ProviderName": "Npgsql", - "ConnectionStrings": { - "ba": "Server=localhost;Database=BootstrapAdmin;User ID=argozhang;Password=argo@163.com;" - } - }, - { - "Enabled": false, - "Widget": "Bootstrap.DataAccess.MongoDB", - "ProviderName": "MongoDB", - "SqlFolder": "..\\..\\..\\db\\MongoDB", - "ConnectionStrings": { - "ba": "mongodb://localhost:27017/BootstrapAdmin" - } - } - ], "SwaggerPathBase": "", "GiteeHealthChecks": "true", "AllowOrigins": "http://localhost:49185", @@ -157,194 +107,5 @@ "第二层", "第三层", "第四层" - ], - "LongbowCache": { - "Enabled": true, - "CorsItems": [ - { - "Enabled": true, - "Key": "ba", - "Url": "CacheList.axd", - "Desc": "后台管理数据缓存接口", - "Self": true - }, - { - "Enabled": true, - "Key": "App", - "Url": "http://localhost:49185/CacheList.axd", - "Desc": "测试系统", - "Self": false - } - ], - "CacheItems": [ - { - "Enabled": true, - "Key": "RoleHelper-RetrieveRolesByUserName", - "Interval": 600000, - "SlidingExpiration": true, - "Desc": "指定用户角色数据缓存" - }, - { - "Enabled": true, - "Key": "RoleHelper-RetrieveRolesByUrl", - "Interval": 600000, - "SlidingExpiration": true, - "Desc": "通过菜单获得角色数据" - }, - { - "Enabled": true, - "Key": "AppHelper-RetrieveAppsByUserName", - "Interval": 600000, - "SlidingExpiration": true, - "Desc": "指定用户授权应用数据缓存" - }, - { - "Enabled": true, - "Key": "BootstrapUser-RetrieveUsersByName", - "Interval": 600000, - "SlidingExpiration": true, - "Desc": "登录用户数据" - }, - { - "Enabled": true, - "Key": "BootstrapDict-RetrieveDicts", - "Interval": 600000, - "SlidingExpiration": true, - "Desc": "所有字典数据缓存" - }, - { - "Enabled": true, - "Key": "BootstrapMenu-RetrieveMenus", - "Interval": 600000, - "SlidingExpiration": true, - "Desc": "用户所有菜单数据缓存" - }, - { - "Enabled": true, - "Key": "GroupHelper-RetrieveGroupsByUserName", - "Interval": 600000, - "SlidingExpiration": true, - "Desc": "指定用户组数据缓存" - }, - { - "Enabled": true, - "Key": "UserHelper-RetrieveUsers", - "Interval": 600000, - "SlidingExpiration": true, - "Desc": "所有用户数据" - }, - { - "Enabled": true, - "Key": "UserHelper-RetrieveUsersByRoleId", - "Interval": 600000, - "SlidingExpiration": true, - "Desc": "通过角色ID获得所有用户数据" - }, - { - "Enabled": true, - "Key": "UserHelper-RetrieveUsersByGroupId", - "Interval": 600000, - "SlidingExpiration": true, - "Desc": "通过部门ID获得所有用户数据" - }, - { - "Enabled": true, - "Key": "UserHelper-RetrieveNewUsers", - "Interval": 600000, - "SlidingExpiration": true, - "Desc": "新用户数据" - }, - { - "Enabled": true, - "Key": "MenuHelper-RetrieveMenusByRoleId", - "Interval": 600000, - "SlidingExpiration": true, - "Desc": "通过角色ID获得所有菜单数据" - }, - { - "Enabled": true, - "Key": "RoleHelper-RetrieveRoles", - "Interval": 600000, - "SlidingExpiration": true, - "Desc": "所有角色数据" - }, - { - "Enabled": true, - "Key": "RoleHelper-RetrieveRolesByUserId", - "Interval": 600000, - "SlidingExpiration": true, - "Desc": "通过用户ID获得所有角色数据" - }, - { - "Enabled": true, - "Key": "RoleHelper-RetrieveRolesByMenuId", - "Interval": 600000, - "SlidingExpiration": true, - "Desc": "通过菜单ID获得所有角色数据" - }, - { - "Enabled": true, - "Key": "RoleHelper-RetrieveRolesByGroupId", - "Interval": 600000, - "SlidingExpiration": true, - "Desc": "通过部门ID获得所有角色数据" - }, - { - "Enabled": true, - "Key": "GroupHelper-RetrieveGroups", - "Interval": 600000, - "SlidingExpiration": true, - "Desc": "所有部门数据" - }, - { - "Enabled": true, - "Key": "GroupHelper-RetrieveGroupsByUserId", - "Interval": 600000, - "SlidingExpiration": true, - "Desc": "通过用户ID获得所有部门数据" - }, - { - "Enabled": true, - "Key": "GroupHelper-RetrieveGroupsByRoleId", - "Interval": 600000, - "SlidingExpiration": true, - "Desc": "通过角色ID获得所有部门数据" - }, - { - "Enabled": true, - "Key": "AppHelper-RetrieveAppsByRoleId", - "Interval": 600000, - "SlidingExpiration": true, - "Desc": "通过角色ID获得所有应用程序数据" - }, - { - "Enabled": true, - "Key": "DictHelper-RetrieveDictsCategory", - "Interval": 600000, - "SlidingExpiration": true, - "Desc": "字典分类数据" - }, - { - "Enabled": true, - "Key": "ExceptionHelper-RetrieveExceptions", - "Interval": 600000, - "SlidingExpiration": true, - "Desc": "程序异常数据" - }, - { - "Enabled": true, - "Key": "MessageHelper-RetrieveMessages", - "Interval": 600000, - "SlidingExpiration": true, - "Desc": "站内消息数据" - }, - { - "Enabled": true, - "Key": "TaskHelper-RetrieveTasks", - "Interval": 600000, - "SlidingExpiration": true, - "Desc": "所有任务数据" - } - ] - } + ] } \ No newline at end of file diff --git a/src/blazor/admin/BootstrapAdmin.Web/appsettings.json b/src/blazor/admin/BootstrapAdmin.Web/appsettings.json index c67bc152..82926fdf 100644 --- a/src/blazor/admin/BootstrapAdmin.Web/appsettings.json +++ b/src/blazor/admin/BootstrapAdmin.Web/appsettings.json @@ -20,51 +20,9 @@ } }, "ConnectionStrings": { - "ba": "Data Source=.;Initial Catalog=BootstrapAdmin;User ID=sa;Password=sa", - "bb": "Data Source=BootstrapAdmin.db;" + "ba": "Data Source=BootstrapAdmin.db;" }, - "AutoGenerateDatabase": false, - "DB": [ - { - "Enabled": false, - "ProviderName": "SqlServer", - "ConnectionStrings": { - "ba": "Data Source=.;Initial Catalog=BootstrapAdmin;User ID=sa;Password=sa" - } - }, - { - "Enabled": true, - "ProviderName": "Sqlite", - "ConnectionStrings": { - "ba": "Data Source=BootstrapAdmin.db;" - } - }, - { - "Enabled": false, - "ProviderName": "MySql", - "ConnectionStrings": { - "ba": "Server=localhost;Database=BA;Uid=argozhang;Pwd=argo@163.com;SslMode=none;" - } - }, - { - "Enabled": false, - "ProviderName": "Npgsql", - "ConnectionStrings": { - "ba": "Server=localhost;Database=BootstrapAdmin;User ID=argozhang;Password=argo@163.com;" - } - }, - { - "Enabled": false, - "Widget": "Bootstrap.DataAccess.MongoDB", - "ProviderName": "MongoDB", - "ConnectionStrings": { - "ba": "mongodb://localhost:27017/BootstrapAdmin" - } - } - ], "AppId": "BA", - "UseHttps": true, - "SwaggerPathBase": "", "AllowOrigins": "http://localhost,http://admin.blazor.zone", "HealthsCloudUrl": "https://client.blazor.zone/api/Interface/Healths", "GiteeHealthChecks": false, diff --git a/src/blazor/client/BootstrapClient.Web/appsettings.Development.json b/src/blazor/client/BootstrapClient.Web/appsettings.Development.json index f1e3471f..1849ffe4 100644 --- a/src/blazor/client/BootstrapClient.Web/appsettings.Development.json +++ b/src/blazor/client/BootstrapClient.Web/appsettings.Development.json @@ -12,34 +12,5 @@ "BootstrapAdminAuthenticationOptions": { "AuthHost": "http://localhost:5210", "KeyPath": "..\\..\\keys" - }, - "DB": [ - { - "Enabled": false - }, - { - "Enabled": true, - "ProviderName": "Sqlite", - "ConnectionStrings": { - "bb": "..\\..\\admin\\BootstrapAdmin.Web\\BootstrapAdmin.db;", - "client": "Data Source=Client.db;" - } - }, - { - "Enabled": false, - "ProviderName": "MySql", - "ConnectionStrings": { - "ba": "Server=localhost;Database=BootstrapAdmin;Uid=root;Pwd=argo@163.com;SslMode=none;" - } - }, - { - "Enabled": false, - "Widget": "Bootstrap.Client.DataAccess.MongoDB", - "ProviderName": "MongoDB", - "ConnectionStrings": { - "ba": "mongodb://localhost:27017/BootstrapAdmin", - "client": "mongodb://localhost:27017/BootstrapClient" - } - } - ] + } } diff --git a/src/blazor/client/BootstrapClient.Web/appsettings.json b/src/blazor/client/BootstrapClient.Web/appsettings.json index 170ac8bf..ef6bebbe 100644 --- a/src/blazor/client/BootstrapClient.Web/appsettings.json +++ b/src/blazor/client/BootstrapClient.Web/appsettings.json @@ -18,33 +18,5 @@ }, "BootstrapBlazorOptions": { "DefaultCultureInfo": "zh-CN" - }, - "DB": [ - { - "Enabled": false - }, - { - "Enabled": true, - "ProviderName": "Sqlite", - "ConnectionStrings": { - "ba": "Data Source=..\\..\\admin\\BootstrapAdmin.Web\\BootstrapAdmin.db;", - "client": "Data Source=Client.db;" - } - }, - { - "Enabled": false, - "ProviderName": "MySql", - "ConnectionStrings": { - "ba": "Server=localhost;Database=BootstrapAdmin;Uid=argozhang;Pwd=argo@163.com;SslMode=none;" - } - }, - { - "Enabled": false, - "Widget": "Bootstrap.Client.DataAccess.MongoDB", - "ProviderName": "MongoDB", - "ConnectionStrings": { - "ba": "mongodb://localhost:27017/BootstrapAdmin" - } - } - ] + } }