Skip to content

Commit f2b99b5

Browse files
committed
refactor: 优化内嵌UI
1 parent 5b32a0f commit f2b99b5

2 files changed

Lines changed: 17 additions & 33 deletions

File tree

docker/run-all/docker-compose.yml

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ services:
1111
environment:
1212
- TZ=Asia/Shanghai
1313
healthcheck:
14-
test: ["CMD", "redis-cli", "-h", "localhost", "-p", "6379", "-a", "JetLinks@redis", "ping"]
14+
test: [ "CMD", "redis-cli", "-h", "localhost", "-p", "6379", "-a", "JetLinks@redis", "ping" ]
1515
interval: 10s
1616
timeout: 5s
1717
retries: 3
1818
postgres:
1919
image: timescale/timescaledb:latest-pg16
2020
container_name: jetlinks-ce-postgres
21-
# ports:
22-
# - "5432:5432" # 仅供jetlinks-ce访问
21+
# ports:
22+
# - "5432:5432" # 仅供jetlinks-ce访问
2323
volumes:
2424
- "./data/postgres:/var/lib/postgresql/data"
2525
environment:
@@ -28,7 +28,7 @@ services:
2828
POSTGRES_HOST_AUTH_METHOD: trust
2929
TZ: Asia/Shanghai
3030
healthcheck:
31-
test: ["CMD", "pg_isready", "-U", "postgres"]
31+
test: [ "CMD", "pg_isready", "-U", "postgres" ]
3232
interval: 10s
3333
timeout: 5s
3434
retries: 5
@@ -78,7 +78,15 @@ services:
7878
- redis:redis
7979
- postgres:postgres
8080
depends_on:
81-
postgres:
82-
condition: service_healthy
83-
redis:
84-
condition: service_healthy
81+
postgres:
82+
condition: service_healthy
83+
redis:
84+
condition: service_healthy
85+
# ui: # 如果通过访问内嵌的前端存在问题,可以使用这个镜像
86+
# image: registry.cn-shenzhen.aliyuncs.com/jetlinks/jetlinks-ui-vue:2.11.0
87+
# ports:
88+
# - "9000:9000"
89+
# environment:
90+
# API_BASE_PATH: "http://jetlinks:8848/"
91+
# TZ: Asia/Shanghai
92+

jetlinks-standalone/pom.xml

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -175,31 +175,7 @@
175175
<!--UI 相关依赖-->
176176
<dependency>
177177
<groupId>org.jetlinks.ui</groupId>
178-
<artifactId>jetlinks-ui-resource</artifactId>
179-
<version>${jetlinks.ui.version}</version>
180-
</dependency>
181-
182-
<dependency>
183-
<groupId>org.jetlinks.ui</groupId>
184-
<artifactId>device-manager</artifactId>
185-
<version>${jetlinks.ui.version}</version>
186-
</dependency>
187-
188-
<dependency>
189-
<groupId>org.jetlinks.ui</groupId>
190-
<artifactId>notify-manager</artifactId>
191-
<version>${jetlinks.ui.version}</version>
192-
</dependency>
193-
194-
<dependency>
195-
<groupId>org.jetlinks.ui</groupId>
196-
<artifactId>rule-engine-manager</artifactId>
197-
<version>${jetlinks.ui.version}</version>
198-
</dependency>
199-
200-
<dependency>
201-
<groupId>org.jetlinks.ui</groupId>
202-
<artifactId>authentication-manager</artifactId>
178+
<artifactId>jetlinks-community</artifactId>
203179
<version>${jetlinks.ui.version}</version>
204180
</dependency>
205181
</dependencies>

0 commit comments

Comments
 (0)