From 04f09e52ffd4681bdfd85e51acd3da0d1280c3d3 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 16 四月 2022 16:07:10 +0800
Subject: [PATCH] bug修复
---
src/main/java/com/yeshi/buwan/controller/parser/UserParser.java | 450 ++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 402 insertions(+), 48 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 6ec01ea..9181699 100644
--- a/src/main/java/com/yeshi/buwan/controller/parser/UserParser.java
+++ b/src/main/java/com/yeshi/buwan/controller/parser/UserParser.java
@@ -1,31 +1,41 @@
package com.yeshi.buwan.controller.parser;
-import com.yeshi.buwan.domain.*;
+import com.google.gson.Gson;
+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.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.imp.*;
+import com.yeshi.buwan.service.inter.SMSService;
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.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.videos.pptv.PPTVUtil;
import com.yeshi.buwan.vo.AcceptData;
import com.yeshi.buwan.vo.video.VideoListResultVO;
import net.sf.json.JSONArray;
@@ -33,16 +43,26 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Controller;
+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);
+
@Resource
private SystemService systemService;
@@ -70,8 +90,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());
@@ -82,7 +114,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);
@@ -92,7 +124,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", "");
@@ -158,12 +190,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);
@@ -200,19 +230,41 @@
}
}
}
- if (list == null || list.size() < 3) {
- List<String> list1 = solrInternetSearchVideoDataManager.getSuggestKeyList(key);
- if (list1 != null) {
- list.addAll(list1);
- }
+ 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()));
@@ -287,7 +339,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)
@@ -374,6 +426,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);
@@ -381,7 +457,7 @@
pageIndex = 1;
}
- List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(acceptData.getDetailSystem(), acceptData.getVersion());
+ List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(acceptData.getDetailSystem(), acceptData.getVersion(), acceptData.getChannel());
String cacheMD5 = "0";
@@ -419,12 +495,7 @@
}
}
- 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();
@@ -476,11 +547,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();
@@ -488,6 +561,13 @@
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()));
@@ -503,7 +583,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<>();
@@ -548,18 +628,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());
+ 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,
@@ -610,6 +725,90 @@
object.put("data", array);
out.print(JsonUtil.loadTrueJson(object.toString()));
+ }
+
+
+ //鏂扮増鐑棬鎼滅储
+ 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;
+ }
+ }
+ }
+
+ 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()));
}
// 鑾峰彇鐢ㄦ埛淇℃伅
@@ -674,7 +873,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));
}
@@ -761,6 +964,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()));
+ }
+
+
/**
* 鐩稿叧瑙嗛
*
@@ -774,12 +1006,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());
+ 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,
@@ -818,7 +1055,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,
@@ -931,17 +1168,69 @@
}
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(""));
+ }
+
/**
* 鐧诲綍
@@ -971,11 +1260,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()));
+ }
}
}
@@ -1034,6 +1382,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)));
@@ -1121,7 +1475,7 @@
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 "";
--
Gitblit v1.8.0