forked from kidgrow-microservices-platform

zhaoxiaohao
2020-11-18 968a4703c4fae81f71f77a4bea99af8c26e5647e
修改 zuul  并且   输出日志
3 files modified
13 ■■■■ changed files
kidgrow-config/src/main/resources/application-dev.properties 3 ●●●● patch | view | raw | blame | history
kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/java/com/kidgrow/zuul/filter/OrganizationFilter.java 2 ●●● patch | view | raw | blame | history
kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/java/com/kidgrow/zuul/filter/UserInfoHeaderFilter.java 8 ●●●●● patch | view | raw | blame | history
kidgrow-config/src/main/resources/application-dev.properties
@@ -88,4 +88,5 @@
## C\u7AEF\u4EA7\u54C1\u53EF\u7231\u9AD8\u7B5B\u67E5\u5C0F\u7A0B\u5E8F\u914D\u7F6E\u4FE1\u606F
wechat.screening.applets.appid=wx5a9bc7ebd13eb6cc
wechat.screening.applets.secret=c16d8e42e42137bd7ba6e6999f226803
wechat.screening.applets.secret=c16d8e42e42137bd7ba6e6999f226803
health_url_net=http://192.168.2.22/
kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/java/com/kidgrow/zuul/filter/OrganizationFilter.java
@@ -97,7 +97,7 @@
                            map=new HashMap<>();
                            map.put("id",sysUserOrg.getOrgId());
                            List<SysOrganization> sysOrganizations = JSON.parseArray(JSON.toJSONString(sysOrganizationService.getListByMap(map).getData()), SysOrganization.class);
                            if(sysOrganizations.isEmpty()){
                            if(sysOrganizations==null||sysOrganizations.size()<=0){
                                ctx.setSendZuulResponse(false);
                                ctx.addZuulResponseHeader("Content-Type","application/json;charset=UTF-8");
                                ctx.setResponseBody(JSON.toJSONString(ResultBody.fail(1000, "您的组织已经被禁用,请联系管理员")));
kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/java/com/kidgrow/zuul/filter/UserInfoHeaderFilter.java
@@ -104,6 +104,14 @@
                List<SysOrganization> organizations = (List<SysOrganization>) user.getOrganizations();
                //将组织数据 存到header 里面
                if (organizations != null&&organizations.size()>0) {
                    System.out.println(organizations.size());
                    System.out.println("111111111111111111111");
                    for (SysOrganization organization : organizations) {
                        if(organization!=null){
                            System.out.println(organization.getOrgLevel());
                        }
                    }
                    System.out.println("22222222222222");
                    organizations.sort((e1,e2)->e1.getOrgLevel().compareTo(e2.getOrgLevel()));
                    ctx.addZuulRequestHeader(SecurityConstants.USER_ORG_ID_HEADER,String.valueOf(organizations.get(0).getId()));
                    ctx.addZuulRequestHeader(SecurityConstants.USER_ORGS_HEADER,JSON.toJSONString(organizations));