Commits · 52430f86a5000bc5f21d4537a15928f43efe2a26 · 董敬伟 / liquidnet-bus-v1

29 Oct, 2021 3 commits
- candy消费eureka修改 · 52430f86
  anjiabin authored Oct 29, 2021
  
  52430f86
- Merge remote-tracking branch 'origin/dev_redis_multidb' into dev_redis_multidb · c2af85a1
  张国柄 authored Oct 29, 2021
  
  c2af85a1
- +券领取过期及失效响应处理; · 971fea8b
  张国柄 authored Oct 29, 2021
  
  971fea8b
28 Oct, 2021 20 commits
- Merge remote-tracking branch 'origin/master' into dev_redis_multidb · 480f01d0
  张国柄 authored Oct 28, 2021
```
# Conflicts:
#	liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/candy/CandyCouponCodeAdminController.java
#	liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/candy/coupon/code/code.html
```
  480f01d0
- Merge branch 'pre' into 'master' · bbca2b8f
  刘喆 authored Oct 28, 2021
```
Pre

See merge request !112
```
  bbca2b8f
- Merge remote-tracking branch 'origin/fix_adam_close' into pre · c063e1f0
  张国柄 authored Oct 28, 2021
  
  c063e1f0
- fix:用户注销会员订单清除RDS数据; · 1506c43a
  张国柄 authored Oct 28, 2021
  
  1506c43a
- redis多数据源 · 444b4e80
  anjiabin authored Oct 28, 2021
  
  444b4e80
- Merge remote-tracking branch 'origin/fix_admin_ccode_recover' into pre · f0f7e2bb
  张国柄 authored Oct 28, 2021
  
  f0f7e2bb
- redis多数据源 · 43dc478c
  anjiabin authored Oct 28, 2021
  
  43dc478c
- redis多数据源 · 8c36ff30
  anjiabin authored Oct 28, 2021
  
  8c36ff30
- fix:admin:券码退回交互; · fec4c882
  张国柄 authored Oct 28, 2021
  
  fec4c882
- redis多数据源 · 7dfbe583
  anjiabin authored Oct 28, 2021
  
  7dfbe583
- 社交增加喜欢和不喜欢计数 · e8005d78
  anjiabin authored Oct 28, 2021
  
  e8005d78
- 社交增加喜欢和不喜欢计数 · 0c34f69a
  anjiabin authored Oct 28, 2021
  
  0c34f69a
- fix:用户注销遗留用户数据修复; · 2baf3fef
  张国柄 authored Oct 28, 2021
  
  2baf3fef
- 社交增加喜欢和不喜欢计数 · b945b7bd
  anjiabin authored Oct 28, 2021
  
  b945b7bd
- 社交增加喜欢和不喜欢计数 · d9b6af94
  anjiabin authored Oct 28, 2021
  
  d9b6af94
- fix:用户注销遗留用户数据修复; · 529ea43f
  张国柄 authored Oct 28, 2021
  
  529ea43f
- 社交增加喜欢和不喜欢计数 · 4de40f04
  anjiabin authored Oct 28, 2021
  
  4de40f04
- opt:error.properties[candy、chime]; · 454c8d4e
  张国柄 authored Oct 28, 2021
  
  454c8d4e
- 券码:退回逻辑及页面交互调整; · d42208f4
  张国柄 authored Oct 28, 2021
  
  d42208f4
- Revert "券码:退回逻辑调整;" · 389ce2f3
  张国柄 authored Oct 28, 2021
```
This reverts commit 0884af63
```
  389ce2f3
27 Oct, 2021 17 commits
- fix:admin:券码退回交互; · 97c83dec
  张国柄 authored Oct 27, 2021
  
  97c83dec
- fix:admin:券码退回交互; · 78d94ba9
  张国柄 authored Oct 27, 2021
  
  78d94ba9
- 券码:退回逻辑调整; · 0884af63
  张国柄 authored Oct 27, 2021
  
  0884af63
- 券码兑换时间过期优化处理; · 96758db4
  张国柄 authored Oct 27, 2021
  
  96758db4
- +log; · c23c2197
  张国柄 authored Oct 27, 2021
  
  c23c2197
- redis多数据源 · ea4dc549
  anjiabin authored Oct 27, 2021
  
  ea4dc549
- redis多数据源 · ecbf4e8a
  anjiabin authored Oct 27, 2021
  
  ecbf4e8a
- RDS多数据源调整:adam、candy; · 93b99dc8
  张国柄 authored Oct 27, 2021
  
  93b99dc8
- redis多数据源 · 278dffd5
  anjiabin authored Oct 27, 2021
  
  278dffd5
- RDS多数据源调整:adam、candy; · b968cd91
  张国柄 authored Oct 27, 2021
  
  b968cd91
- 删除无关代码; · aa46f5b2
  张国柄 authored Oct 27, 2021
  
  aa46f5b2
- redis多数据源 · d1daa607
  anjiabin authored Oct 27, 2021
  
  d1daa607
- redis多数据源 · 800b402c
  anjiabin authored Oct 27, 2021
  
  800b402c
- consumer.kylin删除candy相关消费逻辑; · da6cf45a
  张国柄 authored Oct 27, 2021
  
  da6cf45a
- 配置调整; · cfbef2dc
  张国柄 authored Oct 27, 2021
  
  cfbef2dc
- 鉴权调整; · af015a6e
  张国柄 authored Oct 27, 2021
```
配置调整;
```
  af015a6e
- redis多数据源 · f3fe0aed
  anjiabin authored Oct 27, 2021
  
  f3fe0aed