Merge pull request 'feature3-userId-added' (#34) from feature3-userId-added into develop

Reviewed-on: https://git.zeptic.in/himanshu/bbps/pulls/34

src/main/java/com/billpaymentservice/bbps/config/SecurityConfig.java

@@ -44,7 +44,7 @@ public class SecurityConfig {
 								         "/webjars/**", 
 								         "/error")
 						.permitAll()
-			            .requestMatchers("/payment/callback/startPayment","/checkTicketStatus/complaints/")
+			            .requestMatchers("/payment/callback/startPayment","/complaints/checkTicketStatus")
 			            .permitAll().requestMatchers(HttpMethod.OPTIONS, "/**").permitAll()
 						.anyRequest().authenticated())
 				.exceptionHandling(ex -> ex.authenticationEntryPoint(jwtAuthenticationEntryPoint))

src/main/resources/application-local.properties

@@ -21,11 +21,11 @@ swagger.server.description=Local Development Server
 #spring.datasource.url=jdbc:postgresql://localhost:5432/bbps_new_updated
 
 spring.datasource.url=jdbc:postgresql://localhost:5432/bbps_enhanced
->>>>>>> Stashed changes
-spring.datasource.username=postgres
-#spring.datasource.password=UAT@DB_2025
 
-spring.datasource.password=himanshu@123
+spring.datasource.username=postgres
+spring.datasource.password=UAT@DB_2025
+
+#spring.datasource.password=himanshu@123
 spring.datasource.driver-class-name=org.postgresql.Driver
 spring.datasource.type=com.zaxxer.hikari.HikariDataSource