Feature xuehui by renxuehui · Pull Request #56 · Nepxion/DiscoveryPlatform

renxuehui · 2021-07-17T13:55:14Z

蓝绿拓扑图功能

…into feature # Conflicts: # discovery-platform-server/discovery-platform-starter-server/src/main/java/com/nepxion/discovery/platform/server/entity/dto/GrayDto.java # discovery-platform-server/discovery-platform-starter-server/src/main/java/com/nepxion/discovery/platform/server/service/GrayService.java # discovery-platform-server/discovery-platform-starter-server/src/main/java/com/nepxion/discovery/platform/server/service/GrayServiceImpl.java

Merge

HaojunRen · 2021-07-17T15:10:19Z

...form-starter-server/src/main/java/com/nepxion/discovery/platform/server/tool/GraphUtils.java

+		return nodeCache;
+	}
+
+	public static GraphDto changeRuleEntityToGraph(RuleEntity ruleEntity) {


change改成convert

HaojunRen · 2021-07-17T15:10:44Z

...form-starter-server/src/main/java/com/nepxion/discovery/platform/server/tool/GraphUtils.java

+
+public class GraphUtils {
+	private GraphUtils(){}
+	private static final String BEGIN_NODE_ID = "begin";


static final 一般放在类的第一行

HaojunRen · 2021-07-17T15:11:20Z

...rter-server/src/main/java/com/nepxion/discovery/platform/server/entity/dto/GraphNodeDto.java

+	}
+
+	private String condition;
+	private String routeId;


移动到上面去

HaojunRen · 2021-07-17T15:11:55Z

...rter-server/src/main/java/com/nepxion/discovery/platform/server/entity/dto/GraphNodeDto.java

+	private String id;
+	private String label;
+	private String type;
+	private String version;


version改成value

HaojunRen · 2021-07-17T15:12:05Z

...rter-server/src/main/java/com/nepxion/discovery/platform/server/entity/dto/GraphEdgeDto.java

+
+	private String source;
+	private String target;
+	private String version;


去掉version

HaojunRen · 2021-07-17T15:12:24Z

...rter-server/src/main/java/com/nepxion/discovery/platform/server/entity/dto/GraphEdgeDto.java

+ * @version 1.0
+ */
+
+public class GraphEdgeDto {


类命名成GraphLinkDto

HaojunRen · 2021-07-17T15:12:49Z

...-starter-server/src/main/java/com/nepxion/discovery/platform/server/entity/dto/GraphDto.java

+		return edges;
+	}
+
+	public void setEdges(List<GraphEdgeDto> edges) {


改成setLinks

HaojunRen · 2021-07-17T15:13:07Z

...server/discovery-platform-starter-server-ui/src/main/resources/templates/blue-green/view.ftl

+    var type = target.get('type');
+    if (type === 'circle') {
+      alert('你点击的是边上的圆点');
+    }


去掉alert

HaojunRen · 2021-07-17T15:14:06Z

.../src/main/java/com/nepxion/discovery/platform/server/controller/BlueGreenPageController.java

 * @version 1.0
 */

+import com.nepxion.discovery.common.util.JsonUtil;


导入模板，format import次序。下同

HaojunRen · 2021-07-17T15:16:46Z

...-starter-server/src/main/java/com/nepxion/discovery/platform/server/entity/dto/GraphDto.java

+import java.util.List;
+
+public class GraphDto {
+


Dto集成序列化接口，序列化自动通过IDE生成，不要用1L表示

HaojunRen · 2021-07-17T15:17:35Z

...-starter-server/src/main/java/com/nepxion/discovery/platform/server/entity/dto/GraphDto.java

+
+	public void setEdges(List<GraphEdgeDto> edges) {
+		this.edges = edges;
+	}


增加如下方法，在底部

@Override public int hashCode() { return HashCodeBuilder.reflectionHashCode(this); } @Override public boolean equals(Object object) { return EqualsBuilder.reflectionEquals(this, object); } @Override public String toString() { return ToStringBuilder.reflectionToString(this, ToStringStyle.MULTI_LINE_STYLE); }

- 代码格式模板导入 - 去掉edgeDto version； NodeDto, version => value - hash、equals、toString; - serialVersionUID;

HaojunRen · 2021-07-18T01:17:04Z

...server/discovery-platform-starter-server-ui/src/main/resources/templates/blue-green/list.ftl

+                                <i class="layui-icon layui-icon-add-1"></i>&nbsp;&nbsp;查看<b>拓扑</b>图
+                            </button>
+                        </div>
+                        </@insert>


按钮风格需要调整一下

HaojunRen · 2021-07-18T01:17:46Z

...rter-server/src/main/java/com/nepxion/discovery/platform/server/entity/dto/GraphLinkDto.java

+ * @author Xuehui Ren
+ * @version 1.0
+ */
+


把作者信息移到package和import之间

HaojunRen · 2021-07-18T01:18:09Z

...rter-server/src/main/java/com/nepxion/discovery/platform/server/entity/dto/GraphLinkDto.java

+
+	private static final long serialVersionUID = 3536615004773370039L;
+	private String source;
+    private String target;


没有对齐？

HaojunRen · 2021-07-18T01:18:30Z

...rter-server/src/main/java/com/nepxion/discovery/platform/server/entity/dto/GraphNodeDto.java

+ *
+ * @author Xuehui Ren
+ * @version 1.0
+ */


把作者信息移到package和import之间

HaojunRen · 2021-07-18T01:18:42Z

...rter-server/src/main/java/com/nepxion/discovery/platform/server/entity/dto/GraphNodeDto.java

+
+	private static final long serialVersionUID = 5728555476871710353L;
+	private String id;
+    private String label;


没有对齐？

HaojunRen · 2021-07-18T01:19:30Z

...ter-server/src/main/java/com/nepxion/discovery/platform/server/service/BlueGreenService.java

 import com.nepxion.discovery.platform.server.entity.po.BlueGreenPo;
 import com.nepxion.discovery.platform.server.service.base.BasePublishService;
+import java.util.Collection;
+import java.util.List;


import顺序format一下

- UI蓝绿颜色交替显示; - 选中记录才能查看拓扑图; - reformat for tab to 4 spaces; - 去掉后台测试代码，改成正式： RuleEntity ruleEntity = platformDiscoveryAdapter.getConfig(portalName)

# Conflicts: # discovery-platform-server/discovery-platform-starter-server/src/main/java/com/nepxion/discovery/platform/server/service/BlueGreenService.java # discovery-platform-server/discovery-platform-starter-server/src/main/java/com/nepxion/discovery/platform/server/service/BlueGreenServiceImpl.java

renxuehui and others added 10 commits July 14, 2021 20:24

feat: 拓扑图功能

957d1fd

Merge pull request #53 from Nepxion/feature

ef6916c

Merge

fixed: 蓝绿拓扑图查看

a3beedd

Merge branch 'feature' into feature-xuehui

08b08f0

fixed: 补充作者信息

a0f8094

fixed: 补充作者信息

5efed50

fixed: 作者信息

4da4e6c

Merge branch 'feature' into feature-xuehui

c913549

fixed: 注释格式调整

c5779ae

HaojunRen reviewed Jul 17, 2021

View reviewed changes

renxuehui added 2 commits July 17, 2021 23:51

fixed: review问题修改

c59558c

- 代码格式模板导入 - 去掉edgeDto version； NodeDto, version => value - hash、equals、toString; - serialVersionUID;

fixed: 拓扑图箭头样式调整

ecf40bc

HaojunRen reviewed Jul 18, 2021

View reviewed changes

renxuehui and others added 15 commits July 19, 2021 22:21

Merge branch 'feature' into feature-xuehui

f4f5959

fixed: 拓扑图切换成图标模式

96e2c2c

fixed: 增加首节点显示文字；弹窗底部按钮改成【关闭】；

f808d04

Modify Button Style

189c3b4

Modify Dialog style

c842498

Modify Link UI

efee8d3

fixed: 1. api网关名称、服务名称居中； 2. 蓝绿颜色交替显示；

8f24333

fixed: 代码review问题

29d73a5

fixed: deal code review

6092f9a

- UI蓝绿颜色交替显示; - 选中记录才能查看拓扑图; - reformat for tab to 4 spaces; - 去掉后台测试代码，改成正式： RuleEntity ruleEntity = platformDiscoveryAdapter.getConfig(portalName)

fixed: 删除无用代码

c0a86e9

Fix coding style

161d9ca

Refactory GraphEdgeDto

e306a2e

Refactory GraphUtils

f54ef9e

Refactory GraphTool

f156e47

renxuehui added 4 commits July 25, 2021 18:41

fixed: 未发布版本，查看拓扑图效果; GraphTool重构=》 BlueGreenAndGraphTool

0a7e458

fixed: 类名修改; debugger去除;

c9889ed

fixed: 查看拓扑图勾选多个时，js异常导致未提示

962bf6c

fixed: 拓扑图支持节点拖动，caven模式更顺滑

bd24fa6

Conversation

renxuehui commented Jul 17, 2021

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants