From 1ff66b5483143e34f8ea73a0c796ec2fa7494d10 Mon Sep 17 00:00:00 2001 From: Asp-Codes Date: Tue, 21 Jan 2025 11:06:53 +0530 Subject: [PATCH 1/5] example env propertiers are set for local development and application properties are edited(need a review) --- src/main/environment/admin_example.properties | 10 +++++----- src/main/resources/application.properties | 5 +++-- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/main/environment/admin_example.properties b/src/main/environment/admin_example.properties index 58f9757..29acff6 100644 --- a/src/main/environment/admin_example.properties +++ b/src/main/environment/admin_example.properties @@ -1,13 +1,13 @@ - # local env +server.port=8082 # DB Connections -spring.datasource.url= -spring.datasource.username= -spring.datasource.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.cj.jdbc.Driver - +#need to check this link callcentre-server-ip=10.208.122.99 diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index f156e2b..3059df5 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -13,7 +13,7 @@ Agents-api-url=http://CTI_SERVER/apps/cust_appsHandler.php?transaction_id=CTI_AG User-Create-api-url=http://CTI_SERVER/apps/cust_appsHandler.php?transaction_id=CTI_SYSTEM_USER&username=USERNAME&password=PASSWORD&firstname=FRISTNAME&lastname=LASTNAME&phone=PHONE&email=EMAIL&role=Default&sessiontimeout=6000&designation=Default&resFormat=3 #common-url=http://localhost:8080/commonapi-v1.1/ -common-url=http://10.208.122.100:8080/commonapi-v1.0/ +common-url=http://localhost:8083/ common-forcelogout=common-url/user/userForceLogout encrypt-password-url=user/setForgetPassword @@ -59,7 +59,7 @@ logging.file.name=logs/admin-api.log enableCTIUserCreation=true apiman-organizationID=IEMR -apiman-base-url=http://localhost:8080/apiman +apiman-base-url=http://localhost:8082/apiman apiman-clientcreation-url=APIMAN_URL/organizations/IEMR/clients apiman-clientcontract-url=APIMAN_URL/organizations/IEMR/clients/CLIENT_ID/versions/1.0/contracts apiman-register-url=APIMAN_URL/actions @@ -82,6 +82,7 @@ swymed-edituser-url=swymed-base-url/SwymedWebApi/api/Contact calibrationPageSize=5 +#check this biological-screening-device-url=http://localhost:8085/ezdx-hub-connect-srv From 8d0a0edf20d4493e1bd4c92a8873dcf1f91423a7 Mon Sep 17 00:00:00 2001 From: Asp-Codes Date: Thu, 23 Jan 2025 13:58:54 +0530 Subject: [PATCH 2/5] shifted common-url from application to individual env properties --- src/main/environment/admin_ci.properties | 4 +- src/main/environment/admin_dev.properties | 2 + src/main/environment/admin_example.properties | 44 ++++++++++--------- src/main/environment/admin_test.properties | 1 + src/main/environment/admin_uat.properties | 1 + src/main/resources/application.properties | 6 +-- 6 files changed, 32 insertions(+), 26 deletions(-) diff --git a/src/main/environment/admin_ci.properties b/src/main/environment/admin_ci.properties index 9d3fa8b..3ab9da5 100644 --- a/src/main/environment/admin_ci.properties +++ b/src/main/environment/admin_ci.properties @@ -18,4 +18,6 @@ spring.redis.host=localhost spring.main.allow-bean-definition-overriding=true #ELK logging file name -logging.file.name=@env.ADMIN_API_LOGGING_FILE_NAME@ \ No newline at end of file +logging.file.name=@env.ADMIN_API_LOGGING_FILE_NAME@ + +common-url=http://localhost:8083/ diff --git a/src/main/environment/admin_dev.properties b/src/main/environment/admin_dev.properties index 9534fa4..a98f8ad 100644 --- a/src/main/environment/admin_dev.properties +++ b/src/main/environment/admin_dev.properties @@ -17,3 +17,5 @@ videoConsultation-base-url=https://psmri.swymed.com:92744 spring.redis.host=localhost spring.main.allow-bean-definition-overriding=true +common-url=http://localhost:8083/ + diff --git a/src/main/environment/admin_example.properties b/src/main/environment/admin_example.properties index 29acff6..021b125 100644 --- a/src/main/environment/admin_example.properties +++ b/src/main/environment/admin_example.properties @@ -1,21 +1,23 @@ -# local env -server.port=8082 -# DB Connections -spring.datasource.url=jdbc:mysql://localhost:3306/db_iemr -spring.datasource.username=root -spring.datasource.password=1234 -spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver - - -#need to check this link -callcentre-server-ip=10.208.122.99 - - -videoConsultation-apikey= -videoConsultation-base-url=https://psmri.swymed.com:9274 - - -### Redis IP -spring.redis.host=localhost -spring.main.allow-bean-definition-overriding=true - +# local env +server.port=8082 +# DB Connections +spring.datasource.url=jdbc:mysql://localhost:3306/db_iemr +spring.datasource.username=root +spring.datasource.password=1234 +spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver + + +#need to check this link +callcentre-server-ip=10.208.122.99 + + +videoConsultation-apikey= +videoConsultation-base-url=https://psmri.swymed.com:9274 + + +### Redis IP +spring.redis.host=localhost +spring.main.allow-bean-definition-overriding=true + +common-url=http://localhost:8083/ + diff --git a/src/main/environment/admin_test.properties b/src/main/environment/admin_test.properties index f704669..5d548d2 100644 --- a/src/main/environment/admin_test.properties +++ b/src/main/environment/admin_test.properties @@ -16,3 +16,4 @@ videoConsultation-base-url=https://psmri.swymed.com:9274 spring.redis.host=localhost spring.main.allow-bean-definition-overriding=true +common-url=http://localhost:8083/ diff --git a/src/main/environment/admin_uat.properties b/src/main/environment/admin_uat.properties index 7f179ae..4ea23d7 100644 --- a/src/main/environment/admin_uat.properties +++ b/src/main/environment/admin_uat.properties @@ -16,3 +16,4 @@ videoConsultation-base-url=https://psmri.swymed.com:9274 spring.redis.host=localhost spring.main.allow-bean-definition-overriding=true +common-url=http://localhost:8083/ diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 3059df5..9659400 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -12,9 +12,7 @@ spring.profiles.active=test Agents-api-url=http://CTI_SERVER/apps/cust_appsHandler.php?transaction_id=CTI_AGENT_ADDUPDATE&agent_id=AGENTID&agent_secret=123456&agent_name=AGENTNAME&campaign_name=UAT_104_RO&resFormat=3 User-Create-api-url=http://CTI_SERVER/apps/cust_appsHandler.php?transaction_id=CTI_SYSTEM_USER&username=USERNAME&password=PASSWORD&firstname=FRISTNAME&lastname=LASTNAME&phone=PHONE&email=EMAIL&role=Default&sessiontimeout=6000&designation=Default&resFormat=3 -#common-url=http://localhost:8080/commonapi-v1.1/ -common-url=http://localhost:8083/ -common-forcelogout=common-url/user/userForceLogout +common-forcelogout=/user/userForceLogout encrypt-password-url=user/setForgetPassword @@ -59,7 +57,7 @@ logging.file.name=logs/admin-api.log enableCTIUserCreation=true apiman-organizationID=IEMR -apiman-base-url=http://localhost:8082/apiman +apiman-base-url=http://localhost:8080/apiman apiman-clientcreation-url=APIMAN_URL/organizations/IEMR/clients apiman-clientcontract-url=APIMAN_URL/organizations/IEMR/clients/CLIENT_ID/versions/1.0/contracts apiman-register-url=APIMAN_URL/actions From 8d763bcb486c7abba213fcf85e4e8f6f9cd7fe0c Mon Sep 17 00:00:00 2001 From: Asp-Codes Date: Thu, 23 Jan 2025 14:00:49 +0530 Subject: [PATCH 3/5] shifted common-url from application to individual env properties --- src/main/environment/admin_example.properties | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/main/environment/admin_example.properties b/src/main/environment/admin_example.properties index 021b125..28a135b 100644 --- a/src/main/environment/admin_example.properties +++ b/src/main/environment/admin_example.properties @@ -6,15 +6,11 @@ spring.datasource.username=root spring.datasource.password=1234 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver - -#need to check this link callcentre-server-ip=10.208.122.99 - videoConsultation-apikey= videoConsultation-base-url=https://psmri.swymed.com:9274 - ### Redis IP spring.redis.host=localhost spring.main.allow-bean-definition-overriding=true From f660113db495815512af72630d5769ebb395ac62 Mon Sep 17 00:00:00 2001 From: Asp-Codes Date: Thu, 23 Jan 2025 14:03:11 +0530 Subject: [PATCH 4/5] shifted common-url from application to individual env properties --- src/main/environment/admin_example.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/environment/admin_example.properties b/src/main/environment/admin_example.properties index 28a135b..7d63bca 100644 --- a/src/main/environment/admin_example.properties +++ b/src/main/environment/admin_example.properties @@ -1,5 +1,5 @@ -# local env server.port=8082 +# local env # DB Connections spring.datasource.url=jdbc:mysql://localhost:3306/db_iemr spring.datasource.username=root From 2e1dbec11d02f28a78f779c12dbfefa57b75b3aa Mon Sep 17 00:00:00 2001 From: Asp-Codes Date: Tue, 28 Jan 2025 20:19:58 +0530 Subject: [PATCH 5/5] updated ports and common-url in ci properties --- src/main/environment/admin_ci.properties | 46 +++++++++++------------ src/main/environment/admin_dev.properties | 42 ++++++++++----------- src/main/environment/admin_uat.properties | 38 +++++++++---------- src/main/resources/application.properties | 6 +-- 4 files changed, 64 insertions(+), 68 deletions(-) diff --git a/src/main/environment/admin_ci.properties b/src/main/environment/admin_ci.properties index 3ab9da5..d8a79d0 100644 --- a/src/main/environment/admin_ci.properties +++ b/src/main/environment/admin_ci.properties @@ -1,23 +1,23 @@ - -# local env -# DB Connections -spring.datasource.url=@env.DATABASE_URL@ -spring.datasource.username=@env.DATABASE_USERNAME@ -spring.datasource.password=@env.DATABASE_PASSWORD@ -spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver - -callcentre-server-ip=@env.CALLCENTRE_SERVER_IP@ - - -videoConsultation-apikey=@env.SWYMED_APIKEY@ -videoConsultation-base-url=@env.SWYMED_BASE_URL@ - - -### Redis IP -spring.redis.host=localhost -spring.main.allow-bean-definition-overriding=true - -#ELK logging file name -logging.file.name=@env.ADMIN_API_LOGGING_FILE_NAME@ - -common-url=http://localhost:8083/ + +# local env +# DB Connections +spring.datasource.url=@env.DATABASE_URL@ +spring.datasource.username=@env.DATABASE_USERNAME@ +spring.datasource.password=@env.DATABASE_PASSWORD@ +spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver + +callcentre-server-ip=@env.CALLCENTRE_SERVER_IP@ + + +videoConsultation-apikey=@env.SWYMED_APIKEY@ +videoConsultation-base-url=@env.SWYMED_BASE_URL@ + + +### Redis IP +spring.redis.host=localhost +spring.main.allow-bean-definition-overriding=true + +#ELK logging file name +logging.file.name=@env.ADMIN_API_LOGGING_FILE_NAME@ + +common-url=@env.COMMON_URL@ diff --git a/src/main/environment/admin_dev.properties b/src/main/environment/admin_dev.properties index a98f8ad..37c64ab 100644 --- a/src/main/environment/admin_dev.properties +++ b/src/main/environment/admin_dev.properties @@ -1,21 +1,21 @@ - -# dev env -# DB Connections -spring.datasource.url= -spring.datasource.username= -spring.datasource.password= -spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver - - - -callcentre-server-ip=10.208.122.99 - -videoConsultation-apikey= -videoConsultation-base-url=https://psmri.swymed.com:92744 - -### Redis IP -spring.redis.host=localhost -spring.main.allow-bean-definition-overriding=true - -common-url=http://localhost:8083/ - + +# dev env +# DB Connections +spring.datasource.url= +spring.datasource.username= +spring.datasource.password= +spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver + + + +callcentre-server-ip=10.208.122.99 + +videoConsultation-apikey= +videoConsultation-base-url=https://psmri.swymed.com:92744 + +### Redis IP +spring.redis.host=localhost +spring.main.allow-bean-definition-overriding=true + +common-url=http://localhost:8083/ + diff --git a/src/main/environment/admin_uat.properties b/src/main/environment/admin_uat.properties index 4ea23d7..6111e23 100644 --- a/src/main/environment/admin_uat.properties +++ b/src/main/environment/admin_uat.properties @@ -1,19 +1,19 @@ -# UAT env -# DB Connections -spring.datasource.url= -spring.datasource.username= -spring.datasource.password= -spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver - -callcentre-server-ip=10.208.122.99 -videoConsultation-apikey= -videoConsultation-base-url=https://psmri.swymed.com:9274 - - - - -### Redis IP -spring.redis.host=localhost -spring.main.allow-bean-definition-overriding=true - -common-url=http://localhost:8083/ +# UAT env +# DB Connections +spring.datasource.url= +spring.datasource.username= +spring.datasource.password= +spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver + +callcentre-server-ip=10.208.122.99 +videoConsultation-apikey= +videoConsultation-base-url=https://psmri.swymed.com:9274 + + + + +### Redis IP +spring.redis.host=localhost +spring.main.allow-bean-definition-overriding=true + +common-url=http://localhost:8083/ diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 9659400..75abced 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -31,9 +31,6 @@ spring.datasource.tomcat.min-idle=1 spring.datasource.tomcat.min-evictable-idle-time-millis=15000 spring.datasource.tomcat.remove-abandoned-timeout=600 -## Added by neeraj for tomcat port. commonAPI is running on 8080. 19-02-2018 - - spring.session.store-type=redis spring.main.allow-bean-definition-overriding=true spring.redis.password= @@ -80,8 +77,7 @@ swymed-edituser-url=swymed-base-url/SwymedWebApi/api/Contact calibrationPageSize=5 -#check this -biological-screening-device-url=http://localhost:8085/ezdx-hub-connect-srv +biological-screening-device-url=http://localhost:8096/ezdx-hub-connect-srv