Skip to content

Chore/sanitize sensitive config 20260814 #380

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Qinyouzeng merged 7 commits into from
Aug 14, 2026
Merged

Chore/sanitize sensitive config 20260814 #380

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
27c5616
refactor: Improve filter case sensitivity in query handlers
wzh425 Jan 9, 2026
5eb49a1
Merge branch 'main' of github.com:masastack/MASA.Alert
wzh425 Aug 14, 2026
9615a7d
chore: sanitize sensitive local configuration values
wzh425 Aug 14, 2026
9678f2c
refactor: Remove Masa.Alert.Web.Admin project and update configuration
wzh425 Aug 14, 2026
40df9ce
chore: Clean up appsettings.json by removing commented-out configuration
wzh425 Aug 14, 2026
ee54ade
chore: Update launchSettings.json with new configuration values
wzh425 Aug 14, 2026
f5d8191
chore: Enable ITokenGenerater registration in service configuration
wzh425 Aug 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
*.user
*.userosscache
*.sln.docstates
**/appsettings.secrets.json
**/appsettings.*.secrets.json

# User-specific files (MonoDevelop/Xamarin Studio)
*.userprefs
Expand Down
36 changes: 0 additions & 36 deletions Masa.Alert.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "components", "components",
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.Alert.Service.Admin", "src\Services\Masa.Alert.Service\Masa.Alert.Service.Admin.csproj", "{87A8E21E-DF58-4BEA-8EA1-EF333BE4D2B3}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Web", "Web", "{F3986DD3-0372-4929-B72A-09D93196541E}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.Alert.Web.Admin", "src\Web\Masa.Alert.Web.Admin\Masa.Alert.Web.Admin.csproj", "{3F0181CA-BDF5-4F56-A664-0E82DFD2A8C7}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ApiGateways", "ApiGateways", "{32774681-0D67-48A6-A379-D57015094F85}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.Alert.ApiGateways.Caller", "src\ApiGateways\Caller\Masa.Alert.ApiGateways.Caller\Masa.Alert.ApiGateways.Caller.csproj", "{40685EC0-64DF-4742-B8F6-602AFAEFC0EA}"
Expand All @@ -35,10 +31,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.Alert.Infrastructure.D
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.Alert.Infrastructure.EntityFrameworkCore", "src\Infrastructure\Masa.Alert.Infrastructure.EntityFrameworkCore\Masa.Alert.Infrastructure.EntityFrameworkCore.csproj", "{FAFDC558-45A7-4FF7-BFCE-015EDF58F3AE}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.Alert.Web.Admin.Server", "src\Web\Masa.Alert.Web.Admin.Server\Masa.Alert.Web.Admin.Server.csproj", "{8FA1D09B-F5B5-4B42-BF86-53512F1377B2}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.Alert.Web.Admin.WebAssembly", "src\Web\Masa.Alert.Web.Admin.WebAssembly\Masa.Alert.Web.Admin.WebAssembly.csproj", "{1644695E-4B4F-4D7D-833C-7E694E758641}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.Alert.Infrastructure.Common", "src\Infrastructure\Masa.Alert.Infrastructure.Common\Masa.Alert.Infrastructure.Common.csproj", "{4024A9CA-D6CA-44D7-BEA4-D96891AFC6DD}"
EndProject
Project("{E53339B2-1760-4266-BCC7-CA923CBCF16C}") = "docker-compose", "docker-compose.dcproj", "{C147F2DF-F545-4263-9FBE-C7A833BB2A73}"
Expand Down Expand Up @@ -92,14 +84,6 @@ Global
{87A8E21E-DF58-4BEA-8EA1-EF333BE4D2B3}.Release|Any CPU.Build.0 = Release|Any CPU
{87A8E21E-DF58-4BEA-8EA1-EF333BE4D2B3}.Release|x86.ActiveCfg = Release|Any CPU
{87A8E21E-DF58-4BEA-8EA1-EF333BE4D2B3}.Release|x86.Build.0 = Release|Any CPU
{3F0181CA-BDF5-4F56-A664-0E82DFD2A8C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3F0181CA-BDF5-4F56-A664-0E82DFD2A8C7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3F0181CA-BDF5-4F56-A664-0E82DFD2A8C7}.Debug|x86.ActiveCfg = Debug|Any CPU
{3F0181CA-BDF5-4F56-A664-0E82DFD2A8C7}.Debug|x86.Build.0 = Debug|Any CPU
{3F0181CA-BDF5-4F56-A664-0E82DFD2A8C7}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3F0181CA-BDF5-4F56-A664-0E82DFD2A8C7}.Release|Any CPU.Build.0 = Release|Any CPU
{3F0181CA-BDF5-4F56-A664-0E82DFD2A8C7}.Release|x86.ActiveCfg = Release|Any CPU
{3F0181CA-BDF5-4F56-A664-0E82DFD2A8C7}.Release|x86.Build.0 = Release|Any CPU
{40685EC0-64DF-4742-B8F6-602AFAEFC0EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{40685EC0-64DF-4742-B8F6-602AFAEFC0EA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{40685EC0-64DF-4742-B8F6-602AFAEFC0EA}.Debug|x86.ActiveCfg = Debug|Any CPU
Expand Down Expand Up @@ -132,22 +116,6 @@ Global
{FAFDC558-45A7-4FF7-BFCE-015EDF58F3AE}.Release|Any CPU.Build.0 = Release|Any CPU
{FAFDC558-45A7-4FF7-BFCE-015EDF58F3AE}.Release|x86.ActiveCfg = Release|Any CPU
{FAFDC558-45A7-4FF7-BFCE-015EDF58F3AE}.Release|x86.Build.0 = Release|Any CPU
{8FA1D09B-F5B5-4B42-BF86-53512F1377B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8FA1D09B-F5B5-4B42-BF86-53512F1377B2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8FA1D09B-F5B5-4B42-BF86-53512F1377B2}.Debug|x86.ActiveCfg = Debug|Any CPU
{8FA1D09B-F5B5-4B42-BF86-53512F1377B2}.Debug|x86.Build.0 = Debug|Any CPU
{8FA1D09B-F5B5-4B42-BF86-53512F1377B2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8FA1D09B-F5B5-4B42-BF86-53512F1377B2}.Release|Any CPU.Build.0 = Release|Any CPU
{8FA1D09B-F5B5-4B42-BF86-53512F1377B2}.Release|x86.ActiveCfg = Release|Any CPU
{8FA1D09B-F5B5-4B42-BF86-53512F1377B2}.Release|x86.Build.0 = Release|Any CPU
{1644695E-4B4F-4D7D-833C-7E694E758641}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1644695E-4B4F-4D7D-833C-7E694E758641}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1644695E-4B4F-4D7D-833C-7E694E758641}.Debug|x86.ActiveCfg = Debug|Any CPU
{1644695E-4B4F-4D7D-833C-7E694E758641}.Debug|x86.Build.0 = Debug|Any CPU
{1644695E-4B4F-4D7D-833C-7E694E758641}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1644695E-4B4F-4D7D-833C-7E694E758641}.Release|Any CPU.Build.0 = Release|Any CPU
{1644695E-4B4F-4D7D-833C-7E694E758641}.Release|x86.ActiveCfg = Release|Any CPU
{1644695E-4B4F-4D7D-833C-7E694E758641}.Release|x86.Build.0 = Release|Any CPU
{4024A9CA-D6CA-44D7-BEA4-D96891AFC6DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4024A9CA-D6CA-44D7-BEA4-D96891AFC6DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4024A9CA-D6CA-44D7-BEA4-D96891AFC6DD}.Debug|x86.ActiveCfg = Debug|Any CPU
Expand Down Expand Up @@ -260,17 +228,13 @@ Global
{4A1D2DFA-D091-4CD2-B9CB-D7AAA795ABD9} = {92F40AFA-8416-40BE-9893-D35E1924C69D}
{FBFB499A-7022-4417-881B-68F63DBDB7F4} = {E011B243-0389-468B-B903-83445BED69A4}
{87A8E21E-DF58-4BEA-8EA1-EF333BE4D2B3} = {4A1D2DFA-D091-4CD2-B9CB-D7AAA795ABD9}
{F3986DD3-0372-4929-B72A-09D93196541E} = {92F40AFA-8416-40BE-9893-D35E1924C69D}
{3F0181CA-BDF5-4F56-A664-0E82DFD2A8C7} = {F3986DD3-0372-4929-B72A-09D93196541E}
{32774681-0D67-48A6-A379-D57015094F85} = {92F40AFA-8416-40BE-9893-D35E1924C69D}
{40685EC0-64DF-4742-B8F6-602AFAEFC0EA} = {32774681-0D67-48A6-A379-D57015094F85}
{88AD0A79-5286-4C1C-8A58-AAC9E6870CCD} = {92F40AFA-8416-40BE-9893-D35E1924C69D}
{D38D7297-FC98-4126-B320-1322B6F8CCFB} = {88AD0A79-5286-4C1C-8A58-AAC9E6870CCD}
{4660010F-BB9B-4C8E-B4F7-34AF77080EA0} = {92F40AFA-8416-40BE-9893-D35E1924C69D}
{6CAC62DA-A3AF-4BFE-8E1C-0DB9D0D81CD6} = {4660010F-BB9B-4C8E-B4F7-34AF77080EA0}
{FAFDC558-45A7-4FF7-BFCE-015EDF58F3AE} = {4660010F-BB9B-4C8E-B4F7-34AF77080EA0}
{8FA1D09B-F5B5-4B42-BF86-53512F1377B2} = {F3986DD3-0372-4929-B72A-09D93196541E}
{1644695E-4B4F-4D7D-833C-7E694E758641} = {F3986DD3-0372-4929-B72A-09D93196541E}
{4024A9CA-D6CA-44D7-BEA4-D96891AFC6DD} = {4660010F-BB9B-4C8E-B4F7-34AF77080EA0}
{BE3519B8-A573-4C5D-B48C-1FA3CE1E4473} = {92F40AFA-8416-40BE-9893-D35E1924C69D}
{6D9909B5-3FF8-493C-B12A-0C312B01C106} = {92F40AFA-8416-40BE-9893-D35E1924C69D}
Expand Down
2 changes: 2 additions & 0 deletions ...frastructure/Masa.Alert.EntityFrameworkCore.PostgreSql/AlertPostgreSqlDbContextFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ public AlertDbContext CreateDbContext(string[] args)
var configurationBuilder = new ConfigurationBuilder();
var configuration = configurationBuilder
.AddJsonFile("appsettings.PostgreSql.json")
.AddJsonFile("appsettings.secrets.json", optional: true)
.AddEnvironmentVariables()
.Build();
optionsBuilder.UseNpgsql(configuration.GetConnectionString("DefaultConnection")!, b => b.MigrationsAssembly("Masa.Alert.EntityFrameworkCore.PostgreSql"));

Expand Down
3 changes: 3 additions & 0 deletions ...asa.Alert.EntityFrameworkCore.PostgreSql/Masa.Alert.EntityFrameworkCore.PostgreSql.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@
<None Update="appsettings.PostgreSql.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="appsettings.secrets.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>

</Project>
4 changes: 1 addition & 3 deletions src/Infrastructure/Masa.Alert.EntityFrameworkCore.PostgreSql/appsettings.PostgreSql.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
{
"ConnectionStrings": {
"DefaultConnection": "Server=10.130.0.19;Port=3815;User Id=ss;Password=Lsd@2023;Database=alert_dev;"
}

}
2 changes: 2 additions & 0 deletions ...Infrastructure/Masa.Alert.EntityFrameworkCore.SqlServer/AlertSqlServerDbContextFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ public AlertDbContext CreateDbContext(string[] args)
var configurationBuilder = new ConfigurationBuilder();
var configuration = configurationBuilder
.AddJsonFile("appsettings.SqlServer.json")
.AddJsonFile("appsettings.secrets.json", optional: true)
.AddEnvironmentVariables()
.Build();
optionsBuilder.UseSqlServer(configuration.GetConnectionString("DefaultConnection"), b => b.MigrationsAssembly("Masa.Alert.EntityFrameworkCore.SqlServer"));

Expand Down
3 changes: 3 additions & 0 deletions .../Masa.Alert.EntityFrameworkCore.SqlServer/Masa.Alert.EntityFrameworkCore.SqlServer.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@
</ItemGroup>

<ItemGroup>
<None Update="appsettings.secrets.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="appsettings.SqlServer.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
Expand Down
4 changes: 1 addition & 3 deletions src/Infrastructure/Masa.Alert.EntityFrameworkCore.SqlServer/appsettings.SqlServer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
{
"ConnectionStrings": {
"DefaultConnection": "Server=10.130.0.19,2415;Database=alert_dev;User Id=ss;Password=Hzss@123;"
}

}
1 change: 0 additions & 1 deletion src/Services/Masa.Alert.Service/appsettings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,4 @@
"DaprGrpcPort": 20601
},
"AppId": "masa-alert-service"
//"masa-alert-servic": "fdgfdg"
}
Binary file removed src/Web/Masa.Alert.Web.Admin.Server/Certificates/7348307__lonsid.cn.pfx
View file
Open in desktop
Binary file not shown.
15 changes: 0 additions & 15 deletions src/Web/Masa.Alert.Web.Admin.Server/Dockerfile
View file
Open in desktop

This file was deleted.

33 changes: 0 additions & 33 deletions src/Web/Masa.Alert.Web.Admin.Server/Masa.Alert.Web.Admin.Server.csproj
View file
Open in desktop

This file was deleted.

43 changes: 0 additions & 43 deletions src/Web/Masa.Alert.Web.Admin.Server/Pages/Error.cshtml
View file
Open in desktop

This file was deleted.

30 changes: 0 additions & 30 deletions src/Web/Masa.Alert.Web.Admin.Server/Pages/Error.cshtml.cs
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions src/Web/Masa.Alert.Web.Admin.Server/Pages/Logout.cshtml
View file
Open in desktop

This file was deleted.

24 changes: 0 additions & 24 deletions src/Web/Masa.Alert.Web.Admin.Server/Pages/Logout.cshtml.cs
View file
Open in desktop

This file was deleted.

15 changes: 0 additions & 15 deletions src/Web/Masa.Alert.Web.Admin.Server/Pages/_Host.cshtml
View file
Open in desktop

This file was deleted.

48 changes: 0 additions & 48 deletions src/Web/Masa.Alert.Web.Admin.Server/Pages/_Layout.cshtml
View file
Open in desktop

This file was deleted.

Loading
Loading