diff --git a/pom.xml b/pom.xml index f69587f..901709d 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ UTF-8 UTF-8 - 17.0.3 + 17 3.2.2 0.10.0.RELEASE @@ -191,10 +191,7 @@ lombok ${lombok.version} - - org.springframework.data - spring-data-jpa - + org.springframework.boot spring-boot-starter-data-redis @@ -216,6 +213,12 @@ org.springframework.boot spring-boot-starter + + + org.springframework.boot + spring-boot-starter-logging + + diff --git a/src/main/environment/common_dev.properties b/src/main/environment/common_dev.properties index 94ac22f..51f9e19 100644 --- a/src/main/environment/common_dev.properties +++ b/src/main/environment/common_dev.properties @@ -5,7 +5,7 @@ spring.datasource.driver-class-name=com.mysql.jdbc.Driver spring.profiles.active=test callcentre-server-ip=10.208.122.99 -common-api-url=http://10.208.122.38:8080/commonapi-v1.0/ +common-api-url=/commonapi-v1.0/ ### Redis IP spring.data.redis.host=localhost diff --git a/src/main/environment/common_example.properties b/src/main/environment/common_example.properties index 5ed921d..c21bd50 100644 --- a/src/main/environment/common_example.properties +++ b/src/main/environment/common_example.properties @@ -5,7 +5,7 @@ spring.datasource.driver-class-name=com.mysql.jdbc.Driver spring.profiles.active=test callcentre-server-ip=10.208.122.99 -common-api-url=http://10.208.122.38:8080/commonapi-v1.0/ +common-api-url=/commonapi-v1.0/ ### Redis IP spring.data.redis.host=localhost diff --git a/src/main/environment/common_test.properties b/src/main/environment/common_test.properties index 03387ca..d89475a 100644 --- a/src/main/environment/common_test.properties +++ b/src/main/environment/common_test.properties @@ -6,7 +6,8 @@ spring.datasource.driver-class-name=com.mysql.jdbc.Driver #spring.jpa.show-sql=true spring.profiles.active=test callcentre-server-ip=10.208.122.99 -common-api-url=http://10.208.122.38:8080/commonapi-v1.0/ + +common-api-url=/commonapi-v1.0/ ### Redis IP spring.data.redis.host=localhost diff --git a/src/main/java/com/iemr/inventory/RoleMasterApplication.java b/src/main/java/com/iemr/inventory/RoleMasterApplication.java index 292fc8d..135029c 100644 --- a/src/main/java/com/iemr/inventory/RoleMasterApplication.java +++ b/src/main/java/com/iemr/inventory/RoleMasterApplication.java @@ -25,6 +25,7 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.builder.SpringApplicationBuilder; +import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; import org.springframework.cache.annotation.EnableCaching; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; @@ -39,7 +40,7 @@ @ComponentScan @SpringBootApplication @EnableCaching(proxyTargetClass = true) -public class RoleMasterApplication { +public class RoleMasterApplication extends SpringBootServletInitializer{ public static void main(String[] args) { SpringApplication.run(roleMasterApplication, args); diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml deleted file mode 100644 index 6b5b9bf..0000000 --- a/src/main/resources/logback.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - ${HOME_LOG} - - - logs/archived/app.%d{yyyy-MM-dd}.%i.log.gz - - 1MB - - 20GB - - 60 - - - - %d %-5p [%X{sessionId}] [%X{userId}] %C{1}.%M:%L] %m%n - - - - - - - - - - - - \ No newline at end of file