github
/
halo
mirror of https://github.com/halo-dev/halo
1
0
Fork 0
Code Issues Releases Wiki Activity

Refactor ApiOptionController

pull/98/head
johnniang 2019-02-21 00:40:38 +08:00
parent a11eacd09d
commit 97af07b4c3
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/cc/ryanc/halo/web/controller/api/ApiOptionController.java
View File

@ -5,6 +5,7 @@ import cc.ryanc.halo.model.enums.BlogPropertiesEnum;
import cc.ryanc.halo.model.enums.ResponseStatusEnum;
import cc.ryanc.halo.service.OptionsService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.*;
import java.util.Map;
@ -55,9 +56,8 @@ public class ApiOptionController {
* @return JsonResult
*/
@GetMapping
public JsonResult options() {
final Map<String, String> options = optionsService.findAllOptions();
return new JsonResult(ResponseStatusEnum.SUCCESS.getCode(), ResponseStatusEnum.SUCCESS.getMsg(), options);
public Map<String, String> options() {
return optionsService.findAllOptions();
}
/**
@ -79,7 +79,6 @@ public class ApiOptionController {
*/
@GetMapping(value = "/one")
public JsonResult option(@RequestParam(value = "optionName") String optionName) {
final String optionValue = optionsService.findOneOption(optionName);
return new JsonResult(ResponseStatusEnum.SUCCESS.getCode(), ResponseStatusEnum.SUCCESS.getMsg(), optionValue);
return new JsonResult(HttpStatus.OK.value(), HttpStatus.OK.getReasonPhrase(), optionsService.findOneOption(optionName));
}
}