Merge branch 'dev' of http://git.hobbystocks.cn/AHX-Bid/poyee-app into dev

poyi-app/src/main/resources/application.yml

@@ -163,8 +163,8 @@ spring:
   rabbitmq:
     host: 192.168.50.10
     port: 5672
-    username: ahx
-    password: ahx
+    username: poyee-app
+    password: Pass2010
     #确认消息已发送到交换机(Exchange)
     publisher-confirms: true
     #确认消息已发送到队列(Queue)
@@ -273,7 +273,6 @@ express:
 #elasticsearch 配置
 elasticsearch:
   rest:
-    #uris: localhost:9200,localhost:9300  #测试环境es地址
     uris: 192.168.50.10:9202  #测试环境es地址
 
 #直播间webSocket地址

tzy-sportcard/src/main/java/com/tzy/elasticsearch/config/RestClientConfig.java

@@ -14,10 +14,10 @@ import javax.annotation.PostConstruct;
 import java.util.ArrayList;
 import java.util.List;
 
-//@Configuration
+@Configuration
 public class RestClientConfig extends AbstractElasticsearchConfiguration {
 
-//    @Value("${elasticsearch.rest.uris}")
+    @Value("${elasticsearch.rest.uris}")
     private String uris;
 
     @Bean