Commits · 233904071e0f8643a473608fc11e1ad88401b1a2 · xushaohua / midjourney-proxy

07 Sep, 2021 12 commits
- Merge branches '3.x' and 'feature/1005325' of… · 23390407
```
Merge branches '3.x' and 'feature/1005325' of http://begitlab.chubanyun.me/rays/pcloud-book into 3.x
```
  朱亚洁 authored Sep 07, 2021
  23390407 Browse Files
- feat:[1005325]H5本书服务简化RAYS工具配置 · 937497a7
  朱亚洁 authored Sep 07, 2021
  
  937497a7 Browse Files
- 移除事务注解 · d2581826
  李传峰 authored Sep 07, 2021
  
  d2581826 Browse Files
- 修正取值弄反，导致映射错误 · 91b3af6c
  李传峰 authored Sep 07, 2021
  
  91b3af6c Browse Files
- 修正取值弄反，导致映射错误 · 6f418310
  李传峰 authored Sep 07, 2021
  
  6f418310 Browse Files
- 3.x升级&老ES对接新服务,移除无用@FeignClient注解 · d99fa1c2
  李传峰 authored Sep 07, 2021
  
  d99fa1c2 Browse Files
- 3.x升级&老ES对接新服务 · 67de1a90
  李传峰 authored Sep 07, 2021
  
  67de1a90 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/2.x' into 3.x · d00bde17
```
# Conflicts:
#	pcloud-service-book/pom.xml
```
  李传峰 authored Sep 07, 2021
  d00bde17 Browse Files
- Merge remote-tracking branch 'remotes/origin/master' into 3.x · 27a0dec2
```
# Conflicts:
#	pcloud-service-book/src/main/java/com/pcloud/book/group/biz/ResourcePageBiz.java
#	pcloud-service-book/src/main/java/com/pcloud/book/group/biz/impl/ResourcePageBizImpl.java
#	pcloud-service-book/src/main/java/com/pcloud/book/group/constant/ResourcePageConstants.java
#	pcloud-service-book/src/main/java/com/pcloud/book/group/facade/impl/ResourcePageFacade.java
```
  李传峰 authored Sep 07, 2021
  27a0dec2 Browse Files
- Merge branch '3.x' of http://begitlab.chubanyun.me/rays/pcloud-book into 3.x · 08858847
  李传峰 authored Sep 07, 2021
  
  08858847 Browse Files
- 3.x，版本修改处理 · 5d24f6c5
  李传峰 authored Sep 07, 2021
  
  5d24f6c5 Browse Files
- book 索引对接 · 5b7a64d8
  李传峰 authored Sep 07, 2021
  
  5b7a64d8 Browse Files
02 Sep, 2021 7 commits
- book 索引对接 · c9900f50
  李传峰 authored Sep 02, 2021
  
  c9900f50 Browse Files
- 调整es包路径 · e7d70560
  李传峰 authored Sep 02, 2021
  
  e7d70560 Browse Files
- Merge remote-tracking branch 'remotes/origin/master' into feature/2.x · e4d6ba56
  李传峰 authored Sep 02, 2021
  
  e4d6ba56 Browse Files
- remove ik analyzer · f057df76
  李传峰 authored Sep 02, 2021
  
  f057df76 Browse Files
- add deploy-all-env.bat · 22b8a247
  李传峰 authored Sep 02, 2021
  
  22b8a247 Browse Files
- Merge branch 'feature/1005260' into 'master' · 98cb038e
```
feat:[1005260]小睿H5关注公众号弹窗

See merge request rays/pcloud-book!1396
```
  田超 authored Sep 02, 2021
  98cb038e Browse Files
- feat:[1005260]小睿H5关注公众号弹窗 · 6cf26f30
  朱亚洁 authored Sep 02, 2021
  
  6cf26f30 Browse Files
01 Sep, 2021 2 commits
- Merge branch 'bug/1030717' into 'master' · bc98554a
```
bug:[1030717]资源配置

See merge request rays/pcloud-book!1395
```
  田超 authored Sep 01, 2021
  bc98554a Browse Files
- bug:[1030717]资源配置 · 374b9d58
  朱亚洁 authored Sep 01, 2021
  
  374b9d58 Browse Files
31 Aug, 2021 5 commits
- Merge branch 'fixbug/badSql' into 'master' · 16428cda
```
bug: [none] sql异常

See merge request rays/pcloud-book!1394
```
  田超 authored Aug 31, 2021
  16428cda Browse Files
- bug: [none] sql一场 · 73bf68a5
  桂前礼 authored Aug 31, 2021
  
  73bf68a5 Browse Files
- Merge branch 'fixbug/1005354' into 'master' · 61abed3f
```
bug: [1005354] 生产error处理

See merge request rays/pcloud-book!1393
```
  田超 authored Aug 31, 2021
  61abed3f Browse Files
- bug: [1005354] 生产error处理 · a4755935
  吴博 authored Aug 31, 2021
  
  a4755935 Browse Files
- Merge remote-tracking branch 'remotes/origin/master' into feature/2.x · fa563b2e
  李传峰 authored Aug 31, 2021
  
  fa563b2e Browse Files
30 Aug, 2021 5 commits
- Merge branch 'feature/1005330' into 'master' · a66c0ac8
```
feat:[1005330]导航分成互助打卡

See merge request rays/pcloud-book!1392
```
  田超 authored Aug 30, 2021
  a66c0ac8 Browse Files
- feat:[1005330]导航分成互助打卡 · 1348bb6c
  朱亚洁 authored Aug 30, 2021
  
  1348bb6c Browse Files
- Merge branches '3.x' and 'feature/1005260' of… · 7ebcbfa1
```
Merge branches '3.x' and 'feature/1005260' of http://begitlab.chubanyun.me/rays/pcloud-book into 3.x
```
  朱亚洁 authored Aug 30, 2021
  7ebcbfa1 Browse Files
- Merge remote-tracking branch 'origin/feature/1005260' into feature/1005260 · c661a61a
  朱亚洁 authored Aug 30, 2021
  
  c661a61a Browse Files
- 1005260小睿H5关注公众号弹窗 · d661c6e4
  朱亚洁 authored Aug 30, 2021
  
  d661c6e4 Browse Files
27 Aug, 2021 7 commits
- Merge branch 'fixbug/navigation2' into 'master' · 8875f119
```
bug:[none]H5导航

See merge request rays/pcloud-book!1391
```
  田超 authored Aug 27, 2021
  8875f119 Browse Files
- bug:[none]H5导航 · 5c8311c5
  朱亚洁 authored Aug 27, 2021
  
  5c8311c5 Browse Files
- Merge branch 'fixbug/navigation' into 'master' · 25406bac
```
bug:[none]H5导航

See merge request rays/pcloud-book!1390
```
  Administrator authored Aug 27, 2021
  25406bac Browse Files
- bug:[none]H5导航 · f6e3b635
  朱亚洁 authored Aug 27, 2021
  
  f6e3b635 Browse Files
- Merge branch 'feature/1005314' into 'master' · 47a2f43f
```
feat: [1005314] 编辑运营需求（版权保护支付、应用有效期）

See merge request rays/pcloud-book!1389
```
  田超 authored Aug 27, 2021
  47a2f43f Browse Files
- feat: [1005314] 编辑运营需求（版权保护支付、应用有效期） · 42b53c6d
  郑永强 authored Aug 25, 2021
  
  42b53c6d Browse Files
- book_group_qrcode 对接新es · 8932cc7c
  李传峰 authored Aug 27, 2021
  
  8932cc7c Browse Files
26 Aug, 2021 2 commits
- 1005260小睿H5关注公众号弹窗 · 20953a05
  朱亚洁 authored Aug 26, 2021
  
  20953a05 Browse Files
- Merge branch 'feature/1005240' into 'master' · df59b9f6
```
feat:[1005240]本书服务页加导航

See merge request rays/pcloud-book!1388
```
  田超 authored Aug 26, 2021
  df59b9f6 Browse Files