From 3fbe44bc8924bb3f4fe6eb182c0220761750fbd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BE=BE=E5=AF=8C=E6=96=8C?= Date: Wed, 24 Sep 2025 10:40:46 +0800 Subject: [PATCH] =?UTF-8?q?fix=20(farm):=20=E7=94=A8=E6=88=B7=E5=90=8C?= =?UTF-8?q?=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 绕过token验证 --- .../IndicatorNameController.java | 154 +++++++++--------- .../controller/admin/auth/AuthController.java | 3 +- .../controller/admin/auth/vo/UserReqVO.java | 4 + .../service/auth/AdminAuthServiceImpl.java | 2 +- .../src/main/resources/application.yaml | 3 +- 5 files changed, 85 insertions(+), 81 deletions(-) diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/indicatorname/IndicatorNameController.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/indicatorname/IndicatorNameController.java index 3c6cb607..935911e1 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/indicatorname/IndicatorNameController.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/indicatorname/IndicatorNameController.java @@ -29,83 +29,83 @@ import cn.iocoder.yudao.module.farm.controller.admin.indicatorname.vo.*; import cn.iocoder.yudao.module.farm.dal.dataobject.indicatorname.IndicatorNameDO; import cn.iocoder.yudao.module.farm.service.indicatorname.IndicatorNameService; -@Tag(name = "管理后台 - 指标名称") -@RestController -@RequestMapping("/farm/indicator-name") -@Validated +//@Tag(name = "管理后台 - 指标名称") +//@RestController +//@RequestMapping("/farm/indicator-name") +//@Validated public class IndicatorNameController { - - @Resource - private IndicatorNameService indicatorNameService; - - @PostMapping("/create") - @Operation(summary = "创建指标名称") - @PreAuthorize("@ss.hasPermission('farm:indicator-name:create')") - public CommonResult createIndicatorName(@Valid @RequestBody IndicatorNameSaveReqVO createReqVO) { - return success(indicatorNameService.createIndicatorName(createReqVO)); - } - - @PutMapping("/update") - @Operation(summary = "更新指标名称") - @PreAuthorize("@ss.hasPermission('farm:indicator-name:update')") - public CommonResult updateIndicatorName(@Valid @RequestBody IndicatorNameSaveReqVO updateReqVO) { - indicatorNameService.updateIndicatorName(updateReqVO); - return success(true); - } - - @DeleteMapping("/delete") - @Operation(summary = "删除指标名称") - @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('farm:indicator-name:delete')") - public CommonResult deleteIndicatorName(@RequestParam("id") Long id) { - indicatorNameService.deleteIndicatorName(id); - return success(true); - } - - @DeleteMapping("/delete-list") - @Parameter(name = "ids", description = "编号", required = true) - @Operation(summary = "批量删除指标名称") - @PreAuthorize("@ss.hasPermission('farm:indicator-name:delete')") - public CommonResult deleteIndicatorNameList(@RequestParam("ids") List ids) { - indicatorNameService.deleteIndicatorNameListByIds(ids); - return success(true); - } - - @GetMapping("/get") - @Operation(summary = "获得指标名称") - @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('farm:indicator-name:query')") - public CommonResult getIndicatorName(@RequestParam("id") Long id) { - IndicatorNameDO indicatorName = indicatorNameService.getIndicatorName(id); - return success(BeanUtils.toBean(indicatorName, IndicatorNameRespVO.class)); - } - - @GetMapping("/page") - @Operation(summary = "获得指标名称分页") - @PreAuthorize("@ss.hasPermission('farm:indicator-name:query')") - public CommonResult> getIndicatorNamePage(@Valid IndicatorNamePageReqVO pageReqVO) { - PageResult pageResult = indicatorNameService.getIndicatorNamePage(pageReqVO); - return success(BeanUtils.toBean(pageResult, IndicatorNameRespVO.class)); - } - - @GetMapping("/list") - @Operation(summary = "获得指标名称全量") - @PreAuthorize("@ss.hasPermission('farm:indicator-name:query')") - public CommonResult> getIndicatorNameList(@Valid IndicatorNamePageReqVO pageReqVO) { - List pageResult = indicatorNameService.getIndicatorNameList(pageReqVO); - return success(BeanUtils.toBean(pageResult, IndicatorNameRespVO.class)); - } - @GetMapping("/export-excel") - @Operation(summary = "导出指标名称 Excel") - @PreAuthorize("@ss.hasPermission('farm:indicator-name:export')") - @ApiAccessLog(operateType = EXPORT) - public void exportIndicatorNameExcel(@Valid IndicatorNamePageReqVO pageReqVO, - HttpServletResponse response) throws IOException { - pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); - List list = indicatorNameService.getIndicatorNamePage(pageReqVO).getList(); - // 导出 Excel - ExcelUtils.write(response, "指标名称.xls", "数据", IndicatorNameRespVO.class, - BeanUtils.toBean(list, IndicatorNameRespVO.class)); - } +// +// @Resource +// private IndicatorNameService indicatorNameService; +// +// @PostMapping("/create") +// @Operation(summary = "创建指标名称") +// @PreAuthorize("@ss.hasPermission('farm:indicator-name:create')") +// public CommonResult createIndicatorName(@Valid @RequestBody IndicatorNameSaveReqVO createReqVO) { +// return success(indicatorNameService.createIndicatorName(createReqVO)); +// } +// +// @PutMapping("/update") +// @Operation(summary = "更新指标名称") +// @PreAuthorize("@ss.hasPermission('farm:indicator-name:update')") +// public CommonResult updateIndicatorName(@Valid @RequestBody IndicatorNameSaveReqVO updateReqVO) { +// indicatorNameService.updateIndicatorName(updateReqVO); +// return success(true); +// } +// +// @DeleteMapping("/delete") +// @Operation(summary = "删除指标名称") +// @Parameter(name = "id", description = "编号", required = true) +// @PreAuthorize("@ss.hasPermission('farm:indicator-name:delete')") +// public CommonResult deleteIndicatorName(@RequestParam("id") Long id) { +// indicatorNameService.deleteIndicatorName(id); +// return success(true); +// } +// +// @DeleteMapping("/delete-list") +// @Parameter(name = "ids", description = "编号", required = true) +// @Operation(summary = "批量删除指标名称") +// @PreAuthorize("@ss.hasPermission('farm:indicator-name:delete')") +// public CommonResult deleteIndicatorNameList(@RequestParam("ids") List ids) { +// indicatorNameService.deleteIndicatorNameListByIds(ids); +// return success(true); +// } +// +// @GetMapping("/get") +// @Operation(summary = "获得指标名称") +// @Parameter(name = "id", description = "编号", required = true, example = "1024") +// @PreAuthorize("@ss.hasPermission('farm:indicator-name:query')") +// public CommonResult getIndicatorName(@RequestParam("id") Long id) { +// IndicatorNameDO indicatorName = indicatorNameService.getIndicatorName(id); +// return success(BeanUtils.toBean(indicatorName, IndicatorNameRespVO.class)); +// } +// +// @GetMapping("/page") +// @Operation(summary = "获得指标名称分页") +// @PreAuthorize("@ss.hasPermission('farm:indicator-name:query')") +// public CommonResult> getIndicatorNamePage(@Valid IndicatorNamePageReqVO pageReqVO) { +// PageResult pageResult = indicatorNameService.getIndicatorNamePage(pageReqVO); +// return success(BeanUtils.toBean(pageResult, IndicatorNameRespVO.class)); +// } +// +// @GetMapping("/list") +// @Operation(summary = "获得指标名称全量") +// @PreAuthorize("@ss.hasPermission('farm:indicator-name:query')") +// public CommonResult> getIndicatorNameList(@Valid IndicatorNamePageReqVO pageReqVO) { +// List pageResult = indicatorNameService.getIndicatorNameList(pageReqVO); +// return success(BeanUtils.toBean(pageResult, IndicatorNameRespVO.class)); +// } +// @GetMapping("/export-excel") +// @Operation(summary = "导出指标名称 Excel") +// @PreAuthorize("@ss.hasPermission('farm:indicator-name:export')") +// @ApiAccessLog(operateType = EXPORT) +// public void exportIndicatorNameExcel(@Valid IndicatorNamePageReqVO pageReqVO, +// HttpServletResponse response) throws IOException { +// pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); +// List list = indicatorNameService.getIndicatorNamePage(pageReqVO).getList(); +// // 导出 Excel +// ExcelUtils.write(response, "指标名称.xls", "数据", IndicatorNameRespVO.class, +// BeanUtils.toBean(list, IndicatorNameRespVO.class)); +// } } \ No newline at end of file diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/AuthController.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/AuthController.java index 3b532083..d5e68460 100644 --- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/AuthController.java +++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/AuthController.java @@ -209,13 +209,14 @@ public class AuthController { return success(authService.socialLogin(reqVO)); } - + @PermitAll @PostMapping("/api/user-add") @Operation(summary = "同步用户") public CommonResult synchronize(@RequestBody @Valid UserReqVO reqVO) { return success(authService.synchronize(reqVO)); } + @PermitAll @PostMapping("/api/user-info") @Operation(summary = "手机号获取token") public CommonResult getUserInfo(@RequestBody @Valid UserReqVO reqVO) { diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/vo/UserReqVO.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/vo/UserReqVO.java index 2e013c76..8f7910d2 100644 --- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/vo/UserReqVO.java +++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/vo/UserReqVO.java @@ -20,4 +20,8 @@ public class UserReqVO { * 手机号码 */ private String phone; + /** + * 租户ID + */ + private Long tenantId; } \ No newline at end of file diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthServiceImpl.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthServiceImpl.java index a7de7c86..cf3205d0 100644 --- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthServiceImpl.java +++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthServiceImpl.java @@ -458,7 +458,7 @@ public class AdminAuthServiceImpl implements AdminAuthService { adminUserDO.setStatus(CommonStatusEnum.DISABLE.getStatus()); adminUserDO.setPassword("123456"); adminUserDO.setIsSynchronize(1); - adminUserDO.setTenantId(1L); + adminUserDO.setTenantId(reqVO.getTenantId()); userService.createUser(adminUserDO); return true; } else { diff --git a/yudao-server/src/main/resources/application.yaml b/yudao-server/src/main/resources/application.yaml index b492bacd..02f99842 100644 --- a/yudao-server/src/main/resources/application.yaml +++ b/yudao-server/src/main/resources/application.yaml @@ -282,8 +282,7 @@ yudao: - /admin-api/system/auth/get-access-token - /admin-api/system/auth/get-session - /admin-api/system/auth/get-phone-number - - /admin-api/system/auth/api/user-add - - /admin-api/system/auth/api/user-info + - /admin-api/system/auth/api - /admin-api/farm/remote ignore-visit-urls: - /admin-api/system/user/profile/**