From 651a15c78f668bef3859d9ed1bb7ad0b669d3600 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 03 七月 2020 17:52:07 +0800
Subject: [PATCH] 多APP优化
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserAccountController.java | 116 ++++++++++++++++++----------------------------------------
1 files changed, 36 insertions(+), 80 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserAccountController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserAccountController.java
index 5a3db7e..9660ab3 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserAccountController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserAccountController.java
@@ -7,6 +7,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
+import com.yeshi.fanli.util.*;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
@@ -14,6 +15,7 @@
import org.yeshi.utils.encrypt.DESUtil;
import com.alipay.api.AlipayApiException;
+import com.google.gson.Gson;
import com.yeshi.fanli.dto.wx.WXAccountInfoDTO;
import com.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.bus.user.BindingAccount;
@@ -33,6 +35,7 @@
import com.yeshi.fanli.exception.user.AlipayAccountException;
import com.yeshi.fanli.exception.user.AlipayTransferException;
import com.yeshi.fanli.exception.user.UserAccountException;
+import com.yeshi.fanli.exception.user.UserInfoException;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.config.BusinessSystemService;
import com.yeshi.fanli.service.inter.config.ConfigService;
@@ -63,15 +66,11 @@
import com.yeshi.fanli.service.inter.user.UserShareGoodsRecordService;
import com.yeshi.fanli.service.inter.user.UserSystemCouponService;
import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;
-import com.yeshi.fanli.util.Constant;
-import com.yeshi.fanli.util.GsonUtil;
-import com.yeshi.fanli.util.RedisManager;
-import com.yeshi.fanli.util.StringUtil;
-import com.yeshi.fanli.util.ThreadUtil;
import com.yeshi.fanli.util.account.UserUtil;
import com.yeshi.fanli.util.wx.WXLoginUtil;
import net.sf.json.JSONObject;
+import org.yeshi.utils.entity.ProxyIP;
/**
* 璐︽埛绯荤粺
@@ -173,10 +172,6 @@
@Resource
private DeviceActiveService deviceActiveService;
- private static final String PASSWORD_MAX_ERROR = "password_max_error";
- private static final String EXTRACT_MIN_MONEY = "extract_min_money";
- private static final String EXTRACT_MAX_MONEY = "extract_max_money";
-
/**
*
* @param acceptData
@@ -194,6 +189,13 @@
public void login(AcceptData acceptData, String code, String vcode, String phone, boolean wxinstall,
String tbOpenid, String tbNickName, String tbPortrait, String tbSession, int loginType, Boolean first,
HttpSession session, HttpServletRequest request, PrintWriter out) {
+
+ // 2.0浠ヤ笅鐗堟湰涓嶅厑璁哥櫥褰�
+ if (!VersionUtil.greaterThan_2_0(acceptData.getPlatform(), acceptData.getVersion())) {
+ out.print("璇峰崌绾у埌鏈�鏂扮増鏈�");
+ return;
+ }
+
BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
acceptData.getPackages());
if (system == null) {
@@ -261,14 +263,6 @@
ThreadUtil.run(new Runnable() {
public void run() {
try {
- int platformType = 0;
- String platform = acceptData.getPlatform();
- if ("android".equals(platform)) {
- platformType = 1;
- } else if ("ios".equals(platform)) {
- platformType = 2;
- }
- userSystemCouponService.copyLotteryPrize(uuser.getId(), platformType, acceptData.getDevice());
// 缁戝畾oppo,vivo鎺ㄩ��
DeviceActive active = deviceActiveService.getFirstActiveInfo(acceptData.getDevice());
if (active != null) {
@@ -284,7 +278,7 @@
} catch (UserAccountException e) {
try {
- LogHelper.cookieLog("鐧诲綍鍑洪敊:" + e.getCode() + "-" + e.getMessage());
+ LogHelper.error("鐧诲綍鍑洪敊:" + e.getCode() + "-" + e.getMessage());
} catch (Exception e1) {
e1.printStackTrace();
}
@@ -308,6 +302,12 @@
@RequestMapping(value = "register")
public void register(AcceptData acceptData, String tbOpenid, String tbNickName, String tbPortrait, String vcode,
String phone, HttpServletRequest request, HttpSession session, PrintWriter out) {
+ // 2.0浠ヤ笅鐗堟湰涓嶅厑璁哥櫥褰�
+ if (!VersionUtil.greaterThan_2_0(acceptData.getPlatform(), acceptData.getVersion())) {
+ out.print("璇峰崌绾у埌鏈�鏂扮増鏈�");
+ return;
+ }
+
BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
acceptData.getPackages());
if (system == null) {
@@ -359,40 +359,6 @@
}
/**
- * 璐﹀彿鎵撻��
- *
- * @param acceptData
- * @param mainUid
- * @param lessUid
- * @param session
- * @param out
- */
- @RequestMapping(value = "connect")
- public void connect(AcceptData acceptData, long mainUid, long lessUid, HttpSession session, PrintWriter out) {
- BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
- acceptData.getPackages());
- if (system == null) {
- out.print(JsonUtil.loadFalseResult("绯荤粺涓嶅瓨鍦�"));
- return;
- }
-
- if (mainUid == 0 || lessUid == 0) {
- out.print(JsonUtil.loadFalseResult(1, "璇蜂笂浼犳墦閫氱敤鎴稩D"));
- return;
- }
-
- try {
- userAccountService.connectUsers(new UserInfo(mainUid), new UserInfo(lessUid));
- UserInfo user = userInfoService.getUserByIdWithMybatis(mainUid);
- JSONObject data = new JSONObject();
- data.put("user", GsonUtil.toJsonExpose(UserUtil.filterForClientUser(user)));
- out.print(JsonUtil.loadTrueResult(data));
- } catch (UserAccountException e) {
- out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMsg()));
- }
- }
-
- /**
* 鑾峰彇鐢ㄦ埛ID
*
* @param acceptData
@@ -420,7 +386,7 @@
return;
}
try {
- user = userAccountService.getUserInfoByWXUnionId(system.getAppid(), weiXinUser.getUnionid());
+ user = userAccountService.getUserInfoByWXUnionId(SystemInfoUtil.getSystem(acceptData), weiXinUser.getUnionid());
} catch (UserAccountException e) {
try {
LogHelper.errorDetailInfo(e, null, "鑾峰彇鐢ㄦ埛淇℃伅鍑洪敊");
@@ -430,7 +396,7 @@
}
} else if (!StringUtil.isNullOrEmpty(tbOpenid)) {
try {
- user = userAccountService.getUserInfoByTaoBaoOpenId(system.getAppid(), tbOpenid);
+ user = userAccountService.getUserInfoByTaoBaoOpenId(SystemInfoUtil.getSystem(acceptData), tbOpenid);
} catch (UserAccountException e) {
try {
LogHelper.errorDetailInfo(e);
@@ -440,7 +406,7 @@
}
} else if (!StringUtil.isNullOrEmpty(phone)) {
try {
- user = userAccountService.getUserInfoByPhone(system.getAppid(), phone);
+ user = userAccountService.getUserInfoByPhone(SystemInfoUtil.getSystem(acceptData), phone);
} catch (UserAccountException e) {
try {
LogHelper.errorDetailInfo(e);
@@ -796,8 +762,7 @@
return;
}
- String key = "bindalipay-" + uid;
-
+ String key = RedisKeyEnum.getRedisKey(RedisKeyEnum.bindAlipay, uid + "");
if (!StringUtil.isNullOrEmpty(redisManager.getCommonString(key))) {
out.print(JsonUtil.loadFalseResult(2, "鏈嶅姟鍣ㄧ箒蹇欙紝璇风◢鍚庨噸璇�"));
return;
@@ -852,8 +817,7 @@
return;
}
- String key = "bindalipay-" + uid;
-
+ String key = RedisKeyEnum.getRedisKey(RedisKeyEnum.bindAlipay, uid + "");
if (!StringUtil.isNullOrEmpty(redisManager.getCommonString(key))) {
out.print(JsonUtil.loadFalseResult(1001, "鏈嶅姟鍣ㄧ箒蹇欙紝璇风◢鍚庨噸璇�"));
return;
@@ -943,8 +907,7 @@
return;
}
- String key = "bindalipay-" + uid;
-
+ String key = RedisKeyEnum.getRedisKey(RedisKeyEnum.bindAlipay, uid + "");
if (!StringUtil.isNullOrEmpty(redisManager.getCommonString(key))) {
out.print(JsonUtil.loadFalseResult(1001, "鏈嶅姟鍣ㄧ箒蹇欙紝璇风◢鍚庨噸璇�"));
return;
@@ -983,6 +946,7 @@
userInfoModifyRecordService.addModifyRecord(uid, ModifyTypeEnum.bindAlipay, account);
} catch (AlipayTransferException e1) {
+ LogHelper.error("鏀粯瀹濋獙璇佸嚭閿�:"+new Gson().toJson(e1));
if (e1.getSubCode().equalsIgnoreCase("PAYEE_NOT_EXIST")) {
String msg = "绯荤粺鏈兘鎴愬姛杞处0.1鍏冿紝鎻愮幇璐﹀彿淇℃伅鏈夎锛岃鏍稿鍚庨噸鏂板～鍐欍��";
out.print(JsonUtil.loadFalseResult(1, msg));
@@ -1074,7 +1038,7 @@
data.put("totalUnGetTiChengMoney",
hongBaoV2Service.getUnGetTiChengMoney(uid).setScale(2, BigDecimal.ROUND_DOWN).toString()); // 鏈埌璐︽彁鎴�
// 灞曠ず鎻愭垚鏁版嵁
- if (configService.iosOnLining(Integer.parseInt(acceptData.getVersion())))
+ if (configService.iosOnLining(Integer.parseInt(acceptData.getVersion()),SystemInfoUtil.getSystem(acceptData)))
data.put("showTiCheng", false);
else
data.put("showTiCheng", spreadImgCount + shareCount > 0);
@@ -1183,6 +1147,12 @@
public void loginNew(AcceptData acceptData, String vcode, String phone, String code, int loginType,
HttpServletRequest request, PrintWriter out) {
+ // 2.0浠ヤ笅鐗堟湰涓嶅厑璁哥櫥褰�
+ if (!VersionUtil.greaterThan_2_0(acceptData.getPlatform(), acceptData.getVersion())) {
+ out.print("璇峰崌绾у埌鏈�鏂扮増鏈�");
+ return;
+ }
+
try {
BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
acceptData.getPackages());
@@ -1194,12 +1164,12 @@
UserInfo userInfo = null;
// 鎵嬫満鐧诲綍
if (loginType == 1) {
- userInfo = userAccountService.loginPhone(request, loginType, vcode, phone, system.getAppid());
+ userInfo = userAccountService.loginPhone(new ProxyIP(request.getRemoteHost(),request.getRemotePort()), acceptData, loginType, vcode, phone, system.getAppid());
}
// 寰俊鐧诲綍
if (loginType == 2) {
- userInfo = userAccountService.loginWinXin(request, acceptData, loginType, code, system.getAppid());
+ userInfo = userAccountService.loginWinXin(new ProxyIP(request.getRemoteHost(),request.getRemotePort()), acceptData, loginType, code, system.getAppid());
}
if (userInfo == null) {
@@ -1220,20 +1190,6 @@
LogHelper.errorDetailInfo(e);
}
- /* 鍚屾鏈櫥褰曚箣鍓嶈澶囨娊濂栨暟鎹� */
- try {
- int platformType = 0;
- String platform = acceptData.getPlatform();
- if ("android".equals(platform)) {
- platformType = 1;
- } else if ("ios".equals(platform)) {
- platformType = 2;
- }
- userSystemCouponService.copyLotteryPrize(uuser.getId(), platformType, device);
- } catch (Exception e) {
- e.printStackTrace();
- }
-
// 缁戝畾oppo鎺ㄩ��
DeviceActive active = deviceActiveService.getFirstActiveInfo(acceptData.getDevice());
if (active != null) {
@@ -1248,7 +1204,7 @@
} catch (UserAccountException e) {
out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMsg()));
try {
- LogHelper.cookieLog("鐧诲綍鍑洪敊:" + e.getCode() + "-" + e.getMessage());
+ LogHelper.error("鐧诲綍鍑洪敊:" + e.getCode() + "-" + e.getMessage());
} catch (Exception e1) {
e1.printStackTrace();
}
@@ -1377,5 +1333,5 @@
out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMsg()));
}
}
-
+
}
--
Gitblit v1.8.0