🚑 日常Bug修复

.github/workflows/dotnet.yml

@@ -1,52 +0,0 @@
-name: Build-Dokcer
-on:
-  push:
-    tags:
-      - "*"
-
-jobs:
-  Push-DockerHub:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: Install Dotnet 6.x
-        uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: "6.0"
-          include-prerelease: True
-      - name: 设置标签
-        id: vars
-        run: echo ::set-output name=tag::${GITHUB_REF:10}
-
-      - name: 编译
-        run: dotnet build aspnet-core/Lion.AbpPro.sln
-
-      - name: 发布HostApi
-        run: cd aspnet-core/services/host/Lion.AbpPro.HttpApi.Host &&
-          dotnet publish -c release -o publish &&
-          docker build  -t abp-vnext-pro-api:${{ steps.vars.outputs.tag }} .
-
-      - name: 发布IdentityServer4
-        run: cd aspnet-core/services/host/Lion.AbpPro.IdentityServer &&
-          dotnet publish -c release -o publish &&
-          docker build  -t abp-vnext-pro-id4:${{ steps.vars.outputs.tag }} .
-
-      - name: 发布WebGateway
-        run: cd aspnet-core/gateways/Lion.AbpPro.WebGateway &&
-          dotnet publish -c release -o publish &&
-          docker build  -t abp-vnext-pro-web-gateway:${{ steps.vars.outputs.tag }} .  
-
-      - name: 登录Docker
-        run: docker login -u zzzwangjun -p ${{secrets.dockerHubPassword}}
-
-      - name: HostApi镜像推送到DockerHub
-        run: docker tag  abp-vnext-pro-api:${{ steps.vars.outputs.tag }} zzzwangjun/abp-vnext-pro-api:${{ steps.vars.outputs.tag }} &&
-          docker push zzzwangjun/abp-vnext-pro-api:${{ steps.vars.outputs.tag }}
-
-      - name: IdentityServer4镜像推送到DockerHub
-        run: docker tag  abp-vnext-pro-id4:${{ steps.vars.outputs.tag }} zzzwangjun/abp-vnext-pro-id4:${{ steps.vars.outputs.tag }} &&
-          docker push zzzwangjun/abp-vnext-pro-id4:${{ steps.vars.outputs.tag }}
-
-      - name: WebGateway镜像推送到DockerHub
-        run: docker tag  abp-vnext-pro-web-gateway:${{ steps.vars.outputs.tag }} zzzwangjun/abp-vnext-pro-web-gateway:${{ steps.vars.outputs.tag }} &&
-          docker push zzzwangjun/abp-vnext-pro-web-gateway:${{ steps.vars.outputs.tag }}

.github/workflows/vben2.7.yml

@@ -1,26 +0,0 @@
-name: Vben2.7
-on:
-  push:
-    tags:
-      - "*"
-jobs:
-  Push-DockerHub:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: Use Node.js
-        uses: actions/setup-node@v1
-        with:
-          node-version: 14.x
-      - name: Set Tag
-        id: vars
-        run: echo ::set-output name=tag::${GITHUB_REF:10}
-
-      - name: Build And Push Docker Hub
-        run: cd vben271 &&
-          npm install &&
-          npm run build &&
-          docker login -u zzzwangjun -p ${{secrets.dockerHubPassword}} &&
-          docker build -t abp-vnext-pro-ui:${{ steps.vars.outputs.tag }} . &&
-          docker tag  abp-vnext-pro-ui:${{ steps.vars.outputs.tag }} zzzwangjun/abp-vnext-pro-ui:${{ steps.vars.outputs.tag }} &&
-          docker push zzzwangjun/abp-vnext-pro-ui:${{ steps.vars.outputs.tag }}

aspnet-core/gateways/Lion.AbpPro.WebGateway/appsettings.Consul.json

@@ -0,0 +1,48 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft": "Warning",
+      "Microsoft.Hosting.Lifetime": "Information"
+    }
+  },
+  "AllowedHosts": "*",
+  "App": {
+    "SelfUrl": "http://120.24.194.14:8014",
+    "CorsOrigins": "http://localhost:4200,http://120.24.194.14:8012,http://120.24.194.14:8011,http://120.24.194.14:8013"
+  },
+  "GlobalConfiguration": {
+  },
+  "Routes": [
+    {
+      "DownstreamPathTemplate": "/{url}",
+      "DownstreamScheme": "http",
+      "ServiceName": "AbpPro-Service",
+      "LoadBalancerOptions": {
+        "Type": "LeastConnection"
+      },
+      "UpstreamPathTemplate": "/gateway/{url}",
+      "UpstreamHttpMethod": [
+        "Get",
+        "Post",
+        "Put",
+        "Delete"
+      ]
+    },
+    {
+      "DownstreamPathTemplate": "/{url}",
+      "DownstreamScheme": "ws",
+      "ServiceName": "AbpPro-Service",
+      "LoadBalancerOptions": {
+        "Type": "LeastConnection"
+      },
+      "UpstreamPathTemplate": "/ws/{url}",
+      "UpstreamHttpMethod": [
+        "Get",
+        "Post",
+        "Put",
+        "Delete"
+      ]
+    }
+  ]
+}

aspnet-core/services/host/Lion.AbpPro.IdentityServer/AbpProIdentityServerModule.cs

@@ -95,21 +95,13 @@ namespace Lion.AbpPro
         }
 
         private void ConfigureOther(IConfiguration configuration)
-
         {
-            Configure<AppUrlOptions>(options =>
-            {
-                options.Applications["MVC"].RootUrl = configuration["App:SelfUrl"];
-                options.RedirectAllowedUrls.AddRange(configuration["App:RedirectAllowedUrls"].Split(','));
-
-                options.Applications["Angular"].RootUrl = configuration["App:ClientUrl"];
-                options.Applications["Angular"].Urls[AccountUrlNames.PasswordReset] = "account/reset-password";
-            });
+ 
             Configure<AbpBackgroundJobOptions>(options => { options.IsJobExecutionEnabled = false; });
             Configure<AbpAuditingOptions>(options =>
             {
                 //options.IsEnabledForGetRequests = true;
-                options.ApplicationName = "AuthServer";
+                options.ApplicationName = "IdentityServer";
             });
         }
 

aspnet-core/services/src/Lion.AbpPro.Domain/Data/Seeds/AbpSettingDataSeedContributor.cs

@@ -9,7 +9,7 @@ namespace Lion.AbpPro.Data.Seeds
     {
         private readonly ISettingManager _settingManager;
         private const string DefaultLanguageKey = "Abp.Localization.DefaultLanguage";
-        private const string DefaultLanguage = "zh-hans";
+        private const string DefaultLanguage = "zh-Hans";
         public AbpSettingDataSeedContributor(ISettingManager settingManager)
         {
             _settingManager = settingManager;