nidapeng
2024-04-28 a4a4e46ba204634f1355ac1ec9fd3dec0a1579f5
最新版本
已修改7个文件
已重命名2个文件
57 ■■■■ 文件已修改
server/meeting/meeting_admin/src/main/java/com/doumee/api/cloud/CloudBookingsController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/meeting/meeting_admin/src/main/java/com/doumee/config/shiro/ShiroConfig.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/meeting/meeting_admin/src/main/java/com/doumee/config/swagger/SwaggerConfig.java 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/system_gateway/src/main/java/com/doumee/config/CustomWebFilterConfig.java 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/system_gateway/src/main/java/com/doumee/config/GatewayFilterProperties.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/system_gateway/src/main/java/com/doumee/config/GlobalErrorFilterConfig.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/system_gateway/src/main/java/com/doumee/config/GlobalFilterConfig.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/system_gateway/src/main/resources/application.yml 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/system_service/src/main/java/com/doumee/config/cloudfilter/LoginHandlerInterceptor.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/meeting/meeting_admin/src/main/java/com/doumee/api/cloud/CloudBookingsController.java
@@ -45,7 +45,7 @@
 * @author æ±Ÿè¹„蹄
 * @date 2023/05/04 18:18
 */
@Api(tags = "会议室预定信息表")
@Api(tags = "微服务-会议室相关接口")
@RestController
@RequestMapping("/cloudService/bookings")
public class CloudBookingsController extends BaseController {
@@ -60,7 +60,7 @@
    }
    @LoginNoRequired
    @ApiOperation("测试网管")
    @ApiOperation("测试无需登录成功")
    @GetMapping("/testNoLogin")
    public ApiResponse testNoLogin() {
        return ApiResponse.success("会议室管理测试无需登录成功");
server/meeting/meeting_admin/src/main/java/com/doumee/config/shiro/ShiroConfig.java
@@ -73,7 +73,7 @@
        map.put("/common/captcha", "anon");
        //文件上传取消拦截
        map.put("/public/**", "anon");
        map.put("/cloud/**", "anon");
        map.put("/cloudService/**", "anon");
        // - æ”¾è¡Œswagger
        map.put("/doc.html", "anon");
server/meeting/meeting_admin/src/main/java/com/doumee/config/swagger/SwaggerConfig.java
@@ -65,12 +65,26 @@
                .apiInfo(this.getApiInfo()).groupName("default")
                .host(host)
                .select()
                .apis( basePackage("com.doumee.api.cloud"))
                // è®¾ç½®éœ€è¦è¢«æ‰«æçš„类,这里设置为添加了@Api注解的类
//                .apis(RequestHandlerSelectors.withClassAnnotation(Api.class))
                .paths(PathSelectors.any())
                .build();
    }
/*
    @Bean
    public Docket getDocket2() {
        return new Docket(DocumentationType.SWAGGER_2)
                .apiInfo(this.getApiInfo()).groupName("default")
                .host(host)
                .select()
                .apis( basePackage("com.doumee.api.system;com.doumee.api.business;com.doumee.api.common"))
                // è®¾ç½®éœ€è¦è¢«æ‰«æçš„类,这里设置为添加了@Api注解的类
//                .apis(RequestHandlerSelectors.withClassAnnotation(Api.class))
                .paths(PathSelectors.any())
                .build();
    }
*/
   /* @Bean
    public Docket getDocket1() {
        return new Docket(DocumentationType.SWAGGER_2)
server/system_gateway/src/main/java/com/doumee/config/CustomWebFilterConfig.java
ÎļþÃû´Ó server/system_gateway/src/main/java/com/doumee/config/swagger/CustomWebFilterConfig.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.doumee.config.swagger;
package com.doumee.config;
import com.doumee.config.GatewayFilterProperties;
import com.doumee.core.utils.Constants;
@@ -55,6 +55,21 @@
     * //     * @param currentUrl å½“前请求路径
     */
    private boolean shouldSkip(String currentUrl) {
        //如果没有登陆拦截目录,直接返回跳过校验
        if(notAuthUrlProperties.getLoginFilterFolders() == null || notAuthUrlProperties.getLoginFilterFolders().size() ==0){
            return  true;
        }
        boolean isLoginFolder = false;
        for (String skipPath : notAuthUrlProperties.getLoginFilterFolders()) {
            if (skipPath.startsWith(currentUrl)) {
                isLoginFolder = true;
            }
        }
        if(!isLoginFolder){
            //如果不在需要验证目录下,直接返回false,无需验证登录
            return  true;
        }
        //如果没有配置无需登录拦截的接口地址,直接返回false(需要验证)
        if(notAuthUrlProperties.getSkipLoginFilterUrls() == null || notAuthUrlProperties.getSkipLoginFilterUrls().size() ==0){
            return  false;
        }
server/system_gateway/src/main/java/com/doumee/config/GatewayFilterProperties.java
@@ -10,5 +10,12 @@
@Component
@ConfigurationProperties("gateway")
public class GatewayFilterProperties {
    /**
     * æ ¡éªŒæ— éœ€ç™»å½•拦截的接口地址
     */
    private LinkedHashSet<String> skipLoginFilterUrls;
    /**
     * æ ¡éªŒæŽ¥å£è·Ÿç›®å½•
     */
    private LinkedHashSet<String> loginFilterFolders;
}
server/system_gateway/src/main/java/com/doumee/config/GlobalErrorFilterConfig.java
ÎļþÃû´Ó server/system_gateway/src/main/java/com/doumee/config/swagger/GlobalErrorFilterConfig.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.doumee.config.swagger;
package com.doumee.config;
import com.doumee.config.GlobalErrorFilter;
import org.springframework.context.annotation.Bean;
server/system_gateway/src/main/java/com/doumee/config/GlobalFilterConfig.java
@@ -19,8 +19,8 @@
import javax.annotation.Resource;
@Order(1)
@Configuration
//@Order(1)
//@Configuration
public class GlobalFilterConfig implements GlobalFilter {
    @Autowired
    private RedisTemplate<String,Object> stringRedisTemplate;
server/system_gateway/src/main/resources/application.yml
@@ -91,9 +91,14 @@
gateway:
  loginFilterFolders:
    - /login
    - /biz/
  skipLoginFilterUrls:
    - /meetingAdmin/**
    - /visitsAdmin/**
    - /login
    - /doc.html
    - /v2/api-docs/**
    - /**.js
    - /**.html
server/system_service/src/main/java/com/doumee/config/cloudfilter/LoginHandlerInterceptor.java
@@ -28,7 +28,7 @@
    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
        HandlerMethod handlerMethod = (HandlerMethod) handler;
        Class<?> beanType = handlerMethod.getBeanType();
        if (!beanType.isAnnotationPresent(LoginNoRequired.class) || !handlerMethod.hasMethodAnnotation(LoginNoRequired.class)) {
        if (!beanType.isAnnotationPresent(LoginNoRequired.class) && !handlerMethod.hasMethodAnnotation(LoginNoRequired.class)) {
            //获取token
            String token = request.getHeader(Constants.HEADER_USER_TOKEN);  // ä»Ž http è¯·æ±‚头中取出 token
            if (StringUtils.isNotBlank(token)) {