Merge branch 'master' into 'OFRK-312'

# Conflicts:
#   src/main/java/cn/quantgroup/xyqb/service/session/ISessionService.java
#   src/main/java/cn/quantgroup/xyqb/service/session/impl/SessionServiceImpl.java

change-log.md

+### 用户中心公众号功能优化需求（ORRK-304）
+```
+http://confluence.quantgroup.cn/pages/viewpage.action?pageId=61683131
+```
+
+### 用户中心新增登出接口(OFRK-257)
+```
+http://confluence.quantgroup.cn/pages/viewpage.action?pageId=61683156
+```
+
 ##KA-29/2021-11-12
 ###ToB积分时代-电商saas产研开发专项-用户中心
 ```

src/main/java/cn/quantgroup/xyqb/Constants.java

@@ -77,6 +77,7 @@ public interface Constants {
     String PROTOCOL_HEAD_HTTPS = "https:";
     String PROTOCOL_HEAD_HTTP = "http:";
     String REDIRECT = "redirect";
+    String CUSTOMREDIRECT = "customredirect";
     String LOCAL = "local";
     String REDIRECT_ORDER = "orders";
     String DOCKER_DOMAIN = "liangkebang";

src/main/java/cn/quantgroup/xyqb/controller/external/UserController.java

@@ -798,4 +798,39 @@ public class UserController implements IBaseController {
             smsService.deleteCodeFromCache(phoneNo);
         }
     }
+
+    /**
+     * 修改手机号登出接口(KDSP调用)
+     *
+     * @yapi
+     */
+    @RequestMapping(value = "/kdsp/logout", method = RequestMethod.POST)
+    public JsonResult kdspLogout(
+            @RequestParam(required = false, defaultValue = "1") Long channelId, String appChannel,
+            @RequestParam(required = false, defaultValue = "1") Long createdFrom,
+            @RequestParam(required = false, defaultValue = "") Long userId,
+            @RequestParam(required = false, defaultValue = "xyqb") String key,
+            @RequestParam(required = false) String dimension
+    ) {
+        //查询用户
+        User user = userService.findById(userId);
+        if (Objects.isNull(user) || !user.getEnable()) {
+            log.error("用户不存在，或者已经注销，userId:{}", userId);
+            return JsonResult.buildErrorStateResult("登出失败", null);
+        }
+
+        Merchant merchant = merchantService.findMerchantByName(key);
+        if (merchant == null) {
+            return JsonResult.buildErrorStateResult("未知的连接", null);
+        }
+
+        LoginProperties loginProperties = new LoginProperties("", 4, channelId, createdFrom, appChannel, merchant.getId(), merchant.getName(), null);
+        try {
+            userService.kdspLogout(userId, loginProperties);
+        } catch (Exception e) {
+            return JsonResult.buildErrorStateResult("服务器异常,请稍后再试", null);
+        }
+
+        return JsonResult.buildSuccessResult("登出成功");
+    }
 }

src/main/java/cn/quantgroup/xyqb/controller/external/WeChatController.java

@@ -178,13 +178,14 @@ public class WeChatController implements IBaseController {
         Long registerFrom = null;
         String redirect = null;
         String schema = null;
+        String customRedirect = null;
         try {
             extData = new String(Base64.decodeBase64(extData), "UTF-8");
         } catch (Exception ex) {
             extData = "";
         }
         if (StringUtils.isBlank(extData)) {
-            receiveCodeWithDefault(code, systemKey, schema, registerFrom, redirect, response);
+            receiveCodeWithDefault(code, systemKey, schema, registerFrom, redirect, customRedirect, response);
             return;
         }
         log.info("从微信extdata版本接口进入：{}, extData:{}", schema, extData);
@@ -194,15 +195,16 @@ public class WeChatController implements IBaseController {
             });
         } catch (Exception ex) {
             log.error("解析extData发生错误", ex);
-            receiveCodeWithDefault(code, systemKey, schema, registerFrom, redirect, response);
+            receiveCodeWithDefault(code, systemKey, schema, registerFrom, redirect, customRedirect, response);
             return;
         }
         schema = extDataObj.getOrDefault("protocol", Constants.PROTOCOL_HEAD_HTTP).toString();
         log.info("从微信登录extData中获得协议信息,protocol:{}", schema);
         registerFrom = Long.valueOf(extDataObj.getOrDefault("registerFrom", "1").toString());
         redirect = (String) extDataObj.getOrDefault(Constants.REDIRECT, Constants.REDIRECT);
+        customRedirect = (String) extDataObj.getOrDefault(Constants.CUSTOMREDIRECT, null);
         log.info("从微信登录,registerFrom:{}, redirect:{}", registerFrom, redirect);
-        receiveCodeWithDefault(code, systemKey, schema, registerFrom, redirect, response);
+        receiveCodeWithDefault(code, systemKey, schema, registerFrom, redirect, customRedirect, response);
     }
 
     /**
@@ -215,7 +217,7 @@ public class WeChatController implements IBaseController {
      * @param redirect
      * @param response
      */
-    private void receiveCodeWithDefault(String code, String systemKey, String schema, Long registerFrom, String redirect, HttpServletResponse response) {
+    private void receiveCodeWithDefault(String code, String systemKey, String schema, Long registerFrom, String redirect, String customRedirect, HttpServletResponse response) {
         // 微信跳转请求入参监控
         HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
         log.info("[WeChatController][receiveCodeWithDefault]微信授权及跳转：code:{},systemKey:{},schema:{},registerFrom:{},redirect:{},request:{}", code, systemKey, schema, registerFrom, redirect, JSON.toJSONString(getRequestHeaderMap(request)));
@@ -247,6 +249,7 @@ public class WeChatController implements IBaseController {
             log.info("[WeChatController][receiveCodeWithDefault]微信授权及跳转：WechatUserInfo - from wechat api:{}", userInfo);
             if (Objects.isNull(userInfo) || StringUtils.isBlank(userInfo.getOpenId())) {
                 // 让用户登录，不关联微信, 构造不关联微信的url
+                // 如果有自定义跳转链接
                 redirectNormalUrl(response, merchant, registerFrom, domain);
                 return;
             }
@@ -257,19 +260,31 @@ public class WeChatController implements IBaseController {
                 userInfo.setNickName(EmojiUtil.BYTE_4_REPLACE_TEMPLATE);
                 userInfo = wechatService.saveWechatUserInfo(userInfo);
             }
-            redirectWechatLoginUrlWithoutLogin(response, merchant, userInfo, registerFrom, domain);
+            if (customRedirect != null) {
+                customRedirectWechatLoginUrlWithoutLogin(response, merchant, userInfo, registerFrom, customRedirect);
+            } else {
+                redirectWechatLoginUrlWithoutLogin(response, merchant, userInfo, registerFrom, domain);
+            }
             return;
         }
         if (Objects.isNull(userInfoInDb.getUserId())) {
             // 用户已经微信登录了，但是没有关联信用钱包，跳转到注册页面
-            redirectWechatLoginUrlWithoutLogin(response, merchant, userInfoInDb, registerFrom, domain);
+            if (customRedirect != null) {
+                customRedirectWechatLoginUrlWithoutLogin(response, merchant, userInfoInDb, registerFrom, customRedirect);
+            } else {
+                redirectWechatLoginUrlWithoutLogin(response, merchant, userInfoInDb, registerFrom, domain);
+            }
             return;
         }
         User user = userService.findById(userInfoInDb.getUserId());
         // 用户不存在或已注销
         if (Objects.isNull(user) || !user.getEnable()) {
             // 用户已经微信登录了，但是关联信用钱包用户信息无效，跳转到注册页面
-            redirectWechatLoginUrlWithoutLogin(response, merchant, userInfoInDb, registerFrom, domain);
+            if (customRedirect != null) {
+                customRedirectWechatLoginUrlWithoutLogin(response, merchant, userInfoInDb, registerFrom, customRedirect);
+            } else {
+                redirectWechatLoginUrlWithoutLogin(response, merchant, userInfoInDb, registerFrom, domain);
+            }
             return;
         }
         // 已经关联了用户
@@ -329,7 +344,7 @@ public class WeChatController implements IBaseController {
         if (Objects.equals(Constants.PROTOCOL_HEAD_HTTPS, request.getScheme())) {
             schema = Constants.PROTOCOL_HEAD_HTTPS;
         }
-        receiveCodeWithDefault(code, systemKey, schema, registerFrom, redirect, response);
+        receiveCodeWithDefault(code, systemKey, schema, registerFrom, redirect, redirect, response);
     }
 
     private String createUserSession(User user, Merchant merchant, String redirect, String domain, Long registerFrom) {
@@ -382,6 +397,13 @@ public class WeChatController implements IBaseController {
         response.setStatus(HttpStatus.SC_MOVED_PERMANENTLY);
     }
 
+    private void customRedirectWechatLoginUrlWithoutLogin(HttpServletResponse response, Merchant merchant, WechatUserInfo userInfo, Long registerFrom, String customRedirect) {
+        String redirectUrl =  customRedirect + "?registerFrom= " + registerFrom + "&channelId=1&isWechat=true&openId=" + userInfo.getOpenId();
+        log.info("[WeChatController][redirectWechatLoginUrlWithoutLogin]微信授权及自定义跳转：redirectUrl:[{}]", redirectUrl);
+        response.setHeader("Location", redirectUrl);
+        response.setStatus(HttpStatus.SC_MOVED_PERMANENTLY);
+    }
+
     private String assembleNormalRedirectUrl(Merchant merchant, Long registerFrom, String domain) {
         if (Constants.MERCHANT_BAITIAO.equals(merchant.getName())) {
             if (registerFrom == Constants.Channel.HENGCHANG || registerFrom == Constants.Channel.WECHAT) {

src/main/java/cn/quantgroup/xyqb/service/session/ISessionService.java

@@ -43,4 +43,6 @@ public interface ISessionService {
     void deleteSession(String token);
 
     void persistSessionExchange(String token, SessionValue sessionValue, long expire);
+
+    void kdspDeleteSession(Long userId, LoginProperties loginProperties);
 }

src/main/java/cn/quantgroup/xyqb/service/session/impl/SessionServiceImpl.java

@@ -298,6 +298,19 @@ public class SessionServiceImpl implements ISessionService {
         setUserIdTokenKeys(sessionValue.getUser().getId(), key);
     }
 
+
+    public void kdspDeleteSession(Long userId, LoginProperties loginProperties) {
+        List<Long> createFromList = Arrays.asList(214L, 217L);
+        for (Long createFrom : createFromList) {
+            loginProperties.setCreatedFrom(createFrom);
+            String key = generateLoginPropertiesKey(userId, loginProperties);
+            String token = stringRedisTemplate.opsForValue().get(key);
+            deleteSession(token);
+        }
+    }
+
+
+
     /**
      * 获取用户的会话缓存Set的Redis-Key
      *

src/main/java/cn/quantgroup/xyqb/service/user/IUserService.java

@@ -4,6 +4,7 @@ import cn.quantgroup.xyqb.controller.internal.user.resp.UserFullResp;
 import cn.quantgroup.xyqb.entity.Merchant;
 import cn.quantgroup.xyqb.entity.User;
 import cn.quantgroup.xyqb.model.JsonResult;
+import cn.quantgroup.xyqb.model.LoginProperties;
 import cn.quantgroup.xyqb.model.UserInfo;
 
 import javax.servlet.http.HttpServletRequest;
@@ -102,4 +103,6 @@ public interface IUserService {
      * 登出
      */
     void logout(String token);
+
+    void kdspLogout(Long userId, LoginProperties loginProperties);
 }

src/main/java/cn/quantgroup/xyqb/service/user/impl/UserServiceImpl.java

@@ -524,4 +524,10 @@ public class UserServiceImpl implements IUserService, IBaseController {
 
         sessionService.deleteSession(token);
     }
+
+    @Override
+    public void kdspLogout(Long userId, LoginProperties loginProperties) {
+        sessionService.kdspDeleteSession(userId, loginProperties);
+    }
+
 }