From 21955aa2e0a604398c6affd63ace0a1a7b0c8553 Mon Sep 17 00:00:00 2001
From: wanggang <76527413@qq.com>
Date: Wed, 27 May 2020 17:11:17 +0800
Subject: [PATCH] update

Former-commit-id: 27636fc008cd469a368bd38f5c96bcfe096e111b
---
 .../DisplayTemplates/EmailAddress.cshtml      |  1 +
 projects/IoTCenter/Views/Home/Device.cshtml   |  2 +-
 .../publish/docker-compose.override.yml       |  6 +++++
 .../linux-x64/publish/docker-compose.prod.yml |  6 +++++
 .../src/linux-x64/publish/docker-compose.yml  | 27 ++++++++++++++++++-
 .../publish/nginx/nginx.development.conf      |  4 +--
 6 files changed, 42 insertions(+), 4 deletions(-)
 create mode 100644 projects/Infrastructure/Views/Shared/DisplayTemplates/EmailAddress.cshtml

diff --git a/projects/Infrastructure/Views/Shared/DisplayTemplates/EmailAddress.cshtml b/projects/Infrastructure/Views/Shared/DisplayTemplates/EmailAddress.cshtml
new file mode 100644
index 00000000..692d36d7
--- /dev/null
+++ b/projects/Infrastructure/Views/Shared/DisplayTemplates/EmailAddress.cshtml
@@ -0,0 +1 @@
+@Model
\ No newline at end of file
diff --git a/projects/IoTCenter/Views/Home/Device.cshtml b/projects/IoTCenter/Views/Home/Device.cshtml
index 12e74908..00272bff 100644
--- a/projects/IoTCenter/Views/Home/Device.cshtml
+++ b/projects/IoTCenter/Views/Home/Device.cshtml
@@ -1,5 +1,5 @@
 @section bread{
-    <li class="breadcrumb-item"><a href="@Url.Action("Product","Home",new { number=Model})">产品</a></li>
+    <li class="breadcrumb-item"><a href="@Url.Action("Product","Home",new { number=Context.Request.Query["productNumber"]})">产品</a></li>
 }
 <div id="template">
     <template v-if="device">
diff --git a/publish/src/linux-x64/publish/docker-compose.override.yml b/publish/src/linux-x64/publish/docker-compose.override.yml
index bfa0d922..f394d96f 100644
--- a/publish/src/linux-x64/publish/docker-compose.override.yml
+++ b/publish/src/linux-x64/publish/docker-compose.override.yml
@@ -13,6 +13,9 @@ services:
     webmvc:
         image: nginx:1.18
         restart: always
+        networks: 
+            default: 
+                ipv4_address: 10.0.1.80
         environment: 
             TZ: "Asia/Shanghai" 
         volumes: 
@@ -21,6 +24,9 @@ services:
     webspa:
         image: nginx:1.18
         restart: always
+        networks: 
+            default: 
+                ipv4_address: 10.0.1.90
         environment: 
             TZ: "Asia/Shanghai" 
         volumes: 
diff --git a/publish/src/linux-x64/publish/docker-compose.prod.yml b/publish/src/linux-x64/publish/docker-compose.prod.yml
index d4c7bf3a..134ed764 100644
--- a/publish/src/linux-x64/publish/docker-compose.prod.yml
+++ b/publish/src/linux-x64/publish/docker-compose.prod.yml
@@ -4,6 +4,9 @@ services:
     usercenter: 
         image: mcr.microsoft.com/dotnet/core/runtime-deps:3.1-focal
         restart: always
+        networks: 
+            default: 
+                ipv4_address: 10.0.1.110
         environment: 
             - TZ=Asia/Shanghai
             - ASPNETCORE_ENVIRONMENT=Docker
@@ -15,6 +18,9 @@ services:
     iotcenter: 
         image: mcr.microsoft.com/dotnet/core/runtime-deps:3.1-focal
         restart: always
+        networks: 
+            default: 
+                ipv4_address: 10.0.1.120
         environment: 
             - TZ=Asia/Shanghai
             - ASPNETCORE_ENVIRONMENT=Docker
diff --git a/publish/src/linux-x64/publish/docker-compose.yml b/publish/src/linux-x64/publish/docker-compose.yml
index d2152c2b..c7c03e30 100644
--- a/publish/src/linux-x64/publish/docker-compose.yml
+++ b/publish/src/linux-x64/publish/docker-compose.yml
@@ -1,8 +1,17 @@
 version: "3.8"
+networks: 
+    default:
+        driver: overlay
+        ipam: 
+            config: 
+             - subnet: 10.0.1.0/24
 services: 
-    #https://portainer.readthedocs.io/en/latest/deployment.html
     portainer:
         image: portainer/portainer:1.23.2
+        restart: always
+        networks: 
+            default: 
+                ipv4_address: 10.0.1.20
         ports: 
             - 9000:9000
         volumes: 
@@ -11,18 +20,28 @@ services:
     mysql:
         image: mysql:8.0
         restart: always
+        networks: 
+            default: 
+                ipv4_address: 10.0.1.30
         environment: 
             - MYSQL_ROOT_PASSWORD=root
             - MYSQL_DATABASE=jobserver
         command: --default-authentication-plugin=mysql_native_password
         volumes: 
             - ./mysql:/var/lib/mysql
+            
     redis:
         image: redis:6.0
         restart: always
+        networks: 
+            default: 
+                ipv4_address: 10.0.1.40
     influxdb: 
         image: influxdb:1.8
         restart: always
+        networks: 
+            default: 
+                ipv4_address: 10.0.1.50
         hostname: influxdb
         environment: 
             TZ: "Asia/Shanghai"
@@ -33,6 +52,9 @@ services:
             - ./influxdb:/var/lib/influxdb
     srs:
         image: ossrs/srs:v4.0.23
+        networks: 
+            default: 
+                ipv4_address: 10.0.1.60
         environment: 
             TZ: "Asia/Shanghai"
         restart: always
@@ -46,6 +68,9 @@ services:
     nginx: 
         image: nginx:1.18
         restart: always
+        networks: 
+            default: 
+                ipv4_address: 10.0.1.70
         environment: 
             TZ: "Asia/Shanghai"
         ports: 
diff --git a/publish/src/linux-x64/publish/nginx/nginx.development.conf b/publish/src/linux-x64/publish/nginx/nginx.development.conf
index c5e1789c..ecf505bf 100644
--- a/publish/src/linux-x64/publish/nginx/nginx.development.conf
+++ b/publish/src/linux-x64/publish/nginx/nginx.development.conf
@@ -45,11 +45,11 @@ http {
         }
 
         location ^~ /live/ {
-            proxy_pass http://host.docker.internal:8080/live/;
+            proxy_pass http://srs:8080/live/;
         }
 
         location ^~ /video/ {
-            proxy_pass http://host.docker.internal:8080/video/;
+            proxy_pass http://srs:8080/video/;
         }
 
         location ^~ /UserCenter/ {