From ded40ebbd1613490fc68190dbd92db5d7243267f Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 22 八月 2023 16:25:20 +0800
Subject: [PATCH] 优化代码
---
service-api/src/main/java/com/java110/api/smo/login/impl/OwnerAppLoginSMOImpl.java | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/smo/login/impl/OwnerAppLoginSMOImpl.java b/service-api/src/main/java/com/java110/api/smo/login/impl/OwnerAppLoginSMOImpl.java
index 89a68c5..874b0d8 100644
--- a/service-api/src/main/java/com/java110/api/smo/login/impl/OwnerAppLoginSMOImpl.java
+++ b/service-api/src/main/java/com/java110/api/smo/login/impl/OwnerAppLoginSMOImpl.java
@@ -11,8 +11,8 @@
import com.java110.core.factory.WechatFactory;
import com.java110.core.log.LoggerFactory;
import com.java110.dto.owner.OwnerAppUserDto;
-import com.java110.dto.ownerCarOpenUser.OwnerCarOpenUserDto;
-import com.java110.dto.smallWeChat.SmallWeChatDto;
+import com.java110.dto.owner.OwnerCarOpenUserDto;
+import com.java110.dto.wechat.SmallWeChatDto;
import com.java110.dto.user.UserDto;
import com.java110.intf.user.IOwnerCarOpenUserV1InnerServiceSMO;
import com.java110.utils.cache.CommonCache;
@@ -54,6 +54,7 @@
private final static int expireTime = 7200;
private final static int LOGIN_PAGE = 1;
+ private final static int COMMON_PAGE = 2;
@Autowired
private RestTemplate restTemplate;
@@ -214,13 +215,12 @@
logger.debug("璋冪敤寰俊鎹㈠幓openId " + paramOut);
if (paramOut.getStatusCode() != HttpStatus.OK) {
return ResultVo.redirectPage(errorUrl);
-
}
-
JSONObject paramObj = JSONObject.parseObject(paramOut.getBody());
//鑾峰彇 openId
String openId = paramObj.getString("openid");
+
String userinfo_url = WechatConstant.APP_GET_USER_INFO_URL
.replace("ACCESS_TOKEN", paramObj.getString("access_token"))
.replace("OPENID", openId);
@@ -258,6 +258,17 @@
logger.debug("鐧诲綍璺宠浆url:{}", errorUrl);
return ResultVo.redirectPage(errorUrl);
+ }
+
+ if (loginFlag == COMMON_PAGE) {
+ //灏唎penId鏀惧埌redis 缂撳瓨锛岀粰鍓嶆涓嬪彂涓存椂绁ㄦ嵁
+ if (errorUrl.indexOf("?") > 0) {
+ redirectUrl += ("&openId=" + openId);
+ } else {
+ redirectUrl += ("?openId=" + openId);
+ }
+ logger.debug("璺宠浆url:{}", redirectUrl);
+ return ResultVo.redirectPage(redirectUrl);
}
//鍒ゆ柇褰撳墠openId 鏄惁缁戝畾浜嗕笟涓�
@@ -434,7 +445,7 @@
openUrl = WechatConstant.OPEN_AUTH
.replace("APPID", smallWeChatDto.getAppId())
- .replace("SCOPE", "snsapi_userinfo")
+ .replace("SCOPE", "snsapi_base")
.replace(
"REDIRECT_URL",
URLEncoder
--
Gitblit v1.8.0