From cd7767932dddeaf6d9c73a83d4a9b38f0341b77f Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 28 一月 2022 12:46:17 +0800
Subject: [PATCH] bug修复
---
src/main/java/com/yeshi/buwan/controller/parser/UserParser.java | 251 ++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 231 insertions(+), 20 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 9ec97b7..f41aa54 100644
--- a/src/main/java/com/yeshi/buwan/controller/parser/UserParser.java
+++ b/src/main/java/com/yeshi/buwan/controller/parser/UserParser.java
@@ -5,36 +5,46 @@
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.SMSException;
import com.yeshi.buwan.exception.user.LoginUserException;
import com.yeshi.buwan.exception.user.RegisterUserException;
-import com.yeshi.buwan.pptv.PPTVUtil;
+import com.yeshi.buwan.service.inter.SMSService;
+import com.yeshi.buwan.videos.pptv.PPTVUtil;
import com.yeshi.buwan.service.imp.*;
import com.yeshi.buwan.service.inter.juhe.InternetSearchVideoService;
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.VideoUtil;
import com.yeshi.buwan.vo.AcceptData;
import com.yeshi.buwan.vo.video.VideoListResultVO;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Controller;
+import redis.clients.jedis.Jedis;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
@@ -46,6 +56,9 @@
@Controller
public class UserParser {
+
+ Logger searchKeyLogger = LoggerFactory.getLogger("searchKey");
+
@Resource
private SystemService systemService;
@@ -73,10 +86,20 @@
private SolrAlbumVideoDataManager solrDataManager;
@Resource
private SolrInternetSearchVideoDataManager solrInternetSearchVideoDataManager;
+
+ @Resource
+ private SolrShortVideoDataManager solrShortVideoDataManager;
+
@Resource
private ConfigParser configParser;
@Resource
private SystemConfigService systemConfigService;
+
+ @Resource
+ private RedisManager redisManager;
+
+ @Resource
+ private SMSService smsService;
public void getUid(AcceptData acceptData, HttpServletRequest request, PrintWriter out) {
DetailSystem detailSystem = systemService.getDetailSystemByPackage(acceptData.getPackageName());
@@ -87,7 +110,7 @@
out.print(JsonUtil.loadFalseJson("鑾峰彇uid澶辫触"));
return;
} else {
- Map<String, String> map = configService.getConfigAsMap(detailSystem, acceptData.getVersion());
+ Map<String, String> map = configService.getConfigAsMap(acceptData.getChildDetailSystem(), acceptData.getVersion());
ShareContent share = shareService.getShareContent(detailSystem.getId());
JSONObject object = new JSONObject();
object.put("Uid", uid);
@@ -312,7 +335,7 @@
object.put("data", array);
out.print(JsonUtil.loadTrueJson(object.toString()));
} else {
- List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(detailSystem, acceptData.getVersion(),acceptData.getChannel());
+ List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(detailSystem, acceptData.getVersion(), acceptData.getChannel());
String cacheMD5 = "0";
if (resourceList != null && resourceList.size() > 0)
for (Long l : resourceList)
@@ -399,6 +422,30 @@
return;
}
+ final String id = StringUtil.Md5(String.format("%s#%s#%s#%s", acceptData.getDetailSystem().getId(), acceptData.getDevice(), key, type));
+ ThreadUtil.run(new Runnable() {
+ @Override
+ public void run() {
+ String redisKey = "search-" + id;
+ Jedis jedis = redisManager.getJedis();
+ try {
+ //閲嶅璇锋眰杩囨护
+ if (jedis.setnx(redisKey, "1") <= 0) {
+ return;
+ }
+ jedis.expire(redisKey, 120);
+ JSONObject searchData = new JSONObject();
+ searchData.put("key", key);
+ searchData.put("type", type);
+ searchData.put("detailSystemId", acceptData.getDetailSystem().getId());
+ searchData.put("device", acceptData.getDevice());
+ searchData.put("createTime", System.currentTimeMillis());
+ searchKeyLogger.info(new Gson().toJson(searchData));
+ } finally {
+ jedis.close();
+ }
+ }
+ });
LoggerUtil.getUserActiveLogger().info(UserActiveLogFactory.createSearch(new BaseLog(acceptData, ""), key, type));
int pageIndex = StringUtil.getPage(page);
@@ -406,7 +453,7 @@
pageIndex = 1;
}
- List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(acceptData.getDetailSystem(), acceptData.getVersion(),acceptData.getChannel());
+ List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(acceptData.getDetailSystem(), acceptData.getVersion(), acceptData.getChannel());
String cacheMD5 = "0";
@@ -496,11 +543,13 @@
}
}
-
- vt = new VideoType();
- vt.setId(Constant.SEARCH_RESULT_TYPE_HIGH_DEFINITION);
- vt.setName("楂樻竻");
- typeList.add(vt);
+ //闊╁墽涓嶈繑鍥為珮娓�
+ if (!acceptData.getDetailSystem().getId().equalsIgnoreCase("48")) {
+ vt = new VideoType();
+ vt.setId(Constant.SEARCH_RESULT_TYPE_HIGH_DEFINITION);
+ vt.setName("楂樻竻");
+ typeList.add(vt);
+ }
JSONArray array1 = new JSONArray();
@@ -530,7 +579,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<>();
@@ -575,18 +624,53 @@
}
+
+ 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)) {
- guessLikeForInternetSearch(acceptData, videoId, out);
- return;
+ int fromtype = VideoUtil.getVideoFromType(videoId);
+ switch (fromtype) {
+ case HomeVideo.FROM_TYPE_INTERNET:
+ guessLikeForInternetSearch(acceptData, videoId, out);
+ return;
+ case HomeVideo.FROM_TYPE_SHORT:
+ guessLikeForShortVideo(acceptData, videoId, out);
+ return;
}
DetailSystem ds = systemService.getDetailSystemByPackage(acceptData.getPackageName());
- List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(acceptData.getDetailSystem(), acceptData.getVersion(),acceptData.getChannel());
+ List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(acceptData.getDetailSystem(), acceptData.getVersion(), acceptData.getChannel());
List<VideoInfo> list1 = StringUtil.isNullOrEmpty(videoId)
? recommendService.guessLikeList(ds.getId(), 4, resourceList, CacheUtil.getMD5Long(resourceList))
: recommendService.guessLikeList(ds.getId(), 4, videoId, resourceList,
@@ -872,6 +956,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()));
+ }
+
+
/**
* 鐩稿叧瑙嗛
*
@@ -885,12 +998,17 @@
return;
}
- if (!NumberUtil.isNumeric(videoId)) {
- getRelativeVideosForInternetSearch(acceptData, videoId, out);
- return;
+ int fromtype = VideoUtil.getVideoFromType(videoId);
+ switch (fromtype) {
+ case HomeVideo.FROM_TYPE_INTERNET:
+ getRelativeVideosForInternetSearch(acceptData, videoId, out);
+ return;
+ case HomeVideo.FROM_TYPE_SHORT:
+ getRelativeVideosForShortVideo(acceptData, videoId, out);
+ return;
}
- List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(acceptData.getDetailSystem(), acceptData.getVersion(),acceptData.getChannel());
+ List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(acceptData.getDetailSystem(), acceptData.getVersion(), acceptData.getChannel());
DetailSystem ds = systemService.getDetailSystemByPackage(acceptData.getPackageName());
List<VideoInfo> list = recommendService.getRelativeVideoList(ds.getId(), 4, videoId, resourceList,
@@ -929,7 +1047,7 @@
return;
}
- List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(acceptData.getDetailSystem(), acceptData.getVersion(),acceptData.getChannel());
+ List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(acceptData.getDetailSystem(), acceptData.getVersion(), acceptData.getChannel());
DetailSystem ds = systemService.getDetailSystemByPackage(acceptData.getPackageName());
List<VideoInfo> list1 = recommendService.peopleSee(ds.getId(), 4, videoId, resourceList,
@@ -1055,13 +1173,41 @@
content = title;
}
- boolean isS = MailSenderUtil.sendEmail(account, "ysyz17784739772@126.com", "weikou2014", title,
+ boolean isS = MailSenderUtil.sendEmail(account, "app_yzm_zc@163.com", "KZKSRTEMDWEQRAQR", title,
content);
// }
// }).start();
out.print(JsonUtil.loadTrueJson("楠岃瘉鐮佸彂閫佹垚鍔�"));
}
+
+
+ public void sendSMSCode(AcceptData acceptData, HttpServletRequest request, PrintWriter out) {
+ String phone = request.getParameter("phone");
+
+ if (StringUtil.isNullOrEmpty(phone)) {
+ out.print(JsonUtil.loadFalseJson("鐢佃瘽鍙风爜涓嶈兘涓虹┖"));
+ return;
+ }
+
+ if (!StringUtil.isMobile(phone)) {
+ out.print(JsonUtil.loadFalseJson("鐢佃瘽鍙风爜鏍煎紡涓嶆纭�"));
+ return;
+ }
+
+ try {
+ smsService.sendLoginVCode(phone, 6,acceptData.getDetailSystem().getId(),acceptData.getVersion());
+ } catch (SMSException e) {
+ e.printStackTrace();
+ out.print(JsonUtil.loadFalseJson(e.getMessage()));
+ return;
+ } catch (Exception e) {
+ out.print(JsonUtil.loadFalseJson("鐭俊鍙戦�佸嚭閿欙紝璇风◢鍚庡啀璇�"));
+ return;
+ }
+ out.print(JsonUtil.loadTrueJson(""));
+ }
+
/**
* 鐧诲綍
@@ -1091,11 +1237,70 @@
loginInfoDto.setSystemId(acceptData.getDetailSystem().getSystem().getId());
loginInfoDto.setEmail(account);
loginInfoDto.setPwd(StringUtil.Md5(pwd));
+ loginInfoDto.setIpInfo(IPUtil.getRemotIP(request) + ":" + request.getRemotePort());
try {
LoginUser user = userService.login(loginInfoDto);
out.print(JsonUtil.loadTrueJson(StringUtil.outPutResultJson(user)));
} catch (LoginUserException e) {
out.print(JsonUtil.loadFalseJson(e.getMessage()));
+ }
+ }
+
+
+ /**
+ * 鐧诲綍
+ *
+ * @param request
+ * @param out
+ */
+ public void phoneLogin(AcceptData acceptData, HttpServletRequest request, PrintWriter out) {
+ String account = request.getParameter("phone");// 閭
+ String vcode = request.getParameter("code");// 瀵嗙爜
+ if (StringUtil.isNullOrEmpty(account)) {
+ out.print(JsonUtil.loadFalseJson("璇蜂笂浼犳墜鏈哄彿"));
+ return;
+ }
+
+ if (StringUtil.isNullOrEmpty(vcode)) {
+ out.print(JsonUtil.loadFalseJson("璇蜂笂浼犻獙璇佺爜"));
+ return;
+ }
+
+ if (!smsService.verifyLoginVCode(account, vcode,acceptData.getDetailSystem().getId(),acceptData.getVersion())) {
+ out.print(JsonUtil.loadFalseJson("楠岃瘉鐮侀敊璇�"));
+ return;
+ }
+
+ LoginInfoDto loginInfoDto = new LoginInfoDto();
+ loginInfoDto.setLoginType(LoginUser.LOGIN_TYPE_PHONE);
+ loginInfoDto.setSystemId(acceptData.getDetailSystem().getSystem().getId());
+ loginInfoDto.setPhone(account);
+ loginInfoDto.setSmsCode(vcode);
+ loginInfoDto.setIpInfo(IPUtil.getRemotIP(request) + ":" + request.getRemotePort());
+ try {
+ LoginUser user = userService.login(loginInfoDto);
+ out.print(JsonUtil.loadTrueJson(StringUtil.outPutResultJson(user)));
+ } catch (LoginUserException e) {
+ //鐢ㄦ埛涓嶅瓨鍦�
+ if (e.getCode() == LoginUserException.CODE_NO_USER) {
+ //娉ㄥ唽鐢ㄦ埛
+ try {
+ userService.register(loginInfoDto);
+ //娉ㄥ唽鎴愬姛锛屽紑濮嬬櫥褰�
+ try {
+ LoginUser user = userService.login(loginInfoDto);
+ out.print(JsonUtil.loadTrueJson(StringUtil.outPutResultJson(user)));
+ } catch (LoginUserException e2) {
+ out.print(JsonUtil.loadFalseJson("鐧诲綍鍑洪敊锛岃绋嶅悗鍐嶈瘯"));
+ }
+
+ } catch (RegisterUserException e1) {
+ e1.printStackTrace();
+ out.print(JsonUtil.loadFalseJson("鐧诲綍鍑洪敊锛岃绋嶅悗鍐嶈瘯"));
+ }
+ } else {
+ out.print(JsonUtil.loadFalseJson(e.getMessage()));
+ }
}
}
@@ -1154,6 +1359,12 @@
// 娉ㄥ唽 --鐢ㄦ埛鍚�,鏄电О,瀵嗙爜
LoginUser user = userService.getLoginUser(loginUid);
+ if (user.getState() != null && user.getState() == LoginUser.STATE_UNREGISTER) {
+ out.print(JsonUtil.loadFalseJson("璐︽埛宸叉敞閿�"));
+ return;
+ }
+ //闅愯棌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