From b1a1fc075c92f92d33f4cfa73f69965c1792b93a Mon Sep 17 00:00:00 2001 From: yqy Date: Fri, 15 Jul 2022 19:04:16 +0800 Subject: [PATCH] =?UTF-8?q?pom=E4=BE=9D=E8=B5=96=E4=BF=AE=E6=94=B9+?= =?UTF-8?q?=E8=8F=9C=E5=8D=95=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cdp-common/cdp-common-rocketmq/pom.xml | 16 ++++++++-------- .../src/main/resources/config/bootstrap.yml | 1 - .../com/baiye/service/impl/MenuServiceImpl.java | 2 +- .../cdp-tool-mq/cdp-tool-mq-producer/pom.xml | 6 ++++++ .../cdp-tool-mq/cpd-tool-mq-consumer/pom.xml | 6 ++++++ 5 files changed, 21 insertions(+), 10 deletions(-) diff --git a/cdp-common/cdp-common-rocketmq/pom.xml b/cdp-common/cdp-common-rocketmq/pom.xml index d6ae33d..db81f38 100644 --- a/cdp-common/cdp-common-rocketmq/pom.xml +++ b/cdp-common/cdp-common-rocketmq/pom.xml @@ -39,13 +39,13 @@ - - - - org.springframework.boot - spring-boot-maven-plugin - - - + + + + + + + + diff --git a/cdp-iaas/authorization-server/src/main/resources/config/bootstrap.yml b/cdp-iaas/authorization-server/src/main/resources/config/bootstrap.yml index 69a42e0..056acef 100644 --- a/cdp-iaas/authorization-server/src/main/resources/config/bootstrap.yml +++ b/cdp-iaas/authorization-server/src/main/resources/config/bootstrap.yml @@ -17,7 +17,6 @@ spring: database: 0 host: 8.130.96.163 port: 6379 - password: #连接超时时间 timeout: 5000 cloud: diff --git a/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/java/com/baiye/service/impl/MenuServiceImpl.java b/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/java/com/baiye/service/impl/MenuServiceImpl.java index 4f26231..712f4a6 100644 --- a/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/java/com/baiye/service/impl/MenuServiceImpl.java +++ b/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/java/com/baiye/service/impl/MenuServiceImpl.java @@ -300,7 +300,7 @@ public class MenuServiceImpl extends ServiceImpl implements IM menuVo.setRedirect("noredirect"); // TODO: 2020/8/15 第二个参数相当于每个MenuVo对象中的children对象，不能用该方法的menuVos参数，否则会出现无限套娃的现象 menuVo.setChildren(this.buildMenus(children, new ArrayList<>())); - } else if (menuDto.getId().equals(0L)) { + } else if (menuDto.getPid().equals(0L)) { // 当前节点是一级节点，并且该节点没有子节点 // TODO: 2020/8/14 这一块原作者写的，我也不太明白,大概的意思是构建一个子节点，子节点的信息和之前的menuVo差不多 // TODO: 2020/8/14 然后将前面的menuVo的属性进行改变，最后把自己设置的子节点作为menuVo的子节点属性 diff --git a/cdp-tools/cdp-tool-mq/cdp-tool-mq-producer/pom.xml b/cdp-tools/cdp-tool-mq/cdp-tool-mq-producer/pom.xml index 25f1941..3547313 100644 --- a/cdp-tools/cdp-tool-mq/cdp-tool-mq-producer/pom.xml +++ b/cdp-tools/cdp-tool-mq/cdp-tool-mq-producer/pom.xml @@ -27,6 +27,12 @@ spring-boot-starter-test test + + + org.springframework.boot + spring-boot-starter-test + test + diff --git a/cdp-tools/cdp-tool-mq/cpd-tool-mq-consumer/pom.xml b/cdp-tools/cdp-tool-mq/cpd-tool-mq-consumer/pom.xml index 9e6924e..daa62de 100644 --- a/cdp-tools/cdp-tool-mq/cpd-tool-mq-consumer/pom.xml +++ b/cdp-tools/cdp-tool-mq/cpd-tool-mq-consumer/pom.xml @@ -28,6 +28,12 @@ spring-boot-starter-test test + + + org.springframework.boot + spring-boot-starter-test + test +