提交

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

@@ -6,6 +6,7 @@ import com.example.afrishop_v3.models.TbCfToicoupon;
 import com.example.afrishop_v3.repository.TbCfCouponRepository;
 import com.example.afrishop_v3.repository.TbCfToicouponRepository;
 import com.example.afrishop_v3.security.services.AuthenticationUser;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
@@ -25,7 +26,11 @@ public class CouponController {
     //Get coupons list by authenticated user
     @GetMapping
     public Result getUserCoupons() {
-        return queryCouponByUserId(user.userId());
+        Optional<String> userOptional = Optional.ofNullable(user.userId());
+        if (userOptional.isPresent()) {
+            return new Result(queryCouponByUserId(user.userId()));
+        }
+        return new Result();
     }
 
 

src/main/java/com/example/afrishop_v3/security/WebSecurityConfig.java

@@ -70,7 +70,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
                 .authorizeRequests().antMatchers("/api/auth/**", "/search/image/**", "/itemStation/**", "/startPage/**",
                 "/goodsType/**", "/home/**", "/spider/**", "/store/**", "/shopify/**", "/community/**", "/version/**",
                 "/flutterwave/notify/**", "/dpo/notify/**", "/advertisement/**", "/website/**", "/paypal/**", "/discover/bonus/**",
-                "/problem/**", "/cube/**", "/activity/**", "/attributes/**", "/stripe/**").permitAll()
+                "/problem/**", "/cube/**", "/activity/**", "/attributes/**", "/stripe/**", "/coupon/**", "/logistics/freeShippingThreshold").permitAll()
                 .antMatchers("/api/test/**").permitAll()
                 .anyRequest().authenticated();
 

src/main/java/com/example/afrishop_v3/security/services/AuthenticationUser.java

@@ -41,6 +41,10 @@ public class AuthenticationUser implements IAuthenticationFacade {
     }
 
     public String userId() {
-        return user().getUserId();
+        TbCfUserInfo user = user();
+        if (user != null) {
+            return user().getUserId();
+        }
+        return null;
     }
 }

src/main/resources/application-prod.yml

@@ -87,3 +87,9 @@ paypal:
   success_page: https://www.afrieshop.com/payment_successful
   failed_page: https://www.afrieshop.com/payment_failed
   mode: live
+
+stripe:
+  success_url: https://app.afrieshop.com/afrishop/stripe/success
+  cancel_url: https://app.afrieshop.com/afrishop/stripe/cancel
+  public_key: pk_test_y5dXLjyUyBD11Ta9g2DGynxN0048vnmpGz
+  secret_key: sk_test_tGl2q7Omxehpli7R3Z6xU6G900iL1eX32c

src/main/resources/application.properties

 server.servlet.context-path=/zion
 spring.jpa.hibernate.ddl-auto=update
 server.port=8083
-spring.profiles.active=prod
+spring.profiles.active=test
 #spring.datasource.url=jdbc:mysql://${MYSQL_HOST:localhost}:3306/afrishop_test?useUnicode=true&connectionCollation=utf8mb4_general_ci&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC
 #spring.datasource.username=root
 #spring.datasource.password=Diaoyunnuli.8

src/test/java/com/example/afrishop_v3/AfrishopV3ApplicationTests.java

@@ -18,10 +18,7 @@ import org.springframework.web.client.RestTemplate;
 
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Optional;
+import java.util.*;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest
@@ -64,10 +61,12 @@ public class AfrishopV3ApplicationTests {
 
     @Test
     public void test2(){
-        Optional<Token> firstToken = tokenRepository.findFirstToken();
-        if (firstToken.isPresent()){
-            System.out.println(firstToken.get().getToken());
-        }
+        List list=new ArrayList();
+        list.add(2);
+        list.add(1);
+        list.add(3);
+        list.forEach(System.out::println);
+
     }
 
 }