From 6d06a1599e4750e20210512efd04778f6b083260 Mon Sep 17 00:00:00 2001 From: iamshen Date: Fri, 24 May 2024 10:50:49 +0800 Subject: [PATCH 1/2] Delete useless zip file --- .../aspirate-output.zip | Bin 9321 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 build/DaprTool.Solution.AppHost/aspirate-output.zip diff --git a/build/DaprTool.Solution.AppHost/aspirate-output.zip b/build/DaprTool.Solution.AppHost/aspirate-output.zip deleted file mode 100644 index 849721a8cd28e48a00b73880df4bd88b153bb0e9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9321 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 Date: Wed, 29 May 2024 09:35:44 +0800 Subject: [PATCH 2/2] Upgrade dotnet aspire --- Common.props | 2 +- Directory.Packages.props | 6 ++-- NuGet.Config | 10 ++++++ .../DaprTool.Solution.AppHost.csproj | 2 +- .../aspirate-output/admin/deployment.yaml | 2 +- .../aspirate-output/admin/kustomization.yaml | 2 ++ .../auth-admin/deployment.yaml | 2 +- .../auth-admin/kustomization.yaml | 2 ++ .../aspirate-output/auth-api/deployment.yaml | 2 +- .../auth-api/kustomization.yaml | 2 ++ .../aspirate-output/auth-sts/deployment.yaml | 2 +- .../auth-sts/kustomization.yaml | 2 ++ .../aspirate-output/dashboard.yaml | 14 +-------- .../aspirate-output/kustomization.yaml | 1 + .../aspirate-output/order-api/deployment.yaml | 2 +- .../order-api/kustomization.yaml | 2 ++ .../proxy-monitor/deployment.yaml | 31 +++++++++++++++++++ .../proxy-monitor/kustomization.yaml | 18 +++++++++++ .../proxy-monitor/service.yaml | 16 ++++++++++ .../proxy-server/deployment.yaml | 2 +- .../proxy-server/kustomization.yaml | 2 ++ .../aspirate-state.json | 5 ++- build/DaprTool.Solution.AppHost/aspirate.json | 2 +- .../Idsrv4.Admin.Api/Idsrv4.Admin.Api.csproj | 1 + src/ProxyServer/Program.cs | 12 ++++++- src/ProxyServer/ProxyServer.csproj | 11 ++++--- 26 files changed, 125 insertions(+), 30 deletions(-) create mode 100644 NuGet.Config create mode 100644 build/DaprTool.Solution.AppHost/aspirate-output/proxy-monitor/deployment.yaml create mode 100644 build/DaprTool.Solution.AppHost/aspirate-output/proxy-monitor/kustomization.yaml create mode 100644 build/DaprTool.Solution.AppHost/aspirate-output/proxy-monitor/service.yaml diff --git a/Common.props b/Common.props index a518bd0..b15a115 100644 --- a/Common.props +++ b/Common.props @@ -4,7 +4,7 @@ net8.0 enable enable - NU1803;NU1507;1701;1702;1591;8002;CS1573; + $(NoWarn);NU1803;NU1507;1701;1702;1591;8002;CS1573; diff --git a/Directory.Packages.props b/Directory.Packages.props index ebc6a02..46c9520 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -18,7 +18,7 @@ - + @@ -26,6 +26,8 @@ + + @@ -82,7 +84,7 @@ - + diff --git a/NuGet.Config b/NuGet.Config new file mode 100644 index 0000000..c4cf7bd --- /dev/null +++ b/NuGet.Config @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/build/DaprTool.Solution.AppHost/DaprTool.Solution.AppHost.csproj b/build/DaprTool.Solution.AppHost/DaprTool.Solution.AppHost.csproj index 7c3c97f..73f9d48 100644 --- a/build/DaprTool.Solution.AppHost/DaprTool.Solution.AppHost.csproj +++ b/build/DaprTool.Solution.AppHost/DaprTool.Solution.AppHost.csproj @@ -13,7 +13,7 @@ - + diff --git a/build/DaprTool.Solution.AppHost/aspirate-output/admin/deployment.yaml b/build/DaprTool.Solution.AppHost/aspirate-output/admin/deployment.yaml index 57477e8..1a45619 100644 --- a/build/DaprTool.Solution.AppHost/aspirate-output/admin/deployment.yaml +++ b/build/DaprTool.Solution.AppHost/aspirate-output/admin/deployment.yaml @@ -30,7 +30,7 @@ spec: spec: containers: - name: admin - image: registry.cn-shenzhen.aliyuncs.com/huangshen/web-admin:latest + image: registry.cn-shenzhen.aliyuncs.com/project-workspace/web-admin:1.0.5-alpha1 imagePullPolicy: IfNotPresent ports: - containerPort: 8080 diff --git a/build/DaprTool.Solution.AppHost/aspirate-output/admin/kustomization.yaml b/build/DaprTool.Solution.AppHost/aspirate-output/admin/kustomization.yaml index a99abef..5933d65 100644 --- a/build/DaprTool.Solution.AppHost/aspirate-output/admin/kustomization.yaml +++ b/build/DaprTool.Solution.AppHost/aspirate-output/admin/kustomization.yaml @@ -12,5 +12,7 @@ configMapGenerator: - OTEL_DOTNET_EXPERIMENTAL_OTLP_EMIT_EVENT_LOG_ATTRIBUTES=true - OTEL_DOTNET_EXPERIMENTAL_OTLP_RETRY=in_memory - ASPNETCORE_FORWARDEDHEADERS_ENABLED=true + - OTEL_EXPORTER_OTLP_ENDPOINT=http://aspire-dashboard:18889 + - OTEL_SERVICE_NAME=admin - ASPNETCORE_URLS=http://+:8080; diff --git a/build/DaprTool.Solution.AppHost/aspirate-output/auth-admin/deployment.yaml b/build/DaprTool.Solution.AppHost/aspirate-output/auth-admin/deployment.yaml index 4984a37..7d05837 100644 --- a/build/DaprTool.Solution.AppHost/aspirate-output/auth-admin/deployment.yaml +++ b/build/DaprTool.Solution.AppHost/aspirate-output/auth-admin/deployment.yaml @@ -30,7 +30,7 @@ spec: spec: containers: - name: auth-admin - image: registry.cn-shenzhen.aliyuncs.com/huangshen/auth-admin:latest + image: registry.cn-shenzhen.aliyuncs.com/project-workspace/auth-admin:1.0.5-alpha1 imagePullPolicy: IfNotPresent ports: - containerPort: 8080 diff --git a/build/DaprTool.Solution.AppHost/aspirate-output/auth-admin/kustomization.yaml b/build/DaprTool.Solution.AppHost/aspirate-output/auth-admin/kustomization.yaml index 9d2b2b3..2a22d12 100644 --- a/build/DaprTool.Solution.AppHost/aspirate-output/auth-admin/kustomization.yaml +++ b/build/DaprTool.Solution.AppHost/aspirate-output/auth-admin/kustomization.yaml @@ -12,5 +12,7 @@ configMapGenerator: - OTEL_DOTNET_EXPERIMENTAL_OTLP_EMIT_EVENT_LOG_ATTRIBUTES=true - OTEL_DOTNET_EXPERIMENTAL_OTLP_RETRY=in_memory - ASPNETCORE_FORWARDEDHEADERS_ENABLED=true + - OTEL_EXPORTER_OTLP_ENDPOINT=http://aspire-dashboard:18889 + - OTEL_SERVICE_NAME=auth-admin - ASPNETCORE_URLS=http://+:8080; diff --git a/build/DaprTool.Solution.AppHost/aspirate-output/auth-api/deployment.yaml b/build/DaprTool.Solution.AppHost/aspirate-output/auth-api/deployment.yaml index 669d9fb..aec53fc 100644 --- a/build/DaprTool.Solution.AppHost/aspirate-output/auth-api/deployment.yaml +++ b/build/DaprTool.Solution.AppHost/aspirate-output/auth-api/deployment.yaml @@ -30,7 +30,7 @@ spec: spec: containers: - name: auth-api - image: registry.cn-shenzhen.aliyuncs.com/huangshen/auth-api:latest + image: registry.cn-shenzhen.aliyuncs.com/project-workspace/auth-api:1.0.5-alpha1 imagePullPolicy: IfNotPresent ports: - containerPort: 8080 diff --git a/build/DaprTool.Solution.AppHost/aspirate-output/auth-api/kustomization.yaml b/build/DaprTool.Solution.AppHost/aspirate-output/auth-api/kustomization.yaml index 90494ca..9b6b0fa 100644 --- a/build/DaprTool.Solution.AppHost/aspirate-output/auth-api/kustomization.yaml +++ b/build/DaprTool.Solution.AppHost/aspirate-output/auth-api/kustomization.yaml @@ -12,5 +12,7 @@ configMapGenerator: - OTEL_DOTNET_EXPERIMENTAL_OTLP_EMIT_EVENT_LOG_ATTRIBUTES=true - OTEL_DOTNET_EXPERIMENTAL_OTLP_RETRY=in_memory - ASPNETCORE_FORWARDEDHEADERS_ENABLED=true + - OTEL_EXPORTER_OTLP_ENDPOINT=http://aspire-dashboard:18889 + - OTEL_SERVICE_NAME=auth-api - ASPNETCORE_URLS=http://+:8080; diff --git a/build/DaprTool.Solution.AppHost/aspirate-output/auth-sts/deployment.yaml b/build/DaprTool.Solution.AppHost/aspirate-output/auth-sts/deployment.yaml index dfb6685..f1c71f8 100644 --- a/build/DaprTool.Solution.AppHost/aspirate-output/auth-sts/deployment.yaml +++ b/build/DaprTool.Solution.AppHost/aspirate-output/auth-sts/deployment.yaml @@ -30,7 +30,7 @@ spec: spec: containers: - name: auth-sts - image: registry.cn-shenzhen.aliyuncs.com/huangshen/auth-sts:latest + image: registry.cn-shenzhen.aliyuncs.com/project-workspace/auth-sts:1.0.5-alpha1 imagePullPolicy: IfNotPresent ports: - containerPort: 8080 diff --git a/build/DaprTool.Solution.AppHost/aspirate-output/auth-sts/kustomization.yaml b/build/DaprTool.Solution.AppHost/aspirate-output/auth-sts/kustomization.yaml index 156756d..d8c748b 100644 --- a/build/DaprTool.Solution.AppHost/aspirate-output/auth-sts/kustomization.yaml +++ b/build/DaprTool.Solution.AppHost/aspirate-output/auth-sts/kustomization.yaml @@ -12,5 +12,7 @@ configMapGenerator: - OTEL_DOTNET_EXPERIMENTAL_OTLP_EMIT_EVENT_LOG_ATTRIBUTES=true - OTEL_DOTNET_EXPERIMENTAL_OTLP_RETRY=in_memory - ASPNETCORE_FORWARDEDHEADERS_ENABLED=true + - OTEL_EXPORTER_OTLP_ENDPOINT=http://aspire-dashboard:18889 + - OTEL_SERVICE_NAME=auth-sts - ASPNETCORE_URLS=http://+:8080; diff --git a/build/DaprTool.Solution.AppHost/aspirate-output/dashboard.yaml b/build/DaprTool.Solution.AppHost/aspirate-output/dashboard.yaml index 604fb1a..78c0a53 100644 --- a/build/DaprTool.Solution.AppHost/aspirate-output/dashboard.yaml +++ b/build/DaprTool.Solution.AppHost/aspirate-output/dashboard.yaml @@ -17,7 +17,7 @@ spec: terminationGracePeriodSeconds: 30 containers: - name: aspire-dashboard - image: mcr.microsoft.com/dotnet/nightly/aspire-dashboard:8.0.0-preview.7 + image: mcr.microsoft.com/dotnet/aspire-dashboard:8.0 resources: requests: cpu: "500m" @@ -32,18 +32,6 @@ spec: env: - name: DOTNET_DASHBOARD_UNSECURED_ALLOW_ANONYMOUS value: "true" - livenessProbe: - httpGet: - path: / - port: 18888 - initialDelaySeconds: 30 - periodSeconds: 10 - readinessProbe: - httpGet: - path: / - port: 18888 - initialDelaySeconds: 30 - periodSeconds: 10 --- apiVersion: v1 kind: Service diff --git a/build/DaprTool.Solution.AppHost/aspirate-output/kustomization.yaml b/build/DaprTool.Solution.AppHost/aspirate-output/kustomization.yaml index e6aa18e..3f3ba56 100644 --- a/build/DaprTool.Solution.AppHost/aspirate-output/kustomization.yaml +++ b/build/DaprTool.Solution.AppHost/aspirate-output/kustomization.yaml @@ -6,6 +6,7 @@ resources: - auth-admin - auth-api - order-api +- proxy-monitor - proxy-server - namespace.yaml - dashboard.yaml diff --git a/build/DaprTool.Solution.AppHost/aspirate-output/order-api/deployment.yaml b/build/DaprTool.Solution.AppHost/aspirate-output/order-api/deployment.yaml index d5ea0db..69db7c1 100644 --- a/build/DaprTool.Solution.AppHost/aspirate-output/order-api/deployment.yaml +++ b/build/DaprTool.Solution.AppHost/aspirate-output/order-api/deployment.yaml @@ -30,7 +30,7 @@ spec: spec: containers: - name: order-api - image: registry.cn-shenzhen.aliyuncs.com/huangshen/order-api:latest + image: registry.cn-shenzhen.aliyuncs.com/project-workspace/order-api:1.0.5-alpha1 imagePullPolicy: IfNotPresent ports: - containerPort: 8080 diff --git a/build/DaprTool.Solution.AppHost/aspirate-output/order-api/kustomization.yaml b/build/DaprTool.Solution.AppHost/aspirate-output/order-api/kustomization.yaml index 457dcf8..0af8212 100644 --- a/build/DaprTool.Solution.AppHost/aspirate-output/order-api/kustomization.yaml +++ b/build/DaprTool.Solution.AppHost/aspirate-output/order-api/kustomization.yaml @@ -12,5 +12,7 @@ configMapGenerator: - OTEL_DOTNET_EXPERIMENTAL_OTLP_EMIT_EVENT_LOG_ATTRIBUTES=true - OTEL_DOTNET_EXPERIMENTAL_OTLP_RETRY=in_memory - ASPNETCORE_FORWARDEDHEADERS_ENABLED=true + - OTEL_EXPORTER_OTLP_ENDPOINT=http://aspire-dashboard:18889 + - OTEL_SERVICE_NAME=order-api - ASPNETCORE_URLS=http://+:8080; diff --git a/build/DaprTool.Solution.AppHost/aspirate-output/proxy-monitor/deployment.yaml b/build/DaprTool.Solution.AppHost/aspirate-output/proxy-monitor/deployment.yaml new file mode 100644 index 0000000..7cb9ad3 --- /dev/null +++ b/build/DaprTool.Solution.AppHost/aspirate-output/proxy-monitor/deployment.yaml @@ -0,0 +1,31 @@ +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: proxy-monitor + labels: + app: proxy-monitor +spec: + minReadySeconds: 60 + replicas: 1 + selector: + matchLabels: + app: proxy-monitor + strategy: + type: Recreate + template: + metadata: + labels: + app: proxy-monitor + spec: + containers: + - name: proxy-monitor + image: registry.cn-shenzhen.aliyuncs.com/project-workspace/proxy-monitor:1.0.5-alpha1 + imagePullPolicy: IfNotPresent + ports: + - containerPort: 8080 + - containerPort: 8443 + envFrom: + - configMapRef: + name: proxy-monitor-env + terminationGracePeriodSeconds: 180 \ No newline at end of file diff --git a/build/DaprTool.Solution.AppHost/aspirate-output/proxy-monitor/kustomization.yaml b/build/DaprTool.Solution.AppHost/aspirate-output/proxy-monitor/kustomization.yaml new file mode 100644 index 0000000..7eda7cf --- /dev/null +++ b/build/DaprTool.Solution.AppHost/aspirate-output/proxy-monitor/kustomization.yaml @@ -0,0 +1,18 @@ +resources: +- deployment.yaml +- service.yaml + +generatorOptions: + disableNameSuffixHash: true + +configMapGenerator: +- name: proxy-monitor-env + literals: + - OTEL_DOTNET_EXPERIMENTAL_OTLP_EMIT_EXCEPTION_LOG_ATTRIBUTES=true + - OTEL_DOTNET_EXPERIMENTAL_OTLP_EMIT_EVENT_LOG_ATTRIBUTES=true + - OTEL_DOTNET_EXPERIMENTAL_OTLP_RETRY=in_memory + - ASPNETCORE_FORWARDEDHEADERS_ENABLED=true + - OTEL_EXPORTER_OTLP_ENDPOINT=http://aspire-dashboard:18889 + - OTEL_SERVICE_NAME=proxy-monitor + - ASPNETCORE_URLS=http://+:8080; + diff --git a/build/DaprTool.Solution.AppHost/aspirate-output/proxy-monitor/service.yaml b/build/DaprTool.Solution.AppHost/aspirate-output/proxy-monitor/service.yaml new file mode 100644 index 0000000..b98f60e --- /dev/null +++ b/build/DaprTool.Solution.AppHost/aspirate-output/proxy-monitor/service.yaml @@ -0,0 +1,16 @@ +--- +apiVersion: v1 +kind: Service +metadata: + name: proxy-monitor +spec: + type: ClusterIP + selector: + app: proxy-monitor + ports: + - name: http + port: 44430 + targetPort: 8080 + - name: https + port: 8443 + targetPort: 8443 diff --git a/build/DaprTool.Solution.AppHost/aspirate-output/proxy-server/deployment.yaml b/build/DaprTool.Solution.AppHost/aspirate-output/proxy-server/deployment.yaml index c7822b5..df0a426 100644 --- a/build/DaprTool.Solution.AppHost/aspirate-output/proxy-server/deployment.yaml +++ b/build/DaprTool.Solution.AppHost/aspirate-output/proxy-server/deployment.yaml @@ -20,7 +20,7 @@ spec: spec: containers: - name: proxy-server - image: registry.cn-shenzhen.aliyuncs.com/huangshen/proxy-server:latest + image: registry.cn-shenzhen.aliyuncs.com/project-workspace/proxy-server:1.0.5-alpha1 imagePullPolicy: IfNotPresent ports: - containerPort: 8080 diff --git a/build/DaprTool.Solution.AppHost/aspirate-output/proxy-server/kustomization.yaml b/build/DaprTool.Solution.AppHost/aspirate-output/proxy-server/kustomization.yaml index a23dcc6..be37258 100644 --- a/build/DaprTool.Solution.AppHost/aspirate-output/proxy-server/kustomization.yaml +++ b/build/DaprTool.Solution.AppHost/aspirate-output/proxy-server/kustomization.yaml @@ -17,5 +17,7 @@ configMapGenerator: - services__auth-sts__http__0=http://auth-sts:8080 - services__auth-api__http__0=http://auth-api:8080 - services__order-api__http__0=http://order-api:8080 + - OTEL_EXPORTER_OTLP_ENDPOINT=http://aspire-dashboard:18889 + - OTEL_SERVICE_NAME=proxy-server - ASPNETCORE_URLS=http://+:8080; diff --git a/build/DaprTool.Solution.AppHost/aspirate-state.json b/build/DaprTool.Solution.AppHost/aspirate-state.json index 596ccb4..db47f1f 100644 --- a/build/DaprTool.Solution.AppHost/aspirate-state.json +++ b/build/DaprTool.Solution.AppHost/aspirate-state.json @@ -4,13 +4,16 @@ "namespace": "dapr-playground", "containerRegistry": "registry.cn-shenzhen.aliyuncs.com", "containerImageTags": [ + "1.0.5-alpha1", "latest" ], + "imagePullPolicy": "IfNotPresent", "containerBuilder": "docker", - "containerRepositoryPrefix": "huangshen", + "containerRepositoryPrefix": "project-workspace", "outputFormat": "kustomize", "skipFinalKustomizeGeneration": false, "privateRegistryEmail": "aspir8@aka.ms", + "includeDashboard": true, "useCustomNamespace": true, "secrets": { "salt": "IkrA7nfBQ7D\u002BCckn", diff --git a/build/DaprTool.Solution.AppHost/aspirate.json b/build/DaprTool.Solution.AppHost/aspirate.json index 2a1d7dc..55d43af 100644 --- a/build/DaprTool.Solution.AppHost/aspirate.json +++ b/build/DaprTool.Solution.AppHost/aspirate.json @@ -2,7 +2,7 @@ "TemplatePath": null, "ContainerSettings": { "Registry": "registry.cn-shenzhen.aliyuncs.com", - "RepositoryPrefix": "huangshen", + "RepositoryPrefix": "project-workspace", "Tags": [ "latest" ], diff --git a/src/IdentityServer4/src/Idsrv4.Admin.Api/Idsrv4.Admin.Api.csproj b/src/IdentityServer4/src/Idsrv4.Admin.Api/Idsrv4.Admin.Api.csproj index 2efb2f1..f2ab51e 100644 --- a/src/IdentityServer4/src/Idsrv4.Admin.Api/Idsrv4.Admin.Api.csproj +++ b/src/IdentityServer4/src/Idsrv4.Admin.Api/Idsrv4.Admin.Api.csproj @@ -2,6 +2,7 @@ net8.0 1cc472a2-4e4b-48ce-846b-5219f71fc643 + false auth-api registry.cn-shenzhen.aliyuncs.com mcr.microsoft.com/dotnet/aspnet:8.0 diff --git a/src/ProxyServer/Program.cs b/src/ProxyServer/Program.cs index 3f89aa1..08821d9 100644 --- a/src/ProxyServer/Program.cs +++ b/src/ProxyServer/Program.cs @@ -1,5 +1,16 @@ +using Serilog.Sinks.SystemConsole.Themes; +using Serilog; + var builder = WebApplication.CreateBuilder(args); +using var serilog = new LoggerConfiguration() + .MinimumLevel.Debug() + .Enrich.FromLogContext() + .WriteTo.Console(theme: AnsiConsoleTheme.Code) + .CreateLogger(); +builder.Logging.ClearProviders(); +builder.Logging.AddSerilog(serilog, dispose: false); + builder.AddServiceDefaults(); builder.Services.AddAntiforgery(); @@ -10,7 +21,6 @@ builder.WebHost.ConfigureKestrel(options => options.Limits.MaxResponseBufferSize = 131072; // 增加到 128KB，根据需要调整 }); - // 如果不知道 路由 匹配 match 怎么配置 请参考链接 // https://learn.microsoft.com/zh-cn/aspnet/core/fundamentals/routing?view=aspnetcore-8.0#route-templates builder.Services diff --git a/src/ProxyServer/ProxyServer.csproj b/src/ProxyServer/ProxyServer.csproj index 7282199..6092cca 100644 --- a/src/ProxyServer/ProxyServer.csproj +++ b/src/ProxyServer/ProxyServer.csproj @@ -1,4 +1,4 @@ - + proxy-server @@ -7,9 +7,12 @@ - - - + + + + + + -- Gitee