From 5d65f461567b8e23201934130e0245bce6ca12d1 Mon Sep 17 00:00:00 2001 From: wu Date: Thu, 22 Feb 2024 14:03:19 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9events=E8=A1=A8=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2;=20=E6=B7=BB=E5=8A=A0=E6=8E=A5=E5=8F=A3=E6=9D=83?= =?UTF-8?q?=E9=99=90=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ruoyi/pt/controller/EventsController.java | 7 ++++--- .../java/com/ruoyi/framework/config/SecurityConfig.java | 8 +++++--- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/pt/controller/EventsController.java b/ruoyi-admin/src/main/java/com/ruoyi/pt/controller/EventsController.java index f8cdae2..8a52dde 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/pt/controller/EventsController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/pt/controller/EventsController.java @@ -1,7 +1,6 @@ package com.ruoyi.pt.controller; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.common.core.controller.BaseController; @@ -45,7 +44,7 @@ public class EventsController extends BaseController { /** * 分页条件查询所有数据 * - * @param page 分页条件 + * @param page 分页条件 * @param events 查询条件 * @return 所有数据 */ @@ -64,7 +63,9 @@ public class EventsController extends BaseController { @GetMapping("{id}") @ApiOperation(value = "通过主键查询单条事件集合表", response = Events.class) public AjaxResult getById(@PathVariable Serializable id) { - return success(eventsService.getById(id)); + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("innerEventId", id); + return success(eventsService.getOne(wrapper)); } /** diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java index 76fd1a4..2081747 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java @@ -114,9 +114,11 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter .antMatchers("/login", "/register", "/captchaImage").permitAll() // 静态资源，可匿名访问 .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll() - .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**","/pt/**","/gateway/event/event/eventData/**","/gateway/event/event/eventData/eventProgress/**").permitAll() - .antMatchers("/remoteCall/**").anonymous() - .antMatchers("/common/**").anonymous() + .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll() +// .antMatchers("/remoteCall/**").anonymous() +// .antMatchers("/pt/**").anonymous() +// .antMatchers("/gateway/event/event/eventData/**").anonymous() +// .antMatchers("/gateway/event/event/eventData/eventProgress/**").anonymous() // 除上面外的所有请求全部需要鉴权认证 .anyRequest().authenticated() .and()