Merge remote-tracking branch 'origin/develop' into develop

2 years ago · 9965896e77
parent b56708d31b 9fbffc2cc7
commit 9965896e77
2 changed files with 3 additions and 3 deletions
--- a/hippo4j-server/bin/startup.cmd
+++ b/hippo4j-server/bin/startup.cmd
@ -22,8 +22,8 @@ set "HIPPO4J_OPTS=%HIPPO4J_OPTS% -jar %BASE_DIR%\target\%SERVER%.jar"


 rem set hippo4j spring config location
-set "HIPPO4J_CONFIG_OPTS=--spring.config.location=%CUSTOM_SEARCH_LOCATIONS%"
-set "HIPPO4J_CONFIG_OPTS=%HIPPO4J_OPTS% --server.tomcat.basedir=%BASE_DIR%/bin"
+set "HIPPO4J_CONFIG_OPTS=%HIPPO4J_CONFIG_OPTS% --spring.config.location=%CUSTOM_SEARCH_LOCATIONS%"
+set "HIPPO4J_CONFIG_OPTS=%HIPPO4J_CONFIG_OPTS% --server.tomcat.basedir=%BASE_DIR%/bin"


 rem set hippo4j logback file location
--- a/pom.xml
+++ b/pom.xml
@ -46,7 +46,7 @@
        <slf4j-api.version>1.7.7</slf4j-api.version>
        <logback.version>1.2.3</logback.version>
        <mybatis-plus.version>3.4.2</mybatis-plus.version>
-        <spring-boot.version>2.3.2.RELEASE</spring-boot.version>
+        <spring-boot.version>2.5.13</spring-boot.version>
        <apollo.version>1.9.1</apollo.version>

        <maven.javadoc.failOnError>false</maven.javadoc.failOnError>