Merge branch 'dev'

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

@@ -460,9 +460,9 @@ public class AuthController extends Controller {
                 user.setUserId(userid);
 
                 fillUserNecessayInfo(user, request);
+                user.setRegister(true);
                 user = userRepository.save(user);
 
-
                 //赠送用户优惠券
                 fixCoupon(user);
             } else {

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

@@ -157,6 +157,10 @@ public class TbCfUserInfo {
     @Column(unique = true)
     private Long codeCount;
 
+    @Transient
+    private boolean register;
+
+
     @Formula(value = "(SELECT IFNULL(COUNT(c.id),0) FROM following c WHERE c.followed_info_user_id=user_id)")
     private int followers;//Count users following
 
@@ -268,7 +272,8 @@ public class TbCfUserInfo {
     }
 
     public boolean hasFcm() {
-        return !StringUtils.isBlank(fcm);
+        //firebase messaging token generated by fierbase client service
+        return !StringUtils.isBlank(fcm) && !fcm.startsWith("firebase messaging");
     }
 
     public String getFcm() {
@@ -627,6 +632,14 @@ public class TbCfUserInfo {
         return isSend;
     }
 
+    public boolean isRegister() {
+        return register;
+    }
+
+    public void setRegister(boolean register) {
+        this.register = register;
+    }
+
     @JsonIgnore
     public Collection<String> getRoles() {
         ArrayList<String> objects = new ArrayList<>();