merge

boot-web/src/main/java/com/xwbing/controller/SysConfigControl.java

@@ -49,8 +49,8 @@ public class SysConfigControl {
 
     @ApiOperation(value = "删除", notes = "根据code删除系统配置信息")
     @ApiImplicitParam(name = "code", value = "配置项的code", paramType = "query", required = true, dataType = "string")
-    @GetMapping("removeByCode/{code}")
-    public JSONObject removeByCode(@PathVariable String code) {
+    @GetMapping("removeByCode")
+    public JSONObject removeByCode(@RequestParam String code) {
         String logMsg = "删除系统配置信息";
         logger.info(logMsg + " code:{}", code);
         if (StringUtils.isEmpty(code)) {
@@ -67,7 +67,7 @@ public class SysConfigControl {
             @ApiImplicitParam(name = "enable", value = "是否启用，格式为Y|N", paramType = "query", required = true, dataType = "string"),
     })
     @PostMapping("update")
-    public JSONObject update(@RequestBody SysConfig sysConfig) {
+    public JSONObject update(SysConfig sysConfig) {
         String logMsg = "修改系统配置信息";
         logger.info(logMsg);
         if (StringUtils.isEmpty(sysConfig.getCode()))

boot-web/src/main/java/com/xwbing/controller/SysUserControl.java

@@ -8,6 +8,8 @@ import com.xwbing.service.SysUserService;
 import com.xwbing.util.JSONObjResult;
 import com.xwbing.util.RestMessage;
 import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -28,6 +30,7 @@ public class SysUserControl {
     private SysUserService sysUserService;
     @Resource
     private SysUserLoginInOutService loginInOutService;
+    private final Logger logger = LoggerFactory.getLogger(SysUserControl.class);
 
     @LogInfo("添加用户")
     @PostMapping("save")

boot-web/src/main/java/com/xwbing/handler/GlobalExceptionHandler.java

@@ -33,7 +33,6 @@ public class GlobalExceptionHandler {
     /**
      * 自定义业务异常
      *
-     * @param request
      * @param ex
      * @return
      */
@@ -42,7 +41,7 @@ public class GlobalExceptionHandler {
     // 返回给页面200状态码
     @ResponseStatus(value = HttpStatus.OK)
     @ResponseBody
-    public JSONObject handlerGuideException(HttpServletRequest request, Exception ex) {
+    public JSONObject handlerGuideException(Exception ex) {
         logger.error(ex.getMessage());
         return JSONObjResult.toJSONObj(ex.getMessage());
     }