lywsvip/hsweb-framework
1
0
Fork 0
mirror of https://github.com/hs-web/hsweb-framework.git synced 2026-06-08 17:03:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

优化配置

Browse Source
This commit is contained in:
zhouhao
2017-12-13 17:53:07 +08:00
parent 5b0620f997
commit 9fceb99bc1
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
hsweb-system/hsweb-system-authorization/hsweb-system-authorization-controller/src/main/java/org/hswebframework/web/controller/authorization/UserSettingController.java
View File

@@ -3,12 +3,11 @@ package org.hswebframework.web.controller.authorization;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.hswebframework.web.authorization.Authentication;
import org.hswebframework.web.authorization.User;
import org.hswebframework.web.authorization.annotation.Authorize;
import org.hswebframework.web.controller.message.ResponseMessage;
import org.hswebframework.web.entity.authorization.UserSettingEntity;
import org.hswebframework.web.service.authorization.UserSettingService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -30,24 +29,24 @@ public class UserSettingController {
@GetMapping("/me/{key}/{id}")
@Authorize(merge = false)
@ApiOperation("获取当前用户的配置")
public ResponseEntity<UserSettingEntity> get(Authentication authentication,
@PathVariable String key,
@PathVariable String id) {
return ResponseEntity.ok(userSettingService.selectByUser(authentication.getUser().getId(), key, id));
public ResponseMessage<UserSettingEntity> get(Authentication authentication,
@PathVariable String key,
@PathVariable String id) {
return ResponseMessage.ok(userSettingService.selectByUser(authentication.getUser().getId(), key, id));
}
@GetMapping("/me/{key}")
@Authorize(merge = false)
@ApiOperation("获取当前用户的配置列表")
public ResponseEntity<List<UserSettingEntity>> get(Authentication authentication,
public ResponseMessage<List<UserSettingEntity>> get(Authentication authentication,
@PathVariable String key) {
return ResponseEntity.ok(userSettingService.selectByUser(authentication.getUser().getId(), key));
return ResponseMessage.ok(userSettingService.selectByUser(authentication.getUser().getId(), key));
}
@PatchMapping("/me/{key}")
@Authorize(merge = false)
@ApiOperation("获取当前用户的配置列表")
public ResponseEntity<String> save(Authentication authentication,
public ResponseMessage<String> save(Authentication authentication,
@PathVariable String key,
@Validated
@RequestBody UserSettingEntity userSettingEntity) {
@@ -59,6 +58,6 @@ public class UserSettingController {
userSettingEntity.setId(old.getId());
}
String id = userSettingService.saveOrUpdate(userSettingEntity);
return ResponseEntity.ok(id);
return ResponseMessage.ok(id);
}
}