Skip to content

Commit 59dd0a3

Browse files
YunaiVYunaiV
committed
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts: # yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/followup/CrmFollowUpRecordController.java # yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/permission/CrmPermissionController.java # yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/seckill/SeckillConfigController.java
2 parents 59178ec + e618f83 commit 59dd0a3

File tree

10 files changed

+78
-177
lines changed

10 files changed

+78
-177
lines changed

‎sql/mysql/ruoyi-vue-pro.sql

+66-152
Large diffs are not rendered by default.

‎yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/CrmCustomerController.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ public void importTemplate(HttpServletResponse response) throws IOException {
262262

263263
@PostMapping("/import")
264264
@Operation(summary = "导入客户")
265-
@PreAuthorize("@ss.hasPermission('system:customer:import')")
265+
@PreAuthorize("@ss.hasPermission('crm:customer:import')")
266266
public CommonResult<CrmCustomerImportRespVO> importExcel(@Valid CrmCustomerImportReqVO importReqVO)
267267
throws Exception {
268268
List<CrmCustomerImportExcelVO> list = ExcelUtils.read(importReqVO.getFile(), CrmCustomerImportExcelVO.class);

‎yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/followup/CrmFollowUpRecordController.java

+2-8
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,8 @@
1919
import io.swagger.v3.oas.annotations.Operation;
2020
import io.swagger.v3.oas.annotations.Parameter;
2121
import io.swagger.v3.oas.annotations.tags.Tag;
22-
import javax.annotation.Resource;
23-
import javax.validation.Valid;
24-
25-
import org.springframework.security.access.prepost.PreAuthorize;
22+
import jakarta.annotation.Resource;
23+
import jakarta.validation.Valid;
2624
import org.springframework.validation.annotation.Validated;
2725
import org.springframework.web.bind.annotation.*;
2826

@@ -53,15 +51,13 @@ public class CrmFollowUpRecordController {
5351

5452
@PostMapping("/create")
5553
@Operation(summary = "创建跟进记录")
56-
@PreAuthorize("@ss.hasPermission('crm:follow-up-record:create')")
5754
public CommonResult<Long> createFollowUpRecord(@Valid @RequestBody CrmFollowUpRecordSaveReqVO createReqVO) {
5855
return success(followUpRecordService.createFollowUpRecord(createReqVO));
5956
}
6057

6158
@DeleteMapping("/delete")
6259
@Operation(summary = "删除跟进记录")
6360
@Parameter(name = "id", description = "编号", required = true)
64-
@PreAuthorize("@ss.hasPermission('crm:follow-up-record:delete')")
6561
public CommonResult<Boolean> deleteFollowUpRecord(@RequestParam("id") Long id) {
6662
followUpRecordService.deleteFollowUpRecord(id, getLoginUserId());
6763
return success(true);
@@ -70,15 +66,13 @@ public CommonResult<Boolean> deleteFollowUpRecord(@RequestParam("id") Long id) {
7066
@GetMapping("/get")
7167
@Operation(summary = "获得跟进记录")
7268
@Parameter(name = "id", description = "编号", required = true, example = "1024")
73-
@PreAuthorize("@ss.hasPermission('crm:follow-up-record:query')")
7469
public CommonResult<CrmFollowUpRecordRespVO> getFollowUpRecord(@RequestParam("id") Long id) {
7570
CrmFollowUpRecordDO followUpRecord = followUpRecordService.getFollowUpRecord(id);
7671
return success(BeanUtils.toBean(followUpRecord, CrmFollowUpRecordRespVO.class));
7772
}
7873

7974
@GetMapping("/page")
8075
@Operation(summary = "获得跟进记录分页")
81-
@PreAuthorize("@ss.hasPermission('crm:follow-up-record:query')")
8276
public CommonResult<PageResult<CrmFollowUpRecordRespVO>> getFollowUpRecordPage(@Valid CrmFollowUpRecordPageReqVO pageReqVO) {
8377
PageResult<CrmFollowUpRecordDO> pageResult = followUpRecordService.getFollowUpRecordPage(pageReqVO);
8478
// 1.1 查询联系人和商机

‎yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/operatelog/CrmOperateLogController.java

-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ public class CrmOperateLogController {
5353

5454
@GetMapping("/page")
5555
@Operation(summary = "获得操作日志")
56-
@PreAuthorize("@ss.hasPermission('crm:operate-log:query')")
5756
public CommonResult<PageResult<CrmOperateLogRespVO>> getCustomerOperateLog(@Valid CrmOperateLogPageReqVO pageReqVO) {
5857
OperateLogPageReqDTO reqDTO = new OperateLogPageReqDTO();
5958
reqDTO.setPageSize(PAGE_SIZE_NONE); // 默认不分页，需要分页需注释

‎yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/permission/CrmPermissionController.java

+2-8
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,8 @@
2323
import io.swagger.v3.oas.annotations.Parameter;
2424
import io.swagger.v3.oas.annotations.Parameters;
2525
import io.swagger.v3.oas.annotations.tags.Tag;
26-
import javax.annotation.Resource;
27-
import javax.validation.Valid;
28-
import org.springframework.security.access.prepost.PreAuthorize;
26+
import jakarta.annotation.Resource;
27+
import jakarta.validation.Valid;
2928
import org.springframework.validation.annotation.Validated;
3029
import org.springframework.web.bind.annotation.*;
3130

@@ -58,15 +57,13 @@ public class CrmPermissionController {
5857

5958
@PostMapping("/create")
6059
@Operation(summary = "创建数据权限")
61-
@PreAuthorize("@ss.hasPermission('crm:permission:create')")
6260
public CommonResult<Boolean> create(@Valid @RequestBody CrmPermissionSaveReqVO reqVO) {
6361
permissionService.createPermission(reqVO, getLoginUserId());
6462
return success(true);
6563
}
6664

6765
@PutMapping("/update")
6866
@Operation(summary = "编辑数据权限")
69-
@PreAuthorize("@ss.hasPermission('crm:permission:update')")
7067
@CrmPermission(bizTypeValue = "#updateReqVO.bizType", bizId = "#updateReqVO.bizId"
7168
, level = CrmPermissionLevelEnum.OWNER)
7269
public CommonResult<Boolean> updatePermission(@Valid @RequestBody CrmPermissionUpdateReqVO updateReqVO) {
@@ -77,7 +74,6 @@ public CommonResult<Boolean> updatePermission(@Valid @RequestBody CrmPermissionU
7774
@DeleteMapping("/delete")
7875
@Operation(summary = "删除数据权限")
7976
@Parameter(name = "ids", description = "数据权限编号", required = true, example = "1024")
80-
@PreAuthorize("@ss.hasPermission('crm:permission:delete')")
8177
public CommonResult<Boolean> deletePermission(@RequestParam("ids") Collection<Long> ids) {
8278
permissionService.deletePermissionBatch(ids, getLoginUserId());
8379
return success(true);
@@ -86,7 +82,6 @@ public CommonResult<Boolean> deletePermission(@RequestParam("ids") Collection<Lo
8682
@DeleteMapping("/delete-self")
8783
@Operation(summary = "删除自己的数据权限")
8884
@Parameter(name = "id", description = "数据权限编号", required = true, example = "1024")
89-
@PreAuthorize("@ss.hasPermission('crm:permission:delete')")
9085
public CommonResult<Boolean> deleteSelfPermission(@RequestParam("id") Long id) {
9186
permissionService.deleteSelfPermission(id, getLoginUserId());
9287
return success(true);
@@ -98,7 +93,6 @@ public CommonResult<Boolean> deleteSelfPermission(@RequestParam("id") Long id) {
9893
@Parameter(name = "bizType", description = "CRM 类型", required = true, example = "2"),
9994
@Parameter(name = "bizId", description = "CRM 类型数据编号", required = true, example = "1024")
10095
})
101-
@PreAuthorize("@ss.hasPermission('crm:permission:query')")
10296
public CommonResult<List<CrmPermissionRespVO>> getPermissionList(@RequestParam("bizType") Integer bizType,
10397
@RequestParam("bizId") Long bizId) {
10498
List<CrmPermissionDO> permissions = permissionService.getPermissionListByBiz(bizType, bizId);

‎yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/seckill/SeckillConfigController.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
import org.springframework.validation.annotation.Validated;
1515
import org.springframework.web.bind.annotation.*;
1616

17-
import javax.annotation.Resource;
18-
import javax.validation.Valid;
17+
import jakarta.annotation.Resource;
18+
import jakarta.validation.Valid;
1919
import java.util.List;
2020

2121
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
@@ -46,7 +46,7 @@ public CommonResult<Boolean> updateSeckillConfig(@Valid @RequestBody SeckillConf
4646

4747
@PutMapping("/update-status")
4848
@Operation(summary = "修改时段配置状态")
49-
@PreAuthorize("@ss.hasPermission('system:seckill-config:update')")
49+
@PreAuthorize("@ss.hasPermission('promotion:seckill-config:update')")
5050
public CommonResult<Boolean> updateSeckillConfigStatus(@Valid @RequestBody SeckillConfigUpdateStatusReqVo reqVO) {
5151
seckillConfigService.updateSeckillConfigStatus(reqVO.getId(), reqVO.getStatus());
5252
return success(true);

‎yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailAccountController.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public CommonResult<Boolean> deleteMailAccount(@RequestParam Long id) {
5757
@GetMapping("/get")
5858
@Operation(summary = "获得邮箱账号")
5959
@Parameter(name = "id", description = "编号", required = true, example = "1024")
60-
@PreAuthorize("@ss.hasPermission('system:mail-account:get')")
60+
@PreAuthorize("@ss.hasPermission('system:mail-account:query')")
6161
public CommonResult<MailAccountRespVO> getMailAccount(@RequestParam("id") Long id) {
6262
MailAccountDO account = mailAccountService.getMailAccount(id);
6363
return success(BeanUtils.toBean(account, MailAccountRespVO.class));

‎yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailTemplateController.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public CommonResult<Boolean> deleteMailTemplate(@RequestParam("id") Long id) {
5757
@GetMapping("/get")
5858
@Operation(summary = "获得邮件模版")
5959
@Parameter(name = "id", description = "编号", required = true, example = "1024")
60-
@PreAuthorize("@ss.hasPermission('system:mail-template:get')")
60+
@PreAuthorize("@ss.hasPermission('system:mail-template:query')")
6161
public CommonResult<MailTemplateRespVO> getMailTemplate(@RequestParam("id") Long id) {
6262
MailTemplateDO template = mailTempleService.getMailTemplate(id);
6363
return success(BeanUtils.toBean(template, MailTemplateRespVO.class));

‎yudao-module-system/yudao-module-system-biz/src/main/resources/application-dev.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,7 @@ justauth:
158158
client-secret: 1wTb7hYxnpT2TUbIeHGXGo7T0odav1ic10mLdyyATOw
159159
agent-id: 1000004
160160
ignore-check-redirect-uri: true
161+
# noinspection SpringBootApplicationYaml
161162
WECHAT_MINI_APP: # 微信小程序
162163
client-id: ${wx.miniapp.appid}
163164
client-secret: ${wx.miniapp.secret}
@@ -167,7 +168,6 @@ justauth:
167168
client-id: ${wx.mp.app-id}
168169
client-secret: ${wx.mp.secret}
169170
ignore-check-redirect-uri: true
170-
ignore-check-state: true # 微信公众号，未调用后端的 getSocialAuthorizeUrl 方法，所以无法进行 state 校验 TODO 芋艿：后续考虑支持
171171
cache:
172172
type: REDIS
173173
prefix: 'social_auth_state:' # 缓存前缀，目前只对 Redis 缓存生效，默认 JUSTAUTH::STATE::

‎yudao-module-system/yudao-module-system-biz/src/main/resources/application-local.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,7 @@ justauth:
189189
client-secret: 1wTb7hYxnpT2TUbIeHGXGo7T0odav1ic10mLdyyATOw
190190
agent-id: 1000004
191191
ignore-check-redirect-uri: true
192+
# noinspection SpringBootApplicationYaml
192193
WECHAT_MINI_APP: # 微信小程序
193194
client-id: ${wx.miniapp.appid}
194195
client-secret: ${wx.miniapp.secret}
@@ -198,7 +199,6 @@ justauth:
198199
client-id: ${wx.mp.app-id}
199200
client-secret: ${wx.mp.secret}
200201
ignore-check-redirect-uri: true
201-
ignore-check-state: true # 微信公众号，未调用后端的 getSocialAuthorizeUrl 方法，所以无法进行 state 校验 TODO 芋艿：后续考虑支持
202202
cache:
203203
type: REDIS
204204
prefix: 'social_auth_state:' # 缓存前缀，目前只对 Redis 缓存生效，默认 JUSTAUTH::STATE::

0 commit comments

Comments
 (0)