diff --git a/ym-admin/src/main/java/com/cnbm/admin/config/SecurityConfig.java b/ym-admin/src/main/java/com/cnbm/admin/config/SecurityConfig.java index 81c8825..5cf488f 100644 --- a/ym-admin/src/main/java/com/cnbm/admin/config/SecurityConfig.java +++ b/ym-admin/src/main/java/com/cnbm/admin/config/SecurityConfig.java @@ -75,7 +75,11 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter { "/test/**", "/**/expert", "/captcha", - "druid/**").anonymous() + "druid/**", + "/packing/woPackagingBox/page", + "/packing/printModel/page" + + ).anonymous() // .antMatchers("/testCors").hasAuthority("system:dept:list222") // 除上面外的所有请求全部需要鉴权认证 .anyRequest() diff --git a/ym-packing/src/main/java/com/cnbm/packing/controller/PrintModelController.java b/ym-packing/src/main/java/com/cnbm/packing/controller/PrintModelController.java index a190fb9..42c02e5 100644 --- a/ym-packing/src/main/java/com/cnbm/packing/controller/PrintModelController.java +++ b/ym-packing/src/main/java/com/cnbm/packing/controller/PrintModelController.java @@ -52,10 +52,9 @@ public class PrintModelController { @ApiImplicitParam(name = "lineBody", value = "线体,1=F ; 2=S", paramType = "query", dataTypeClass = Integer.class), @ApiImplicitParam(name = "isEnable", value = "启用状态:0 、停用,1、启用", paramType = "query", dataTypeClass = Integer.class) }) - @PreAuthorize("@ex.hasAuthority('packing:printModel:page')") + //@PreAuthorize("@ex.hasAuthority('packing:printModel:page')") public Result> page(@ApiIgnore @RequestParam Map params){ PageData page = printModelService.page(params); - return new Result>().ok(page); } diff --git a/ym-packing/src/main/java/com/cnbm/packing/controller/TestController.java b/ym-packing/src/main/java/com/cnbm/packing/controller/TestController.java index 9d16b59..b09fea2 100644 --- a/ym-packing/src/main/java/com/cnbm/packing/controller/TestController.java +++ b/ym-packing/src/main/java/com/cnbm/packing/controller/TestController.java @@ -159,8 +159,8 @@ public class TestController { return R.ok(); } -// @PostMapping("/forImport") -// public R forImport(@RequestBody WoCompensationPowerDTO dto) throws UnsupportedEncodingException, ParseException { +// @PostMapping("/forImportTest") +// public R forImportTest(@RequestBody WoCompensationPowerDTO dto){ // System.out.println(dto.getRemark()); // // List alllCamlineSubForImp = service.getAlllCamlineSubForImp(dto.getRemark().split(",")); diff --git a/ym-packing/src/main/java/com/cnbm/packing/controller/WoPackagingBoxController.java b/ym-packing/src/main/java/com/cnbm/packing/controller/WoPackagingBoxController.java index 85da518..ce0b3d7 100644 --- a/ym-packing/src/main/java/com/cnbm/packing/controller/WoPackagingBoxController.java +++ b/ym-packing/src/main/java/com/cnbm/packing/controller/WoPackagingBoxController.java @@ -63,7 +63,6 @@ public class WoPackagingBoxController { // @ApiImplicitParam(name = "printStatus", value = "打印状态:0、未打印,1、已打印", paramType = "query", dataTypeClass = Integer.class), @ApiImplicitParam(name = "model", value = "模式,1-手动模式;2-自动模式", paramType = "query", dataTypeClass = Integer.class) }) - @PreAuthorize("@ex.hasAuthority('packing:woPackagingBox:page')") public Result> page(@ApiIgnore @RequestParam Map params){ PageData page = woPackagingBoxService.page(params);