Bläddra i källkod

规范HTTP接口

wanggaokun 3 veckor sedan
förälder
incheckning
fa82eecba9

+ 6 - 10
eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/controller/auth/AuthController.java

@@ -9,11 +9,6 @@ package org.eco.vip.nexus.core.controller.auth;
 import cn.dev33.satoken.stp.StpUtil;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
-import org.eco.vip.nexus.core.domain.auth.pojo.AuthQuery;
-import org.eco.vip.nexus.core.domain.auth.pojo.LoginVO;
-import org.eco.vip.nexus.core.domain.client.pojo.ClientVO;
-import org.eco.vip.nexus.core.service.auth.IAuthService;
-import org.eco.vip.nexus.core.service.client.IClientService;
 import org.eco.vip.core.constant.Constants;
 import org.eco.vip.core.exception.BusinessException;
 import org.eco.vip.core.pojo.CommonResult;
@@ -21,12 +16,13 @@ import org.eco.vip.core.utils.JsonUtils;
 import org.eco.vip.core.utils.ObjUtils;
 import org.eco.vip.core.utils.StrUtils;
 import org.eco.vip.core.utils.ValidatorUtils;
+import org.eco.vip.nexus.core.domain.auth.pojo.AuthQuery;
+import org.eco.vip.nexus.core.domain.auth.pojo.LoginVO;
+import org.eco.vip.nexus.core.domain.client.pojo.ClientVO;
+import org.eco.vip.nexus.core.service.auth.IAuthService;
+import org.eco.vip.nexus.core.service.client.IClientService;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import static org.eco.vip.core.pojo.CommonResult.fail;
 import static org.eco.vip.core.pojo.CommonResult.success;

+ 4 - 9
eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/controller/client/ClientController.java

@@ -10,19 +10,14 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 import jakarta.annotation.Resource;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotEmpty;
+import org.eco.vip.core.pojo.CommonResult;
+import org.eco.vip.core.pojo.PageResult;
 import org.eco.vip.nexus.core.domain.client.pojo.ClientBO;
 import org.eco.vip.nexus.core.domain.client.pojo.ClientVO;
 import org.eco.vip.nexus.core.service.client.IClientService;
-import org.eco.vip.core.pojo.CommonResult;
-import org.eco.vip.core.pojo.PageResult;
 import org.eco.vip.security.annotation.PermissionsResource;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
@@ -64,7 +59,7 @@ public class ClientController {
         return success();
     }
 
-    @PostMapping("/edit")
+    @PutMapping("/edit")
     @SaCheckPermission("system:client:edit")
     public CommonResult<Void> edit(@RequestBody @Valid ClientBO clientBO) {
         boolean result = clientService.update(clientBO);

+ 4 - 9
eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/controller/config/ConfigController.java

@@ -10,19 +10,14 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 import jakarta.annotation.Resource;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotEmpty;
+import org.eco.vip.core.pojo.CommonResult;
+import org.eco.vip.core.pojo.PageResult;
 import org.eco.vip.nexus.core.domain.config.pojo.ConfigBO;
 import org.eco.vip.nexus.core.domain.config.pojo.ConfigVO;
 import org.eco.vip.nexus.core.service.config.IConfigService;
-import org.eco.vip.core.pojo.CommonResult;
-import org.eco.vip.core.pojo.PageResult;
 import org.eco.vip.security.annotation.PermissionsResource;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
@@ -66,7 +61,7 @@ public class ConfigController {
         return success();
     }
 
-    @PostMapping("/edit")
+    @PutMapping("/edit")
     @SaCheckPermission("system:config:edit")
     public CommonResult<String> edit(@RequestBody @Valid ConfigBO configBO) {
         boolean result = configService.update(configBO);

+ 6 - 11
eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/controller/dict/DictController.java

@@ -11,19 +11,14 @@ import cn.hutool.core.lang.tree.Tree;
 import jakarta.annotation.Resource;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotEmpty;
+import org.eco.vip.core.pojo.CommonResult;
+import org.eco.vip.core.pojo.PageResult;
 import org.eco.vip.nexus.core.domain.dict.pojo.DictBO;
 import org.eco.vip.nexus.core.domain.dict.pojo.DictVO;
 import org.eco.vip.nexus.core.service.dict.IDictService;
-import org.eco.vip.core.pojo.CommonResult;
-import org.eco.vip.core.pojo.PageResult;
 import org.eco.vip.security.annotation.PermissionsResource;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 import java.util.Map;
@@ -56,7 +51,7 @@ public class DictController {
     }
 
     @GetMapping("/map")
-    public CommonResult<Map<String,List<DictVO>>> map() {
+    public CommonResult<Map<String, List<DictVO>>> map() {
         return success(dictService.selectMap());
     }
 
@@ -75,7 +70,7 @@ public class DictController {
         return success();
     }
 
-    @PostMapping("/edit")
+    @PutMapping("/edit")
     @SaCheckPermission("system:dict:edit")
     public CommonResult<String> edit(@RequestBody @Valid DictBO dictBO) {
         boolean result = dictService.update(dictBO);
@@ -88,7 +83,7 @@ public class DictController {
     @DeleteMapping("/delete")
     @SaCheckPermission("system:dict:delete")
     public CommonResult<String> delete(@RequestBody @Valid @NotEmpty(message = "集合不能为空") List<String> ids) {
-        if(dictService.hasChildByIds(ids)) {
+        if (dictService.hasChildByIds(ids)) {
             return fail("存在子节点,无法删除!");
         }
         boolean result = dictService.delete(ids);

+ 4 - 9
eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/controller/menu/MenuController.java

@@ -11,19 +11,14 @@ import cn.hutool.core.lang.tree.Tree;
 import jakarta.annotation.Resource;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotEmpty;
+import org.eco.vip.core.pojo.CommonResult;
+import org.eco.vip.core.pojo.PageResult;
 import org.eco.vip.nexus.core.domain.menu.pojo.MenuBO;
 import org.eco.vip.nexus.core.domain.menu.pojo.MenuVO;
 import org.eco.vip.nexus.core.service.menu.IMenuService;
-import org.eco.vip.core.pojo.CommonResult;
-import org.eco.vip.core.pojo.PageResult;
 import org.eco.vip.security.annotation.PermissionsResource;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
@@ -70,7 +65,7 @@ public class MenuController {
         return success();
     }
 
-    @PostMapping("/edit")
+    @PutMapping("/edit")
     @SaCheckPermission("system:menu:edit")
     public CommonResult<String> edit(@RequestBody @Valid MenuBO menuBO) {
         boolean result = menuService.update(menuBO);

+ 4 - 4
eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/controller/org/OrgController.java

@@ -11,11 +11,11 @@ import cn.hutool.core.lang.tree.Tree;
 import jakarta.annotation.Resource;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotEmpty;
+import org.eco.vip.core.pojo.CommonResult;
+import org.eco.vip.core.pojo.PageResult;
 import org.eco.vip.nexus.core.domain.org.pojo.OrgBO;
 import org.eco.vip.nexus.core.domain.org.pojo.OrgVO;
 import org.eco.vip.nexus.core.service.org.IOrgService;
-import org.eco.vip.core.pojo.CommonResult;
-import org.eco.vip.core.pojo.PageResult;
 import org.eco.vip.security.annotation.PermissionsResource;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -68,7 +68,7 @@ public class OrgController {
         return success();
     }
 
-    @PostMapping("/edit")
+    @PutMapping("/edit")
     @SaCheckPermission("system:org:edit")
     public CommonResult<String> edit(@RequestBody @Valid OrgBO orgBO) {
         boolean result = orgService.update(orgBO);
@@ -81,7 +81,7 @@ public class OrgController {
     @DeleteMapping("/delete")
     @SaCheckPermission("system:org:delete")
     public CommonResult<String> delete(@RequestBody @Valid @NotEmpty(message = "集合不能为空") List<String> orgIds) {
-        if(orgService.hasChildByIds(orgIds)) {
+        if (orgService.hasChildByIds(orgIds)) {
             return fail("存在下级组织,不允许删除");
         }
         boolean result = orgService.delete(orgIds);

+ 6 - 11
eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/controller/position/PositionController.java

@@ -10,20 +10,15 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 import jakarta.annotation.Resource;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotEmpty;
-import org.eco.vip.nexus.core.domain.position.pojo.PositionBO;
-import org.eco.vip.nexus.core.domain.position.pojo.PositionVO;
-import org.eco.vip.nexus.core.service.position.IPositionService;
 import org.eco.vip.core.pojo.CommonResult;
 import org.eco.vip.core.pojo.PageResult;
 import org.eco.vip.core.utils.StrUtils;
+import org.eco.vip.nexus.core.domain.position.pojo.PositionBO;
+import org.eco.vip.nexus.core.domain.position.pojo.PositionVO;
+import org.eco.vip.nexus.core.service.position.IPositionService;
 import org.eco.vip.security.annotation.PermissionsResource;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
@@ -65,10 +60,10 @@ public class PositionController {
         return success();
     }
 
-    @PostMapping("/edit")
+    @PutMapping("/edit")
     @SaCheckPermission("system:position:edit")
     public CommonResult<String> edit(@RequestBody @Valid PositionBO positionBO) {
-        if(StrUtils.isBlank(positionBO.getPositionId())) {
+        if (StrUtils.isBlank(positionBO.getPositionId())) {
             return fail("职位id不能为空!");
         }
         boolean result = positionService.update(positionBO);

+ 5 - 10
eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/controller/role/RoleController.java

@@ -10,19 +10,14 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 import jakarta.annotation.Resource;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotEmpty;
+import org.eco.vip.core.pojo.CommonResult;
+import org.eco.vip.core.pojo.PageResult;
 import org.eco.vip.nexus.core.domain.role.pojo.RoleBO;
 import org.eco.vip.nexus.core.domain.role.pojo.RoleVO;
 import org.eco.vip.nexus.core.service.role.IRoleService;
-import org.eco.vip.core.pojo.CommonResult;
-import org.eco.vip.core.pojo.PageResult;
 import org.eco.vip.security.annotation.PermissionsResource;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
@@ -56,7 +51,7 @@ public class RoleController {
     @PostMapping("/add")
     @SaCheckPermission("system:role:add")
     public CommonResult<String> add(@RequestBody @Valid RoleBO roleBO) {
-        if(roleService.hasRoleByCode(roleBO.getCode())) {
+        if (roleService.hasRoleByCode(roleBO.getCode())) {
             return fail("角色标识已存在!");
         }
         boolean result = roleService.insert(roleBO);
@@ -66,7 +61,7 @@ public class RoleController {
         return success();
     }
 
-    @PostMapping("/edit")
+    @PutMapping("/edit")
     @SaCheckPermission("system:role:edit")
     public CommonResult<String> edit(@RequestBody @Valid RoleBO roleBO) {
         boolean result = roleService.update(roleBO);

+ 6 - 13
eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/controller/user/UserController.java

@@ -7,28 +7,22 @@ package org.eco.vip.nexus.core.controller.user;
 
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
-import cn.hutool.crypto.digest.BCrypt;
 import jakarta.annotation.Resource;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotEmpty;
-import org.eco.vip.nexus.core.domain.auth.pojo.LoginUserVO;
-import org.eco.vip.nexus.core.domain.user.pojo.UserBO;
-import org.eco.vip.nexus.core.domain.user.pojo.UserVO;
-import org.eco.vip.nexus.core.service.user.IUserService;
 import org.eco.vip.core.pojo.CommonResult;
 import org.eco.vip.core.pojo.LoginUserStorage;
 import org.eco.vip.core.pojo.PageResult;
 import org.eco.vip.core.utils.ObjUtils;
 import org.eco.vip.core.utils.StrUtils;
+import org.eco.vip.nexus.core.domain.auth.pojo.LoginUserVO;
+import org.eco.vip.nexus.core.domain.user.pojo.UserBO;
+import org.eco.vip.nexus.core.domain.user.pojo.UserVO;
+import org.eco.vip.nexus.core.service.user.IUserService;
 import org.eco.vip.security.annotation.PermissionsResource;
 import org.eco.vip.security.utils.LoginHelper;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
@@ -63,7 +57,6 @@ public class UserController {
     @PostMapping("/add")
     @SaCheckPermission("system:user:add")
     public CommonResult<String> add(@RequestBody @Valid UserBO userBO) {
-        userBO.setPassword(BCrypt.hashpw(userBO.getPassword()));
         boolean result = userService.insert(userBO);
         if (!result) {
             return fail("新增用户失败!");
@@ -71,7 +64,7 @@ public class UserController {
         return success();
     }
 
-    @PostMapping("/edit")
+    @PutMapping("/edit")
     @SaCheckPermission("system:user:edit")
     public CommonResult<String> edit(@RequestBody @Valid UserBO userBO) {
         if (StrUtils.isBlank(userBO.getUserId())) {