commit commit

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

@@ -218,7 +218,7 @@ public class AuthController extends Controller {
 
 
     @PostMapping(value = "/register/user")
-    public Result checkFirebase(@RequestBody TbCfUserInfo user) throws ParseException {
+    public Result checkFirebase(@RequestBody TbCfUserInfo user) {
         //Data to be userInfoVo
 //        {
 //            "firebaseUid":"firebaseUid",
@@ -230,7 +230,7 @@ public class AuthController extends Controller {
 //        }
 
         // Check if firebase token is valid
-       try {
+
            boolean isTokenValid = user.getToken() != null && validateFirebaseToken(user.getToken());
 
 
@@ -336,9 +336,7 @@ public class AuthController extends Controller {
            } else {
                return new Result<>(ResultCodeEnum.ILLEGAL_ARGUMENT.getCode(), ResultCodeEnum.ILLEGAL_ARGUMENT.getDesc());
            }
-       }catch (Exception e){
-           return new Result(ResultCodeEnum.VALIDATE_ERROR.getCode(),e.getMessage());
-       }
+
 
 
     }

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

@@ -116,8 +116,8 @@ abstract class Controller {
         if (firebaseApp == null) return false;
 
         FirebaseAuth instance = FirebaseAuth.getInstance(firebaseApp);
-        System.out.println(firebaseApp.getName());
-        System.out.println(token);
+        //System.out.println(firebaseApp.getName());
+        //System.out.println(token);
         try {
             FirebaseToken firebaseToken = instance.verifyIdToken(token);
             // verify token successfully

src/main/resources/application-dev.yml

@@ -52,9 +52,9 @@ dpo:
   #服务类型
   service_type: 35711
   #回调地址
-  notify_url: https://app.afrieshop.com/zion/dpo/notify
+  notify_url: http://159.138.48.71:8080/zion/dpo/notify
   #取消地址
-  back_url: https://app.afrieshop.com/zion/dpo/cancel
+  back_url: http://159.138.48.71:8080/zion/dpo/cancel
   #支付成功页面
   success_url: https://www.afrieshop.com/payment_successful
   #支付失败页面

src/main/resources/application-prod.yml

@@ -52,9 +52,9 @@ dpo:
   #服务类型
   service_type: 35711
   #回调地址
-  notify_url: https://app.afrieshop.com/zion/dpo/notify
+  notify_url: http://159.138.48.71:8080/zion/dpo/notify
   #取消地址
-  back_url: https://app.afrieshop.com/zion/dpo/cancel
+  back_url: http://159.138.48.71:8080/zion/dpo/cancel
   #支付成功页面
   success_url: https://www.afrieshop.com/payment_successful
   #支付失败页面

src/main/resources/application-test.yml

@@ -52,9 +52,9 @@ dpo:
   #服务类型
   service_type: 5525
   #回调地址
-  notify_url: https://dev.diaosaas.com/zion/dpo/notify
+  notify_url: http://165.22.82.105:7000/zion/dpo/notify
   #取消地址
-  back_url: https://dev.diaosaas.com/zion/dpo/cancel
+  back_url: http://165.22.82.105:7000/zion/dpo/cancel
   #支付成功页面
   success_url: https://dev.diaosaas.com/afrishop_web/payment_successful
   #支付失败页面