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

Added Pull Request template, added placeholders in properties file, a… #35

Open
wants to merge 2 commits into
base: feature/jdk1.8
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
30 changes: 30 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
# Description

Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. List any dependencies that are required for this change.

# Type of change

- [ ] Bug fix
- [ ] New feature
- [ ] Enhancement
- [ ] Refactoring
- [ ] Documentation
- [ ] Other ( please specify )

# How Has This Been Tested?

Please describe the tests that you ran to verify your changes. Please also note any relevant details for your test configuration.

- [ ] Test A
- [ ] Test B

# Checklist:

- [ ] My code follows the style guidelines of this project
- [ ] I have performed a self-review of my own code
- [ ] I have commented my code, particularly in hard-to-understand areas
- [ ] I have made corresponding changes to the documentation
- [ ] My changes generate no new warnings
- [ ] Any dependent changes have been merged and published in downstream modules


3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,6 @@ mvnw.cmd
.tern-project
debug.log
mvnw

# Properties
src/main/environment/common_local.properties
12 changes: 7 additions & 5 deletions src/main/environment/common_dev.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
spring.datasource.url=<Enter AMRIT DB URL here>
spring.datasource.username=<Enter your AMRIT DB username>
spring.datasource.password=<Enter your AMRIT DB password>
# 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.jdbc.Driver


Expand All @@ -9,8 +11,8 @@ spring.profiles.active=test
callcentre-server-ip=10.208.122.99


common-url=http://10.208.122.32:8080/commonapi-v1.0/
common-api-url=http://10.208.122.32:8080/commonapi-v1.0/
common-url=<Enter your socket address here>/commonapi-v1.0/
common-api-url=<Enter your socket address here>/commonapi-v1.0/

### Redis IP
spring.redis.host=localhost
Expand Down
16 changes: 6 additions & 10 deletions src/main/environment/common_local.properties
Original file line number Diff line number Diff line change
@@ -1,20 +1,16 @@

spring.datasource.url=<Enter AMRIT DB URL here>
spring.datasource.username=<Enter your AMRIT DB username>
spring.datasource.password=<Enter your AMRIT DB password>
#spencDbPassring.datasource.url=jdbc:mysql://10.208.122.38:3306/db_iemr
#spring.datasource.username=piramaldev
#spring.datasource.password=Piramal@2017
# spring.datasource.username=piramaldev
# spring.datasource.password=Piramal@2017
# 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.jdbc.Driver

#spring.jpa.show-sql=true

spring.profiles.active=test


common-url=http://10.208.122.38:8080/commonapi-v1.0/
common-url=http://localhost:8080/commonapi-v1.0/

### Redis IP
spring.redis.host=localhost
Expand Down
14 changes: 8 additions & 6 deletions src/main/environment/common_test.properties
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
spring.datasource.url=<Enter AMRIT DB URL here>
spring.datasource.username=<Enter your AMRIT DB username>
spring.datasource.password=<Enter your AMRIT DB password>
# test 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.jdbc.Driver

#spring.jpa.show-sql=true

spring.profiles.active=test


common-url=http://10.208.122.38:8080/commonapi-v1.0/
common-api-url=http://10.208.122.38:8080/commonapi-v1.0/
common-url=<Enter your socket address here>/commonapi-v1.0/
common-api-url=<Enter your socket address here>/commonapi-v1.0/

corsIP = http://10.208.122.38:8080
corsIP = <Enter your socket address here>

### Redis IP
spring.redis.host=localhost
Expand Down
Loading