Merge pull request #115 from Asp-irin/develop

Assigned port 8085, updated ports for all microservices, and modified database connection in the environment configuration.

src/main/environment/common_example.properties

@@ -1,53 +1,54 @@
 # dev env
+server.port=8085
 # DB Connections
-spring.datasource.url=<Enter AMRIT DB_IEMR URL here>
-spring.datasource.username=<Enter your AMRIT DB_IEMR username>
-spring.datasource.password=<Enter your AMRIT DB_IEMR password>
+spring.datasource.url=jdbc:mysql://localhost:3306/db_iemr
+spring.datasource.username=root
+spring.datasource.password=1234
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 
 ## Carestream URLs
-carestreamOrderCreateURL =http://localhost:8080/carestream/createOrder
+carestreamOrderCreateURL =http://localhost:8083/carestream/createOrder
 
 ## Identity - Common URLs
 #  Registration
-registrationUrl =http://localhost:8080/beneficiary/create
+registrationUrl =http://localhost:8083/beneficiary/create
 
-syncSearchByLocation =http://localhost:8082/id/searchByVillageIdAndLastModifiedDate
+syncSearchByLocation =http://localhost:8094/id/searchByVillageIdAndLastModifiedDate
 
-getBenCountToSync = http://localhost:8082/id/countBenByVillageIdAndLastModifiedDate
+getBenCountToSync = http://localhost:8094/id/countBenByVillageIdAndLastModifiedDate
 
-registrarQuickSearchByIdUrl =http://localhost:8080/beneficiary/searchUserByID
+registrarQuickSearchByIdUrl =http://localhost:8083/beneficiary/searchUserByID
 
-registrarQuickSearchByPhoneNoUrl =http://localhost:8080/beneficiary/searchUserByPhone
+registrarQuickSearchByPhoneNoUrl =http://localhost:8083/beneficiary/searchUserByPhone
 
-getBenImageFromIdentity =http://localhost:8082/id/benImageByBenRegID
+getBenImageFromIdentity =http://localhost:8094/id/benImageByBenRegID
 
 ##save covid Vaccine details coming from mobile app through fhir
-saveCovidVaccineDetailsURL = http://localhost:8080/covid/saveCovidVaccinationDetails
+saveCovidVaccineDetailsURL = http://localhost:8083/covid/saveCovidVaccinationDetails
 
 ##beneficiary edit
-beneficiaryEditUrl =http://localhost:8080/beneficiary/update
+beneficiaryEditUrl =http://localhost:8083/beneficiary/update
 
 ## Advance Search
-registrarAdvanceSearchUrl =http://localhost:8080/beneficiary/searchBeneficiary
+registrarAdvanceSearchUrl =http://localhost:8083/beneficiary/searchBeneficiary
 
 ## Data Sync API
-dataSyncUploadUrl==http://localhost:8080/dataSync/van-to-server
+dataSyncUploadUrl==http://localhost:8087/dataSync/van-to-server
 
 ## Data download API
-dataSyncDownloadUrl==http://localhost:8080/dataSync/server-to-van
+dataSyncDownloadUrl==http://localhost:8087/dataSync/server-to-van
 
 ## TC specialist slot booking
-tcSpecialistSlotBook=http://localhost:9091/schedule/bookSlot
+tcSpecialistSlotBook=http://localhost:8088/schedule/bookSlot
 
 ## TC specialist slot cancelling
-tcSpecialistSlotCancel=http://localhost:9091/schedule/cancelBookedSlot
+tcSpecialistSlotCancel=http://localhost:8088/schedule/cancelBookedSlot
 
 ## TM sms to beneficiary(schedule, cancel, reschedule)
-sendSMSUrl=http://localhost:8080/sms/sendSMS
+sendSMSUrl=http://localhost:8083/sms/sendSMS
 
 ### get openkm doc download url
-openkmDocUrl=http://localhost:8080/kmfilemanager/getKMFileDownloadURL
+openkmDocUrl=http://localhost:8083/kmfilemanager/getKMFileDownloadURL
 
 ##Fetosense Url
 foetalMonitor-api-url-ANCTestDetails=https://asia-south1-amrit-fetosense.cloudfunctions.net/insertMother
@@ -86,6 +87,6 @@ prescription=TMPrescription SMS
 
 ### Redis IP
 spring.redis.host=localhost
-
+spring.redis.port=6379
 
 

src/main/resources/application.properties

@@ -20,7 +20,6 @@ spring.jpa.hibernate.ddl-auto=none
 spring.jpa.hibernate.show_sql=true
 spring.jpa.hibernate.format_sql=true
 spring.main.allow-circular-references=true
-
 spring.session.store-type=redis
 #spring.redis.host=localhost
 spring.redis.password=