From 9fc5a5bf46a7db97bec59a672cf2b16fb9b9d832 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 16 十月 2019 16:47:27 +0800
Subject: [PATCH] VIVO推送修改
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserAccountControllerV2.java | 28 +++++++++++++++-------------
1 files changed, 15 insertions(+), 13 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 2babc45..0dd03ea 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,6 +25,7 @@
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;
@@ -94,6 +95,9 @@
private DeviceTokenOPPOService deviceTokenOPPOService;
@Resource
+ private DeviceTokenVIVOService deviceTokenVIVOService;
+
+ @Resource
private TaoBaoUnionConfigService taoBaoUnionConfigService;
@Resource
@@ -128,11 +132,9 @@
@Resource
private DeviceActiveService deviceActiveService;
-
+
@Resource
private BindRemindService bindRemindService;
-
-
/**
* 鏂扮増鐧诲綍 V1.5.3
@@ -147,7 +149,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(),
@@ -194,11 +196,12 @@
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());
}
}
});
@@ -221,7 +224,7 @@
e1.printStackTrace();
}
}
-
+
} catch (Exception e) {
out.print(JsonUtil.loadFalseResult("鐧诲綍澶辫触"));
try {
@@ -232,8 +235,6 @@
}
}
-
-
/**
* 缁戝畾鐢佃瘽鍙风爜 V2.0.1 寰俊鐧诲綍
*
@@ -244,7 +245,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) {
@@ -266,7 +268,7 @@
out.print(JsonUtil.loadFalseResult("key鍊间笉鑳戒负绌�"));
return;
}
-
+
phone = phone.replaceAll(" ", "");
String oldVCode = redisManager.getSMSVCode(phone, SMSHistory.TYPE_BIND);
@@ -290,7 +292,7 @@
out.print(JsonUtil.loadFalseResult(1, "缁戝畾澶辫触"));
}
}
-
+
/**
* 缁戝畾鐢佃瘽鍙风爜 V2.0.1 寰俊鐧诲綍
*
@@ -309,5 +311,5 @@
bindRemindService.addBindPhone(uid);
out.print(JsonUtil.loadTrueResult("璁板綍鎴愬姛"));
}
-
+
}
--
Gitblit v1.8.0