From ef37d60710c252e1d8473e8ce779696d497e857f Mon Sep 17 00:00:00 2001
From: admin <2780501319@qq.com>
Date: 星期一, 29 三月 2021 23:59:56 +0800
Subject: [PATCH] 全网搜视频详情日志添加
---
src/main/java/com/yeshi/buwan/controller/parser/UserParser.java | 415 +++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 361 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 ac147d6..e4abe35 100644
--- a/src/main/java/com/yeshi/buwan/controller/parser/UserParser.java
+++ b/src/main/java/com/yeshi/buwan/controller/parser/UserParser.java
@@ -1,30 +1,53 @@
package com.yeshi.buwan.controller.parser;
import com.yeshi.buwan.domain.*;
+import com.yeshi.buwan.domain.Collection;
+import com.yeshi.buwan.domain.solr.SolrAlbumVideo;
+import com.yeshi.buwan.domain.system.DetailSystem;
+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.SolrVideoSearchFilter;
+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.pptv.PPTVUtil;
import com.yeshi.buwan.service.imp.*;
+import com.yeshi.buwan.service.inter.juhe.InternetSearchVideoService;
+import com.yeshi.buwan.service.manager.SolrAlbumVideoDataManager;
+import com.yeshi.buwan.service.manager.SolrInternetSearchVideoDataManager;
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.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.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 javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
import java.io.File;
import java.io.PrintWriter;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
@Controller
public class UserParser {
+
@Resource
private SystemService systemService;
@Resource
- private ConfigService configService;
+ private DetailSystemConfigService configService;
@Resource
private UserService userService;
@Resource
@@ -43,6 +66,12 @@
private BanQuanService banQuanService;
@Resource
private VideoInfoService videoInfoService;
+ @Resource
+ private SolrAlbumVideoDataManager solrDataManager;
+ @Resource
+ private SolrInternetSearchVideoDataManager solrInternetSearchVideoDataManager;
+ @Resource
+ private ConfigParser configParser;
public void getUid(AcceptData acceptData, HttpServletRequest request, PrintWriter out) {
DetailSystem detailSystem = systemService.getDetailSystemByPackage(acceptData.getPackageName());
@@ -53,13 +82,13 @@
out.print(JsonUtil.loadFalseJson("鑾峰彇uid澶辫触"));
return;
} else {
- Map<String, String> map = configService.getConfigAsMap(detailSystem,acceptData.getVersion());
+ Map<String, String> map = configService.getConfigAsMap(detailSystem, acceptData.getVersion());
ShareContent share = shareService.getShareContent(detailSystem.getId());
JSONObject object = new JSONObject();
object.put("Uid", uid);
object.put("Portrait", userInfo.getPortrait());
object.put("Nickname", userInfo.getNickname());
- object.put("TopIcon", map.get("top_icon"));
+
object.put("ZiXun", map.get("zixun_url"));
if (acceptData.getPlatform().equalsIgnoreCase("ios") && !"涓浗".equalsIgnoreCase(userInfo.getCountry()))// 姝ｅ湪瀹℃牳鐨勭増鏈�
object.put("CommentUrl", "");
@@ -80,7 +109,14 @@
object.put("WXShareIcon", map.get("wx_share_icon"));
object.put("WXShareUrl", map.get("wx_share_url"));
object.put("WXShareContent", map.get("wx_share_content"));
- object.put("TuiGuang", map.get("taobao_tuiguang"));
+
+ if ("qq".equalsIgnoreCase(acceptData.getChannel())) {
+ object.put("TopIcon", "");
+ object.put("TuiGuang", "");
+ } else {
+ object.put("TuiGuang", map.get("taobao_tuiguang"));
+ object.put("TopIcon", map.get("top_icon"));
+ }
object.put("SOHU_partner", detailSystem.getSohuPartner());
object.put("SOHU_key", detailSystem.getSohuKey());
@@ -102,12 +138,22 @@
object.put("shopurl", map.get("shopurl"));
object.put("copyplate", map.get("copy_plate"));
- // 鏄惁骞垮憡鐐瑰嚮涓嬭浇
- if ("huawei".equalsIgnoreCase(acceptData.getChannel())
- && acceptData.getVersion() >= Integer.parseInt(map.get("ad_click_download_version"))) {
+ //寮�鍏宠缃�
+ String channel = acceptData.getChannel().toLowerCase();
+ String adOpenSettings = map.get("ad_other_open_settings");
+ JSONObject adOpenSettingsJson = JSONObject.fromObject(adOpenSettings);
+
+ if (!adOpenSettingsJson.keySet().contains(channel.toLowerCase())) {
+ channel = "qq";
+ }
+
+ int closeVersion = adOpenSettingsJson.optInt(channel);
+ if (acceptData.getVersion() >= closeVersion) {
object.put("adClickDownload", true);
- } else
+ } else {
object.put("adClickDownload", false);
+ }
+
// 骞垮憡绫诲瀷
object.put("adType", map.get("ad_type"));
@@ -119,7 +165,15 @@
fullVideoVersion = json.optInt(acceptData.getChannel().toLowerCase(), 0);
}
- if (acceptData.getVersion() >= fullVideoVersion) {// 鏄惁灞忚斀璇︽儏椤靛叏灞忓箍鍛�
+
+ ConfigParser.ADConfig adConfig = configParser.getAdShowType("ad_video_detail_full_video", acceptData.getChannel(), acceptData.getVersion(), map);
+ String type = adConfig == null ? "" : adConfig.getType();
+
+ if (!StringUtil.isNullOrEmpty(type)) {// 鏄惁灞忚斀璇︽儏椤靛叏灞忓箍鍛�
+ JSONObject adType = JSONObject.fromObject(map.get("ad_type"));
+ adType.put("videoDetailSplashAd", true);
+ object.put("adType", adType.toString());
+ } else {
JSONObject adType = JSONObject.fromObject(map.get("ad_type"));
adType.put("videoDetailSplashAd", false);
object.put("adType", adType.toString());
@@ -138,14 +192,21 @@
return;
}
- List<String> list = searchService.suggestSearch(key, acceptData.getSystem());
+ List<String> list = solrDataManager.getSuggestKeyList(key); //searchService.suggestSearch(key, acceptData.getSystem());
if (acceptData.getPlatform().equalsIgnoreCase("ios")) {
if (Constant.IOSTest) {
- if (acceptData.getVersion()== 1) {
- list = new ArrayList<String>();
+ if (acceptData.getVersion() == 1) {
+ list = new ArrayList<>();
}
}
}
+ if (list == null || list.size() < 3) {
+ List<String> list1 = solrInternetSearchVideoDataManager.getSuggestKeyList(key);
+ if (list1 != null) {
+ list.addAll(list1);
+ }
+ }
+
JSONObject object = new JSONObject();
object.put("count", list.size() + "");
JSONArray array = new JSONArray();
@@ -157,6 +218,34 @@
out.print(JsonUtil.loadTrueJson(object.toString()));
}
+
+ private List<VideoDetailInfo> createSearchVideoDetailsVO(VideoInfo video) {
+ List<VideoDetailInfo> detailList = new ArrayList<>();
+ if (video.getVideoType() != null && (Integer.parseInt(video.getVideoType().getId() + "") == VideoCategoryConstant.CATEGORY_DIANSHIJU || Integer.parseInt(video.getVideoType().getId() + "") == VideoCategoryConstant.CATEGORY_DONGMAN)) {
+ if (video.getVideocount() != null && video.getVideocount() <= 5) {
+ for (int i = 0; i < video.getVideocount(); i++) {
+ VideoDetailInfo detail = new VideoDetailInfo();
+ detail.setTag((i + 1) + "");
+ detailList.add(detail);
+ }
+ } else {
+ for (int i = 0; i < 3; i++) {
+ VideoDetailInfo detail = new VideoDetailInfo();
+ detail.setTag((i + 1) + "");
+ detailList.add(detail);
+ }
+
+ for (int i = video.getVideocount() - 3; i < video.getVideocount(); i++) {
+ VideoDetailInfo detail = new VideoDetailInfo();
+ detail.setTag((i + 1) + "");
+ detailList.add(detail);
+ }
+ }
+ }
+
+ return detailList;
+ }
+
// 鎼滅储
public void search(AcceptData acceptData, HttpServletRequest request, PrintWriter out) {
@@ -198,7 +287,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)
@@ -208,6 +297,14 @@
List<VideoInfo> list = searchService.search(detailSystem.getId(), request.getRemoteAddr(),
acceptData.getUid(), key, pageIndex, (StringUtil.isNullOrEmpty(contentType) ? 0 : Integer.parseInt(contentType)),
acceptData.getSystem(), resourceList, cacheMD5);
+ //缁勭粐鏁版嵁
+ for (VideoInfo video : list) {
+ //濡傛灉鏄鐗囷紝涓斾负5澶у垎绫� 灏遍噰鐢ㄧ珫鏉″睍绀�
+ if (video.getShowType() == 1) {
+ video.setVideoDetailList(createSearchVideoDetailsVO(video));
+
+ }
+ }
cacheMD5 = "0";
if (list != null) {
for (VideoInfo info : list) {
@@ -249,18 +346,191 @@
array.add(StringUtil.outPutResultJson(list.get(i)));
}
object.put("data", array);
+ if (pageIndex == 1) {//杩斿洖瀵艰埅鏍�
+
+ }
+
out.print(JsonUtil.loadTrueJson(object.toString()));
}
+ }
+
+
+ // 鎼滅储
+ public void searchNew(AcceptData acceptData, HttpServletRequest request, PrintWriter out) {
+
+
+ //type: 0-鍏ㄩ儴 1-
+ String key = request.getParameter("Key");
+ String type = request.getParameter("Type");
+ String page = request.getParameter("Page");
+
+ if (StringUtil.isNullOrEmpty(key)) {
+ out.print(JsonUtil.loadFalseJson("璇蜂笂浼燢ey"));
+ return;
+ }
+
+ if (StringUtil.isNullOrEmpty(type)) {
+ out.print(JsonUtil.loadFalseJson("璇蜂笂浼燭ype"));
+ return;
+ }
+
+ LoggerUtil.getUserActiveLogger().info(UserActiveLogFactory.createSearch(new BaseLog(acceptData, ""), key, type));
+
+ int pageIndex = StringUtil.getPage(page);
+ if (pageIndex <= 0) {
+ pageIndex = 1;
+ }
+
+ List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(acceptData.getDetailSystem(), acceptData.getVersion());
+
+
+ String cacheMD5 = "0";
+ if (resourceList != null && resourceList.size() > 0)
+ for (Long l : resourceList)
+ cacheMD5 += "#" + l;
+ cacheMD5 = StringUtil.Md5(cacheMD5);
+
+
+ VideoListResultVO videoListResultVO = searchService.searchNew(acceptData.getDetailSystem().getId(), request.getRemoteAddr(),
+ acceptData.getUid(), key, pageIndex, Integer.parseInt(type),
+ acceptData.getSystem(), resourceList, cacheMD5);
+ //缁勭粐鏁版嵁
+ for (VideoInfo video : videoListResultVO.getVideoList()) {
+ //濡傛灉鏄鐗囷紝涓斾负5澶у垎绫� 灏遍噰鐢ㄧ珫鏉″睍绀�
+ if (video.getShowType() == 1) {
+ video.setVideoDetailList(createSearchVideoDetailsVO(video));
+ }
+ }
+ cacheMD5 = "0";
+ if (videoListResultVO.getVideoList() != null) {
+ for (VideoInfo info : videoListResultVO.getVideoList()) {
+ cacheMD5 += info.getId() + "#";
+ }
+ }
+ List<VideoInfo> list = banQuanService.getBanQuanVideo(videoListResultVO.getVideoList(), acceptData.getDetailSystem().getId(), cacheMD5);
+
+ JSONObject object = new JSONObject();
+ object.put("count", Constant.isUpdate ? 19 + "" : videoListResultVO.getCount());
+ JSONArray array = new JSONArray();
+ for (int i = 0; i < list.size(); i++) {
+ if (JuheVideoUtil.isNeedDelete((VideoInfo) list.get(i), acceptData.getDetailSystem().getId())) {
+ list.remove(i);
+ i--;
+ }
+ }
+
+ for (int i = 0; i < list.size(); i++) {
+ ((VideoInfo) list.get(i))
+ .setPicture(VideoPictureUtil.getShowPicture((VideoInfo) list.get(i), acceptData.getPlatform(), acceptData.getVersion() + ""));
+ array.add(StringUtil.outPutResultJson(list.get(i)));
+ }
+ object.put("data", array);
+ if (pageIndex == 1) {//杩斿洖瀵艰埅鏍�
+ List<VideoType> typeList = new ArrayList<>();
+ VideoType vt = new VideoType();
+ vt.setId(0);
+ vt.setName("鍏ㄩ儴");
+ typeList.add(vt);
+ Set<Long> set = new HashSet<>();
+ for (VideoInfo videoInfo : list) {
+ if (videoInfo.getShowType() == 1 && videoInfo.getVideoType() != null)
+ set.add(videoInfo.getVideoType().getId());
+ }
+
+ for (Iterator<Long> its = set.iterator(); its.hasNext(); ) {
+ Long typeId = its.next();
+ String typeName = VideoConstant.getMainCategoryName(typeId);
+ if (!StringUtil.isNullOrEmpty(typeName)) {
+ vt = new VideoType();
+ vt.setId(typeId);
+ vt.setName(typeName);
+ typeList.add(vt);
+ }
+ }
+
+ vt = new VideoType();
+ vt.setId(Constant.SEARCH_RESULT_TYPE_HIGH_DEFINITION);
+ vt.setName("楂樻竻");
+ typeList.add(vt);
+
+
+ JSONArray array1 = new JSONArray();
+ for (VideoType vt1 : typeList)
+ array1.add(StringUtil.outPutResultJson(vt1));
+ object.put("typeList", array1);
+ }
+
+ out.print(JsonUtil.loadTrueJson(object.toString()));
+
+ }
+
+
+ @Resource
+ private InternetSearchVideoService internetSearchVideoService;
+
+ private void guessLikeForInternetSearch(AcceptData acceptData, String videoId, PrintWriter out) {
+ InternetSearchVideo internetSearchVideo = internetSearchVideoService.selectByPrimaryKey(videoId);
+ if (internetSearchVideo != null) {
+ int rootType = internetSearchVideo.getRootType();
+ SolrVideoSearchFilter filter = new SolrVideoSearchFilter();
+ filter.setVideoType(rootType);
+ filter.setResourceIds(new String[]{PPTVUtil.RESOURCE_ID + ""});
+ filter.setSortKey("watchcount");
+ SolrResultDTO dto = solrDataManager.find(filter, 1, 20);
+ List<SolrAlbumVideo> solrAlbumVideoList = new ArrayList<>();
+ solrAlbumVideoList.addAll(dto.getVideoList());
+ List<VideoInfo> list = new ArrayList<>();
+ for (int i = 0; i < 4; i++) {
+ if (solrAlbumVideoList.size() > 0) {
+ int p = (int) (Math.random() * solrAlbumVideoList.size());
+ SolrAlbumVideo solrAlbumVideo = solrAlbumVideoList.get(p);
+ list.add(VideoInfoFactory.create(solrAlbumVideo));
+ solrAlbumVideoList.remove(p);
+ }
+ }
+
+ if (list.size() < 4) {
+ filter.setResourceIds(null);
+ dto = solrDataManager.find(filter, 1, 20);
+ solrAlbumVideoList.clear();
+ solrAlbumVideoList.addAll(dto.getVideoList());
+ for (int i = list.size(); i < 4; i++) {
+ if (solrAlbumVideoList.size() > 0) {
+ int p = (int) (Math.random() * solrAlbumVideoList.size());
+ SolrAlbumVideo solrAlbumVideo = solrAlbumVideoList.get(p);
+ list.add(VideoInfoFactory.create(solrAlbumVideo));
+ solrAlbumVideoList.remove(p);
+ }
+ }
+ }
+
+
+ JSONObject object = new JSONObject();
+ object.put("count", list.size() + "");
+ JSONArray array = new JSONArray();
+
+ for (int i = 0; i < list.size(); i++) {
+ array.add(StringUtil.outPutResultJson(list.get(i)));
+ }
+
+ 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;
+ }
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,
@@ -270,7 +540,7 @@
list1 = videoInfoService.simpleRandomVideoList(4);
}
- List<VideoInfo> list = new ArrayList<VideoInfo>();
+ List<VideoInfo> list = new ArrayList<>();
list.addAll(list1);
if ("android".equalsIgnoreCase(acceptData.getPlatform()) && acceptData.getVersion() < 35) {
@@ -429,6 +699,39 @@
}
+
+ private void getRelativeVideosForInternetSearch(AcceptData acceptData, String videoId, PrintWriter out) {
+ InternetSearchVideo internetSearchVideo = internetSearchVideoService.selectByPrimaryKey(videoId);
+ if (internetSearchVideo != null) {
+ SolrVideoSearchFilter filter = new SolrVideoSearchFilter();
+ filter.setKey(internetSearchVideo.getName());
+ filter.setFuzzy(true);
+ SolrResultDTO dto = solrDataManager.find(filter, 1, 20);
+ List<SolrAlbumVideo> solrAlbumVideoList = new ArrayList<>();
+ solrAlbumVideoList.addAll(dto.getVideoList());
+ List<VideoInfo> list = new ArrayList<>();
+ for (int i = 0; i < 4; i++) {
+ if (i < solrAlbumVideoList.size()) {
+ SolrAlbumVideo solrAlbumVideo = solrAlbumVideoList.get(i);
+ list.add(VideoInfoFactory.create(solrAlbumVideo));
+ }
+ }
+
+
+ JSONObject object = new JSONObject();
+ object.put("count", list.size() + "");
+ JSONArray array = new JSONArray();
+
+ for (int i = 0; i < list.size(); i++) {
+ array.add(StringUtil.outPutResultJson(list.get(i)));
+ }
+
+ object.put("data", array);
+ out.print(JsonUtil.loadTrueJson(object.toString()));
+ }
+
+ }
+
/**
* 鐩稿叧瑙嗛
*
@@ -442,7 +745,12 @@
return;
}
- List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(acceptData.getPlatform(), acceptData.getVersion());
+ if (!NumberUtil.isNumeric(videoId)) {
+ getRelativeVideosForInternetSearch(acceptData, videoId, out);
+ return;
+ }
+
+ 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,
@@ -481,7 +789,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,
@@ -490,7 +798,7 @@
list1 = videoInfoService.simpleRandomVideoList(4);
}
- List<VideoInfo> list = new ArrayList<VideoInfo>();
+ List<VideoInfo> list = new ArrayList<>();
list.addAll(list1);
if ("android".equalsIgnoreCase(acceptData.getPlatform()) && acceptData.getVersion() < 35) {
@@ -524,6 +832,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)) {
@@ -556,24 +865,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()));
+ }
}
/**
@@ -630,17 +937,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()));
+ }
}
/**
@@ -655,6 +962,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;
@@ -665,7 +973,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))
@@ -729,7 +1037,7 @@
}
if (!verifyCode.equalsIgnoreCase(request.getSession().getAttribute(email) + "")) {
- out.print(JsonUtil.loadTrueJson("楠岃瘉鐮侀敊璇�"));
+ out.print(JsonUtil.loadFalseJson("楠岃瘉鐮侀敊璇�"));
return;
}
@@ -775,16 +1083,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