1.添加返回结果包装实体类；

2.修改项目接口返回包装结果。

pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>cn.minbb</groupId>
-    <artifactId>edu</artifactId>
+    <artifactId>EDUServer</artifactId>
     <version>0.0.1-SNAPSHOT</version>
     <packaging>war</packaging>
 

src/main/java/cn/minbb/edu/EduApplication.java → src/main/java/cn/minbb/edu/EDUApplication.java

@@ -1,19 +1,22 @@
 package cn.minbb.edu;
 
+import org.springframework.boot.Banner;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
 
 @SpringBootApplication
-public class EduApplication extends SpringBootServletInitializer {
+public class EDUApplication extends SpringBootServletInitializer {
 
     public static void main(String[] args) {
-        SpringApplication.run(EduApplication.class, args);
+        SpringApplication application = new SpringApplication(EDUApplication.class);
+        application.setBannerMode(Banner.Mode.CONSOLE);
+        application.run(args);
     }
 
     @Override
     protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) {
-        return builder.sources(EduApplication.class);
+        return builder.sources(EDUApplication.class);
     }
 }

src/main/java/cn/minbb/edu/controller/MainController.java

@@ -1,15 +0,0 @@
-package cn.minbb.edu.controller;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-@RequestMapping(value = "")
-public class MainController {
-
-    @RequestMapping(value = "/", method = RequestMethod.GET)
-    public String main() {
-        return "EDUServer";
-    }
-}

src/main/java/cn/minbb/edu/controller/UserController.java → src/main/java/cn/minbb/edu/controller/rest/UserController.java

@@ -1,5 +1,6 @@
-package cn.minbb.edu.controller;
+package cn.minbb.edu.controller.rest;
 
+import cn.minbb.edu.data.ResponseResult;
 import cn.minbb.edu.model.User;
 import cn.minbb.edu.service.UserService;
 import com.alibaba.fastjson.JSONObject;
@@ -7,50 +8,51 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.HashMap;
-import java.util.Map;
 
 @RestController
-@RequestMapping(value = "/user")
+@RequestMapping(value = "user")
 public class UserController {
 
-    private final UserService userService;
+    private UserService userService;
 
     @Autowired
     public UserController(UserService userService) {
         this.userService = userService;
     }
 
-    @RequestMapping(value = "/login", method = RequestMethod.POST)
-    public String login(
+    @PostMapping(value = "login")
+    public ResponseResult<User> login(
             @RequestParam(value = "username") String username,
             @RequestParam(value = "password") String password,
             HttpServletRequest request) {
-        Map<String, Object> result = new HashMap<>();
+        ResponseResult<User> result = new ResponseResult<>();
         User user = userService.findUserByUsername(username);
         if (user == null) {
             // 用户不存在
-            result.put("result", 404);
-            result.put("summary", "用户不存在");
+            result.setCode(0);
+            result.setStatus(false);
+            result.setMessage("用户不存在");
         } else {
             if (password.equals(user.getPassword())) {
                 // OK
-                result.put("result", 200);
-                result.put("summary", "登录成功");
-                result.put("data", user);
+                result.setCode(1);
+                result.setStatus(true);
+                result.setMessage("登录成功");
+                result.setData(user);
             } else {
                 // 密码错误
-                result.put("result", 404);
-                result.put("summary", "密码错误");
+                result.setCode(0);
+                result.setStatus(false);
+                result.setMessage("密码错误");
             }
         }
-        return JSONObject.toJSONString(result);
+        return result;
     }
 
-    @RequestMapping(value = "/register", method = RequestMethod.POST)
-    public String register(@RequestBody String userJSON, HttpServletRequest request) {
+    @PostMapping(value = "register")
+    public ResponseResult<User> register(@RequestBody String userJSON, HttpServletRequest request) {
+        ResponseResult<User> result = new ResponseResult<>();
         User userClient = JSONObject.parseObject(userJSON, User.class);
-        Map<String, Object> result = new HashMap<>();
         if (userClient != null) {
             String username = userClient.getUsername();
             if (userService.findUserByUsername(username) == null) {
@@ -58,24 +60,28 @@ public class UserController {
                 User user = userService.save(new User(username, userClient.getPassword()));
                 if (user != null) {
                     // 注册成功
-                    result.put("result", 200);
-                    result.put("summary", "注册成功");
-                    result.put("data", user);
+                    result.setCode(1);
+                    result.setStatus(true);
+                    result.setMessage("注册成功");
+                    result.setData(user);
                 } else {
                     // 注册失败
-                    result.put("result", 404);
-                    result.put("summary", "注册失败");
+                    result.setCode(0);
+                    result.setStatus(false);
+                    result.setMessage("注册失败");
                 }
             } else {
                 // 用户存在 - 不可以注册
-                result.put("result", 404);
-                result.put("summary", "用户已存在");
+                result.setCode(0);
+                result.setStatus(false);
+                result.setMessage("用户已存在");
             }
         } else {
             // 错误的注册请求
-            result.put("result", 404);
-            result.put("summary", "错误的注册请求");
+            result.setCode(0);
+            result.setStatus(false);
+            result.setMessage("错误的注册请求");
         }
-        return JSONObject.toJSONString(result);
+        return result;
     }
 }

src/main/java/cn/minbb/edu/controller/web/MainController.java

@@ -0,0 +1,17 @@
+package cn.minbb.edu.controller.web;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+@Controller
+@RequestMapping(value = "")
+public class MainController {
+
+    @GetMapping(value = "")
+    @ResponseBody
+    public String main() {
+        return "EDUServer Running...";
+    }
+}

src/main/java/cn/minbb/edu/data/ResponseResult.java

@@ -0,0 +1,20 @@
+package cn.minbb.edu.data;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Collection;
+
+@Data
+public class ResponseResult<T extends Serializable> implements Serializable {
+
+    private Integer code = -1;
+
+    private Boolean status = false;
+
+    private String message = "";
+
+    private T data;
+
+    private Collection<T> dataset;
+}

src/main/java/cn/minbb/edu/model/User.java

@@ -7,12 +7,13 @@ import lombok.Setter;
 
 import javax.persistence.*;
 import javax.validation.constraints.NotNull;
+import java.io.Serializable;
 
 @Entity
 @Table(name = "user")
 @NoArgsConstructor
 @AllArgsConstructor
-public class User {
+public class User implements Serializable {
 
     @Getter
     @Setter

src/main/resources/application-dev.properties

@@ -0,0 +1,5 @@
+# ¿ª·¢»·¾³
+server.servlet.context-path=/
+# MySQL
+spring.datasource.username=
+spring.datasource.password=

src/main/resources/application.properties

@@ -1,8 +1,10 @@
+# Ö¸¶¨ÔËÐл·¾³
+spring.profiles.active=pro
 server.port=80
 server.servlet.context-path=/
-spring.datasource.url=jdbc:mysql://172.24.9.99:3306/edu?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT
-spring.datasource.username=IEC
-spring.datasource.password=iec
+spring.datasource.url=jdbc:mysql://127.0.0.1:3306/edu?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT
+spring.datasource.username=
+spring.datasource.password=
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 spring.datasource.sql-script-encoding=UTF-8
 spring.jpa.show-sql=false

src/main/resources/banner.txt

@@ -0,0 +1,2 @@
+
+知学教育APP后端服务

src/main/resources/templates/index.html

@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html lang="zh-CN">
+<head>
+    <meta charset="UTF-8"/>
+    <title>Title</title>
+</head>
+<body>
+
+</body>
+</html>

src/test/java/cn/minbb/edu/EduApplicationTests.java → src/test/java/cn/minbb/edu/EDUApplicationTests.java

@@ -7,7 +7,7 @@ import org.springframework.test.context.junit4.SpringRunner;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest
-public class EduApplicationTests {
+public class EDUApplicationTests {
 
     @Test
     public void contextLoads() {