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/service/inter/user/UserAccountService.java | 99 ++++++++++++++++++++++++++++++++----------------- 1 files changed, 64 insertions(+), 35 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserAccountService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserAccountService.java index b29d3ad..a1abe5c 100644 --- a/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserAccountService.java +++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserAccountService.java @@ -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 @@ -53,32 +53,34 @@ */ public void register(UserInfo userInfo) throws UserAccountException; + /** * 鏍规嵁绯荤粺涓庡井淇nionid鑾峰彇鐢ㄦ埛淇℃伅 - * - * @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); @@ -149,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; /** @@ -193,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; @@ -238,8 +242,7 @@ /** * 2.0.1 鏂扮櫥褰曟柟寮� -寰俊 - * - * @param request + * @param ipInfo * @param acceptData * @param loginType * @param wxCode @@ -247,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; + + /** + * 缁戝畾寰俊鐧诲綍 + 鎵嬫満鍙穔ey + * @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; + } -- Gitblit v1.8.0