Skip to content

M
midjourney-proxy
Commit 890cc04a by 裴大威
Options

Merge branch 'fix-groupHeadUrl' into 'master' 

fix group headUrl

See merge request rays/pcloud-book!240
parents 691d7cb1 76612365
Showing with 111 additions and 13 deletions
pcloud-facade-book/src/main/java/com/pcloud/book/book/constant/BookConstant.java
...@@ -8,6 +8,7 @@ import com.pcloud.common.constant.CacheConstant; ...@@ -8,6 +8,7 @@ import com.pcloud.common.constant.CacheConstant;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Random;
/** /**
* 描述 :图书常量 * 描述 :图书常量
...@@ -125,6 +126,8 @@ public class BookConstant { ...@@ -125,6 +126,8 @@ public class BookConstant {
*/ */
public static final Long THIRTY = 30L; public static final Long THIRTY = 30L;
public static final Random RANDOM = new Random();
/** /**
* 微信群默认头像 * 微信群默认头像
*/ */
...@@ -137,7 +140,110 @@ public class BookConstant { ...@@ -137,7 +140,110 @@ public class BookConstant {
"https://oss.5rs.me/oss/upload/image/jpg/d8413818004b43c3af489ca6e249ae31.jpg", "https://oss.5rs.me/oss/upload/image/jpg/d8413818004b43c3af489ca6e249ae31.jpg",
"https://oss.5rs.me/oss/upload/image/jpg/05d98267b99441f2be54d5c4b39c99e1.jpg", "https://oss.5rs.me/oss/upload/image/jpg/05d98267b99441f2be54d5c4b39c99e1.jpg",
"https://oss.5rs.me/oss/upload/image/jpg/a5ff33889b4945bd94f7bfc8216bc0d8.jpg", "https://oss.5rs.me/oss/upload/image/jpg/a5ff33889b4945bd94f7bfc8216bc0d8.jpg",
"https://oss.5rs.me/oss/upload/image/jpg/3fb33c317d7f48df93109571957959fa.jpg"); "https://oss.5rs.me/oss/upload/image/jpg/3fb33c317d7f48df93109571957959fa.jpg",
"https://oss.5rs.me/oss/upload/image/jpg/f0d92d9a3ef643189334514a7f2c84a6.jpg",
"https://oss.5rs.me/oss/upload/image/jpg/349fc64b712f4fc7851450e00170dfb3.jpg",
"https://oss.5rs.me/oss/upload/image/jpg/32ff9aded9cb4ba6b5e953478a6c9a92.jpg",
"https://oss.5rs.me/oss/upload/image/jpg/a7bddec750a847778b04105538a6ea34.jpg",
"https://oss.5rs.me/oss/upload/image/jpg/c19b98c0b90844df946e8b2302bfaa0b.jpg",
"https://oss.5rs.me/oss/upload/image/jpg/5c10b538d3404a3f8e9fe1a1bbc951d6.jpg",
"https://oss.5rs.me/oss/upload/image/jpg/dfcc5d6fca144e38824abf1f33cb1f56.jpg",
"https://oss.5rs.me/oss/upload/image/jpg/25f62e182ad54372a98e91308ed7c4f5.jpg",
"https://oss.5rs.me/oss/upload/image/jpg/984cb4309a19496f87c720f0819fc590.jpg",
"https://oss.5rs.me/oss/upload/image/jpg/a7c92e9177a446c7883aaa99925340f5.jpg",
"https://oss.5rs.me/oss/upload/image/jpg/edf879e7224c42ff88f0a85256d464c9.jpg",
"https://oss.5rs.me/oss/upload/image/jpg/a0b43e220ccf49db8f64985c07d4c582.jpg",
"https://oss.5rs.me/oss/upload/image/jpg/3beb0351679445b8868a74376ca640ab.jpg",
"https://oss.5rs.me/oss/upload/image/jpg/3695698e277a47b185b5d6700bc7a6ea.jpg",
"https://oss.5rs.me/oss/upload/image/jpg/b516878d119b44d7becd956f561539b1.jpg",
"https://oss.5rs.me/oss/upload/image/jpg/481df9f13435481cb7586271e3c47c64.jpg",
"https://oss.5rs.me/oss/upload/image/jpg/4b812016a41e462c96d2b5c1de18bbb1.jpg",
"https://oss.5rs.me/oss/upload/image/jpg/b74f78f46a624949a5f44b33849545a0.jpg",
"https://oss.5rs.me/oss/upload/image/jpg/db04c03fda80470c87f36b72e5f0d693.jpg",
"https://oss.5rs.me/oss/upload/image/jpg/9357f804352a4631b7721c3883366f32.jpg",
"https://oss.5rs.me/oss/upload/image/jpg/7517400597f242c99356ece0418cbb69.jpg",
"https://oss.5rs.me/oss/upload/image/jpg/9c0d0c0613b948d19653c0554e59bf10.jpg",
"https://oss.5rs.me/oss/upload/image/jpg/c7cafaac33ce412dbf6b54cdcb968869.jpg",
"https://oss.5rs.me/oss/upload/image/jpg/5a5efece215f44b593082fd5acb1ba6a.jpg",
"https://oss.5rs.me/oss/upload/image/jpg/a5130474001744d39a953c264b6f2b50.jpg",
"https://oss.5rs.me/oss/upload/image/jpg/0c8b292f2f4a462a8eb15498f3134bdc.jpg",
"https://oss.5rs.me/oss/upload/image/jpg/e52aa27710b04814ad72e26f24672c3e.jpg",
"https://oss.5rs.me/oss/upload/image/jpg/05de1499008949cb923d9b4f069cd063.jpg",
"https://oss.5rs.me/oss/upload/image/jpg/5d029cdb3c574d2ab90cb8f621126788.jpg",
"https://oss.5rs.me/oss/upload/image/jpg/be4cf4579c614fc6bcf6eecf768c77f8.jpg",
"https://oss.5rs.me/oss/upload/image/jpg/9d8a34ec22bb4a029b0d3bcf3d01c678.jpg",
"https://oss.5rs.me/oss/upload/image/jpg/b225c12aea284be5916d186cc6b3527c.jpg",
"https://oss.5rs.me/oss/upload/image/jpg/76dffe5833564acc980a52451c0f30c8.jpg",
"https://oss.5rs.me/oss/upload/image/jpg/1515fa78369d4b1b94b4833d46fad7b8.jpg",
"https://oss.5rs.me/oss/upload/image/jpg/937747a210894a06af9471b14a31473c.jpg",
"https://oss.5rs.me/oss/upload/image/jpg/6be030a556994cb693f22a94cec4a971.jpg",
"https://oss.5rs.me/oss/upload/image/jpg/bd71e3cf4ea74f26824007ece26d0ddf.jpg",
"https://oss.5rs.me/oss/upload/image/jpg/56a53ea3eda347d4a89bd2ecf9aef013.jpg",
"https://oss.5rs.me/oss/upload/image/jpg/68a2e52a89b6470ebcc2aae0ee17d476.jpg",
"https://oss.5rs.me/oss/upload/image/jpg/04ea6a300a114807b2101ac949b7590a.jpg",
"https://oss.5rs.me/oss/upload/image/jpg/a6049fbf9bdb4c7097b80751932d4820.jpg",
"https://oss.5rs.me/oss/upload/image/jpg/611f1fce1b894749a2a67bcb19863e89.jpg",
"https://oss.5rs.me/oss/upload/image/jpg/4beb1075c99d4f8688208a676d236861.jpg",
"https://oss.5rs.me/oss/upload/image/jpg/cc126b48d7ba4e4a9f13a4f891eebedf.jpg",
"https://oss.5rs.me/oss/upload/image/jpg/c2d331e1f25a4ffeb34992712e4155c7.jpg",
"https://oss.5rs.me/oss/upload/image/jpg/e5387066120842cd85c12ebcbfd8d93f.jpg",
"https://oss.5rs.me/oss/upload/image/jpg/5a922de5f11e4ada92fec367716a257d.jpg",
"https://oss.5rs.me/oss/upload/image/jpg/0e093bce8d684b29b85fd6184af67ef7.jpg",
"https://oss.5rs.me/oss/upload/image/jpg/5d6a1cc42a35464293cb63b89b3271e7.jpg",
"https://oss.5rs.me/oss/upload/image/jpg/9ad9b7af4aa840ba83485c2c9cfbc861.jpg",
"https://oss.5rs.me/oss/upload/image/jpg/58bc326f3c374abe8a76a6edabf6c8e8.jpg",
"https://oss.5rs.me/oss/upload/image/jpg/93dbbd4882984930b40018aba95a5fc8.jpg",
"https://oss.5rs.me/oss/upload/image/jpg/8971ad7ff7394b10a496e2a20f220811.jpg",
"https://oss.5rs.me/oss/upload/image/jpg/63fdae8b3c7d42b59ad2caa696c759a9.jpg",
"https://oss.5rs.me/oss/upload/image/jpg/a15dd9799e044c028596fa9dc7a8a65e.jpg",
"https://oss.5rs.me/oss/upload/image/jpg/84a635285e9e4fae930a0e542b48c17b.jpg",
"https://oss.5rs.me/oss/upload/image/jpg/5d85b6e07e094030a0851e37627961c3.jpg",
"https://oss.5rs.me/oss/upload/image/jpg/54ad45ae8ca94dffb53599420b3934ef.jpg",
"https://oss.5rs.me/oss/upload/image/jpg/27e014bf12c34028821703fc873b0d7b.jpg",
"https://oss.5rs.me/oss/upload/image/jpg/5ea14cca8fbc4bbcba7b5847d7db95a7.jpg",
"https://oss.5rs.me/oss/upload/image/jpg/c4b44c4d33e74f58b25be7c1b065a3ec.jpg",
"https://oss.5rs.me/oss/upload/image/jpg/1daf5b240f64444c9a9f723203a46d31.jpg",
"https://oss.5rs.me/oss/upload/image/jpg/bfd05d7239174fa88c1a02fd10ddfe23.jpg",
"https://oss.5rs.me/oss/upload/image/jpg/1f3f34a0101646b4beab8b359139f8d9.jpg",
"https://oss.5rs.me/oss/upload/image/jpg/5fca5466fde74ac3aa68282d02fbc49c.jpg",
"https://oss.5rs.me/oss/upload/image/jpg/b07f4f25a1ea49a3b2941563e49ab98a.jpg",
"https://oss.5rs.me/oss/upload/image/jpg/76ec59b91eb54c9cb0992bb9db554d5e.jpg",
"https://oss.5rs.me/oss/upload/image/jpg/7cdf4f671c55463d806906b3136f488c.jpg",
"https://oss.5rs.me/oss/upload/image/jpg/9a334914f3284b6584aa853b20637908.jpg",
"https://oss.5rs.me/oss/upload/image/jpg/9b8b139694df41ada6af64af78361831.jpg",
"https://oss.5rs.me/oss/upload/image/jpg/a9f3dc95a7724fcc925c3ab963f66e4d.jpg",
"https://oss.5rs.me/oss/upload/image/jpg/07794c9246474aa58b7c22dec149b102.jpg",
"https://oss.5rs.me/oss/upload/image/jpg/033ada5f3df24cb193487ce5c325368d.jpg",
"https://oss.5rs.me/oss/upload/image/jpg/5d545cbbea674b11a1cfa88b56e763ac.jpg",
"https://oss.5rs.me/oss/upload/image/jpg/2d1404e4a65c4267ad07506c28c8d95e.jpg",
"https://oss.5rs.me/oss/upload/image/jpg/a0ce9a2815da4e6aa468e6384aa5073c.jpg",
"https://oss.5rs.me/oss/upload/image/jpg/a4dcee8850e0482ba3ba3b59cfd1b68f.jpg",
"https://oss.5rs.me/oss/upload/image/jpg/4850c8f8eb2e4cf5839b375d90fd0f57.jpg",
"https://oss.5rs.me/oss/upload/image/jpg/99ffd32e077a427bbc6871ce418b09dc.jpg",
"https://oss.5rs.me/oss/upload/image/jpg/f1ef53d0ba934e0f965ac70d9c8b5a89.jpg",
"https://oss.5rs.me/oss/upload/image/jpg/a927082e706446c19079971e81338c19.jpg",
"https://oss.5rs.me/oss/upload/image/jpg/224582917734415da4ff7643737444eb.jpg",
"https://oss.5rs.me/oss/upload/image/jpg/64514374c3784edfb3eed9501aa70fe4.jpg",
"https://oss.5rs.me/oss/upload/image/jpg/e80bf344d2d64ac1a8e697c3304af371.jpg",
"https://oss.5rs.me/oss/upload/image/jpg/d1ba7823193846609dc00f2c1661e693.jpg",
"https://oss.5rs.me/oss/upload/image/jpg/84f9f400a6e645dabf99df60201c269b.jpg",
"https://oss.5rs.me/oss/upload/image/jpg/f9790b6747d846cf8d1d1edabbae18c0.jpg",
"https://oss.5rs.me/oss/upload/image/jpg/aff7bdad64644a6f93db729b6aee9627.jpg",
"https://oss.5rs.me/oss/upload/image/jpg/23d89fee946040bd8b004bf3de0f3d38.jpg",
"https://oss.5rs.me/oss/upload/image/jpg/983d05134c1e4c718f7ca541b92fa1df.jpg",
"https://oss.5rs.me/oss/upload/image/jpg/15cf9fd35f044e65807663d52d4bd37e.jpg");
/**
* 随机获取指定数量头像
* @return
*/
public static List<String> getRandomHeadUrl(int num) {
List<String> headUrls = Lists.newArrayList();
for (int i = 0; i < num; i++) {
headUrls.add(DEFAULT_HEADURL.get(RANDOM.nextInt(DEFAULT_HEADURL.size())));
}
return headUrls;
}
public enum BookKeywordAuditEnum { public enum BookKeywordAuditEnum {
......
pcloud-service-book/src/main/java/com/pcloud/book/group/biz/impl/BookGroupClassifyBizImpl.java
package com.pcloud.book.group.biz.impl; package com.pcloud.book.group.biz.impl;
import com.google.common.collect.Lists;
import com.alibaba.fastjson.JSONObject;
import com.pcloud.book.base.exception.BookBizException; import com.pcloud.book.base.exception.BookBizException;
import com.pcloud.book.book.constant.BookConstant; import com.pcloud.book.book.constant.BookConstant;
import com.pcloud.book.consumer.common.ExportConsr; import com.pcloud.book.consumer.common.ExportConsr;
...@@ -964,13 +961,7 @@ public class BookGroupClassifyBizImpl implements BookGroupClassifyBiz { ...@@ -964,13 +961,7 @@ public class BookGroupClassifyBizImpl implements BookGroupClassifyBiz {
if (groupQrcodeInfoDTO != null) { if (groupQrcodeInfoDTO != null) {
listClassify4WechatVO.setUserNumber(groupQrcodeInfoDTO.getUserNumber()); listClassify4WechatVO.setUserNumber(groupQrcodeInfoDTO.getUserNumber());
listClassify4WechatVO.setGroupSeq(groupQrcodeInfoDTO.getGroupSeq()); listClassify4WechatVO.setGroupSeq(groupQrcodeInfoDTO.getGroupSeq());
List<String> headUrls = Lists.newArrayList(); List<String> headUrls = BookConstant.getRandomHeadUrl(groupQrcodeInfoDTO.getUserNumber() > 9 ? 9 : groupQrcodeInfoDTO.getUserNumber());
try {
JSONObject.parseArray(groupQrcodeInfoDTO.getQrcodeHeadUrl(), String.class);
} catch (Exception e) {
headUrls.addAll(BookConstant.DEFAULT_HEADURL);
log.error("===[setGroupQrcodeInfo] JSONObject.parseArray QrcodeHeadUrl:{} error:{}===", groupQrcodeInfoDTO.getQrcodeHeadUrl(), e.getMessage());
}
listClassify4WechatVO.setHeadUrl(headUrls); listClassify4WechatVO.setHeadUrl(headUrls);
} }
} }
......
pcloud-service-book/src/main/java/com/pcloud/book/group/handler/PushBookGroupUpdateHandler.java
...@@ -2,14 +2,16 @@ package com.pcloud.book.group.handler; ...@@ -2,14 +2,16 @@ package com.pcloud.book.group.handler;
import com.pcloud.book.group.biz.BookGroupBiz; import com.pcloud.book.group.biz.BookGroupBiz;
import com.pcloud.common.utils.DateUtils; import com.pcloud.common.utils.DateUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import javax.annotation.PostConstruct;
import java.util.Random; import java.util.Random;
import javax.annotation.PostConstruct;
/** /**
* @Description 启动时开始推送1v1更新 * @Description 启动时开始推送1v1更新
* @Author ruansiyuan * @Author ruansiyuan
...@@ -38,7 +40,6 @@ public class PushBookGroupUpdateHandler { ...@@ -38,7 +40,6 @@ public class PushBookGroupUpdateHandler {
if (isInTime) { if (isInTime) {
pushBookGroupUpdateHandler.bookGroupBiz.pushBookGroupUpdate(); pushBookGroupUpdateHandler.bookGroupBiz.pushBookGroupUpdate();
} }
Thread.currentThread();
Thread.sleep(sleepMillis); Thread.sleep(sleepMillis);
} catch (Throwable e) { } catch (Throwable e) {
LOGGER.error("启动时开始推送1v1更新异常" + e.getMessage(), e); LOGGER.error("启动时开始推送1v1更新异常" + e.getMessage(), e);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment