Merge remote-tracking branch 'origin/zzj' into zzj

huanghongfa

2021-09-02 177249c76aeea0b4bf8d8816d4994e3b445b45ce

 springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/java/com/panzhihua/zuul/filters/SercuritFilter.java

@@ -1,13 +1,12 @@
package com.panzhihua.zuul.filters;



import com.alibaba.fastjson.JSONArray;

import com.panzhihua.common.constants.SecurityConstants;

import com.panzhihua.common.constants.UserConstants;

import com.panzhihua.common.model.vos.MenuVO;

import com.panzhihua.common.model.vos.R;

import com.panzhihua.common.service.user.UserService;

import java.util.ArrayList;

import java.util.Collection;

import java.util.List;

import java.util.concurrent.TimeUnit;

import java.util.stream.Collectors;



import lombok.extern.slf4j.Slf4j;

import javax.annotation.Resource;



import org.springframework.data.redis.core.StringRedisTemplate;

import org.springframework.data.redis.core.ValueOperations;

@@ -18,12 +17,13 @@
import org.springframework.stereotype.Component;

import org.springframework.util.ObjectUtils;



import javax.annotation.Resource;

import java.util.ArrayList;

import java.util.Collection;

import java.util.List;

import java.util.concurrent.TimeUnit;

import java.util.stream.Collectors;

import com.alibaba.fastjson.JSONArray;

import com.panzhihua.common.constants.SecurityConstants;

import com.panzhihua.common.model.vos.MenuVO;

import com.panzhihua.common.model.vos.R;

import com.panzhihua.common.service.user.UserService;



import lombok.extern.slf4j.Slf4j;



/**

 * @program: springcloud_k8s_panzhihuazhihuishequ

@@ -41,31 +41,35 @@


    /**

     * 获取当前url对应的角色

     * @param o 请求url

     * 
     * @param o

     *            请求url

     * @return 权限列表

     * @throws IllegalArgumentException 异常

     * @throws IllegalArgumentException

     *             异常

     */

    @Override

    public Collection<ConfigAttribute> getAttributes(Object o) throws IllegalArgumentException {

       List<ConfigAttribute> configAttributes=new ArrayList<>();

        String requestUrl = ((FilterInvocation) o).getRequestUrl();

        log.info("接口请求地址【{}】",requestUrl);

        List<ConfigAttribute> configAttributes = new ArrayList<>();

        String requestUrl = ((FilterInvocation)o).getRequestUrl();

        log.info("接口请求地址【{}】", requestUrl);

        Boolean aBoolean = stringRedisTemplate.hasKey(SecurityConstants.ROLE_ALL);

        ValueOperations<String, String> valueOperations = stringRedisTemplate.opsForValue();

        List<MenuVO> menuVOS=new ArrayList<>();

        List<MenuVO> menuVOS = new ArrayList<>();

        if (aBoolean) {

            String roleAll = valueOperations.get(SecurityConstants.ROLE_ALL);

            menuVOS= JSONArray.parseArray(roleAll,MenuVO.class);

        }else{

            menuVOS = JSONArray.parseArray(roleAll, MenuVO.class);

        } else {

            R<List<MenuVO>> r = userService.getAllMenu();

            List<MenuVO> data = (List<MenuVO>)r.getData();

            List<MenuVO> data = r.getData();

            if (!ObjectUtils.isEmpty(data)) {

                menuVOS=data;

                valueOperations.set(SecurityConstants.ROLE_ALL,JSONArray.toJSONString(data),24, TimeUnit.HOURS);

                menuVOS = data;

                valueOperations.set(SecurityConstants.ROLE_ALL, JSONArray.toJSONString(data), 24, TimeUnit.HOURS);

            }

        }

        if (!ObjectUtils.isEmpty(menuVOS)) {

            List<MenuVO> collect = menuVOS.stream().filter(menuVO -> menuVO.getUrl().equals(requestUrl)).collect(Collectors.toList());

            List<MenuVO> collect =

                menuVOS.stream().filter(menuVO -> menuVO.getUrl().equals(requestUrl)).collect(Collectors.toList());

            if (!ObjectUtils.isEmpty(collect)) {

                collect.forEach(menuVO -> {

                    configAttributes.add(new SecurityConfig(menuVO.getRole()));

@@ -82,12 +86,12 @@
        boolean noToken = !requestUrl.contains("noToken");

        boolean useragreement = !requestUrl.contains("useragreement");

        boolean listadvertisement = !requestUrl.contains("listadvertisement");

//        boolean pageworkguide = !requestUrl.contains("applets/workguide/pageworkguide");

//        boolean detailworkguide = !requestUrl.contains("applets/workguide/detailworkguide");

//        boolean pagedynamic = !requestUrl.contains("applets/partybuilding/pagedynamic");

//        boolean infodynamic = !requestUrl.contains("applets/partybuilding/infodynamic");

        if (contains&&docs&&login&&refreshToken&&useragreement&&wxNotify&&wxCgi&&isShop&&listadvertisement&&noToken

                ) {

        // boolean pageworkguide = !requestUrl.contains("applets/workguide/pageworkguide");

        // boolean detailworkguide = !requestUrl.contains("applets/workguide/detailworkguide");

        // boolean pagedynamic = !requestUrl.contains("applets/partybuilding/pagedynamic");

        // boolean infodynamic = !requestUrl.contains("applets/partybuilding/infodynamic");

        if (contains && docs && login && refreshToken && useragreement && wxNotify && wxCgi && isShop

            && listadvertisement && noToken) {

            configAttributes.add(new SecurityConfig(SecurityConstants.ROLE_APPLETS));

        }

        return configAttributes;