fanli-server.git

			@@ -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
			@@ -131,8 +135,6 @@

			@Resource
			private BindRemindService bindRemindService;



			/**
			* 新版登录 V1.5.3
			@@ -195,10 +197,11 @@
			}
			}

			// 绑定oppo推送
			// 绑定oppo,VIVO推送
			DeviceActive active = deviceActiveService.getFirstActiveInfo(acceptData.getDevice());
			if (active != null) {
			deviceTokenOPPOService.bindUid(uuser.getId(), active.getId());
			deviceTokenVIVOService.bindUid(uuser.getId(), active.getId());
			}
			}
			});
			@@ -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) {