diff --git a/24Hour/appsettings.json b/24Hour/appsettings.json index 63a1bc6..4f7e7c7 100644 --- a/24Hour/appsettings.json +++ b/24Hour/appsettings.json @@ -53,9 +53,9 @@ }, "CaseTwenty": { "SysAddress": "http://127.0.0.1:5194", - "UseOfflineData": "true", - "UnitCode": 410503, - "UnitName": "北关区院" + "UseOfflineData": "false", + "UnitCode": 130129, + "UnitName": "赞皇区检" }, "SyncDataFromJiguang": { "enable": "false" diff --git a/24Hour/build/dockerbuild.txt b/24Hour/build/dockerbuild.txt index a8b59cf..9bcb86b 100644 --- a/24Hour/build/dockerbuild.txt +++ b/24Hour/build/dockerbuild.txt @@ -1,6 +1,6 @@ create images -docker build -t twentyfoursvc:1.0.2.2 . -docker save -o d://twentyfoursvc.1.0.2.2.tar twentyfoursvc:1.0.2.2 +docker build -t twentyfoursvc:1.0.2.4 . +docker save -o d://twentyfoursvc.1.0.2.5.tar twentyfoursvc:1.0.2.5 docker on windows for fake data create container docker run --name twentyfoursvc -p 8098:8098 -v D://dockerconfigs/24hourconfig/appsettings.json:/app/appsettings.json -v /etc/localtime:/etc/localtime -d twentyfoursvc:1.0.1.5 @@ -12,7 +12,7 @@ docker network create -d bridge twentytotwneyfour for 24hourserver docker run \ ---name twentyfoursvc1.0.2.2 \ +--name twentyfoursvc1.0.2.5 \ -p 8098:8098 \ -v /home/24hour/logs:/app/logs \ -v /home/24hour/wwwroot:/app/wwwroot \ @@ -22,7 +22,11 @@ docker run \ --link mysql \ --network twentytotwneyfour \ --network-alias twentyfour \ --d twentyfoursvc:1.0.2.2 +-d twentyfoursvc:1.0.2.5 + + + +docker run --name twentyfoursvc1.0.2.3 -d twentyfoursvc:1.0.2.3 @@ -44,7 +48,7 @@ docker run --name twentyfoursvc1.0.2.2 \ -docker run --name twentyfoursvc1.0.1.18 \ +docker run --name twentyfoursvc1.0.2.3 \ -p 8098:8098 \ -v /home/24hour/config/appsettings.json:/app/appsettings.json \ -v /home/24hour/config/log4net.config:/app/log4net.config \ @@ -59,7 +63,7 @@ docker run --name twentyfoursvc1.0.1.18 \ --link mysql \ --network twentytotwneyfour \ --network-alias twentyfour \ ---restart=always -d twentyfoursvc:1.0.1.18 +--restart=always -d twentyfoursvc:1.0.2.3 docker run -d --name dotnetmvc \ @@ -168,7 +172,7 @@ docker run --rm -it \ - +2.0代理 docker run --name twentyfoursvc @@ -178,12 +182,12 @@ docker run --restart=always -d twentyfoursvc:1.0.1.5 -docker build -t twentysysproxy:1.0.1.4 . -docker save -o d://twentysysproxy.1.0.1.4.tar twentysysproxy:1.0.1.4 -docker load -i twentysysproxy.1.0.1.4.tar +docker build -t twentysysproxy:1.0.1.5 . +docker save -o d://twentysysproxy.1.0.1.5.tar twentysysproxy:1.0.1.5 +docker load -i twentysysproxy.1.0.1.5.tar for 2.0 proxyclient -docker run --name twentysysproxy.1.0.1.4 -p 5194:5194 -v /home/twentysysproxy/config/appsettings.json:/app/appsettings.json -v /etc/localtime:/etc/localtime --restart=always --link mysql --network twentytotwneyfour --network-alias twentyproxy -d twentysysproxy:1.0.1.4 +docker run --name twentysysproxy.1.0.1.5 -p 5194:5194 -v /home/twentysysproxy/config/appsettings.json:/app/appsettings.json -v /etc/localtime:/etc/localtime --restart=always --link mysql --network twentytotwneyfour --network-alias twentyproxy -d twentysysproxy:1.0.1.5 diff --git a/Dto/obj/Debug/net6.0/Dto.AssemblyInfo.cs b/Dto/obj/Debug/net6.0/Dto.AssemblyInfo.cs index 571a848..66a2324 100644 --- a/Dto/obj/Debug/net6.0/Dto.AssemblyInfo.cs +++ b/Dto/obj/Debug/net6.0/Dto.AssemblyInfo.cs @@ -1,10 +1,9 @@ //------------------------------------------------------------------------------ // -// 此代码由工具生成。 -// 运行时版本:4.0.30319.42000 +// This code was generated by a tool. // -// 对此文件的更改可能会导致不正确的行为,并且如果 -// 重新生成代码,这些更改将会丢失。 +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. // //------------------------------------------------------------------------------ diff --git a/WebApplication1/WebApplication1.csproj b/WebApplication1/WebApplication1.csproj index 6e3e579..bcc8be4 100644 --- a/WebApplication1/WebApplication1.csproj +++ b/WebApplication1/WebApplication1.csproj @@ -6,8 +6,8 @@ enable ae1f7aa6-e320-4393-ac3f-984b92923499 Linux - 1.0.1.4 - 1.0.1.4 + 1.0.1.5 + 1.0.1.5 diff --git a/WebApplication1/appsettings.json b/WebApplication1/appsettings.json index 0c711ca..6f34a30 100644 --- a/WebApplication1/appsettings.json +++ b/WebApplication1/appsettings.json @@ -8,7 +8,7 @@ "AllowedHosts": "*", "Configs": { - "SystemIp": "143.120.5.25", + "SystemIp": "143.16.40.6", "Port": "8080" }, "Kestrel": {