diff --git a/docker-compose.yml b/docker-compose.yml
index 705b773b..b103de8e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,7 @@
version: '3.3'
services:
orion-visor-service:
- image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:2.0.6
+ image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:2.0.7
ports:
- 1081:80
environment:
@@ -20,7 +20,7 @@ services:
- orion-visor-mysql
- orion-visor-redis
orion-visor-mysql:
- image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:2.0.6
+ image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:2.0.7
privileged: true
ports:
- 3307:3306
@@ -34,7 +34,7 @@ services:
- /data/orion-visor-space/docker-volumes/orion-visor-mysql/var-lib-mysql-files:/var/lib/mysql-files
- /data/orion-visor-space/docker-volumes/orion-visor-mysql/etc-mysql:/etc/mysql
orion-visor-redis:
- image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:2.0.6
+ image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:2.0.7
privileged: true
ports:
- 6380:6379
diff --git a/docker/orion-visor-mysql/build.sh b/docker/orion-visor-mysql/build.sh
index 960d3eda..a12d2d7b 100644
--- a/docker/orion-visor-mysql/build.sh
+++ b/docker/orion-visor-mysql/build.sh
@@ -1,5 +1,5 @@
#/bin/bash
-version=2.0.6
+version=2.0.7
cp -r ../../sql ./sql
docker build -t orion-visor-mysql:${version} .
rm -rf ./sql
diff --git a/docker/orion-visor-redis/build.sh b/docker/orion-visor-redis/build.sh
index cef014d5..d9629d7f 100644
--- a/docker/orion-visor-redis/build.sh
+++ b/docker/orion-visor-redis/build.sh
@@ -1,5 +1,5 @@
#/bin/bash
-version=2.0.6
+version=2.0.7
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/orion-visor-service/build.sh b/docker/orion-visor-service/build.sh
index f8fea604..aaa4e01e 100644
--- a/docker/orion-visor-service/build.sh
+++ b/docker/orion-visor-service/build.sh
@@ -1,5 +1,5 @@
#/bin/bash
-version=2.0.6
+version=2.0.7
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 10503d6c..9cc9a61e 100644
--- a/orion-visor-dependencies/pom.xml
+++ b/orion-visor-dependencies/pom.xml
@@ -14,7 +14,7 @@
https://github.com/lijiahangmax/orion-visor
- 2.0.6
+ 2.0.7
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 33851407..89682f15 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.0.6";
+ String VERSION = "2.0.7";
String ORION_VISOR = "orion-visor";
diff --git a/orion-visor-launch/src/main/java/com/orion/visor/launch/LaunchApplication.java b/orion-visor-launch/src/main/java/com/orion/visor/launch/LaunchApplication.java
index 52e09f51..f3928349 100644
--- a/orion-visor-launch/src/main/java/com/orion/visor/launch/LaunchApplication.java
+++ b/orion-visor-launch/src/main/java/com/orion/visor/launch/LaunchApplication.java
@@ -1,10 +1,17 @@
package com.orion.visor.launch;
+import com.orion.lang.utils.Strings;
+import com.orion.visor.framework.common.constant.Const;
+import org.springframework.beans.factory.annotation.AnnotatedBeanDefinition;
import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.beans.factory.support.BeanDefinitionReaderUtils;
import org.springframework.beans.factory.support.BeanDefinitionRegistry;
import org.springframework.beans.factory.support.BeanNameGenerator;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.core.type.AnnotationMetadata;
+
+import java.util.Optional;
/**
* application 启动类
@@ -26,9 +33,25 @@ public class LaunchApplication {
* 自定义 bean 名称生成器
*/
public static class CustomBeanNameGenerator implements BeanNameGenerator {
+
+ private static final String BEAN_ANNOTATION_CLASS_NAME = "org.springframework.stereotype.Component";
+
@Override
public String generateBeanName(BeanDefinition definition, BeanDefinitionRegistry registry) {
- return definition.getBeanClassName();
+ // 兼容注解自定义名称
+ if (definition instanceof AnnotatedBeanDefinition) {
+ AnnotationMetadata metadata = ((AnnotatedBeanDefinition) definition).getMetadata();
+ // 处理自定义 bean 名称
+ return Optional.of(metadata)
+ .map(s -> s.getAnnotationAttributes(BEAN_ANNOTATION_CLASS_NAME))
+ .map(s -> s.get(Const.VALUE))
+ .map(Object::toString)
+ .filter(Strings::isNotBlank)
+ .orElseGet(definition::getBeanClassName);
+ } else {
+ // 非注解形式默认使用默认名称
+ return BeanDefinitionReaderUtils.generateBeanName(definition, registry);
+ }
}
}
diff --git a/orion-visor-ui/.env.development b/orion-visor-ui/.env.development
index ad5823d0..d09a8a7d 100644
--- a/orion-visor-ui/.env.development
+++ b/orion-visor-ui/.env.development
@@ -1,6 +1,6 @@
VITE_API_BASE_URL= 'http://127.0.0.1:9200/orion-visor/api'
VITE_WS_BASE_URL= 'ws://127.0.0.1:9200/orion-visor/keep-alive'
-VITE_APP_VERSION= '2.0.6'
+VITE_APP_VERSION= '2.0.7'
VITE_APP_RELEASE= 'Community'
VITE_SFTP_PREVIEW_MB= 2
VITE_DEMO_MODE= false
diff --git a/orion-visor-ui/.env.production b/orion-visor-ui/.env.production
index dc1245e0..ff9b7c38 100644
--- a/orion-visor-ui/.env.production
+++ b/orion-visor-ui/.env.production
@@ -1,6 +1,6 @@
VITE_API_BASE_URL= '/orion-visor/api'
VITE_WS_BASE_URL= '/orion-visor/keep-alive'
-VITE_APP_VERSION= '2.0.6'
+VITE_APP_VERSION= '2.0.7'
VITE_APP_RELEASE= 'Community'
VITE_SFTP_PREVIEW_MB= 2
VITE_DEMO_MODE= false
diff --git a/orion-visor-ui/package.json b/orion-visor-ui/package.json
index 30435206..afcf09d5 100644
--- a/orion-visor-ui/package.json
+++ b/orion-visor-ui/package.json
@@ -1,7 +1,7 @@
{
"name": "orion-visor-ui",
"description": "Orion Visor UI",
- "version": "2.0.6",
+ "version": "2.0.7",
"private": true,
"author": "Jiahang Li",
"license": "Apache 2.0",
diff --git a/pom.xml b/pom.xml
index 3c8948d3..18956434 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
- 2.0.6
+ 2.0.7
8
8
3.0.0-M5