From 4ebe7c447e964e1b3ead12abb1d95b75faf67426 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 27 二月 2021 15:22:46 +0800
Subject: [PATCH] PPTV完善，兼容多个系统的框架搭建
---
src/main/java/com/yeshi/buwan/controller/parser/UserParser.java | 60 +++++++++++++++++++++++++++++++-----------------------------
1 files changed, 31 insertions(+), 29 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 20c91bc..04bc3da 100644
--- a/src/main/java/com/yeshi/buwan/controller/parser/UserParser.java
+++ b/src/main/java/com/yeshi/buwan/controller/parser/UserParser.java
@@ -19,6 +19,7 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
import java.io.File;
import java.io.PrintWriter;
import java.util.*;
@@ -259,7 +260,7 @@
object.put("data", array);
out.print(JsonUtil.loadTrueJson(object.toString()));
} else {
- List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(acceptData.getPlatform(), acceptData.getVersion());
+ List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(detailSystem, acceptData.getVersion());
String cacheMD5 = "0";
if (resourceList != null && resourceList.size() > 0)
for (Long l : resourceList)
@@ -359,7 +360,7 @@
object.put("data", array);
out.print(JsonUtil.loadTrueJson(object.toString()));
} else {
- List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(acceptData.getPlatform(), acceptData.getVersion());
+ List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(detailSystem, acceptData.getVersion());
String cacheMD5 = "0";
if (resourceList != null && resourceList.size() > 0)
for (Long l : resourceList)
@@ -393,23 +394,23 @@
i--;
}
}
-
- List<String> keyList = banQuanService.getBanQuanKeyListAll(Integer.parseInt(detailSystem.getId()));
- for (int i = 0; i < list.size(); i++) {
-
- boolean delete = false;
- for (int j = 0; j < keyList.size(); j++) {
- if (list.get(i).getName().contains(keyList.get(j))) {
- delete = true;
- break;
- }
- }
- if (delete) {
- list.remove(i);
- i--;
- }
-
- }
+//
+// List<String> keyList = banQuanService.getBanQuanKeyListAll(Integer.parseInt(detailSystem.getId()));
+// for (int i = 0; i < list.size(); i++) {
+//
+// boolean delete = false;
+// for (int j = 0; j < keyList.size(); j++) {
+// if (list.get(i).getName().contains(keyList.get(j))) {
+// delete = true;
+// break;
+// }
+// }
+// if (delete) {
+// list.remove(i);
+// i--;
+// }
+//
+// }
for (int i = 0; i < list.size(); i++) {
((VideoInfo) list.get(i))
@@ -457,7 +458,7 @@
DetailSystem ds = systemService.getDetailSystemByPackage(acceptData.getPackageName());
- List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(acceptData.getPlatform(), acceptData.getVersion());
+ List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(acceptData.getDetailSystem(), acceptData.getVersion());
List<VideoInfo> list1 = StringUtil.isNullOrEmpty(videoId)
? recommendService.guessLikeList(ds.getId(), 4, resourceList, CacheUtil.getMD5Long(resourceList))
: recommendService.guessLikeList(ds.getId(), 4, videoId, resourceList,
@@ -639,7 +640,7 @@
return;
}
- List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(acceptData.getPlatform(), acceptData.getVersion());
+ List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(acceptData.getDetailSystem(), acceptData.getVersion());
DetailSystem ds = systemService.getDetailSystemByPackage(acceptData.getPackageName());
List<VideoInfo> list = recommendService.getRelativeVideoList(ds.getId(), 4, videoId, resourceList,
@@ -678,7 +679,7 @@
return;
}
- List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(acceptData.getPlatform(), acceptData.getVersion());
+ List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(acceptData.getDetailSystem(), acceptData.getVersion());
DetailSystem ds = systemService.getDetailSystemByPackage(acceptData.getPackageName());
List<VideoInfo> list1 = recommendService.peopleSee(ds.getId(), 4, videoId, resourceList,
@@ -721,6 +722,7 @@
String pwd = request.getParameter("Pwd");// 瀵嗙爜
String nickName = request.getParameter("NickName");// 鏄电О
String code = request.getParameter("VerifyCode");// 楠岃瘉鐮�
+ String portrait = request.getParameter("Portrait");// 楠岃瘉鐮�
if (StringUtil.isNullOrEmpty(account)) {
@@ -763,7 +765,7 @@
user.setName(nickName);
user.setOpenid(account);
user.setPwd(StringUtil.Md5(pwd));
- user.setPortrait(savePortrait(request));
+ user.setPortrait(savePortrait(portrait, request.getSession()));
user.setIpinfo(ip + ":" + port);
String result = userService.registerByEmail(user);
@@ -852,6 +854,7 @@
String birthDay = request.getParameter("BirthDay");// 鐢熸棩
String personalSign = request.getParameter("PersonalSign");// 涓�х鍚�
String loginUid = request.getParameter("LoginUid");// 涓�х鍚�
+ String portrait = request.getParameter("Portrait");
if (StringUtil.isNullOrEmpty(loginUid)) {
out.print(JsonUtil.loadFalseJson("璇蜂笂浼燣oginUid"));
return;
@@ -862,7 +865,7 @@
if (user != null) {
if (!StringUtil.isNullOrEmpty(nickName))
user.setName(nickName);
- String potrait = savePortrait(request);
+ String potrait = savePortrait(portrait, request.getSession());
if (!StringUtil.isNullOrEmpty(potrait))
user.setPortrait(potrait);
if (!StringUtil.isNullOrEmpty(sex))
@@ -972,16 +975,15 @@
}
- private String savePortrait(HttpServletRequest request) {
- String base64 = request.getParameter("Portrait");
+ public static String savePortrait(String base64, HttpSession session) {
if (StringUtil.isNullOrEmpty(base64))
return "";
String fileName = "portrait_" + System.currentTimeMillis() + ".jpg";
// 瀹氫箟涓婁紶璺緞
- String path = request.getSession().getServletContext().getRealPath("upload") + "/" + fileName;
- if (!new File(request.getSession().getServletContext().getRealPath("upload") + "/").exists())
- new File(request.getSession().getServletContext().getRealPath("upload") + "/").mkdirs();
+ String path = session.getServletContext().getRealPath("upload") + "/" + fileName;
+ if (!new File(session.getServletContext().getRealPath("upload") + "/").exists())
+ new File(session.getServletContext().getRealPath("upload") + "/").mkdirs();
boolean isS = StringUtil.generateImageFromBase64(base64, path);
if (!isS)
return "";
--
Gitblit v1.8.0