From a0cf03ee4b2eebe8f512fc8e91d854214bd350c1 Mon Sep 17 00:00:00 2001 From: bynt Date: Tue, 14 Feb 2023 11:15:50 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/config/application-dev.yml | 4 ++-- .../src/main/resources/config/application-dev.yml | 4 ++-- .../main/java/com/baiye/service/impl/UserServiceImpl.java | 7 ++++--- .../src/main/resources/config/application-dev.yml | 4 ++-- .../src/main/resources/config/application-dev.yml | 4 ++-- 5 files changed, 12 insertions(+), 11 deletions(-) diff --git a/cdp-iaas/authorization-server/src/main/resources/config/application-dev.yml b/cdp-iaas/authorization-server/src/main/resources/config/application-dev.yml index 05bd12b..73e1ac6 100644 --- a/cdp-iaas/authorization-server/src/main/resources/config/application-dev.yml +++ b/cdp-iaas/authorization-server/src/main/resources/config/application-dev.yml @@ -10,14 +10,14 @@ spring: username: root redis: #数据库索引 - database: 9 + database: 8 host: 8.130.96.163 port: 6379 #连接超时时间 timeout: 5000 cloud: nacos: - server-addr: 8.130.96.163:8848 + server-addr: 127.0.0.1:8848 # server-addr: 101.35.109.129:8848 config: server-addr: ${spring.cloud.nacos.server-addr} diff --git a/cdp-iaas/gateway-server/src/main/resources/config/application-dev.yml b/cdp-iaas/gateway-server/src/main/resources/config/application-dev.yml index d061be1..63ef608 100644 --- a/cdp-iaas/gateway-server/src/main/resources/config/application-dev.yml +++ b/cdp-iaas/gateway-server/src/main/resources/config/application-dev.yml @@ -1,7 +1,7 @@ spring: redis: #数据库索引 - database: 9 + database: 8 host: 8.130.96.163 port: 6379 password: @@ -42,7 +42,7 @@ spring: filters: - StripPrefix=1 nacos: - server-addr: 8.130.96.163:8848 + server-addr: 127.0.0.1:8848 # server-addr: 101.35.109.129 config: server-addr: ${spring.cloud.nacos.server-addr} diff --git a/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/java/com/baiye/service/impl/UserServiceImpl.java b/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/java/com/baiye/service/impl/UserServiceImpl.java index 215fa46..779670f 100644 --- a/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/java/com/baiye/service/impl/UserServiceImpl.java +++ b/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/java/com/baiye/service/impl/UserServiceImpl.java @@ -34,6 +34,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Lists; import com.google.common.collect.Maps; import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; @@ -496,9 +497,9 @@ public class UserServiceImpl extends ServiceImpl implements IU } List roles = authorities.stream().map(GrantedAuthority::getAuthority).collect(Collectors.toList()); map.put("roles", roles); - List wechatIds = - remoteWechatService.getWechatId(); - map.put("wechatIds", wechatIds); + /*List wechatIds = + remoteWechatService.getWechatId();*/ + map.put("wechatIds", Lists.newArrayList()); map.put("tiktokId", AesEncrypt.encrypt (SecurityUtils.getCurrentUserId().toString(), EncryptionConstants.ENCRYPTION_KEY)); diff --git a/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/resources/config/application-dev.yml b/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/resources/config/application-dev.yml index 3376b9a..f90254c 100644 --- a/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/resources/config/application-dev.yml +++ b/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/resources/config/application-dev.yml @@ -4,9 +4,9 @@ spring: nacos: discovery: # server-addr: ${NACOS_HOST:8.130.96.163}:${NACOS_PORT:8848} - server-addr: ${NACOS_HOST:8.130.96.163}:${NACOS_PORT:8848} + server-addr: ${NACOS_HOST:127.0.0.1}:${NACOS_PORT:8848} redis: - database: 9 + database: 8 host: 8.130.96.163 timeout: 5000 datasource: diff --git a/cdp-tools/cdp-tool-wechat/cdp-wechat-server/src/main/resources/config/application-dev.yml b/cdp-tools/cdp-tool-wechat/cdp-wechat-server/src/main/resources/config/application-dev.yml index c724e44..09329ea 100644 --- a/cdp-tools/cdp-tool-wechat/cdp-wechat-server/src/main/resources/config/application-dev.yml +++ b/cdp-tools/cdp-tool-wechat/cdp-wechat-server/src/main/resources/config/application-dev.yml @@ -3,7 +3,7 @@ spring: cloud: nacos: discovery: - server-addr: ${NACOS_HOST:8.130.96.163}:${NACOS_PORT:8848} + server-addr: ${NACOS_HOST:127.0.0.1}:${NACOS_PORT:8848} # Spring Cloud Stream 配置项，对应 BindingServiceProperties 类 stream: # Binding 配置项，对应 BindingProperties Map @@ -28,7 +28,7 @@ spring: broadcasting: false # 是否使用广播消费，默认为 false 使用集群消费 orderly: true # 是否顺序消费，默认为 false 并发消费。 redis: - database: 3 + database: 9 host: 8.130.96.163 timeout: 5000 datasource: