Merge pull request #247 from toarunmishra/3.3.0

IDENTITY_BASE_URL fix

Author: SauravBizbRolly

src/main/java/com/iemr/common/service/beneficiary/IdentityBeneficiaryServiceImpl.java

@@ -401,9 +401,9 @@ public String getIdentityResponse(String request, String auth, Boolean is1097) t
 		if (auth != null) {
 			header.put("Authorization", auth);
 		}
+		String baseUrl = is1097 ? identity1097BaseURL : identityBaseURL;
+		String apiUrl = baseUrl + ConfigProperties.getPropertyByName("identity-api-url-benCreate");
 
-		String apiUrl = ConfigProperties.getPropertyByName("identity-api-url-benCreate")
-				.replace(IDENTITY_BASE_URL, (is1097 ? identity1097BaseURL : identityBaseURL));
 
 		logger.info("Calling URL: {}", apiUrl);
 		logger.info("Request Payload: {}", request);

src/main/resources/application.properties

@@ -115,10 +115,8 @@ identity-api-url-getByPartialBenRegIdList =IDENTITY_BASE_URL/id/getByPartialBenR
 identity-api-url-getByPhoneNum =IDENTITY_BASE_URL/id/getByPhoneNum?phoneNum=
 identity-api-url-getByBenId =IDENTITY_BASE_URL/id/getByBenId?benId=
 identity-api-url-getByBenRegId =IDENTITY_BASE_URL/id/getByBenRegId?benRegId=
-IDENTITY_API_URL=https://amritdemo.piramalswasthya.org
-identity-api-url-benCreate=${IDENTITY_API_URL}/id/create
+identity-api-url-benCreate =IDENTITY_BASE_URL/id/create
 #identity-api-url-benCreate =IDENTITY_BASE_URL/id/create
-
 identity-api-url-benEdit =IDENTITY_BASE_URL/id/edit
 identity-api-url-benEditEducationCommunity=IDENTITY_BASE_URL/id/editEducationOrCommunity