resolve merge conflict

src/main/java/com/tarento/retail/config/JwtTokenUtil.java

@@ -75,7 +75,7 @@ public class JwtTokenUtil implements Serializable {
 		claims.put(CLAIMS_KEY, Arrays.asList(new SimpleGrantedAuthority(JWT_GRANTED_AUTHORITY)));
 
 		return Jwts.builder().setClaims(claims).setIssuer(JWT_ISSUER).setIssuedAt(new Date(System.currentTimeMillis()))
-				.setExpiration(new Date(System.currentTimeMillis() + appConfig.getJwtValidity() * 60 * 1000))
+				.setExpiration(new Date(System.currentTimeMillis() + appConfig.getJwtValidity() * 60 * 10000))
 				.signWith(SignatureAlgorithm.HS256, SIGNING_KEY).compact();
 	}
 

src/main/java/com/tarento/retail/service/impl/UserServiceImpl.java

@@ -568,8 +568,7 @@ public class UserServiceImpl implements UserDetailsService, UserService {
 
 	@Override
 	public Boolean validateUserOTP(String username, String otp) {
-		return Boolean.TRUE; //remove when commit the code
-		/*
+
 		try {
 			LoginAuthentication loginAuth = Cache.getUserAuthData(username);
 			if (loginAuth != null && loginAuth.getOtpExpiryDate() > DateUtil.getCurrentTimestamp()
@@ -580,7 +579,6 @@ public class UserServiceImpl implements UserDetailsService, UserService {
 			LOGGER.error(String.format(Constants.EXCEPTION_METHOD, "validateUserOTP", e.getMessage()));
 		}
 		return Boolean.FALSE;
-		*/
 	}
 
 	@Override

src/main/resources/application.properties

@@ -31,10 +31,9 @@ mail.smtp.password=BFlcJ5K2pekNcgLG8Joo9y78JL5DyO0gIhztJpeRm93d
 mail.smtp.email=idc-eagle@tarento.com
 
 ### Expiry Timings ###
-otp.validity.mins=5
-jwt.validity.mins=4320
+otp.validity.mins=10080
+jwt.validity.mins=10080
 
 #springdoc.swagger-ui.path=/user-management/swagger/swagger-ui.html
 #springdoc.api-docs.path=/user-management/swagger/api-docs
 spring.mvc.pathmatch.matching-strategy=ant-path-matcher
-

src/main/resources/otp_template.vm

@@ -295,13 +295,13 @@
                         <tr>
                             <td class="free-text PT25">
                                 #if($otp)
-                                $otp is your UP SMF Login OTP. This is valid for the next 5 mins.
+                                Your UP SMF login OTP is $otp. It is valid for 5 mins.
                                 #end
                             </td>
                         </tr>
                         <tr>
                             <td class="free-text PT25">
-                                Thank you!
+                                Thank you.
                             </td>
                         </tr>