From 55e853b4cf6a00bf5f1bccdd5208c9b5d53289c3 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 17 六月 2020 09:08:14 +0800
Subject: [PATCH] 鉴权登录问题
---
service-front/src/main/java/com/java110/front/smo/ownerLogin/impl/OwnerAppLoginSMOImpl.java | 123 +++++++++++++++++++++++++++++++++-------
1 files changed, 100 insertions(+), 23 deletions(-)
diff --git a/service-front/src/main/java/com/java110/front/smo/ownerLogin/impl/OwnerAppLoginSMOImpl.java b/service-front/src/main/java/com/java110/front/smo/ownerLogin/impl/OwnerAppLoginSMOImpl.java
index a0f012b..8f937df 100644
--- a/service-front/src/main/java/com/java110/front/smo/ownerLogin/impl/OwnerAppLoginSMOImpl.java
+++ b/service-front/src/main/java/com/java110/front/smo/ownerLogin/impl/OwnerAppLoginSMOImpl.java
@@ -7,6 +7,7 @@
import com.java110.core.context.PageData;
import com.java110.core.factory.AuthenticationFactory;
import com.java110.dto.owner.OwnerAppUserDto;
+import com.java110.dto.user.UserDto;
import com.java110.front.properties.WechatAuthProperties;
import com.java110.front.smo.ownerLogin.IOwnerAppLoginSMO;
import com.java110.utils.cache.CommonCache;
@@ -67,15 +68,24 @@
JSONObject loginInfo = JSONObject.parseObject(pd.getReqData());
loginInfo.put("passwd", AuthenticationFactory.passwdMd5(loginInfo.getString("password")));
- responseEntity = this.callCenterService(restTemplate, pd, loginInfo.toJSONString(), ServiceConstant.SERVICE_API_URL + "/api/user.service.login", HttpMethod.POST);
- if (responseEntity.getStatusCode() != HttpStatus.OK) {
+// responseEntity = this.callCenterService(restTemplate, pd, loginInfo.toJSONString(), ServiceConstant.SERVICE_API_URL + "/api/user.service.login", HttpMethod.POST);
+// if (responseEntity.getStatusCode() != HttpStatus.OK) {
+// return responseEntity;
+// }
+
+ // JSONObject userInfo = JSONObject.parseObject(responseEntity.getBody());
+ UserDto userDto = new UserDto();
+ userDto.setUserName(loginInfo.getString("userName"));
+ userDto.setPassword(loginInfo.getString("password"));
+ userDto = super.getForApi(pd,userDto,ServiceCodeConstant.SERVICE_CODE_USER_LOGIN,UserDto.class);
+
+ if(userDto == null){
+ responseEntity = new ResponseEntity<>("鐢ㄦ埛鍚嶆垨瀵嗙爜閿欒", HttpStatus.BAD_REQUEST);
return responseEntity;
}
- JSONObject userInfo = JSONObject.parseObject(responseEntity.getBody());
-
//鏍规嵁鐢ㄦ埛鏌ヨ鍟嗘埛淇℃伅
- String userId = userInfo.getString("userId");
+ String userId = userDto.getUserId();
pd = PageData.newInstance().builder(userId, "", "", pd.getReqData(),
"", "", "", "",
@@ -96,7 +106,12 @@
JSONObject paramOut = new JSONObject();
paramOut.put("result", 0);
paramOut.put("owner", appUser);
- paramOut.put("token", userInfo.getString("token"));
+ paramOut.put("token", userDto.getToken());
+
+ userDto = new UserDto();
+ userDto.setUserId(ownerAppUserDtos.get(0).getUserId());
+ UserDto tmpUserDto = super.getForApi(pd, userDto, ServiceCodeConstant.QUERY_USER_SECRET, UserDto.class);
+ paramOut.put("key", tmpUserDto.getKey());
String appId = pd.getAppId();
@@ -110,15 +125,63 @@
}
@Override
+ public ResponseEntity<String> doLoginByKey(IPageData pd) throws SMOException {
+ JSONObject paramIn = JSONObject.parseObject(pd.getReqData());
+ Assert.hasKeyAndValue(paramIn, "key", "璇锋眰鎶ユ枃涓湭鍖呭惈涓存椂绉橀挜");
+ logger.debug("doLogin鍏ュ弬锛�" + paramIn.toJSONString());
+ ResponseEntity<String> responseEntity;
+
+ JSONObject loginInfo = JSONObject.parseObject(pd.getReqData());
+
+ UserDto userDto = new UserDto();
+ userDto.setKey(paramIn.getString("key"));
+ userDto = super.postForApi(pd, userDto, ServiceCodeConstant.SERVICE_CODE_USER_LOGIN, UserDto.class);
+
+
+ //鏍规嵁鐢ㄦ埛鏌ヨ鍟嗘埛淇℃伅
+ String userId = userDto.getUserId();
+
+ pd = PageData.newInstance().builder(userId, "", "", pd.getReqData(),
+ "", "", "", "",
+ pd.getAppId());
+ OwnerAppUserDto ownerAppUserDto = new OwnerAppUserDto();
+ ownerAppUserDto.setUserId(userId);
+ List<OwnerAppUserDto> ownerAppUserDtos = super.getForApis(pd, ownerAppUserDto, ServiceCodeConstant.LIST_APPUSERBINDINGOWNERS, OwnerAppUserDto.class);
+
+
+ if (ownerAppUserDtos == null || ownerAppUserDtos.size() < 1) {
+ responseEntity = new ResponseEntity<>("鐢ㄦ埛鏈粦瀹氫笟涓�", HttpStatus.BAD_REQUEST);
+ return responseEntity;
+ }
+
+ JSONObject appUser = JSONObject.parseObject(JSONObject.toJSONString(ownerAppUserDtos.get(0)));
+ appUser.put("userId", userId);
+ appUser.put("userName", paramIn.getString("username"));
+ JSONObject paramOut = new JSONObject();
+ paramOut.put("code", 0);
+ paramOut.put("msg", "鎴愬姛");
+ paramOut.put("owner", appUser);
+ paramOut.put("token", userDto.getToken());
+ paramOut.put("key", userDto.getKey());
+ return new ResponseEntity<>(paramOut.toJSONString(), HttpStatus.OK);
+
+ }
+
+ @Override
public ResponseEntity<String> getPageAccessToken(IPageData pd) throws SMOException {
JSONObject paramIn = JSONObject.parseObject(pd.getReqData());
String authCode = paramIn.getString("code");
String state = paramIn.getString("state");
- String urlCode = CommonCache.getAndRemoveValue(paramIn.getString("urlCode"));
+ String paramStr = CommonCache.getAndRemoveValue(paramIn.getString("urlCode"));
- if (StringUtil.isEmpty(urlCode)) {
- return ResultVo.redirectPage("/#/pages/login/login");
+ if (StringUtil.isEmpty(paramStr)) {
+ return ResultVo.redirectPage("/");
}
+
+ JSONObject param = JSONObject.parseObject(paramStr);
+ String redirectUrl = param.getString("redirectUrl");
+ String errorUrl = param.getString("errorUrl");
+
String url = WechatConstant.APP_GET_ACCESS_TOKEN_URL.replace("APPID", wechatAuthProperties.getWechatAppId())
.replace("SECRET", wechatAuthProperties.getWechatAppSecret())
@@ -126,9 +189,9 @@
ResponseEntity<String> paramOut = outRestTemplate.getForEntity(url, String.class);
- logger.debug("璋冪敤寰俊鎹㈠幓token ", paramOut);
+ logger.debug("璋冪敤寰俊鎹㈠幓openId ", paramOut);
if (paramOut.getStatusCode() != HttpStatus.OK) {
- return ResultVo.redirectPage("/#/pages/login/login");
+ return ResultVo.redirectPage(errorUrl);
}
@@ -149,7 +212,7 @@
//灏唎penId鏀惧埌redis 缂撳瓨锛岀粰鍓嶆涓嬪彂涓存椂绁ㄦ嵁
String code = UUID.randomUUID().toString();
CommonCache.setValue(code, openId, expireTime);
- return ResultVo.redirectPage("/#/pages/login/login?code=" + code);
+ return ResultVo.redirectPage(errorUrl + "?code=" + code);
}
// String accessToken = paramObj.getString("access_token");//鏆傛椂涓嶇敤
@@ -163,7 +226,16 @@
} catch (Exception e) {
logger.error("鍒涘缓token澶辫触");
}
- return ResultVo.redirectPage("/");
+ //鏌ヨ鐢ㄦ埛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())){
+// tmpUserDto = super.postForApi(pd, tmpUserDto, ServiceCodeConstant.SERVICE_CODE_USER_LOGIN, UserDto.class);
+// }
+ redirectUrl = redirectUrl + (redirectUrl.indexOf("?") > 0 ? "&key=" + tmpUserDto.getKey() : "?key=" + tmpUserDto.getKey());
+ return ResultVo.redirectPage(redirectUrl);
}
@@ -178,10 +250,15 @@
* @throws SMOException
*/
@Override
- public ResponseEntity<String> refreshToken(IPageData pd, String redirectUrl, HttpServletRequest request, HttpServletResponse response) throws SMOException {
+ public ResponseEntity<String> refreshToken(IPageData pd, String redirectUrl,
+ String errorUrl,
+ HttpServletRequest request, HttpServletResponse response) throws SMOException {
//鍒嗛厤urlCode
String urlCode = UUID.randomUUID().toString();
- CommonCache.setValue(urlCode, redirectUrl, expireTime);
+ JSONObject param = new JSONObject();
+ param.put("redirectUrl", redirectUrl);
+ param.put("errorUrl", errorUrl);
+ CommonCache.setValue(urlCode, param.toJSONString(), expireTime);
URL url = null;
String openUrl = "";
@@ -327,22 +404,22 @@
}
OwnerAppUserDto tmpOwnerAppUserDto = new OwnerAppUserDto();
- ownerAppUserDto.setOpenId(openId);
- ownerAppUserDto.setAppType(OwnerAppUserDto.APP_TYPE_WECHAT_MINA);
+ tmpOwnerAppUserDto.setOpenId(openId);
+ tmpOwnerAppUserDto.setAppType(OwnerAppUserDto.APP_TYPE_WECHAT_MINA);
if (ownerAppUserDto != null) {
- ownerAppUserDto.setAppUserId(tmpOwnerAppUserDto.getAppUserId());
- ownerAppUserDto.setCommunityId(tmpOwnerAppUserDto.getCommunityId());
+ tmpOwnerAppUserDto.setAppUserId(ownerAppUserDto.getAppUserId());
+ tmpOwnerAppUserDto.setCommunityId(ownerAppUserDto.getCommunityId());
} else {
- ownerAppUserDto.setOldAppUserId(ownerAppUserDtos.get(0).getAppUserId());
- ownerAppUserDto.setAppUserId("-1");
- ownerAppUserDto.setCommunityId(ownerAppUserDtos.get(0).getCommunityId());
+ 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, ownerAppUserDto, ServiceCodeConstant.REFRESH_APP_USER_BINDING_OWNER_OPEN_ID,
+ super.postForApi(pd, tmpOwnerAppUserDto, ServiceCodeConstant.REFRESH_APP_USER_BINDING_OWNER_OPEN_ID,
OwnerAppUserDto.class);
return new ResponseEntity<>(paramOut.toJSONString(), HttpStatus.OK);
}
--
Gitblit v1.8.0