Commit a5c032a4 a5c032a4c4f5e3c91879a3f65e2e626faf21723e by xianghan

1.update

1 parent 599627e3
...@@ -9,9 +9,7 @@ import org.springframework.amqp.rabbit.listener.RabbitListenerContainerFactory; ...@@ -9,9 +9,7 @@ import org.springframework.amqp.rabbit.listener.RabbitListenerContainerFactory;
9 import org.springframework.beans.factory.annotation.Qualifier; 9 import org.springframework.beans.factory.annotation.Qualifier;
10 import org.springframework.beans.factory.annotation.Value; 10 import org.springframework.beans.factory.annotation.Value;
11 import org.springframework.boot.autoconfigure.amqp.SimpleRabbitListenerContainerFactoryConfigurer; 11 import org.springframework.boot.autoconfigure.amqp.SimpleRabbitListenerContainerFactoryConfigurer;
12 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
13 import org.springframework.context.annotation.Bean; 12 import org.springframework.context.annotation.Bean;
14 import org.springframework.context.annotation.Conditional;
15 import org.springframework.context.annotation.Configuration; 13 import org.springframework.context.annotation.Configuration;
16 import org.springframework.context.annotation.Primary; 14 import org.springframework.context.annotation.Primary;
17 15
...@@ -139,7 +137,7 @@ public class RabbitMqConfig { ...@@ -139,7 +137,7 @@ public class RabbitMqConfig {
139 public static final String UC_DIRECT_MANAGEMENT = "uc.direct.management"; 137 public static final String UC_DIRECT_MANAGEMENT = "uc.direct.management";
140 // uc-service-management 2 uc-consumer-iptv 138 // uc-service-management 2 uc-consumer-iptv
141 // public static final String ENGINE_TO_SERVICE_DIRECT = "uc.engine.service.direct"; 139 // public static final String ENGINE_TO_SERVICE_DIRECT = "uc.engine.service.direct";
142 public static final String ENGINE_TO_SERVICE_DIRECT = "uc.engine.service.direct.local"; 140 public static final String ENGINE_TO_SERVICE_DIRECT = "uc.engine.service.direct";
143 141
144 @Bean 142 @Bean
145 public Queue managementDirect() { 143 public Queue managementDirect() {
......
...@@ -7,7 +7,7 @@ spring: ...@@ -7,7 +7,7 @@ spring:
7 # username: root 7 # username: root
8 # # 密码 8 # # 密码
9 # password: Tjlh@2017 9 # password: Tjlh@2017
10 url: jdbc:log4jdbc:mysql://122.112.214.149:3306/tj_user_admin?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false 10 url: jdbc:log4jdbc:mysql://122.112.214.149:3306/tj_user_iptv?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false
11 username: root 11 username: root
12 password: root 12 password: root
13 # 驱动程序 13 # 驱动程序
...@@ -80,11 +80,11 @@ mutil-mq: ...@@ -80,11 +80,11 @@ mutil-mq:
80 # virtual-host: /member_center 80 # virtual-host: /member_center
81 host: 122.112.214.149 # rabbitmq的连接地址 81 host: 122.112.214.149 # rabbitmq的连接地址
82 port: 5672 # rabbitmq的连接端口号 82 port: 5672 # rabbitmq的连接端口号
83 # virtual-host: member_center # rabbitmq的虚拟hosthhh
83 virtual-host: member_center # rabbitmq的虚拟hosthhh 84 virtual-host: member_center # rabbitmq的虚拟hosthhh
84 username: guest # rabbitmq的用户名 85 username: guest # rabbitmq的用户名
85 password: guest # rabbitmq的密码 86 password: guest # rabbitmq的密码
86 publisher-confirms: true #如果对异步消息需要回调必须设置为true 87 publisher-confirms: true #如果对异步消息需要回调必须设置为true
87 startup: off
88 88
89 # 管理侧 89 # 管理侧
90 management: 90 management:
...@@ -114,7 +114,6 @@ mutil-mq: ...@@ -114,7 +114,6 @@ mutil-mq:
114 username: guest # rabbitmq的用户名 114 username: guest # rabbitmq的用户名
115 password: guest # rabbitmq的密码 115 password: guest # rabbitmq的密码
116 publisher-confirms: true #如果对异步消息需要回调必须设置为true 116 publisher-confirms: true #如果对异步消息需要回调必须设置为true
117 startup: on
118 117
119 # 服务属性 118 # 服务属性
120 service: 119 service:
...@@ -125,4 +124,4 @@ service: ...@@ -125,4 +124,4 @@ service:
125 124
126 # uc-engine服务地址 125 # uc-engine服务地址
127 api: 126 api:
128 baseUrl:
...\ No newline at end of file ...\ No newline at end of file
127 baseUrl: http://127.0.0.1:8447
...\ No newline at end of file ...\ No newline at end of file
......