From f2b99b501ddda2d63d837be962568cc333f25692 Mon Sep 17 00:00:00 2001 From: zhouhao Date: Mon, 1 Dec 2025 09:58:00 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96=E5=86=85?= =?UTF-8?q?=E5=B5=8CUI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/run-all/docker-compose.yml | 24 ++++++++++++++++-------- jetlinks-standalone/pom.xml | 26 +------------------------- 2 files changed, 17 insertions(+), 33 deletions(-) diff --git a/docker/run-all/docker-compose.yml b/docker/run-all/docker-compose.yml index c193befb..79c0f4ef 100644 --- a/docker/run-all/docker-compose.yml +++ b/docker/run-all/docker-compose.yml @@ -11,15 +11,15 @@ services: environment: - TZ=Asia/Shanghai healthcheck: - test: ["CMD", "redis-cli", "-h", "localhost", "-p", "6379", "-a", "JetLinks@redis", "ping"] + test: [ "CMD", "redis-cli", "-h", "localhost", "-p", "6379", "-a", "JetLinks@redis", "ping" ] interval: 10s timeout: 5s retries: 3 postgres: image: timescale/timescaledb:latest-pg16 container_name: jetlinks-ce-postgres -# ports: -# - "5432:5432" # 仅供jetlinks-ce访问 + # ports: + # - "5432:5432" # 仅供jetlinks-ce访问 volumes: - "./data/postgres:/var/lib/postgresql/data" environment: @@ -28,7 +28,7 @@ services: POSTGRES_HOST_AUTH_METHOD: trust TZ: Asia/Shanghai healthcheck: - test: ["CMD", "pg_isready", "-U", "postgres"] + test: [ "CMD", "pg_isready", "-U", "postgres" ] interval: 10s timeout: 5s retries: 5 @@ -78,7 +78,15 @@ services: - redis:redis - postgres:postgres depends_on: - postgres: - condition: service_healthy - redis: - condition: service_healthy + postgres: + condition: service_healthy + redis: + condition: service_healthy +# ui: # 如果通过访问内嵌的前端存在问题,可以使用这个镜像 +# image: registry.cn-shenzhen.aliyuncs.com/jetlinks/jetlinks-ui-vue:2.11.0 +# ports: +# - "9000:9000" +# environment: +# API_BASE_PATH: "http://jetlinks:8848/" +# TZ: Asia/Shanghai + diff --git a/jetlinks-standalone/pom.xml b/jetlinks-standalone/pom.xml index dd9b3b2b..6e2458b1 100644 --- a/jetlinks-standalone/pom.xml +++ b/jetlinks-standalone/pom.xml @@ -175,31 +175,7 @@ org.jetlinks.ui - jetlinks-ui-resource - ${jetlinks.ui.version} - - - - org.jetlinks.ui - device-manager - ${jetlinks.ui.version} - - - - org.jetlinks.ui - notify-manager - ${jetlinks.ui.version} - - - - org.jetlinks.ui - rule-engine-manager - ${jetlinks.ui.version} - - - - org.jetlinks.ui - authentication-manager + jetlinks-community ${jetlinks.ui.version}