Skip to content

张云鹏 / uc-consumer

Go to a project
Toggle navigation
Toggle navigation pinning
Commit 26f5a664 26f5a66458ffb6d5932ed3055a65d1c0f8c7f524 by xianghan@topdraw.cn
Options

Merge branch 'release/1.0.1'

2 parents 3cb72785 9b9ce9e6
Inline Side-by-side
Showing 11 changed files with 168 additions and 77 deletions
...@@ -4,6 +4,7 @@ package com.topdraw; ...@@ -4,6 +4,7 @@ package com.topdraw;
4 import com.topdraw.utils.SpringContextHolder; 4 import com.topdraw.utils.SpringContextHolder;
5 import org.springframework.boot.SpringApplication; 5 import org.springframework.boot.SpringApplication;
6 import org.springframework.boot.autoconfigure.SpringBootApplication; 6 import org.springframework.boot.autoconfigure.SpringBootApplication;
7 import org.springframework.boot.autoconfigure.amqp.RabbitAutoConfiguration;
7 import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration; 8 import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration;
8 import org.springframework.boot.builder.SpringApplicationBuilder; 9 import org.springframework.boot.builder.SpringApplicationBuilder;
9 import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; 10 import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
......
...@@ -29,6 +29,10 @@ public class MemberProfile implements Serializable { ...@@ -29,6 +29,10 @@ public class MemberProfile implements Serializable {
29 @Column(name = "id") 29 @Column(name = "id")
30 private Long id; 30 private Long id;
31 31
32 // 手机号
33 @Column(name = "phone")
34 private String phone;
35
32 // 会员id 36 // 会员id
33 @Column(name = "member_id", nullable = false) 37 @Column(name = "member_id", nullable = false)
34 private Long memberId; 38 private Long memberId;
......
...@@ -2,6 +2,7 @@ package com.topdraw.business.basicdata.member.profile.service.dto; ...@@ -2,6 +2,7 @@ package com.topdraw.business.basicdata.member.profile.service.dto;
2 2
3 import lombok.Data; 3 import lombok.Data;
4 4
5 import javax.persistence.Column;
5 import java.io.Serializable; 6 import java.io.Serializable;
6 import java.sql.Timestamp; 7 import java.sql.Timestamp;
7 8
...@@ -19,6 +20,9 @@ public class MemberProfileDTO implements Serializable { ...@@ -19,6 +20,9 @@ public class MemberProfileDTO implements Serializable {
19 // 会员id 20 // 会员id
20 private Long memberId; 21 private Long memberId;
21 22
23 // 手机号
24 private String phone;
25
22 // 姓名 26 // 姓名
23 private String realname; 27 private String realname;
24 28
......
1 package com.topdraw.config;
2
3 import org.springframework.amqp.core.*;
4 import org.springframework.amqp.rabbit.config.SimpleRabbitListenerContainerFactory;
5 import org.springframework.amqp.rabbit.connection.CachingConnectionFactory;
6 import org.springframework.amqp.rabbit.connection.ConnectionFactory;
7 import org.springframework.amqp.rabbit.core.RabbitTemplate;
8 import org.springframework.amqp.rabbit.listener.RabbitListenerContainerFactory;
9 import org.springframework.beans.factory.annotation.Qualifier;
10 import org.springframework.beans.factory.annotation.Value;
11 import org.springframework.boot.autoconfigure.amqp.SimpleRabbitListenerContainerFactoryConfigurer;
12 import org.springframework.context.annotation.Bean;
13 import org.springframework.context.annotation.Configuration;
14 import org.springframework.context.annotation.Primary;
15
16 @Configuration
17 public class RabbitMqConfig {
18
19 /** 路由(事件)--direct route.key*/
20 public static final String UC_ROUTE_KEY_DIRECT_EVENT_AAA = "uc.route.key.direct.event.aaa";
21
22 /** 队列-- */
23 public static final String UC_QUEUE_FANOUT_IPTV = "uc.fanout.iptv";
24 public static final String UC_QUEUE_FANOUT_WEIXIN = "uc.fanout.weixin";
25
26 public static final String UC_EXCHANGE_FANOUT = "uc.fanout";
27
28
29 @Bean(name = "userCenterConnectionFactory")
30 @Primary
31 public ConnectionFactory userCenterConnectionFactory(){
32 CachingConnectionFactory connectionFactory = new CachingConnectionFactory();
33 /*connectionFactory.setHost("47.100.212.170");
34 connectionFactory.setPort(5672);
35 connectionFactory.setUsername("test");
36 connectionFactory.setPassword("test");
37 connectionFactory.setVirtualHost("/");*/
38 connectionFactory.setHost("172.23.51.109");
39 connectionFactory.setPort(5672);
40 connectionFactory.setUsername("admin");
41 connectionFactory.setPassword("Tjlh@2021");
42 // connectionFactory.setVirtualHost("member_center");
43 connectionFactory.setVirtualHost("/");
44 return connectionFactory;
45 }
46
47 @Bean(name = "memberServiceConnectionFactory")
48 public ConnectionFactory memberServiceConnectionFactory(){
49 CachingConnectionFactory connectionFactory = new CachingConnectionFactory();
50 /*connectionFactory.setHost("139.196.145.150");
51 connectionFactory.setPort(5672);
52 connectionFactory.setUsername("admin");
53 connectionFactory.setPassword("Topdraw1qaz");
54 connectionFactory.setVirtualHost("member_center");*/
55 connectionFactory.setHost("172.0.31.108");
56 connectionFactory.setPort(5672);
57 connectionFactory.setUsername("admin");
58 connectionFactory.setPassword("Tjlh@2021");
59 connectionFactory.setVirtualHost("member_center");
60 return connectionFactory;
61 }
62
63 @Bean(name = "userCenterRabbitListenerContainerFactory")
64 @Primary
65 public RabbitListenerContainerFactory userCenterRabbitListenerContainerFactory(
66 SimpleRabbitListenerContainerFactoryConfigurer containerFactoryConfigurer,
67 @Qualifier("userCenterConnectionFactory") ConnectionFactory connectionFactory) {
68 SimpleRabbitListenerContainerFactory factory = new SimpleRabbitListenerContainerFactory();
69 containerFactoryConfigurer.configure(factory,connectionFactory);
70 return factory;
71 }
72
73
74 @Bean(name = "memberServiceRabbitListenerContainerFactory")
75 public RabbitListenerContainerFactory memberServiceRabbitListenerContainerFactory(
76 SimpleRabbitListenerContainerFactoryConfigurer containerFactoryConfigurer,
77 @Qualifier("memberServiceConnectionFactory") ConnectionFactory connectionFactory) {
78 SimpleRabbitListenerContainerFactory factory = new SimpleRabbitListenerContainerFactory();
79 containerFactoryConfigurer.configure(factory,connectionFactory);
80 return factory;
81 }
82
83 /*
84 @Bean(name = "userCenterRabbitTemplate")
85 public RabbitTemplate userCenterRabbitTemplate(ConnectionFactory userCenterConnectionFactory){
86 RabbitTemplate u = new RabbitTemplate(userCenterConnectionFactory);
87 return u;
88 }
89
90 @Bean(name = "memberServiceRabbitTemplate")
91 public RabbitTemplate memberServiceRabbitTemplate(ConnectionFactory memberServiceConnectionFactory){
92 RabbitTemplate u = new RabbitTemplate(memberServiceConnectionFactory);
93 return u;
94 }
95 */
96
97
98 /**
99 * 处理事件
100 * @return org.springframework.amqp.core.Queue
101 * @author XiangHan
102 * @date 2021/9/7 10:19 上午
103 */
104 @Bean
105 public Queue eventDirect() {
106 return new Queue(UC_ROUTE_KEY_DIRECT_EVENT_AAA);
107 }
108 }
1 package com.topdraw.mq.config;
2
3 import org.springframework.amqp.core.*;
4 import org.springframework.beans.factory.annotation.Value;
5 import org.springframework.context.annotation.Bean;
6 import org.springframework.context.annotation.Configuration;
7
8 @Configuration
9 public class RabbitMqConfig {
10
11 /** 路由(事件)--direct route.key*/
12 public static final String UC_ROUTE_KEY_DIRECT_EVENT_AAA = "uc.route.key.direct.event.aaa";
13
14 /** 队列-- */
15 public static final String UC_QUEUE_FANOUT_IPTV = "uc.fanout.iptv";
16 public static final String UC_QUEUE_FANOUT_WEIXIN = "uc.fanout.weixin";
17
18 public static final String UC_EXCHANGE_FANOUT = "uc.fanout";
19
20
21 /**
22 * 处理事件
23 * @return org.springframework.amqp.core.Queue
24 * @author XiangHan
25 * @date 2021/9/7 10:19 上午
26 */
27 @Bean
28 public Queue eventDirect() {
29 return new Queue(UC_ROUTE_KEY_DIRECT_EVENT_AAA);
30 }
31 }
1 package com.topdraw.mq.consumer; 1 package com.topdraw.mq.consumer;
2 2
3 import com.topdraw.config.ServiceEnvConfig; 3 import com.topdraw.config.ServiceEnvConfig;
4 import com.topdraw.mq.config.RabbitMqConfig; 4 import com.topdraw.config.RabbitMqConfig;
5 import com.topdraw.mq.domain.DataSyncMsg;
6 import com.topdraw.mq.domain.TableOperationMsg; 5 import com.topdraw.mq.domain.TableOperationMsg;
7 import com.topdraw.util.JSONUtil; 6 import com.topdraw.util.JSONUtil;
8 import lombok.extern.slf4j.Slf4j; 7 import lombok.extern.slf4j.Slf4j;
9 import org.slf4j.Logger; 8 import org.slf4j.Logger;
10 import org.slf4j.LoggerFactory; 9 import org.slf4j.LoggerFactory;
11 import org.springframework.amqp.core.AcknowledgeMode;
12 import org.springframework.amqp.core.ExchangeTypes; 10 import org.springframework.amqp.core.ExchangeTypes;
13 import org.springframework.amqp.rabbit.annotation.*; 11 import org.springframework.amqp.rabbit.annotation.*;
14 import org.springframework.beans.factory.annotation.Autowired; 12 import org.springframework.beans.factory.annotation.Autowired;
...@@ -34,7 +32,8 @@ public class MemberServiceConsumer { ...@@ -34,7 +32,8 @@ public class MemberServiceConsumer {
34 @RabbitListener(bindings = { 32 @RabbitListener(bindings = {
35 @QueueBinding(value = @Queue(value = "#{memberServiceConsumer.platform()}"), 33 @QueueBinding(value = @Queue(value = "#{memberServiceConsumer.platform()}"),
36 exchange = @Exchange(value = RabbitMqConfig.UC_EXCHANGE_FANOUT,type = ExchangeTypes.FANOUT)) 34 exchange = @Exchange(value = RabbitMqConfig.UC_EXCHANGE_FANOUT,type = ExchangeTypes.FANOUT))
37 }) 35 }
36 ,containerFactory = "memberServiceRabbitListenerContainerFactory")
38 public void memberServiceFanoutConsumer(String content) { 37 public void memberServiceFanoutConsumer(String content) {
39 try { 38 try {
40 log.info(" receive dataSync msg , content is : {} ", content); 39 log.info(" receive dataSync msg , content is : {} ", content);
......
1 package com.topdraw.mq.consumer; 1 package com.topdraw.mq.consumer;
2 2
3 import com.topdraw.mq.config.RabbitMqConfig; 3 import com.topdraw.config.RabbitMqConfig;
4 import com.topdraw.mq.domain.DataSyncMsg; 4 import com.topdraw.mq.domain.DataSyncMsg;
5 import com.topdraw.resttemplate.RestTemplateClient; 5 import com.topdraw.resttemplate.RestTemplateClient;
6 import com.topdraw.util.JSONUtil; 6 import com.topdraw.util.JSONUtil;
...@@ -25,7 +25,8 @@ public class UserCenterConsumer { ...@@ -25,7 +25,8 @@ public class UserCenterConsumer {
25 * @date 2021/9/7 11:26 上午 25 * @date 2021/9/7 11:26 上午
26 */ 26 */
27 @RabbitHandler 27 @RabbitHandler
28 @RabbitListener(queues = RabbitMqConfig.UC_ROUTE_KEY_DIRECT_EVENT_AAA) 28 @RabbitListener(queues = RabbitMqConfig.UC_ROUTE_KEY_DIRECT_EVENT_AAA,
29 containerFactory = "userCenterRabbitListenerContainerFactory")
29 public void ucEventConsumer(String content) { 30 public void ucEventConsumer(String content) {
30 log.info(" receive dataSync msg , content is : {} ", content); 31 log.info(" receive dataSync msg , content is : {} ", content);
31 DataSyncMsg dataSyncMsg = this.parseContent(content); 32 DataSyncMsg dataSyncMsg = this.parseContent(content);
......
...@@ -47,6 +47,7 @@ public class RestTemplateClient { ...@@ -47,6 +47,7 @@ public class RestTemplateClient {
47 String content = JSON.toJSONString(dataSyncMsg); 47 String content = JSON.toJSONString(dataSyncMsg);
48 HashMap<Object, Object> objectObjectHashMap = new HashMap<>(); 48 HashMap<Object, Object> objectObjectHashMap = new HashMap<>();
49 objectObjectHashMap.put("content", content); 49 objectObjectHashMap.put("content", content);
50 log.info("===>>>" + content);
50 restTemplate.postForEntity(url, objectObjectHashMap, String.class); 51 restTemplate.postForEntity(url, objectObjectHashMap, String.class);
51 /* ResponseEntity<String> responseEntity = restTemplate.postForEntity(url, objectObjectHashMap, String.class); 52 /* ResponseEntity<String> responseEntity = restTemplate.postForEntity(url, objectObjectHashMap, String.class);
52 if (responseEntity.getStatusCode().is2xxSuccessful()) { 53 if (responseEntity.getStatusCode().is2xxSuccessful()) {
......
...@@ -2,14 +2,13 @@ ...@@ -2,14 +2,13 @@
2 spring: 2 spring:
3 datasource: 3 datasource:
4 # 测试/演示库 4 # 测试/演示库
5 #url: jdbc:log4jdbc:mysql://139.196.37.202:3306/tj_user_0819?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false 5 url: jdbc:log4jdbc:mysql://139.196.37.202:3306/tj_user_0819?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false
6 #username: root
7 #password: Topdraw1qaz
8 url: jdbc:log4jdbc:mysql://122.112.214.149:3306/tj_user?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false
9 username: root 6 username: root
10 password: root 7 password: Topdraw1qaz
8 # url: jdbc:log4jdbc:mysql://122.112.214.149:3306/tj_user?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false
9 # username: root
10 # password: root
11 driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy 11 driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
12 # driverClassName: com.mysql.jdbc.Driver
13 #Druid 12 #Druid
14 type: com.alibaba.druid.pool.DruidDataSource 13 type: com.alibaba.druid.pool.DruidDataSource
15 druid: 14 druid:
...@@ -40,6 +39,25 @@ spring: ...@@ -40,6 +39,25 @@ spring:
40 url-pattern: /* 39 url-pattern: /*
41 exclusions: "*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/druid/*" 40 exclusions: "*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/druid/*"
42 41
42
43 rabbitmq:
44 user-center:
45 host: 47.100.212.170 # rabbitmq的连接地址
46 #host: 139.196.192.242 # rabbitmq的连接地址
47 port: 5672 # rabbitmq的连接端口号
48 virtual-host: / # rabbitmq的虚拟host
49 username: test # rabbitmq的用户名
50 password: test # rabbitmq的密码
51 publisher-confirms: true #如果对异步消息需要回调必须设置为true
52 member-service:
53 host: 139.196.145.150 # rabbitmq的连接地址
54 port: 5672 # rabbitmq的连接端口号
55 virtual-host: member_center # rabbitmq的虚拟host
56 username: admin # rabbitmq的用户名
57 password: Topdraw1qaz # rabbitmq的密码
58 publisher-confirms: true #如果对异步消息需要回调必须设置为true
59
60
43 #配置 Jpa 61 #配置 Jpa
44 jpa: 62 jpa:
45 hibernate: 63 hibernate:
...@@ -53,23 +71,11 @@ spring: ...@@ -53,23 +71,11 @@ spring:
53 redis: 71 redis:
54 #数据库索引 72 #数据库索引
55 database: 6 73 database: 6
56 host: 127.0.0.1 74 host: 122.112.214.149
57 port: 6379 75 port: 6379
58 password:
59 #连接超时时间 76 #连接超时时间
60 timeout: 5000 77 timeout: 5000
61 rabbitmq: 78
62 host: 47.100.212.170 # rabbitmq的连接地址
63 # host: 122.112.214.149 # rabbitmq的连接地址
64 #host: 139.196.192.242 # rabbitmq的连接地址
65 port: 5672 # rabbitmq的连接端口号
66 #virtual-host: /member_center # rabbitmq的虚拟host
67 #username: member_center # rabbitmq的用户名
68 #password: Tjlh@2021 # rabbitmq的密码
69 virtual-host: test # rabbitmq的虚拟host
70 username: omo_test # rabbitmq的用户名
71 password: omo_test # rabbitmq的密码
72 publisher-confirms: true #如果对异步消息需要回调必须设置为true
73 79
74 #jwt。依赖的common中有需要jwt的部分属性。 80 #jwt。依赖的common中有需要jwt的部分属性。
75 jwt: 81 jwt:
...@@ -94,6 +100,8 @@ generator: ...@@ -94,6 +100,8 @@ generator:
94 swagger: 100 swagger:
95 enabled: true 101 enabled: true
96 102
103
104
97 # 文件存储路径(相对路径) 105 # 文件存储路径(相对路径)
98 file: 106 file:
99 path: system/file 107 path: system/file
...@@ -106,7 +114,7 @@ file: ...@@ -106,7 +114,7 @@ file:
106 uc: 114 uc:
107 service: 115 service:
108 # uc两侧部署，需配置位于哪一侧 mobile小屏侧 vis大屏侧 116 # uc两侧部署，需配置位于哪一侧 mobile小屏侧 vis大屏侧
109 type: mobile 117 type: vis
110 118
111 api: 119 api:
112 # baseUrl: http://139.196.4.234:8447 120 # baseUrl: http://139.196.4.234:8447
......
1 #配置数据源 1 #配置数据源
2 spring: 2 spring:
3 datasource: 3 datasource:
4 # 测试/演示库 4 url: jdbc:log4jdbc:mysql://172.0.31.91:3306/tj_user?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false
5 #url: jdbc:log4jdbc:mysql://139.196.37.202:3306/tj_user_0819?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false
6 #username: root
7 #password: Topdraw1qaz
8 url: jdbc:log4jdbc:mysql://122.112.214.149:3306/tj_user?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false
9 username: root 5 username: root
10 password: root 6 password: Tjlh@2021
11 driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy 7 driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
12 # driverClassName: com.mysql.jdbc.Driver
13 #Druid 8 #Druid
14 type: com.alibaba.druid.pool.DruidDataSource 9 type: com.alibaba.druid.pool.DruidDataSource
15 druid: 10 druid:
...@@ -52,23 +47,24 @@ spring: ...@@ -52,23 +47,24 @@ spring:
52 max-request-size: 200MB 47 max-request-size: 200MB
53 redis: 48 redis:
54 #数据库索引 49 #数据库索引
55 database: 6 50 database: 0
56 host: 127.0.0.1 51 host: 127.0.0.1
57 port: 6379 52 port: 6379
58 password: 53 password:
59 #连接超时时间 54 #连接超时时间
60 timeout: 5000 55 timeout: 5000
61 rabbitmq: 56 rabbitmq:
62 host: 122.112.214.149 # rabbitmq的连接地址 57 host: 172.0.31.96 # rabbitmq的连接地址
63 #host: 139.196.192.242 # rabbitmq的连接地址
64 port: 5672 # rabbitmq的连接端口号 58 port: 5672 # rabbitmq的连接端口号
65 #virtual-host: /member_center # rabbitmq的虚拟host 59 virtual-host: member_center # rabbitmq的虚拟host
66 #username: member_center # rabbitmq的用户名 60 username: admin # rabbitmq的用户名
67 #password: Tjlh@2021 # rabbitmq的密码 61 password: Tjlh@2021 # rabbitmq的密码
68 virtual-host: / # rabbitmq的虚拟host
69 username: guest # rabbitmq的用户名
70 password: guest # rabbitmq的密码
71 publisher-confirms: true #如果对异步消息需要回调必须设置为true 62 publisher-confirms: true #如果对异步消息需要回调必须设置为true
63 listener:
64 direct:
65 auto-startup: false
66 simple:
67 auto-startup: false
72 68
73 #jwt。依赖的common中有需要jwt的部分属性。 69 #jwt。依赖的common中有需要jwt的部分属性。
74 jwt: 70 jwt:
...@@ -105,8 +101,8 @@ file: ...@@ -105,8 +101,8 @@ file:
105 uc: 101 uc:
106 service: 102 service:
107 # uc两侧部署，需配置位于哪一侧 mobile小屏侧 vis大屏侧 103 # uc两侧部署，需配置位于哪一侧 mobile小屏侧 vis大屏侧
108 type: mobile 104 type: vis
109 105
110 api: 106 api:
111 # baseUrl: http://139.196.4.234:8447 107 # baseUrl: http://139.196.4.234:8447
112 baseUrl: http://localhost:8447 108 baseUrl: http://172.0.31.94:8447
......
1 server: 1 server:
2 port: 8449 2 port: 8448
3 3
4 spring: 4 spring:
5 application: 5 application:
......