Merge branch 'master' of http://dev.ccwin-in.com:3000/BoXu.Zheng/WZC2

be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/PdaHttpApiHostModule.cs

@@ -68,33 +68,33 @@ namespace Win_in.Sfs.Wms.Pda;
     typeof(MessageApplicationContractsModule),
     typeof(AuthApplicationContractsModule)
     )]
-public class PdaHttpApiHostModule : AbpModule
+public class PdaHttpApiHostModule : ModuleBase<PdaHttpApiHostModule>
 {
     private bool _isMultiTenancy = true;
 
-    /// <summary>
-    /// 预配置服务
-    /// </summary>
-    /// <param name="context"></param>
-    public override void PreConfigureServices(ServiceConfigurationContext context)
-    {
-        context.Services.AddAutoMapperObjectMapper<AbpDddDomainModule>();
-        Configure<AbpAutoMapperOptions>(options => { options.AddMaps<PdaHttpApiHostModule>(validate: true); });
+    ///// <summary>
+    ///// 预配置服务
+    ///// </summary>
+    ///// <param name="context"></param>
+    //public override void PreConfigureServices(ServiceConfigurationContext context)
+    //{
+    //    context.Services.AddAutoMapperObjectMapper<AbpDddDomainModule>();
+    //    Configure<AbpAutoMapperOptions>(options => { options.AddMaps<PdaHttpApiHostModule>(validate: true); });
 
-        PreConfigure<AbpHttpClientBuilderOptions>(options =>
-        {
-            //Polly 重试3次
-            options.ProxyClientBuildActions.Add((remoteServiceName, clientBuilder) =>
-            {
-                clientBuilder.AddTransientHttpErrorPolicy(policyBuilder =>
-                    policyBuilder.WaitAndRetryAsync(
-                        3,
-                        i => TimeSpan.FromSeconds(Math.Pow(2, i))
-                    )
-                );
-            });
-        });
-    }
+    //    PreConfigure<AbpHttpClientBuilderOptions>(options =>
+    //    {
+    //        //Polly 重试3次
+    //        options.ProxyClientBuildActions.Add((remoteServiceName, clientBuilder) =>
+    //        {
+    //            clientBuilder.AddTransientHttpErrorPolicy(policyBuilder =>
+    //                policyBuilder.WaitAndRetryAsync(
+    //                    3,
+    //                    i => TimeSpan.FromSeconds(Math.Pow(2, i))
+    //                )
+    //            );
+    //        });
+    //    });
+    //}
 
     /// <summary>
     ///
@@ -113,26 +113,27 @@ public class PdaHttpApiHostModule : AbpModule
     /// <param name="context"></param>
     public override void ConfigureServices(ServiceConfigurationContext context)
     {
-        _ = context.Services.GetHostingEnvironment();
-        var configuration = context.Services.GetConfiguration();
+        //_ = context.Services.GetHostingEnvironment();
+        //var configuration = context.Services.GetConfiguration();
 
-        context.SetConsoleTitleOfWebApp("Pda.Host");
+        //context.SetConsoleTitleOfWebApp("Pda.Host");
 
-        _isMultiTenancy = Convert.ToBoolean(configuration["IsMultiTenancy"]);
+        //_isMultiTenancy = Convert.ToBoolean(configuration["IsMultiTenancy"]);
 
-        ConfigureHttpClientProxies(context);
+        //ConfigureHttpClientProxies(context);
 
-        ConfigureMultiTenancy();
+        //ConfigureMultiTenancy();
 
-        ConfigureSwaggerServices(context, configuration);
+        base.ConfigureServices(context);
+        GetXmlFiles();
 
-        ConfigureLocalization();
+        //ConfigureLocalization();
 
-        ConfigureAuthentication(context, configuration);
+        //ConfigureAuthentication(context, configuration);
 
-        ConfigureCors(context, configuration);
+        //ConfigureCors(context, configuration);
 
-        ConfigureAntiForgery();
+        //ConfigureAntiForgery();
     }
 
     private void ConfigureAntiForgery()

build/src/docker/publish/conf/settings/appsettings.Development.json

@@ -45,7 +45,7 @@
   },
   "AuthServer": {
     "Audience": "Auth",
-    "Authority": "http://localhost:59093/",
+    "Authority": "http://dev.ccwin-in.com:21293/",
     "ClientId": "Auth_App",
     "ClientSecret": "1q2w3E*",
     "RequireHttpsMetadata": "false",
@@ -95,7 +95,7 @@
   },
   "IdentityClients": {
     "Default": {
-      "Authority": "http://localhost:59093",
+      "Authority": "http://dev.ccwin-in.com:21293",
       "ClientId": "Auth_App",
       "ClientSecret": "1q2w3E*",
       "GrantType": "client_credentials",
@@ -110,31 +110,31 @@
   },
   "RemoteServices": {
     "Auth": {
-      "BaseUrl": "http://dev.ccwin-in.com:59093/"
+      "BaseUrl": "http://localhost:21293/"
     },
     "BaseData": {
-      "BaseUrl": "http://dev.ccwin-in.com:59094/"
+      "BaseUrl": "http://localhost:21294/"
     },
     "Default": {
-      "BaseUrl": "http://dev.ccwin-in.com:59093"
+      "BaseUrl": "http://localhost:21293/"
     },
     "FileStorage": {
-      "BaseUrl": "http://dev.ccwin-in.com:59092/"
+      "BaseUrl": "http://localhost:21292/"
     },
     "Inventory": {
-      "BaseUrl": "http://dev.ccwin-in.com:59095/"
+      "BaseUrl": "http://localhost:59095/"
     },
     "Job": {
-      "BaseUrl": "http://dev.ccwin-in.com:59095/"
+      "BaseUrl": "http://localhost:59095/"
     },
     "Label": {
-      "BaseUrl": "http://dev.ccwin-in.com:59092/"
+      "BaseUrl": "http://localhost:21292/"
     },
     "Message": {
-      "BaseUrl": "http://dev.ccwin-in.com:59092/"
+      "BaseUrl": "http://localhost:21292/"
     },
     "Store": {
-      "BaseUrl": "http://dev.ccwin-in.com:59095/"
+      "BaseUrl": "http://localhost:59095/"
     }
   },
   "Serilog": {