update

Former-commit-id: 27636fc008cd469a368bd38f5c96bcfe096e111b

projects/Infrastructure/Views/Shared/DisplayTemplates/EmailAddress.cshtml

@@ -0,0 +1 @@
+@Model

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">

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: 

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

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: 

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/ {