Merge branch 'develop_master' of http://101.36.229.190:90/LiuChao/foton-slrs-system-rest into develop_2

 Conflicts:

	adc-da-main/src/main/resources/application-dev.properties

adc-da-main/src/main/java/com/adc/da/main/config/RestTemplateConfig.java

@@ -7,6 +7,7 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.http.client.ClientHttpRequestFactory;
 import org.springframework.http.client.SimpleClientHttpRequestFactory;
+import org.springframework.cloud.client.loadbalancer.LoadBalanced;
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.StringHttpMessageConverter;
 import org.springframework.web.client.RestTemplate;

adc-da-main/src/main/resources/application-dev.properties

@@ -9,7 +9,7 @@ spring.datasource.password = root
 
 #==============================================
 # 应用设置
-spring.application.name=FotonLAWSSystem
+spring.application.name=FotonLAWSSystem-zqazqazqa
 application.code=20200101
 application.center=1
 #==============================================
@@ -35,11 +35,11 @@ spring.mail.port=587
 # ==============================================
 # rabbitMQ
 # ==============================================
-#spring.rabbitmq.host=rabbitmq-cluster-01.vs.test.geely.svc
-#spring.rabbitmq.port=5672
-#spring.rabbitmq.virtual-host=uat_pcms
-#spring.rabbitmq.username=uat_pcms
-#spring.rabbitmq.password=VxsBLL5bJruwzXfS
+spring.rabbitmq.host=rabbitmq-cluster-01.vs.test.geely.svc
+spring.rabbitmq.port=5672
+spring.rabbitmq.virtual-host=uat_pcms
+spring.rabbitmq.username=uat_pcms
+spring.rabbitmq.password=VxsBLL5bJruwzXfS
 # spring.rabbitmq.publisher-confirms=true
 
 # ==============================================

adc-da-main/src/main/resources/application.properties

@@ -30,14 +30,17 @@ restPath=/api
 #server.servlet.context-path=/api
 
 #是否将自己注册到Eureka Server上，默认为true
-eureka.client.register-with-eureka=false
+eureka.client.register-with-eureka=true
 ##是否从Eureka Server上获取注册信息，默认为true
-eureka.client.fetch-registry=false
+eureka.client.fetch-registry=true
+
 
 #eureka.client.service-url.defaultZone=http://10.5.116.172:8672/eureka/
 #eureka.client.service-url.defaultZone=http://127.0.0.1:8671/eureka/
 #eureka.client.service-url.defaultZone=http://10.5.116.172:8672/eureka/
-eureka.client.service-url.defaultZone=http://127.0.0.1:8761/eureka/
+
+eureka.client.service-url.defaultZone=http://192.168.10.47:8761/eureka/
+
 # 请求连接的超时时间 默认的时间为 1 秒
 ribbon.ConnectTimeout=500000
 # 请求处理的超时时间