Commits · ee0ca50c8d6918a92a2f62d80cad5f6b485b99ff · xushaohua / midjourney-proxy

17 Sep, 2021 4 commits
- Merge branch 'feature/1005436' into 'master' · ee0ca50c
```
feat:[1005436]配置H5页面，增加字体颜色配置

See merge request rays/pcloud-book!1414
```
  田超 authored Sep 17, 2021
  ee0ca50c Browse Files
- feat:[1005436]配置H5页面，增加字体颜色配置 · e94991ef
  朱亚洁 authored Sep 10, 2021
  
  e94991ef Browse Files
- Merge branch 'feature/1005479' into 'master' · b5e866e6
```
feat:[1005479]关联书刊时自动冻结书刊收益

See merge request rays/pcloud-book!1413
```
  田超 authored Sep 17, 2021
  b5e866e6 Browse Files
- feat:[1005479]关联书刊时自动冻结书刊收益 · 8e421bd6
  朱亚洁 authored Sep 16, 2021
  
  8e421bd6 Browse Files
16 Sep, 2021 2 commits
- Merge branch 'feature/1005485' into 'master' · 543852d4
```
feat: [1005485] 修复编辑端书刊查询

See merge request rays/pcloud-book!1412
```
  田超 authored Sep 16, 2021
  543852d4 Browse Files
- feat: [1005485] 修复编辑端书刊查询 · 6c86f854
  吴博 authored Sep 16, 2021
  
  6c86f854 Browse Files
14 Sep, 2021 2 commits
- Merge branch 'fixbug/fix1030832' into 'master' · 45106e09
```
bug: [1030832] 【生产回归】【生产环境】【出版端】【书刊管理】根据不存在的关键词搜索出了全部内容，应该一个也搜不到

See merge request rays/pcloud-book!1411
```
  田超 authored Sep 14, 2021
  45106e09 Browse Files
- bug: [1030832] 【生产回归】【生产环境】【出版端】【书刊管理】根据不存在的关键词搜索出了全部内容，应该一个也搜不到 · 25dae8f9
  吴博 authored Sep 14, 2021
  
  25dae8f9 Browse Files
11 Sep, 2021 2 commits
- Merge branch 'feature/1005255' into 'master' · 8bb0807d
```
feat:[1005255]取消运营平台限制

See merge request rays/pcloud-book!1410
```
  田超 authored Sep 11, 2021
  8bb0807d Browse Files
- feat:[1005255]取消运营平台限制 · ccd4051e
  朱亚洁 authored Sep 11, 2021
  
  ccd4051e Browse Files
10 Sep, 2021 2 commits
- Merge branch 'feature/1005387' into 'master' · a5bc3788
```
feat:[1005387]本书服务页优化

See merge request rays/pcloud-book!1409
```
  田超 authored Sep 10, 2021
  a5bc3788 Browse Files
- feat:[1005387]本书服务页优化 · 4cd4f800
  朱亚洁 authored Sep 10, 2021
  
  4cd4f800 Browse Files
09 Sep, 2021 4 commits
- Merge branch 'fixbug/deleteColumn' into 'master' · debe368e
```
bug:[none]保存空页面

See merge request rays/pcloud-book!1408
```
  Administrator authored Sep 09, 2021
  debe368e Browse Files
- bug:[none]保存空页面 · ca5ef5e3
  朱亚洁 authored Sep 09, 2021
  
  ca5ef5e3 Browse Files
- Merge branch 'feature/1005398' into 'master' · f73976be
```
feat: [1005398] 第三方资源大图

See merge request rays/pcloud-book!1407
```
  田超 authored Sep 09, 2021
  f73976be Browse Files
- feat: [1005398] 第三方资源大图 · 676b9d38
  吴博 authored Sep 06, 2021
  
  676b9d38 Browse Files
08 Sep, 2021 2 commits
- error -> warn ，记录异常便于查问题 · 44412441
  李传峰 authored Sep 08, 2021
  
  44412441 Browse Files
- Merge branch '3.x' into 'master' · 57886542
```
3.x 升级

See merge request rays/pcloud-book!1402
```
  李传峰 authored Sep 08, 2021
  57886542 Browse Files
07 Sep, 2021 13 commits
- Merge branch 'feature/1005325' into 'master' · df3f57e2
```
feat:[1005325]H5本书服务简化RAYS工具配置

See merge request rays/pcloud-book!1401
```
  田超 authored Sep 07, 2021
  df3f57e2 Browse Files
- 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