From 3a0f366b684d28536a7cb45d0a0f5ccf21b348b8 Mon Sep 17 00:00:00 2001 From: cKey <35512826+colinin@users.noreply.github.com> Date: Sat, 11 Mar 2023 10:59:45 +0800 Subject: [PATCH] feat(openiddict): replace mvc theme to leptonxlite --- aspnet-core/LINGYUN.MicroService.All.sln | 5 +++-- aspnet-core/services/LY.MicroService.AuthServer/.gitignore | 2 ++ .../services/LY.MicroService.AuthServer/AuthServerModule.cs | 4 ++-- .../LY.MicroService.AuthServer.csproj | 3 +-- .../LY.MicroService.AuthServer/appsettings.Development.json | 4 ++-- aspnet-core/services/LY.MicroService.AuthServer/package.json | 4 ++-- .../services/LY.MicroService.identityServer/package.json | 2 +- 7 files changed, 13 insertions(+), 11 deletions(-) create mode 100644 aspnet-core/services/LY.MicroService.AuthServer/.gitignore diff --git a/aspnet-core/LINGYUN.MicroService.All.sln b/aspnet-core/LINGYUN.MicroService.All.sln index 598a3a223..7d6295555 100644 --- a/aspnet-core/LINGYUN.MicroService.All.sln +++ b/aspnet-core/LINGYUN.MicroService.All.sln @@ -553,6 +553,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{52E6 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{F3E04039-7BEE-46F8-B33B-FE13E977DCCA}" ProjectSection(SolutionItems) = preProject + ..\.github\workflows\build.yml = ..\.github\workflows\build.yml ..\.github\workflows\release.yml = ..\.github\workflows\release.yml EndProjectSection EndProject @@ -568,9 +569,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LY.MicroService.Platform.En EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LY.MicroService.RealtimeMessage.EntityFrameworkCore", "migrations\LY.MicroService.RealtimeMessage.EntityFrameworkCore\LY.MicroService.RealtimeMessage.EntityFrameworkCore.csproj", "{6AC6AC37-0163-4EF2-A49C-2E0B87F73AE9}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LINGYUN.Abp.TextTemplating.Scriban", "modules\text-templating\LINGYUN.Abp.TextTemplating.Scriban\LINGYUN.Abp.TextTemplating.Scriban.csproj", "{E2019836-1C67-47E4-B3AF-D62F4AFC7679}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.TextTemplating.Scriban", "modules\text-templating\LINGYUN.Abp.TextTemplating.Scriban\LINGYUN.Abp.TextTemplating.Scriban.csproj", "{E2019836-1C67-47E4-B3AF-D62F4AFC7679}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LINGYUN.Abp.TextTemplating.Razor", "modules\text-templating\LINGYUN.Abp.TextTemplating.Razor\LINGYUN.Abp.TextTemplating.Razor.csproj", "{5F83F8D0-822B-4316-B7DD-85DAFDFAA0E2}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.TextTemplating.Razor", "modules\text-templating\LINGYUN.Abp.TextTemplating.Razor\LINGYUN.Abp.TextTemplating.Razor.csproj", "{5F83F8D0-822B-4316-B7DD-85DAFDFAA0E2}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/aspnet-core/services/LY.MicroService.AuthServer/.gitignore b/aspnet-core/services/LY.MicroService.AuthServer/.gitignore new file mode 100644 index 000000000..60fc43a0b --- /dev/null +++ b/aspnet-core/services/LY.MicroService.AuthServer/.gitignore @@ -0,0 +1,2 @@ +wwwroot/* +package-lock.json \ No newline at end of file diff --git a/aspnet-core/services/LY.MicroService.AuthServer/AuthServerModule.cs b/aspnet-core/services/LY.MicroService.AuthServer/AuthServerModule.cs index cd45c15fc..fc632d3e8 100644 --- a/aspnet-core/services/LY.MicroService.AuthServer/AuthServerModule.cs +++ b/aspnet-core/services/LY.MicroService.AuthServer/AuthServerModule.cs @@ -23,7 +23,7 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using Volo.Abp; using Volo.Abp.Account.Web; -using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic; +using Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite; using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared; using Volo.Abp.AspNetCore.Serilog; using Volo.Abp.Autofac; @@ -46,7 +46,7 @@ namespace LY.MicroService.AuthServer; typeof(AbpAspNetCoreSerilogModule), typeof(AbpAccountWebOpenIddictModule), typeof(AbpAccountApplicationModule), - typeof(AbpAspNetCoreMvcUiBasicThemeModule), + typeof(AbpAspNetCoreMvcUiLeptonXLiteThemeModule), typeof(AbpAutofacModule), typeof(AbpCachingStackExchangeRedisModule), typeof(AbpEntityFrameworkCoreMySQLModule), diff --git a/aspnet-core/services/LY.MicroService.AuthServer/LY.MicroService.AuthServer.csproj b/aspnet-core/services/LY.MicroService.AuthServer/LY.MicroService.AuthServer.csproj index 8e5c8c269..d852ec065 100644 --- a/aspnet-core/services/LY.MicroService.AuthServer/LY.MicroService.AuthServer.csproj +++ b/aspnet-core/services/LY.MicroService.AuthServer/LY.MicroService.AuthServer.csproj @@ -26,9 +26,8 @@ - - + diff --git a/aspnet-core/services/LY.MicroService.AuthServer/appsettings.Development.json b/aspnet-core/services/LY.MicroService.AuthServer/appsettings.Development.json index 67e35b499..3e78a9801 100644 --- a/aspnet-core/services/LY.MicroService.AuthServer/appsettings.Development.json +++ b/aspnet-core/services/LY.MicroService.AuthServer/appsettings.Development.json @@ -1,10 +1,10 @@ { "AgileConfig": { - "IsEnabled": true, + "IsEnabled": false, "env": "DEV", "appId": "LINGYUN.Abp.AuthServer", "secret": "1q2w3E*", - "nodes": "http://127.0.0.1:5000", + "nodes": "http://127.0.0.1:15000", "name": "AuthServer", "tag": "AuthServer" }, diff --git a/aspnet-core/services/LY.MicroService.AuthServer/package.json b/aspnet-core/services/LY.MicroService.AuthServer/package.json index 4fc7e6ec6..c952e3b0c 100644 --- a/aspnet-core/services/LY.MicroService.AuthServer/package.json +++ b/aspnet-core/services/LY.MicroService.AuthServer/package.json @@ -1,8 +1,8 @@ { - "version": "6.0.0-rc.1", + "version": "7.0.2", "name": "my-app-auth-server", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "6.0.0-rc.1" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "2.0.4" } } \ No newline at end of file diff --git a/aspnet-core/services/LY.MicroService.identityServer/package.json b/aspnet-core/services/LY.MicroService.identityServer/package.json index aa1d1a080..4a26b4452 100644 --- a/aspnet-core/services/LY.MicroService.identityServer/package.json +++ b/aspnet-core/services/LY.MicroService.identityServer/package.json @@ -1,5 +1,5 @@ { - "version": "1.0.0", + "version": "7.0.2", "name": "my-app-identityserver", "private": true, "dependencies": {