更新

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

@@ -135,18 +135,18 @@ public class AuthController extends Controller {
 
     @GetMapping("/verifyCode/{account}/{code}")
     public Result<Boolean> validateCode(@PathVariable("account") String account,
-                                        @PathVariable("code") String code){
+                                        @PathVariable("code") String code) {
         Optional<TbCfUserInfo> userInfoOptional = userRepository.findFirstByAccount(account);
-        if( !userInfoOptional.isPresent() )
-            return new Result<>(ResultCodeEnum.VALIDATE_ERROR.getCode(),"Account not found");
+        if (!userInfoOptional.isPresent())
+            return new Result<>(ResultCodeEnum.VALIDATE_ERROR.getCode(), "Account not found");
 
         TbCfUserInfo userInfo = userInfoOptional.get();
 
-        if( code.equals(userInfo.getVerificationCode()) ){
-            return new Result<>(true,"Verification code is right !!!");
+        if (code.equals(userInfo.getVerificationCode())) {
+            return new Result<>(true, "Verification code is right !!!");
         }
 
-        return new Result<>(false,ResultCodeEnum.VALIDATE_ERROR.getCode(),"Verification code is wrong !!!");
+        return new Result<>(false, ResultCodeEnum.VALIDATE_ERROR.getCode(), "Verification code is wrong !!!");
     }
 
     @PostMapping("/signup")
@@ -347,7 +347,7 @@ public class AuthController extends Controller {
             if (!optional.isPresent() && user.getPhone() != null && !user.getPhone().isEmpty() && userRepository.existsByAccount(user.getPhone().replace("+", ""))) {
                 optional = userRepository.findFirstByAccount(user.getPhone().replace("+", ""));
             }
-            logger.info("user is exist:"+optional.isPresent());
+            logger.info("user is exist:" + optional.isPresent());
             if (!optional.isPresent()) {
 
 
@@ -416,7 +416,7 @@ public class AuthController extends Controller {
                 user.setAccount(user.getEmail() != null ? user.getEmail() : user.getPhone());
             }
 
-            if( user.getNick() == null ){
+            if (user.getNick() == null) {
                 user.setNick(user.getEmail() != null ? user.getEmail() : user.getPhone());
             }
 
@@ -459,7 +459,7 @@ public class AuthController extends Controller {
             c.add(Calendar.DATE, 7);
             Date endDate = c.getTime();
             for (TbCfCoupon tbCfCoupon : couponVailList) {
-                logger.info("coupon:"+tbCfCoupon.getCouponTitle());
+                logger.info("coupon:" + tbCfCoupon.getCouponTitle());
                 TbCfToicoupon toi = new TbCfToicoupon();
                 //把上面获取到的值，赋值到实体类中
                 toi.setToitableId(IdUtil.createIdbyUUID());
@@ -528,7 +528,6 @@ public class AuthController extends Controller {
 
     private void fillUserNecessayInfo(TbCfUserInfo tbCfUserInfoVo) {
         if (tbCfUserInfoVo.getAvatar() == null) tbCfUserInfoVo.setAvatar(domainProperties.getProperty("user.avatar"));
-        tbCfUserInfoVo.setNick(tbCfUserInfoVo.getAccount());
         tbCfUserInfoVo.setUserNo(IdUtil.createIdByDate());
         tbCfUserInfoVo.setPhoneFlag(StateConstant.INVALID);
         tbCfUserInfoVo.setLoginCount(0);
@@ -541,9 +540,11 @@ public class AuthController extends Controller {
             tbCfUserInfoVo.setUserType(UserTypeEnum.UN_KNOW.getCode());
         tbCfUserInfoVo.setEmailFlag(StateConstant.INVALID);
 
-        if( tbCfUserInfoVo.getNick() == null ){
-            tbCfUserInfoVo.setNick(tbCfUserInfoVo.getEmail() == null ? tbCfUserInfoVo.getEmail() : tbCfUserInfoVo.getPhone());
+        if (tbCfUserInfoVo.getNick() == null) {
+            tbCfUserInfoVo.setNick(tbCfUserInfoVo.getEmail() != null ? tbCfUserInfoVo.getEmail() : tbCfUserInfoVo.getPhone() != null ? tbCfUserInfoVo.getPhone() : tbCfUserInfoVo.getAccount());
         }
+        logger.info("user===" + tbCfUserInfoVo);
+
     }
 
     @PostMapping("/resetPassword/{account}")
@@ -568,8 +569,8 @@ public class AuthController extends Controller {
 
         String validatePassword = validatePassword(password);
 
-        if( validatePassword != null ){
-            return new Result(ResultCodeEnum.VALIDATE_ERROR.getCode(),validatePassword);
+        if (validatePassword != null) {
+            return new Result(ResultCodeEnum.VALIDATE_ERROR.getCode(), validatePassword);
         }
 
         TbCfUserInfo user = firstByAccount.get();
@@ -578,17 +579,17 @@ public class AuthController extends Controller {
             user.setPassword(encoder.encode(password));
             userRepository.save(user);
             return new Result("Password reset successfully !");
-        }else {
-            return new Result(ResultCodeEnum.VALIDATE_ERROR.getCode(),"Verification code don't match !");
+        } else {
+            return new Result(ResultCodeEnum.VALIDATE_ERROR.getCode(), "Verification code don't match !");
         }
 
     }
 
     @GetMapping("/checkAccountAvailability/{account}")
-    public Result checkUsername(@PathVariable("account") String account){
+    public Result checkUsername(@PathVariable("account") String account) {
         boolean exists = userRepository.existsByAccount(account);
 
-        if( exists ){
+        if (exists) {
             return new Result<>(
                     true,
                     ResultCodeEnum.SUCCESS.getCode(),

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

@@ -110,6 +110,7 @@ abstract class Controller {
             FirebaseApp firebaseApp;
             try {
                 firebaseApp = FirebaseApp.getInstance("other");
+                System.out.println("firebaseApp="+firebaseApp);
             } catch (IllegalStateException e) {
                 firebaseApp = FirebaseApp.initializeApp(options, "other");
             }
@@ -128,7 +129,7 @@ abstract class Controller {
         if (firebaseApp == null) return false;
 
         FirebaseAuth instance = FirebaseAuth.getInstance(firebaseApp);
-        //System.out.println(firebaseApp.getName());
+        System.out.println("instance="+instance);
         //System.out.println(token);
         try {
             FirebaseToken firebaseToken = instance.verifyIdToken(token);