Commits · c26740516512273c78bd10d117fb304328e26e86 · xushaohua / midjourney-proxy

09 Nov, 2021 1 commit
- feat:[none] 增加X-Real-IP方法 · c2674051
  李传峰 authored Nov 09, 2021
  
  c2674051 Browse Files
08 Nov, 2021 2 commits
- Merge branch 'feature/1005931' into 3.x · 13130d9c
  桂前礼 authored Nov 08, 2021
  
  13130d9c Browse Files
- feat: [1005931] 企业微信二期增加个人sop群sop，补全剩余应用关联活码配置，每个应用增加私域流量活码关联配置 · 044dae96
  桂前礼 authored Nov 08, 2021
  
  044dae96 Browse Files
03 Nov, 2021 3 commits
- Merge branch 'feature/agentCallBack' into 3.x · 9f554bbc
  桂前礼 authored Nov 04, 2021
  
  9f554bbc Browse Files
- feat: [none] 企业微信二期-消息回调部分（接口改造） · e50e3cdb
  桂前礼 authored Nov 04, 2021
  
  e50e3cdb Browse Files
- resolve conflicts · d05b553c
  桂前礼 authored Nov 04, 2021
  
  d05b553c Browse Files
02 Nov, 2021 2 commits
- Merge branch 'feature/1005507' into 'master' · 6e356d0d
```
feat: [1005507] 图书订购与热卖纸书优化

See merge request rays/pcloud-common-parent!234
```
  田超 authored Nov 02, 2021
  6e356d0d Browse Files
- feat: [1005507] 图书订购与热卖纸书优化 · 91ad725b
  郑永强 authored Oct 18, 2021
  
  91ad725b Browse Files
28 Oct, 2021 4 commits
- Merge branch 'feature/1005273' into 'master' · 722beb1e
```
feat: [1005273] 私域助手-企业微信

See merge request rays/pcloud-common-parent!233
```
  田超 authored Oct 28, 2021
  722beb1e Browse Files
- feat: [1005273] 私域助手-企业微信 · 9fa989ca
  桂前礼 authored Oct 25, 2021
  
  9fa989ca Browse Files
- Merge branch 'feature/1005798' into 'master' · a688c4ce
```
feat:[1005798] 预测数据

See merge request rays/pcloud-common-parent!232
```
  田超 authored Oct 28, 2021
  a688c4ce Browse Files
- feat:[1005798] 预测数据 · c74818e6
  admin authored Oct 28, 2021
  
  c74818e6 Browse Files
27 Oct, 2021 1 commit
- feat: [1005507] 图书订购与热卖纸书优化 · a46c96bc
  郑永强 authored Oct 18, 2021
  
  a46c96bc Browse Files
26 Oct, 2021 3 commits
- 解决冲突 · eb1b9d50
  admin authored Oct 26, 2021
  
  eb1b9d50 Browse Files
- add topic · 6fa0a013
  admin authored Oct 26, 2021
  
  6fa0a013 Browse Files
- feat:[none]加新的topic · f12beb6d
  admin authored Oct 26, 2021
  
  f12beb6d Browse Files
19 Oct, 2021 2 commits
- fix merge error · e8c8cee2
  李传峰 authored Oct 19, 2021
  
  e8c8cee2 Browse Files
- Merge remote-tracking branch 'remotes/origin/master' into 3.x · aa5b9dba
```
# Conflicts:
#	pcloud-common-core/src/main/java/com/pcloud/common/core/constant/MQTopicProducer.java
#	pcloud-common-core/src/main/java/com/pcloud/common/core/constant/SMSTemplateConstant.java
```
  李传峰 authored Oct 19, 2021
  aa5b9dba Browse Files
18 Oct, 2021 3 commits
- 加入AES加密工具类，增加long的常用方法 · b9c8f912
  李传峰 authored Oct 18, 2021
  
  b9c8f912 Browse Files
- 加入AES加密工具类 · fefa336f
  李传峰 authored Oct 18, 2021
  
  fefa336f Browse Files
- 加入AES加密工具类 · 4cc66ac4
  李传峰 authored Oct 18, 2021
  
  4cc66ac4 Browse Files
27 Sep, 2021 2 commits
- Merge branch 'feature/1005439' into 'master' · 0e77e561
```
feat:[1005439]策划/商务：平台会员

See merge request rays/pcloud-common-parent!231
```
  田超 authored Sep 27, 2021
  0e77e561 Browse Files
- feat:[1005439]策划/商务：平台会员 · 77b97569
  朱亚洁 authored Sep 24, 2021
  
  77b97569 Browse Files
26 Sep, 2021 15 commits
- Merge branch 'feature/1005527' into 'master' · d878b5c7
```
feat:[1005527]公众号-关注后延时推送

See merge request rays/pcloud-common-parent!230
```
  田超 authored Sep 26, 2021
  d878b5c7 Browse Files
- feat:[1005527]公众号-关注后延时推送 · ec4b0792
  朱亚洁 authored Sep 26, 2021
  
  ec4b0792 Browse Files
- Merge branch 'feature/1005481' into 'master' · db9cc0fc
```
feat: [1005481] 服务余量预警

See merge request rays/pcloud-common-parent!229
```
  田超 authored Sep 26, 2021
  db9cc0fc Browse Files
- feat: [1005481] 服务余量预警 · c59db2f0
  吴博 authored Sep 26, 2021
  
  c59db2f0 Browse Files
- Merge branch 'fixbug/geoip' into 'master' · 4fff9471
```
bug: [none] IP地理位置库 更换

See merge request rays/pcloud-common-parent!228
```
  田超 authored Sep 26, 2021
  4fff9471 Browse Files
- bug: [none] IP地理位置库更换 · e6631bb0
  桂前礼 authored Sep 26, 2021
  
  e6631bb0 Browse Files
- Merge branch '3.x' of http://begitlab.chubanyun.me/rays/pcloud-common-parent into 3.x · 5015ad4c
  朱亚洁 authored Sep 26, 2021
  
  5015ad4c Browse Files
- feat:[1005527]公众号-关注后延时推送 · 7b6f4b4b
  朱亚洁 authored Sep 26, 2021
  
  7b6f4b4b Browse Files
- feat: [1005481] 服务消息预警 · cdf7ee18
  吴博 authored Sep 26, 2021
  
  cdf7ee18 Browse Files
- Merge branches '3.x' and 'feature/1005481' of… · 2cf6d12e
```
Merge branches '3.x' and 'feature/1005481' of ssh://begitlab.chubanyun.me:12122/rays/pcloud-common-parent into 3.x
```
  吴博 authored Sep 26, 2021
  2cf6d12e Browse Files
- feat: [1005481] 服务消息预警 · c3547900
  吴博 authored Sep 26, 2021
  
  c3547900 Browse Files
- feat: [1005481] 服务消息预警 · cb5840c5
  吴博 authored Sep 26, 2021
  
  cb5840c5 Browse Files
- feat: [1005481] 服务消息预警 · e8ab6bf5
  吴博 authored Sep 26, 2021
  
  e8ab6bf5 Browse Files
- Merge branches '3.x' and 'feature/1005481' of… · 9de93392
```
Merge branches '3.x' and 'feature/1005481' of ssh://begitlab.chubanyun.me:12122/rays/pcloud-common-parent into 3.x

 Conflicts:
	pcloud-common-core/src/main/java/com/pcloud/common/core/constant/MQTopicProducer.java
	pcloud-common-core/src/main/java/com/pcloud/common/core/dto/SendMessageDto.java
```
  吴博 authored Sep 26, 2021
  9de93392 Browse Files
- feat: [1005481] 服务消息预警 · fd21634c
  吴博 authored Sep 26, 2021
  
  fd21634c Browse Files
24 Sep, 2021 1 commit
- feat:[1005439]策划/商务：平台会员 · 53129083
  朱亚洁 authored Sep 24, 2021
  
  53129083 Browse Files
18 Sep, 2021 1 commit
- Merge branch 'feature/1005434' into 'master' · 8374286d
```
feat: [1005434] 上邮验证码

See merge request rays/pcloud-common-parent!227
```
  田超 authored Sep 18, 2021
  8374286d Browse Files