Browse Source

升级版本号至1.0.1.5

develop
胡超1 2 years ago
parent
commit
e51f0e5f5a
  1. 6
      24Hour/appsettings.json
  2. 26
      24Hour/build/dockerbuild.txt
  3. 7
      Dto/obj/Debug/net6.0/Dto.AssemblyInfo.cs
  4. 4
      WebApplication1/WebApplication1.csproj
  5. 2
      WebApplication1/appsettings.json

6
24Hour/appsettings.json

@ -53,9 +53,9 @@
}, },
"CaseTwenty": { "CaseTwenty": {
"SysAddress": "http://127.0.0.1:5194", "SysAddress": "http://127.0.0.1:5194",
"UseOfflineData": "true", "UseOfflineData": "false",
"UnitCode": 410503, "UnitCode": 130129,
"UnitName": "北关区院" "UnitName": "赞皇区检"
}, },
"SyncDataFromJiguang": { "SyncDataFromJiguang": {
"enable": "false" "enable": "false"

26
24Hour/build/dockerbuild.txt

@ -1,6 +1,6 @@
create images create images
docker build -t twentyfoursvc:1.0.2.2 . docker build -t twentyfoursvc:1.0.2.4 .
docker save -o d://twentyfoursvc.1.0.2.2.tar twentyfoursvc:1.0.2.2 docker save -o d://twentyfoursvc.1.0.2.5.tar twentyfoursvc:1.0.2.5
docker on windows for fake data docker on windows for fake data
create container 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 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 for 24hourserver
docker run \ docker run \
--name twentyfoursvc1.0.2.2 \ --name twentyfoursvc1.0.2.5 \
-p 8098:8098 \ -p 8098:8098 \
-v /home/24hour/logs:/app/logs \ -v /home/24hour/logs:/app/logs \
-v /home/24hour/wwwroot:/app/wwwroot \ -v /home/24hour/wwwroot:/app/wwwroot \
@ -22,7 +22,11 @@ docker run \
--link mysql \ --link mysql \
--network twentytotwneyfour \ --network twentytotwneyfour \
--network-alias twentyfour \ --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 \ -p 8098:8098 \
-v /home/24hour/config/appsettings.json:/app/appsettings.json \ -v /home/24hour/config/appsettings.json:/app/appsettings.json \
-v /home/24hour/config/log4net.config:/app/log4net.config \ -v /home/24hour/config/log4net.config:/app/log4net.config \
@ -59,7 +63,7 @@ docker run --name twentyfoursvc1.0.1.18 \
--link mysql \ --link mysql \
--network twentytotwneyfour \ --network twentytotwneyfour \
--network-alias twentyfour \ --network-alias twentyfour \
--restart=always -d twentyfoursvc:1.0.1.18 --restart=always -d twentyfoursvc:1.0.2.3
docker run -d --name dotnetmvc \ docker run -d --name dotnetmvc \
@ -168,7 +172,7 @@ docker run --rm -it \
2.0代理
docker run docker run
--name twentyfoursvc --name twentyfoursvc
@ -178,12 +182,12 @@ docker run
--restart=always --restart=always
-d twentyfoursvc:1.0.1.5 -d twentyfoursvc:1.0.1.5
docker build -t twentysysproxy:1.0.1.4 . docker build -t twentysysproxy:1.0.1.5 .
docker save -o d://twentysysproxy.1.0.1.4.tar twentysysproxy:1.0.1.4 docker save -o d://twentysysproxy.1.0.1.5.tar twentysysproxy:1.0.1.5
docker load -i twentysysproxy.1.0.1.4.tar docker load -i twentysysproxy.1.0.1.5.tar
for 2.0 proxyclient 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

7
Dto/obj/Debug/net6.0/Dto.AssemblyInfo.cs

@ -1,10 +1,9 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// 此代码由工具生成。 // This code was generated by a tool.
// 运行时版本:4.0.30319.42000
// //
// 对此文件的更改可能会导致不正确的行为,并且如果 // Changes to this file may cause incorrect behavior and will be lost if
// 重新生成代码,这些更改将会丢失。 // the code is regenerated.
// </auto-generated> // </auto-generated>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------

4
WebApplication1/WebApplication1.csproj

@ -6,8 +6,8 @@
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<UserSecretsId>ae1f7aa6-e320-4393-ac3f-984b92923499</UserSecretsId> <UserSecretsId>ae1f7aa6-e320-4393-ac3f-984b92923499</UserSecretsId>
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS> <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
<AssemblyVersion>1.0.1.4</AssemblyVersion> <AssemblyVersion>1.0.1.5</AssemblyVersion>
<Version>1.0.1.4</Version> <Version>1.0.1.5</Version>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

2
WebApplication1/appsettings.json

@ -8,7 +8,7 @@
"AllowedHosts": "*", "AllowedHosts": "*",
"Configs": { "Configs": {
"SystemIp": "143.120.5.25", "SystemIp": "143.16.40.6",
"Port": "8080" "Port": "8080"
}, },
"Kestrel": { "Kestrel": {

Loading…
Cancel
Save