From cdc3690a0354e01b44852f4c9da3b7204128d2eb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 13 八月 2021 18:46:36 +0800
Subject: [PATCH] 增加苹果内购回调日志，兼容苹果内购
---
src/main/java/com/yeshi/buwan/controller/parser/UserParser.java | 83 +++++++++++++++++++++++++++++++++++++++++
1 files changed, 82 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/yeshi/buwan/controller/parser/UserParser.java b/src/main/java/com/yeshi/buwan/controller/parser/UserParser.java
index 7c90b8b..d3450b0 100644
--- a/src/main/java/com/yeshi/buwan/controller/parser/UserParser.java
+++ b/src/main/java/com/yeshi/buwan/controller/parser/UserParser.java
@@ -5,12 +5,14 @@
import com.yeshi.buwan.domain.*;
import com.yeshi.buwan.domain.Collection;
import com.yeshi.buwan.domain.solr.SolrAlbumVideo;
+import com.yeshi.buwan.domain.solr.SolrShortVideo;
import com.yeshi.buwan.domain.system.DetailSystem;
import com.yeshi.buwan.domain.system.DetailSystemConfig;
import com.yeshi.buwan.domain.user.LoginUser;
import com.yeshi.buwan.domain.video.InternetSearchVideo;
import com.yeshi.buwan.dto.log.BaseLog;
import com.yeshi.buwan.dto.search.SolrResultDTO;
+import com.yeshi.buwan.dto.search.SolrShortVideoSearchFilter;
import com.yeshi.buwan.dto.search.SolrVideoSearchFilter;
import com.yeshi.buwan.dto.user.LoginInfoDto;
import com.yeshi.buwan.exception.user.LoginUserException;
@@ -21,15 +23,18 @@
import com.yeshi.buwan.service.inter.system.SystemConfigService;
import com.yeshi.buwan.service.manager.search.SolrAlbumVideoDataManager;
import com.yeshi.buwan.service.manager.search.SolrInternetSearchVideoDataManager;
+import com.yeshi.buwan.service.manager.search.SolrShortVideoDataManager;
import com.yeshi.buwan.util.*;
import com.yeshi.buwan.util.JuHe.VideoResourceUtil;
import com.yeshi.buwan.util.annotation.RequireUid;
import com.yeshi.buwan.util.email.MailSenderUtil;
import com.yeshi.buwan.util.factory.VideoInfoFactory;
+import com.yeshi.buwan.util.factory.vo.UserInfoVOFactory;
import com.yeshi.buwan.util.log.LoggerUtil;
import com.yeshi.buwan.util.log.UserActiveLogFactory;
import com.yeshi.buwan.util.video.VideoCategoryConstant;
import com.yeshi.buwan.util.video.VideoConstant;
+import com.yeshi.buwan.util.video.shortvideo.ShortVideoUtil;
import com.yeshi.buwan.vo.AcceptData;
import com.yeshi.buwan.vo.video.VideoListResultVO;
import net.sf.json.JSONArray;
@@ -79,6 +84,10 @@
private SolrAlbumVideoDataManager solrDataManager;
@Resource
private SolrInternetSearchVideoDataManager solrInternetSearchVideoDataManager;
+
+ @Resource
+ private SolrShortVideoDataManager solrShortVideoDataManager;
+
@Resource
private ConfigParser configParser;
@Resource
@@ -563,7 +572,7 @@
int rootType = internetSearchVideo.getRootType();
SolrVideoSearchFilter filter = new SolrVideoSearchFilter();
filter.setVideoType(rootType);
- filter.setResourceIds(new String[]{PPTVUtil.RESOURCE_ID + ""});
+ filter.setResourceIds(Arrays.asList(new String[]{PPTVUtil.RESOURCE_ID + ""}));
filter.setSortKey("watchcount");
SolrResultDTO dto = solrDataManager.find(filter, 1, 20);
List<SolrAlbumVideo> solrAlbumVideoList = new ArrayList<>();
@@ -608,11 +617,46 @@
}
+
+ private void guessLikeForShortVideo(AcceptData acceptData, String videoId, PrintWriter out) {
+ SolrShortVideo solrShortVideo = solrShortVideoDataManager.findOne(videoId);
+ SolrShortVideoSearchFilter filter = new SolrShortVideoSearchFilter();
+ filter.setRootVideoType(solrShortVideo.getRootVideoType());
+ if (solrShortVideo.getArea() != null) {
+ filter.setAreas(Arrays.asList(solrShortVideo.getArea().split(",")));
+ }
+
+ SolrResultDTO dto = solrShortVideoDataManager.find(filter, 1, 10);
+
+
+ JSONObject object = new JSONObject();
+ object.put("count", dto.getVideoList().size() + "");
+ JSONArray array = new JSONArray();
+
+ for (int i = 0; i < dto.getVideoList().size(); i++) {
+ SolrShortVideo temp = (SolrShortVideo) dto.getVideoList().get(i);
+ if (temp.getId().equalsIgnoreCase(videoId))
+ continue;
+ array.add(StringUtil.outPutResultJson(VideoInfoFactory.create(temp)));
+ }
+ if (array.size() % 2 != 0) {
+ array.remove(array.size() - 1);
+ }
+
+ object.put("data", array);
+ out.print(JsonUtil.loadTrueJson(object.toString()));
+ }
+
// 鐚滀綘鍠滄
public void guessLike(AcceptData acceptData, HttpServletRequest request, PrintWriter out) {
String videoId = request.getParameter("VideoId");
if (!NumberUtil.isNumeric(videoId)) {
+ if (ShortVideoUtil.isShortVideoId(videoId)) {
+ guessLikeForShortVideo(acceptData, videoId, out);
+ return;
+ }
+
guessLikeForInternetSearch(acceptData, videoId, out);
return;
}
@@ -905,6 +949,35 @@
}
+
+ private void getRelativeVideosForShortVideo(AcceptData acceptData, String videoId, PrintWriter out) {
+ SolrShortVideo solrShortVideo = solrShortVideoDataManager.findOne(videoId);
+ SolrShortVideoSearchFilter filter = new SolrShortVideoSearchFilter();
+ filter.setKey(solrShortVideo.getName());
+ filter.setFuzzy(true);
+
+ SolrResultDTO dto = solrShortVideoDataManager.find(filter, 1, 10);
+
+
+ JSONObject object = new JSONObject();
+ object.put("count", dto.getVideoList().size() + "");
+ JSONArray array = new JSONArray();
+
+ for (int i = 0; i < dto.getVideoList().size(); i++) {
+ SolrShortVideo temp = (SolrShortVideo) dto.getVideoList().get(i);
+ if (temp.getId().equalsIgnoreCase(videoId))
+ continue;
+ array.add(StringUtil.outPutResultJson(VideoInfoFactory.create(temp)));
+ }
+ if (array.size() % 2 != 0) {
+ array.remove(array.size() - 1);
+ }
+
+ object.put("data", array);
+ out.print(JsonUtil.loadTrueJson(object.toString()));
+ }
+
+
/**
* 鐩稿叧瑙嗛
*
@@ -919,6 +992,12 @@
}
if (!NumberUtil.isNumeric(videoId)) {
+ if (ShortVideoUtil.isShortVideoId(videoId)) {
+ getRelativeVideosForShortVideo(acceptData, videoId, out);
+ return;
+ }
+
+
getRelativeVideosForInternetSearch(acceptData, videoId, out);
return;
}
@@ -1187,6 +1266,8 @@
// 娉ㄥ唽 --鐢ㄦ埛鍚�,鏄电О,瀵嗙爜
LoginUser user = userService.getLoginUser(loginUid);
+ //闅愯棌user涓殑email
+ user.setEmail(UserInfoVOFactory.getHiddenEmail(user.getEmail()));
if (user.getPortrait() != null && !user.getPortrait().startsWith("http"))
user.setPortrait("http://" + Constant.WEBSITE + "/BuWan" + user.getPortrait());
out.print(JsonUtil.loadTrueJson(StringUtil.outPutResultJson(user)));
--
Gitblit v1.8.0