From b30fb8afd3cd6228bda9b182dc412bb3c8daf69c Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 17 十月 2024 16:28:48 +0800
Subject: [PATCH] CMQ转为Rabbitmq
---
src/main/java/com/yeshi/buwan/controller/parser/UserParser.java | 469 +++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 414 insertions(+), 55 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 84bff4d..54151b5 100644
--- a/src/main/java/com/yeshi/buwan/controller/parser/UserParser.java
+++ b/src/main/java/com/yeshi/buwan/controller/parser/UserParser.java
@@ -1,36 +1,45 @@
package com.yeshi.buwan.controller.parser;
import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
import com.google.gson.reflect.TypeToken;
-import com.yeshi.buwan.domain.*;
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.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.inter.system.SystemConfigService;
-import com.yeshi.buwan.service.manager.SolrAlbumVideoDataManager;
-import com.yeshi.buwan.service.manager.SolrInternetSearchVideoDataManager;
+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.rank.IqiyiRankUtil;
+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;
@@ -38,18 +47,27 @@
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.IOException;
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;
@@ -77,10 +95,23 @@
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;
public void getUid(AcceptData acceptData, HttpServletRequest request, PrintWriter out) {
DetailSystem detailSystem = systemService.getDetailSystemByPackage(acceptData.getPackageName());
@@ -91,7 +122,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);
@@ -316,7 +347,7 @@
object.put("data", array);
out.print(JsonUtil.loadTrueJson(object.toString()));
} else {
- List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(detailSystem, acceptData.getVersion(),acceptData.getChannel());
+ List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(detailSystem, acceptData.getVersion(), acceptData.getChannel());
String cacheMD5 = "0";
if (resourceList != null && resourceList.size() > 0)
for (Long l : resourceList)
@@ -403,6 +434,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);
@@ -410,7 +465,7 @@
pageIndex = 1;
}
- List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(acceptData.getDetailSystem(), acceptData.getVersion(),acceptData.getChannel());
+ List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(acceptData.getDetailSystem(), acceptData.getVersion(), acceptData.getChannel());
String cacheMD5 = "0";
@@ -500,11 +555,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();
@@ -534,7 +591,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<>();
@@ -579,18 +636,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(),acceptData.getChannel());
+ 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,
@@ -711,6 +803,32 @@
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();
@@ -789,7 +907,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));
}
@@ -876,6 +998,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()));
+ }
+
+
/**
* 鐩稿叧瑙嗛
*
@@ -889,12 +1040,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(),acceptData.getChannel());
+ 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,
@@ -933,7 +1089,7 @@
return;
}
- List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(acceptData.getDetailSystem(), acceptData.getVersion(),acceptData.getChannel());
+ 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,
@@ -998,7 +1154,7 @@
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;
}
@@ -1040,13 +1196,13 @@
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++) {
@@ -1059,13 +1215,56 @@
content = title;
}
- boolean isS = MailSenderUtil.sendEmail(account, "ysyz17784739772@126.com", "weikou2014", title,
- content);
+ 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(""));
+ }
+
/**
* 鐧诲綍
@@ -1074,32 +1273,179 @@
* @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);
}
-
- if (StringUtil.isNullOrEmpty(pwd)) {
- out.print(JsonUtil.loadFalseJson("璇蜂笂浼燩wd"));
- return;
- }
-
- // DetailSystem ds =
- // systemService.getDetailSystemByPackage(packageName);
- // 娉ㄥ唽 --鐢ㄦ埛鍚�,鏄电О,瀵嗙爜
-
LoginInfoDto loginInfoDto = new LoginInfoDto();
- loginInfoDto.setLoginType(LoginUser.LOGIN_TYPE_EMAIL);
loginInfoDto.setSystemId(acceptData.getDetailSystem().getSystem().getId());
- loginInfoDto.setEmail(account);
- loginInfoDto.setPwd(StringUtil.Md5(pwd));
+ 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;
+ }
+
try {
LoginUser user = userService.login(loginInfoDto);
out.print(JsonUtil.loadTrueJson(StringUtil.outPutResultJson(user)));
} catch (LoginUserException e) {
- out.print(JsonUtil.loadFalseJson(e.getMessage()));
+ 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()));
+ }
}
}
@@ -1131,7 +1477,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);
@@ -1158,6 +1504,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)));
@@ -1170,6 +1522,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");// 楠岃瘉鐮�
@@ -1195,7 +1549,7 @@
}
// 娉ㄥ唽 --鐢ㄦ埛鍚�,鏄电О,瀵嗙爜
- LoginUser user = userService.getLoginUserByOpenId(email);
+ LoginUser user = userService.getValidLoginUserByEmail(email, acceptData.getDetailSystem().getSystem().getId());
if (user == null) {
out.print(JsonUtil.loadFalseJson("璇ョ敤鎴蜂笉瀛樺湪"));
} else {
@@ -1239,13 +1593,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 "";
@@ -1276,7 +1631,11 @@
if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
ip = request.getRemoteAddr();
}
- out.print(ip + "-----" + IPUtil.getIPContry(request.getRemoteAddr()));
+ try {
+ out.print(ip + "-----" + new Gson().toJson(IPUtil.getLocalIPInfo(request.getRemoteAddr())));
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
}
--
Gitblit v1.8.0