diff --git a/README.md b/README.md index 13a0ba03..5e2ecfba 100644 --- a/README.md +++ b/README.md @@ -63,6 +63,12 @@ $ bin/dhorse-stop.sh 本软件遵守Apache开源许可协议2.0,详情《 [Apache License 2.0](http://www.apache.org/licenses/LICENSE-2.0)》。 +## 社区文章 +《[DHorse系列文章之操作手册](https://blog.csdn.net/huashetianzu/article/details/127560678)》 +《[DHorse系列文章之镜像制作](https://blog.csdn.net/huashetianzu/article/details/127376460)》 +《[DHorse系列文章之maven打包](https://blog.csdn.net/huashetianzu/article/details/127481538)》 +《[DHorse系列文章之Dubbo项目解决方案](https://blog.csdn.net/huashetianzu/article/details/127560873)》 + ## 社区交流 如果想了解更多内容,请加如下微信(邀请进群),感谢您的使用。 diff --git a/dhorse-application/src/main/java/org/dhorse/application/service/ClusterApplicationService.java b/dhorse-application/src/main/java/org/dhorse/application/service/ClusterApplicationService.java index cccacac3..bba83e93 100644 --- a/dhorse-application/src/main/java/org/dhorse/application/service/ClusterApplicationService.java +++ b/dhorse-application/src/main/java/org/dhorse/application/service/ClusterApplicationService.java @@ -100,18 +100,19 @@ public Void update(ClusterUpdateParam clusterUpdateParam) { } validateAddParam(clusterUpdateParam); - //首先开启日志收集 - if(clusterUpdateParam.getLogSwitch() == null) { - closeLogSwitch(clusterUpdateParam.getClusterId()); - }else if(YesOrNoEnum.YES.getCode().equals(clusterUpdateParam.getLogSwitch())) { - openLogSwitch(clusterUpdateParam.getClusterId()); - } - ClusterParam clusterParam = buildBizParam(clusterUpdateParam); clusterParam.setId(clusterUpdateParam.getClusterId()); if (!clusterRepository.update(clusterParam)) { LogUtils.throwException(logger, MessageCodeEnum.FAILURE); } + + //开启(关闭)日志收集 + if(clusterUpdateParam.getLogSwitch() == null) { + closeLogSwitch(clusterUpdateParam.getClusterId()); + }else if(YesOrNoEnum.YES.getCode().equals(clusterUpdateParam.getLogSwitch())) { + openLogSwitch(clusterUpdateParam.getClusterId()); + } + return null; } diff --git a/dhorse-application/src/main/java/org/dhorse/application/service/DeployApplicationService.java b/dhorse-application/src/main/java/org/dhorse/application/service/DeployApplicationService.java index c732e621..236939c3 100644 --- a/dhorse-application/src/main/java/org/dhorse/application/service/DeployApplicationService.java +++ b/dhorse-application/src/main/java/org/dhorse/application/service/DeployApplicationService.java @@ -391,6 +391,7 @@ public boolean doMavenPack(Maven mavenConf, String localPathOfBranch) { profile.setProperties(properties); MavenExecutionRequest executionRequest = request.getRequest(); executionRequest.setProfiles(Arrays.asList(profile)); + executionRequest.setLoggingLevel(MavenExecutionRequest.LOGGING_LEVEL_INFO); MavenCli cli = new MavenCli(); int status = 0; diff --git a/dhorse-infrastructure/src/main/java/org/dhorse/infrastructure/strategy/cluster/K8sClusterStrategy.java b/dhorse-infrastructure/src/main/java/org/dhorse/infrastructure/strategy/cluster/K8sClusterStrategy.java index 3cfb28bf..2ad7ab97 100644 --- a/dhorse-infrastructure/src/main/java/org/dhorse/infrastructure/strategy/cluster/K8sClusterStrategy.java +++ b/dhorse-infrastructure/src/main/java/org/dhorse/infrastructure/strategy/cluster/K8sClusterStrategy.java @@ -627,7 +627,7 @@ public PageData replicaPage(EnvReplicaPageParam pageParam, ClusterPO //目前只有一个container String imageName = e.getSpec().getContainers().get(0).getImage(); r.setVersionName(imageName.substring(imageName.lastIndexOf("/") + 1)); - r.setIp(e.getStatus().getHostIP()); + r.setIp(e.getStatus().getPodIP()); r.setName(e.getMetadata().getName()); r.setEnvName(projectEnvPO.getEnvName()); r.setClusterName(clusterPO.getClusterName()); diff --git a/static/index.html b/static/index.html index 6a768e87..bee70777 100644 --- a/static/index.html +++ b/static/index.html @@ -101,8 +101,8 @@
-
-
+
+
v0.9.1-beta