diff --git a/docker-compose-testing.yml b/docker-compose-testing.yml
index 0629ee30..f1b0df23 100644
--- a/docker-compose-testing.yml
+++ b/docker-compose-testing.yml
@@ -1,17 +1,17 @@
version: '3.3'
services:
- orion-visor-service:
- image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:2.1.1
+ service:
+ image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:2.1.2
privileged: true
ports:
- 1081:80
environment:
- - MYSQL_HOST=orion-visor-mysql
+ - MYSQL_HOST=mysql
- MYSQL_PORT=3306
- MYSQL_DATABASE=orion_visor
- MYSQL_USER=root
- MYSQL_PASSWORD=Data@123456
- - REDIS_HOST=orion-visor-redis
+ - REDIS_HOST=redis
- REDIS_PASSWORD=Data@123456
- SECRET_KEY=uQeacXV8b3isvKLK
- DEMO_MODE=false
@@ -24,15 +24,15 @@ services:
retries: 200
start_period: 3s
depends_on:
- orion-visor-mysql:
+ mysql:
condition: service_healthy
- orion-visor-redis:
+ redis:
condition: service_healthy
links:
- - orion-visor-mysql
- - orion-visor-redis
- orion-visor-mysql:
- image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:2.1.1
+ - mysql
+ - redis
+ mysql:
+ image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:2.1.2
privileged: true
ports:
- 3307:3306
@@ -51,8 +51,8 @@ services:
timeout: 60s
retries: 10
start_period: 3s
- orion-visor-redis:
- image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:2.1.1
+ redis:
+ image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:2.1.2
privileged: true
ports:
- 6380:6379
@@ -71,9 +71,9 @@ services:
build:
context: ./docker/e2e
environment:
- SERVER: http://orion-visor-service:80
+ SERVER: http://service:80
depends_on:
- orion-visor-service:
+ service:
condition: service_healthy
links:
- - orion-visor-service
+ - service
diff --git a/docker-compose.yml b/docker-compose.yml
index 4672638a..be588b1c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,17 +1,17 @@
version: '3.3'
services:
- orion-visor-service:
- image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:2.1.1
+ service:
+ image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:2.1.2
privileged: true
ports:
- 1081:80
environment:
- - MYSQL_HOST=orion-visor-mysql
+ - MYSQL_HOST=mysql
- MYSQL_PORT=3306
- MYSQL_DATABASE=orion_visor
- MYSQL_USER=root
- MYSQL_PASSWORD=Data@123456
- - REDIS_HOST=orion-visor-redis
+ - REDIS_HOST=redis
- REDIS_PASSWORD=Data@123456
- SECRET_KEY=uQeacXV8b3isvKLK
- DEMO_MODE=false
@@ -24,15 +24,15 @@ services:
retries: 200
start_period: 3s
depends_on:
- orion-visor-mysql:
+ mysql:
condition: service_healthy
- orion-visor-redis:
+ redis:
condition: service_healthy
links:
- - orion-visor-mysql
- - orion-visor-redis
- orion-visor-mysql:
- image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:2.1.1
+ - mysql
+ - redis
+ mysql:
+ image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:2.1.2
privileged: true
ports:
- 3307:3306
@@ -51,8 +51,8 @@ services:
timeout: 60s
retries: 10
start_period: 3s
- orion-visor-redis:
- image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:2.1.1
+ redis:
+ image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:2.1.2
privileged: true
ports:
- 6380:6379
@@ -67,7 +67,12 @@ services:
timeout: 60s
retries: 10
start_period: 3s
- orion-visor-adminer:
- image: adminer
+ adminer:
+ image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-adminer:2.1.2
ports:
- 8081:8080
+ depends_on:
+ mysql:
+ condition: service_healthy
+ links:
+ - mysql
diff --git a/docker/adminer/Dockerfile b/docker/adminer/Dockerfile
new file mode 100644
index 00000000..9ee4d40b
--- /dev/null
+++ b/docker/adminer/Dockerfile
@@ -0,0 +1 @@
+FROM adminer:latest
diff --git a/docker/adminer/build.sh b/docker/adminer/build.sh
new file mode 100644
index 00000000..bc1a13ef
--- /dev/null
+++ b/docker/adminer/build.sh
@@ -0,0 +1,5 @@
+#/bin/bash
+version=2.1.2
+docker build -t orion-visor-adminer:${version} .
+docker tag orion-visor-adminer:${version} registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-adminer:${version}
+docker push registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-adminer:${version}
diff --git a/docker/mysql/build.sh b/docker/mysql/build.sh
index 5c9bfe5d..33fe99cc 100644
--- a/docker/mysql/build.sh
+++ b/docker/mysql/build.sh
@@ -1,5 +1,5 @@
#/bin/bash
-version=2.1.1
+version=2.1.2
cp -r ../../sql ./sql
docker build -t orion-visor-mysql:${version} .
rm -rf ./sql
diff --git a/docker/redis/build.sh b/docker/redis/build.sh
index 6d3efd52..d32ba34f 100644
--- a/docker/redis/build.sh
+++ b/docker/redis/build.sh
@@ -1,5 +1,5 @@
#/bin/bash
-version=2.1.1
+version=2.1.2
docker build -t orion-visor-redis:${version} .
docker tag orion-visor-redis:${version} registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:${version}
docker push registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:${version}
diff --git a/docker/service/build.sh b/docker/service/build.sh
index 238e887f..bbb08391 100644
--- a/docker/service/build.sh
+++ b/docker/service/build.sh
@@ -1,5 +1,5 @@
#/bin/bash
-version=2.1.1
+version=2.1.2
mv ../../orion-visor-launch/target/orion-visor-launch.jar ./orion-visor-launch.jar
mv ../../orion-visor-ui/dist ./dist
docker build -t orion-visor-service:${version} .
diff --git a/orion-visor-dependencies/pom.xml b/orion-visor-dependencies/pom.xml
index 8ed63d50..d90292c8 100644
--- a/orion-visor-dependencies/pom.xml
+++ b/orion-visor-dependencies/pom.xml
@@ -14,7 +14,7 @@
https://github.com/dromara/orion-visor
- 2.1.1
+ 2.1.2
2.7.17
2.7.15
1.5.0
diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/AppConst.java b/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/AppConst.java
index 6f2af3e3..197f43d8 100644
--- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/AppConst.java
+++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/AppConst.java
@@ -14,7 +14,7 @@ public interface AppConst extends OrionConst {
/**
* 同 ${orion.version} 迭代时候需要手动更改
*/
- String VERSION = "2.1.1";
+ String VERSION = "2.1.2";
/**
* 同 ${spring.application.name}
diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-card-list.vue.vm b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-card-list.vue.vm
index c6292a22..9d22e4e6 100644
--- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-card-list.vue.vm
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-card-list.vue.vm
@@ -118,7 +118,7 @@