Update >> 修复登录唯一性 执行update操作 增加问题更新功能

wang-qa · wang-qa · commit a3586c22f180 · 2020-05-13T16:42:20.000+08:00
diff --git a/README.md b/README.md
@@ -48,7 +48,10 @@
 > 9. 使用 `developer tools` 添加配置 `spring.devtools.restart.exclude=static/**,public/**` 完成自动部署（热更新）
 > 10. 添加分页功能
 > 11. 添加拦截器 `WebConfig`
-> 12. 完善问题详情页
+> 12. 完善问题详情页 & 修复登录持久化每次插入不更新用户信息 增加问题更新功能
+
+
+> > 排查问题先检查`debug` 信息中的 `Caused by`
 
 ```markdown
 *Flyway Migration*
diff --git a/src/main/java/life/majiang/community/controller/AuthorizeController.java b/src/main/java/life/majiang/community/controller/AuthorizeController.java
@@ -6,16 +6,17 @@
 
 import life.majiang.community.dto.AccessTokenDTO;
 import life.majiang.community.dto.GithubUser;
-import life.majiang.community.mapper.UserMapper;
 import life.majiang.community.model.User;
 import life.majiang.community.provider.GithubProvider;
+import life.majiang.community.service.UserServices;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
 import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.UUID;
 
@@ -34,8 +35,8 @@ public class AuthorizeController {
     @Value("${github.client.uri}")
     private String clientUri;
 
-    @Autowired // 把 Usermapper 对象放入容器内
-    private UserMapper userMapper;
+    @Autowired // 替换userMapper
+    private UserServices userServices;
 
     @GetMapping("/callback") // 登录成功后返回到登录页
     // 接收返回后的参数 code, state
@@ -63,12 +64,9 @@ public String callback(@RequestParam(name = "code") String code,
             user.setToken(token); // 生成唯一的标识码
             user.setName(githubUser.getName()); // set 用户名
             user.setAccountID(String.valueOf(githubUser.getId())); // set 用户第三方id
-            user.setGmtCreate(System.currentTimeMillis()); // set 创建时间
-            user.setGmtModified(user.getGmtCreate()); // set 更新时间
             user.setAvatarUrl(githubUser.getAvatar_url()); // set 用户头像
-            System.out.println("--->>> usermapper >>>--- " + userMapper);
             System.out.println("--->>> insertuser >>>--- " + user);
-            userMapper.insert(user); // 执行SQL
+            userServices.createOrUpdate(user); //  执行SQL 插入或更新user
             /** Cookie 写入 */
             // 自动写入  服务器生成 Token 放入 Cookie
             response.addCookie(new Cookie("token", token));
@@ -80,5 +78,16 @@ public String callback(@RequestParam(name = "code") String code,
             return "redirect:/";
         }
     }
+
+    @GetMapping("logout")
+    public String logout(HttpServletRequest request,
+                         HttpServletResponse response) {
+        request.getSession().removeAttribute("user"); // 移除session
+        Cookie cookie = new Cookie("token", null); // 移除token 重新赋值为null
+        cookie.setMaxAge(0);
+        response.addCookie(cookie);
+        return "redirect:/";
+    }
+
 }
 
diff --git a/src/main/java/life/majiang/community/controller/IndexController.java b/src/main/java/life/majiang/community/controller/IndexController.java
@@ -37,22 +37,8 @@ public String index(HttpServletRequest request,
                         @RequestParam(name = "page", defaultValue = "1") Integer page, // 默认第1页
                         @RequestParam(name = "size", defaultValue = "5") Integer size // 默认5页 每页条数
     ) {
-        // 用户 cookies 由拦截器SessionInterceptor执行
-//        Cookie[] cookies = request.getCookies(); // 获取用户 cookie
-//        if (cookies != null && cookies.length != 0) {// 判断是用户 Cookie 是否为空 长度不为0
-//            for (Cookie cookie : cookies) {
-//                if (cookie.getName().equals("token")) { // 检查 cookies_key是否为 token
-//                    String token = cookie.getValue();
-//                    User user = userMapper.findByToken(token);
-//                    // 如果user != null 写入session
-//                    if (user != null) {
-//                        System.out.println(user.toString());
-//                        request.getSession().setAttribute("user", user);
-//                    }
-//                    break; // 命中后结束循环
-//                }
-//            }
-//        }
+        // 用户 cookies 由拦截器SessionInterceptor执行  >> 移动到 SessionController
+
         // 获取 question_list
 //        List<Question> questionList = questionMapper.list(); // question表不能返回用户头像
         PaginationDTO pagination = questionService.list(page, size);
diff --git a/src/main/java/life/majiang/community/controller/ProfileController.java b/src/main/java/life/majiang/community/controller/ProfileController.java
@@ -27,22 +27,8 @@ public String profile(HttpServletRequest request,
                           @RequestParam(name = "page", defaultValue = "1") Integer page, // 默认第1页
                           @RequestParam(name = "size", defaultValue = "5") Integer size, // 默认5页 每页条数
                           Model model) {
-//        User user = null;
-//        Cookie[] cookies = request.getCookies(); // 获取用户 cookie
-//        if (cookies != null && cookies.length != 0) {// 判断是用户 Cookie 是否为空 长度不为0
-//            for (Cookie cookie : cookies) {
-//                if (cookie.getName().equals("token")) { // 检查 cookies_key是否为 token
-//                    String token = cookie.getValue();
-//                    user = userMapper.findByToken(token);
-//                    // 如果user != null 写入session
-//                    if (user != null) {
-//                        System.out.println(user.toString());
-//                        request.getSession().setAttribute("user", user);
-//                    }
-//                    break; // 命中后结束循环
-//                }
-//            }
-//        }
+        // 检测登录状态 移动到 SessionController
+
         // 获取User
         User user = (User) request.getSession().getAttribute("user");
         if (user == null) { // 如果未登录跳转到 首页
diff --git a/src/main/java/life/majiang/community/controller/PublishController.java b/src/main/java/life/majiang/community/controller/PublishController.java
@@ -1,12 +1,14 @@
 package life.majiang.community.controller;
 
-import life.majiang.community.mapper.QuestionMapper;
+import life.majiang.community.dto.QuestionDTO;
 import life.majiang.community.model.Question;
 import life.majiang.community.model.User;
+import life.majiang.community.service.QuestionService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
@@ -15,11 +17,20 @@
 @Controller
 public class PublishController {
 
-    @Autowired // 注入 questionMapper
-    private QuestionMapper questionMapper;
+    @Autowired
+    private QuestionService questionService;
 
-//    @Autowired // 注入 userMapper
-//    private UserMapper userMapper;
+    @GetMapping("publish/{id}") // 编辑问题
+    public String edit(@PathVariable(name = "id") Integer id,
+                       Model model) {
+        QuestionDTO question = questionService.getById(id);
+        // 回显到页面
+        model.addAttribute("title", question.getTitle());
+        model.addAttribute("description", question.getDescription());
+        model.addAttribute("tag", question.getTag());
+        model.addAttribute("id", question.getId());
+        return "publish";
+    }
 
     // get 去渲染页面
     @GetMapping("/publish")
@@ -34,28 +45,15 @@ public String doQuestion(
             @RequestParam("title") String title,
             @RequestParam("description") String description,
             @RequestParam("tag") String tag,
+            @RequestParam(value = "id", required = false) Integer id,
             HttpServletRequest request,
             Model model
     ) {
 
         /**
          * publish_page 获取填写者信息 判断是否登录
+         * 移动到 SessionController
          * */
-//        User user = null;
-//        Cookie[] cookies = request.getCookies();
-//        if (cookies != null && cookies.length != 0) {// 判断是用户 Cookie 是否为空 长度不为0 去除空指针
-//            for (Cookie cookie : cookies) {
-//                if (cookie.getName().equals("token")) { // 检查 cookies_key是否为 token
-//                    String token = cookie.getValue();
-//                    user = userMapper.findByToken(token);
-//                    // 如果user != null 写入session
-//                    if (user != null) {
-//                        request.getSession().setAttribute("user", user);
-//                    }
-//                    break; // 命中后结束循环
-//                }
-//            }
-//        }
 
         // 获取User
         User user = (User) request.getSession().getAttribute("user");
@@ -94,9 +92,8 @@ public String doQuestion(
         question.setDescription(description);// set 内容
         question.setTag(tag);// set 标签
         question.setCreator(user.getId());// set 提问者id
-        question.setGmtCreate(System.currentTimeMillis()); // set 创建时间
-        question.setGmtModified(System.currentTimeMillis()); // set 更新时间
-        questionMapper.create(question); // 执行SQL
+        question.setId(id); // set 问题id
+        questionService.createOrUpdate(question); // 执行SQL 插入或更新question
         return "redirect:/"; // 成功返回 首页
     }
 }
diff --git a/src/main/java/life/majiang/community/controller/QuestionController.java b/src/main/java/life/majiang/community/controller/QuestionController.java
@@ -20,6 +20,6 @@ public String question(@PathVariable(name = "id") Integer id,
         QuestionDTO questionDTO = questionService.getById(id); // 获取用户id
         model.addAttribute("question", questionDTO); // 传递到页面
 
-        return "question";
+        return "question"; // question中的user
     }
 }
diff --git a/src/main/java/life/majiang/community/interceptor/SessionInterceptor.java b/src/main/java/life/majiang/community/interceptor/SessionInterceptor.java
@@ -40,7 +40,7 @@ public boolean preHandle(HttpServletRequest request, HttpServletResponse respons
                 }
             }
         }
-        return true; // 返回 true 继续执行
+        return true; // 返回 true 继续执行 & session中的user
     }
 
     @Override
diff --git a/src/main/java/life/majiang/community/mapper/QuestionMapper.java b/src/main/java/life/majiang/community/mapper/QuestionMapper.java
@@ -1,10 +1,7 @@
 package life.majiang.community.mapper;
 
 import life.majiang.community.model.Question;
-import org.apache.ibatis.annotations.Insert;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.*;
 
 import java.util.List;
 
@@ -30,4 +27,6 @@ public interface QuestionMapper {
     @Select("select * from question where id = #{id}")
     Question getById(@Param("id") Integer id);
 
+    @Update("update question set title = #{title}, description = #{description}, gmt_modified = #{gmtModified}, tag = #{id} where id = #{id}")
+    void update(Question question); // 更新问题
 }
diff --git a/src/main/java/life/majiang/community/mapper/UserMapper.java b/src/main/java/life/majiang/community/mapper/UserMapper.java
@@ -1,10 +1,7 @@
 package life.majiang.community.mapper;
 
 import life.majiang.community.model.User;
-import org.apache.ibatis.annotations.Insert;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.*;
 
 /*
  * 引入数据库
@@ -21,4 +18,10 @@ public interface UserMapper {
     @Select("select * from USER where id = #{id}")
     User findByID(@Param("id") Integer id);
 
+    @Select("select * from USER where account_id = #{accountID}")
+    User findByAccountId(@Param("accountID") String accountID); // 根据accountID查询用户
+
+    @Update("update user set name = #{name}, token = ${token} gmt_modified = #{gmt_Modified}, avatar_url = #{avatarUrl}) where id = #{id v}")
+    void update(User user); // 更新用户信息
+
 }
diff --git a/src/main/java/life/majiang/community/service/QuestionService.java b/src/main/java/life/majiang/community/service/QuestionService.java
@@ -127,4 +127,18 @@ public QuestionDTO getById(Integer id) {
         questionDTO.setUser(user); // 添加返回 user属性
         return questionDTO;
     }
+
+    public void createOrUpdate(Question question) {
+        if (question.getId() == null) {
+            // 插入操作 未找到
+            question.setGmtCreate(System.currentTimeMillis()); // set 创建时间
+            question.setGmtModified(System.currentTimeMillis()); // set 更新时间
+            questionMapper.create(question);
+        } else {
+            // 更新操作 找到
+            question.setGmtModified(System.currentTimeMillis()); // set 更新时间
+            questionMapper.update(question);
+
+        }
+    }
 }
diff --git a/src/main/java/life/majiang/community/service/UserServices.java b/src/main/java/life/majiang/community/service/UserServices.java
@@ -0,0 +1,30 @@
+package life.majiang.community.service;
+
+import life.majiang.community.mapper.UserMapper;
+import life.majiang.community.model.User;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class UserServices {
+    @Autowired
+    private UserMapper userMapper;
+
+    public void createOrUpdate(User user) {
+        User dbuser = userMapper.findByAccountId(user.getAccountID()); // userMapper查找AccountID并返回user对象
+        if (dbuser == null) {
+            // 未找到 插入操作
+            user.setGmtCreate(System.currentTimeMillis()); // set 创建时间
+            user.setGmtModified(user.getGmtCreate()); // set 更新时间
+            userMapper.insert(user);
+        } else {
+            // 找到 更新操作
+            dbuser.setGmtModified(user.getGmtCreate()); // set 更新时间
+            dbuser.setName(user.getName()); // set 用户名
+            dbuser.setAvatarUrl(user.getAvatarUrl()); // set 用户头像
+            dbuser.setToken(user.getToken()); // set 用户token
+            userMapper.update(dbuser);
+
+        }
+    }
+}
diff --git a/src/main/resources/templates/navigation.html b/src/main/resources/templates/navigation.html
@@ -43,7 +43,8 @@
                             <li><a href="/profile/questions">我的问题</a></li>
                             <li><a href="#">消息中心</a></li>
                             <li><a href="#">个人资料</a></li>
-                            <li><a href="#">退出登录</a></li>
+                            <hr text="我是分割线">
+                            <li><a href="/logout">退出登录</a></li>
                         </ul>
                     </li>
                     <li th:if="${session.user == null}">
diff --git a/src/main/resources/templates/publish.html b/src/main/resources/templates/publish.html
@@ -4,11 +4,11 @@
 <head>
     <title>发布提问 - 麻酱社区</title>
     <meta charset="UTF-8" http-equiv="Content-Type"/>
-    <link href="css/bootstrap.min.css" rel="stylesheet">
-    <link href="css/bootstrap-theme.min.css" rel="stylesheet">
-    <link href="css/community.css" rel="stylesheet">
-    <script src="js/jquery-3.5.0.min.js"></script>
-    <script src="js/bootstrap.min.js" type="application/javascript"></script>
+    <link href="/css/bootstrap.min.css" rel="stylesheet">
+    <link href="/css/bootstrap-theme.min.css" rel="stylesheet">
+    <link href="/css/community.css" rel="stylesheet">
+    <script src="/js/jquery-3.5.0.min.js"></script>
+    <script src="/js/bootstrap.min.js" type="application/javascript"></script>
 
 </head>
 <!--引入表头-->
@@ -19,6 +19,7 @@
             <h2><span aria-hidden="true" class="glyphicon glyphicon-plus"></span>发起</h2>
             <hr text="我是分割线">
             <form action="/publish" method="post">
+                <input name="id" th:value="${id}" type="hidden">
                 <div class="form-group">
                     <label for="title">问题标题 (简明扼要):</label>
                     <input class="form-control" id="title" name="title" placeholder="问题标题" th:value="${title}"
diff --git a/src/main/resources/templates/question.html b/src/main/resources/templates/question.html
@@ -28,7 +28,8 @@ <h4><span th:text="${question.title}">问题标题</span></h4>
             <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12" th:text="${question.description}">问题描述</div>
             <hr class="col-lg-12 col-md-12 col-sm-12 col-xs-12" test="我是分割线">
             <a class="community-menu" th:href="@{'/publish/'+${question.id}}">
-                <span aria-hidden="true" class="glyphicon glyphicon-pencil"></span>
+                <span aria-hidden="true" class="glyphicon glyphicon-pencil"
+                      th:if="${session.user != null && session.user.id == question.creator}"></span>
                 编辑
             </a>
         </div>

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,6 @@ public String question(@PathVariable(name = "id") Integer id,`
`20`	`20`	`QuestionDTO questionDTO = questionService.getById(id); // 获取用户id`
`21`	`21`	`model.addAttribute("question", questionDTO); // 传递到页面`
`22`	`22`
`23`		`- return "question";`
	`23`	`+ return "question"; // question中的user`
`24`	`24`	`}`
`25`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ public boolean preHandle(HttpServletRequest request, HttpServletResponse respons`
`40`	`40`	`}`
`41`	`41`	`}`
`42`	`42`	`}`
`43`		`- return true; // 返回 true 继续执行`
	`43`	`+ return true; // 返回 true 继续执行 & session中的user`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`@Override`