diff --git a/.env.example b/.env.example new file mode 100644 index 00000000..36176a83 --- /dev/null +++ b/.env.example @@ -0,0 +1,15 @@ +SERVICE_PORT=1081 +VOLUME_BASE=/data/orion-visor-space/docker-volumes + +MYSQL_HOST=mysql +MYSQL_PORT=3306 +MYSQL_DATABASE=orion_visor +MYSQL_USER=orion +MYSQL_PASSWORD=Data@123456 +MYSQL_ROOT_PASSWORD=Data@123456 + +REDIS_HOST=redis +REDIS_PASSWORD=Data@123456 + +SECRET_KEY=uQeacXV8b3isvKLK +DEMO_MODE=false diff --git a/.gitignore b/.gitignore index c8088e13..35246529 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,4 @@ build/ ### VS Code ### .vscode/ +.env diff --git a/README.md b/README.md index ca325231..eee75a30 100644 --- a/README.md +++ b/README.md @@ -19,12 +19,12 @@ - star + star - fork + fork /dev/tcp/127.0.0.1/3306" ] interval: 3s @@ -52,14 +52,14 @@ services: retries: 10 start_period: 3s redis: - image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:2.1.2 + image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:2.1.3 privileged: true ports: - 6380:6379 environment: - - REDIS_PASSWORD=Data@123456 + - REDIS_PASSWORD=${REDIS_PASSWORD:-Data@123456} volumes: - - /data/orion-visor-space/docker-volumes/redis/data:/data + - ${VOLUME_BASE:-/data/orion-visor-space/docker-volumes}/redis/data:/data command: sh -c "redis-server /usr/local/redis.conf --requirepass $${REDIS_PASSWORD}" healthcheck: test: [ "CMD", "redis-cli", "--raw", "incr", "ping" ] @@ -68,7 +68,7 @@ services: retries: 10 start_period: 3s adminer: - image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-adminer:2.1.2 + image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-adminer:2.1.3 ports: - 8081:8080 depends_on: diff --git a/docker-upgrade.sh b/docker-upgrade.sh index 42e6059e..52fa9d8d 100644 --- a/docker-upgrade.sh +++ b/docker-upgrade.sh @@ -2,6 +2,6 @@ docker compose down # demo 启动 if [ "$1" == "demo" ]; then - sed -i 's/DEMO_MODE=false/DEMO_MODE=true/g' docker-compose.yml + sed -i 's/\${DEMO_MODE:-false}/true/g' docker-compose.yml fi docker compose up -d --remove-orphans diff --git a/docker/adminer/build.sh b/docker/adminer/build.sh index bc1a13ef..f03a0a99 100644 --- a/docker/adminer/build.sh +++ b/docker/adminer/build.sh @@ -1,5 +1,4 @@ #/bin/bash -version=2.1.2 +version=2.1.3 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 33fe99cc..614c250f 100644 --- a/docker/mysql/build.sh +++ b/docker/mysql/build.sh @@ -1,7 +1,6 @@ #/bin/bash -version=2.1.2 +version=2.1.3 cp -r ../../sql ./sql docker build -t orion-visor-mysql:${version} . rm -rf ./sql docker tag orion-visor-mysql:${version} registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:${version} -docker push registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:${version} diff --git a/docker/push.sh b/docker/push.sh new file mode 100644 index 00000000..736746e7 --- /dev/null +++ b/docker/push.sh @@ -0,0 +1,6 @@ +#/bin/bash +version=2.1.3 +docker push registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-adminer:${version} +docker push registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:${version} +docker push registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:${version} +docker push registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:${version} diff --git a/docker/redis/build.sh b/docker/redis/build.sh index d32ba34f..16e44b07 100644 --- a/docker/redis/build.sh +++ b/docker/redis/build.sh @@ -1,5 +1,4 @@ #/bin/bash -version=2.1.2 +version=2.1.3 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 bbb08391..52b69d10 100644 --- a/docker/service/build.sh +++ b/docker/service/build.sh @@ -1,9 +1,8 @@ #/bin/bash -version=2.1.2 +version=2.1.3 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} . rm -rf ./orion-visor-launch.jar rm -rf ./dist docker tag orion-visor-service:${version} registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:${version} -docker push registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:${version} diff --git a/docs/README.md b/docs/README.md index 584eb34c..96601d1f 100644 --- a/docs/README.md +++ b/docs/README.md @@ -19,12 +19,12 @@ - star + star - fork + fork https://github.com/dromara/orion-visor - 2.1.2 + 2.1.3 2.7.17 2.7.15 1.5.0 - 1.0.7 + 1.0.8 1.9.7 1.18.26 1.6.15 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 197f43d8..1d03be4f 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.2"; + String VERSION = "2.1.3"; /** * 同 ${spring.application.name} diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/ErrorMessage.java b/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/ErrorMessage.java index e49e1326..ecfc6fad 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/ErrorMessage.java +++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/ErrorMessage.java @@ -109,4 +109,6 @@ public interface ErrorMessage { String CLIENT_ABORT = "手动中断"; + String UNABLE_DOWNLOAD_FOLDER = "无法下载文件夹"; + } diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/entity/PageRequest.java b/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/entity/PageRequest.java index 3335729f..b9670b72 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/entity/PageRequest.java +++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/entity/PageRequest.java @@ -21,7 +21,7 @@ public class PageRequest implements IPageRequest { @Schema(description = "页码") private int page; - @Range(min = 1, max = 100, groups = Page.class) + @Range(min = 1, max = 200, groups = Page.class) @Schema(description = "大小") private int limit; 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 9d22e4e6..401044b3 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 @@ -68,7 +68,7 @@