Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

server/svr-authentication/src/main/java/com/yihu/jw/security/oauth2/provider/endpoint/WlyyLoginEndpoint.java

@@ -615,13 +615,14 @@ public class WlyyLoginEndpoint extends AbstractEndpoint {
        }
        //删除个推cid
  /*      if(!StringUtils.isEmpty(token)){
            BaseLoginLogDO loginLogDO = baseLoginLogService.findByToken(token);
            if(loginLogDO!=null){
                userDetailsService.deleteCidByUser(loginLogDO.getUserId());
        if ("hz_yyyzh_wx".equals(wechatId)) {
            if(!StringUtils.isEmpty(token)){
                BaseLoginLogDO loginLogDO = baseLoginLogService.findByToken(token);
                if(loginLogDO!=null){
                    userDetailsService.deleteCidByUser(loginLogDO.getUserId());
                }
            }
        }*/
        }
        HttpHeaders headers = new HttpHeaders();
        headers.set("Cache-Control", "no-store");