From 19aee0a36da9b2898376410e1b22e446ae400826 Mon Sep 17 00:00:00 2001 From: adiao <1819192616@qq.com> Date: Thu, 6 Apr 2023 11:16:39 +0800 Subject: [PATCH] app fix --- .../app/api1/common/ResponseResult.java | 37 +++++++++----- .../app/demos/web/BasicController.java | 51 +++---------------- .../app/demos/web/PathVariableController.java | 1 + .../co/depsystem/app/web/UserController.java | 2 +- 4 files changed, 31 insertions(+), 60 deletions(-) diff --git a/app-api/src/main/java/co/depsystem/app/api1/common/ResponseResult.java b/app-api/src/main/java/co/depsystem/app/api1/common/ResponseResult.java index e064674..edd12c9 100644 --- a/app-api/src/main/java/co/depsystem/app/api1/common/ResponseResult.java +++ b/app-api/src/main/java/co/depsystem/app/api1/common/ResponseResult.java @@ -39,16 +39,24 @@ public class ResponseResult implements Serializable { @Setter private T data; + @Getter + @Setter + private String token; + public static ResponseResult ok(int code, String msg) { - return restResult(null, HttpEnum.OK_200.code(), HttpEnum.OK_200.desc()); + return restResult(null, HttpEnum.OK_200.code(), HttpEnum.OK_200.desc(),null); } public static ResponseResult ok(T data) { - return restResult(data, HttpEnum.OK_200.code(), HttpEnum.OK_200.desc()); + return restResult(data, HttpEnum.OK_200.code(), HttpEnum.OK_200.desc(),null); } public static ResponseResult ok(T data, String msg) { - return restResult(data, HttpEnum.OK_200.code(), msg); + return restResult(data, HttpEnum.OK_200.code(), msg,null); + } + + public static ResponseResult ok(int code,String msg, String token,T data){ + return restResult(data,HttpEnum.OK_200.code(),msg,token); } /** @@ -58,24 +66,24 @@ public class ResponseResult implements Serializable { */ public static ResponseResult failed() { return restResult(null, HttpEnum.ERROR_500.code(), - HttpEnum.ERROR_500.desc()); + HttpEnum.ERROR_500.desc(),null); } public static ResponseResult failed(String msg) { - return restResult(null, HttpEnum.ERROR_500.code(), msg); + return restResult(null, HttpEnum.ERROR_500.code(), msg,null); } public static ResponseResult failed(int code, String msg) { - return restResult(null, code, msg); + return restResult(null, code, msg,null); } public static ResponseResult failed(T data) { return restResult(data, HttpEnum.ERROR_500.code(), - HttpEnum.ERROR_500.desc()); + HttpEnum.ERROR_500.desc(),null); } public static ResponseResult failed(T data, String msg) { - return restResult(data, HttpEnum.ERROR_500.code(), msg); + return restResult(data, HttpEnum.ERROR_500.code(), msg,null); } /** @@ -85,23 +93,23 @@ public class ResponseResult implements Serializable { * @param // 泛型 */ public static ResponseResult notplay(T data){ - return restResult(data,HttpEnum.ERROR_700.code(),HttpEnum.ERROR_700.desc()); + return restResult(data,HttpEnum.ERROR_700.code(),HttpEnum.ERROR_700.desc(),null); } public static ResponseResult notplay(T data, String msg){ - return restResult(data,HttpEnum.ERROR_700.code(), msg); + return restResult(data,HttpEnum.ERROR_700.code(), msg,null); } public static ResponseResult notplay(int code,String msg){ - return restResult(null,code,msg); + return restResult(null,code,msg,null); } public static ResponseResult notplay(String msg){ - return restResult(null,HttpEnum.ERROR_700.code(), msg); + return restResult(null,HttpEnum.ERROR_700.code(), msg,null); } public static ResponseResult notplay(){ - return restResult(null, HttpEnum.ERROR_700.code(), HttpEnum.ERROR_700.desc()); + return restResult(null, HttpEnum.ERROR_700.code(), HttpEnum.ERROR_700.desc(),null); } /** @@ -113,11 +121,12 @@ public class ResponseResult implements Serializable { * @param // 泛型 */ private static ResponseResult restResult(T data, int code, - String msg) { + String msg,String token) { ResponseResult apiResult = new ResponseResult<>(); apiResult.setCode(code); apiResult.setData(data); apiResult.setMsg(msg); + apiResult.setToken(token); return apiResult; } } diff --git a/app-web/src/main/java/co/depsystem/app/demos/web/BasicController.java b/app-web/src/main/java/co/depsystem/app/demos/web/BasicController.java index b8d0d1d..e56ebbf 100644 --- a/app-web/src/main/java/co/depsystem/app/demos/web/BasicController.java +++ b/app-web/src/main/java/co/depsystem/app/demos/web/BasicController.java @@ -32,6 +32,7 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; /** 基本控制器 + * 用作于获取数据和映射模块路径 * @author theonefx */ @RestController @@ -51,7 +52,7 @@ public class BasicController { /** - * index view + * 首页视图 */ @GetMapping(value = "index") public String index(){ @@ -59,7 +60,7 @@ public class BasicController { } /** - * login view + * 登录视图 */ @PostMapping("login") @ResponseBody @@ -73,7 +74,7 @@ public class BasicController { } /** - * register view + * 注册视图 */ @PostMapping("register") @ResponseBody @@ -87,7 +88,7 @@ public class BasicController { } /** - * 返回code image。 + * 返回验证码图片 */ @GetMapping("captcha") public ResponseEntity getCaptcha(HttpServletResponse response) throws IOException { @@ -101,47 +102,7 @@ public class BasicController { return new ResponseEntity<>(bytes, headers, HttpStatus.OK); } - - /** - * ... - */ - @RequestMapping("hello") - @ResponseBody - public String hello(@RequestParam(name = "name", defaultValue = "unknown user") String name) { - return "Hello " + name; - } - - /** - * ... - */ - @RequestMapping("user") - @ResponseBody - public User user() { - User user = new User(); - user.setName("theonefx"); - return user; - } - /** - * ... + * */ - @RequestMapping("save_user") - @ResponseBody - public String saveUser(User u) { - return "user will save: name=" + u.getName(); - } - - /** - * ... - * @RequestMapping("/index") - * public String html(){ - * return "/static/index.html"; - * } - */ - - @ModelAttribute - public void parseUser(@RequestParam(name = "name", defaultValue = "unknown user") String name - , @RequestParam(name = "age", defaultValue = "12") Integer age, User user) { - user.setName("zhangsan"); - } } diff --git a/app-web/src/main/java/co/depsystem/app/demos/web/PathVariableController.java b/app-web/src/main/java/co/depsystem/app/demos/web/PathVariableController.java index 92b5d32..5472c08 100644 --- a/app-web/src/main/java/co/depsystem/app/demos/web/PathVariableController.java +++ b/app-web/src/main/java/co/depsystem/app/demos/web/PathVariableController.java @@ -23,6 +23,7 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.ResponseBody; /** 路径变量控制器 + * 用作于CRUD操作 * @author theonefx */ @Controller diff --git a/app-web/src/main/java/co/depsystem/app/web/UserController.java b/app-web/src/main/java/co/depsystem/app/web/UserController.java index 6633318..6367014 100644 --- a/app-web/src/main/java/co/depsystem/app/web/UserController.java +++ b/app-web/src/main/java/co/depsystem/app/web/UserController.java @@ -12,7 +12,7 @@ import co.depsystem.app.api1.model.UserModel; import javax.annotation.Resource; /** 用户权限管理器 - * 这个控制器是用来管理 + * 这个控制器是用来管理权限的 * @author theonefx */ @Component