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

24Hour/Controllers/Common/LawyerArchivesController.cs

@@ -1126,12 +1126,15 @@ namespace _24Hour.Controllers.Common
                         {
                             result.IsSucceed = true;
                             result.Message = "数据上传案管系统成功";
+                            result.result = Arrangerequest.Message;
                             return result;
                         }
                         else
                         {
+                            
                             result.IsSucceed = false;
                             result.Message = "数据上传案管系统失败，申请阅卷添加失败";
+                            result.result = Arrangerequest.Message;
                             return result;
                         }
                     }
@@ -1139,6 +1142,7 @@ namespace _24Hour.Controllers.Common
                     {
                         result.IsSucceed = false;
                         result.Message = "数据上传案管系统失败，申请添加失败";
+                        result.result = applymarkingrequest.Message;
                         return result;
                     }
                 }
@@ -1146,6 +1150,7 @@ namespace _24Hour.Controllers.Common
                 {
                     result.IsSucceed = false;
                     result.Message = "数据上传案管系统失败，登记添加失败";
+                    result.result = registerinforequest.Message;
                     return result;
                 }
             }
@@ -1601,7 +1606,7 @@ namespace _24Hour.Controllers.Common
                                 new
                                 {
                                     name = "其他",
-                                    value = allCount-excount,
+                                    value = allCount - excount,
                                 }
                             };
                             registerCount.AddRange(list);

24Hour/build/dockerbuild.txt

@@ -32,6 +32,7 @@ docker run --name twentyfoursvc1.0.2.3 -d twentyfoursvc:1.0.2.3
 
 公司252测试
 
+docker build -t twentyfoursvc:1.0.3.10 .
 docker load -i twentyfoursvc1019.tar
 
 
@@ -48,14 +49,14 @@ docker run --name twentyfoursvc_1.0.3.10_private \
 --restart=always -d twentyfoursvc:1.0.3.10
 
 外网运行
-docker run --name twentyfoursvc_1.0.3.7_network \
+docker run --name twentyfoursvc_1.0.3.10_network \
 -p 18098:18098 \
 -v /home/24hour/network/config/appsettings.json:/app/appsettings.json \
 -v /home/24hour/network/config/log4net.config:/app/log4net.config \
 -v /home/24hour/network/wwwroot:/app/wwwroot \
 -v /home/24hour/network/logs:/app/logs \
 -v /etc/localtime:/etc/localtime \
---restart=always -d twentyfoursvc:1.0.3.7
+--restart=always -d twentyfoursvc:1.0.3.10