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

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

@@ -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,11 +218,11 @@ 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" }
             }
             };
 

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,6 +459,10 @@ public class WebPeisHttpApiHostModule : AbpModule
         app.UseDynamicClaims();
         app.UseAuthorization();
 
+        //ÅäÖÃÊÇ·ñÆôÓÃswagger
+        var IsSwagger = Convert.ToBoolean(configuration["Swagger:IsEnabled"]);
+        if (IsSwagger)
+        {
             app.UseSwagger();
             app.UseAbpSwaggerUI(c =>
             {
@@ -467,7 +476,7 @@ public class WebPeisHttpApiHostModule : AbpModule
                 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
   }
 }