完善平台端物模型

DockerComposeShells/.env

@@ -29,6 +29,6 @@ SQLSERVER_PORT=11433
 # 认证信息
 PULSAR_ADMIN_USER=admin
 PULSAR_ADMIN_PASSWORD=0fd7afb8b0d04e6abc4fdfdac2190a79
-IOTDB_ROOT_PASSWORD=Lixiao@1980
+IOTDB_ROOT_PASSWORD=Li#xiao@198!0
 MYSQL_ROOT_PASSWORD='JiShe!aqG#5kGgh&0'
 SQLSERVER_SA_PASSWORD=JiShe!aqG@5kGgh&0

DockerComposeShells/docker-compose-init.yml

@@ -183,7 +183,7 @@ services:
       - pulsar-net
 
   iotdb-standalone-service:
-    image: registry.cn-qingdao.aliyuncs.com/jisheyun/iotdb:2.0.5-standalone
+    image: registry.cn-qingdao.aliyuncs.com/jisheyun/iotdb:2.0.6-standalone
     hostname: iotdb-standalone
     container_name: iotdb-standalone
     restart: always

DockerComposeShells/docker-compose-iotdb-standalone.yml

@@ -1,6 +1,6 @@
 services:
   iotdb-standalone:
-    image: registry.cn-qingdao.aliyuncs.com/jisheyun/iotdb:2.0.5-standalone
+    image: registry.cn-qingdao.aliyuncs.com/jisheyun/iotdb:2.0.6-standalone
     hostname: iotdb-standalone
     container_name: iotdb-standalone
     restart: "no"

DockerComposeShells/docker-compose.yml

@@ -152,7 +152,7 @@ services:
         max-file: "3"
 
   iotdb-standalone-service:
-    image: registry.cn-qingdao.aliyuncs.com/jisheyun/iotdb:2.0.5-standalone
+    image: registry.cn-qingdao.aliyuncs.com/jisheyun/iotdb:2.0.6-standalone
     hostname: iotdb-standalone
     container_name: iotdb-standalone
     restart: always

DockerComposeShells/docker-compose_service_sub.yml

@@ -1,6 +1,6 @@
 services:
   iotdb-standalone-service:
-    image: registry.cn-qingdao.aliyuncs.com/jisheyun/iotdb:2.0.5-standalone
+    image: registry.cn-qingdao.aliyuncs.com/jisheyun/iotdb:2.0.6-standalone
     hostname: iotdb-standalone
     container_name: iotdb-standalone
     restart: always

DockerComposeShells/docker-compose_service_sub_init.yml

@@ -1,6 +1,6 @@
 services:
   iotdb-standalone-service:
-    image: registry.cn-qingdao.aliyuncs.com/jisheyun/iotdb:2.0.5-standalone
+    image: registry.cn-qingdao.aliyuncs.com/jisheyun/iotdb:2.0.6-standalone
     hostname: iotdb-standalone
     container_name: iotdb-standalone
     restart: always

DockerComposeShells/env.example

@@ -17,6 +17,9 @@ REDIS_PORT=30712
 POSTGRES_PORT=5432
 POSTGRES_PASSWORD=JiShe!aqG#5kGgh&0
 POSTGRES_DB=jisheiotprodb
+POSTGRES_USER=postgres
+POSTGRES_CONTAINER=postgres
+POSTGRES_BACKUP_DIR=/mnt/dockerdata/appservice/postgresql/backup
 
 # Admin API配置
 ADMIN_API_PORT=28080

src/JiShe.IoT.EntityFrameworkCore/Migrations/IoTDbContextModelSnapshot.cs

@@ -904,6 +904,10 @@ namespace JiShe.IoT.Migrations
                         .HasColumnType("character varying(50)")
                         .HasComment("设备地址");
 
+                    b.Property<Guid>("DeviceDataId")
+                        .HasColumnType("uuid")
+                        .HasComment("设备数据Id");
+
                     b.Property<string>("DeviceName")
                         .IsRequired()
                         .HasMaxLength(50)
@@ -1578,6 +1582,10 @@ namespace JiShe.IoT.Migrations
                         .HasColumnType("character varying(50)")
                         .HasComment("物联网平台中对应产品物模型属性或者事件类型");
 
+                    b.Property<int>("IdentifierType")
+                        .HasColumnType("integer")
+                        .HasComment("物模型标识符类型");
+
                     b.Property<int>("IoTPlatform")
                         .HasColumnType("integer")
                         .HasComment("物联网平台类型,默认没有指定");