Skip to content

Commit 7176dcb

Browse files
drtechiedrtechie
authored
Merge pull request #67 from Asp-irin/develop
Port 8082 has been assigned to this service, updated ports for all microservices, and modified database connection in the environment configuration.
2 parents 482481d + df2f97c commit 7176dcb

File tree

6 files changed

+81
-91
lines changed

6 files changed

+81
-91
lines changed

‎src/main/environment/admin_ci.properties‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
1-
2-
# local env
3-
# DB Connections
4-
spring.datasource.url=@env.DATABASE_URL@
5-
spring.datasource.username=@env.DATABASE_USERNAME@
6-
spring.datasource.password=@env.DATABASE_PASSWORD@
7-
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
8-
9-
callcentre-server-ip=@env.CALLCENTRE_SERVER_IP@
10-
11-
12-
videoConsultation-apikey=@env.SWYMED_APIKEY@
13-
videoConsultation-base-url=@env.SWYMED_BASE_URL@
14-
15-
16-
### Redis IP
17-
spring.redis.host=localhost
18-
spring.main.allow-bean-definition-overriding=true
19-
jwt.secret=@env.JWT_SECRET_KEY@
20-
21-
#ELK logging file name
22-
logging.file.name=@env.ADMIN_API_LOGGING_FILE_NAME@
1+
# local env
2+
# DB Connections
3+
spring.datasource.url=@env.DATABASE_URL@
4+
spring.datasource.username=@env.DATABASE_USERNAME@
5+
spring.datasource.password=@env.DATABASE_PASSWORD@
6+
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
7+
8+
callcentre-server-ip=@env.CALLCENTRE_SERVER_IP@
9+
10+
11+
videoConsultation-apikey=@env.SWYMED_APIKEY@
12+
videoConsultation-base-url=@env.SWYMED_BASE_URL@
13+
14+
15+
### Redis IP
16+
spring.redis.host=localhost
17+
spring.main.allow-bean-definition-overriding=true
18+
jwt.secret=@env.JWT_SECRET_KEY@
19+
#ELK logging file name
20+
logging.file.name=@env.ADMIN_API_LOGGING_FILE_NAME@
21+
22+
common-url=@env.COMMON_URL@

‎src/main/environment/admin_dev.properties‎

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
1-
2-
# dev env
3-
# DB Connections
4-
spring.datasource.url=<Enter AMRIT DB_IEMR URL here>
5-
spring.datasource.username=<Enter your AMRIT DB_IEMR username>
6-
spring.datasource.password=<Enter your AMRIT DB_IEMR password>
7-
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
8-
9-
10-
11-
callcentre-server-ip=10.208.122.99
12-
13-
videoConsultation-apikey=<Enter Swymed API key>
14-
videoConsultation-base-url=https://psmri.swymed.com:92744
15-
16-
### Redis IP
17-
spring.redis.host=localhost
18-
spring.main.allow-bean-definition-overriding=true
19-
jwt.secret=
20-
1+
# dev env
2+
# DB Connections
3+
spring.datasource.url=<Enter AMRIT DB_IEMR URL here>
4+
spring.datasource.username=<Enter your AMRIT DB_IEMR username>
5+
spring.datasource.password=<Enter your AMRIT DB_IEMR password>
6+
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
7+
8+
9+
10+
callcentre-server-ip=10.208.122.99
11+
12+
videoConsultation-apikey=<Enter Swymed API key>
13+
videoConsultation-base-url=https://psmri.swymed.com:92744
14+
15+
### Redis IP
16+
spring.redis.host=localhost
17+
spring.main.allow-bean-definition-overriding=true
18+
19+
common-url=http://localhost:8083/

‎src/main/environment/admin_example.properties‎

Lines changed: 18 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,18 @@
1-
2-
# local env
3-
# DB Connections
4-
spring.datasource.url=<Enter AMRIT DB_IEMR URL here>
5-
spring.datasource.username=<Enter your AMRIT DB_IEMR username>
6-
spring.datasource.password=<Enter your AMRIT DB_IEMR password>
7-
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
8-
9-
10-
11-
callcentre-server-ip=10.208.122.99
12-
13-
14-
videoConsultation-apikey=<Enter Swymed API key>
15-
videoConsultation-base-url=https://psmri.swymed.com:9274
16-
17-
18-
### Redis IP
19-
spring.redis.host=localhost
20-
spring.main.allow-bean-definition-overriding=true
21-
jwt.secret=
22-
1+
server.port=8082
2+
# local env
3+
# DB Connections
4+
spring.datasource.url=jdbc:mysql://localhost:3306/db_iemr
5+
spring.datasource.username=root
6+
spring.datasource.password=1234
7+
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
8+
9+
callcentre-server-ip=10.208.122.99
10+
11+
videoConsultation-apikey=<Enter Swymed API key>
12+
videoConsultation-base-url=https://psmri.swymed.com:9274
13+
14+
### Redis IP
15+
spring.redis.host=localhost
16+
spring.main.allow-bean-definition-overriding=true
17+
18+
common-url=http://localhost:8083/

‎src/main/environment/admin_test.properties‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,4 @@ spring.redis.host=localhost
1717
spring.main.allow-bean-definition-overriding=true
1818
jwt.secret=
1919

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

‎src/main/environment/admin_uat.properties‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
# UAT env
2-
# DB Connections
3-
spring.datasource.url=<Enter AMRIT DB_IEMR URL here>
4-
spring.datasource.username=<Enter your AMRIT DB_IEMR username>
5-
spring.datasource.password=<Enter your AMRIT DB_IEMR password>
6-
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
7-
8-
callcentre-server-ip=10.208.122.99
9-
videoConsultation-apikey=<Enter Swymed API key>
10-
videoConsultation-base-url=https://psmri.swymed.com:9274
11-
12-
13-
14-
15-
### Redis IP
16-
spring.redis.host=localhost
17-
spring.main.allow-bean-definition-overriding=true
18-
jwt.secret=
19-
1+
# UAT env
2+
# DB Connections
3+
spring.datasource.url=<Enter AMRIT DB_IEMR URL here>
4+
spring.datasource.username=<Enter your AMRIT DB_IEMR username>
5+
spring.datasource.password=<Enter your AMRIT DB_IEMR password>
6+
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
7+
8+
callcentre-server-ip=10.208.122.99
9+
videoConsultation-apikey=<Enter Swymed API key>
10+
videoConsultation-base-url=https://psmri.swymed.com:9274
11+
12+
13+
14+
15+
### Redis IP
16+
spring.redis.host=localhost
17+
spring.main.allow-bean-definition-overriding=true
18+
19+
common-url=http://localhost:8083/

‎src/main/resources/application.properties‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@ spring.profiles.active=test
1212
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
1313
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
1414

15-
#common-url=http://localhost:8080/commonapi-v1.1/
16-
common-url=http://10.208.122.100:8080/commonapi-v1.0/
17-
common-forcelogout=common-url/user/userForceLogout
15+
common-forcelogout=/user/userForceLogout
1816

1917
encrypt-password-url=user/setForgetPassword
2018

@@ -33,9 +31,6 @@ spring.datasource.tomcat.min-idle=1
3331
spring.datasource.tomcat.min-evictable-idle-time-millis=15000
3432
spring.datasource.tomcat.remove-abandoned-timeout=600
3533

36-
## Added by neeraj for tomcat port. commonAPI is running on 8080. 19-02-2018
37-
38-
3934
spring.session.store-type=redis
4035
spring.main.allow-bean-definition-overriding=true
4136
spring.redis.password=
@@ -81,5 +76,4 @@ swymed-createuser-url=swymed-base-url/SwymedWebApi/api/Contact
8176
swymed-edituser-url=swymed-base-url/SwymedWebApi/api/Contact
8277

8378
calibrationPageSize=5
84-
85-
biological-screening-device-url=http://localhost:8085/ezdx-hub-connect-srv
79+
biological-screening-device-url=http://localhost:8096/ezdx-hub-connect-srv

0 commit comments

Comments
 (0)