diff --git a/adc-da-main/src/main/java/com/adc/da/main/config/RestTemplateConfig.java b/adc-da-main/src/main/java/com/adc/da/main/config/RestTemplateConfig.java index 870c415d..bbfe712d 100644 --- a/adc-da-main/src/main/java/com/adc/da/main/config/RestTemplateConfig.java +++ b/adc-da-main/src/main/java/com/adc/da/main/config/RestTemplateConfig.java @@ -2,6 +2,7 @@ package com.adc.da.main.config; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.cloud.client.loadbalancer.LoadBalanced; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.http.client.ClientHttpRequestFactory; @@ -23,6 +24,7 @@ public class RestTemplateConfig { private static final Logger logger = LoggerFactory.getLogger(RestTemplateConfig.class); @Bean + @LoadBalanced public RestTemplate restTemplate(ClientHttpRequestFactory factory){ RestTemplate restTemplate = new RestTemplate(factory); // 使用 utf-8 编码集的 conver 替换默认的 conver(默认的 string conver 的编码集为"ISO-8859-1") diff --git a/adc-da-main/src/main/resources/application-dev.properties b/adc-da-main/src/main/resources/application-dev.properties index d89ffe27..3b50c583 100644 --- a/adc-da-main/src/main/resources/application-dev.properties +++ b/adc-da-main/src/main/resources/application-dev.properties @@ -13,6 +13,10 @@ spring.application.name=FotonLAWSSystem application.code=20200101 application.center=1 #============================================== +#Eruept +eureka.client.allow-redirects=true +eureka.client.register-with-eureka=true +eureka.client.service-url.defaultZone=http://127.0.0.1:8671/eureka/ #============================================== # 邮箱配置1 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/impl/TsInstitutionServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/impl/TsInstitutionServiceImpl.java index 459111f9..0da4f112 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/impl/TsInstitutionServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/impl/TsInstitutionServiceImpl.java @@ -88,9 +88,10 @@ public class TsInstitutionServiceImpl extends ServiceImpl recursionGetInstitutionAndUser(TsInstitution tsInstitution){ List institutionObject=new ArrayList<>(); List tsInstitutions=tsInstitutionDao.selectAndUserByParent(tsInstitution.getId()); + for(TsInstitution tsInstitutionNode:tsInstitutions){ tsInstitutionNode.setDisabled(true); - tsInstitutionNode.setChildren(recursionGetInstitution(tsInstitutionNode)); + tsInstitutionNode.setChildren(recursionGetInstitutionAndUser(tsInstitutionNode)); institutionObject.add(tsInstitutionNode); for(TsUserVO user:tsInstitutionNode.getUsers()){ tsInstitutionNode.getChildren().add(user);