commit

src/main/java/com/example/afrishop_v3/controllers/AuthController.java

@@ -135,6 +135,9 @@ public class AuthController extends Controller {
 
 			signUpRequest.setPassword(encoder.encode(password));
 
+			signUpRequest.setLastLoginTime(new Date());
+
+
 			fixCode(signUpRequest);
 
 			TbCfUserInfo userInfo = userRepository.save(signUpRequest);

src/main/java/com/example/afrishop_v3/controllers/TbCfHomePageEntityController.java

@@ -12,6 +12,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 @RestController
 public class TbCfHomePageEntityController extends Controller {
@@ -81,7 +82,7 @@ public class TbCfHomePageEntityController extends Controller {
     @GetMapping("/home/clientWithFcm")
     public Result getClientList( @RequestParam(value = "pageNo",required = false,defaultValue = "20") Integer pageNo, @RequestParam(value = "pageSize",required = false,defaultValue = "20") Integer pageSize){
         List<TbCfUserInfo> allByFcmIsNotNull = userRepository.findAllByFcmIsNotNull(PageRequest.of(pageNo, pageSize));
-        return new Result<>(allByFcmIsNotNull);
+        return new Result<>(allByFcmIsNotNull.stream().map(TbCfUserInfo::smallMap).collect(Collectors.toList()));
     }
 
     @GetMapping("/home/sendNotification/byCode/{code}")

src/main/java/com/example/afrishop_v3/models/TbCfUserInfo.java

@@ -10,9 +10,7 @@ import org.hibernate.annotations.NotFoundAction;
 
 import javax.persistence.*;
 import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
+import java.util.*;
 
 /**
  * 用户表实体
@@ -227,6 +225,19 @@ public class TbCfUserInfo {
         this.slogan = slogan;
     }
 
+    @JsonIgnore
+    public Map<String,Object> smallMap(){
+        Map<String,Object> map = new LinkedHashMap<>();
+        map.put("username",display());
+        map.put("userId",getUserId());
+        map.put("avatar",getAvatar());
+        map.put("code",getCode());
+        map.put("phone",getPhone());
+        map.put("email",getEmail());
+        map.put("bio",getSlogan());
+        return map;
+    }
+
 
     public void setFcm(String fcm) {
         this.fcm = fcm;