Commit c75b52e1 authored by Zheng Jie's avatar Zheng Jie
Browse files

代码优化,修改Controller中方法,避免名称重复

命名重复会打印如下日志,不介意的可以不修改:
s.d.s.w.s.ApiListingReferenceScanner: Generating unique operation named
parent db1a20a8
...@@ -55,7 +55,7 @@ public class MenuController { ...@@ -55,7 +55,7 @@ public class MenuController {
@ApiOperation("导出菜单数据") @ApiOperation("导出菜单数据")
@GetMapping(value = "/download") @GetMapping(value = "/download")
@PreAuthorize("@el.check('menu:list')") @PreAuthorize("@el.check('menu:list')")
public void download(HttpServletResponse response, MenuQueryCriteria criteria) throws Exception { public void exportMenu(HttpServletResponse response, MenuQueryCriteria criteria) throws Exception {
menuService.download(menuService.queryAll(criteria, false), response); menuService.download(menuService.queryAll(criteria, false), response);
} }
...@@ -70,14 +70,14 @@ public class MenuController { ...@@ -70,14 +70,14 @@ public class MenuController {
@ApiOperation("返回全部的菜单") @ApiOperation("返回全部的菜单")
@GetMapping(value = "/lazy") @GetMapping(value = "/lazy")
@PreAuthorize("@el.check('menu:list','roles:list')") @PreAuthorize("@el.check('menu:list','roles:list')")
public ResponseEntity<Object> query(@RequestParam Long pid){ public ResponseEntity<Object> queryAllMenu(@RequestParam Long pid){
return new ResponseEntity<>(menuService.getMenus(pid),HttpStatus.OK); return new ResponseEntity<>(menuService.getMenus(pid),HttpStatus.OK);
} }
@ApiOperation("根据菜单ID返回所有子节点ID,包含自身ID") @ApiOperation("根据菜单ID返回所有子节点ID,包含自身ID")
@GetMapping(value = "/child") @GetMapping(value = "/child")
@PreAuthorize("@el.check('menu:list','roles:list')") @PreAuthorize("@el.check('menu:list','roles:list')")
public ResponseEntity<Object> child(@RequestParam Long id){ public ResponseEntity<Object> childMenu(@RequestParam Long id){
Set<Menu> menuSet = new HashSet<>(); Set<Menu> menuSet = new HashSet<>();
List<MenuDto> menuList = menuService.getMenus(id); List<MenuDto> menuList = menuService.getMenus(id);
menuSet.add(menuService.findOne(id)); menuSet.add(menuService.findOne(id));
...@@ -89,7 +89,7 @@ public class MenuController { ...@@ -89,7 +89,7 @@ public class MenuController {
@GetMapping @GetMapping
@ApiOperation("查询菜单") @ApiOperation("查询菜单")
@PreAuthorize("@el.check('menu:list')") @PreAuthorize("@el.check('menu:list')")
public ResponseEntity<Object> query(MenuQueryCriteria criteria) throws Exception { public ResponseEntity<Object> queryMenu(MenuQueryCriteria criteria) throws Exception {
List<MenuDto> menuDtoList = menuService.queryAll(criteria, true); List<MenuDto> menuDtoList = menuService.queryAll(criteria, true);
return new ResponseEntity<>(PageUtil.toPage(menuDtoList, menuDtoList.size()),HttpStatus.OK); return new ResponseEntity<>(PageUtil.toPage(menuDtoList, menuDtoList.size()),HttpStatus.OK);
} }
...@@ -97,7 +97,7 @@ public class MenuController { ...@@ -97,7 +97,7 @@ public class MenuController {
@ApiOperation("查询菜单:根据ID获取同级与上级数据") @ApiOperation("查询菜单:根据ID获取同级与上级数据")
@PostMapping("/superior") @PostMapping("/superior")
@PreAuthorize("@el.check('menu:list')") @PreAuthorize("@el.check('menu:list')")
public ResponseEntity<Object> getSuperior(@RequestBody List<Long> ids) { public ResponseEntity<Object> getMenuSuperior(@RequestBody List<Long> ids) {
Set<MenuDto> menuDtos = new LinkedHashSet<>(); Set<MenuDto> menuDtos = new LinkedHashSet<>();
if(CollectionUtil.isNotEmpty(ids)){ if(CollectionUtil.isNotEmpty(ids)){
for (Long id : ids) { for (Long id : ids) {
...@@ -113,7 +113,7 @@ public class MenuController { ...@@ -113,7 +113,7 @@ public class MenuController {
@ApiOperation("新增菜单") @ApiOperation("新增菜单")
@PostMapping @PostMapping
@PreAuthorize("@el.check('menu:add')") @PreAuthorize("@el.check('menu:add')")
public ResponseEntity<Object> create(@Validated @RequestBody Menu resources){ public ResponseEntity<Object> createMenu(@Validated @RequestBody Menu resources){
if (resources.getId() != null) { if (resources.getId() != null) {
throw new BadRequestException("A new "+ ENTITY_NAME +" cannot already have an ID"); throw new BadRequestException("A new "+ ENTITY_NAME +" cannot already have an ID");
} }
...@@ -125,7 +125,7 @@ public class MenuController { ...@@ -125,7 +125,7 @@ public class MenuController {
@ApiOperation("修改菜单") @ApiOperation("修改菜单")
@PutMapping @PutMapping
@PreAuthorize("@el.check('menu:edit')") @PreAuthorize("@el.check('menu:edit')")
public ResponseEntity<Object> update(@Validated(Menu.Update.class) @RequestBody Menu resources){ public ResponseEntity<Object> updateMenu(@Validated(Menu.Update.class) @RequestBody Menu resources){
menuService.update(resources); menuService.update(resources);
return new ResponseEntity<>(HttpStatus.NO_CONTENT); return new ResponseEntity<>(HttpStatus.NO_CONTENT);
} }
...@@ -134,7 +134,7 @@ public class MenuController { ...@@ -134,7 +134,7 @@ public class MenuController {
@ApiOperation("删除菜单") @ApiOperation("删除菜单")
@DeleteMapping @DeleteMapping
@PreAuthorize("@el.check('menu:del')") @PreAuthorize("@el.check('menu:del')")
public ResponseEntity<Object> delete(@RequestBody Set<Long> ids){ public ResponseEntity<Object> deleteMenu(@RequestBody Set<Long> ids){
Set<Menu> menuSet = new HashSet<>(); Set<Menu> menuSet = new HashSet<>();
for (Long id : ids) { for (Long id : ids) {
List<MenuDto> menuList = menuService.getMenus(id); List<MenuDto> menuList = menuService.getMenus(id);
......
...@@ -39,7 +39,7 @@ public class MonitorController { ...@@ -39,7 +39,7 @@ public class MonitorController {
@GetMapping @GetMapping
@ApiOperation("查询服务监控") @ApiOperation("查询服务监控")
@PreAuthorize("@el.check('monitor:list')") @PreAuthorize("@el.check('monitor:list')")
public ResponseEntity<Object> query(){ public ResponseEntity<Object> queryMonitor(){
return new ResponseEntity<>(serverService.getServers(),HttpStatus.OK); return new ResponseEntity<>(serverService.getServers(),HttpStatus.OK);
} }
} }
...@@ -57,34 +57,34 @@ public class RoleController { ...@@ -57,34 +57,34 @@ public class RoleController {
@ApiOperation("获取单个role") @ApiOperation("获取单个role")
@GetMapping(value = "/{id}") @GetMapping(value = "/{id}")
@PreAuthorize("@el.check('roles:list')") @PreAuthorize("@el.check('roles:list')")
public ResponseEntity<Object> query(@PathVariable Long id){ public ResponseEntity<Object> findRoleById(@PathVariable Long id){
return new ResponseEntity<>(roleService.findById(id), HttpStatus.OK); return new ResponseEntity<>(roleService.findById(id), HttpStatus.OK);
} }
@ApiOperation("导出角色数据") @ApiOperation("导出角色数据")
@GetMapping(value = "/download") @GetMapping(value = "/download")
@PreAuthorize("@el.check('role:list')") @PreAuthorize("@el.check('role:list')")
public void download(HttpServletResponse response, RoleQueryCriteria criteria) throws IOException { public void exportRole(HttpServletResponse response, RoleQueryCriteria criteria) throws IOException {
roleService.download(roleService.queryAll(criteria), response); roleService.download(roleService.queryAll(criteria), response);
} }
@ApiOperation("返回全部的角色") @ApiOperation("返回全部的角色")
@GetMapping(value = "/all") @GetMapping(value = "/all")
@PreAuthorize("@el.check('roles:list','user:add','user:edit')") @PreAuthorize("@el.check('roles:list','user:add','user:edit')")
public ResponseEntity<Object> query(){ public ResponseEntity<Object> queryAllRole(){
return new ResponseEntity<>(roleService.queryAll(),HttpStatus.OK); return new ResponseEntity<>(roleService.queryAll(),HttpStatus.OK);
} }
@ApiOperation("查询角色") @ApiOperation("查询角色")
@GetMapping @GetMapping
@PreAuthorize("@el.check('roles:list')") @PreAuthorize("@el.check('roles:list')")
public ResponseEntity<Object> query(RoleQueryCriteria criteria, Pageable pageable){ public ResponseEntity<Object> queryRole(RoleQueryCriteria criteria, Pageable pageable){
return new ResponseEntity<>(roleService.queryAll(criteria,pageable),HttpStatus.OK); return new ResponseEntity<>(roleService.queryAll(criteria,pageable),HttpStatus.OK);
} }
@ApiOperation("获取用户级别") @ApiOperation("获取用户级别")
@GetMapping(value = "/level") @GetMapping(value = "/level")
public ResponseEntity<Object> getLevel(){ public ResponseEntity<Object> getRoleLevel(){
return new ResponseEntity<>(Dict.create().set("level", getLevels(null)),HttpStatus.OK); return new ResponseEntity<>(Dict.create().set("level", getLevels(null)),HttpStatus.OK);
} }
...@@ -92,7 +92,7 @@ public class RoleController { ...@@ -92,7 +92,7 @@ public class RoleController {
@ApiOperation("新增角色") @ApiOperation("新增角色")
@PostMapping @PostMapping
@PreAuthorize("@el.check('roles:add')") @PreAuthorize("@el.check('roles:add')")
public ResponseEntity<Object> create(@Validated @RequestBody Role resources){ public ResponseEntity<Object> createRole(@Validated @RequestBody Role resources){
if (resources.getId() != null) { if (resources.getId() != null) {
throw new BadRequestException("A new "+ ENTITY_NAME +" cannot already have an ID"); throw new BadRequestException("A new "+ ENTITY_NAME +" cannot already have an ID");
} }
...@@ -105,7 +105,7 @@ public class RoleController { ...@@ -105,7 +105,7 @@ public class RoleController {
@ApiOperation("修改角色") @ApiOperation("修改角色")
@PutMapping @PutMapping
@PreAuthorize("@el.check('roles:edit')") @PreAuthorize("@el.check('roles:edit')")
public ResponseEntity<Object> update(@Validated(Role.Update.class) @RequestBody Role resources){ public ResponseEntity<Object> updateRole(@Validated(Role.Update.class) @RequestBody Role resources){
getLevels(resources.getLevel()); getLevels(resources.getLevel());
roleService.update(resources); roleService.update(resources);
return new ResponseEntity<>(HttpStatus.NO_CONTENT); return new ResponseEntity<>(HttpStatus.NO_CONTENT);
...@@ -115,7 +115,7 @@ public class RoleController { ...@@ -115,7 +115,7 @@ public class RoleController {
@ApiOperation("修改角色菜单") @ApiOperation("修改角色菜单")
@PutMapping(value = "/menu") @PutMapping(value = "/menu")
@PreAuthorize("@el.check('roles:edit')") @PreAuthorize("@el.check('roles:edit')")
public ResponseEntity<Object> updateMenu(@RequestBody Role resources){ public ResponseEntity<Object> updateRoleMenu(@RequestBody Role resources){
RoleDto role = roleService.findById(resources.getId()); RoleDto role = roleService.findById(resources.getId());
getLevels(role.getLevel()); getLevels(role.getLevel());
roleService.updateMenu(resources,role); roleService.updateMenu(resources,role);
...@@ -126,7 +126,7 @@ public class RoleController { ...@@ -126,7 +126,7 @@ public class RoleController {
@ApiOperation("删除角色") @ApiOperation("删除角色")
@DeleteMapping @DeleteMapping
@PreAuthorize("@el.check('roles:del')") @PreAuthorize("@el.check('roles:del')")
public ResponseEntity<Object> delete(@RequestBody Set<Long> ids){ public ResponseEntity<Object> deleteRole(@RequestBody Set<Long> ids){
for (Long id : ids) { for (Long id : ids) {
RoleDto role = roleService.findById(id); RoleDto role = roleService.findById(id);
getLevels(role.getLevel()); getLevels(role.getLevel());
......
...@@ -70,14 +70,14 @@ public class UserController { ...@@ -70,14 +70,14 @@ public class UserController {
@ApiOperation("导出用户数据") @ApiOperation("导出用户数据")
@GetMapping(value = "/download") @GetMapping(value = "/download")
@PreAuthorize("@el.check('user:list')") @PreAuthorize("@el.check('user:list')")
public void download(HttpServletResponse response, UserQueryCriteria criteria) throws IOException { public void exportUser(HttpServletResponse response, UserQueryCriteria criteria) throws IOException {
userService.download(userService.queryAll(criteria), response); userService.download(userService.queryAll(criteria), response);
} }
@ApiOperation("查询用户") @ApiOperation("查询用户")
@GetMapping @GetMapping
@PreAuthorize("@el.check('user:list')") @PreAuthorize("@el.check('user:list')")
public ResponseEntity<Object> query(UserQueryCriteria criteria, Pageable pageable){ public ResponseEntity<Object> queryUser(UserQueryCriteria criteria, Pageable pageable){
if (!ObjectUtils.isEmpty(criteria.getDeptId())) { if (!ObjectUtils.isEmpty(criteria.getDeptId())) {
criteria.getDeptIds().add(criteria.getDeptId()); criteria.getDeptIds().add(criteria.getDeptId());
// 先查找是否存在子节点 // 先查找是否存在子节点
...@@ -106,7 +106,7 @@ public class UserController { ...@@ -106,7 +106,7 @@ public class UserController {
@ApiOperation("新增用户") @ApiOperation("新增用户")
@PostMapping @PostMapping
@PreAuthorize("@el.check('user:add')") @PreAuthorize("@el.check('user:add')")
public ResponseEntity<Object> create(@Validated @RequestBody User resources){ public ResponseEntity<Object> createUser(@Validated @RequestBody User resources){
checkLevel(resources); checkLevel(resources);
// 默认密码 123456 // 默认密码 123456
resources.setPassword(passwordEncoder.encode("123456")); resources.setPassword(passwordEncoder.encode("123456"));
...@@ -118,7 +118,7 @@ public class UserController { ...@@ -118,7 +118,7 @@ public class UserController {
@ApiOperation("修改用户") @ApiOperation("修改用户")
@PutMapping @PutMapping
@PreAuthorize("@el.check('user:edit')") @PreAuthorize("@el.check('user:edit')")
public ResponseEntity<Object> update(@Validated(User.Update.class) @RequestBody User resources) throws Exception { public ResponseEntity<Object> updateUser(@Validated(User.Update.class) @RequestBody User resources) throws Exception {
checkLevel(resources); checkLevel(resources);
userService.update(resources); userService.update(resources);
return new ResponseEntity<>(HttpStatus.NO_CONTENT); return new ResponseEntity<>(HttpStatus.NO_CONTENT);
...@@ -127,7 +127,7 @@ public class UserController { ...@@ -127,7 +127,7 @@ public class UserController {
@Log("修改用户:个人中心") @Log("修改用户:个人中心")
@ApiOperation("修改用户:个人中心") @ApiOperation("修改用户:个人中心")
@PutMapping(value = "center") @PutMapping(value = "center")
public ResponseEntity<Object> center(@Validated(User.Update.class) @RequestBody User resources){ public ResponseEntity<Object> centerUser(@Validated(User.Update.class) @RequestBody User resources){
if(!resources.getId().equals(SecurityUtils.getCurrentUserId())){ if(!resources.getId().equals(SecurityUtils.getCurrentUserId())){
throw new BadRequestException("不能修改他人资料"); throw new BadRequestException("不能修改他人资料");
} }
...@@ -139,7 +139,7 @@ public class UserController { ...@@ -139,7 +139,7 @@ public class UserController {
@ApiOperation("删除用户") @ApiOperation("删除用户")
@DeleteMapping @DeleteMapping
@PreAuthorize("@el.check('user:del')") @PreAuthorize("@el.check('user:del')")
public ResponseEntity<Object> delete(@RequestBody Set<Long> ids){ public ResponseEntity<Object> deleteUser(@RequestBody Set<Long> ids){
for (Long id : ids) { for (Long id : ids) {
Integer currentLevel = Collections.min(roleService.findByUsersId(SecurityUtils.getCurrentUserId()).stream().map(RoleSmallDto::getLevel).collect(Collectors.toList())); Integer currentLevel = Collections.min(roleService.findByUsersId(SecurityUtils.getCurrentUserId()).stream().map(RoleSmallDto::getLevel).collect(Collectors.toList()));
Integer optLevel = Collections.min(roleService.findByUsersId(id).stream().map(RoleSmallDto::getLevel).collect(Collectors.toList())); Integer optLevel = Collections.min(roleService.findByUsersId(id).stream().map(RoleSmallDto::getLevel).collect(Collectors.toList()));
...@@ -153,7 +153,7 @@ public class UserController { ...@@ -153,7 +153,7 @@ public class UserController {
@ApiOperation("修改密码") @ApiOperation("修改密码")
@PostMapping(value = "/updatePass") @PostMapping(value = "/updatePass")
public ResponseEntity<Object> updatePass(@RequestBody UserPassVo passVo) throws Exception { public ResponseEntity<Object> updateUserPass(@RequestBody UserPassVo passVo) throws Exception {
String oldPass = RsaUtils.decryptByPrivateKey(RsaProperties.privateKey,passVo.getOldPass()); String oldPass = RsaUtils.decryptByPrivateKey(RsaProperties.privateKey,passVo.getOldPass());
String newPass = RsaUtils.decryptByPrivateKey(RsaProperties.privateKey,passVo.getNewPass()); String newPass = RsaUtils.decryptByPrivateKey(RsaProperties.privateKey,passVo.getNewPass());
UserDto user = userService.findByName(SecurityUtils.getCurrentUsername()); UserDto user = userService.findByName(SecurityUtils.getCurrentUsername());
...@@ -169,14 +169,14 @@ public class UserController { ...@@ -169,14 +169,14 @@ public class UserController {
@ApiOperation("修改头像") @ApiOperation("修改头像")
@PostMapping(value = "/updateAvatar") @PostMapping(value = "/updateAvatar")
public ResponseEntity<Object> updateAvatar(@RequestParam MultipartFile avatar){ public ResponseEntity<Object> updateUserAvatar(@RequestParam MultipartFile avatar){
return new ResponseEntity<>(userService.updateAvatar(avatar), HttpStatus.OK); return new ResponseEntity<>(userService.updateAvatar(avatar), HttpStatus.OK);
} }
@Log("修改邮箱") @Log("修改邮箱")
@ApiOperation("修改邮箱") @ApiOperation("修改邮箱")
@PostMapping(value = "/updateEmail/{code}") @PostMapping(value = "/updateEmail/{code}")
public ResponseEntity<Object> updateEmail(@PathVariable String code,@RequestBody User user) throws Exception { public ResponseEntity<Object> updateUserEmail(@PathVariable String code,@RequestBody User user) throws Exception {
String password = RsaUtils.decryptByPrivateKey(RsaProperties.privateKey,user.getPassword()); String password = RsaUtils.decryptByPrivateKey(RsaProperties.privateKey,user.getPassword());
UserDto userDto = userService.findByName(SecurityUtils.getCurrentUsername()); UserDto userDto = userService.findByName(SecurityUtils.getCurrentUsername());
if(!passwordEncoder.matches(password, userDto.getPassword())){ if(!passwordEncoder.matches(password, userDto.getPassword())){
......
...@@ -48,6 +48,7 @@ public interface UserService { ...@@ -48,6 +48,7 @@ public interface UserService {
/** /**
* 编辑用户 * 编辑用户
* @param resources / * @param resources /
* @throws Exception /
*/ */
void update(User resources) throws Exception; void update(User resources) throws Exception;
......
...@@ -47,7 +47,7 @@ public class ${className}Controller { ...@@ -47,7 +47,7 @@ public class ${className}Controller {
@ApiOperation("导出数据") @ApiOperation("导出数据")
@GetMapping(value = "/download") @GetMapping(value = "/download")
@PreAuthorize("@el.check('${changeClassName}:list')") @PreAuthorize("@el.check('${changeClassName}:list')")
public void download(HttpServletResponse response, ${className}QueryCriteria criteria) throws IOException { public void export${className}(HttpServletResponse response, ${className}QueryCriteria criteria) throws IOException {
${changeClassName}Service.download(${changeClassName}Service.queryAll(criteria), response); ${changeClassName}Service.download(${changeClassName}Service.queryAll(criteria), response);
} }
...@@ -55,7 +55,7 @@ public class ${className}Controller { ...@@ -55,7 +55,7 @@ public class ${className}Controller {
@Log("查询${apiAlias}") @Log("查询${apiAlias}")
@ApiOperation("查询${apiAlias}") @ApiOperation("查询${apiAlias}")
@PreAuthorize("@el.check('${changeClassName}:list')") @PreAuthorize("@el.check('${changeClassName}:list')")
public ResponseEntity<Object> query(${className}QueryCriteria criteria, Pageable pageable){ public ResponseEntity<Object> query${className}(${className}QueryCriteria criteria, Pageable pageable){
return new ResponseEntity<>(${changeClassName}Service.queryAll(criteria,pageable),HttpStatus.OK); return new ResponseEntity<>(${changeClassName}Service.queryAll(criteria,pageable),HttpStatus.OK);
} }
...@@ -63,7 +63,7 @@ public class ${className}Controller { ...@@ -63,7 +63,7 @@ public class ${className}Controller {
@Log("新增${apiAlias}") @Log("新增${apiAlias}")
@ApiOperation("新增${apiAlias}") @ApiOperation("新增${apiAlias}")
@PreAuthorize("@el.check('${changeClassName}:add')") @PreAuthorize("@el.check('${changeClassName}:add')")
public ResponseEntity<Object> create(@Validated @RequestBody ${className} resources){ public ResponseEntity<Object> create${className}(@Validated @RequestBody ${className} resources){
return new ResponseEntity<>(${changeClassName}Service.create(resources),HttpStatus.CREATED); return new ResponseEntity<>(${changeClassName}Service.create(resources),HttpStatus.CREATED);
} }
...@@ -71,16 +71,16 @@ public class ${className}Controller { ...@@ -71,16 +71,16 @@ public class ${className}Controller {
@Log("修改${apiAlias}") @Log("修改${apiAlias}")
@ApiOperation("修改${apiAlias}") @ApiOperation("修改${apiAlias}")
@PreAuthorize("@el.check('${changeClassName}:edit')") @PreAuthorize("@el.check('${changeClassName}:edit')")
public ResponseEntity<Object> update(@Validated @RequestBody ${className} resources){ public ResponseEntity<Object> update${className}(@Validated @RequestBody ${className} resources){
${changeClassName}Service.update(resources); ${changeClassName}Service.update(resources);
return new ResponseEntity<>(HttpStatus.NO_CONTENT); return new ResponseEntity<>(HttpStatus.NO_CONTENT);
} }
@DeleteMapping
@Log("删除${apiAlias}") @Log("删除${apiAlias}")
@ApiOperation("删除${apiAlias}") @ApiOperation("删除${apiAlias}")
@PreAuthorize("@el.check('${changeClassName}:del')") @PreAuthorize("@el.check('${changeClassName}:del')")
@DeleteMapping public ResponseEntity<Object> delete${className}(@RequestBody ${pkColumnType}[] ids) {
public ResponseEntity<Object> delete(@RequestBody ${pkColumnType}[] ids) {
${changeClassName}Service.deleteAll(ids); ${changeClassName}Service.deleteAll(ids);
return new ResponseEntity<>(HttpStatus.OK); return new ResponseEntity<>(HttpStatus.OK);
} }
......
...@@ -53,14 +53,14 @@ public class AliPayController { ...@@ -53,14 +53,14 @@ public class AliPayController {
private final AliPayService alipayService; private final AliPayService alipayService;
@GetMapping @GetMapping
public ResponseEntity<AlipayConfig> queryConfig() { public ResponseEntity<AlipayConfig> queryAliConfig() {
return new ResponseEntity<>(alipayService.find(), HttpStatus.OK); return new ResponseEntity<>(alipayService.find(), HttpStatus.OK);
} }
@Log("配置支付宝") @Log("配置支付宝")
@ApiOperation("配置支付宝") @ApiOperation("配置支付宝")
@PutMapping @PutMapping
public ResponseEntity<Object> updateConfig(@Validated @RequestBody AlipayConfig alipayConfig) { public ResponseEntity<Object> updateAliPayConfig(@Validated @RequestBody AlipayConfig alipayConfig) {
alipayService.config(alipayConfig); alipayService.config(alipayConfig);
return new ResponseEntity<>(HttpStatus.OK); return new ResponseEntity<>(HttpStatus.OK);
} }
......
...@@ -41,14 +41,14 @@ public class EmailController { ...@@ -41,14 +41,14 @@ public class EmailController {
private final EmailService emailService; private final EmailService emailService;
@GetMapping @GetMapping
public ResponseEntity<Object> queryConfig(){ public ResponseEntity<Object> queryEmailConfig(){
return new ResponseEntity<>(emailService.find(),HttpStatus.OK); return new ResponseEntity<>(emailService.find(),HttpStatus.OK);
} }
@Log("配置邮件") @Log("配置邮件")
@PutMapping @PutMapping
@ApiOperation("配置邮件") @ApiOperation("配置邮件")
public ResponseEntity<Object> updateConfig(@Validated @RequestBody EmailConfig emailConfig) throws Exception { public ResponseEntity<Object> updateEmailConfig(@Validated @RequestBody EmailConfig emailConfig) throws Exception {
emailService.config(emailConfig,emailService.find()); emailService.config(emailConfig,emailService.find());
return new ResponseEntity<>(HttpStatus.OK); return new ResponseEntity<>(HttpStatus.OK);
} }
......
...@@ -45,31 +45,31 @@ public class LocalStorageController { ...@@ -45,31 +45,31 @@ public class LocalStorageController {
private final LocalStorageService localStorageService; private final LocalStorageService localStorageService;
@ApiOperation("查询文件")
@GetMapping @GetMapping
@ApiOperation("查询文件")
@PreAuthorize("@el.check('storage:list')") @PreAuthorize("@el.check('storage:list')")
public ResponseEntity<Object> query(LocalStorageQueryCriteria criteria, Pageable pageable){ public ResponseEntity<Object> queryFile(LocalStorageQueryCriteria criteria, Pageable pageable){
return new ResponseEntity<>(localStorageService.queryAll(criteria,pageable),HttpStatus.OK); return new ResponseEntity<>(localStorageService.queryAll(criteria,pageable),HttpStatus.OK);
} }
@ApiOperation("导出数据") @ApiOperation("导出数据")
@GetMapping(value = "/download") @GetMapping(value = "/download")
@PreAuthorize("@el.check('storage:list')") @PreAuthorize("@el.check('storage:list')")
public void download(HttpServletResponse response, LocalStorageQueryCriteria criteria) throws IOException { public void exportFile(HttpServletResponse response, LocalStorageQueryCriteria criteria) throws IOException {
localStorageService.download(localStorageService.queryAll(criteria), response); localStorageService.download(localStorageService.queryAll(criteria), response);
} }
@ApiOperation("上传文件")
@PostMapping @PostMapping
@ApiOperation("上传文件")
@PreAuthorize("@el.check('storage:add')") @PreAuthorize("@el.check('storage:add')")
public ResponseEntity<Object> create(@RequestParam String name, @RequestParam("file") MultipartFile file){ public ResponseEntity<Object> createFile(@RequestParam String name, @RequestParam("file") MultipartFile file){
localStorageService.create(name, file); localStorageService.create(name, file);
return new ResponseEntity<>(HttpStatus.CREATED); return new ResponseEntity<>(HttpStatus.CREATED);
} }
@PostMapping("/pictures")
@ApiOperation("上传图片") @ApiOperation("上传图片")
public ResponseEntity<Object> upload(@RequestParam MultipartFile file){ @PostMapping("/pictures")
public ResponseEntity<Object> uploadPicture(@RequestParam MultipartFile file){
// 判断文件是否为图片 // 判断文件是否为图片
String suffix = FileUtil.getExtensionName(file.getOriginalFilename()); String suffix = FileUtil.getExtensionName(file.getOriginalFilename());
if(!FileUtil.IMAGE.equals(FileUtil.getFileType(suffix))){ if(!FileUtil.IMAGE.equals(FileUtil.getFileType(suffix))){
...@@ -79,11 +79,11 @@ public class LocalStorageController { ...@@ -79,11 +79,11 @@ public class LocalStorageController {
return new ResponseEntity<>(localStorage, HttpStatus.OK); return new ResponseEntity<>(localStorage, HttpStatus.OK);
} }
@PutMapping
@Log("修改文件") @Log("修改文件")
@ApiOperation("修改文件") @ApiOperation("修改文件")
@PutMapping
@PreAuthorize("@el.check('storage:edit')") @PreAuthorize("@el.check('storage:edit')")
public ResponseEntity<Object> update(@Validated @RequestBody LocalStorage resources){ public ResponseEntity<Object> updateFile(@Validated @RequestBody LocalStorage resources){
localStorageService.update(resources); localStorageService.update(resources);
return new ResponseEntity<>(HttpStatus.NO_CONTENT); return new ResponseEntity<>(HttpStatus.NO_CONTENT);
} }
...@@ -91,7 +91,7 @@ public class LocalStorageController { ...@@ -91,7 +91,7 @@ public class LocalStorageController {
@Log("删除文件") @Log("删除文件")
@DeleteMapping @DeleteMapping
@ApiOperation("多选删除") @ApiOperation("多选删除")
public ResponseEntity<Object> delete(@RequestBody Long[] ids) { public ResponseEntity<Object> deleteFile(@RequestBody Long[] ids) {
localStorageService.deleteAll(ids); localStorageService.deleteAll(ids);
return new ResponseEntity<>(HttpStatus.OK); return new ResponseEntity<>(HttpStatus.OK);
} }
......
...@@ -50,14 +50,14 @@ public class QiniuController { ...@@ -50,14 +50,14 @@ public class QiniuController {
private final QiNiuService qiNiuService; private final QiNiuService qiNiuService;
@GetMapping(value = "/config") @GetMapping(value = "/config")
public ResponseEntity<Object> queryConfig(){ public ResponseEntity<Object> queryQiNiuConfig(){
return new ResponseEntity<>(qiNiuService.find(), HttpStatus.OK); return new ResponseEntity<>(qiNiuService.find(), HttpStatus.OK);
} }
@Log("配置七牛云存储") @Log("配置七牛云存储")
@ApiOperation("配置七牛云存储") @ApiOperation("配置七牛云存储")
@PutMapping(value = "/config") @PutMapping(value = "/config")
public ResponseEntity<Object> updateConfig(@Validated @RequestBody QiniuConfig qiniuConfig){ public ResponseEntity<Object> updateQiNiuConfig(@Validated @RequestBody QiniuConfig qiniuConfig){
qiNiuService.config(qiniuConfig); qiNiuService.config(qiniuConfig);
qiNiuService.update(qiniuConfig.getType()); qiNiuService.update(qiniuConfig.getType());
return new ResponseEntity<>(HttpStatus.OK); return new ResponseEntity<>(HttpStatus.OK);
...@@ -65,20 +65,20 @@ public class QiniuController { ...@@ -65,20 +65,20 @@ public class QiniuController {
@ApiOperation("导出数据") @ApiOperation("导出数据")
@GetMapping(value = "/download") @GetMapping(value = "/download")
public void download(HttpServletResponse response, QiniuQueryCriteria criteria) throws IOException { public void exportQiNiu(HttpServletResponse response, QiniuQueryCriteria criteria) throws IOException {
qiNiuService.downloadList(qiNiuService.queryAll(criteria), response); qiNiuService.downloadList(qiNiuService.queryAll(criteria), response);
} }
@ApiOperation("查询文件") @ApiOperation("查询文件")
@GetMapping @GetMapping
public ResponseEntity<Object> query(QiniuQueryCriteria criteria, Pageable pageable){ public ResponseEntity<Object> queryQiNiu(QiniuQueryCriteria criteria, Pageable pageable){
return new ResponseEntity<>(qiNiuService.queryAll(criteria,pageable),HttpStatus.OK); return new ResponseEntity<>(qiNiuService.queryAll(criteria,pageable),HttpStatus.OK);
} }
@Log("上传文件") @Log("上传文件")
@ApiOperation("上传文件") @ApiOperation("上传文件")
@PostMapping @PostMapping
public ResponseEntity<Object> upload(@RequestParam MultipartFile file){ public ResponseEntity<Object> uploadQiNiu(@RequestParam MultipartFile file){
QiniuContent qiniuContent = qiNiuService.upload(file,qiNiuService.find()); QiniuContent qiniuContent = qiNiuService.upload(file,qiNiuService.find());
Map<String,Object> map = new HashMap<>(3); Map<String,Object> map = new HashMap<>(3);
map.put("id",qiniuContent.getId()); map.put("id",qiniuContent.getId());
...@@ -90,7 +90,7 @@ public class QiniuController { ...@@ -90,7 +90,7 @@ public class QiniuController {
@Log("同步七牛云数据") @Log("同步七牛云数据")
@ApiOperation("同步七牛云数据") @ApiOperation("同步七牛云数据")
@PostMapping(value = "/synchronize") @PostMapping(value = "/synchronize")
public ResponseEntity<Object> synchronize(){ public ResponseEntity<Object> synchronizeQiNiu(){
qiNiuService.synchronize(qiNiuService.find()); qiNiuService.synchronize(qiNiuService.find());
return new ResponseEntity<>(HttpStatus.OK); return new ResponseEntity<>(HttpStatus.OK);
} }
...@@ -98,7 +98,7 @@ public class QiniuController { ...@@ -98,7 +98,7 @@ public class QiniuController {
@Log("下载文件") @Log("下载文件")
@ApiOperation("下载文件") @ApiOperation("下载文件")
@GetMapping(value = "/download/{id}") @GetMapping(value = "/download/{id}")
public ResponseEntity<Object> download(@PathVariable Long id){ public ResponseEntity<Object> downloadQiNiu(@PathVariable Long id){
Map<String,Object> map = new HashMap<>(1); Map<String,Object> map = new HashMap<>(1);
map.put("url", qiNiuService.download(qiNiuService.findByContentId(id),qiNiuService.find())); map.put("url", qiNiuService.download(qiNiuService.findByContentId(id),qiNiuService.find()));
return new ResponseEntity<>(map,HttpStatus.OK); return new ResponseEntity<>(map,HttpStatus.OK);
...@@ -107,7 +107,7 @@ public class QiniuController { ...@@ -107,7 +107,7 @@ public class QiniuController {
@Log("删除文件") @Log("删除文件")
@ApiOperation("删除文件") @ApiOperation("删除文件")
@DeleteMapping(value = "/{id}") @DeleteMapping(value = "/{id}")
public ResponseEntity<Object> delete(@PathVariable Long id){ public ResponseEntity<Object> deleteQiNiu(@PathVariable Long id){
qiNiuService.delete(qiNiuService.findByContentId(id),qiNiuService.find()); qiNiuService.delete(qiNiuService.findByContentId(id),qiNiuService.find());
return new ResponseEntity<>(HttpStatus.OK); return new ResponseEntity<>(HttpStatus.OK);
} }
...@@ -115,7 +115,7 @@ public class QiniuController { ...@@ -115,7 +115,7 @@ public class QiniuController {
@Log("删除多张图片") @Log("删除多张图片")
@ApiOperation("删除多张图片") @ApiOperation("删除多张图片")
@DeleteMapping @DeleteMapping
public ResponseEntity<Object> deleteAll(@RequestBody Long[] ids) { public ResponseEntity<Object> deleteAllQiNiu(@RequestBody Long[] ids) {
qiNiuService.deleteAll(ids, qiNiuService.find()); qiNiuService.deleteAll(ids, qiNiuService.find());
return new ResponseEntity<>(HttpStatus.OK); return new ResponseEntity<>(HttpStatus.OK);
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment