manager/orion-visor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🔖 升级版本.

Browse Source
This commit is contained in:
lijiahang
2024-10-24 09:36:05 +08:00
parent 8ace3ddd1f
commit 029a46c07d
12 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
docker-compose-testing.yml
View File

@@ -1,7 +1,7 @@
version: '3.3' version: '3.3'
services: services:
service: service:
image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:2.1.7 image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:2.1.8
privileged: true privileged: true
ports: ports:
- 1081:80 - 1081:80
@@ -32,7 +32,7 @@ services:
- mysql - mysql
- redis - redis
mysql: mysql:
image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:2.1.7 image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:2.1.8
privileged: true privileged: true
ports: ports:
- 3307:3306 - 3307:3306
@@ -52,7 +52,7 @@ services:
retries: 10 retries: 10
start_period: 3s start_period: 3s
redis: redis:
image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:2.1.7 image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:2.1.8
privileged: true privileged: true
ports: ports:
- 6380:6379 - 6380:6379

8
docker-compose.yml
View File

@@ -1,7 +1,7 @@
version: '3.3' version: '3.3'
services: services:
service: service:
image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:2.1.7 image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:2.1.8
privileged: true privileged: true
ports: ports:
- ${SERVICE_PORT:-1081}:80 - ${SERVICE_PORT:-1081}:80
@@ -32,7 +32,7 @@ services:
- mysql - mysql
- redis - redis
mysql: mysql:
image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:2.1.7 image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:2.1.8
privileged: true privileged: true
ports: ports:
- 3307:3306 - 3307:3306
@@ -52,7 +52,7 @@ services:
retries: 15 retries: 15
start_period: 3s start_period: 3s
redis: redis:
image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:2.1.7 image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:2.1.8
privileged: true privileged: true
ports: ports:
- 6380:6379 - 6380:6379
@@ -68,7 +68,7 @@ services:
retries: 15 retries: 15
start_period: 3s start_period: 3s
adminer: adminer:
image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-adminer:2.1.7 image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-adminer:2.1.8
ports: ports:
- 8081:8080 - 8081:8080
depends_on: depends_on:

2
docker/adminer/build.sh
View File

@@ -1,4 +1,4 @@
#/bin/bash #/bin/bash
version=2.1.7 version=2.1.8
docker build -t orion-visor-adminer:${version} . docker build -t orion-visor-adminer:${version} .
docker tag orion-visor-adminer:${version} registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-adminer:${version} docker tag orion-visor-adminer:${version} registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-adminer:${version}

2
docker/mysql/build.sh
View File

@@ -1,5 +1,5 @@
#/bin/bash #/bin/bash
version=2.1.7 version=2.1.8
cp -r ../../sql ./sql cp -r ../../sql ./sql
docker build -t orion-visor-mysql:${version} . docker build -t orion-visor-mysql:${version} .
rm -rf ./sql rm -rf ./sql

2
docker/push.sh
View File

@@ -1,5 +1,5 @@
#/bin/bash #/bin/bash
version=2.1.7 version=2.1.8
docker push registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-adminer:${version} 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-mysql:${version}
docker push registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:${version} docker push registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:${version}

2
docker/redis/build.sh
View File

@@ -1,4 +1,4 @@
#/bin/bash #/bin/bash
version=2.1.7 version=2.1.8
docker build -t orion-visor-redis:${version} . docker build -t orion-visor-redis:${version} .
docker tag orion-visor-redis:${version} registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:${version} docker tag orion-visor-redis:${version} registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:${version}

2
docker/service/build.sh
View File

@@ -1,5 +1,5 @@
#/bin/bash #/bin/bash
version=2.1.7 version=2.1.8
mv ../../orion-visor-launch/target/orion-visor-launch.jar ./orion-visor-launch.jar mv ../../orion-visor-launch/target/orion-visor-launch.jar ./orion-visor-launch.jar
mv ../../orion-visor-ui/dist ./dist mv ../../orion-visor-ui/dist ./dist
docker build -t orion-visor-service:${version} . docker build -t orion-visor-service:${version} .

4
orion-visor-dependencies/pom.xml
View File

@@ -14,11 +14,11 @@
<url>https://github.com/dromara/orion-visor</url> <url>https://github.com/dromara/orion-visor</url>
<properties> <properties>
<revision>2.1.7</revision> <revision>2.1.8</revision>
<spring.boot.version>2.7.17</spring.boot.version> <spring.boot.version>2.7.17</spring.boot.version>
<spring.boot.admin.version>2.7.15</spring.boot.admin.version> <spring.boot.admin.version>2.7.15</spring.boot.admin.version>
<flatten.maven.plugin.version>1.5.0</flatten.maven.plugin.version> <flatten.maven.plugin.version>1.5.0</flatten.maven.plugin.version>
<orion.kit.version>1.0.8</orion.kit.version> <orion.kit.version>1.0.9</orion.kit.version>
<aspectj.version>1.9.7</aspectj.version> <aspectj.version>1.9.7</aspectj.version>
<lombok.version>1.18.26</lombok.version> <lombok.version>1.18.26</lombok.version>
<springdoc.version>1.6.15</springdoc.version> <springdoc.version>1.6.15</springdoc.version>

2
orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/AppConst.java
View File

@@ -29,7 +29,7 @@ public interface AppConst extends OrionConst {
/** /**
* 同 ${orion.version} 迭代时候需要手动更改 * 同 ${orion.version} 迭代时候需要手动更改
*/ */
String VERSION = "2.1.7"; String VERSION = "2.1.8";
/** /**
* 同 ${spring.application.name} * 同 ${spring.application.name}

4
orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/utils/Valid.java
View File

@@ -43,6 +43,10 @@ public class Valid extends com.orion.lang.utils.Valid {
return notNull(object, ErrorMessage.PARAM_MISSING); return notNull(object, ErrorMessage.PARAM_MISSING);
} }
public static <T> T isNull(T object) {
return isNull(object, ErrorMessage.PARAM_ERROR);
}
public static String notBlank(String s) { public static String notBlank(String s) {
return notBlank(s, ErrorMessage.PARAM_MISSING); return notBlank(s, ErrorMessage.PARAM_MISSING);
} }

2
orion-visor-ui/package.json
View File

@@ -1,7 +1,7 @@
{ {
"name": "orion-visor-ui", "name": "orion-visor-ui",
"description": "Orion Visor UI", "description": "Orion Visor UI",
"version": "2.1.7", "version": "2.1.8",
"private": true, "private": true,
"author": "Jiahang Li", "author": "Jiahang Li",
"license": "Apache 2.0", "license": "Apache 2.0",

2
pom.xml
View File

@@ -22,7 +22,7 @@
</modules> </modules>
<properties> <properties>
<revision>2.1.7</revision> <revision>2.1.8</revision>
<maven.compiler.source>8</maven.compiler.source> <maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target> <maven.compiler.target>8</maven.compiler.target>
<maven.surefire.plugin.version>3.0.0-M5</maven.surefire.plugin.version> <maven.surefire.plugin.version>3.0.0-M5</maven.surefire.plugin.version>