From 4011b8d0b377af33e2bc435f7726329630d706cb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 02 三月 2021 18:28:52 +0800
Subject: [PATCH] 搜索引擎接口更新
---
src/main/java/com/yeshi/buwan/controller/parser/UserParser.java | 111 ++++++++++++++++++++++++++++---------------------------
1 files changed, 57 insertions(+), 54 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..7710f05 100644
--- a/src/main/java/com/yeshi/buwan/controller/parser/UserParser.java
+++ b/src/main/java/com/yeshi/buwan/controller/parser/UserParser.java
@@ -3,6 +3,9 @@
import com.yeshi.buwan.domain.*;
import com.yeshi.buwan.domain.Collection;
import com.yeshi.buwan.domain.user.LoginUser;
+import com.yeshi.buwan.dto.user.LoginInfoDto;
+import com.yeshi.buwan.exception.user.LoginUserException;
+import com.yeshi.buwan.exception.user.RegisterUserException;
import com.yeshi.buwan.service.imp.*;
import com.yeshi.buwan.service.manager.SolrAlbumDataManager;
import com.yeshi.buwan.util.*;
@@ -19,6 +22,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 +263,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 +363,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 +397,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 +461,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 +643,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 +682,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 +725,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)) {
@@ -753,24 +758,22 @@
if (StringUtil.isNullOrEmpty(nickName))
nickName = "鏃犲悕姘�";
- DetailSystem ds = systemService.getDetailSystemByPackage(acceptData.getPackageName());
- // 娉ㄥ唽 --鐢ㄦ埛鍚�,鏄电О,瀵嗙爜
- LoginUser user = new LoginUser();
- user.setCreatetime(System.currentTimeMillis() + "");
- user.setDetailsystem(ds.getId());
- user.setDevice(acceptData.getDevice());
- user.setLoginType(3);
- user.setName(nickName);
- user.setOpenid(account);
- user.setPwd(StringUtil.Md5(pwd));
- user.setPortrait(savePortrait(request));
- user.setIpinfo(ip + ":" + port);
- String result = userService.registerByEmail(user);
- if (result.contains("鎴愬姛"))
+ LoginInfoDto loginInfoDto = new LoginInfoDto();
+ loginInfoDto.setEmail(account);
+ loginInfoDto.setSystemId(acceptData.getDetailSystem().getSystem().getId());
+ loginInfoDto.setLoginType(LoginUser.LOGIN_TYPE_EMAIL);
+ loginInfoDto.setPwd(StringUtil.Md5(pwd));
+ loginInfoDto.setIpInfo(ip + ":" + port);
+ loginInfoDto.setNickName(nickName);
+
+
+ try {
+ userService.register(loginInfoDto);
out.print(JsonUtil.loadTrueJson("娉ㄥ唽鎴愬姛"));
- else
- out.print(JsonUtil.loadFalseJson(result));
+ } catch (RegisterUserException e) {
+ out.print(JsonUtil.loadFalseJson(e.getMessage()));
+ }
}
/**
@@ -827,17 +830,17 @@
// systemService.getDetailSystemByPackage(packageName);
// 娉ㄥ唽 --鐢ㄦ埛鍚�,鏄电О,瀵嗙爜
- LoginUser user = new LoginUser();
- user.setDevice(acceptData.getDevice());
- user.setLoginType(3);
- user.setOpenid(account);
- user.setPwd(StringUtil.Md5(pwd));
- user.setPortrait("http://buwan-1255749512.file.myqcloud.com/resource/ic_portrait_default.png");
- user = userService.loginByEmail(user);
- if (user == null || user.getState() != LoginUser.STATE_NORMAL)
- out.print(JsonUtil.loadFalseJson("璐﹀彿鎴栧瘑鐮侀敊璇�"));
- else
+ LoginInfoDto loginInfoDto = new LoginInfoDto();
+ loginInfoDto.setLoginType(LoginUser.LOGIN_TYPE_EMAIL);
+ loginInfoDto.setSystemId(acceptData.getDetailSystem().getSystem().getId());
+ loginInfoDto.setEmail(account);
+ loginInfoDto.setPwd(StringUtil.Md5(pwd));
+ try {
+ LoginUser user = userService.login(loginInfoDto);
out.print(JsonUtil.loadTrueJson(StringUtil.outPutResultJson(user)));
+ } catch (LoginUserException e) {
+ out.print(JsonUtil.loadFalseJson(e.getMessage()));
+ }
}
/**
@@ -852,6 +855,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 +866,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 +976,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