From ce64e667815b39efdc2f8bd52be0d43d49db8d84 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期日, 17 七月 2022 00:06:29 +0800
Subject: [PATCH] 优化小区位置

---
 service-api/src/main/java/com/java110/api/smo/login/impl/OwnerAppLoginSMOImpl.java |   20 ++++++++++++++++++--
 1 files changed, 18 insertions(+), 2 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 88fad85..76ca094 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
@@ -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);
@@ -255,7 +255,20 @@
             } else {
                 errorUrl += ("?code=" + code);
             }
+            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 鏄惁缁戝畾浜嗕笟涓�
@@ -272,6 +285,7 @@
             CommonCache.setValue(code, openId, expireTime);
             CommonCache.setValue(code + "-nickname", userinfo_paramObj.getString("nickname"), expireTime);
             CommonCache.setValue(code + "-headimgurl", userinfo_paramObj.getString("headimgurl"), expireTime);
+            CommonCache.setValue(code + "-unionid", userinfo_paramObj.getString("unionid"), expireTime);
             if (errorUrl.indexOf("?") > 0) {
                 errorUrl += ("&code=" + code);
             } else {
@@ -301,6 +315,8 @@
             CommonCache.setValue(code, openId, expireTime);
             CommonCache.setValue(code + "-nickname", userinfo_paramObj.getString("nickname"), expireTime);
             CommonCache.setValue(code + "-headimgurl", userinfo_paramObj.getString("headimgurl"), expireTime);
+            CommonCache.setValue(code + "-unionid", userinfo_paramObj.getString("unionid"), expireTime);
+
             if (errorUrl.indexOf("?") > 0) {
                 errorUrl += ("&code=" + code);
             } else {

--
Gitblit v1.8.0