From 63c3a18f43272009a22e7a0bfcd1337b823c2874 Mon Sep 17 00:00:00 2001 From: Mithun James <1007084+drtechie@users.noreply.github.com> Date: Thu, 15 May 2025 16:24:34 +0530 Subject: [PATCH 1/4] feat: ensure url doesn't have version. upgrade version --- pom.xml | 4 ++-- src/main/webapp/WEB-INF/jboss-web.xml | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 src/main/webapp/WEB-INF/jboss-web.xml diff --git a/pom.xml b/pom.xml index 84d6d8b..588dda9 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 com.iemr.tm Scheduler-API - 0.0.1-SNAPSHOT + 3.1.0 war scheduler-api TeleMedicine Page @@ -256,7 +256,7 @@ - schedulerapi-v3.0.0 + ${artifactId}-${version} org.apache.maven.plugins diff --git a/src/main/webapp/WEB-INF/jboss-web.xml b/src/main/webapp/WEB-INF/jboss-web.xml new file mode 100644 index 0000000..1a65ef0 --- /dev/null +++ b/src/main/webapp/WEB-INF/jboss-web.xml @@ -0,0 +1,4 @@ + + + /scheduler-api + From b4964cf6e41ecca123ed51765c019dd630113c27 Mon Sep 17 00:00:00 2001 From: Mithun James <1007084+drtechie@users.noreply.github.com> Date: Sat, 17 May 2025 00:02:46 +0530 Subject: [PATCH 2/4] fix: war file artifact names --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 588dda9..ebe931a 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 com.iemr.tm - Scheduler-API + scheduler-api 3.1.0 war scheduler-api From b58be6ee818fd6d7774f713ce754e08a1f344ab1 Mon Sep 17 00:00:00 2001 From: Mithun James <1007084+drtechie@users.noreply.github.com> Date: Sat, 17 May 2025 13:14:10 +0530 Subject: [PATCH 3/4] fix: cleanup env variables; delete unused _dev, _uat, _test env files --- src/main/environment/common_ci.properties | 1 + src/main/environment/common_dev.properties | 18 ------------------ src/main/environment/common_example.properties | 4 +++- src/main/environment/common_test.properties | 18 ------------------ src/main/resources/application.properties | 3 --- 5 files changed, 4 insertions(+), 40 deletions(-) delete mode 100644 src/main/environment/common_dev.properties delete mode 100644 src/main/environment/common_test.properties diff --git a/src/main/environment/common_ci.properties b/src/main/environment/common_ci.properties index 6e7d5de..f0ed942 100644 --- a/src/main/environment/common_ci.properties +++ b/src/main/environment/common_ci.properties @@ -19,6 +19,7 @@ spring.redis.host=localhost jwt.secret=@env.JWT_SECRET_KEY@ #ELK logging file name +logging.path=logs/ logging.file.name=@env.SCHEDULER_API_LOGGING_FILE_NAME@ springdoc.api-docs.enabled=@env.SWAGGER_DOC_ENABLED@ diff --git a/src/main/environment/common_dev.properties b/src/main/environment/common_dev.properties deleted file mode 100644 index 085cd72..0000000 --- a/src/main/environment/common_dev.properties +++ /dev/null @@ -1,18 +0,0 @@ -# dev env -# DB Connections -spring.datasource.url= -spring.datasource.username= -spring.datasource.password= -spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver - -spring.profiles.active=test - -callcentre-server-ip=10.208.122.99 - - -common-url=/commonapi-v1.0/ - -### Redis IP -spring.redis.host=localhost -jwt.secret= - diff --git a/src/main/environment/common_example.properties b/src/main/environment/common_example.properties index c6a0485..d6b4463 100644 --- a/src/main/environment/common_example.properties +++ b/src/main/environment/common_example.properties @@ -18,5 +18,7 @@ common-url=http://localhost:8083/ ### Redis IP spring.redis.host=localhost -jwt.secret= +jwt.secret=my-32-character-ultra-secure-and-ultra-long-secret +logging.path=logs/ +logging.file.name=logs/scheduler-api.log diff --git a/src/main/environment/common_test.properties b/src/main/environment/common_test.properties deleted file mode 100644 index ad74007..0000000 --- a/src/main/environment/common_test.properties +++ /dev/null @@ -1,18 +0,0 @@ -# test env -# DB Connections -spring.datasource.url= -spring.datasource.username= -spring.datasource.password= -spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver - - -spring.profiles.active=test - -callcentre-server-ip=10.208.122.99 - - -common-url=/commonapi-v1.0/ - -### Redis IP -spring.redis.host=localhost -jwt.secret= diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 9f44b50..601dca7 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -30,9 +30,6 @@ logging.level.org.springframework.web=DEBUG logging.level.org.hibernate=DEBUG logging.level.com.iemr=DEBUG -logging.path=logs/ -logging.file.name=logs/scheduler-api.log - # slot size in mins multiple of 5 scheduling-slotsize=5 czentrix-server-ip=10.208.122.99 From 0300286128c406149ee56ec1544760e6d9ba011d Mon Sep 17 00:00:00 2001 From: Mithun James <1007084+drtechie@users.noreply.github.com> Date: Mon, 19 May 2025 10:49:30 +0530 Subject: [PATCH 4/4] fix: update names of the services in pom.xml files --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ebe931a..ac63bb8 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ scheduler-api 3.1.0 war - scheduler-api + Scheduler-API TeleMedicine Page org.springframework.boot