Skip to content

feat: ensure url doesn't have version. upgrade version #48

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

Merged
drtechie merged 5 commits into from
May 19, 2025
Merged

feat: ensure url doesn't have version. upgrade version #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e4d1e21
feat: ensure url doesn't have version. upgrade version
drtechie May 15, 2025
4d1fcf9
fix: env variables
drtechie May 16, 2025
f097a62
fix: cleanup env variables; delete unused _dev, _uat, _test env files
drtechie May 17, 2025
0f0da3e
fix: update names of the services in pom.xml files
drtechie May 19, 2025
662d4cd
fix: add empty line to end of CI file
drtechie May 19, 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
8 changes: 4 additions & 4 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
<modelVersion>4.0.0</modelVersion>

<groupId>com.iemr.common</groupId>
<artifactId>Common</artifactId>
<version>1.0-SNAPSHOT</version>
<artifactId>helpline-104-api</artifactId>
<version>3.1.0</version>
<packaging>war</packaging>
<name>Piramal-Helpline-104-API</name>
<name>Helpline-104-API</name>
<description>Piramal Helpline 104 API</description>
<parent>
<groupId>org.springframework.boot</groupId>
Expand Down Expand Up @@ -254,7 +254,7 @@
</dependencies>

<build>
<finalName>104api-v3.0.0</finalName>
<finalName>${artifactId}-${version}</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down
4 changes: 4 additions & 0 deletions src/main/environment/104_ci.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,11 @@ common-url=@env.COMMON_API_BASE_URL@
spring.redis.host=localhost

#ELK logging file name
logging.path=logs/
logging.file.name=@env.HELPLINE104_API_LOGGING_FILE_NAME@
jwt.secret=@env.JWT_SECRET_KEY@
springdoc.api-docs.enabled=@env.SWAGGER_DOC_ENABLED@
springdoc.swagger-ui.enabled=@env.SWAGGER_DOC_ENABLED@

sendSMSUrl= @env.COMMON_API_BASE_URL@sms/sendSMS
sendEmailGeneralUrl = @env.COMMON_API_BASE_URL@emailController/sendEmailGeneral
20 changes: 0 additions & 20 deletions src/main/environment/104_dev.properties
View file
Open in desktop

This file was deleted.

9 changes: 7 additions & 2 deletions src/main/environment/104_example.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,13 @@ secondary.datasource.url=<Enter AMRIT DB_REPORTING URL here>
secondary.datasource.driver-class-name=com.mysql.jdbc.Driver

# Common Config
common-url=http://localhost:8080/commonapi-v1.0
common-url=http://localhost:8080
sendSMSUrl= http://localhost:8080/sms/sendSMS
sendEmailGeneralUrl = http://localhost:8080/emailController/sendEmailGeneral

### Redis IP
spring.redis.host=localhost
jwt.secret=
jwt.secret=my-32-character-ultra-secure-and-ultra-long-secret
#If both properties are set, only logging.file.name takes effect.
logging.path=logs/
logging.file.name=logs/helpline104-api.log
34 changes: 0 additions & 34 deletions src/main/environment/104_test.properties
View file
Open in desktop

This file was deleted.

19 changes: 0 additions & 19 deletions src/main/environment/104_uat.properties
View file
Open in desktop

This file was deleted.

3 changes: 0 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 @@ -45,9 +45,6 @@ logging.level.org.hibernate=INFO
logging.level.com.iemr=DEBUG
logging.level.org.springframework=INFO

logging.path=logs/
logging.file.name=logs/helpline104-api.log

##sms details for IMR MMR
IMRMMRSmsTemplate= IMR MMR SMS
sendSMSUrl= <Enter your socket address here>/commonapi-v1.0/sms/sendSMS
Expand Down
4 changes: 4 additions & 0 deletions src/main/webapp/WEB-INF/jboss-web.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<jboss-web>
<context-root>/104-api</context-root>
</jboss-web>
Loading