Merge remote-tracking branch 'origin/master'

backend/src/main/java/io/metersphere/track/service/TestCaseCommentService.java

@@ -47,7 +47,7 @@ public class TestCaseCommentService {
         testCaseWithBLOBs = testCaseMapper.selectByPrimaryKey(request.getCaseId());
         SaveTestCaseReviewRequest caseReviewRequest = new SaveTestCaseReviewRequest();
         List<String> userIds = new ArrayList<>();
-        userIds.add(testCaseComment.getAuthor());
+        userIds.add(testCaseWithBLOBs.getMaintainer());
         mailService.sendHtml(userIds, "comment", caseReviewRequest, request, testCaseWithBLOBs);
 
     }

frontend/src/business/components/common/router/router.js

@@ -26,6 +26,9 @@ const router = new VueRouter({
 });
 
 router.beforeEach((to, from, next) => {
+
+  redirectLoginPath(to.fullPath);
+
   //解决localStorage清空，cookie没失效导致的卡死问题
   if (!localStorage.getItem('Admin-Token')) {
     axios.get("/signout");
@@ -38,4 +41,17 @@ router.beforeEach((to, from, next) => {
   }
 });
 
+// 登入后跳转至原路径
+function redirectLoginPath(originPath) {
+  let redirectUrl = sessionStorage.getItem('redirectUrl');
+  let loginSuccess = sessionStorage.getItem('loginSuccess');
+  sessionStorage.setItem('redirectUrl', originPath);
+  if (redirectUrl && loginSuccess) {
+    sessionStorage.removeItem('loginSuccess');
+    router.push(redirectUrl);
+  }
+  sessionStorage.removeItem('loginSuccess');
+}
+
+
 export default router

frontend/src/login/Login.vue

@@ -143,12 +143,14 @@
       normalLogin() {
         this.result = this.$post("signin", this.form, response => {
           saveLocalStorage(response);
+          sessionStorage.setItem('loginSuccess', 'true');
           this.getLanguage(response.data.language);
         });
       },
       ldapLogin() {
         this.result = this.$post("ldap/signin", this.form, response => {
           saveLocalStorage(response);
+          sessionStorage.setItem('loginSuccess', 'true');
           this.getLanguage(response.data.language);
         });
       },