lenovodn 2 лет назад
Родитель
Сommit
abbe0a7f6a

+ 12 - 10
jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java

@@ -53,7 +53,7 @@ public class ShiroConfig {
 
     /**
      * Filter Chain定义说明
-     *
+     * <p>
      * 1、一个URL可以配置多个Filter,使用逗号分隔
      * 2、当设置多个过滤器时,全部验证通过,才视为通过
      * 3、部分过滤器可指定参数,如perms,roles
@@ -66,12 +66,12 @@ public class ShiroConfig {
         Map<String, String> filterChainDefinitionMap = new LinkedHashMap<String, String>();
 
         //支持yml方式,配置拦截排除
-        if(jeecgBaseConfig!=null && jeecgBaseConfig.getShiro()!=null){
+        if (jeecgBaseConfig != null && jeecgBaseConfig.getShiro() != null) {
             String shiroExcludeUrls = jeecgBaseConfig.getShiro().getExcludeUrls();
-            if(oConvertUtils.isNotEmpty(shiroExcludeUrls)){
+            if (oConvertUtils.isNotEmpty(shiroExcludeUrls)) {
                 String[] permissionUrl = shiroExcludeUrls.split(",");
-                for(String url : permissionUrl){
-                    filterChainDefinitionMap.put(url,"anon");
+                for (String url : permissionUrl) {
+                    filterChainDefinitionMap.put(url, "anon");
                 }
             }
         }
@@ -114,7 +114,8 @@ public class ShiroConfig {
         filterChainDefinitionMap.put("/**/*.ttf", "anon");
         filterChainDefinitionMap.put("/**/*.woff", "anon");
         filterChainDefinitionMap.put("/**/*.woff2", "anon");
-         filterChainDefinitionMap.put("/**/*.json", "anon");
+        filterChainDefinitionMap.put("/**/*.json", "anon");
+        filterChainDefinitionMap.put("/**/*.zip", "anon");
 
         filterChainDefinitionMap.put("/druid/**", "anon");
         filterChainDefinitionMap.put("/swagger-ui.html", "anon");
@@ -153,7 +154,7 @@ public class ShiroConfig {
         Map<String, Filter> filterMap = new HashMap<String, Filter>(1);
         //如果cloudServer为空 则说明是单体 需要加载跨域配置【微服务跨域切换】
         Object cloudServer = env.getProperty(CommonConstant.CLOUD_SERVER_KEY);
-        filterMap.put("jwt", new JwtFilter(cloudServer==null));
+        filterMap.put("jwt", new JwtFilter(cloudServer == null));
         shiroFilterFactoryBean.setFilters(filterMap);
         // <!-- 过滤链定义,从上向下顺序执行,一般将/**放在最为下边
         filterChainDefinitionMap.put("/**", "jwt");
@@ -187,6 +188,7 @@ public class ShiroConfig {
 
     /**
      * 下面的代码是添加注解支持
+     *
      * @return
      */
     @Bean
@@ -253,15 +255,15 @@ public class ShiroConfig {
                 redisManager.setPassword(lettuceConnectionFactory.getPassword());
             }
             manager = redisManager;
-        }else{
+        } else {
             // redis集群支持,优先使用集群配置
             RedisClusterManager redisManager = new RedisClusterManager();
             Set<HostAndPort> portSet = new HashSet<>();
-            lettuceConnectionFactory.getClusterConfiguration().getClusterNodes().forEach(node -> portSet.add(new HostAndPort(node.getHost() , node.getPort())));
+            lettuceConnectionFactory.getClusterConfiguration().getClusterNodes().forEach(node -> portSet.add(new HostAndPort(node.getHost(), node.getPort())));
             //update-begin--Author:scott Date:20210531 for:修改集群模式下未设置redis密码的bug issues/I3QNIC
             if (oConvertUtils.isNotEmpty(lettuceConnectionFactory.getPassword())) {
                 JedisCluster jedisCluster = new JedisCluster(portSet, 2000, 2000, 5,
-                    lettuceConnectionFactory.getPassword(), new GenericObjectPoolConfig());
+                        lettuceConnectionFactory.getPassword(), new GenericObjectPoolConfig());
                 redisManager.setPassword(lettuceConnectionFactory.getPassword());
                 redisManager.setJedisCluster(jedisCluster);
             } else {

+ 1 - 3
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/controller/NwVersionController.java

@@ -200,13 +200,11 @@ public class NwVersionController extends JeecgController<NwVersion, INwVersionSe
         return Result.OK(path+one.getPath());
     }
 
-
     @ApiOperation(value = "nw更新-JSON文件", notes = "nw更新-JSON文件")
-
     @GetMapping(value = "/downLoadJson")
     public Result<String> getJson(HttpServletRequest request, HttpServletResponse response) {
         NwVersion one = nwVersionService.lambdaQuery().orderByDesc(NwVersion::getCreateTime).last("limit 1").one();
         return Result.OK(path+one.getJsonPath());
-
     }
+
 }