Merge branch 'develop-FileUpload-test' of http://192.168.0.12:3000/Coder/24Hour.Service into develop-FileUpload-test

24Hour/Controllers/Common/LawyerArchivesController.cs

@@ -20,6 +20,7 @@ using javax.xml.crypto;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
 using NPOI.OpenXmlFormats.Spreadsheet;
 using NPOI.SS.Formula.Functions;
@@ -1041,6 +1042,7 @@ namespace _24Hour.Controllers.Common
                     Lxdh = "",
                     Lxdz = ""
                 });
+                logger.LogInformation(registerinforequest.ConvertToJsonStr());
                 if (registerinforequest.IsSucceed == true)
                 {
                     var registerinfo = registerinforequest.result;
@@ -1061,6 +1063,7 @@ namespace _24Hour.Controllers.Common
                                     var basestr = Elight.Utility.Encrypt.DataEncryption.Decryptiones(filepath);
                                     var filename = Path.GetFileName(filepath);
                                     filename = Path.ChangeExtension(filename, ".jpg");
+                                    logger.LogInformation($"upload image {filename}");
                                     await twentyClient.UploadImage(new UploadDto()
                                     {
                                         Bmsah = registerinfo.bmsah,
@@ -1103,6 +1106,7 @@ namespace _24Hour.Controllers.Common
                     };
                     var applymarkingrequest = await ApplyMarKing(markinginput);
 
+                    logger.LogInformation(applymarkingrequest.ConvertToJsonStr());
                     if (applymarkingrequest.IsSucceed == true)
                     {
                         var applymarkinginfo = applymarkingrequest.result;
@@ -1122,6 +1126,7 @@ namespace _24Hour.Controllers.Common
                             yjjzsj = permissibleStartTime,
                             yjkssj = permissibleEndTime,
                         });
+                        logger.LogInformation(Arrangerequest.ConvertToJsonStr());
                         if (Arrangerequest.IsSucceed == true)
                         {
                             result.IsSucceed = true;

24Hour/build/dockerbuild.txt

@@ -12,7 +12,7 @@ docker network create -d bridge twentytotwneyfour
 
 for 24hourserver
 docker run \
---name twentyfoursvc1.0.3.10\
+--name twentyfoursvc1.0.3.11 \
 -p 8098:8098 \
 -v /home/24hour/logs:/app/logs \
 -v /home/24hour/wwwroot:/app/wwwroot \
@@ -22,7 +22,7 @@ docker run \
 --link mysql \
 --network twentytotwneyfour \
 --network-alias twentyfour \
--d twentyfoursvc:1.0.3.10
+-d twentyfoursvc:1.0.3.11