Merge branch 'develop' into 1.1.5

mosip · Apr 6, 2021 · 4fa79d2 · 4fa79d2
2 parents 89819c9 + c8e06a5
commit 4fa79d2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/pre-registration/pre-registration-application-service/Dockerfile b/pre-registration/pre-registration-application-service/Dockerfile
@@ -83,8 +83,8 @@ CMD if [ "$is_glowroot_env" = "present" ]; then \
     java -Dloader.path="${loader_path_env}" -jar -javaagent:glowroot/glowroot.jar -Dspring.cloud.config.label="${spring_config_label_env}" -Dspring.profiles.active="${active_profile_env}" -Dspring.cloud.config.uri="${spring_config_url_env}" pre-registration-application-service.jar ; \
     else \
           wget -q --show-progress "${artifactory_url_env}"/artifactory/libs-snapshot-local/io/mosip/kernel/kernel-ref-idobjectvalidator/kernel-ref-idobjectvalidator.jar "${loader_path_env}"/kernel-ref-idobjectvalidator.jar ; \
-		  wget -q --show-progress "${artifactory_url_env}"/artifactory/libs-release-local/icu4j/icu4j.jar "${loader_path_env}"/icu4j.jar ; \
+          wget -q --show-progress "${artifactory_url_env}"/artifactory/libs-release-local/icu4j/icu4j.jar "${loader_path_env}"/icu4j.jar ; \
           wget -q --show-progress "${artifactory_url_env}"/artifactory/libs-release-local/icu4j/kernel-transliteration-icu4j.jar "${loader_path_env}"/kernel-transliteration-icu4j.jar ; \
-       java -Dloader.path=./kernel-ref-idobjectvalidator.jar,./icu4j.jar,./kernel-transliteration-icu4j.jar -jar -Dspring.cloud.config.label="${spring_config_label_env}" -Dspring.profiles.active="${active_profile_env}" -Dspring.cloud.config.uri="${spring_config_url_env}" pre-registration-application-service.jar ; \
+          java -Dloader.path=./kernel-ref-idobjectvalidator.jar,./icu4j.jar,./kernel-transliteration-icu4j.jar -jar -Dspring.cloud.config.label="${spring_config_label_env}" -Dspring.profiles.active="${active_profile_env}" -Dspring.cloud.config.uri="${spring_config_url_env}" pre-registration-application-service.jar ; \
       #java -jar -Dloader.path="${loader_path_env}" -Dspring.cloud.config.label="${spring_config_label_env}" -Dspring.profiles.active="${active_profile_env}" -Dspring.cloud.config.uri="${spring_config_url_env}" pre-registration-application-service.jar ; \
-      fi
+      fi
diff --git a/...cation-service/src/main/java/io/mosip/preregistration/application/service/OTPManager.java b/...cation-service/src/main/java/io/mosip/preregistration/application/service/OTPManager.java
@@ -137,16 +137,12 @@ public boolean sendOtp(MainRequestDTO<OtpRequestDTO> requestDTO, String channelT
 		LocalDateTime dateTime = LocalDateTime.now(ZoneId.of(environment.getProperty("timeZone")));
 		DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern("dd-MM-yyyy");
 		DateTimeFormatter timeFormatter = DateTimeFormatter.ofPattern("HH:mm:ss");
-		System.out.println(dateFormatter.format(dateTime) + "" + timeFormatter.format(dateTime));
 
 		mp.put("otp", otp);
-		mp.put("date", requestDTO.getRequesttime());
-		mp.put("validTime", "15 minutes");
 		mp.put("date",dateFormatter.format(dateTime));
 		mp.put("validTime", validTime);
 		mp.put("name", userId);
 		mp.put("username", userId);
-		mp.put("time", new Date(requestDTO.getRequesttime().getTime()));
 		mp.put("time", timeFormatter.format(dateTime));
 
 		if (channelType.equalsIgnoreCase(PreRegLoginConstant.PHONE_NUMBER)) {