From 04c0cc88c8feac23785638cf9845326229b2b0c9 Mon Sep 17 00:00:00 2001 From: vanitha1822 Date: Mon, 4 May 2026 12:55:20 +0530 Subject: [PATCH 1/5] fix: reset password --- .../employeemaster/EmployeeMasterServiceImpl.java | 6 +++++- .../admin/service/user/EncryptUserPassword.java | 14 +++++++++++--- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/iemr/admin/service/employeemaster/EmployeeMasterServiceImpl.java b/src/main/java/com/iemr/admin/service/employeemaster/EmployeeMasterServiceImpl.java index e3ae01ad..8a784fb6 100644 --- a/src/main/java/com/iemr/admin/service/employeemaster/EmployeeMasterServiceImpl.java +++ b/src/main/java/com/iemr/admin/service/employeemaster/EmployeeMasterServiceImpl.java @@ -45,6 +45,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.http.HttpEntity; import org.springframework.http.HttpMethod; import org.springframework.http.ResponseEntity; @@ -113,7 +114,10 @@ public class EmployeeMasterServiceImpl implements EmployeeMasterInter { private static HttpUtils httpUtils = new HttpUtils(); - private String common_url = ConfigProperties.getPropertyByName("common-url"); + @Value("${common-url}") + private String common_url; + + // private String common_url = ConfigProperties.getPropertyByName("common-url"); private final String COMMON_BASE_URL = "common-url"; diff --git a/src/main/java/com/iemr/admin/service/user/EncryptUserPassword.java b/src/main/java/com/iemr/admin/service/user/EncryptUserPassword.java index 14ff8cb9..2dcdc85d 100644 --- a/src/main/java/com/iemr/admin/service/user/EncryptUserPassword.java +++ b/src/main/java/com/iemr/admin/service/user/EncryptUserPassword.java @@ -21,9 +21,11 @@ */ package com.iemr.admin.service.user; +import org.hibernate.engine.jdbc.env.internal.LobCreationLogging_.logger; import org.json.JSONObject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Value; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; @@ -36,10 +38,16 @@ @Service public class EncryptUserPassword { private static HttpUtils utils = new HttpUtils(); - private static String commonBaseURL = ConfigProperties.getPropertyByName("common-url"); - private static String encryptPasswordURL = commonBaseURL - + ConfigProperties.getPropertyByName("encrypt-password-url"); + @Value("${common-url}") + private String commonBaseURL; + + // @Value("${encrypt-password-url}") + // private String encryptPasswordEndpoint; + + // private static String commonBaseURL = ConfigProperties.getPropertyByName("common-url"); + private String encryptPasswordURL = commonBaseURL + ConfigProperties.getPropertyByName("encrypt-password-url"); + private Logger logger = LoggerFactory.getLogger(this.getClass().getName()); @Async From 8306d5457b6ab9e611ff49333a9662bec52f309c Mon Sep 17 00:00:00 2001 From: vanitha1822 Date: Mon, 4 May 2026 13:12:39 +0530 Subject: [PATCH 2/5] fix: build issue --- .../java/com/iemr/admin/service/user/EncryptUserPassword.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/com/iemr/admin/service/user/EncryptUserPassword.java b/src/main/java/com/iemr/admin/service/user/EncryptUserPassword.java index 2dcdc85d..fe86c3e1 100644 --- a/src/main/java/com/iemr/admin/service/user/EncryptUserPassword.java +++ b/src/main/java/com/iemr/admin/service/user/EncryptUserPassword.java @@ -21,7 +21,6 @@ */ package com.iemr.admin.service.user; -import org.hibernate.engine.jdbc.env.internal.LobCreationLogging_.logger; import org.json.JSONObject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -47,7 +46,7 @@ public class EncryptUserPassword { // private static String commonBaseURL = ConfigProperties.getPropertyByName("common-url"); private String encryptPasswordURL = commonBaseURL + ConfigProperties.getPropertyByName("encrypt-password-url"); - + private Logger logger = LoggerFactory.getLogger(this.getClass().getName()); @Async From afab16095d004843095e62dbf320066794f003e3 Mon Sep 17 00:00:00 2001 From: vanitha1822 Date: Mon, 4 May 2026 14:03:20 +0530 Subject: [PATCH 3/5] fix: update the url --- .../employeemaster/EmployeeMasterServiceImpl.java | 10 ++++++---- .../provideronboard/EncryptUserPassword123.java | 8 ++++++-- .../iemr/admin/service/user/EncryptUserPassword.java | 2 +- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/iemr/admin/service/employeemaster/EmployeeMasterServiceImpl.java b/src/main/java/com/iemr/admin/service/employeemaster/EmployeeMasterServiceImpl.java index 8a784fb6..25a41de6 100644 --- a/src/main/java/com/iemr/admin/service/employeemaster/EmployeeMasterServiceImpl.java +++ b/src/main/java/com/iemr/admin/service/employeemaster/EmployeeMasterServiceImpl.java @@ -116,7 +116,7 @@ public class EmployeeMasterServiceImpl implements EmployeeMasterInter { @Value("${common-url}") private String common_url; - + // private String common_url = ConfigProperties.getPropertyByName("common-url"); private final String COMMON_BASE_URL = "common-url"; @@ -474,7 +474,7 @@ private Set getCTICampaignRoles(String campaignName, String authToken) t ObjectMapper objectMapper = new ObjectMapper(); Set resultSet = new HashSet(); HttpEntity request = RestTemplateUtil.createRequestEntity(campaignName, authToken); - String url = configProperties.getPropertyByName("common-url") + configProperties.getPropertyByName("create-feedback"); + String url = common_url +"/" + configProperties.getPropertyByName("create-feedback"); ResponseEntity responseStr = restTemplate.exchange(url, HttpMethod.POST, request, String.class); OutputResponse response = objectMapper.readValue(responseStr.getBody(), OutputResponse.class); @@ -717,7 +717,8 @@ public void createUserInCallCentre(M_User1 user, String authToken) { logger.info("EmployeeMasterServiceImpl.createUserInCallCentre - start"); if (ENABLE_CTI_USER_CREATION) { String UserCreateAPIURL = ""; - String ctiServer = configProperties.getPropertyByName("common-url"); + // String ctiServer = configProperties.getPropertyByName("common-url"); + String ctiServer=common_url; UserCreateAPIURL = ctiServer + configProperties.getPropertyByName("create-update-users-url"); HashMap headers = new HashMap(); JSONObject request = new JSONObject(); @@ -751,7 +752,8 @@ public void updateUserInCallCentre(String userName, String ctiRole, String authT if (ENABLE_CTI_USER_CREATION) { String UserCreateAPIURL = ""; - String ctiServer = configProperties.getPropertyByName("common-url"); + // String ctiServer = configProperties.getPropertyByName("common-url"); + String ctiServer=common_url; UserCreateAPIURL = ctiServer + configProperties.getPropertyByName("create-update-users-url"); HashMap headers = new HashMap(); JSONObject request = new JSONObject(); diff --git a/src/main/java/com/iemr/admin/service/provideronboard/EncryptUserPassword123.java b/src/main/java/com/iemr/admin/service/provideronboard/EncryptUserPassword123.java index 009842c4..1a374880 100644 --- a/src/main/java/com/iemr/admin/service/provideronboard/EncryptUserPassword123.java +++ b/src/main/java/com/iemr/admin/service/provideronboard/EncryptUserPassword123.java @@ -24,6 +24,7 @@ import org.json.JSONObject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Value; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; @@ -37,8 +38,11 @@ @Service public class EncryptUserPassword123 { private static HttpUtils utils = new HttpUtils(); - private static String commonBaseURL = ConfigProperties.getPropertyByName("common-url"); - private static String encryptPasswordURL = commonBaseURL + // private static String commonBaseURL = ConfigProperties.getPropertyByName("common-url"); + @Value("common-url") + private String commonBaseURL; + + private String encryptPasswordURL = commonBaseURL + "/" + ConfigProperties.getPropertyByName("encrypt-password-url"); private Logger logger = LoggerFactory.getLogger(this.getClass().getName()); diff --git a/src/main/java/com/iemr/admin/service/user/EncryptUserPassword.java b/src/main/java/com/iemr/admin/service/user/EncryptUserPassword.java index fe86c3e1..79e06389 100644 --- a/src/main/java/com/iemr/admin/service/user/EncryptUserPassword.java +++ b/src/main/java/com/iemr/admin/service/user/EncryptUserPassword.java @@ -45,7 +45,7 @@ public class EncryptUserPassword { // private String encryptPasswordEndpoint; // private static String commonBaseURL = ConfigProperties.getPropertyByName("common-url"); - private String encryptPasswordURL = commonBaseURL + ConfigProperties.getPropertyByName("encrypt-password-url"); + private String encryptPasswordURL = commonBaseURL + "/" + ConfigProperties.getPropertyByName("encrypt-password-url"); private Logger logger = LoggerFactory.getLogger(this.getClass().getName()); From f088231cefe72b61a8da42b7842d68a3ff29a45f Mon Sep 17 00:00:00 2001 From: vanitha1822 Date: Mon, 4 May 2026 14:28:58 +0530 Subject: [PATCH 4/5] fix: update config properties --- .../admin/utils/config/ConfigProperties.java | 24 +++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/iemr/admin/utils/config/ConfigProperties.java b/src/main/java/com/iemr/admin/utils/config/ConfigProperties.java index 2aacef90..9fdb90fe 100644 --- a/src/main/java/com/iemr/admin/utils/config/ConfigProperties.java +++ b/src/main/java/com/iemr/admin/utils/config/ConfigProperties.java @@ -118,11 +118,27 @@ public static int getSessionExpiryTime() { public static String getPropertyByName(String propertyName) { String result = null; try { - if (properties == null) { - initalizeProperties(); + // if (properties == null) { + // initalizeProperties(); + // } + // // result = environment.getProperty(propertyName); + // result = properties.getProperty(propertyName); + + if (environment != null) + { + result = environment.getProperty(propertyName); + } + if (result == null) + { + if (properties == null) + { + initalizeProperties(); + } + result = properties.getProperty(propertyName).trim(); + } else + { + result = result.trim(); } - // result = environment.getProperty(propertyName); - result = properties.getProperty(propertyName); } catch (Exception e) { logger.error(propertyName + " retrival failed.", e); } From fbe5a28a25063a17b210c23b70fddc1dec252ed6 Mon Sep 17 00:00:00 2001 From: vanitha1822 Date: Mon, 4 May 2026 21:41:50 +0530 Subject: [PATCH 5/5] fix: initialize constructor --- .../EncryptUserPassword123.java | 21 +++++++++++++++---- .../service/user/EncryptUserPassword.java | 17 +++++++++++++-- 2 files changed, 32 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/iemr/admin/service/provideronboard/EncryptUserPassword123.java b/src/main/java/com/iemr/admin/service/provideronboard/EncryptUserPassword123.java index 1a374880..19ef7496 100644 --- a/src/main/java/com/iemr/admin/service/provideronboard/EncryptUserPassword123.java +++ b/src/main/java/com/iemr/admin/service/provideronboard/EncryptUserPassword123.java @@ -35,18 +35,31 @@ import com.iemr.admin.utils.mapper.InputMapper; import com.iemr.admin.utils.response.OutputResponse; +import jakarta.annotation.PostConstruct; + @Service public class EncryptUserPassword123 { private static HttpUtils utils = new HttpUtils(); - // private static String commonBaseURL = ConfigProperties.getPropertyByName("common-url"); - @Value("common-url") + // private static String commonBaseURL = + // ConfigProperties.getPropertyByName("common-url"); + + @Value("${common-url}") private String commonBaseURL; - private String encryptPasswordURL = commonBaseURL + "/" - + ConfigProperties.getPropertyByName("encrypt-password-url"); + // private String encryptPasswordURL = commonBaseURL + "/" + // + ConfigProperties.getPropertyByName("encrypt-password-url"); private Logger logger = LoggerFactory.getLogger(this.getClass().getName()); + private String encryptPasswordURL; + + @PostConstruct + public void init() { + encryptPasswordURL = commonBaseURL + "/" + + ConfigProperties.getPropertyByName("encrypt-password-url"); + logger.info("commonBaseURL=" + encryptPasswordURL); + } + @Async public OutputResponse encryptUserCredentials(M_User data) { JSONObject request = new JSONObject(); diff --git a/src/main/java/com/iemr/admin/service/user/EncryptUserPassword.java b/src/main/java/com/iemr/admin/service/user/EncryptUserPassword.java index 79e06389..165120e1 100644 --- a/src/main/java/com/iemr/admin/service/user/EncryptUserPassword.java +++ b/src/main/java/com/iemr/admin/service/user/EncryptUserPassword.java @@ -34,6 +34,8 @@ import com.iemr.admin.utils.mapper.InputMapper; import com.iemr.admin.utils.response.OutputResponse; +import jakarta.annotation.PostConstruct; + @Service public class EncryptUserPassword { private static HttpUtils utils = new HttpUtils(); @@ -44,11 +46,22 @@ public class EncryptUserPassword { // @Value("${encrypt-password-url}") // private String encryptPasswordEndpoint; - // private static String commonBaseURL = ConfigProperties.getPropertyByName("common-url"); - private String encryptPasswordURL = commonBaseURL + "/" + ConfigProperties.getPropertyByName("encrypt-password-url"); + // private static String commonBaseURL = + // ConfigProperties.getPropertyByName("common-url"); + // private String encryptPasswordURL = commonBaseURL + "/" + + // ConfigProperties.getPropertyByName("encrypt-password-url"); private Logger logger = LoggerFactory.getLogger(this.getClass().getName()); + private String encryptPasswordURL; + + @PostConstruct + public void init() { + encryptPasswordURL = commonBaseURL + "/" + + ConfigProperties.getPropertyByName("encrypt-password-url"); + logger.info("commonBaseURL" + encryptPasswordURL); + } + @Async public OutputResponse encryptUserCredentials(M_User1 data) { JSONObject request = new JSONObject();