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.

Sign up for GitHub

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

Open
wants to merge 6 commits into
base: develop
Choose a base branch
from
+85 −86
Open

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

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1ff66b5
example env propertiers are set for local development and application…
Asp-irin Jan 21, 2025
d629b9b
Merge branch 'PSMRI:develop' into develop
Asp-irin Jan 21, 2025
8d0a0ed
shifted common-url from application to individual env properties
Asp-irin Jan 23, 2025
8d763bc
shifted common-url from application to individual env properties
Asp-irin Jan 23, 2025
f660113
shifted common-url from application to individual env properties
Asp-irin Jan 23, 2025
2e1dbec
updated ports and common-url in ci properties
Asp-irin Jan 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/main/environment/admin_ci.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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@
logging.file.name=@env.ADMIN_API_LOGGING_FILE_NAME@

common-url=http://localhost:8083/
Asp-irin marked this conversation as resolved.
Show resolved Hide resolved
2 changes: 2 additions & 0 deletions src/main/environment/admin_dev.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/

40 changes: 19 additions & 21 deletions src/main/environment/admin_example.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,19 @@

# local 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

server.port=8082
# local env
# DB Connections
spring.datasource.url=jdbc:mysql://localhost:3306/db_iemr
spring.datasource.username=root
spring.datasource.password=1234
Comment on lines +4 to +6
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Security: Replace database credentials with placeholders.

Even in example properties files, it's not recommended to commit actual database credentials. Replace them with placeholders to prevent potential security risks.

Apply this diff:

-spring.datasource.url=jdbc:mysql://localhost:3306/db_iemr
-spring.datasource.username=root
-spring.datasource.password=1234
+spring.datasource.url=<Enter your DB URL here>
+spring.datasource.username=<Enter your DB username>
+spring.datasource.password=<Enter your DB password>
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
spring.datasource.url=jdbc:mysql://localhost:3306/db_iemr
spring.datasource.username=root
spring.datasource.password=1234
spring.datasource.url=<Enter your DB URL here>
spring.datasource.username=<Enter your DB username>
spring.datasource.password=<Enter your DB 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/

1 change: 1 addition & 0 deletions src/main/environment/admin_test.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/
1 change: 1 addition & 0 deletions src/main/environment/admin_uat.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/
5 changes: 2 additions & 3 deletions src/main/resources/application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -82,6 +80,7 @@ swymed-edituser-url=swymed-base-url/SwymedWebApi/api/Contact

calibrationPageSize=5

#check this
Asp-irin marked this conversation as resolved.
Show resolved Hide resolved
biological-screening-device-url=http://localhost:8085/ezdx-hub-connect-srv


Expand Down