邮件

src/main/java/com/izouma/dingdong/domain/backstage/Email.java

@@ -45,6 +45,7 @@ public class Email extends BaseEntity {
     @ApiModelProperty(value = "是否已读", name = "isRead")
     private Boolean isRead;
 
+    @Builder.Default
     @Column(nullable = false)
     private Boolean enabled = true;
 

src/main/java/com/izouma/dingdong/service/UserService.java

@@ -71,13 +71,11 @@ public class UserService {
         if (user.getBlacklist()) {
             throw new BusinessException("被拉入黑名单！");
         }
-        if (RIDER.equals(identity)) {
-            boolean matches = new BCryptPasswordEncoder().matches(password, user.getPassword());
-            if (!matches) {
-                throw new BusinessException("密码不正确");
-            }
-        }
 
+        boolean matches = new BCryptPasswordEncoder().matches(password, user.getPassword());
+        if (!matches) {
+            throw new BusinessException("密码不正确");
+        }
         return user;
 
     }

src/main/java/com/izouma/dingdong/service/WithdrawApplyService.java

@@ -19,7 +19,6 @@ import org.springframework.stereotype.Service;
 
 import javax.transaction.Transactional;
 import java.math.BigDecimal;
-import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 

src/main/java/com/izouma/dingdong/web/backstage/EmailController.java

@@ -18,6 +18,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.time.LocalDateTime;
 import java.util.List;
 
 @RestController
@@ -25,7 +26,7 @@ import java.util.List;
 @AllArgsConstructor
 public class EmailController extends BaseController {
     private EmailService emailService;
-    private EmailRepo emailRepo;
+    private EmailRepo    emailRepo;
 
     //@PreAuthorize("hasRole('ADMIN')")
     @PostMapping("/save")
@@ -35,6 +36,9 @@ public class EmailController extends BaseController {
             ObjUtils.merge(orig, record);
             return emailRepo.save(orig);
         }
+        record.setEnabled(true);
+        record.setIsRead(false);
+        record.setSendTime(LocalDateTime.now());
         return emailRepo.save(record);
     }
 
@@ -42,7 +46,7 @@ public class EmailController extends BaseController {
     //@PreAuthorize("hasRole('ADMIN')")
     @GetMapping("/all")
     public Page<Email> all(PageQuery pageQuery) {
-        return emailRepo.findAll(toSpecification(pageQuery,Email.class), toPageRequest(pageQuery));
+        return emailRepo.findAll(toSpecification(pageQuery, Email.class), toPageRequest(pageQuery));
     }
 
     @GetMapping("/get/{id}")
@@ -63,7 +67,7 @@ public class EmailController extends BaseController {
     }
 
     @GetMapping("/my")
-    public List<Email> my(){
+    public List<Email> my() {
         return emailRepo.findAllByReceiveUserId(SecurityUtils.getAuthenticatedUser().getId());
     }
 }

src/test/java/com/izouma/dingdong/service/EmailServiceTest.java

@@ -1,6 +1,22 @@
 package com.izouma.dingdong.service;
 
+import com.izouma.dingdong.web.backstage.EmailController;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
 public class EmailServiceTest {
+    @Autowired
+    private EmailController controller;
+
+    @Test
+    public void test(){
+        System.out.println(controller.get(534L));
+    }
 
 
 }

src/test/java/com/izouma/dingdong/service/UserServiceTest.java

@@ -0,0 +1,20 @@
+package com.izouma.dingdong.service;
+
+import com.izouma.dingdong.enums.Identity;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
+public class UserServiceTest {
+    @Autowired
+    private UserService userService;
+
+    @Test
+    public void test(){
+        System.out.println(userService.register("18888", "123456", Identity.USER));
+    }
+}