From cc4580a882904e5abf1379233a84630c5e1d5de7 Mon Sep 17 00:00:00 2001 From: swetatech24 Date: Fri, 6 Oct 2023 18:47:02 +0530 Subject: [PATCH 1/2] Added Pull Request template, added placeholders in properties file, and added admin_local to git ignore --- .github/PULL_REQUEST_TEMPLATE.md | 30 ++++++++++++++++++++ .gitignore | 3 ++ src/main/environment/common_dev.properties | 12 ++++---- src/main/environment/common_local.properties | 11 +++---- src/main/environment/common_test.properties | 12 ++++---- 5 files changed, 53 insertions(+), 15 deletions(-) create mode 100644 .github/PULL_REQUEST_TEMPLATE.md diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 0000000..58bdec2 --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -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 + + diff --git a/.gitignore b/.gitignore index 98942fa..069e5e7 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,6 @@ mvnw.cmd .tern-project debug.log mvnw + +# Properties +src/main/environment/common_local.properties diff --git a/src/main/environment/common_dev.properties b/src/main/environment/common_dev.properties index ca6c7bb..35f7623 100644 --- a/src/main/environment/common_dev.properties +++ b/src/main/environment/common_dev.properties @@ -1,6 +1,8 @@ -spring.datasource.url= -spring.datasource.username= -spring.datasource.password= +# dev env +# DB Connections +spring.datasource.url= +spring.datasource.username= +spring.datasource.password= spring.datasource.driver-class-name=com.mysql.jdbc.Driver @@ -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=/commonapi-v1.0/ +common-api-url=/commonapi-v1.0/ ### Redis IP spring.redis.host=localhost diff --git a/src/main/environment/common_local.properties b/src/main/environment/common_local.properties index f66ca29..b830b83 100644 --- a/src/main/environment/common_local.properties +++ b/src/main/environment/common_local.properties @@ -1,7 +1,8 @@ - -spring.datasource.url= -spring.datasource.username= -spring.datasource.password= +# local env +# DB Connections +spring.datasource.url= +spring.datasource.username= +spring.datasource.password= #spencDbPassring.datasource.url=jdbc:mysql://10.208.122.38:3306/db_iemr #spring.datasource.username=piramaldev #spring.datasource.password=Piramal@2017 @@ -14,7 +15,7 @@ spring.datasource.driver-class-name=com.mysql.jdbc.Driver 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 diff --git a/src/main/environment/common_test.properties b/src/main/environment/common_test.properties index ce63482..7a36492 100644 --- a/src/main/environment/common_test.properties +++ b/src/main/environment/common_test.properties @@ -1,6 +1,8 @@ -spring.datasource.url= -spring.datasource.username= -spring.datasource.password= +# test env +# DB Connections +spring.datasource.url= +spring.datasource.username= +spring.datasource.password= spring.datasource.driver-class-name=com.mysql.jdbc.Driver #spring.jpa.show-sql=true @@ -8,8 +10,8 @@ spring.datasource.driver-class-name=com.mysql.jdbc.Driver 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=/commonapi-v1.0/ +common-api-url=/commonapi-v1.0/ corsIP = http://10.208.122.38:8080 From ba28dbd12cba8d46bb4c8dabf476e282ca73404f Mon Sep 17 00:00:00 2001 From: swetatech24 Date: Mon, 9 Oct 2023 09:18:14 +0530 Subject: [PATCH 2/2] Resolved Conversastion --- src/main/environment/common_local.properties | 5 ----- src/main/environment/common_test.properties | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/src/main/environment/common_local.properties b/src/main/environment/common_local.properties index b830b83..670e394 100644 --- a/src/main/environment/common_local.properties +++ b/src/main/environment/common_local.properties @@ -3,11 +3,6 @@ spring.datasource.url= spring.datasource.username= spring.datasource.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 spring.datasource.driver-class-name=com.mysql.jdbc.Driver #spring.jpa.show-sql=true diff --git a/src/main/environment/common_test.properties b/src/main/environment/common_test.properties index 7a36492..52baa64 100644 --- a/src/main/environment/common_test.properties +++ b/src/main/environment/common_test.properties @@ -13,7 +13,7 @@ spring.profiles.active=test common-url=/commonapi-v1.0/ common-api-url=/commonapi-v1.0/ -corsIP = http://10.208.122.38:8080 +corsIP = ### Redis IP spring.redis.host=localhost