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 | 235 +++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 173 insertions(+), 62 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 9181699..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,6 +1,7 @@
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.Collection;
import com.yeshi.buwan.domain.*;
@@ -15,6 +16,7 @@
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;
@@ -22,6 +24,7 @@
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;
@@ -32,9 +35,11 @@
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;
@@ -43,6 +48,7 @@
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;
@@ -62,6 +68,8 @@
Logger searchKeyLogger = LoggerFactory.getLogger("searchKey");
Logger logger = LoggerFactory.getLogger(UserParser.class);
+
+ Logger deviceGeoLogger = LoggerFactory.getLogger("deviceGeo");
@Resource
@@ -104,6 +112,12 @@
@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());
@@ -795,6 +809,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();
@@ -815,7 +855,18 @@
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
@@ -1120,13 +1171,13 @@
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 = "鏃犲悕姘�";
@@ -1162,7 +1213,7 @@
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;
}
@@ -1239,33 +1290,121 @@
* @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()));
+ }
}
}
@@ -1355,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);
@@ -1400,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");// 楠岃瘉鐮�
@@ -1425,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 {
@@ -1469,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.replace("\n",""), path);
+ boolean isS = StringUtil.generateImageFromBase64(base64.replace("\n", ""), path);
if (!isS)
return "";
@@ -1490,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