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()