Merge branch 'Test.IRC' of http://192.168.3.68:2000/XCKJ/irc-netcore-api into Test.IRC

IRaCIS.Core.API/Controllers/UploadDownLoadController.cs

@@ -563,7 +563,7 @@ namespace IRaCIS.Core.API.Controllers
                 templateFileStream.Seek(0, SeekOrigin.Begin);
 
 
-                var ossRelativePath = oSSService.UploadToOSS(fileStream, "InspectionUpload/SiteSurvey", realFileName);
+                var ossRelativePath = oSSService.UploadToOSS(fileStream, "InspectionUpload/Check", realFileName);
 
                 await _repository.AddAsync(new InspectionFile() { FileName = realFileName, RelativePath = ossRelativePath, TrialId = trialId });
 

IRaCIS.Core.API/Properties/launchSettings.json

@@ -30,11 +30,11 @@
       "launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}",
       "publishAllPorts": true
     },
-    "IRaCIS.Staging": {
+    "IRaCIS.Uat_IRC": {
       "commandName": "Project",
       "launchBrowser": true,
       "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Staging"
+        "ASPNETCORE_ENVIRONMENT": "Uat_IRC"
       },
       "applicationUrl": "http://localhost:6100"
     },
@@ -46,6 +46,6 @@
       },
       "applicationUrl": "http://localhost:6300"
     }
-  
+
   }
 }

IRaCIS.Core.API/Startup.cs

@@ -71,6 +71,8 @@ namespace IRaCIS.Core.API
         // This method gets called by the runtime. Use this method to add services to the container.
         public void ConfigureServices(IServiceCollection services)
         {
+            //健康检查
+            services.AddHealthChecks();
             //本地化
             services.AddJsonLocalization(options => options.ResourcesPath = "Resources");
 
@@ -167,6 +169,8 @@ namespace IRaCIS.Core.API
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
         public async void Configure(IApplicationBuilder app, IWebHostEnvironment env)
         {
+
+
             //本地化
             app.UseLocalization();
 
@@ -234,6 +238,8 @@ namespace IRaCIS.Core.API
                 endpoints.MapControllers();
 
                 endpoints.MapHub<UploadHub>("/UploadHub");
+
+                endpoints.MapHealthChecks("/health");
             });
 
             var hangfireJobService = app.ApplicationServices.GetRequiredService<IIRaCISHangfireJob>();

IRaCIS.Core.API/appsettings.Uat_IRC.json

@@ -7,8 +7,8 @@
     }
   },
   "ConnectionStrings": {
-    "RemoteNew": "Server=123.56.94.154,1433\\MSSQLSERVER;Database=Uat_IRC;User ID=sa;Password=dev123456DEV;TrustServerCertificate=true",
-    "Hangfire": "Server=123.56.94.154,1433\\MSSQLSERVER;Database=Uat.Study.Hangfire;User ID=sa;Password=dev123456DEV;TrustServerCertificate=true"
+    "RemoteNew": "Server=47.117.164.182,1434;Database=Uat_IRC;User ID=sa;Password=xc@123456;TrustServerCertificate=true",
+    "Hangfire": "Server=47.117.164.182,1434;Database=Uat_IRC.Hangfire;User ID=sa;Password=xc@123456;TrustServerCertificate=true"
   },
 
   "AliyunOSS": {