Skip to content

Commit cf6be4a

Browse files
CodespilotCodespilot
authored
Merge pull request #25 from NerosoftDev/develop
Develop
2 parents ec6ded1 + 648a366 commit cf6be4a

File tree

189 files changed

+2891
-4439
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

189 files changed

+2891
-4439
lines changed

‎Directory.Packages.props‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
<PropertyGroup>
33
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
44
<EnablePackageVersionOverride>true</EnablePackageVersionOverride>
5-
<EuoniaPackageVersion>8.1.21</EuoniaPackageVersion>
5+
<EuoniaPackageVersion>8.1.22</EuoniaPackageVersion>
66
</PropertyGroup>
77
<ItemGroup>
8-
<PackageVersion Include="Blazored.LocalStorage" Version="4.4.0" />
8+
<PackageVersion Include="Blazored.LocalStorage" Version="4.5.0" />
99
<PackageVersion Include="BlazorMonaco" Version="3.1.0" />
1010
<PackageVersion Include="CommunityToolkit.Mvvm" Version="8.2.2" />
1111
<PackageVersion Include="Dapper" Version="2.1.28" />
@@ -29,37 +29,37 @@
2929
<PackageVersion Include="Euonia.Pipeline" Version="$(EuoniaPackageVersion)" />
3030
<PackageVersion Include="Euonia.Validation" Version="$(EuoniaPackageVersion)" />
3131
<PackageVersion Include="Euonia.Repository.EfCore" Version="$(EuoniaPackageVersion)" />
32-
<PackageVersion Include="Google.Api.CommonProtos" Version="2.13.0" />
33-
<PackageVersion Include="Google.Protobuf" Version="3.25.2" />
32+
<PackageVersion Include="Google.Api.CommonProtos" Version="2.14.0" />
33+
<PackageVersion Include="Google.Protobuf" Version="3.25.3" />
3434
<PackageVersion Include="Grpc.Net.Client" Version="2.60.0" />
35-
<PackageVersion Include="Grpc.Tools" Version="2.60.0" />
35+
<PackageVersion Include="Grpc.Tools" Version="2.61.0" />
3636
<PackageVersion Include="IdentityModel" Version="6.2.0" />
37-
<PackageVersion Include="Microsoft.AspNetCore.Components.Authorization" Version="8.0.1" />
38-
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.1" />
39-
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.1" />
40-
<PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="8.0.1" />
37+
<PackageVersion Include="Microsoft.AspNetCore.Components.Authorization" Version="8.0.2" />
38+
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.2" />
39+
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.2" />
40+
<PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="8.0.2" />
4141
<PackageVersion Include="Microsoft.Extensions.Http" Version="8.0.0" />
42-
<PackageVersion Include="Microsoft.Extensions.Http.Polly" Version="8.0.1" />
42+
<PackageVersion Include="Microsoft.Extensions.Http.Polly" Version="8.0.2" />
4343
<PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
4444
<PackageVersion Include="Microsoft.FeatureManagement.AspNetCore" Version="3.1.1" />
45-
<PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components" Version="4.3.1" />
46-
<PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components.Emoji" Version="4.3.1" />
47-
<PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components.Icons" Version="4.3.1" />
45+
<PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components" Version="4.4.1" />
46+
<PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components.Emoji" Version="4.4.0" />
47+
<PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components.Icons" Version="4.4.0" />
4848
<PackageVersion Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.6" />
4949
<PackageVersion Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="7.0.11" />
5050
<PackageVersion Include="Refit" Version="7.0.0" />
5151
<PackageVersion Include="Refit.HttpClientFactory" Version="7.0.0" />
5252
<PackageVersion Include="Refit.Newtonsoft.Json" Version="7.0.0" />
5353
<PackageVersion Include="StackExchange.Redis" Version="2.7.17" />
5454
<PackageVersion Include="Swashbuckle.AspNetCore" Version="6.5.0" />
55-
<PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="7.3.0" />
55+
<PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="7.3.1" />
5656
</ItemGroup>
5757
<ItemGroup>
58-
<PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.1" />
59-
<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.1" />
60-
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.1" />
61-
<PackageVersion Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.0-beta.2" />
62-
<PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.0" />
58+
<PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.2" />
59+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.2" />
60+
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.2" />
61+
<PackageVersion Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.0" />
62+
<PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.2" />
6363
<PackageVersion Include="MongoDB.EntityFrameworkCore" Version="7.0.0-preview.1" />
6464
</ItemGroup>
6565
<ItemGroup>
@@ -72,7 +72,7 @@
7272
</PackageVersion>
7373
</ItemGroup>
7474
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1'">
75-
<PackageVersion Include="System.Text.Json" Version="8.0.1" />
75+
<PackageVersion Include="System.Text.Json" Version="8.0.2" />
7676
</ItemGroup>
7777
<ItemGroup Condition=" $(TargetFrameworkVersion.Equals('v5.0')) ">
7878
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="5.0.0" />
@@ -102,9 +102,9 @@
102102
<!-- Tests -->
103103
<ItemGroup>
104104
<PackageVersion Include="BenchmarkDotNet" Version="0.13.4" />
105-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
106-
<PackageVersion Include="xunit" Version="2.6.6" />
107-
<PackageVersion Include="xunit.runner.visualstudio" Version="2.5.6">
105+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
106+
<PackageVersion Include="xunit" Version="2.7.0" />
107+
<PackageVersion Include="xunit.runner.visualstudio" Version="2.5.7">
108108
<PrivateAssets>all</PrivateAssets>
109109
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
110110
</PackageVersion>

‎Source/Starfish.Client/Clients/HttpConfigurationClient.cs‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,14 @@ internal class HttpConfigurationClient : IConfigurationClient
44
{
55
private readonly HttpClient _httpClient = new();
66

7-
private readonly string _app;
7+
private readonly string _id;
88
private readonly string _secret;
9-
private readonly string _env;
109

11-
public HttpConfigurationClient(Uri host, string app, string secret, string env)
10+
public HttpConfigurationClient(Uri host, string id, string secret)
1211
{
1312
_httpClient.BaseAddress = host;
14-
_app = app;
13+
_id = id;
1514
_secret = secret;
16-
_env = env;
1715

1816
// _httpClient.DefaultRequestHeaders.Add(Constants.RequestHeaders.Team, team);
1917
// _httpClient.DefaultRequestHeaders.Add(Constants.RequestHeaders.App, app);
@@ -28,7 +26,7 @@ public async Task GetConfigurationAsync(Action<byte[], int> dataAction, Cancella
2826
try
2927
{
3028
attempts++;
31-
using var request = new HttpRequestMessage(HttpMethod.Get, $"es?app={_app}&secret={_secret}&env={_env}");
29+
using var request = new HttpRequestMessage(HttpMethod.Get, $"es?id={_id}&secret={_secret}");
3230

3331
var response = await _httpClient.SendAsync(request, HttpCompletionOption.ResponseHeadersRead, cancellationToken);
3432

‎Source/Starfish.Client/Clients/SocketConfigurationClient.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ internal class SocketConfigurationClient : IConfigurationClient
77
private readonly ClientWebSocket _client = new();
88
private readonly Uri _uri;
99

10-
public SocketConfigurationClient(Uri host, string app, string secret, string env)
10+
public SocketConfigurationClient(Uri host, string id, string secret)
1111
{
12-
_uri = new Uri($"{host.AbsoluteUri}ws?app={app}&secret={secret}&env={env}");
12+
_uri = new Uri($"{host.AbsoluteUri}ws?app={id}&secret={secret}");
1313
// _client.Options.SetRequestHeader(Constants.RequestHeaders.Team, team);
1414
// _client.Options.SetRequestHeader(Constants.RequestHeaders.App, app);
1515
// _client.Options.SetRequestHeader(Constants.RequestHeaders.Secret, secret);

‎Source/Starfish.Client/ConfigurationClientOptions.cs‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,7 @@ public class ConfigurationClientOptions
1010
/// <summary>
1111
/// 应用Id
1212
/// </summary>
13-
public string App { get; set; }
14-
15-
/// <summary>
16-
/// 应用环境
17-
/// </summary>
18-
public string Env { get; set; }
13+
public string Id { get; set; }
1914

2015
/// <summary>
2116
/// 密钥
@@ -67,9 +62,9 @@ public static ConfigurationClientOptions Load(IConfiguration configuration)
6762
throw new InvalidOperationException(Resources.IDS_ERROR_STARFISH_SECTION_NOT_FOUND);
6863
}
6964

70-
var app = section[nameof(App)];
65+
var id = section[nameof(Id)];
7166

72-
if (string.IsNullOrWhiteSpace(app))
67+
if (string.IsNullOrWhiteSpace(id))
7368
{
7469
throw new InvalidOperationException(Resources.IDS_ERROR_APP_SECTION_NOT_FOUND);
7570
}
@@ -83,8 +78,7 @@ public static ConfigurationClientOptions Load(IConfiguration configuration)
8378
var options = new ConfigurationClientOptions
8479
{
8580
Host = host,
86-
App = app,
87-
Env = section[nameof(Env)] ?? Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT"),
81+
Id = id,
8882
Secret = section[nameof(Secret)],
8983
CacheDirectory = section[nameof(CacheDirectory)] ?? AppDomain.CurrentDomain.BaseDirectory
9084
};

‎Source/Starfish.Client/StarfishConfigurationProvider.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ internal class StarfishConfigurationProvider : ConfigurationProvider, IDisposabl
2121
public StarfishConfigurationProvider(ConfigurationClientOptions options)
2222
{
2323
_options = options;
24-
_cacheFile = Path.Combine(_options.CacheDirectory, $"{_options.App}.starfish.{_options.Env}.cache");
24+
_cacheFile = Path.Combine(_options.CacheDirectory, $"{_options.Id}.starfish.cache");
2525
HostChanged += OnHostChanged;
2626
ConnectionLost += (_, _) =>
2727
{
@@ -58,8 +58,8 @@ private async void OnHostChanged(object sender, HostChangedEventArgs args)
5858
var uri = new Uri(args.Host);
5959
IConfigurationClient client = uri.Scheme switch
6060
{
61-
"http" or "https" => new HttpConfigurationClient(uri, _options.App, _options.Secret, _options.Env),
62-
"ws" or "wss" => new SocketConfigurationClient(uri, _options.App, _options.Secret, _options.Env),
61+
"http" or "https" => new HttpConfigurationClient(uri, _options.Id, _options.Secret),
62+
"ws" or "wss" => new SocketConfigurationClient(uri, _options.Id, _options.Secret),
6363
_ => throw new NotSupportedException(string.Format(Resources.IDS_ERROR_SCHEMA_NOT_SUPPORTED, uri.Scheme)),
6464
};
6565
try

‎Source/Starfish.Common/PermissionState.cs‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
namespace Nerosoft.Starfish.Common;
2+
3+
public enum PermissionState
4+
{
5+
None = 0,
6+
Read = 1,
7+
Edit = 2
8+
}

‎Source/Starfish.Service/Application/ApplicationServiceModule.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ public override void AheadConfigureServices(ServiceConfigurationContext context)
3232
{
3333
options.AddProfile<IdentityMappingProfile>();
3434
options.AddProfile<LogsMappingProfile>();
35-
options.AddProfile<AppsMappingProfile>();
3635
options.AddProfile<ConfigurationMappingProfile>();
3736
});
3837
}

‎Source/Starfish.Service/Application/Commands/Configs/AppInfoCreateCommand.cs‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎Source/Starfish.Service/Application/Commands/Configs/AppInfoDeleteCommand.cs‎

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎Source/Starfish.Service/Application/Commands/Configs/AppInfoUpdateCommand.cs‎

Lines changed: 0 additions & 20 deletions
This file was deleted.

0 commit comments

Comments
 (0)