Commit 5bb800d279ead958137ab243216a819ed4b7d677
1 parent
91c31825
fix: delete config
Showing
4 changed files
with
19 additions
and
19 deletions
ruoyi-admin/src/main/java/com/ruoyi/driver/controller/DriverController.java
| @@ -42,7 +42,7 @@ public class DriverController extends BaseController | @@ -42,7 +42,7 @@ public class DriverController extends BaseController | ||
| 42 | /** | 42 | /** |
| 43 | * 查询驾驶员信息列表 | 43 | * 查询驾驶员信息列表 |
| 44 | */ | 44 | */ |
| 45 | - @PreAuthorize("@ss.hasPermi('driver:driver:list')") | 45 | +// @PreAuthorize("@ss.hasPermi('driver:driver:list')") |
| 46 | @GetMapping("/list") | 46 | @GetMapping("/list") |
| 47 | @ApiOperation(value = "查询驾驶员信息列表",notes = "查询驾驶员信息列表") | 47 | @ApiOperation(value = "查询驾驶员信息列表",notes = "查询驾驶员信息列表") |
| 48 | public TableDataInfo list(Driver driver) | 48 | public TableDataInfo list(Driver driver) |
| @@ -55,7 +55,7 @@ public class DriverController extends BaseController | @@ -55,7 +55,7 @@ public class DriverController extends BaseController | ||
| 55 | /** | 55 | /** |
| 56 | * 导出驾驶员信息列表 | 56 | * 导出驾驶员信息列表 |
| 57 | */ | 57 | */ |
| 58 | - @PreAuthorize("@ss.hasPermi('driver:driver:export')") | 58 | +// @PreAuthorize("@ss.hasPermi('driver:driver:export')") |
| 59 | @Log(title = "驾驶员信息", businessType = BusinessType.EXPORT) | 59 | @Log(title = "驾驶员信息", businessType = BusinessType.EXPORT) |
| 60 | @PostMapping("/export") | 60 | @PostMapping("/export") |
| 61 | @ApiOperation("导出驾驶员信息列表") | 61 | @ApiOperation("导出驾驶员信息列表") |
| @@ -69,7 +69,7 @@ public class DriverController extends BaseController | @@ -69,7 +69,7 @@ public class DriverController extends BaseController | ||
| 69 | /** | 69 | /** |
| 70 | * 获取驾驶员信息详细信息 | 70 | * 获取驾驶员信息详细信息 |
| 71 | */ | 71 | */ |
| 72 | - @PreAuthorize("@ss.hasPermi('driver:driver:query')") | 72 | +// @PreAuthorize("@ss.hasPermi('driver:driver:query')") |
| 73 | @GetMapping(value = "/{id}") | 73 | @GetMapping(value = "/{id}") |
| 74 | @ApiOperation("获取驾驶员信息详细信息") | 74 | @ApiOperation("获取驾驶员信息详细信息") |
| 75 | public AjaxResult getInfo(@ApiParam(value = "id",required = true) @PathVariable("id") Long id) | 75 | public AjaxResult getInfo(@ApiParam(value = "id",required = true) @PathVariable("id") Long id) |
| @@ -80,7 +80,7 @@ public class DriverController extends BaseController | @@ -80,7 +80,7 @@ public class DriverController extends BaseController | ||
| 80 | /** | 80 | /** |
| 81 | * 新增驾驶员信息 | 81 | * 新增驾驶员信息 |
| 82 | */ | 82 | */ |
| 83 | - @PreAuthorize("@ss.hasPermi('driver:driver:add')") | 83 | +// @PreAuthorize("@ss.hasPermi('driver:driver:add')") |
| 84 | @Log(title = "驾驶员信息", businessType = BusinessType.INSERT) | 84 | @Log(title = "驾驶员信息", businessType = BusinessType.INSERT) |
| 85 | @PostMapping | 85 | @PostMapping |
| 86 | @ApiOperation("新增驾驶员信息") | 86 | @ApiOperation("新增驾驶员信息") |
| @@ -92,7 +92,7 @@ public class DriverController extends BaseController | @@ -92,7 +92,7 @@ public class DriverController extends BaseController | ||
| 92 | /** | 92 | /** |
| 93 | * 修改驾驶员信息 | 93 | * 修改驾驶员信息 |
| 94 | */ | 94 | */ |
| 95 | - @PreAuthorize("@ss.hasPermi('driver:driver:edit')") | 95 | +// @PreAuthorize("@ss.hasPermi('driver:driver:edit')") |
| 96 | @Log(title = "驾驶员信息", businessType = BusinessType.UPDATE) | 96 | @Log(title = "驾驶员信息", businessType = BusinessType.UPDATE) |
| 97 | @PutMapping | 97 | @PutMapping |
| 98 | @ApiOperation("修改驾驶员信息") | 98 | @ApiOperation("修改驾驶员信息") |
| @@ -104,7 +104,7 @@ public class DriverController extends BaseController | @@ -104,7 +104,7 @@ public class DriverController extends BaseController | ||
| 104 | /** | 104 | /** |
| 105 | * 删除驾驶员信息 | 105 | * 删除驾驶员信息 |
| 106 | */ | 106 | */ |
| 107 | - @PreAuthorize("@ss.hasPermi('driver:driver:remove')") | 107 | +// @PreAuthorize("@ss.hasPermi('driver:driver:remove')") |
| 108 | @Log(title = "驾驶员信息", businessType = BusinessType.DELETE) | 108 | @Log(title = "驾驶员信息", businessType = BusinessType.DELETE) |
| 109 | @DeleteMapping("/{ids}") | 109 | @DeleteMapping("/{ids}") |
| 110 | @ApiOperation("删除驾驶员信息") | 110 | @ApiOperation("删除驾驶员信息") |
ruoyi-admin/src/main/java/com/ruoyi/eexception/controller/EquipmentExceptionController.java
| @@ -41,7 +41,7 @@ public class EquipmentExceptionController extends BaseController | @@ -41,7 +41,7 @@ public class EquipmentExceptionController extends BaseController | ||
| 41 | /** | 41 | /** |
| 42 | * 查询设备异常记录列表 | 42 | * 查询设备异常记录列表 |
| 43 | */ | 43 | */ |
| 44 | - @PreAuthorize("@ss.hasPermi('eexception:eexception:list')") | 44 | +// @PreAuthorize("@ss.hasPermi('eexception:eexception:list')") |
| 45 | @GetMapping("/list") | 45 | @GetMapping("/list") |
| 46 | @ApiOperation("查询设备异常记录列表") | 46 | @ApiOperation("查询设备异常记录列表") |
| 47 | public TableDataInfo list(EquipmentException equipmentException) | 47 | public TableDataInfo list(EquipmentException equipmentException) |
| @@ -54,7 +54,7 @@ public class EquipmentExceptionController extends BaseController | @@ -54,7 +54,7 @@ public class EquipmentExceptionController extends BaseController | ||
| 54 | /** | 54 | /** |
| 55 | * 导出设备异常记录列表 | 55 | * 导出设备异常记录列表 |
| 56 | */ | 56 | */ |
| 57 | - @PreAuthorize("@ss.hasPermi('eexception:eexception:export')") | 57 | +// @PreAuthorize("@ss.hasPermi('eexception:eexception:export')") |
| 58 | @Log(title = "设备异常记录", businessType = BusinessType.EXPORT) | 58 | @Log(title = "设备异常记录", businessType = BusinessType.EXPORT) |
| 59 | @PostMapping("/export") | 59 | @PostMapping("/export") |
| 60 | @ApiOperation("导出设备异常记录列表") | 60 | @ApiOperation("导出设备异常记录列表") |
| @@ -68,7 +68,7 @@ public class EquipmentExceptionController extends BaseController | @@ -68,7 +68,7 @@ public class EquipmentExceptionController extends BaseController | ||
| 68 | /** | 68 | /** |
| 69 | * 获取设备异常记录详细信息 | 69 | * 获取设备异常记录详细信息 |
| 70 | */ | 70 | */ |
| 71 | - @PreAuthorize("@ss.hasPermi('eexception:eexception:query')") | 71 | +// @PreAuthorize("@ss.hasPermi('eexception:eexception:query')") |
| 72 | @GetMapping(value = "/{id}") | 72 | @GetMapping(value = "/{id}") |
| 73 | @ApiOperation("获取设备异常记录详细信息") | 73 | @ApiOperation("获取设备异常记录详细信息") |
| 74 | public AjaxResult getInfo(@PathVariable("id") Long id) | 74 | public AjaxResult getInfo(@PathVariable("id") Long id) |
| @@ -79,7 +79,7 @@ public class EquipmentExceptionController extends BaseController | @@ -79,7 +79,7 @@ public class EquipmentExceptionController extends BaseController | ||
| 79 | /** | 79 | /** |
| 80 | * 新增设备异常记录 | 80 | * 新增设备异常记录 |
| 81 | */ | 81 | */ |
| 82 | - @PreAuthorize("@ss.hasPermi('eexception:eexception:add')") | 82 | +// @PreAuthorize("@ss.hasPermi('eexception:eexception:add')") |
| 83 | @Log(title = "设备异常记录", businessType = BusinessType.INSERT) | 83 | @Log(title = "设备异常记录", businessType = BusinessType.INSERT) |
| 84 | @PostMapping | 84 | @PostMapping |
| 85 | @ApiOperation("新增设备异常记录") | 85 | @ApiOperation("新增设备异常记录") |
| @@ -91,7 +91,7 @@ public class EquipmentExceptionController extends BaseController | @@ -91,7 +91,7 @@ public class EquipmentExceptionController extends BaseController | ||
| 91 | /** | 91 | /** |
| 92 | * 修改设备异常记录 | 92 | * 修改设备异常记录 |
| 93 | */ | 93 | */ |
| 94 | - @PreAuthorize("@ss.hasPermi('eexception:eexception:edit')") | 94 | +// @PreAuthorize("@ss.hasPermi('eexception:eexception:edit')") |
| 95 | @Log(title = "设备异常记录", businessType = BusinessType.UPDATE) | 95 | @Log(title = "设备异常记录", businessType = BusinessType.UPDATE) |
| 96 | @PutMapping | 96 | @PutMapping |
| 97 | @ApiOperation("修改设备异常记录") | 97 | @ApiOperation("修改设备异常记录") |
| @@ -103,7 +103,7 @@ public class EquipmentExceptionController extends BaseController | @@ -103,7 +103,7 @@ public class EquipmentExceptionController extends BaseController | ||
| 103 | /** | 103 | /** |
| 104 | * 删除设备异常记录 | 104 | * 删除设备异常记录 |
| 105 | */ | 105 | */ |
| 106 | - @PreAuthorize("@ss.hasPermi('eexception:eexception:remove')") | 106 | +// @PreAuthorize("@ss.hasPermi('eexception:eexception:remove')") |
| 107 | @Log(title = "设备异常记录", businessType = BusinessType.DELETE) | 107 | @Log(title = "设备异常记录", businessType = BusinessType.DELETE) |
| 108 | @DeleteMapping("/{ids}") | 108 | @DeleteMapping("/{ids}") |
| 109 | @ApiOperation("删除设备异常记录") | 109 | @ApiOperation("删除设备异常记录") |
ruoyi-admin/src/main/java/com/ruoyi/equipment/controller/EquipmentController.java
| @@ -41,7 +41,7 @@ public class EquipmentController extends BaseController | @@ -41,7 +41,7 @@ public class EquipmentController extends BaseController | ||
| 41 | /** | 41 | /** |
| 42 | * 查询设备信息列表 | 42 | * 查询设备信息列表 |
| 43 | */ | 43 | */ |
| 44 | - @PreAuthorize("@ss.hasPermi('equipment:equipment:list')") | 44 | +// @PreAuthorize("@ss.hasPermi('equipment:equipment:list')") |
| 45 | @GetMapping("/list") | 45 | @GetMapping("/list") |
| 46 | @ApiOperation("查询设备信息列表") | 46 | @ApiOperation("查询设备信息列表") |
| 47 | public TableDataInfo list(Equipment equipment) | 47 | public TableDataInfo list(Equipment equipment) |
| @@ -54,7 +54,7 @@ public class EquipmentController extends BaseController | @@ -54,7 +54,7 @@ public class EquipmentController extends BaseController | ||
| 54 | /** | 54 | /** |
| 55 | * 导出设备信息列表 | 55 | * 导出设备信息列表 |
| 56 | */ | 56 | */ |
| 57 | - @PreAuthorize("@ss.hasPermi('equipment:equipment:export')") | 57 | +// @PreAuthorize("@ss.hasPermi('equipment:equipment:export')") |
| 58 | @Log(title = "设备信息", businessType = BusinessType.EXPORT) | 58 | @Log(title = "设备信息", businessType = BusinessType.EXPORT) |
| 59 | @PostMapping("/export") | 59 | @PostMapping("/export") |
| 60 | @ApiOperation("导出设备信息列表") | 60 | @ApiOperation("导出设备信息列表") |
| @@ -68,7 +68,7 @@ public class EquipmentController extends BaseController | @@ -68,7 +68,7 @@ public class EquipmentController extends BaseController | ||
| 68 | /** | 68 | /** |
| 69 | * 获取设备信息详细信息 | 69 | * 获取设备信息详细信息 |
| 70 | */ | 70 | */ |
| 71 | - @PreAuthorize("@ss.hasPermi('equipment:equipment:query')") | 71 | +// @PreAuthorize("@ss.hasPermi('equipment:equipment:query')") |
| 72 | @GetMapping(value = "/{id}") | 72 | @GetMapping(value = "/{id}") |
| 73 | @ApiOperation("获取设备信息详细信息") | 73 | @ApiOperation("获取设备信息详细信息") |
| 74 | public AjaxResult getInfo(@PathVariable("id") Long id) | 74 | public AjaxResult getInfo(@PathVariable("id") Long id) |
| @@ -79,7 +79,7 @@ public class EquipmentController extends BaseController | @@ -79,7 +79,7 @@ public class EquipmentController extends BaseController | ||
| 79 | /** | 79 | /** |
| 80 | * 新增设备信息 | 80 | * 新增设备信息 |
| 81 | */ | 81 | */ |
| 82 | - @PreAuthorize("@ss.hasPermi('equipment:equipment:add')") | 82 | +// @PreAuthorize("@ss.hasPermi('equipment:equipment:add')") |
| 83 | @Log(title = "设备信息", businessType = BusinessType.INSERT) | 83 | @Log(title = "设备信息", businessType = BusinessType.INSERT) |
| 84 | @PostMapping | 84 | @PostMapping |
| 85 | @ApiOperation("新增设备信息") | 85 | @ApiOperation("新增设备信息") |
| @@ -91,7 +91,7 @@ public class EquipmentController extends BaseController | @@ -91,7 +91,7 @@ public class EquipmentController extends BaseController | ||
| 91 | /** | 91 | /** |
| 92 | * 修改设备信息 | 92 | * 修改设备信息 |
| 93 | */ | 93 | */ |
| 94 | - @PreAuthorize("@ss.hasPermi('equipment:equipment:edit')") | 94 | +// @PreAuthorize("@ss.hasPermi('equipment:equipment:edit')") |
| 95 | @Log(title = "设备信息", businessType = BusinessType.UPDATE) | 95 | @Log(title = "设备信息", businessType = BusinessType.UPDATE) |
| 96 | @PutMapping | 96 | @PutMapping |
| 97 | @ApiOperation("修改设备信息") | 97 | @ApiOperation("修改设备信息") |
| @@ -103,7 +103,7 @@ public class EquipmentController extends BaseController | @@ -103,7 +103,7 @@ public class EquipmentController extends BaseController | ||
| 103 | /** | 103 | /** |
| 104 | * 删除设备信息 | 104 | * 删除设备信息 |
| 105 | */ | 105 | */ |
| 106 | - @PreAuthorize("@ss.hasPermi('equipment:equipment:remove')") | 106 | +// @PreAuthorize("@ss.hasPermi('equipment:equipment:remove')") |
| 107 | @Log(title = "设备信息", businessType = BusinessType.DELETE) | 107 | @Log(title = "设备信息", businessType = BusinessType.DELETE) |
| 108 | @DeleteMapping("/{ids}") | 108 | @DeleteMapping("/{ids}") |
| 109 | @ApiOperation("删除设备信息") | 109 | @ApiOperation("删除设备信息") |
ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
| @@ -111,7 +111,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter | @@ -111,7 +111,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter | ||
| 111 | // 过滤请求 | 111 | // 过滤请求 |
| 112 | .authorizeRequests() | 112 | .authorizeRequests() |
| 113 | // 对于登录login 注册register 验证码captchaImage 允许匿名访问 | 113 | // 对于登录login 注册register 验证码captchaImage 允许匿名访问 |
| 114 | - .antMatchers("/**","/login", "/register", "/captchaImage").permitAll() | 114 | + .antMatchers("/driver/**","/in/**","/eexception/**","/equipment/**","/login", "/register", "/captchaImage").permitAll() |
| 115 | // 静态资源,可匿名访问 | 115 | // 静态资源,可匿名访问 |
| 116 | .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll() | 116 | .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll() |
| 117 | .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll() | 117 | .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll() |