From 53ea50a0c82d776fce71369bd986396537a8d0e5 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 07 十一月 2019 16:05:18 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserAccountControllerV2.java | 53 ++++++++++++++++++++++++++++++++++-------------------
1 files changed, 34 insertions(+), 19 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserAccountControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserAccountControllerV2.java
index 7d230fa..5c155f0 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserAccountControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserAccountControllerV2.java
@@ -25,8 +25,10 @@
import com.yeshi.fanli.service.inter.push.DeviceActiveService;
import com.yeshi.fanli.service.inter.push.DeviceTokenHWService;
import com.yeshi.fanli.service.inter.push.DeviceTokenOPPOService;
+import com.yeshi.fanli.service.inter.push.DeviceTokenVIVOService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;
import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinOriginService;
+import com.yeshi.fanli.service.inter.user.BindRemindService;
import com.yeshi.fanli.service.inter.user.ForbiddenUserIdentifyCodeService;
import com.yeshi.fanli.service.inter.user.ShamUserService;
import com.yeshi.fanli.service.inter.user.SpreadUserImgService;
@@ -43,7 +45,6 @@
import com.yeshi.fanli.util.RedisManager;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.ThreadUtil;
-import com.yeshi.fanli.util.VersionUtil;
import com.yeshi.fanli.util.account.UserUtil;
import com.yeshi.fanli.util.annotation.RequestSerializableByKey;
@@ -93,6 +94,9 @@
private DeviceTokenOPPOService deviceTokenOPPOService;
@Resource
+ private DeviceTokenVIVOService deviceTokenVIVOService;
+
+ @Resource
private TaoBaoUnionConfigService taoBaoUnionConfigService;
@Resource
@@ -128,7 +132,8 @@
@Resource
private DeviceActiveService deviceActiveService;
-
+ @Resource
+ private BindRemindService bindRemindService;
/**
* 鏂扮増鐧诲綍 V1.5.3
@@ -143,7 +148,7 @@
* @param out
*/
@RequestMapping(value = "login", method = RequestMethod.POST)
- public void login(AcceptData acceptData, int loginType, String vcode, String phone, String code,
+ public void login(AcceptData acceptData, int loginType, String vcode, String phone, String code,
HttpServletRequest request, PrintWriter out) {
try {
BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
@@ -182,19 +187,11 @@
LogHelper.errorDetailInfo(e);
}
- if (VersionUtil.greaterThan_1_5_60(acceptData.getPlatform(), acceptData.getVersion())) {
- /* 鏂颁汉绾㈠寘 */
- try {
- userTaoLiJinOriginService.synchDeviceHongbao(uuser.getId(), device);
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- // 缁戝畾oppo鎺ㄩ��
+ // 缁戝畾oppo,VIVO鎺ㄩ��
DeviceActive active = deviceActiveService.getFirstActiveInfo(acceptData.getDevice());
if (active != null) {
deviceTokenOPPOService.bindUid(uuser.getId(), active.getId());
+ deviceTokenVIVOService.bindUid(uuser.getId(), active.getId());
}
}
});
@@ -217,7 +214,7 @@
e1.printStackTrace();
}
}
-
+
} catch (Exception e) {
out.print(JsonUtil.loadFalseResult("鐧诲綍澶辫触"));
try {
@@ -228,8 +225,6 @@
}
}
-
-
/**
* 缁戝畾鐢佃瘽鍙风爜 V2.0.1 寰俊鐧诲綍
*
@@ -240,7 +235,8 @@
*/
@RequestSerializableByKey(key = "'bindPhoneLogin-'+#phone")
@RequestMapping(value = "bindPhoneLogin")
- public void bindPhoneLogin(AcceptData acceptData,String vcode, String phone, String key, HttpServletRequest request, PrintWriter out) {
+ public void bindPhoneLogin(AcceptData acceptData, String vcode, String phone, String key,
+ HttpServletRequest request, PrintWriter out) {
BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
acceptData.getPackages());
if (system == null) {
@@ -262,7 +258,7 @@
out.print(JsonUtil.loadFalseResult("key鍊间笉鑳戒负绌�"));
return;
}
-
+
phone = phone.replaceAll(" ", "");
String oldVCode = redisManager.getSMSVCode(phone, SMSHistory.TYPE_BIND);
@@ -286,5 +282,24 @@
out.print(JsonUtil.loadFalseResult(1, "缁戝畾澶辫触"));
}
}
-
+
+ /**
+ * 缁戝畾鐢佃瘽鍙风爜 V2.0.1 寰俊鐧诲綍
+ *
+ * @param acceptData
+ * @param vcode
+ * @param phone
+ * @param out
+ */
+ @RequestMapping(value = "recordBind")
+ public void recordBind(AcceptData acceptData, Long uid, PrintWriter out) {
+ if (uid == null || uid <= 0) {
+ out.print(JsonUtil.loadFalseResult("鐢ㄦ埛id涓虹┖"));
+ return;
+ }
+
+ bindRemindService.addBindPhone(uid);
+ out.print(JsonUtil.loadTrueResult("璁板綍鎴愬姛"));
+ }
+
}
--
Gitblit v1.8.0