admin/JiShe.IOT.Admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新docker镜像版本

Browse Source
This commit is contained in:
ChenYi 2026-03-25 22:10:28 +08:00
parent f1ac4f67b5
commit 82e662c867
9 changed files with 82 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
DockerComposeShells/docker-compose-init.yml
View File

@ -1,6 +1,6 @@
services:
zookeeper:
image: registry.cn-qingdao.aliyuncs.com/jisheyun/pulsar:4.1.1
image: registry.cn-qingdao.aliyuncs.com/jisheyun/pulsar:4.1.3
container_name: zookeeper
hostname: zookeeper
restart: unless-stopped
@ -29,7 +29,7 @@ services:
start_period: 60s
pulsar-cluster-init:
image: registry.cn-qingdao.aliyuncs.com/jisheyun/pulsar:4.1.1
image: registry.cn-qingdao.aliyuncs.com/jisheyun/pulsar:4.1.3
container_name: pulsar-cluster-init
hostname: pulsar-cluster-init
command: >
@ -42,7 +42,7 @@ services:
- pulsar-net
bookie:
image: registry.cn-qingdao.aliyuncs.com/jisheyun/pulsar:4.1.1
image: registry.cn-qingdao.aliyuncs.com/jisheyun/pulsar:4.1.3
container_name: pulsar-bookie
hostname: pulsar-bookie
restart: unless-stopped
@ -77,7 +77,7 @@ services:
- pulsar-bookkeeper-data:/pulsar/data/bookkeeper
broker:
image: registry.cn-qingdao.aliyuncs.com/jisheyun/pulsar:4.1.1
image: registry.cn-qingdao.aliyuncs.com/jisheyun/pulsar:4.1.3
container_name: pulsar-broker
hostname: pulsar-broker
restart: unless-stopped
@ -149,7 +149,7 @@ services:
start_period: 60s
pulsar-init:
image: registry.cn-qingdao.aliyuncs.com/jisheyun/pulsar:4.1.1
image: registry.cn-qingdao.aliyuncs.com/jisheyun/pulsar:4.1.3
container_name: pulsar-init
hostname: pulsar-init
command: >
@ -183,7 +183,7 @@ services:
- pulsar-net
iotdb-standalone-service:
image: registry.cn-qingdao.aliyuncs.com/jisheyun/iotdb:2.0.6-standalone
image: registry.cn-qingdao.aliyuncs.com/jisheyun/iotdb:2.0.7-standalone
hostname: iotdb-standalone
container_name: iotdb-standalone
restart: always
@ -216,7 +216,7 @@ services:
- pulsar-net
redis-service:
image: registry.cn-qingdao.aliyuncs.com/jisheyun/redis:8.0.2-alpine3.21
image: registry.cn-qingdao.aliyuncs.com/jisheyun/redis:8.6.2-alpine3.23
container_name: redis
restart: always
hostname: redis
@ -237,7 +237,7 @@ services:
- pulsar-net
postgres-service:
image: registry.cn-qingdao.aliyuncs.com/jisheyun/postgres:18.1-alpine
image: registry.cn-qingdao.aliyuncs.com/jisheyun/postgres:18.3-alpine
container_name: postgres
hostname: postgres
restart: unless-stopped

2
DockerComposeShells/docker-compose-iotdb-standalone.yml
View File

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

12
DockerComposeShells/docker-compose.yml
View File

@ -1,6 +1,6 @@
services:
zookeeper:
image: registry.cn-qingdao.aliyuncs.com/jisheyun/pulsar:4.1.1
image: registry.cn-qingdao.aliyuncs.com/jisheyun/pulsar:4.1.3
container_name: zookeeper
hostname: zookeeper
restart: unless-stopped
@ -34,7 +34,7 @@ services:
max-file: "3"
bookie:
image: registry.cn-qingdao.aliyuncs.com/jisheyun/pulsar:4.1.1
image: registry.cn-qingdao.aliyuncs.com/jisheyun/pulsar:4.1.3
container_name: pulsar-bookie
hostname: pulsar-bookie
restart: unless-stopped
@ -77,7 +77,7 @@ services:
max-file: "3"
broker:
image: registry.cn-qingdao.aliyuncs.com/jisheyun/pulsar:4.1.1
image: registry.cn-qingdao.aliyuncs.com/jisheyun/pulsar:4.1.3
container_name: pulsar-broker
hostname: pulsar-broker
restart: unless-stopped
@ -152,7 +152,7 @@ services:
max-file: "3"
iotdb-standalone-service:
image: registry.cn-qingdao.aliyuncs.com/jisheyun/iotdb:2.0.6-standalone
image: registry.cn-qingdao.aliyuncs.com/jisheyun/iotdb:2.0.7-standalone
hostname: iotdb-standalone
container_name: iotdb-standalone
restart: always
@ -190,7 +190,7 @@ services:
max-file: "5"
redis-service:
image: registry.cn-qingdao.aliyuncs.com/jisheyun/redis:8.0.2-alpine3.21
image: registry.cn-qingdao.aliyuncs.com/jisheyun/redis:8.6.2-alpine3.23
container_name: redis
restart: always
hostname: redis
@ -216,7 +216,7 @@ services:
max-file: "3"
postgres-service:
image: registry.cn-qingdao.aliyuncs.com/jisheyun/postgres:18.1-alpine
image: registry.cn-qingdao.aliyuncs.com/jisheyun/postgres:18.3-alpine
container_name: postgres
hostname: postgres
restart: unless-stopped

6
DockerComposeShells/docker-compose_service_sub.yml
View File

@ -1,6 +1,6 @@
services:
iotdb-standalone-service:
image: registry.cn-qingdao.aliyuncs.com/jisheyun/iotdb:2.0.6-standalone
image: registry.cn-qingdao.aliyuncs.com/jisheyun/iotdb:2.0.7-standalone
hostname: iotdb-standalone
container_name: iotdb-standalone
restart: always
@ -38,7 +38,7 @@ services:
max-file: "5"
redis-service:
image: registry.cn-qingdao.aliyuncs.com/jisheyun/redis:8.0.2-alpine3.21
image: registry.cn-qingdao.aliyuncs.com/jisheyun/redis:8.6.2-alpine3.23
container_name: redis
restart: always
hostname: redis
@ -64,7 +64,7 @@ services:
max-file: "3"
postgres-service:
image: registry.cn-qingdao.aliyuncs.com/jisheyun/postgres:18.1-alpine
image: registry.cn-qingdao.aliyuncs.com/jisheyun/postgres:18.3-alpine
container_name: postgres
hostname: postgres
restart: unless-stopped

6
DockerComposeShells/docker-compose_service_sub_init.yml
View File

@ -1,6 +1,6 @@
services:
iotdb-standalone-service:
image: registry.cn-qingdao.aliyuncs.com/jisheyun/iotdb:2.0.6-standalone
image: registry.cn-qingdao.aliyuncs.com/jisheyun/iotdb:2.0.7-standalone
hostname: iotdb-standalone
container_name: iotdb-standalone
restart: always
@ -33,7 +33,7 @@ services:
- pulsar-net
redis-service:
image: registry.cn-qingdao.aliyuncs.com/jisheyun/redis:8.0.2-alpine3.21
image: registry.cn-qingdao.aliyuncs.com/jisheyun/redis:8.6.2-alpine3.23
container_name: redis
restart: always
hostname: redis
@ -54,7 +54,7 @@ services:
- pulsar-net
postgres-service:
image: registry.cn-qingdao.aliyuncs.com/jisheyun/postgres:18.1-alpine
image: registry.cn-qingdao.aliyuncs.com/jisheyun/postgres:18.3-alpine
container_name: postgres
hostname: postgres
restart: unless-stopped

2
host/JiShe.IoT.HttpApi.Host/Program.cs
View File

@ -47,7 +47,7 @@ public class Program
//options.Limits.MaxConcurrentConnections = 1000;//限制并发连接数，默认无限制
});
builder.WebHost.UseUrls($"http://+:10500");
builder.WebHost.UseUrls($"http://+:20500");
var app = builder.Build();
await app.InitializeApplicationAsync();
await app.RunAsync();

29
src/JiShe.IoT.EntityFrameworkCore/Migrations/20260320152205_InitialCreate.Designer.cs → src/JiShe.IoT.EntityFrameworkCore/Migrations/20260325090415_InitialCreate.Designer.cs generated
View File

@ -14,7 +14,7 @@ using Volo.Abp.EntityFrameworkCore;
namespace JiShe.IoT.Migrations
{
[DbContext(typeof(IoTDbContext))]
[Migration("20260320152205_InitialCreate")]
[Migration("20260325090415_InitialCreate")]
partial class InitialCreate
{
/// <inheritdoc />
@ -754,6 +754,18 @@ namespace JiShe.IoT.Migrations
.HasColumnType("integer")
.HasComment("设备类型，与业务系统无关，主要区分是网关设备、直连设备");
b.Property<int>("EncryptionMethod")
.ValueGeneratedOnAdd()
.HasColumnType("integer")
.HasDefaultValue(1)
.HasComment("设备鉴权加密方式");
b.Property<int>("EncryptionType")
.ValueGeneratedOnAdd()
.HasColumnType("integer")
.HasDefaultValue(1)
.HasComment("设备加密类型，类型不同给，鉴权路径资源不同，默认为一型一密");
b.Property<string>("ExtraProperties")
.HasColumnType("text")
.HasColumnName("ExtraProperties")
@ -826,6 +838,10 @@ namespace JiShe.IoT.Migrations
.HasColumnType("timestamp with time zone")
.HasComment("最后在线时间");
b.Property<int?>("NeedEquipmentProductionPlan")
.HasColumnType("integer")
.HasComment("是否需要设备生产计划");
b.Property<int?>("OSACreatorId")
.HasColumnType("integer")
.HasComment("旧系统授权创建者Id");
@ -854,6 +870,11 @@ namespace JiShe.IoT.Migrations
.HasColumnType("text")
.HasComment("备注");
b.Property<string>("SimCardInfo")
.IsRequired()
.HasColumnType("jsonb")
.HasComment("SIM卡信息");
b.Property<int>("SubDeviceCapacity")
.ValueGeneratedOnAdd()
.HasColumnType("integer")
@ -1170,6 +1191,12 @@ namespace JiShe.IoT.Migrations
.HasColumnType("character varying(256)")
.HasComment("指令名称");
b.Property<int>("CommandType")
.ValueGeneratedOnAdd()
.HasColumnType("integer")
.HasDefaultValue(0)
.HasComment("指令类型");
b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken()
.IsRequired()

5
src/JiShe.IoT.EntityFrameworkCore/Migrations/20260320152205_InitialCreate.cs → src/JiShe.IoT.EntityFrameworkCore/Migrations/20260325090415_InitialCreate.cs
View File

@ -762,6 +762,10 @@ namespace JiShe.IoT.Migrations
UpgradeDate = table.Column<DateTime>(type: "timestamp with time zone", nullable: true, comment: "升级日期"),
SubDeviceCapacity = table.Column<int>(type: "integer", nullable: false, defaultValue: 64, comment: "子设备容量"),
ReadingMode = table.Column<int>(type: "integer", nullable: false, defaultValue: 1, comment: "抄读模式"),
SimCardInfo = table.Column<string>(type: "jsonb", nullable: false, comment: "SIM卡信息"),
EncryptionType = table.Column<int>(type: "integer", nullable: false, defaultValue: 1, comment: "设备加密类型，类型不同给，鉴权路径资源不同，默认为一型一密"),
EncryptionMethod = table.Column<int>(type: "integer", nullable: false, defaultValue: 1, comment: "设备鉴权加密方式"),
NeedEquipmentProductionPlan = table.Column<int>(type: "integer", nullable: true, comment: "是否需要设备生产计划"),
ConcurrencyStamp = table.Column<string>(type: "character varying(40)", maxLength: 40, nullable: false),
CreationTime = table.Column<DateTime>(type: "timestamp with time zone", nullable: false),
CreatorId = table.Column<Guid>(type: "uuid", nullable: true),
@ -790,6 +794,7 @@ namespace JiShe.IoT.Migrations
Id = table.Column<Guid>(type: "uuid", nullable: false),
DeviceThingModelId = table.Column<Guid>(type: "uuid", nullable: false, comment: "设备端物模型Id"),
IoTPlatform = table.Column<int>(type: "integer", nullable: false, comment: "物联网平台类型"),
CommandType = table.Column<int>(type: "integer", nullable: false, defaultValue: 0, comment: "指令类型"),
IoTPlatformProductId = table.Column<string>(type: "character varying(50)", maxLength: 50, nullable: false, comment: "物联网平台中对应的产品Id"),
CommandName = table.Column<string>(type: "character varying(256)", maxLength: 256, nullable: false, comment: "指令名称"),
IssueCommand = table.Column<string>(type: "character varying(512)", maxLength: 512, nullable: false, comment: "完整的单个下发指令"),

27
src/JiShe.IoT.EntityFrameworkCore/Migrations/IoTDbContextModelSnapshot.cs
View File

@ -751,6 +751,18 @@ namespace JiShe.IoT.Migrations
.HasColumnType("integer")
.HasComment("设备类型，与业务系统无关，主要区分是网关设备、直连设备");
b.Property<int>("EncryptionMethod")
.ValueGeneratedOnAdd()
.HasColumnType("integer")
.HasDefaultValue(1)
.HasComment("设备鉴权加密方式");
b.Property<int>("EncryptionType")
.ValueGeneratedOnAdd()
.HasColumnType("integer")
.HasDefaultValue(1)
.HasComment("设备加密类型，类型不同给，鉴权路径资源不同，默认为一型一密");
b.Property<string>("ExtraProperties")
.HasColumnType("text")
.HasColumnName("ExtraProperties")
@ -823,6 +835,10 @@ namespace JiShe.IoT.Migrations
.HasColumnType("timestamp with time zone")
.HasComment("最后在线时间");
b.Property<int?>("NeedEquipmentProductionPlan")
.HasColumnType("integer")
.HasComment("是否需要设备生产计划");
b.Property<int?>("OSACreatorId")
.HasColumnType("integer")
.HasComment("旧系统授权创建者Id");
@ -851,6 +867,11 @@ namespace JiShe.IoT.Migrations
.HasColumnType("text")
.HasComment("备注");
b.Property<string>("SimCardInfo")
.IsRequired()
.HasColumnType("jsonb")
.HasComment("SIM卡信息");
b.Property<int>("SubDeviceCapacity")
.ValueGeneratedOnAdd()
.HasColumnType("integer")
@ -1167,6 +1188,12 @@ namespace JiShe.IoT.Migrations
.HasColumnType("character varying(256)")
.HasComment("指令名称");
b.Property<int>("CommandType")
.ValueGeneratedOnAdd()
.HasColumnType("integer")
.HasDefaultValue(0)
.HasComment("指令类型");
b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken()
.IsRequired()