java110
2022-09-04 7c36caa1b7bb37633e95b0934957b2b75a34a621
service-api/src/main/java/com/java110/api/smo/staff/impl/StaffAuthSMOImpl.java
@@ -78,7 +78,7 @@
        ResponseEntity<String> paramOut = outRestTemplate.getForEntity(url, String.class);
        logger.debug("调用微信换去openId ", paramOut);
        logger.debug("调用微信换去openId {}", paramOut);
        if (paramOut.getStatusCode() != HttpStatus.OK) {
            return ResultVo.redirectPage("/");
@@ -93,7 +93,7 @@
        paramOut = outRestTemplate.getForEntity(url, String.class);
        logger.debug("调用微信换去openId ", paramOut);
        logger.debug("调用微信换去openId {}", paramOut);
        if (paramOut.getStatusCode() != HttpStatus.OK) {
            return ResultVo.redirectPage("/");
        }
@@ -109,6 +109,15 @@
        ResponseEntity<String> responseEntity = this.callCenterService(restTemplate, pd, paramAuth.toJSONString(),
                "/staff/updateStaffAppAuth", HttpMethod.POST);
        url = MappingCache.getValue("OWNER_WECHAT_URL");
        if(url.contains("/#/")){
            if(url.contains("?")){
                url += ("&wAppId="+smallWeChatDto.getAppId());
            }else{
                url += ("?wAppId="+smallWeChatDto.getAppId());
            }
        }else{
            url += ("/#/?wAppId="+smallWeChatDto.getAppId());
        }
        return ResultVo.redirectPage(url);
    }
@@ -139,6 +148,10 @@
        String openUrl = "";
        String url = MappingCache.getValue("OWNER_WECHAT_URL");
        url = url
                + "/app/loginStaffWechatAuth?appId=992020061452450002&staffId="
                + staffId + "&storeId=" + storeId + "&wId=" + WechatFactory.getWId(smallWeChatDto.getAppId())
        + "&communityId=" + communityId;
        if (url.contains("?")) {
            url += ("&wAppId=" + smallWeChatDto.getAppId());
@@ -153,11 +166,7 @@
                    .replace(
                            "REDIRECT_URL",
                            URLEncoder
                                    .encode(
                                            (url
                                                    + "/app/loginStaffWechatAuth?appId=992020061452450002&staffId="
                                                    + staffId + "&storeId=" + storeId + "&wId=" + WechatFactory.getWId(smallWeChatDto.getAppId()))
                                                    + "&communityId=" + communityId,
                                    .encode(url,
                                            "UTF-8")).replace("STATE", "1");
            response.sendRedirect(openUrl);
        } catch (Exception e) {