Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking β€œSign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Port 8082 has been assigned to this service, updated ports for all microservices, and modified database connection in the environment configuration. #67

Merged
merged 7 commits into from
Feb 12, 2025
Prev Previous commit
Next Next commit
updated ports and common-url in ci properties
Asp-irin committed Jan 28, 2025
commit 2e1dbec11d02f28a78f779c12dbfefa57b75b3aa
46 changes: 23 additions & 23 deletions src/main/environment/admin_ci.properties
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@

# local env
# DB Connections
[email protected]_URL@
[email protected]_USERNAME@
[email protected]_PASSWORD@
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver

[email protected]_SERVER_IP@


[email protected]_APIKEY@
[email protected]_BASE_URL@


### Redis IP
spring.redis.host=localhost
spring.main.allow-bean-definition-overriding=true

#ELK logging file name
[email protected]_API_LOGGING_FILE_NAME@

common-url=http://localhost:8083/

# local env
# DB Connections
[email protected]_URL@
[email protected]_USERNAME@
[email protected]_PASSWORD@
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver

[email protected]_SERVER_IP@


[email protected]_APIKEY@
[email protected]_BASE_URL@


### Redis IP
spring.redis.host=localhost
spring.main.allow-bean-definition-overriding=true

#ELK logging file name
[email protected]_API_LOGGING_FILE_NAME@

common-url=@env.COMMON_URL@
42 changes: 21 additions & 21 deletions src/main/environment/admin_dev.properties
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@

# dev env
# 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.driver-class-name=com.mysql.cj.jdbc.Driver



callcentre-server-ip=10.208.122.99

videoConsultation-apikey=<Enter Swymed API key>
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=<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.driver-class-name=com.mysql.cj.jdbc.Driver



callcentre-server-ip=10.208.122.99

videoConsultation-apikey=<Enter Swymed API key>
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/

38 changes: 19 additions & 19 deletions src/main/environment/admin_uat.properties
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
# UAT env
# 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.driver-class-name=com.mysql.cj.jdbc.Driver

callcentre-server-ip=10.208.122.99
videoConsultation-apikey=<Enter Swymed API key>
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=<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.driver-class-name=com.mysql.cj.jdbc.Driver

callcentre-server-ip=10.208.122.99
videoConsultation-apikey=<Enter Swymed API key>
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/
6 changes: 1 addition & 5 deletions src/main/resources/application.properties
Original file line number Diff line number Diff line change
@@ -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