Commits · 8bb64b863f65c85e70d19f77290fee70b41b7750 · 向汉 / uc-consumer

07 Sep, 2022 1 commit

Merge remote-tracking branch 'remotes/origin/2.2.0-release' · 8bb64b86 ...

# Conflicts:
#	src/main/java/com/topdraw/business/module/member/repository/MemberRepository.java
#	src/main/java/com/topdraw/business/module/member/service/MemberService.java
#	src/main/java/com/topdraw/business/module/member/service/impl/MemberServiceImpl.java
#	src/main/java/com/topdraw/business/process/service/impl/UserOperationServiceImpl.java
#	src/main/java/com/topdraw/business/process/service/impl/member/MemberOperationServiceImpl.java
#	src/main/java/com/topdraw/mq/consumer/UcEventBusIptv2ManagementUcEngine.java
#	src/main/java/com/topdraw/mq/consumer/UcGatewayIptv2IptvConsumer.java
#	src/main/java/com/topdraw/mq/consumer/WeiXinEventConsumer.java
#	src/main/java/com/topdraw/mq/domain/DataSyncMsg.java
#	src/main/java/com/topdraw/resttemplate/RestTemplateClient.java
#	src/main/resources/config/application-dev.yml

authored 2022-09-07 09:31:20 +0800

24 Aug, 2022 1 commit
- 1.task实体中添加关联实体id字段 · 80f8168f ...
  80f8168f Browse Files
```
2.修改同步任务逻辑
```
  xianghan authored 2022-08-24 14:18:11 +0800
19 Aug, 2022 1 commit
- 1.修改调用uce接口响应结果 · eb323c19
  eb323c19 Browse Files
  
  xianghan authored 2022-08-19 17:21:41 +0800
09 Aug, 2022 1 commit
- 1.优化配置文件 · 45ed1aa6
  45ed1aa6 Browse Files
  
  xianghan authored 2022-08-09 15:11:52 +0800
22 Jul, 2022 1 commit
- 1.优化配置文件 · ec13a047 ...
  ec13a047
```
2.同步app账号
```
  xianghan authored 2022-07-22 11:01:43 +0800
15 Jul, 2022 1 commit
- 1.按照规范修改配置文件，去除列表 · 06370947
  06370947 Browse Files
  
  xianghan authored 2022-07-15 18:31:23 +0800
09 Jul, 2022 1 commit
- 1.添加消费成长报告mq · 95065426
  95065426 Browse Files
  
  xianghan authored 2022-07-09 21:39:26 +0800
04 Jul, 2022 1 commit
- 1.添加批量修改会员分组接口 · fd7258cd
  fd7258cd Browse Files
  
  xianghan authored 2022-07-04 20:51:28 +0800
25 Jun, 2022 2 commits
- 1.修改绑定、解绑的实现方式 · c60f18f6
  c60f18f6 Browse Files
  
  xianghan authored 2022-06-25 21:29:37 +0800
- 1.修改判空条件 · 1e729a4f
  1e729a4f Browse Files
  
  xianghan authored 2022-06-25 18:42:48 +0800
24 Jun, 2022 1 commit
- 1.去除消费任务时的部分查询，直接将消息传递至uce · 1e30cfe4
  1e30cfe4 Browse Files
  
  xianghan authored 2022-06-24 09:34:33 +0800
20 Jun, 2022 1 commit
- 1.优化部分任务处理逻辑 · 495bb3c6
  495bb3c6 Browse Files
  
  xianghan authored 2022-06-20 21:40:24 +0800
19 Jun, 2022 3 commits
- 1.同步master，修改小屏解绑bug · 4bc1f4cf
  4bc1f4cf Browse Files
  
  xianghan authored 2022-06-20 01:00:33 +0800
- 1.同步master，优化警告信息 · a1b52b0e
  a1b52b0e Browse Files
  
  xianghan authored 2022-06-19 23:32:01 +0800
- 1.同步master，优化任务处理过程 · ca54709d
  ca54709d Browse Files
  
  xianghan authored 2022-06-19 19:11:29 +0800
17 Jun, 2022 2 commits
- 1.同步master，优化任务处理过程 · f4ad8dc9
  f4ad8dc9 Browse Files
  
  xianghan authored 2022-06-17 09:41:18 +0800
- 1.优化任务处理过程 · 77995e43
  77995e43 Browse Files
  
  xianghan authored 2022-06-17 09:34:19 +0800
16 Jun, 2022 1 commit
- 1.修改会员信息修改、账号信息修改的方式 · 60b8b824
  60b8b824 Browse Files
  
  xianghan authored 2022-06-16 10:12:44 +0800
14 Jun, 2022 1 commit
- 1.添加换绑、解绑日志 · 977b98cf
  977b98cf Browse Files
  
  xianghan authored 2022-06-14 14:45:09 +0800
13 Jun, 2022 2 commits
- 1.修改绑定的逻辑实现 · 9c38b950
  9c38b950 Browse Files
  
  xianghan authored 2022-06-13 21:25:21 +0800
- 1.为关注业务添加必要的日志 · be34f2c3
  be34f2c3 Browse Files
  
  xianghan authored 2022-06-13 09:31:57 +0800
10 Jun, 2022 1 commit

Merge branch '2' · 28189ec9 ...

28189ec9 Browse Files

# Conflicts:
#	src/main/java/com/topdraw/business/module/member/profile/service/impl/MemberProfileServiceImpl.java
#	src/main/java/com/topdraw/business/module/member/service/impl/MemberServiceImpl.java
#	src/main/java/com/topdraw/business/module/user/iptv/domain/UserTv.java
#	src/main/java/com/topdraw/business/module/user/iptv/service/dto/UserTvDTO.java
#	src/main/java/com/topdraw/business/module/user/weixin/service/impl/UserWeixinServiceImpl.java
#	src/main/java/com/topdraw/mq/consumer/WeiXinEventConsumer.java
#	src/main/resources/config/application-dev.yml

authored 2022-06-10 09:31:53 +0800

09 Jun, 2022 3 commits
- 1.添加查询会员日志 · d9cadcfa
  d9cadcfa Browse Files
  
  xianghan authored 2022-06-10 03:09:12 +0800
- 1.兼容1.0.0版本 · b1f50657
  b1f50657 Browse Files
  
  xianghan authored 2022-06-10 01:04:42 +0800
- 1.优化mq配置，添加默认数据源和默认队列 · 1a39d208
  1a39d208 Browse Files
  
  xianghan authored 2022-06-09 13:15:20 +0800
08 Jun, 2022 1 commit
- 1.修改大屏侧小屏解绑和换绑的逻辑 · aae2399c
  aae2399c Browse Files
  
  xianghan authored 2022-06-09 00:35:29 +0800
02 Jun, 2022 1 commit
- 1.update · cf39040a
  cf39040a Browse Files
  
  xianghan authored 2022-06-02 10:48:35 +0800
01 Jun, 2022 1 commit
- 1.update · cb36cfdf
  cb36cfdf Browse Files
  
  xianghan authored 2022-06-01 16:38:52 +0800
31 May, 2022 3 commits
- 1.update · 2c9f83ae
  2c9f83ae Browse Files
  
  xianghan authored 2022-05-31 23:36:49 +0800
- 1.update · 4a4ff22e
  4a4ff22e Browse Files
  
  xianghan authored 2022-05-31 21:16:37 +0800
- 1.update · b0eb3957
  b0eb3957 Browse Files
  
  xianghan authored 2022-05-31 12:29:44 +0800
30 May, 2022 2 commits
- 1.update · befd31ce
  befd31ce Browse Files
  
  xianghan authored 2022-05-30 23:17:42 +0800
- 1.update · 2bf41a44
  2bf41a44 Browse Files
  
  xianghan authored 2022-05-30 09:49:21 +0800
27 May, 2022 1 commit
- 1.update · 99016a4c
  99016a4c Browse Files
  
  xianghan authored 2022-05-27 09:14:44 +0800
25 May, 2022 1 commit
- 1.update · 663ab529
  663ab529 Browse Files
  
  xianghan authored 2022-05-25 12:06:33 +0800
22 May, 2022 1 commit
- 1.update · 7cf8df3d
  7cf8df3d Browse Files
  
  xianghan authored 2022-05-22 22:26:36 +0800
21 May, 2022 1 commit
- 1.update · 5d345d7d
  5d345d7d Browse Files
  
  xianghan authored 2022-05-22 00:01:57 +0800
19 May, 2022 2 commits
- 1.update · 732860d9
  732860d9 Browse Files
  
  xianghan authored 2022-05-19 23:45:04 +0800
- 1.update · b54d2c49
  b54d2c49 Browse Files
  
  xianghan authored 2022-05-19 10:29:47 +0800
17 May, 2022 1 commit
- 1.update · 227879a4
  227879a4 Browse Files
  
  xianghan authored 2022-05-18 01:18:26 +0800