Skip to content

Commit

Permalink
副本ip、版本号
Browse files Browse the repository at this point in the history
  • Loading branch information
cgw committed Oct 28, 2022
1 parent fe4b821 commit 226696f
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 10 deletions.
6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)

## 社区交流

如果想了解更多内容,请加如下微信(邀请进群),感谢您的使用。
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -627,7 +627,7 @@ public PageData<EnvReplica> 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());
Expand Down
4 changes: 2 additions & 2 deletions static/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,8 @@
<div class="layuimini-site-mobile"><i class="layui-icon"></i></div>

<div class="layui-body">
<div class="layuimini-content-page">
</div>
<div class="layuimini-content-page"></div>
<div style="text-align: center; height:60px; line-height:60px; color: #9c9da0">v0.9.1-beta</div>
</div>

</div>
Expand Down

0 comments on commit 226696f

Please sign in to comment.