Merge branch 'master' of http://140.143.162.39:3000/wxd/WebPeis0523

src/Shentun.WebPeis.Application/Users/UserAppService.cs

@@ -95,7 +95,7 @@ namespace Shentun.WebPeis.Users
         [HttpPost("api/app/Users/UpdatePassWord")]
         public async Task UpdatePassWordAsync(UpdatePassWordDto input)
         {
-  
+
             var user = await _userManager.FindByIdAsync(_currentUser.Id.ToString());
             if (user != null)
             {
@@ -110,7 +110,7 @@ namespace Shentun.WebPeis.Users
                 await _userManager.AddPasswordAsync(user, input.NewPassWord);
 
             }
-           
+
 
         }
 
@@ -204,11 +204,13 @@ namespace Shentun.WebPeis.Users
 
         protected virtual async Task<TokenResponse> RequestAuthServerLoginByPasswordAsync(HttpClient client, string username, string password)
         {
-
+            var AdminUrl = _configuration.GetSection("Kestrel")
+                  .GetSection("Endpoints").GetSection("Http")
+                  .GetSection("Url").Value;
 
             var request = new PasswordTokenRequest
             {
-                Address = _configuration["AuthServer:Authority"] + "/connect/token",
+                Address = AdminUrl + "/connect/token",
                 //GrantType = "password",
                 //UserName = username,
                 //Password = password,
@@ -216,12 +218,12 @@ namespace Shentun.WebPeis.Users
                 //ClientId = "Peis_App",
                 Parameters =
                 {
-                    {"username",username},
-                    {"password",password },
-                    {"scope","WebPeis offline_access" },
-                    {"client_id","WebPeis_App" },
-                    {"grant_type","password" }
-                }
+                { "username",username},
+                    { "password",password },
+                    { "scope","WebPeis offline_access" },
+                    { "client_id","WebPeis_App" },
+                    { "grant_type","password" }
+            }
             };
 
             //request.Headers.Add("Content-Type", "application/x-www-form-urlencoded");

src/Shentun.WebPeis.HttpApi.Host/WebPeisHttpApiHostModule.cs

@@ -182,7 +182,12 @@ public class WebPeisHttpApiHostModule : AbpModule
         });
 
 
-
+        ///解除https限制
+        context.Services.AddOpenIddict()
+            .AddServer(option =>
+            {
+                option.UseAspNetCore().DisableTransportSecurityRequirement();
+            });
 
 
         //Configure<OpenIddictServerAspNetCoreBuilder>(configure =>
@@ -454,20 +459,24 @@ public class WebPeisHttpApiHostModule : AbpModule
         app.UseDynamicClaims();
         app.UseAuthorization();
 
-        app.UseSwagger();
-        app.UseAbpSwaggerUI(c =>
+        //配置是否启用swagger
+        var IsSwagger = Convert.ToBoolean(configuration["Swagger:IsEnabled"]);
+        if (IsSwagger)
         {
-            c.SwaggerEndpoint($"/swagger/Work/swagger.json", "业务API");  //分组显示
-            c.SwaggerEndpoint($"/swagger/Sys/swagger.json", "底层API");  //分组显示
-            //c.SwaggerEndpoint("/swagger/v1/swagger.json", "WebPeis API");
-
-            var configuration = context.ServiceProvider.GetRequiredService<IConfiguration>();
-            c.OAuthClientId(configuration["AuthServer:SwaggerClientId"]);
-            c.OAuthClientSecret(configuration["AuthServer:ClientSecret"]);
-            c.OAuthScopes("WebPeis");
-            c.DefaultModelExpandDepth(-1);
-        });
-
+            app.UseSwagger();
+            app.UseAbpSwaggerUI(c =>
+            {
+                c.SwaggerEndpoint($"/swagger/Work/swagger.json", "业务API");  //分组显示
+                c.SwaggerEndpoint($"/swagger/Sys/swagger.json", "底层API");  //分组显示
+                                                                           //c.SwaggerEndpoint("/swagger/v1/swagger.json", "WebPeis API");
+
+                var configuration = context.ServiceProvider.GetRequiredService<IConfiguration>();
+                c.OAuthClientId(configuration["AuthServer:SwaggerClientId"]);
+                c.OAuthClientSecret(configuration["AuthServer:ClientSecret"]);
+                c.OAuthScopes("WebPeis");
+                c.DefaultModelExpandDepth(-1);
+            });
+        }
         app.UseAuditing();
         app.UseAbpSerilogEnrichers();
         app.UseConfiguredEndpoints();

src/Shentun.WebPeis.HttpApi.Host/appsettings.json

@@ -64,5 +64,8 @@
     "BaseAddress": "http://10.1.13.31",
     "ReportListApiUrl": "http://10.1.13.31/api/report/page",
     "ReportApiUrl": "http://10.1.13.31/api/report/download"
+  },
+  "Swagger": {
+    "IsEnabled": true
   }
 }