diff --git a/apps/angular/dynamic-env.json b/apps/angular/dynamic-env.json index 1a1ff42a..6084fb35 100644 --- a/apps/angular/dynamic-env.json +++ b/apps/angular/dynamic-env.json @@ -10,7 +10,7 @@ "redirectUri": "https://eshop-st-web", "clientId": "EShopOnAbp_App", "responseType": "code", - "scope": "offline_access openid profile email phone IdentityService AdministrationService SaasService" + "scope": "offline_access openid profile email phone IdentityService AdministrationService" }, "apis": { "default": { diff --git a/apps/angular/src/environments/environment.prod.ts b/apps/angular/src/environments/environment.prod.ts index 20653898..7b471baa 100644 --- a/apps/angular/src/environments/environment.prod.ts +++ b/apps/angular/src/environments/environment.prod.ts @@ -14,7 +14,7 @@ export const environment = { redirectUri: baseUrl, clientId: 'Web', responseType: 'code', - scope: 'offline_access openid profile email phone IdentityService AdministrationService SaasService', + scope: 'offline_access openid profile email phone IdentityService AdministrationService', }, apis: { default: { diff --git a/apps/angular/src/environments/environment.ts b/apps/angular/src/environments/environment.ts index d79f4a8e..6096504f 100644 --- a/apps/angular/src/environments/environment.ts +++ b/apps/angular/src/environments/environment.ts @@ -14,7 +14,7 @@ export const environment = { clientId: 'Web', responseType: 'code', scope: - 'offline_access openid profile email phone IdentityService AdministrationService SaasService', + 'offline_access openid profile email phone IdentityService AdministrationService', requireHttps: true, }, apis: { diff --git a/apps/auth-server/src/EShopOnAbp.AuthServer/Dockerfile b/apps/auth-server/src/EShopOnAbp.AuthServer/Dockerfile index 1bbffe2c..a4eebf30 100644 --- a/apps/auth-server/src/EShopOnAbp.AuthServer/Dockerfile +++ b/apps/auth-server/src/EShopOnAbp.AuthServer/Dockerfile @@ -24,7 +24,6 @@ COPY "shared/EShopOnAbp.Shared.Localization/EShopOnAbp.Shared.Localization.cspro # Microservices COPY "services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/EShopOnAbp.AdministrationService.HttpApi.Host.csproj" "services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/EShopOnAbp.AdministrationService.HttpApi.Host.csproj" COPY "services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/EShopOnAbp.IdentityService.HttpApi.Host.csproj" "services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/EShopOnAbp.IdentityService.HttpApi.Host.csproj" -COPY *"services/saas/src/EShopOnAbp.SaasService.HttpApi.Host/EShopOnAbp.SaasService.HttpApi.Host.csproj" "services/saas/src/EShopOnAbp.SaasService.HttpApi.Host/EShopOnAbp.SaasService.HttpApi.Host.csproj" COPY *"services/basket/src/EShopOnAbp.BasketService.HttpApi.Host/EShopOnAbp.BasketService.HttpApi.Host.csproj" "services/basket/src/EShopOnAbp.BasketService.HttpApi.Host/EShopOnAbp.BasketService.HttpApi.Host.csproj" COPY *"services/ordering/src/EShopOnAbp.OrderingService.HttpApi.Host/EShopOnAbp.OrderingService.HttpApi.Host.csproj" "services/ordering/src/EShopOnAbp.OrderingService.HttpApi.Host/EShopOnAbp.OrderingService.HttpApi.Host.csproj" COPY *"services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Host/EShopOnAbp.CatalogService.HttpApi.Host.csproj" "services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Host/EShopOnAbp.CatalogService.HttpApi.Host.csproj" diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/Dockerfile b/apps/public-web/src/EShopOnAbp.PublicWeb/Dockerfile index 813b2f49..b81ecdea 100644 --- a/apps/public-web/src/EShopOnAbp.PublicWeb/Dockerfile +++ b/apps/public-web/src/EShopOnAbp.PublicWeb/Dockerfile @@ -24,7 +24,6 @@ COPY "shared/EShopOnAbp.Shared.Localization/EShopOnAbp.Shared.Localization.cspro # Microservices COPY "services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/EShopOnAbp.AdministrationService.HttpApi.Host.csproj" "services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/EShopOnAbp.AdministrationService.HttpApi.Host.csproj" COPY "services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/EShopOnAbp.IdentityService.HttpApi.Host.csproj" "services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/EShopOnAbp.IdentityService.HttpApi.Host.csproj" -COPY *"services/saas/src/EShopOnAbp.SaasService.HttpApi.Host/EShopOnAbp.SaasService.HttpApi.Host.csproj" "services/saas/src/EShopOnAbp.SaasService.HttpApi.Host/EShopOnAbp.SaasService.HttpApi.Host.csproj" COPY *"services/basket/src/EShopOnAbp.BasketService.HttpApi.Host/EShopOnAbp.BasketService.HttpApi.Host.csproj" "services/basket/src/EShopOnAbp.BasketService.HttpApi.Host/EShopOnAbp.BasketService.HttpApi.Host.csproj" COPY *"services/ordering/src/EShopOnAbp.OrderingService.HttpApi.Host/EShopOnAbp.OrderingService.HttpApi.Host.csproj" "services/ordering/src/EShopOnAbp.OrderingService.HttpApi.Host/EShopOnAbp.OrderingService.HttpApi.Host.csproj" COPY *"services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Host/EShopOnAbp.CatalogService.HttpApi.Host.csproj" "services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Host/EShopOnAbp.CatalogService.HttpApi.Host.csproj" diff --git a/build/build-images-locally.ps1 b/build/build-images-locally.ps1 index cf85bc3f..eb9ccc31 100644 --- a/build/build-images-locally.ps1 +++ b/build/build-images-locally.ps1 @@ -11,7 +11,6 @@ $webPublicGatewayFolder = Join-Path $slnFolder "gateways/web-public/src/EShopOnA $identityServiceFolder = Join-Path $slnFolder "services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host" $administrationServiceFolder = Join-Path $slnFolder "services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host" -$saasServiceFolder = Join-Path $slnFolder "services/saas/src/EShopOnAbp.SaasService.HttpApi.Host" ### Angular WEB App(WWW) Write-Host "*** BUILDING WEB (WWW) ****************" -ForegroundColor Green @@ -57,12 +56,6 @@ Set-Location $administrationServiceFolder dotnet publish -c Release docker build -f Dockerfile.local -t eshoponabp/service-administration:$version . -### SAAS-SERVICE -Write-Host "*** BUILDING SAAS-SERVICE ****************" -ForegroundColor Green -Set-Location $saasServiceFolder -dotnet publish -c Release -docker build -f Dockerfile.local -t eshoponabp/service-saas:$version . - ### ALL COMPLETED Write-Host "ALL COMPLETED" -ForegroundColor Green Set-Location $currentFolder \ No newline at end of file diff --git a/build/build-images.ps1 b/build/build-images.ps1 index c85d615c..25e45dca 100644 --- a/build/build-images.ps1 +++ b/build/build-images.ps1 @@ -11,7 +11,6 @@ $webPublicGatewayFolder = Join-Path $slnFolder "gateways/web-public/src/EShopOnA $identityServiceFolder = Join-Path $slnFolder "services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host" $administrationServiceFolder = Join-Path $slnFolder "services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host" -$saasServiceFolder = Join-Path $slnFolder "services/saas/src/EShopOnAbp.SaasService.HttpApi.Host" Write-Host "===== BUILDING APPLICATIONS =====" -ForegroundColor Yellow @@ -54,11 +53,6 @@ Write-Host "**************** BUILDING ADMINISTRATION-SERVICE ****************" - Set-Location $slnFolder docker build -f "$administrationServiceFolder/Dockerfile" -t eshoponabp/service-administration:$version . -### SAAS-SERVICE -Write-Host "**************** BUILDING SAAS-SERVICE ****************" -ForegroundColor Green -Set-Location $slnFolder -docker build -f "$saasServiceFolder/Dockerfile" -t eshoponabp/service-saas:$version . - ### ALL COMPLETED Write-Host "ALL COMPLETED" -ForegroundColor Green Set-Location $currentFolder \ No newline at end of file diff --git a/etc/README.md b/etc/README.md index b1c368b7..166c6502 100644 --- a/etc/README.md +++ b/etc/README.md @@ -23,7 +23,6 @@ helm install ingress-nginx ingress-nginx/ingress-nginx 127.0.0.1 eshop-st-authserver 127.0.0.1 eshop-st-identity 127.0.0.1 eshop-st-administration -127.0.0.1 eshop-st-saas 127.0.0.1 eshop-st-gateway-web 127.0.0.1 eshop-st-gateway-web-public ```` diff --git a/etc/k8s/eshoponabp/charts/administration/templates/administration-deployment.yaml b/etc/k8s/eshoponabp/charts/administration/templates/administration-deployment.yaml index 26f80d03..2b506bad 100644 --- a/etc/k8s/eshoponabp/charts/administration/templates/administration-deployment.yaml +++ b/etc/k8s/eshoponabp/charts/administration/templates/administration-deployment.yaml @@ -30,9 +30,7 @@ spec: - name: IdentityClients__Default__Authority value: "{{ .Values.synchedCommunication.authority }}" - name: "ConnectionStrings__AdministrationService" - value: "{{ .Values.config.connectionStrings.administrationService }}" - - name: "ConnectionStrings__SaasService" - value: "{{ .Values.config.connectionStrings.saasService }}" + value: "{{ .Values.config.connectionStrings.administrationService }}" - name: "DOTNET_ENVIRONMENT" value: "{{ .Values.config.dotnetEnv }}" - name: "Redis__Configuration" diff --git a/etc/k8s/eshoponabp/charts/administration/values.yaml b/etc/k8s/eshoponabp/charts/administration/values.yaml index 50b4e536..26aefe9d 100644 --- a/etc/k8s/eshoponabp/charts/administration/values.yaml +++ b/etc/k8s/eshoponabp/charts/administration/values.yaml @@ -4,7 +4,6 @@ config: corsOrigins: # https://eshop-st-gateway-web,https://eshop-st-gateway-public-web,https://eshop-st-gateway-internal connectionStrings: administrationService: # - saasService: # authServer: authority: http://eshop-st-authserver requireHttpsMetadata: "false" diff --git a/etc/k8s/eshoponabp/charts/authserver/templates/authserver-deployment.yaml b/etc/k8s/eshoponabp/charts/authserver/templates/authserver-deployment.yaml index 162929db..ec5107b2 100644 --- a/etc/k8s/eshoponabp/charts/authserver/templates/authserver-deployment.yaml +++ b/etc/k8s/eshoponabp/charts/authserver/templates/authserver-deployment.yaml @@ -31,8 +31,6 @@ spec: value: "{{ .Values.config.identityService.connString }}" - name: "ConnectionStrings__AdministrationService" value: "{{ .Values.config.administrationService.connString }}" - - name: "ConnectionStrings__SaasService" - value: "{{ .Values.config.saasService.connString }}" - name: "DOTNET_ENVIRONMENT" value: "{{ .Values.config.dotnetEnv }}" - name: "Redis__Configuration" diff --git a/etc/k8s/eshoponabp/charts/authserver/values.yaml b/etc/k8s/eshoponabp/charts/authserver/values.yaml index 7ac6934f..fb08bbec 100644 --- a/etc/k8s/eshoponabp/charts/authserver/values.yaml +++ b/etc/k8s/eshoponabp/charts/authserver/values.yaml @@ -1,13 +1,11 @@ config: selfUrl: # https://eshop-st-authserver - corsOrigins: # https://eshop-st-identity,https://eshop-st-administration,https://eshop-st-saas + corsOrigins: # https://eshop-st-identity,https://eshop-st-administration allowedRedirectUrls: https://eshop-st-web identityService: connString: # administrationService: - connString: # - saasService: - connString: # + connString: # dotnetEnv: # redisHost: # rabbitmqHost: # diff --git a/etc/k8s/eshoponabp/charts/gateway-web/templates/gateway-web-configmap.yaml b/etc/k8s/eshoponabp/charts/gateway-web/templates/gateway-web-configmap.yaml index 80b4cb7c..22d1155e 100644 --- a/etc/k8s/eshoponabp/charts/gateway-web/templates/gateway-web-configmap.yaml +++ b/etc/k8s/eshoponabp/charts/gateway-web/templates/gateway-web-configmap.yaml @@ -32,19 +32,6 @@ data: "UpstreamPathTemplate": "/api/account/{everything}", "UpstreamHttpMethod": [ "Put", "Delete", "Get", "Post" ] }, - { - "ServiceKey": "Saas Service", - "DownstreamPathTemplate": "/api/saas/{everything}", - "DownstreamScheme": "{{ .Values.reRoutes.saasService.schema }}", - "DownstreamHostAndPorts": [ - { - "Host": "{{ .Values.reRoutes.saasService.host }}", - "Port": {{ .Values.reRoutes.saasService.port }} - } - ], - "UpstreamPathTemplate": "/api/saas/{everything}", - "UpstreamHttpMethod": [ "Put", "Delete", "Get", "Post" ] - }, { "ServiceKey": "Administration Service", "DownstreamPathTemplate": "/api/abp/{everything}", diff --git a/etc/k8s/eshoponabp/charts/gateway-web/values.yaml b/etc/k8s/eshoponabp/charts/gateway-web/values.yaml index 68d4588f..40195ae2 100644 --- a/etc/k8s/eshoponabp/charts/gateway-web/values.yaml +++ b/etc/k8s/eshoponabp/charts/gateway-web/values.yaml @@ -19,10 +19,6 @@ reRoutes: schema: http host: eshop-st-administration port: 80 - saasService: - schema: # http - host: # eshop-st-saas - port: # 80 ingress: host: # eshop-st-gateway-web tlsSecret: eshop-demo-tls diff --git a/etc/k8s/eshoponabp/charts/identity/templates/identity-deployment.yaml b/etc/k8s/eshoponabp/charts/identity/templates/identity-deployment.yaml index 072eb431..a7adf73a 100644 --- a/etc/k8s/eshoponabp/charts/identity/templates/identity-deployment.yaml +++ b/etc/k8s/eshoponabp/charts/identity/templates/identity-deployment.yaml @@ -28,9 +28,7 @@ spec: - name: "ConnectionStrings__IdentityService" value: {{ .Values.config.connectionStrings.identityService }} - name: "ConnectionStrings__AdministrationService" - value: {{ .Values.config.connectionStrings.administrationService }} - - name: "ConnectionStrings__SaasService" - value: {{ .Values.config.connectionStrings.saasService }} + value: {{ .Values.config.connectionStrings.administrationService }} - name: "DOTNET_ENVIRONMENT" value: "{{ .Values.config.dotnetEnv }}" - name: "Redis__Configuration" @@ -51,8 +49,6 @@ spec: value: {{ .Values.identityServerClients.publicWebRootUrl }} - name: "IdentityServerClients__IdentityService__RootUrl" value: {{ .Values.identityServerClients.identityServiceRootUrl }} - - name: "IdentityServerClients__SaasService__RootUrl" - value: {{ .Values.identityServerClients.saasServiceRootUrl }} - name: "IdentityServerClients__AdministrationService__RootUrl" value: {{ .Values.identityServerClients.administrationServiceRootUrl }} - name: "IdentityServerClients__InternalGateway__RootUrl" diff --git a/etc/k8s/eshoponabp/charts/identity/values.yaml b/etc/k8s/eshoponabp/charts/identity/values.yaml index fb40c806..3710c1b7 100644 --- a/etc/k8s/eshoponabp/charts/identity/values.yaml +++ b/etc/k8s/eshoponabp/charts/identity/values.yaml @@ -4,7 +4,6 @@ config: connectionStrings: identityService: # administrationService: # - saasService: # authServer: authority: http://eshop-st-authserver requireHttpsMetadata: "false" @@ -22,7 +21,6 @@ identityServerClients: publicWebGatewayRootUrl: # identityServiceRootUrl: # administrationServiceRootUrl: # - saasServiceRootUrl: # ingress: host: eshop-st-identity diff --git a/etc/k8s/eshoponabp/charts/saas/Chart.yaml b/etc/k8s/eshoponabp/charts/saas/Chart.yaml deleted file mode 100644 index 659b4618..00000000 --- a/etc/k8s/eshoponabp/charts/saas/Chart.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: v2 -name: saas -appVersion: "1.0" -description: eShopOnAbp Saas Microservice -version: 1.0.0 -type: application \ No newline at end of file diff --git a/etc/k8s/eshoponabp/charts/saas/templates/saas-ingress.yaml b/etc/k8s/eshoponabp/charts/saas/templates/saas-ingress.yaml deleted file mode 100644 index e843265f..00000000 --- a/etc/k8s/eshoponabp/charts/saas/templates/saas-ingress.yaml +++ /dev/null @@ -1,27 +0,0 @@ -apiVersion: networking.k8s.io/v1 -kind: Ingress -metadata: - name: {{ .Release.Name }}-{{ .Chart.Name }}-ingress - annotations: - kubernetes.io/ingress.class: "nginx" - nginx.ingress.kubernetes.io/rewrite-target: / - nginx.ingress.kubernetes.io/force-ssl-redirect: "true" - nginx.ingress.kubernetes.io/proxy-buffer-size: 32k - nginx.ingress.kubernetes.io/proxy-buffers-number: "8" - cert-manager.io/cluster-issuer: letsencrypt -spec: - tls: - - hosts: - - {{ .Values.ingress.host }} - secretName: {{ .Values.ingress.tlsSecret }} - rules: - - host: "{{ .Values.ingress.host }}" - http: - paths: - - path: / - pathType: Prefix - backend: - service: - name: {{ .Release.Name }}-{{ .Chart.Name }} - port: - number: 80 \ No newline at end of file diff --git a/etc/k8s/eshoponabp/charts/saas/templates/saas-service.yaml b/etc/k8s/eshoponabp/charts/saas/templates/saas-service.yaml deleted file mode 100644 index ee157c01..00000000 --- a/etc/k8s/eshoponabp/charts/saas/templates/saas-service.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - labels: - name: {{ .Release.Name }}-{{ .Chart.Name }} - name: {{ .Release.Name }}-{{ .Chart.Name }} -spec: - ports: - - name: "80" - port: 80 - - name: "443" - port: 443 - selector: - app: {{ .Release.Name }}-{{ .Chart.Name }} diff --git a/etc/k8s/eshoponabp/charts/saas/templates/saas.yaml b/etc/k8s/eshoponabp/charts/saas/templates/saas.yaml deleted file mode 100644 index 52b83826..00000000 --- a/etc/k8s/eshoponabp/charts/saas/templates/saas.yaml +++ /dev/null @@ -1,49 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ .Release.Name }}-{{ .Chart.Name }} -spec: - selector: - matchLabels: - app: {{ .Release.Name }}-{{ .Chart.Name }} - template: - metadata: - labels: - app: {{ .Release.Name }}-{{ .Chart.Name }} - spec: - containers: - - image: {{ .Values.image.repository }}:{{ .Values.image.tag }} - imagePullPolicy: {{ .Values.image.pullPolicy }} - name: {{ .Release.Name }}-{{ .Chart.Name }} - ports: - - name: http - containerPort: 80 - - name: https - containerPort: 443 - env: - - name: App__SelfUrl - value: "{{ .Values.config.selfUrl }}" - - name: App__CorsOrigins - value: "{{ .Values.config.corsOrigins }}" - - name: "ConnectionStrings__AdministrationService" - value: {{ .Values.config.connectionStrings.administrationService }} - - name: "ConnectionStrings__SaasService" - value: {{ .Values.config.connectionStrings.saasService }} - - name: "DOTNET_ENVIRONMENT" - value: "{{ .Values.config.dotnetEnv }}" - - name: "Redis__Configuration" - value: "{{ .Values.config.redisHost }}" - - name: "RabbitMQ__Connections__Default__HostName" - value: "{{ .Values.config.rabbitmqHost }}" - - name: "ElasticSearch__Url" - value: "{{ .Values.config.elasticsearchHost }}" - - name: "AuthServer__Authority" - value: "{{ .Values.config.authServer.authority }}" - - name: "AuthServer__RequireHttpsMetadata" - value: "{{ .Values.config.authServer.requireHttpsMetadata }}" - - name: "StringEncryption__DefaultPassPhrase" - value: "{{ .Values.config.stringEncryptionDefaultPassPhrase }}" - {{- if .Values.env }} -{{ toYaml .Values.env | indent 8 }} - {{- end }} - diff --git a/etc/k8s/eshoponabp/charts/saas/values.yaml b/etc/k8s/eshoponabp/charts/saas/values.yaml deleted file mode 100644 index badbfdf7..00000000 --- a/etc/k8s/eshoponabp/charts/saas/values.yaml +++ /dev/null @@ -1,25 +0,0 @@ -config: - selfUrl: https://eshop-st-saas - corsOrigins: https://eshop-st-gateway-web,https://eshop-st-gateway-public-web,https://eshop-st-gateway-internal - connectionStrings: - administrationService: "Server=es-st-sqldb,1433;Database=EShopOnAbp_Administration;User Id=sa;password=myPassw@rd;MultipleActiveResultSets=true" - saasService: "Server=es-st-sqldb,1433;Database=EShopOnAbp_Saas;User Id=sa;password=myPassw@rd;MultipleActiveResultSets=true" - authServer: - authority: http://eshop-st-authserver - requireHttpsMetadata: "false" - dotnetEnv: Staging - redisHost: es-st-redis - rabbitmqHost: es-st-rabbitmq - elasticsearchHost: es-st-elasticsearch - stringEncryptionDefaultPassPhrase: gsKnGZ041HLL4IM8 - -ingress: - host: eshop-st-saas - tlsSecret: eshop-demo-tls - -image: - repository: eshoponabp/service-saas - tag: latest - pullPolicy: IfNotPresent - -env: {} \ No newline at end of file diff --git a/etc/k8s/eshoponabp/values.yaml b/etc/k8s/eshoponabp/values.yaml index 514c90ac..35640471 100644 --- a/etc/k8s/eshoponabp/values.yaml +++ b/etc/k8s/eshoponabp/values.yaml @@ -8,8 +8,6 @@ authserver: connString: "Server=es-st-sqldb,1433;Database=EShopOnAbp_Identity;User Id=sa;password=myPassw@rd;MultipleActiveResultSets=true" administrationService: connString: "Server=es-st-sqldb,1433;Database=EShopOnAbp_Administration;User Id=sa;password=myPassw@rd;MultipleActiveResultSets=true" - saasService: - connString: "Server=es-st-sqldb,1433;Database=EShopOnAbp_Saas;User Id=sa;password=myPassw@rd;MultipleActiveResultSets=true" dotnetEnv: Staging redisHost: es-st-redis rabbitmqHost: es-st-rabbitmq @@ -57,7 +55,6 @@ identity: connectionStrings: identityService: "Server=es-st-sqldb,1433;Database=EShopOnAbp_Identity;User Id=sa;password=myPassw@rd;MultipleActiveResultSets=true" administrationService: "Server=es-st-sqldb,1433;Database=EShopOnAbp_Administration;User Id=sa;password=myPassw@rd;MultipleActiveResultSets=true" - saasService: "Server=es-st-sqldb,1433;Database=EShopOnAbp_Saas;User Id=sa;password=myPassw@rd;MultipleActiveResultSets=true" authServer: authority: http://eshop-st-authserver requireHttpsMetadata: "false" @@ -72,7 +69,6 @@ identity: publicWebGatewayRootUrl: https://eshop-st-gateway-web-public/ identityServiceRootUrl: https://eshop-st-identity/ administrationServiceRootUrl: https://eshop-st-administration/ - saasServiceRootUrl: https://eshop-st-saas/ ingress: host: eshop-st-identity image: @@ -87,7 +83,6 @@ administration: corsOrigins: https://eshop-st-gateway-web,https://eshop-st-gateway-web-public,https://eshop-st-gateway-internal connectionStrings: administrationService: "Server=es-st-sqldb,1433;Database=EShopOnAbp_Administration;User Id=sa;password=myPassw@rd;MultipleActiveResultSets=true" - saasService: "Server=es-st-sqldb,1433;Database=EShopOnAbp_Saas;User Id=sa;password=myPassw@rd;MultipleActiveResultSets=true" authServer: authority: http://eshop-st-authserver requireHttpsMetadata: "false" @@ -131,10 +126,6 @@ gateway-web: schema: http host: eshop-st-administration port: 80 - saasService: - schema: http - host: eshop-st-saas - port: 80 # gateway-web-public sub-chart override gateway-web-public: diff --git a/etc/scripts/build-images.ps1 b/etc/scripts/build-images.ps1 index 592bef60..4d7bb606 100644 --- a/etc/scripts/build-images.ps1 +++ b/etc/scripts/build-images.ps1 @@ -12,7 +12,6 @@ $internalGatewayFolder = Join-Path $slnFolder "gateways/internal/src/EShopOnAbp. $identityServiceFolder = Join-Path $slnFolder "services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host" $administrationServiceFolder = Join-Path $slnFolder "services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host" -$saasServiceFolder = Join-Path $slnFolder "services/saas/src/EShopOnAbp.SaasService.HttpApi.Host" ### Angular WEB App(WWW) Write-Host "*** BUILDING WEB (WWW) ****************" -ForegroundColor Green @@ -64,12 +63,6 @@ Set-Location $administrationServiceFolder dotnet publish -c Release docker build -t eshoponabp/service-administration:$version . -### SAAS-SERVICE -Write-Host "*** BUILDING SAAS-SERVICE ****************" -ForegroundColor Green -Set-Location $saasServiceFolder -dotnet publish -c Release -docker build -t eshoponabp/service-saas:$version . - ### ALL COMPLETED Write-Host "ALL COMPLETED" -ForegroundColor Green Set-Location $currentFolder \ No newline at end of file diff --git a/gateways/web-public/src/EShopOnAbp.WebPublicGateway/Dockerfile b/gateways/web-public/src/EShopOnAbp.WebPublicGateway/Dockerfile index ea373981..07ae24fa 100644 --- a/gateways/web-public/src/EShopOnAbp.WebPublicGateway/Dockerfile +++ b/gateways/web-public/src/EShopOnAbp.WebPublicGateway/Dockerfile @@ -24,7 +24,6 @@ COPY "shared/EShopOnAbp.Shared.Localization/EShopOnAbp.Shared.Localization.cspro # Microservices COPY "services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/EShopOnAbp.AdministrationService.HttpApi.Host.csproj" "services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/EShopOnAbp.AdministrationService.HttpApi.Host.csproj" COPY "services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/EShopOnAbp.IdentityService.HttpApi.Host.csproj" "services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/EShopOnAbp.IdentityService.HttpApi.Host.csproj" -COPY *"services/saas/src/EShopOnAbp.SaasService.HttpApi.Host/EShopOnAbp.SaasService.HttpApi.Host.csproj" "services/saas/src/EShopOnAbp.SaasService.HttpApi.Host/EShopOnAbp.SaasService.HttpApi.Host.csproj" COPY *"services/basket/src/EShopOnAbp.BasketService.HttpApi.Host/EShopOnAbp.BasketService.HttpApi.Host.csproj" "services/basket/src/EShopOnAbp.BasketService.HttpApi.Host/EShopOnAbp.BasketService.HttpApi.Host.csproj" COPY *"services/ordering/src/EShopOnAbp.OrderingService.HttpApi.Host/EShopOnAbp.OrderingService.HttpApi.Host.csproj" "services/ordering/src/EShopOnAbp.OrderingService.HttpApi.Host/EShopOnAbp.OrderingService.HttpApi.Host.csproj" COPY *"services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Host/EShopOnAbp.CatalogService.HttpApi.Host.csproj" "services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Host/EShopOnAbp.CatalogService.HttpApi.Host.csproj" diff --git a/gateways/web/src/EShopOnAbp.WebGateway/Dockerfile b/gateways/web/src/EShopOnAbp.WebGateway/Dockerfile index 9ad062f6..5975a2ec 100644 --- a/gateways/web/src/EShopOnAbp.WebGateway/Dockerfile +++ b/gateways/web/src/EShopOnAbp.WebGateway/Dockerfile @@ -24,7 +24,6 @@ COPY "shared/EShopOnAbp.Shared.Localization/EShopOnAbp.Shared.Localization.cspro # Microservices COPY "services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/EShopOnAbp.AdministrationService.HttpApi.Host.csproj" "services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/EShopOnAbp.AdministrationService.HttpApi.Host.csproj" COPY "services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/EShopOnAbp.IdentityService.HttpApi.Host.csproj" "services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/EShopOnAbp.IdentityService.HttpApi.Host.csproj" -COPY *"services/saas/src/EShopOnAbp.SaasService.HttpApi.Host/EShopOnAbp.SaasService.HttpApi.Host.csproj" "services/saas/src/EShopOnAbp.SaasService.HttpApi.Host/EShopOnAbp.SaasService.HttpApi.Host.csproj" COPY *"services/basket/src/EShopOnAbp.BasketService.HttpApi.Host/EShopOnAbp.BasketService.HttpApi.Host.csproj" "services/basket/src/EShopOnAbp.BasketService.HttpApi.Host/EShopOnAbp.BasketService.HttpApi.Host.csproj" COPY *"services/ordering/src/EShopOnAbp.OrderingService.HttpApi.Host/EShopOnAbp.OrderingService.HttpApi.Host.csproj" "services/ordering/src/EShopOnAbp.OrderingService.HttpApi.Host/EShopOnAbp.OrderingService.HttpApi.Host.csproj" COPY *"services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Host/EShopOnAbp.CatalogService.HttpApi.Host.csproj" "services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Host/EShopOnAbp.CatalogService.HttpApi.Host.csproj" diff --git a/gateways/web/src/EShopOnAbp.WebGateway/appsettings.json b/gateways/web/src/EShopOnAbp.WebGateway/appsettings.json index e7b9ea22..22148ec9 100644 --- a/gateways/web/src/EShopOnAbp.WebGateway/appsettings.json +++ b/gateways/web/src/EShopOnAbp.WebGateway/appsettings.json @@ -44,19 +44,6 @@ "UpstreamPathTemplate": "/api/account/{everything}", "UpstreamHttpMethod": [ "Put", "Delete", "Get", "Post" ] }, - { - "ServiceKey": "Saas Service", - "DownstreamPathTemplate": "/api/multi-tenancy/{everything}", - "DownstreamScheme": "https", - "DownstreamHostAndPorts": [ - { - "Host": "localhost", - "Port": 44352 - } - ], - "UpstreamPathTemplate": "/api/multi-tenancy/{everything}", - "UpstreamHttpMethod": [ "Put", "Delete", "Get", "Post" ] - }, { "ServiceKey": "Administration Service", "DownstreamPathTemplate": "/api/abp/{everything}", diff --git a/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/Dockerfile b/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/Dockerfile index d498afbf..aa55922f 100644 --- a/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/Dockerfile +++ b/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/Dockerfile @@ -24,7 +24,6 @@ COPY "shared/EShopOnAbp.Shared.Localization/EShopOnAbp.Shared.Localization.cspro # Microservices COPY "services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/EShopOnAbp.AdministrationService.HttpApi.Host.csproj" "services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/EShopOnAbp.AdministrationService.HttpApi.Host.csproj" COPY "services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/EShopOnAbp.IdentityService.HttpApi.Host.csproj" "services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/EShopOnAbp.IdentityService.HttpApi.Host.csproj" -COPY *"services/saas/src/EShopOnAbp.SaasService.HttpApi.Host/EShopOnAbp.SaasService.HttpApi.Host.csproj" "services/saas/src/EShopOnAbp.SaasService.HttpApi.Host/EShopOnAbp.SaasService.HttpApi.Host.csproj" COPY *"services/basket/src/EShopOnAbp.BasketService.HttpApi.Host/EShopOnAbp.BasketService.HttpApi.Host.csproj" "services/basket/src/EShopOnAbp.BasketService.HttpApi.Host/EShopOnAbp.BasketService.HttpApi.Host.csproj" COPY *"services/ordering/src/EShopOnAbp.OrderingService.HttpApi.Host/EShopOnAbp.OrderingService.HttpApi.Host.csproj" "services/ordering/src/EShopOnAbp.OrderingService.HttpApi.Host/EShopOnAbp.OrderingService.HttpApi.Host.csproj" COPY *"services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Host/EShopOnAbp.CatalogService.HttpApi.Host.csproj" "services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Host/EShopOnAbp.CatalogService.HttpApi.Host.csproj" diff --git a/services/basket/src/EShopOnAbp.BasketService.HttpApi.Host/BasketServiceHttpApiHostModule.cs b/services/basket/src/EShopOnAbp.BasketService.HttpApi.Host/BasketServiceHttpApiHostModule.cs index aa2e62ce..2031c71f 100644 --- a/services/basket/src/EShopOnAbp.BasketService.HttpApi.Host/BasketServiceHttpApiHostModule.cs +++ b/services/basket/src/EShopOnAbp.BasketService.HttpApi.Host/BasketServiceHttpApiHostModule.cs @@ -77,7 +77,7 @@ namespace EShopOnAbp.BasketService app.UseAbpClaimsMap(); app.UseAuthorization(); app.UseSwagger(); - app.UseSwaggerUI(options => { options.SwaggerEndpoint("/swagger/v1/swagger.json", "Saas Service API"); }); + app.UseSwaggerUI(options => { options.SwaggerEndpoint("/swagger/v1/swagger.json", "Basket Service API"); }); app.UseAbpSerilogEnrichers(); app.UseAuditing(); app.UseUnitOfWork(); diff --git a/services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Host/CatalogServiceHttpApiHostModule.cs b/services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Host/CatalogServiceHttpApiHostModule.cs index 78d3ea91..ca4bdc4a 100644 --- a/services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Host/CatalogServiceHttpApiHostModule.cs +++ b/services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Host/CatalogServiceHttpApiHostModule.cs @@ -82,7 +82,7 @@ namespace EShopOnAbp.CatalogService app.UseAbpClaimsMap(); app.UseAuthorization(); app.UseSwagger(); - app.UseSwaggerUI(options => { options.SwaggerEndpoint("/swagger/v1/swagger.json", "Saas Service API"); }); + app.UseSwaggerUI(options => { options.SwaggerEndpoint("/swagger/v1/swagger.json", "Catalog Service API"); }); app.UseAbpSerilogEnrichers(); app.UseAuditing(); app.UseUnitOfWork(); diff --git a/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/DbMigrations/IdentityServerDataSeeder.cs b/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/DbMigrations/IdentityServerDataSeeder.cs index 98b4cb84..ea138191 100644 --- a/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/DbMigrations/IdentityServerDataSeeder.cs +++ b/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/DbMigrations/IdentityServerDataSeeder.cs @@ -85,7 +85,6 @@ namespace EShopOnAbp.IdentityService.DbMigrations await CreateApiResourceAsync("IdentityService", commonApiUserClaims); await CreateApiResourceAsync("AdministrationService", commonApiUserClaims); - await CreateApiResourceAsync("SaasService", commonApiUserClaims); await CreateApiResourceAsync("CatalogService", commonApiUserClaims); await CreateApiResourceAsync("BasketService", commonApiUserClaims); await CreateApiResourceAsync("OrderingService", commonApiUserClaims); @@ -96,7 +95,6 @@ namespace EShopOnAbp.IdentityService.DbMigrations { await CreateApiScopeAsync("IdentityService"); await CreateApiScopeAsync("AdministrationService"); - await CreateApiScopeAsync("SaasService"); await CreateApiScopeAsync("CatalogService"); await CreateApiScopeAsync("BasketService"); await CreateApiScopeAsync("OrderingService"); @@ -108,9 +106,6 @@ namespace EShopOnAbp.IdentityService.DbMigrations await CreateSwaggerClientAsync("IdentityService", new[] { "IdentityService"}); - await CreateSwaggerClientAsync("SaasService", - new[] { "SaasService" }); - await CreateSwaggerClientAsync("AdministrationService", new[] { "AdministrationService" }); @@ -239,8 +234,7 @@ namespace EShopOnAbp.IdentityService.DbMigrations scopes: commonScopes.Union(new[] { "IdentityService", - "AdministrationService", - "SaasService" + "AdministrationService" }), grantTypes: new[] { "authorization_code", "LinkLogin" }, secret: "1q2w3e*".Sha256(), diff --git a/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/Dockerfile b/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/Dockerfile index a2a86593..7ac0145c 100644 --- a/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/Dockerfile +++ b/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/Dockerfile @@ -24,7 +24,6 @@ COPY "shared/EShopOnAbp.Shared.Localization/EShopOnAbp.Shared.Localization.cspro # Microservices COPY "services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/EShopOnAbp.AdministrationService.HttpApi.Host.csproj" "services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/EShopOnAbp.AdministrationService.HttpApi.Host.csproj" COPY "services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/EShopOnAbp.IdentityService.HttpApi.Host.csproj" "services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/EShopOnAbp.IdentityService.HttpApi.Host.csproj" -COPY *"services/saas/src/EShopOnAbp.SaasService.HttpApi.Host/EShopOnAbp.SaasService.HttpApi.Host.csproj" "services/saas/src/EShopOnAbp.SaasService.HttpApi.Host/EShopOnAbp.SaasService.HttpApi.Host.csproj" COPY *"services/basket/src/EShopOnAbp.BasketService.HttpApi.Host/EShopOnAbp.BasketService.HttpApi.Host.csproj" "services/basket/src/EShopOnAbp.BasketService.HttpApi.Host/EShopOnAbp.BasketService.HttpApi.Host.csproj" COPY *"services/ordering/src/EShopOnAbp.OrderingService.HttpApi.Host/EShopOnAbp.OrderingService.HttpApi.Host.csproj" "services/ordering/src/EShopOnAbp.OrderingService.HttpApi.Host/EShopOnAbp.OrderingService.HttpApi.Host.csproj" COPY *"services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Host/EShopOnAbp.CatalogService.HttpApi.Host.csproj" "services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Host/EShopOnAbp.CatalogService.HttpApi.Host.csproj" diff --git a/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/appsettings.json b/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/appsettings.json index 4b03f5f5..4de16837 100644 --- a/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/appsettings.json +++ b/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/appsettings.json @@ -19,8 +19,7 @@ "AllowedHosts": "*", "ConnectionStrings": { "IdentityService": "Server=localhost,1434;Database=EShopOnAbp_Identity;User Id=sa;password=myPassw0rd", - "AdministrationService": "Server=localhost,1434;Database=EShopOnAbp_Administration;User Id=sa;password=myPassw0rd", - "SaasService": "Server=localhost,1434;Database=EShopOnAbp_Saas;User Id=sa;password=myPassw0rd" + "AdministrationService": "Server=localhost,1434;Database=EShopOnAbp_Administration;User Id=sa;password=myPassw0rd" }, "StringEncryption": { "DefaultPassPhrase": "gsKnGZ041HLL4IM8" @@ -58,9 +57,6 @@ "IdentityService": { "RootUrl": "https://localhost:44351" }, - "SaasService": { - "RootUrl": "https://localhost:44352" - }, "AdministrationService": { "RootUrl": "https://localhost:44353" }, diff --git a/services/ordering/src/EShopOnAbp.OrderingService.HttpApi.Host/OrderingServiceHttpApiHostModule.cs b/services/ordering/src/EShopOnAbp.OrderingService.HttpApi.Host/OrderingServiceHttpApiHostModule.cs index 2fbed780..90901243 100644 --- a/services/ordering/src/EShopOnAbp.OrderingService.HttpApi.Host/OrderingServiceHttpApiHostModule.cs +++ b/services/ordering/src/EShopOnAbp.OrderingService.HttpApi.Host/OrderingServiceHttpApiHostModule.cs @@ -82,7 +82,7 @@ namespace EShopOnAbp.OrderingService app.UseAbpClaimsMap(); app.UseAuthorization(); app.UseSwagger(); - app.UseSwaggerUI(options => { options.SwaggerEndpoint("/swagger/v1/swagger.json", "Saas Service API"); }); + app.UseSwaggerUI(options => { options.SwaggerEndpoint("/swagger/v1/swagger.json", "ORdering Service API"); }); app.UseAbpSerilogEnrichers(); app.UseAuditing(); app.UseUnitOfWork(); diff --git a/services/payment/src/EShopOnAbp.PaymentService.HttpApi.Host/PaymentServiceHttpApiHostModule.cs b/services/payment/src/EShopOnAbp.PaymentService.HttpApi.Host/PaymentServiceHttpApiHostModule.cs index 1ebad85e..497eca00 100644 --- a/services/payment/src/EShopOnAbp.PaymentService.HttpApi.Host/PaymentServiceHttpApiHostModule.cs +++ b/services/payment/src/EShopOnAbp.PaymentService.HttpApi.Host/PaymentServiceHttpApiHostModule.cs @@ -81,7 +81,7 @@ namespace EShopOnAbp.PaymentService app.UseAbpClaimsMap(); app.UseAuthorization(); app.UseSwagger(); - app.UseSwaggerUI(options => { options.SwaggerEndpoint("/swagger/v1/swagger.json", "Saas Service API"); }); + app.UseSwaggerUI(options => { options.SwaggerEndpoint("/swagger/v1/swagger.json", "Payment Service API"); }); app.UseAbpSerilogEnrichers(); app.UseAuditing(); app.UseUnitOfWork(); diff --git a/shared/EShopOnAbp.Shared.Hosting/EShopOnAbpSharedHostingModule.cs b/shared/EShopOnAbp.Shared.Hosting/EShopOnAbpSharedHostingModule.cs index 094b72bf..904fd810 100644 --- a/shared/EShopOnAbp.Shared.Hosting/EShopOnAbpSharedHostingModule.cs +++ b/shared/EShopOnAbp.Shared.Hosting/EShopOnAbpSharedHostingModule.cs @@ -18,12 +18,6 @@ namespace EShopOnAbp.Shared.Hosting { Configure(options => { - options.Databases.Configure("SaasService", database => - { - database.MappedConnections.Add("AbpTenantManagement"); - database.IsUsedByTenants = false; - }); - options.Databases.Configure("AdministrationService", database => { database.MappedConnections.Add("AbpAuditLogging");