Merge branch 'release-feat-zhangfeng' into 'release'

feat(member): 积分相关权限校验取消

See merge request !27

yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/controller/admin/scoreRule/ScoreRuleController.java

@@ -48,14 +48,14 @@ public class ScoreRuleController {
     @PostMapping("/create")
     @ApiOperation("创建积分规则")
     @Idempotent(timeout = 3)
-    @PreAuthorize("@ss.hasPermission('member:score-rule:create')")
+    //@PreAuthorize("@ss.hasPermission('member:score-rule:create')")
     public CommonResult<Long> createScoreRule(@Valid @RequestBody ScoreRuleCreateReqVO createReqVO) {
         return success(scoreRuleService.createScoreRule(createReqVO));
     }
 
     @PostMapping("/update")
     @ApiOperation("更新积分规则")
-    @PreAuthorize("@ss.hasPermission('member:score-rule:update')")
+    //@PreAuthorize("@ss.hasPermission('member:score-rule:update')")
     public CommonResult<Boolean> updateScoreRule(@Valid @RequestBody ScoreRuleUpdateReqVO updateReqVO) {
         scoreRuleService.updateScoreRule(updateReqVO);
         return success(true);
@@ -63,7 +63,7 @@ public class ScoreRuleController {
 
     @PostMapping("/delete")
     @ApiOperation("删除积分规则")
-    @PreAuthorize("@ss.hasPermission('member:score-rule:delete')")
+    //@PreAuthorize("@ss.hasPermission('member:score-rule:delete')")
     public CommonResult<Boolean> deleteScoreRule(@Valid @RequestBody IdReqVo idReqVo) {
         scoreRuleService.deleteScoreRule(idReqVo.getId());
         return success(true);
@@ -71,7 +71,7 @@ public class ScoreRuleController {
 
     @PostMapping("/get")
     @ApiOperation("获得积分规则详情")
-    @PreAuthorize("@ss.hasPermission('member:score-rule:query')")
+    //@PreAuthorize("@ss.hasPermission('member:score-rule:query')")
     public CommonResult<ScoreRuleBackDetailVO> getScoreRule(@Valid @RequestBody IdReqVo idReqVo) {
         ScoreRuleBackDetailVO scoreRuleBackDetailVO = scoreRuleService.getScoreRule(idReqVo.getId());
         return success(scoreRuleBackDetailVO);
@@ -80,7 +80,7 @@ public class ScoreRuleController {
     @PostMapping("/list")
     @ApiOperation("获得积分规则列表")
     @ApiImplicitParam(name = "ids", value = "编号列表", required = true, example = "1024,2048", dataTypeClass = List.class)
-    @PreAuthorize("@ss.hasPermission('member:score-rule:query')")
+    //@PreAuthorize("@ss.hasPermission('member:score-rule:query')")
     public CommonResult<List<ScoreRuleBackVO>> getScoreRuleList(@NotNull @RequestParam Collection<Long> ids) {
         List<ScoreRuleBackVO> list = scoreRuleService.getScoreRuleList(ids);
         return success(list);
@@ -88,7 +88,7 @@ public class ScoreRuleController {
 
     @PostMapping("/page")
     @ApiOperation("获得积分规则分页")
-    @PreAuthorize("@ss.hasPermission('member:score-rule:query')")
+    //@PreAuthorize("@ss.hasPermission('member:score-rule:query')")
     public CommonResult<PageResult<ScoreRuleBackVO>> getScoreRulePage(@Valid @RequestBody ScoreRuleQueryVO query, PageVO page) {
         PageResult<ScoreRuleBackVO> pageResult = scoreRuleService.getScoreRulePage(query, page);
         return success(pageResult);
@@ -96,7 +96,7 @@ public class ScoreRuleController {
 
     @PostMapping("/status")
     @ApiOperation("启用关闭")
-    @PreAuthorize("@ss.hasPermission('member:score-rule:update')")
+    //@PreAuthorize("@ss.hasPermission('member:score-rule:update')")
     public CommonResult<Boolean> updateStatus(@Valid @RequestBody ScoreRuleStatusReqVO scoreRuleStatusReqVO) {
         scoreRuleService.updateStatus(scoreRuleStatusReqVO);
         return success(true);
@@ -105,14 +105,14 @@ public class ScoreRuleController {
     @PostMapping("/copy")
     @ApiOperation("复制规则")
     @Idempotent(timeout = 3)
-    @PreAuthorize("@ss.hasPermission('member:score-rule:create')")
+    //@PreAuthorize("@ss.hasPermission('member:score-rule:create')")
     public CommonResult<Long> copyScoreRule(@Valid @RequestBody IdReqVo idReqVo) {
         return success(scoreRuleService.copyScoreRule(idReqVo.getId()));
     }
 
     @PostMapping("/delay")
     @ApiOperation("延期规则")
-    @PreAuthorize("@ss.hasPermission('member:score-rule:update')")
+    //@PreAuthorize("@ss.hasPermission('member:score-rule:update')")
     public CommonResult<Boolean> delayScoreRule(@Valid @RequestBody ScoreDelayReqVO scoreDelayReqVO) {
         scoreRuleService.delayScoreRule(scoreDelayReqVO);
         return success(true);
@@ -135,7 +135,7 @@ public class ScoreRuleController {
 
     @GetMapping("/export-excel")
     @ApiOperation("导出积分规则Excel")
-    @PreAuthorize("@ss.hasPermission('member:score-rule:export')")
+    //@PreAuthorize("@ss.hasPermission('member:score-rule:export')")
     @OperateLog(type = EXPORT)
     public void exportScoreRuleExcel(@Valid ScoreRuleQueryVO query,
                                      HttpServletResponse response) throws IOException {
@@ -147,7 +147,7 @@ public class ScoreRuleController {
 
     @PostMapping("/switch/set")
     @ApiOperation("设置会员工能开关")
-    @PreAuthorize("@ss.hasPermission('member:score-rule:update')")
+    //@PreAuthorize("@ss.hasPermission('member:score-rule:update')")
     public CommonResult<Boolean> setScoreRuleSwitch(@RequestBody SwitchReqVo switchReqVo) {
         return success(scoreRuleService.setScoreRuleSwitch(switchReqVo));
     }

yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/controller/admin/userScore/MemberUserScoreController.java

@@ -43,7 +43,7 @@ public class MemberUserScoreController {
 
     @PostMapping("/page")
     @ApiOperation("获得会员积分分页")
-    @PreAuthorize("@ss.hasPermission('member:user-score:query')")
+    //@PreAuthorize("@ss.hasPermission('member:user-score:query')")
     public CommonResult<PageResult<MemberUserScoreBackVO>> getUserScorePage(@Valid @RequestBody MemberUserScoreQueryVO query) {
         PageResult<MemberUserScoreBackVO> pageResult = userScoreService.getUserScorePage(query);
         return success(pageResult);
@@ -52,7 +52,7 @@ public class MemberUserScoreController {
     @PostMapping("/operate")
     @ApiOperation("操作积分")
     @Idempotent(timeout = 5)
-    @PreAuthorize("@ss.hasPermission('member:user-score:operate')")
+    //@PreAuthorize("@ss.hasPermission('member:user-score:operate')")
     public CommonResult<Boolean> operate(@Valid @RequestBody MemberUserScoreOperateQueryVO query) {
         Map<String,Object> extParam = new HashMap<>();
         extParam.put("comment", query.getComment());

yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/controller/admin/userScoreLog/MemberUserScoreLogController.java

@@ -29,7 +29,7 @@ public class MemberUserScoreLogController {
 
     @PostMapping("/page")
     @ApiOperation("获得积分记录分页")
-    @PreAuthorize("@ss.hasPermission('member:user-score-log:query')")
+    //@PreAuthorize("@ss.hasPermission('member:user-score-log:query')")
     public CommonResult<PageResult<MemberUserScoreLogBackVO>> page(@Valid @RequestBody MemberUserScoreLogQueryVO query) {
         PageResult<MemberUserScoreLogBackVO> pageResult = memberUserScoreLogService.getPage(query);
         return success(pageResult);