fanli-server.git

			@@ -1,13 +1,14 @@
			package com.yeshi.fanli.service.inter.user;

			import javax.servlet.http.HttpServletRequest;
			import javax.servlet.http.HttpSession;

			import com.yeshi.fanli.entity.SystemEnum;
			import com.yeshi.fanli.entity.accept.AcceptData;
			import com.yeshi.fanli.entity.bus.user.LoginResult;
			import com.yeshi.fanli.entity.bus.user.UserInfo;
			import com.yeshi.fanli.entity.bus.user.WeiXinUser;
			import com.yeshi.fanli.exception.user.UserAccountException;
			import org.yeshi.utils.entity.ProxyIP;

			import javax.servlet.http.HttpServletRequest;

			/**
			* 登录服务
			@@ -19,7 +20,6 @@
			/**
			* 用户登录
			*
			* @param session
			* @param code
			* @param phone
			* @param wxinstall
			@@ -45,29 +45,6 @@
			public LoginResult loginNoInstallWX(AcceptData acceptData, String appId, String code, String phone,
			UserInfo tbUserInfo, int loginType) throws UserAccountException;

			/**
			* 打通微信账号与其他类型的一个账号
			*
			* @param session
			* @throws UserAccountException
			*/
			public void connectUsers(HttpSession session) throws UserAccountException;

			/**
			* 备份重要的用户信息
			*
			* @param uid
			*/
			public String backupUserImportantInfo(Long uid);

			/**
			* 打通两个账号，以主账号为主
			*
			* @param mainUser
			* @param lessUser
			* @throws UserAccountException
			*/
			public void connectUsers(UserInfo mainUser, UserInfo lessUser) throws UserAccountException;

			/**
			* 注册用户
			@@ -76,32 +53,34 @@
			*/
			public void register(UserInfo userInfo) throws UserAccountException;


			/**
			* 根据系统与微信unionid获取用户信息
			*
			* @param appId
			* @param system
			* @param unionId
			* @return
			* @throws UserAccountException
			*/
			public UserInfo getUserInfoByWXUnionId(String appId, String unionId) throws UserAccountException;
			public UserInfo getUserInfoByWXUnionId(SystemEnum system, String unionId) throws UserAccountException;

			/**
			* 根据系统和淘宝的Openid寻找用户
			*
			* @param appId
			* @param system
			* @param openId
			* @return
			* @throws UserAccountException
			*/
			public UserInfo getUserInfoByTaoBaoOpenId(String appId, String openId) throws UserAccountException;
			public UserInfo getUserInfoByTaoBaoOpenId(SystemEnum system, String openId) throws UserAccountException;


			/**
			* 根据系统和电话号码寻找用户
			*
			* @param appId
			* @param system
			* @param phone
			* @return
			* @throws UserAccountException
			*/
			public UserInfo getUserInfoByPhone(String appId, String phone) throws UserAccountException;
			public UserInfo getUserInfoByPhone(SystemEnum system, String phone) throws UserAccountException;

			public void addUser(UserInfo user);

			@@ -172,30 +151,33 @@
			public String repairPortrait(Long uid);

			/**
			* 电话号码登录 1.5.3
			*
			* @param request
			* @param first
			* @param appId
			* 电话号码登录 1.5.3
			* @param ipInfo
			* @param acceptData
			* @param loginType
			* @param vcode
			* @param phone
			* @param appId
			* @return
			* @throws UserAccountException
			*/
			public UserInfo loginPhone(HttpServletRequest request, int loginType, String vcode, String phone, String appId)
			@Deprecated
			public UserInfo loginPhone(ProxyIP ipInfo,AcceptData acceptData, int loginType, String vcode, String phone, String appId)
			throws UserAccountException;


			/**
			* 微信登录 1.5.3
			*
			* @param request
			* @param first
			* @param appId
			* @param code
			* @param ipInfo
			* @param acceptData
			* @param loginType
			* @param code
			* @param appId
			* @return
			* @throws UserAccountException
			*/
			public UserInfo loginWinXin(HttpServletRequest request, AcceptData acceptData, int loginType, String code,
			@Deprecated
			public UserInfo loginWinXin(ProxyIP ipInfo,AcceptData acceptData, int loginType, String code,
			String appId) throws UserAccountException;

			/**
			@@ -216,12 +198,11 @@
			*/
			public void bindWeiXin(AcceptData acceptData, Long uid, String code) throws UserAccountException;



			/**
			* 绑定微信 V1.5.3
			*
			* @param uid
			* @param code
			* @param wxUser
			* @throws UserAccountException
			*/
			public void bindWeiXin( Long uid, WeiXinUser wxUser ) throws UserAccountException;
			@@ -261,8 +242,7 @@

			/**
			* 2.0.1 新登录方式 -微信
			*
			* @param request
			* @param ipInfo
			* @param acceptData
			* @param loginType
			* @param wxCode
			@@ -270,20 +250,46 @@
			* @return
			* @throws UserAccountException
			*/
			public UserInfo loginWeiXinNew(HttpServletRequest request, AcceptData acceptData, int loginType, String wxCode,
			public UserInfo loginWeiXinNew(ProxyIP ipInfo,AcceptData acceptData, int loginType, String wxCode,
			String appId) throws UserAccountException;

			/**
			* 未注册之前绑定手机号
			*
			* @param ipinfo
			* @param acceptData
			* @param phone
			* @param key
			* @param appId
			* @param request
			* @return
			* @throws UserAccountException
			*/
			public UserInfo bindPhoneToLogin(String phone, String key, String appId, HttpServletRequest request)
			public UserInfo bindPhoneToLogin(ProxyIP ipinfo, AcceptData acceptData, String phone, String key)
			throws UserAccountException;

			/**
			* 手机登录需要绑定微信
			* @param ipinfo
			* @param acceptData
			* @param loginType
			* @param vcode
			* @param phone
			* @param appId
			* @return
			* @throws UserAccountException
			*/
			public UserInfo loginPhoneNew(ProxyIP ipinfo, AcceptData acceptData, int loginType, String vcode, String phone, String appId)
			throws UserAccountException;

			/**
			* 绑定微信登录 + 手机号key
			* @param ipInfo
			* @param acceptData
			* @param code
			* @param appId
			* @param key
			* @return
			* @throws UserAccountException
			*/
			public UserInfo bindWXToLogin(ProxyIP ipInfo, AcceptData acceptData, String code, String appId,
			String key) throws UserAccountException;

			}