From e34e91568095f88b3731046d18d776961556e089 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期五, 11 十二月 2020 09:17:32 +0800
Subject: [PATCH] 优化员工认证功能
---
service-front/src/main/java/com/java110/front/smo/staff/impl/StaffAuthSMOImpl.java | 246 +++++--------------------------------------------
1 files changed, 25 insertions(+), 221 deletions(-)
diff --git a/service-front/src/main/java/com/java110/front/smo/staff/impl/StaffAuthSMOImpl.java b/service-front/src/main/java/com/java110/front/smo/staff/impl/StaffAuthSMOImpl.java
index eb18143..17cf74c 100644
--- a/service-front/src/main/java/com/java110/front/smo/staff/impl/StaffAuthSMOImpl.java
+++ b/service-front/src/main/java/com/java110/front/smo/staff/impl/StaffAuthSMOImpl.java
@@ -5,17 +5,13 @@
import com.java110.core.base.smo.front.AbstractFrontServiceSMO;
import com.java110.core.context.IPageData;
import com.java110.core.context.PageData;
-import com.java110.core.factory.AuthenticationFactory;
import com.java110.core.factory.WechatFactory;
import com.java110.dto.owner.OwnerAppUserDto;
import com.java110.dto.smallWeChat.SmallWeChatDto;
-import com.java110.dto.user.UserDto;
import com.java110.front.properties.WechatAuthProperties;
import com.java110.front.smo.staff.IStaffAuthSMO;
-import com.java110.utils.cache.CommonCache;
-import com.java110.utils.constant.CommonConstant;
+import com.java110.utils.cache.MappingCache;
import com.java110.utils.constant.ResponseConstant;
-import com.java110.utils.constant.ServiceCodeConstant;
import com.java110.utils.constant.ServiceConstant;
import com.java110.utils.constant.WechatConstant;
import com.java110.utils.exception.SMOException;
@@ -33,12 +29,8 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import java.net.URL;
import java.net.URLEncoder;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
-import java.util.UUID;
/**
* wx鐧诲綍
@@ -65,16 +57,8 @@
public ResponseEntity<String> getPageAccessToken(IPageData pd, HttpServletRequest request) throws SMOException {
JSONObject paramIn = JSONObject.parseObject(pd.getReqData());
String authCode = paramIn.getString("code");
- String state = paramIn.getString("state");
- String paramStr = CommonCache.getAndRemoveValue(paramIn.getString("urlCode"));
-
- if (StringUtil.isEmpty(paramStr)) {
- return ResultVo.redirectPage("/");
- }
-
- JSONObject param = JSONObject.parseObject(paramStr);
- String redirectUrl = param.getString("redirectUrl");
- String errorUrl = param.getString("errorUrl");
+ String staffId = paramIn.getString("staffId");
+ String storeId = paramIn.getString("storeId");
String wId = paramIn.getString("wId");
SmallWeChatDto smallWeChatDto = null;
if (!StringUtil.isEmpty(wId)) {
@@ -97,7 +81,7 @@
logger.debug("璋冪敤寰俊鎹㈠幓openId ", paramOut);
if (paramOut.getStatusCode() != HttpStatus.OK) {
- return ResultVo.redirectPage(errorUrl);
+ return ResultVo.redirectPage("/");
}
@@ -106,53 +90,17 @@
//鑾峰彇 openId
String openId = paramObj.getString("openid");
- int loginFlag = paramIn.getInteger("loginFlag");
- //璇存槑鏄櫥褰曢〉闈紝涓嬪彂code 灏卞彲浠ワ紝涓嶉渶瑕佷笅鍙慿ey 涔嬬被
- if (loginFlag == LOGIN_PAGE) {
- //灏唎penId鏀惧埌redis 缂撳瓨锛岀粰鍓嶆涓嬪彂涓存椂绁ㄦ嵁
- String code = UUID.randomUUID().toString();
- CommonCache.setValue(code, openId, expireTime);
- return ResultVo.redirectPage(errorUrl + "?code=" + code);
- }
+ JSONObject paramAuth = new JSONObject();
+ paramAuth.put("openId", openId);
+ paramAuth.put("staffId", staffId);
+ paramAuth.put("storeId", storeId);
+ paramAuth.put("appType", "WECHAT");
+ paramAuth.put("state", "2002");
- //鍒ゆ柇褰撳墠openId 鏄惁缁戝畾浜嗕笟涓�
- pd = PageData.newInstance().builder("-1", "", "", pd.getReqData(),
- "", "", "", "",
- pd.getAppId());
- OwnerAppUserDto ownerAppUserDto = new OwnerAppUserDto();
- ownerAppUserDto.setOpenId(openId);
- List<OwnerAppUserDto> ownerAppUserDtos = super.getForApis(pd, ownerAppUserDto, ServiceCodeConstant.LIST_APPUSERBINDINGOWNERS, OwnerAppUserDto.class);
-
- if (ownerAppUserDtos == null || ownerAppUserDtos.size() < 1) {
- //灏唎penId鏀惧埌redis 缂撳瓨锛岀粰鍓嶆涓嬪彂涓存椂绁ㄦ嵁
- String code = UUID.randomUUID().toString();
- CommonCache.setValue(code, openId, expireTime);
- return ResultVo.redirectPage(errorUrl + "?code=" + code);
- }
-
- // String accessToken = paramObj.getString("access_token");//鏆傛椂涓嶇敤
- Map userMap = new HashMap();
- userMap.put(CommonConstant.LOGIN_USER_ID, ownerAppUserDtos.get(0).getUserId());
- userMap.put(CommonConstant.LOGIN_USER_NAME, ownerAppUserDtos.get(0).getAppUserName());
- String token = "";
- try {
- token = AuthenticationFactory.createAndSaveToken(userMap);
- pd.setToken(token);
- } catch (Exception e) {
- logger.error("鍒涘缓token澶辫触");
- }
- //鏌ヨ鐢ㄦ埛key
- UserDto userDto = new UserDto();
- userDto.setUserId(ownerAppUserDtos.get(0).getUserId());
- UserDto tmpUserDto = super.getForApi(pd, userDto, ServiceCodeConstant.QUERY_USER_SECRET, UserDto.class);
-
- if (StringUtil.isEmpty(tmpUserDto.getKey())) {
- String code = UUID.randomUUID().toString();
- CommonCache.setValue(code, openId, expireTime);
- return ResultVo.redirectPage(errorUrl + "?code=" + code);
- }
- redirectUrl = redirectUrl + (redirectUrl.indexOf("?") > 0 ? "&key=" + tmpUserDto.getKey() : "?key=" + tmpUserDto.getKey());
- return ResultVo.redirectPage(redirectUrl);
+ ResponseEntity<String> responseEntity = this.callCenterService(restTemplate, pd, paramAuth.toJSONString(),
+ ServiceConstant.SERVICE_API_URL + "/api/staff/updateStaffAppAuth", HttpMethod.POST);
+ url = MappingCache.getValue("OWNER_WECHAT_URL");
+ return ResultVo.redirectPage(url);
}
@@ -160,24 +108,18 @@
* 鍒锋柊token
*
* @param pd
- * @param redirectUrl
* @param request
* @param response
* @return
* @throws SMOException
*/
@Override
- public ResponseEntity<String> refreshToken(IPageData pd, String redirectUrl,
- String errorUrl,
- String loginFlag,
+ public ResponseEntity<String> refreshToken(IPageData pd, String communityId, String staffId, String storeId,
HttpServletRequest request, HttpServletResponse response) throws SMOException {
- String wAppId = request.getHeader("w-app-id");
SmallWeChatDto smallWeChatDto = null;
- if (!StringUtil.isEmpty(wAppId)) {
- JSONObject paramIn = new JSONObject();
- paramIn.put("appId", wAppId);
- smallWeChatDto = getSmallWechat(pd, paramIn);
- }
+ JSONObject paramIn = new JSONObject();
+ paramIn.put("communityId", communityId);
+ smallWeChatDto = getSmallWechat(pd, paramIn);
if (smallWeChatDto == null) { //浠庨厤缃枃浠朵腑鑾峰彇 灏忕▼搴忛厤缃俊鎭�
smallWeChatDto = new SmallWeChatDto();
smallWeChatDto.setAppId(wechatAuthProperties.getWechatAppId());
@@ -186,16 +128,9 @@
smallWeChatDto.setPayPassword(wechatAuthProperties.getKey());
}
- URL url = null;
String openUrl = "";
+ String url = MappingCache.getValue("OWNER_WECHAT_URL");
try {
- url = new URL(redirectUrl);
-
- String newUrl = url.getProtocol() + "://" + url.getHost();
- if (url.getPort() > 0) {
- newUrl += (":" + url.getPort());
- }
-
openUrl = WechatConstant.OPEN_AUTH
.replace("APPID", smallWeChatDto.getAppId())
.replace("SCOPE", "snsapi_base")
@@ -203,12 +138,13 @@
"REDIRECT_URL",
URLEncoder
.encode(
- (newUrl
- + "/app/loginStaffWechatAuth?appId=992020061452450002&wId=" + WechatFactory.getWId(wAppId)),
+ (url
+ + "/app/loginStaffWechatAuth?appId=992020061452450002&staffId="
+ + staffId + "&storeId=" + storeId + "&wId=" + WechatFactory.getWId(smallWeChatDto.getAppId())),
"UTF-8")).replace("STATE", "1");
} catch (Exception e) {
- logger.error("寰俊鍏紬鍙烽壌鏉� redirectUrl 閿欒 " + redirectUrl, e);
+ logger.error("寰俊鍏紬鍙烽壌鏉� redirectUrl 閿欒 " + url, e);
throw new SMOException(ResponseConstant.RESULT_CODE_ERROR, e.getLocalizedMessage());
}
@@ -216,138 +152,6 @@
urlObj.put("openUrl", openUrl);
return ResultVo.createResponseEntity(ResultVo.CODE_MACHINE_OK, ResultVo.MSG_OK, urlObj);
- }
-
- /**
- * 鍏紬鍙风櫥褰�
- *
- * @param pd
- * @param paramIn
- * @param paramOut
- * @param userId
- * @param ownerAppUserDtos
- * @return
- */
- private ResponseEntity<String> wechat(IPageData pd, JSONObject paramIn, JSONObject paramOut, String userId,
- List<OwnerAppUserDto> ownerAppUserDtos) {
-
- ResponseEntity<String> responseEntity = null;
- //鏌ヨ寰俊淇℃伅
- pd = PageData.newInstance().builder(userId, "", "", pd.getReqData(),
- "", "", "", "",
- pd.getAppId());
-
-
- String code = paramIn.getString("code");
-
- String openId = CommonCache.getValue(code);
-
- if (StringUtil.isEmpty(openId)) {
- responseEntity = new ResponseEntity<>("椤甸潰澶辨晥锛岃鍒锋柊鍚庨噸璇�", HttpStatus.UNAUTHORIZED);
- return responseEntity;
- }
-
- OwnerAppUserDto curOwnerApp = judgeCurrentOwnerBind(ownerAppUserDtos, OwnerAppUserDto.APP_TYPE_WECHAT);
-
- //璇存槑 褰撳墠鐨刼penId 灏辨槸鏈�鏂扮殑
- if (curOwnerApp != null && openId.equals(curOwnerApp.getOpenId())) {
- return new ResponseEntity<>(paramOut.toJSONString(), HttpStatus.OK);
- }
-
- JSONObject userOwnerInfo = new JSONObject();
- OwnerAppUserDto ownerAppUserDto = new OwnerAppUserDto();
- ownerAppUserDto.setOpenId(openId);
- ownerAppUserDto.setAppType(OwnerAppUserDto.APP_TYPE_WECHAT);
- if (curOwnerApp != null) {
- ownerAppUserDto.setAppUserId(curOwnerApp.getAppUserId());
- ownerAppUserDto.setCommunityId(curOwnerApp.getCommunityId());
- } else {
- ownerAppUserDto.setOldAppUserId(ownerAppUserDtos.get(0).getAppUserId());
- ownerAppUserDto.setAppUserId("-1");
- ownerAppUserDto.setCommunityId(ownerAppUserDtos.get(0).getCommunityId());
- }
-
- //鏌ヨ寰俊淇℃伅
- pd = PageData.newInstance().builder(userId, "", "", pd.getReqData(),
- "", "", "", "",
- pd.getAppId());
-
- super.postForApi(pd, ownerAppUserDto, ServiceCodeConstant.REFRESH_APP_USER_BINDING_OWNER_OPEN_ID,
- OwnerAppUserDto.class);
- return new ResponseEntity<>(paramOut.toJSONString(), HttpStatus.OK);
- }
-
- private ResponseEntity<String> mina(IPageData pd, JSONObject paramIn, JSONObject paramOut, String userId, List<OwnerAppUserDto> ownerAppUserDtos) {
-
- ResponseEntity<String> responseEntity = null;
- //鏌ヨ寰俊淇℃伅
- pd = PageData.newInstance().builder(userId, "", "", pd.getReqData(),
- "", "", "", "",
- pd.getAppId());
- responseEntity = this.callCenterService(restTemplate, pd, "",
- ServiceConstant.SERVICE_API_URL + "/api/smallWeChat.listSmallWeChats?appId="
- + paramIn.getString("appId") + "&page=1&row=1&communityId=" + ownerAppUserDtos.get(0).getCommunityId(), HttpMethod.GET);
-
- if (responseEntity.getStatusCode() != HttpStatus.OK) {
- return responseEntity;
- }
- JSONObject smallWechatObj = JSONObject.parseObject(responseEntity.getBody().toString());
- JSONArray smallWeChats = smallWechatObj.getJSONArray("smallWeChats");
- String appId = wechatAuthProperties.getAppId();
- String secret = wechatAuthProperties.getSecret();
- if (smallWeChats.size() > 0) {
- appId = smallWeChats.getJSONObject(0).getString("appId");
- secret = smallWeChats.getJSONObject(0).getString("appSecret");
- }
-
- String code = paramIn.getString("code");
- String urlString = "?appid={appId}&secret={secret}&js_code={code}&grant_type={grantType}";
- String response = outRestTemplate.getForObject(
- wechatAuthProperties.getSessionHost() + urlString, String.class,
- appId,
- secret,
- code,
- wechatAuthProperties.getGrantType());
-
- logger.debug("wechatAuthProperties:" + JSONObject.toJSONString(wechatAuthProperties));
-
- logger.debug("寰俊杩斿洖鎶ユ枃锛�" + response);
-
- //Assert.jsonObjectHaveKey(response, "errcode", "杩斿洖鎶ユ枃涓湭鍖呭惈 閿欒缂栫爜锛屾帴鍙ｅ嚭閿�");
- JSONObject responseObj = JSONObject.parseObject(response);
-
- if (responseObj.containsKey("errcode") && !"0".equals(responseObj.getString("errcode"))) {
- throw new IllegalArgumentException("寰俊楠岃瘉澶辫触锛屽彲鑳芥槸code澶辨晥" + responseObj);
- }
-
- String openId = responseObj.getString("openid");
-
- OwnerAppUserDto ownerAppUserDto = judgeCurrentOwnerBind(ownerAppUserDtos, OwnerAppUserDto.APP_TYPE_WECHAT_MINA);
-
- //璇存槑 褰撳墠鐨刼penId 灏辨槸鏈�鏂扮殑
- if (ownerAppUserDto != null && openId.equals(ownerAppUserDto.getOpenId())) {
- return new ResponseEntity<>(paramOut.toJSONString(), HttpStatus.OK);
- }
-
- OwnerAppUserDto tmpOwnerAppUserDto = new OwnerAppUserDto();
- tmpOwnerAppUserDto.setOpenId(openId);
- tmpOwnerAppUserDto.setAppType(OwnerAppUserDto.APP_TYPE_WECHAT_MINA);
- if (ownerAppUserDto != null) {
- tmpOwnerAppUserDto.setAppUserId(ownerAppUserDto.getAppUserId());
- tmpOwnerAppUserDto.setCommunityId(ownerAppUserDto.getCommunityId());
- } else {
- tmpOwnerAppUserDto.setOldAppUserId(ownerAppUserDtos.get(0).getAppUserId());
- tmpOwnerAppUserDto.setAppUserId("-1");
- tmpOwnerAppUserDto.setCommunityId(ownerAppUserDtos.get(0).getCommunityId());
- }
- //鏌ヨ寰俊淇℃伅
- pd = PageData.newInstance().builder(userId, "", "", pd.getReqData(),
- "", "", "", "",
- pd.getAppId());
-
- super.postForApi(pd, tmpOwnerAppUserDto, ServiceCodeConstant.REFRESH_APP_USER_BINDING_OWNER_OPEN_ID,
- OwnerAppUserDto.class);
- return new ResponseEntity<>(paramOut.toJSONString(), HttpStatus.OK);
}
/**
@@ -375,8 +179,8 @@
"", "", "", "",
pd.getAppId());
responseEntity = this.callCenterService(restTemplate, pd, "",
- ServiceConstant.SERVICE_API_URL + "/api/smallWeChat.listSmallWeChats?appId="
- + paramIn.getString("appId") + "&page=1&row=1", HttpMethod.GET);
+ ServiceConstant.SERVICE_API_URL + "/api/smallWeChat.listSmallWeChats?communityId="
+ + paramIn.getString("communityId") + "&page=1&row=1", HttpMethod.GET);
if (responseEntity.getStatusCode() != HttpStatus.OK) {
return null;
--
Gitblit v1.8.0