This is an automated email from the ASF dual-hosted git repository. benjobs pushed a commit to branch unserd in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git
commit a83dd4b0e77371fe0c3f91732b41ba80d7ba42ef Author: benjobs <[email protected]> AuthorDate: Fri Apr 14 23:18:56 2023 +0800 [Improve] Remove unused methods in the controller --- .../console/system/controller/MenuController.java | 12 -------- .../console/system/controller/UserController.java | 35 ---------------------- .../console/system/service/UserService.java | 15 ---------- .../system/service/impl/UserServiceImpl.java | 16 ---------- 4 files changed, 78 deletions(-) diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/MenuController.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/MenuController.java index 1d846a6cf..79288f803 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/MenuController.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/MenuController.java @@ -25,18 +25,15 @@ import org.apache.streampark.console.system.service.MenuService; import org.apache.shiro.authz.annotation.RequiresPermissions; -import com.baomidou.mybatisplus.core.toolkit.StringPool; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; -import javax.validation.constraints.NotBlank; import java.util.ArrayList; import java.util.Map; @@ -73,15 +70,6 @@ public class MenuController { return RestResponse.success(); } - @DeleteMapping("delete") - @RequiresPermissions("menu:delete") - public RestResponse deleteMenus(@NotBlank(message = "{required}") String menuIds) - throws Exception { - String[] ids = menuIds.split(StringPool.COMMA); - this.menuService.deleteMenus(ids); - return RestResponse.success(); - } - @PutMapping("update") @RequiresPermissions("menu:update") public RestResponse updateMenu(@Valid Menu menu) throws Exception { diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/UserController.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/UserController.java index f96d81257..cf927d677 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/UserController.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/UserController.java @@ -21,7 +21,6 @@ import org.apache.streampark.console.base.domain.ResponseCode; import org.apache.streampark.console.base.domain.RestRequest; import org.apache.streampark.console.base.domain.RestResponse; import org.apache.streampark.console.base.exception.ApiAlertException; -import org.apache.streampark.console.base.util.ShaHashUtils; import org.apache.streampark.console.core.enums.LoginType; import org.apache.streampark.console.core.enums.UserType; import org.apache.streampark.console.core.service.CommonService; @@ -30,7 +29,6 @@ import org.apache.streampark.console.system.entity.User; import org.apache.streampark.console.system.service.TeamService; import org.apache.streampark.console.system.service.UserService; -import org.apache.commons.lang3.StringUtils; import org.apache.shiro.authz.annotation.Logical; import org.apache.shiro.authz.annotation.RequiresPermissions; @@ -40,7 +38,6 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -64,11 +61,6 @@ public class UserController { @Autowired private CommonService commonService; - @PostMapping("detail") - public User detail(@NotBlank(message = "{required}") @PathVariable String username) { - return this.userService.findByName(username); - } - @PostMapping("list") @RequiresPermissions( value = {"user:view", "app:view"}, @@ -100,21 +92,6 @@ public class UserController { return RestResponse.success(); } - @PutMapping("profile") - public RestResponse updateProfile(@Valid User user) throws Exception { - this.userService.updateProfile(user); - return RestResponse.success(); - } - - @PutMapping("avatar") - public RestResponse updateAvatar( - @NotBlank(message = "{required}") String username, - @NotBlank(message = "{required}") String avatar) - throws Exception { - this.userService.updateAvatar(username, avatar); - return RestResponse.success(); - } - @PostMapping("getNoTokenUser") public RestResponse getNoTokenUser() { List<User> userList = this.userService.getNoTokenUser(); @@ -127,18 +104,6 @@ public class UserController { return RestResponse.success(result); } - @PostMapping("check/password") - public RestResponse checkPassword( - @NotBlank(message = "{required}") String username, - @NotBlank(message = "{required}") String password) { - - User user = userService.findByName(username); - String salt = user.getSalt(); - String encryptPassword = ShaHashUtils.encrypt(salt, password); - boolean result = StringUtils.equals(user.getPassword(), encryptPassword); - return RestResponse.success(result); - } - @PutMapping("password") public RestResponse updatePassword(User user) throws Exception { userService.updatePassword(user); diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/UserService.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/UserService.java index 4aa3fe927..fdcdfb943 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/UserService.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/UserService.java @@ -77,21 +77,6 @@ public interface UserService extends IService<User> { */ void deleteUser(Long userId) throws Exception; - /** - * update user - * - * @param user user - */ - void updateProfile(User user) throws Exception; - - /** - * update user avatar - * - * @param username name - * @param avatar avatar - */ - void updateAvatar(String username, String avatar) throws Exception; - /** * update password * diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/UserServiceImpl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/UserServiceImpl.java index 01c1365a8..531a1e3a7 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/UserServiceImpl.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/UserServiceImpl.java @@ -119,22 +119,6 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us this.memberService.deleteByUserId(userId); } - @Override - @Transactional(rollbackFor = Exception.class) - public void updateProfile(User user) { - updateById(user); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void updateAvatar(String username, String avatar) { - User user = new User(); - user.setAvatar(avatar); - LambdaQueryWrapper<User> queryWrapper = - new LambdaQueryWrapper<User>().eq(User::getUsername, username); - this.baseMapper.update(user, queryWrapper); - } - @Override @Transactional(rollbackFor = Exception.class) public void updatePassword(User userParam) {
