From c7900490730b7b044c43de657e5bb0a3d8eda43a Mon Sep 17 00:00:00 2001 From: yuemian <--list> Date: Thu, 12 Sep 2024 15:13:34 +0800 Subject: [PATCH] =?UTF-8?q?```=E7=A6=81=E7=94=A8=E5=AE=B9=E5=99=A8?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=8A=9F=E8=83=BD=E5=92=8C=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../provider/common/TianyiLocationProvider.java | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/bocloud.ctstack.plugin/src/main/java/com/bocloud/ctstack/plugin/provider/common/TianyiLocationProvider.java b/bocloud.ctstack.plugin/src/main/java/com/bocloud/ctstack/plugin/provider/common/TianyiLocationProvider.java index b5fd7142..0c5bd435 100644 --- a/bocloud.ctstack.plugin/src/main/java/com/bocloud/ctstack/plugin/provider/common/TianyiLocationProvider.java +++ b/bocloud.ctstack.plugin/src/main/java/com/bocloud/ctstack/plugin/provider/common/TianyiLocationProvider.java @@ -5,17 +5,12 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.bocloud.cmp.domain.Butler; import com.bocloud.ctstack.plugin.domain.model.*; -import com.bocloud.ctstack.plugin.domain.model.container.ContainerClusterModel; -import com.bocloud.ctstack.plugin.domain.model.container.ContainerNodeModel; -import com.bocloud.ctstack.plugin.domain.model.container.ContainerNodePoolModel; import com.bocloud.ctstack.plugin.domain.model.database.ProjectModel; import com.bocloud.ctstack.plugin.domain.model.database.RdsModel; import com.bocloud.ctstack.plugin.provider.TianyiProvider; import com.bocloud.ctstack.plugin.provider.compute.TianyiImageProvider; import com.bocloud.ctstack.plugin.provider.compute.TianyiPhysicalProvider; import com.bocloud.ctstack.plugin.provider.compute.TianyiServerProvider; -import com.bocloud.ctstack.plugin.provider.container.TianYiContainerClusterProvider; -import com.bocloud.ctstack.plugin.provider.container.TianYiContainerNodeProvider; import com.bocloud.ctstack.plugin.provider.database.TianyiRdsProvider; import com.bocloud.ctstack.plugin.provider.network.TianyiFloatingIpProvider; import com.bocloud.ctstack.plugin.provider.network.TianyiSecurityGroupProvider; @@ -35,7 +30,11 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.util.CollectionUtils; import java.math.BigDecimal; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Optional; import java.util.stream.Collectors; /** @@ -299,7 +298,7 @@ public class TianyiLocationProvider extends TianyiProvider { // 同步容器 log.info("获取容器信息..."); - TianYiContainerClusterProvider tianYiContainerClusterProvider = new TianYiContainerClusterProvider(this.getButler()); + /*TianYiContainerClusterProvider tianYiContainerClusterProvider = new TianYiContainerClusterProvider(this.getButler()); GeneralResult containerClusterList = tianYiContainerClusterProvider.list(); log.info("同步容器结果:{}",containerClusterList.isSuccess()); if (containerClusterList.isSuccess()) { @@ -323,7 +322,7 @@ public class TianyiLocationProvider extends TianyiProvider { } } syncModel.setContainerClusterModels(containerClusterModels); - } + }*/ // 同步云硬盘 log.info("获取云硬盘信息..."); @@ -391,7 +390,7 @@ public class TianyiLocationProvider extends TianyiProvider { } log.info("同步资源池信息:{}",poolModelGeneralResult.isSuccess()); - syncRds(syncModel); + //syncRds(syncModel); log.info("end sync ... current region is " + this.getRegionId()); return new GeneralResult(true, syncModel, "数据同步成功!");