diff --git a/src/main/environment/admin_ci.properties b/src/main/environment/admin_ci.properties index 9d3fa8b..d8a79d0 100644 --- a/src/main/environment/admin_ci.properties +++ b/src/main/environment/admin_ci.properties @@ -1,21 +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@ \ No newline at end of file + +# 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 9534fa4..37c64ab 100644 --- a/src/main/environment/admin_dev.properties +++ b/src/main/environment/admin_dev.properties @@ -1,19 +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 - + +# 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_example.properties b/src/main/environment/admin_example.properties index 58f9757..7d63bca 100644 --- a/src/main/environment/admin_example.properties +++ b/src/main/environment/admin_example.properties @@ -1,21 +1,19 @@ - -# local 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 - +server.port=8082 +# local env +# 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 + +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..6111e23 100644 --- a/src/main/environment/admin_uat.properties +++ b/src/main/environment/admin_uat.properties @@ -1,18 +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 - +# 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 f156e2b..75abced 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://10.208.122.100:8080/commonapi-v1.0/ -common-forcelogout=common-url/user/userForceLogout +common-forcelogout=/user/userForceLogout encrypt-password-url=user/setForgetPassword @@ -33,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= @@ -82,7 +77,7 @@ swymed-edituser-url=swymed-base-url/SwymedWebApi/api/Contact calibrationPageSize=5 -biological-screening-device-url=http://localhost:8085/ezdx-hub-connect-srv +biological-screening-device-url=http://localhost:8096/ezdx-hub-connect-srv