diff --git a/orion-visor-launch/src/main/java/org/dromara/visor/launch/configuration/LaunchApplicationConfiguration.java b/orion-visor-common/src/main/java/org/dromara/visor/common/configuration/SpringConfiguration.java
similarity index 91%
rename from orion-visor-launch/src/main/java/org/dromara/visor/launch/configuration/LaunchApplicationConfiguration.java
rename to orion-visor-common/src/main/java/org/dromara/visor/common/configuration/SpringConfiguration.java
index 31148f0f..a7ce3d52 100644
--- a/orion-visor-launch/src/main/java/org/dromara/visor/launch/configuration/LaunchApplicationConfiguration.java
+++ b/orion-visor-common/src/main/java/org/dromara/visor/common/configuration/SpringConfiguration.java
@@ -20,21 +20,21 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.dromara.visor.launch.configuration;
+package org.dromara.visor.common.configuration;
import cn.orionsec.kit.spring.SpringHolder;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
/**
- * 应用配置类
+ * spring 配置类
*
* @author Jiahang Li
* @version 1.0.0
* @since 2023/6/20 10:34
*/
@Configuration
-public class LaunchApplicationConfiguration {
+public class SpringConfiguration {
/**
* @return spring 容器工具类
diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-test/src/main/java/org/dromara/visor/framework/test/core/base/BaseUnitTest.java b/orion-visor-framework/orion-visor-spring-boot-starter-test/src/main/java/org/dromara/visor/framework/test/core/base/BaseUnitTest.java
index 1f07ce5a..2a943537 100644
--- a/orion-visor-framework/orion-visor-spring-boot-starter-test/src/main/java/org/dromara/visor/framework/test/core/base/BaseUnitTest.java
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-test/src/main/java/org/dromara/visor/framework/test/core/base/BaseUnitTest.java
@@ -24,6 +24,7 @@ package org.dromara.visor.framework.test.core.base;
import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure;
import com.baomidou.mybatisplus.autoconfigure.MybatisPlusAutoConfiguration;
+import org.dromara.visor.common.configuration.SpringConfiguration;
import org.dromara.visor.framework.datasource.configuration.OrionDataSourceAutoConfiguration;
import org.dromara.visor.framework.mybatis.configuration.OrionMybatisAutoConfiguration;
import org.dromara.visor.framework.redis.configuration.OrionRedisAutoConfiguration;
@@ -57,6 +58,8 @@ import org.springframework.transaction.annotation.Transactional;
public class BaseUnitTest {
@Import({
+ // spring
+ SpringConfiguration.class,
// mock
OrionMockBeanTestConfiguration.class,
OrionMockRedisTestConfiguration.class,
@@ -74,7 +77,6 @@ public class BaseUnitTest {
RedisAutoConfiguration.class,
RedissonAutoConfiguration.class,
})
- // TODO
public static class Application {
}
diff --git a/orion-visor-launch/src/main/java/org/dromara/visor/launch/LaunchApplication.java b/orion-visor-launch/src/main/java/org/dromara/visor/launch/LaunchApplication.java
index 5d893310..fae60a26 100644
--- a/orion-visor-launch/src/main/java/org/dromara/visor/launch/LaunchApplication.java
+++ b/orion-visor-launch/src/main/java/org/dromara/visor/launch/LaunchApplication.java
@@ -42,7 +42,11 @@ import java.util.Optional;
* @version 1.0.0
* @since 2023/6/19 16:55
*/
-@SpringBootApplication(scanBasePackages = {"org.dromara.visor.launch", "org.dromara.visor.module"})
+@SpringBootApplication(scanBasePackages = {
+ "org.dromara.visor.launch",
+ "org.dromara.visor.common",
+ "org.dromara.visor.module"
+})
public class LaunchApplication {
public static void main(String[] args) {
diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/pom.xml b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/pom.xml
index d3c6ff2d..77d4baba 100644
--- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/pom.xml
+++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/pom.xml
@@ -82,6 +82,10 @@
org.dromara.visor
orion-visor-spring-boot-starter-job
+
+ org.dromara.visor
+ orion-visor-spring-boot-starter-test
+
\ No newline at end of file
diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/HostService.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/HostService.java
index 1d6d17ba..8dfc2ccb 100644
--- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/HostService.java
+++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/HostService.java
@@ -135,13 +135,6 @@ public interface HostService {
*/
void deleteHostRelByIdListAsync(List idList);
- /**
- * 获取当前更新配置的 hostId
- *
- * @return hostId
- */
- Long getCurrentUpdateConfigHostId();
-
/**
* 清除缓存
*/
diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostServiceImpl.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostServiceImpl.java
index d21992db..8d9b0c45 100644
--- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostServiceImpl.java
+++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostServiceImpl.java
@@ -83,8 +83,6 @@ import java.util.stream.Collectors;
@Service
public class HostServiceImpl implements HostService {
- private static final ThreadLocal CURRENT_UPDATE_CONFIG_ID = new ThreadLocal<>();
-
@Resource
private HostDAO hostDAO;
@@ -185,30 +183,25 @@ public class HostServiceImpl implements HostService {
OperatorLogs.add(ExtraFieldConst.CONFIG, param);
log.info("HostService-updateHostConfig request: {}", param);
Long id = request.getId();
- try {
- CURRENT_UPDATE_CONFIG_ID.set(id);
- // 查询主机信息
- HostDO host = hostDAO.selectById(id);
- Valid.notNull(host, ErrorMessage.HOST_ABSENT);
- HostTypeEnum type = Valid.valid(HostTypeEnum::of, host.getType());
- GenericsDataModel beforeConfig = type.parse(host.getConfig());
- GenericsDataModel newConfig = type.parse(request.getConfig());
- // 添加日志参数
- OperatorLogs.add(OperatorLogs.ID, id);
- OperatorLogs.add(OperatorLogs.NAME, host.getName());
- // 更新前校验
- type.doValid(beforeConfig, newConfig);
- // 修改配置
- HostDO updateHost = HostDO.builder()
- .id(id)
- .config(newConfig.serial())
- .build();
- int effect = hostDAO.updateById(updateHost);
- log.info("HostService-updateHostConfig effect: {}", effect);
- return effect;
- } finally {
- CURRENT_UPDATE_CONFIG_ID.remove();
- }
+ // 查询主机信息
+ HostDO host = hostDAO.selectById(id);
+ Valid.notNull(host, ErrorMessage.HOST_ABSENT);
+ HostTypeEnum type = Valid.valid(HostTypeEnum::of, host.getType());
+ GenericsDataModel beforeConfig = type.parse(host.getConfig());
+ GenericsDataModel newConfig = type.parse(request.getConfig());
+ // 添加日志参数
+ OperatorLogs.add(OperatorLogs.ID, id);
+ OperatorLogs.add(OperatorLogs.NAME, host.getName());
+ // 更新前校验
+ type.doValid(beforeConfig, newConfig);
+ // 修改配置
+ HostDO updateHost = HostDO.builder()
+ .id(id)
+ .config(newConfig.serial())
+ .build();
+ int effect = hostDAO.updateById(updateHost);
+ log.info("HostService-updateHostConfig effect: {}", effect);
+ return effect;
}
@Override
@@ -348,11 +341,6 @@ public class HostServiceImpl implements HostService {
dataExtraApi.deleteByRelIdList(DataExtraTypeEnum.HOST, idList);
}
- @Override
- public Long getCurrentUpdateConfigHostId() {
- return CURRENT_UPDATE_CONFIG_ID.get();
- }
-
@Override
public void clearCache() {
RedisMaps.scanKeysDelete(HostCacheKeyDefine.HOST_INFO.format("*"));