From f537abe9f3646c739beaf15076246a2f71a347e9 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 20 二月 2025 16:57:55 +0800
Subject: [PATCH] IOS广告增加区域屏蔽
---
src/main/java/com/yeshi/buwan/controller/parser/UserParser.java | 982 ++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 792 insertions(+), 190 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 e3d2749..b2f17e6 100644
--- a/src/main/java/com/yeshi/buwan/controller/parser/UserParser.java
+++ b/src/main/java/com/yeshi/buwan/controller/parser/UserParser.java
@@ -1,35 +1,81 @@
package com.yeshi.buwan.controller.parser;
-import com.yeshi.buwan.domain.*;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.reflect.TypeToken;
import com.yeshi.buwan.domain.Collection;
+import com.yeshi.buwan.domain.*;
+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.dto.user.QQUserInfo;
+import com.yeshi.buwan.exception.SMSException;
+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.service.inter.SMSService;
+import com.yeshi.buwan.service.inter.juhe.InternetSearchVideoService;
+import com.yeshi.buwan.service.inter.system.SystemConfigService;
+import com.yeshi.buwan.service.manager.IPManager;
+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.login.QQLoginUtil;
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.util.wx.MyWXLoginUtil;
+import com.yeshi.buwan.videos.pptv.PPTVUtil;
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 org.yeshi.utils.entity.wx.WeiXinUser;
+import org.yeshi.utils.exception.MailSendException;
+import org.yeshi.utils.mail.EmailApiUtil;
+import org.yeshi.utils.mail.EmailInfo;
+import redis.clients.jedis.Jedis;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
import java.io.File;
import java.io.PrintWriter;
+import java.lang.reflect.Type;
import java.util.*;
@Controller
public class UserParser {
+
+ Logger searchKeyLogger = LoggerFactory.getLogger("searchKey");
+
+ Logger logger = LoggerFactory.getLogger(UserParser.class);
+
+ Logger deviceGeoLogger = LoggerFactory.getLogger("deviceGeo");
+
+
@Resource
private SystemService systemService;
@Resource
- private ConfigService configService;
+ private DetailSystemConfigService configService;
@Resource
private UserService userService;
@Resource
@@ -49,9 +95,29 @@
@Resource
private VideoInfoService videoInfoService;
@Resource
- private SolrAlbumDataManager solrDataManager;
+ 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;
+
+ @Resource
+ DetailSystemConfigService detailSystemConfigService;
+
+ @Resource
+ private IPManager ipManager;
public void getUid(AcceptData acceptData, HttpServletRequest request, PrintWriter out) {
DetailSystem detailSystem = systemService.getDetailSystemByPackage(acceptData.getPackageName());
@@ -62,7 +128,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);
@@ -72,7 +138,7 @@
object.put("ZiXun", map.get("zixun_url"));
if (acceptData.getPlatform().equalsIgnoreCase("ios") && !"涓浗".equalsIgnoreCase(userInfo.getCountry()))// 姝ｅ湪瀹℃牳鐨勭増鏈�
object.put("CommentUrl", "");
- else
+ else if (share != null)
object.put("CommentUrl", share.getShareUrl());
object.put("IOSSlotID", "");
@@ -138,12 +204,10 @@
// 骞垮憡绫诲瀷
object.put("adType", map.get("ad_type"));
- int fullVideoVersion = Integer.parseInt(map.get("video_detail_full_video_version"));
- String fullVideoVersionChannels = map.get("video_detail_full_video_version_channel");
- JSONObject json = JSONObject.fromObject(fullVideoVersionChannels);
- if (json.optInt(acceptData.getChannel().toLowerCase(), 0) > 0) {
- fullVideoVersion = json.optInt(acceptData.getChannel().toLowerCase(), 0);
- }
+// String fullVideoVersionChannels = map.get("video_detail_full_video_version_channel");
+// JSONObject json = JSONObject.fromObject(fullVideoVersionChannels);
+// if (json.optInt(acceptData.getChannel().toLowerCase(), 0) > 0) {
+// }
ConfigParser.ADConfig adConfig = configParser.getAdShowType("ad_video_detail_full_video", acceptData.getChannel(), acceptData.getVersion(), map);
@@ -180,12 +244,41 @@
}
}
}
+ List<String> list1 = solrInternetSearchVideoDataManager.getSuggestKeyList(key);
+ if (list1 != null) {
+ list.addAll(list1);
+ }
+
+ Set<String> set = new HashSet<>();
+
+ if (list != null) {
+ for (String st : list) {
+ set.add(st);
+ }
+ list.clear();
+ list.addAll(set);
+ }
+
+ //鎸夊叧閿瘝鐨勫尮閰嶅害鎺掑簭
+ Comparator<String> cm = new Comparator<String>() {
+ @Override
+ public int compare(String o1, String o2) {
+ float s1 = CompareStrSimUtil.getSimilarityRatio(o1, key, true);
+ float s2 = CompareStrSimUtil.getSimilarityRatio(o2, key, true);
+ return s2 > s1 ? 1 : -1;
+ }
+ };
+
+ Collections.sort(list, cm);
+
+
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)));
+ if (i < 10)
+ array.add(StringUtil.outPutResultJson(list.get(i)));
}
object.put("data", array);
out.print(JsonUtil.loadTrueJson(object.toString()));
@@ -195,7 +288,7 @@
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() <= 5) {
+ if (video.getVideocount() != null && video.getVideocount() <= 5) {
for (int i = 0; i < video.getVideocount(); i++) {
VideoDetailInfo detail = new VideoDetailInfo();
detail.setTag((i + 1) + "");
@@ -260,7 +353,7 @@
object.put("data", array);
out.print(JsonUtil.loadTrueJson(object.toString()));
} else {
- List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(detailSystem, acceptData.getVersion());
+ List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(detailSystem, acceptData.getVersion(), acceptData.getChannel());
String cacheMD5 = "0";
if (resourceList != null && resourceList.size() > 0)
for (Long l : resourceList)
@@ -330,6 +423,8 @@
// 鎼滅储
public void searchNew(AcceptData acceptData, HttpServletRequest request, PrintWriter out) {
+
+
//type: 0-鍏ㄩ儴 1-
String key = request.getParameter("Key");
String type = request.getParameter("Type");
@@ -345,120 +440,255 @@
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);
if (pageIndex <= 0) {
pageIndex = 1;
}
- DetailSystem detailSystem = systemService.getDetailSystemByPackage(acceptData.getPackageName());
- UserInfo user1 = userService.getUserInfo(acceptData.getUid());
- if (Utils.isTest(request, user1, detailSystem.getId())) {
- detailSystem = systemService.getDetailSystemById(40 + "");
- JSONObject object = new JSONObject();
- object.put("count", 0);
- JSONArray array = new JSONArray();
- object.put("data", array);
- out.print(JsonUtil.loadTrueJson(object.toString()));
- } else {
- List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(detailSystem, acceptData.getVersion());
- String cacheMD5 = "0";
- if (resourceList != null && resourceList.size() > 0)
- for (Long l : resourceList)
- cacheMD5 += "#" + l;
- cacheMD5 = StringUtil.Md5(cacheMD5);
+ List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(acceptData.getDetailSystem(), acceptData.getVersion(), acceptData.getChannel());
- VideoListResultVO videoListResultVO = searchService.searchNew(detailSystem.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(), detailSystem.getId(), cacheMD5);
- JSONObject object = new JSONObject();
- object.put("count", Constant.isUpdate ? 19 + "" : videoListResultVO.getCount());
- JSONArray array = new JSONArray();
+ 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--;
+ }
+ }
+
+
+ if (pageIndex == 1) {//杩斿洖瀵艰埅鏍�
+ List<VideoType> typeList = new ArrayList<>();
+ VideoType vt = new VideoType();
+ vt.setId(0);
+ vt.setName("鍏ㄩ儴");
+ typeList.add(vt);
+ List<Long> set = new ArrayList<>();
+ //灏嗚棰戝唴瀹瑰垎绫诲苟鎺掑簭
+ Map<Long, List<VideoInfo>> videoMap = new HashMap<>();
for (int i = 0; i < list.size(); i++) {
- if (JuheVideoUtil.isNeedDelete((VideoInfo) list.get(i), detailSystem.getId())) {
- list.remove(i);
- i--;
- }
- }
+ VideoInfo videoInfo = list.get(i);
+ if (videoInfo.getShowType() == 1 && videoInfo.getVideoType() != null) {
+ if (videoMap.get(videoInfo.getVideoType().getId()) == null)
+ videoMap.put(videoInfo.getVideoType().getId(), new ArrayList<>());
+ videoMap.get(videoInfo.getVideoType().getId()).add(videoInfo);
+ if (!set.contains(videoInfo.getVideoType().getId()))
+ set.add(videoInfo.getVideoType().getId());
- 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 (VersionUtil.isGraterThan390(acceptData.getPlatform(), acceptData.getVersion()) && (StringUtil.isNullOrEmpty(type) || type.equalsIgnoreCase("0"))) {
+ list.remove(i);
+ i--;
}
}
- if (delete) {
- 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();
+ //閲嶆柊缁勭粐鏁版嵁
+ if (VersionUtil.isGraterThan390(acceptData.getPlatform(), acceptData.getVersion()) && (StringUtil.isNullOrEmpty(type) || type.equalsIgnoreCase("0"))) {
+ List<VideoInfo> albumVideoList = new ArrayList<>();
+ for (int i = 0; i < set.size(); i++) {
+ Long typeId = set.get(i);
String typeName = VideoConstant.getMainCategoryName(typeId);
if (!StringUtil.isNullOrEmpty(typeName)) {
- vt = new VideoType();
- vt.setId(typeId);
- vt.setName(typeName);
- typeList.add(vt);
+ videoMap.get(typeId).get(0).setAlbumMoreInfo(new VideoInfo.VideoAlbumMoreInfo(typeName, i + 1));
+ albumVideoList.addAll(videoMap.get(typeId));
}
}
- JSONArray array1 = new JSONArray();
- for (VideoType vt1 : typeList)
- array1.add(StringUtil.outPutResultJson(vt1));
- object.put("typeList", array1);
+ list.addAll(0, albumVideoList);
}
- out.print(JsonUtil.loadTrueJson(object.toString()));
+
+ for (int i = 0; i < set.size(); i++) {
+ Long typeId = set.get(i);
+ String typeName = VideoConstant.getMainCategoryName(typeId);
+ if (!StringUtil.isNullOrEmpty(typeName)) {
+ vt = new VideoType();
+ vt.setId(typeId);
+ vt.setName(typeName);
+ 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();
+ for (VideoType vt1 : typeList)
+ array1.add(StringUtil.outPutResultJson(vt1));
+ object.put("typeList", array1);
}
+
+ 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);
+
+ 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(Arrays.asList(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()));
+ }
+
+ }
+
+
+ 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");
+ 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());
+ 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,
@@ -511,11 +741,132 @@
}
+
+ //鏂扮増鐑棬鎼滅储
+ public void getHotSearchNew(AcceptData acceptData, HttpServletRequest request, PrintWriter out) {
+ DetailSystemConfig config = configService.getConfigByKey("hot_search", acceptData.getDetailSystem(), acceptData.getVersion());
+ if (config == null) {
+ out.print(JsonUtil.loadFalseJson("鏃犲唴瀹�"));
+ return;
+ }
+ String value = config.getValue();
+ Type type = new TypeToken<List<String>>() {
+ }.getType();
+
+ List<String> list = new Gson().fromJson(value, type);
+
+
+ JSONObject object = new JSONObject();
+ object.put("count", list.size() + "");
+ JSONArray array = new JSONArray();
+ for (int i = 0; i < list.size(); i++) {
+ array.add(list.get(i));
+ }
+
+ object.put("data", array);
+ out.print(JsonUtil.loadTrueJson(object.toString()));
+ }
+
+
+ //鑾峰彇鎼滅储鎺掕姒�
+ public void getSearchRank(AcceptData acceptData, HttpServletRequest request, PrintWriter out) {
+// try {
+// Map<String, List<String>> map = IqiyiRankUtil.getRank(10);
+// } catch (IOException e) {
+// e.printStackTrace();
+// }
+
+ //鎼滅储鎺掕
+ String value = systemConfigService.getConfigValueByKeyCache("searchRank");
+
+ Map<Integer, JSONObject> map = new TreeMap<>();
+ if (!StringUtil.isNullOrEmpty(value)) {
+ JSONObject root = JSONObject.fromObject(value);
+ for (Iterator<String> its = root.keys(); its.hasNext(); ) {
+ String key = its.next();
+ JSONArray array = root.optJSONArray(key);
+ JSONObject data = new JSONObject();
+ switch (key) {
+ case "鐑悳":
+ data.put("鐑悳姒�", array);
+ map.put(0, data);
+ break;
+ case "鐢佃鍓�":
+ data.put("鐢佃鍓ф", array);
+ map.put(1, data);
+ break;
+ case "鐢靛奖":
+ data.put("鐢靛奖姒�", array);
+ map.put(2, data);
+ break;
+ case "缁艰壓":
+ data.put("缁艰壓姒�", array);
+ map.put(3, data);
+ break;
+ case "鍔ㄦ极":
+ data.put("鍔ㄦ极姒�", array);
+ map.put(4, data);
+ break;
+ }
+ }
+ if (map.get(0) == null) {
+ //濡傛灉娌℃湁鐑悳姒滃氨濉厖鎵�鏈夋鍗曠殑鍓嶅嚑涓暟鎹�
+ List<String> list = new ArrayList<>();
+ Type type = new TypeToken<List<String>>() {
+ }.getType();
+
+ for (int i = 1; i < 5; i++) {
+ if (map.get(i) != null) {
+ JSONObject json = map.get(i);
+ String key = json.keySet().iterator().next() + "";
+ JSONArray array = json.optJSONArray(key);
+ List<String> keys = new Gson().fromJson(array.toString(), type);
+ if (keys.size() > 3) {
+ list.addAll(keys.subList(0, 3));
+ } else {
+ list.addAll(keys);
+ }
+ }
+ }
+ if (list.size() > 10) {
+ list = list.subList(0, 10);
+ }
+ JSONObject data = new JSONObject();
+ data.put("鐑悳姒�", list);
+ map.put(0, data);
+ }
+ }
+
+ JSONObject data = new JSONObject();
+ for (Iterator<Integer> its = map.keySet().iterator(); its.hasNext(); ) {
+ Integer key = its.next();
+ JSONObject item = map.get(key);
+ String k = item.keys().next().toString();
+ data.put(k, item.optJSONArray(k));
+ }
+
+
+ JSONObject object = new JSONObject();
+ object.put("data", data);
+ out.print(JsonUtil.loadTrueJson(object.toString()));
+ }
+
// 鑾峰彇鐢ㄦ埛淇℃伅
public void getUserInfo(AcceptData acceptData, HttpServletRequest request, PrintWriter out) {
UserData data = userService.getUserData(acceptData.getUid());
out.print(JsonUtil.loadTrueJson(StringUtil.outPutResultJson(data)));
-
+ // 璁板綍鏃ュ織
+ try {
+// if(!"appstore".equalsIgnoreCase(acceptData.getChannel())) {
+ String ip = IPUtil.getRemotIP(request);
+ IPUtil.IPInfo ipInfo = ipManager.getIPInfo(ip);
+ if (ipInfo != null) {
+ deviceGeoLogger.info("鐢ㄦ埛淇℃伅(uid-{})-IP褰掑睘鍦� IP-{},鐗堟湰-{}, 娓犻亾-{}锛岀渷-{}锛� 甯�-{}",acceptData.getUid(), ip, acceptData.getVersion(), acceptData.getChannel(), ipInfo.getProvince(), ipInfo.getCity());
+ }
+// }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
}
@RequireUid
@@ -573,7 +924,11 @@
VideoInfo vf = new VideoInfo();
vf.setId(videoId);
Collection c = new Collection();
- c.setUser(new UserInfo(acceptData.getUid()));
+ if (!StringUtil.isNullOrEmpty(acceptData.getUid())) {
+ c.setUser(new UserInfo(acceptData.getUid()));
+ } else {
+ c.setUser(new UserInfo("1"));
+ }
if (!StringUtil.isNullOrEmpty(loginUid)) {
c.setLoginUser(new LoginUser(loginUid));
}
@@ -627,6 +982,68 @@
}
+
+ 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()));
+ }
+
+ }
+
+
+ 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()));
+ }
+
+
/**
* 鐩稿叧瑙嗛
*
@@ -640,7 +1057,17 @@
return;
}
- List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(acceptData.getDetailSystem(), acceptData.getVersion());
+ 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());
DetailSystem ds = systemService.getDetailSystemByPackage(acceptData.getPackageName());
List<VideoInfo> list = recommendService.getRelativeVideoList(ds.getId(), 4, videoId, resourceList,
@@ -679,7 +1106,7 @@
return;
}
- List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(acceptData.getDetailSystem(), acceptData.getVersion());
+ 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,
@@ -744,35 +1171,33 @@
return;
}
- if (!StringUtil.isNullOrEmpty(account) && !account.trim().endsWith("@qq.com")) {
+ if (!StringUtil.isNullOrEmpty(account) && !account.trim().endsWith("@qq.com") && !acceptData.getPackage().equalsIgnoreCase("com.yeshi.buwanshequ.ios")) {
out.print(JsonUtil.loadFalseJson("鍙敮鎸丵Q閭娉ㄥ唽"));
return;
}
int port = request.getRemotePort();
- String ip = getIp(request);
+ String ip = IPUtil.getRemotIP(request);
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(portrait, request.getSession()));
- 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()));
+ }
}
/**
@@ -788,23 +1213,75 @@
out.print(JsonUtil.loadFalseJson("璇蜂笂浼燛mail"));
return;
}
- if (!StringUtil.isNullOrEmpty(account) && !account.trim().endsWith("@qq.com")) {
+ if (!StringUtil.isNullOrEmpty(account) && !account.trim().endsWith("@qq.com") && !acceptData.getPackage().equalsIgnoreCase("com.yeshi.buwanshequ.ios")) {
out.print(JsonUtil.loadFalseJson("鍙敮鎸丵Q閭娉ㄥ唽"));
return;
}
final String code = StringUtil.getVerifyCode();
- request.getSession().setAttribute(account, code);
+
// new Thread(new Runnable() {
// public void run() {
// for (int i = 0; i < 3; i++) {
- boolean isS = MailSenderUtil.sendEmail(account, "ysyz17784739772@126.com", "weikou2014", "甯冧父绀惧尯娉ㄥ唽楠岃瘉鐮�:" + code,
- "甯冧父绀惧尯娉ㄥ唽楠岃瘉鐮�:" + code);
+ DetailSystem detailSystem = systemService.getDetailSystemByPackage(acceptData.getPackageName());
+ String title = "甯冧父绀惧尯娉ㄥ唽楠岃瘉鐮�:" + code;
+ String content = "甯冧父绀惧尯娉ㄥ唽楠岃瘉鐮�:" + code;
+ if (!detailSystem.getAppName().contains("甯冧父")) {
+ String name = detailSystem.getAppName();
+ title = name + "楠岃瘉鐮�:" + code;
+ content = title;
+ }
+
+ System.out.println(content);
+
+ EmailInfo emailInfo = new EmailInfo();
+ emailInfo.setToEmail(account);
+ emailInfo.setTitle(title);
+ emailInfo.setFromEmail("app_yzm_zc@163.com");
+ emailInfo.setFormEmailPwd("KZKSRTEMDWEQRAQR");
+ emailInfo.setContent(content);
+ emailInfo.setApp("褰辫");
+ try {
+ EmailApiUtil.sendEmail(emailInfo);
+ request.getSession().setAttribute(account, code);
+ out.print(JsonUtil.loadTrueJson("楠岃瘉鐮佸彂閫佹垚鍔�"));
+ } catch (MailSendException e) {
+ e.printStackTrace();
+ out.print(JsonUtil.loadFalseJson("楠岃瘉鐮佸彂閫佸け璐�"));
+ }
// }
// }).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) {
+ logger.error("鐭俊鍙戦�佸嚭閿�", e);
+ out.print(JsonUtil.loadFalseJson("鐭俊鍙戦�佸嚭閿欙紝璇风◢鍚庡啀璇�"));
+ return;
+ }
+ out.print(JsonUtil.loadTrueJson(""));
+ }
+
/**
* 鐧诲綍
@@ -813,33 +1290,180 @@
* @param out
*/
public void login(AcceptData acceptData, HttpServletRequest request, PrintWriter out) {
- String account = request.getParameter("Email");// 閭
- String pwd = request.getParameter("Pwd");// 瀵嗙爜
- if (StringUtil.isNullOrEmpty(account)) {
- out.print(JsonUtil.loadFalseJson("璇蜂笂浼燛mail"));
- return;
+ String loginType = request.getParameter("LoginType");
+ int logintTypeInt = LoginUser.LOGIN_TYPE_EMAIL;
+ if (!StringUtil.isNullOrEmpty(loginType)) {
+ logintTypeInt = Integer.parseInt(loginType);
+ }
+ LoginInfoDto loginInfoDto = new LoginInfoDto();
+ loginInfoDto.setSystemId(acceptData.getDetailSystem().getSystem().getId());
+ loginInfoDto.setIpInfo(IPUtil.getRemotIP(request) + ":" + request.getRemotePort());
+ switch (logintTypeInt) {
+ case LoginUser.LOGIN_TYPE_EMAIL: {
+ String account = request.getParameter("Email");// 閭
+ String pwd = request.getParameter("Pwd");// 瀵嗙爜
+ if (StringUtil.isNullOrEmpty(account)) {
+ out.print(JsonUtil.loadFalseJson("璇蜂笂浼燛mail"));
+ return;
+ }
+
+ if (StringUtil.isNullOrEmpty(pwd)) {
+ out.print(JsonUtil.loadFalseJson("璇蜂笂浼燩wd"));
+ return;
+ }
+ loginInfoDto.setLoginType(LoginUser.LOGIN_TYPE_EMAIL);
+ loginInfoDto.setSystemId(acceptData.getDetailSystem().getSystem().getId());
+ loginInfoDto.setEmail(account);
+ loginInfoDto.setPwd(StringUtil.Md5(pwd));
+ }
+ break;
+ case LoginUser.LOGIN_TYPE_PHONE: {
+ String account = request.getParameter("Phone");// 閭
+ String pwd = request.getParameter("Pwd");// 瀵嗙爜
+ if (StringUtil.isNullOrEmpty(account)) {
+ out.print(JsonUtil.loadFalseJson("璇蜂笂浼犵數璇濆彿鐮�"));
+ return;
+ }
+
+ if (StringUtil.isNullOrEmpty(pwd)) {
+ out.print(JsonUtil.loadFalseJson("璇蜂笂浼犲瘑鐮�"));
+ return;
+ }
+ loginInfoDto.setLoginType(LoginUser.LOGIN_TYPE_PHONE);
+ loginInfoDto.setPhone(account);
+ loginInfoDto.setPwd(StringUtil.Md5(pwd));
+
+ }
+ break;
+ case LoginUser.LOGIN_TYPE_QQ: {
+ String accessToken = request.getParameter("AccessToken");
+ String openId = request.getParameter("OpenId");
+ if (StringUtil.isNullOrEmpty(accessToken) || StringUtil.isNullOrEmpty(openId)) {
+ out.print(JsonUtil.loadFalseJson("璇蜂笂浼燪Q鎺堟潈淇℃伅"));
+ return;
+ }
+
+ String qqAppId = detailSystemConfigService.getConfigValueByKey("qq_app_id", acceptData.getDetailSystem().getId(), acceptData.getVersion());
+ if (StringUtil.isNullOrEmpty(qqAppId)) {
+ out.print(JsonUtil.loadFalseJson("QQ APPID鑾峰彇鍑洪敊"));
+ return;
+ }
+ QQLoginUtil.QQUserInfoEntity userEntity = QQLoginUtil.getUserInfo(qqAppId.trim(), accessToken, openId);
+ if (userEntity == null) {
+ out.print(JsonUtil.loadFalseJson("QQ鐢ㄦ埛淇℃伅瑙ｆ瀽鍑洪敊"));
+ return;
+ }
+
+ QQUserInfo userInfo = new QQUserInfo();
+ userInfo.setSex(userEntity.getGender());
+ userInfo.setPortrait(userEntity.getFigureurl());
+ userInfo.setOpenId(openId);
+ userInfo.setName(userEntity.getNickname());
+ loginInfoDto.setLoginType(LoginUser.LOGIN_TYPE_QQ);
+ loginInfoDto.setQqUserInfo(userInfo);
+ }
+ break;
+ case LoginUser.LOGIN_TYPE_WX: {
+ String code = request.getParameter("Code");
+ if (StringUtil.isNullOrEmpty(code)) {
+ out.print(JsonUtil.loadFalseJson("璇蜂笂浼犲井淇℃巿鏉冪爜"));
+ return;
+ }
+
+ WeiXinUser weiXinUser = MyWXLoginUtil.getUserInfo(code, MyWXLoginUtil.WEIXIN_APPID, MyWXLoginUtil.WEIXIN_SECRET);
+ if (weiXinUser == null) {
+ out.print(JsonUtil.loadFalseJson("鑾峰彇鎺堟潈淇℃伅澶辫触,璇风◢鍚庡啀璇�"));
+ return;
+ }
+ loginInfoDto.setLoginType(LoginUser.LOGIN_TYPE_WX);
+ loginInfoDto.setWeiXinUser(weiXinUser);
+ }
+ break;
+ default:
+ out.print(JsonUtil.loadFalseJson("鐧诲綍鏂瑰紡閿欒"));
+ return;
}
- if (StringUtil.isNullOrEmpty(pwd)) {
- out.print(JsonUtil.loadFalseJson("璇蜂笂浼燩wd"));
- return;
- }
-
- // DetailSystem ds =
- // 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
+ try {
+ LoginUser user = userService.login(loginInfoDto);
out.print(JsonUtil.loadTrueJson(StringUtil.outPutResultJson(user)));
+ } catch (LoginUserException e) {
+ if ((logintTypeInt == LoginUser.LOGIN_TYPE_WX || logintTypeInt == LoginUser.LOGIN_TYPE_QQ) && e.getCode() == LoginUserException.CODE_NO_USER) {
+ //娉ㄥ唽
+ try {
+ LoginUser lu = userService.register(loginInfoDto);
+ if (lu != null) {
+ JSONObject object = new JSONObject();
+ object.put("user", new GsonBuilder().excludeFieldsWithoutExposeAnnotation().create().toJson(lu));
+ out.print(JsonUtil.loadTrueJson(object.toString()));
+ } else {
+ out.print(JsonUtil.loadFalseJson("鐧诲綍澶辫触"));
+ }
+ } catch (RegisterUserException e1) {
+ out.print(JsonUtil.loadFalseJson("鐧诲綍澶辫触"));
+ }
+ } else {
+ 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()));
+ }
+ }
}
/**
@@ -870,7 +1494,7 @@
user.setPortrait(potrait);
if (!StringUtil.isNullOrEmpty(sex))
user.setSex(sex);
- if (!StringUtil.isNullOrEmpty(acceptData.getSign()))
+ if (!StringUtil.isNullOrEmpty(personalSign))
user.setSign(personalSign);
if (!StringUtil.isNullOrEmpty(birthDay))
user.setBirthday(birthDay);
@@ -897,6 +1521,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)));
@@ -909,6 +1539,8 @@
* @param out
*/
public void setPwd(AcceptData acceptData, HttpServletRequest request, PrintWriter out) {
+
+
String email = request.getParameter("Email");// 涓�х鍚�
String pwd = request.getParameter("Pwd");// 瀵嗙爜
String verifyCode = request.getParameter("VerifyCode");// 楠岃瘉鐮�
@@ -934,7 +1566,7 @@
}
// 娉ㄥ唽 --鐢ㄦ埛鍚�,鏄电О,瀵嗙爜
- LoginUser user = userService.getLoginUserByOpenId(email);
+ LoginUser user = userService.getValidLoginUserByEmail(email, acceptData.getDetailSystem().getSystem().getId());
if (user == null) {
out.print(JsonUtil.loadFalseJson("璇ョ敤鎴蜂笉瀛樺湪"));
} else {
@@ -978,13 +1610,14 @@
public static String savePortrait(String base64, HttpSession session) {
if (StringUtil.isNullOrEmpty(base64))
return "";
+ base64 = base64.replace("\r\n", "");
String fileName = "portrait_" + System.currentTimeMillis() + ".jpg";
// 瀹氫箟涓婁紶璺緞
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);
+ boolean isS = StringUtil.generateImageFromBase64(base64.replace("\n", ""), path);
if (!isS)
return "";
@@ -999,43 +1632,12 @@
}
public void getIPInfo(AcceptData acceptData, HttpServletRequest request, PrintWriter out) {
-
- String ip = request.getHeader("x-forwarded-for");
- if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
- ip = request.getHeader("Proxy-Client-IP");
- }
- if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
- ip = request.getHeader("WL-Proxy-Client-IP");
+ String ip = IPUtil.getRemotIP(request);
+ try {
+ out.print(ip + "-----" + new Gson().toJson(IPUtil.getLocalIPInfo(request.getRemoteAddr())));
+ } catch (Exception e) {
+ e.printStackTrace();
}
- if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
- ip = request.getHeader("X-Real-IP");
- }
-
- if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
- ip = request.getRemoteAddr();
- }
- out.print(ip + "-----" + IPUtil.getIPContry(request.getRemoteAddr()));
-
- }
-
- public static String getIp(HttpServletRequest request) {
- String ip = request.getHeader("x-forwarded-for");
- if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
- ip = request.getHeader("Proxy-Client-IP");
- }
- if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
- ip = request.getHeader("WL-Proxy-Client-IP");
- }
- if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
- ip = request.getHeader("HTTP_CLIENT_IP");
- }
- if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
- ip = request.getHeader("HTTP_X_FORWARDED_FOR");
- }
- if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
- ip = request.getRemoteAddr();
- }
- return ip;
}
}
--
Gitblit v1.8.0