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

Compare commits

base: admin:c571b670c3539b15244ddaab787f533b1d386ab7
Branches Tags
admin:master
admin:master_net9_Pomelo
..
compare: admin:ebc31c3444cbd9f48e492a09ae182e84397e76ca
Branches Tags
admin:master
admin:master_net9_Pomelo

No commits in common. "c571b670c3539b15244ddaab787f533b1d386ab7" and "ebc31c3444cbd9f48e492a09ae182e84397e76ca" have entirely different histories.
c571b670c3 ... ebc31c3444

3 changed files with 5 additions and 5 deletions
Show Stats Expand all files Collapse all files

4
DockerComposeShells/docker-compose.yml
View File

@ -253,7 +253,7 @@ services:
- pulsar-net - pulsar-net
admin-api-service: admin-api-service:
image: registry.cn-qingdao.aliyuncs.com/jisheyun/jishe.iot.admin:2025.0901.1107 image: registry.cn-qingdao.aliyuncs.com/jisheyun/jishe.iot.admin:2025.0827.1536
container_name: admin-api container_name: admin-api
hostname: admin-api hostname: admin-api
restart: always restart: always
@ -284,7 +284,7 @@ services:
- pulsar-net - pulsar-net
admin-web-service: admin-web-service:
image: registry.cn-qingdao.aliyuncs.com/jisheyun/jishe.iot.ui:2025.0901.1413 image: registry.cn-qingdao.aliyuncs.com/jisheyun/jishe.iot.ui:2025.0819.2313
container_name: admin-web container_name: admin-web
hostname: admin-web hostname: admin-web
restart: always restart: always

4
DockerComposeShells/start-pulsar.sh
View File

@ -170,14 +170,14 @@ echo "⏳ 等待IoTDB服务启动完成..."
sleep 10 sleep 10
# 设置IoTDB密码 # 设置IoTDB密码
echo "第七步：🔐 设置 IoTDB" echo "第七步：🔐 设置IoTDB root用户密码..."
echo "ALTER USER root SET PASSWORD '${IOTDB_ROOT_PASSWORD}';" echo "ALTER USER root SET PASSWORD '${IOTDB_ROOT_PASSWORD}';"
docker exec -i iotdb-standalone /bin/bash << EOF docker exec -i iotdb-standalone /bin/bash << EOF
# 等待IoTDB完全启动 # 等待IoTDB完全启动
echo "等待IoTDB服务就绪..." echo "等待IoTDB服务就绪..."
sleep 10 sleep 10
echo "IoTDB服务已就绪，开始创建表模型数据库和设置root账号密码..." echo "IoTDB服务已就绪，开始设置密码和创建数据库..."
# 使用非交互式方式创建表模型数据库 # 使用非交互式方式创建表模型数据库
echo "CREATE DATABASE jisheiotdata;USE jisheiotdata;CREATE TABLE IF NOT EXISTS CTWingAepReceiveMessageEntity( time TIMESTAMP TIME, IoTDataType STRING TAG, DeviceType STRING TAG, DeviceAddress STRING TAG, PlatformTenantId STRING FIELD, ProductId STRING FIELD, ServiceId STRING FIELD, IoTPlatformDeviceOpenInfo STRING FIELD, MessageType STRING FIELD, Protocol STRING FIELD, RawMessage STRING FIELD, ReceivedPayload STRING FIELD, ReceivedTimestamps INT64 FIELD, IMSI STRING FIELD, IMEI STRING FIELD ) COMMENT 'CTWingAepReceiveMessageEntity';CREATE TABLE IF NOT EXISTS DeviceTelemetryPacketTaskInfo( time TIMESTAMP TIME, IoTDataType STRING TAG, DeviceType STRING TAG, DeviceAddress STRING TAG, IoTPlatformProductId STRING FIELD, IoTPlatformDeviceOpenInfo STRING FIELD, IoTPlatformProductName STRING FIELD, IoTPlatformAccountId STRING FIELD, AccountPhoneNumber STRING FIELD, MessageType STRING FIELD, IssueRawMessage STRING FIELD, IssuePayload STRING FIELD, ResponseRawMessage STRING FIELD, ResponsePayload STRING FIELD, TelemetrySource INT32 FIELD, IoTPlatform INT32 FIELD ) COMMENT 'DeviceTelemetryPacketTaskInfo';CREATE TABLE IF NOT EXISTS OneNETReceiveMessageEntity( time TIMESTAMP TIME, IoTDataType STRING TAG, DeviceType STRING TAG, DeviceAddress STRING TAG, ProductId STRING FIELD, IoTPlatformDeviceOpenInfo STRING FIELD, MessageType STRING FIELD, Protocol STRING FIELD, RawMessage STRING FIELD, IsEncrypted BOOLEAN FIELD, PlaintextMessage STRING FIELD, ReceivedPayload STRING FIELD, ReceivedTimestamps INT64 FIELD ) COMMENT 'OneNETReceiveMessageEntity';" | ./start-cli.sh -h iotdb-standalone -sql_dialect table echo "CREATE DATABASE jisheiotdata;USE jisheiotdata;CREATE TABLE IF NOT EXISTS CTWingAepReceiveMessageEntity( time TIMESTAMP TIME, IoTDataType STRING TAG, DeviceType STRING TAG, DeviceAddress STRING TAG, PlatformTenantId STRING FIELD, ProductId STRING FIELD, ServiceId STRING FIELD, IoTPlatformDeviceOpenInfo STRING FIELD, MessageType STRING FIELD, Protocol STRING FIELD, RawMessage STRING FIELD, ReceivedPayload STRING FIELD, ReceivedTimestamps INT64 FIELD, IMSI STRING FIELD, IMEI STRING FIELD ) COMMENT 'CTWingAepReceiveMessageEntity';CREATE TABLE IF NOT EXISTS DeviceTelemetryPacketTaskInfo( time TIMESTAMP TIME, IoTDataType STRING TAG, DeviceType STRING TAG, DeviceAddress STRING TAG, IoTPlatformProductId STRING FIELD, IoTPlatformDeviceOpenInfo STRING FIELD, IoTPlatformProductName STRING FIELD, IoTPlatformAccountId STRING FIELD, AccountPhoneNumber STRING FIELD, MessageType STRING FIELD, IssueRawMessage STRING FIELD, IssuePayload STRING FIELD, ResponseRawMessage STRING FIELD, ResponsePayload STRING FIELD, TelemetrySource INT32 FIELD, IoTPlatform INT32 FIELD ) COMMENT 'DeviceTelemetryPacketTaskInfo';CREATE TABLE IF NOT EXISTS OneNETReceiveMessageEntity( time TIMESTAMP TIME, IoTDataType STRING TAG, DeviceType STRING TAG, DeviceAddress STRING TAG, ProductId STRING FIELD, IoTPlatformDeviceOpenInfo STRING FIELD, MessageType STRING FIELD, Protocol STRING FIELD, RawMessage STRING FIELD, IsEncrypted BOOLEAN FIELD, PlaintextMessage STRING FIELD, ReceivedPayload STRING FIELD, ReceivedTimestamps INT64 FIELD ) COMMENT 'OneNETReceiveMessageEntity';" | ./start-cli.sh -h iotdb-standalone -sql_dialect table

2
JiShe.ServicePro

@ -1 +1 @@
Subproject commit da5242b612338a0fb81bf10839c10b0bde7b43df Subproject commit 97f6ab9088bbeb0cf41409ba53687d07e795d3d3